pool: prevent edge case with undefined subcloser.

abstract-pool.ts

@@ -16,8 +16,7 @@ import { Relay } from './relay.ts'
 export type SubCloser = { close: (reason?: string) => void }
 
 export type AbstractPoolConstructorOptions = AbstractRelayConstructorOptions & {
-  // automaticallyAuth takes a relay URL and should return null
+  // automaticallyAuth takes a relay URL and should return null in case that relay shouldn't be authenticated against
-  // in case that relay shouldn't be authenticated against
   // or a function to sign the AUTH event template otherwise (that function may still throw in case of failure)
   automaticallyAuth?: (relayURL: string) => null | ((event: EventTemplate) => Promise<VerifiedEvent>)
   // onRelayConnectionFailure is called with the URL of a relay that failed the initial connection
@@ -269,10 +268,13 @@ export class AbstractSimplePool {
     filter: Filter,
     params: Pick<SubscribeManyParams, 'label' | 'id' | 'onevent' | 'onclose' | 'maxWait' | 'onauth'>,
   ): SubCloser {
-    const subcloser = this.subscribe(relays, filter, {
+    let subcloser: SubCloser
+    subcloser = this.subscribe(relays, filter, {
       ...params,
       oneose() {
-        subcloser.close('closed automatically on eose')
+        const reason = 'closed automatically on eose'
+        if (subcloser) subcloser.close(reason)
+        else params.onclose?.(relays.map(_ => reason))
       },
     })
     return subcloser

jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@nostr/tools",
-  "version": "2.23.0",
+  "version": "2.23.1",
   "exports": {
     ".": "./index.ts",
     "./core": "./core.ts",

nip13.ts

@@ -21,6 +21,23 @@ export function getPow(hex: string): number {
   return count
 }
 
+/** Get POW difficulty directly from a Uint8Array hash. */
+function getPowFromBytes(hash: Uint8Array): number {
+  let count = 0
+
+  for (let i = 0; i < hash.length; i++) {
+    const byte = hash[i]
+    if (byte === 0) {
+      count += 8
+    } else {
+      count += Math.clz32(byte) - 24
+      break
+    }
+  }
+
+  return count
+}
+
 /**
  * Mine an event with the desired POW. This function mutates the event.
  * Note that this operation is synchronous and should be run in a worker context to avoid blocking the main thread.
@@ -43,18 +60,15 @@ export function minePow(unsigned: UnsignedEvent, difficulty: number): Omit<Event
 
     tag[1] = (++count).toString()
 
-    event.id = fastEventHash(event)
+    const hash = sha256(
+      utf8Encoder.encode(JSON.stringify([0, event.pubkey, event.created_at, event.kind, event.tags, event.content])),
+    )
 
-    if (getPow(event.id) >= difficulty) {
+    if (getPowFromBytes(hash) >= difficulty) {
+      event.id = bytesToHex(hash)
       break
     }
   }
 
   return event
 }
-
-export function fastEventHash(evt: UnsignedEvent): string {
-  return bytesToHex(
-    sha256(utf8Encoder.encode(JSON.stringify([0, evt.pubkey, evt.created_at, evt.kind, evt.tags, evt.content]))),
-  )
-}

package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "nostr-tools",
-  "version": "2.23.0",
+  "version": "2.23.1",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",