Move deduplicateEvents to util

docs/util/blossom.md

@@ -84,7 +84,7 @@ const authEvent = makeBlossomAuthEvent({
 })
 
 // Sign the auth event with your signer
-const signedAuthEvent = await signer.signEvent(authEvent)
+const signedAuthEvent = await signer.sign(authEvent)
 
 // Upload a file
 const file = new File(["Hello world"], "hello.txt", { type: "text/plain" })

docs/util/events.md

@@ -87,6 +87,9 @@ export declare const getIdentifier: (e: EventTemplate) => string | undefined;
 export declare const getIdOrAddress: (e: HashedEvent) => string;
 export declare const getIdAndAddress: (e: HashedEvent) => string[];
 
+// Event deduplication by id or address
+export declare const deduplicateEvents: (e: TrustedEvent) => TrustedEvent[];
+
 // Event type checking
 export declare const isEphemeral: (e: EventTemplate) => boolean;
 export declare const isReplaceable: (e: EventTemplate) => boolean;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@welshman",
   "private": true,
-  "version": "0.4.6",
+  "version": "0.4.7",
   "workspaces": [
     "packages/*"
   ],

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/app",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of svelte stores for use in building nostr client applications.",

packages/content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/content",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for parsing nostr note content.",

packages/editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/editor",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A batteries-included nostr editor.",

packages/feeds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/feeds",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for building dynamic nostr feeds.",

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/lib",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities.",

packages/net/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/net",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "Utilities for connecting with nostr relays.",

packages/net/src/request.ts

@@ -1,7 +1,6 @@
 import {
   on,
   uniq,
-  lte,
   flatten,
   addToMapKey,
   defer,
@@ -13,10 +12,10 @@ import {
 } from "@welshman/lib"
 import {
   Filter,
-  getAddress,
   unionFilters,
   matchFilters,
   TrustedEvent,
+  deduplicateEvents,
   getFilterResultCardinality,
 } from "@welshman/util"
 import {RelayMessage, ClientMessageType, isRelayEvent, isRelayEose} from "./message.js"
@@ -25,20 +24,6 @@ import {SocketEvent, SocketStatus} from "./socket.js"
 import {netContext} from "./context.js"
 import {Tracker} from "./tracker.js"
 
-const deduplicateEvents = (events: TrustedEvent[]) => {
-  const eventsByAddress = new Map<string, TrustedEvent>()
-
-  for (const event of events) {
-    const address = getAddress(event)
-
-    if (lte(eventsByAddress.get(address)?.created_at, event.created_at)) {
-      eventsByAddress.set(address, event)
-    }
-  }
-
-  return Array.from(eventsByAddress.values())
-}
-
 export type BaseRequestOptions = {
   signal?: AbortSignal
   tracker?: Tracker

packages/relay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/relay",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "An in-memory nostr relay implementation.",

packages/router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/router",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities for nostr relay selection.",

packages/signer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/signer",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A nostr signer implemenation supporting several login methods.",

packages/store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/store",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of utilities based on svelte/store for use with welshman",

packages/util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@welshman/util",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "author": "hodlbod",
   "license": "MIT",
   "description": "A collection of nostr-related utilities.",

packages/util/src/Events.ts

@@ -1,7 +1,7 @@
 import {verifiedSymbol, verifyEvent as verifyEventPure} from "nostr-tools/pure"
 import {setNostrWasm, verifyEvent as verifyEventWasm} from "nostr-tools/wasm"
 import {initNostrWasm} from "nostr-wasm"
-import {mapVals, first, pick, now} from "@welshman/lib"
+import {mapVals, lte, first, pick, now} from "@welshman/lib"
 import {getReplyTags, getCommentTags, getReplyTagValues, getCommentTagValues} from "./Tags.js"
 import {getAddress, Address} from "./Address.js"
 import {
@@ -136,6 +136,20 @@ export const getIdOrAddress = (e: HashedEvent) => (isReplaceable(e) ? getAddress
 export const getIdAndAddress = (e: HashedEvent) =>
   isReplaceable(e) ? [e.id, getAddress(e)] : [e.id]
 
+export const deduplicateEvents = (events: TrustedEvent[]) => {
+  const eventsByKey = new Map<string, TrustedEvent>()
+
+  for (const event of events) {
+    const key = getIdOrAddress(event)
+
+    if (lte(eventsByKey.get(key)?.created_at, event.created_at)) {
+      eventsByKey.set(key, event)
+    }
+  }
+
+  return Array.from(eventsByKey.values())
+}
+
 export const isEphemeral = (e: EventTemplate) => isEphemeralKind(e.kind)
 
 export const isReplaceable = (e: EventTemplate) => isReplaceableKind(e.kind)