relay: get rid of the message queue, because js is single-threaded.

abstract-pool.ts

@@ -119,10 +119,14 @@ export class AbstractSimplePool {
 
   subscribe(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
     const request: { url: string; filter: Filter }[] = []
+    const uniqUrls: string[] = []
     for (let i = 0; i < relays.length; i++) {
       const url = normalizeURL(relays[i])
       if (!request.find(r => r.url === url)) {
-        request.push({ url, filter: filter })
+        if (uniqUrls.indexOf(url) === -1) {
+          uniqUrls.push(url)
+          request.push({ url, filter: filter })
+        }
       }
     }
 
@@ -130,17 +134,7 @@ export class AbstractSimplePool {
   }
 
   subscribeMany(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
-    const request: { url: string; filter: Filter }[] = []
-    const uniqUrls: string[] = []
-    for (let i = 0; i < relays.length; i++) {
-      const url = normalizeURL(relays[i])
-      if (uniqUrls.indexOf(url) === -1) {
-        uniqUrls.push(url)
-        request.push({ url, filter: filter })
-      }
-    }
-
-    return this.subscribeMap(request, params)
+    return this.subscribe(relays, filter, params)
   }
 
   subscribeMap(requests: { url: string; filter: Filter }[], params: SubscribeManyParams): SubCloser {
@@ -286,13 +280,7 @@ export class AbstractSimplePool {
     filter: Filter,
     params: Pick<SubscribeManyParams, 'label' | 'id' | 'onevent' | 'onclose' | 'maxWait' | 'onauth'>,
   ): SubCloser {
-    const subcloser = this.subscribeMany(relays, filter, {
-      ...params,
-      oneose() {
-        subcloser.close('closed automatically on eose')
-      },
-    })
-    return subcloser
+    return this.subscribeEose(relays, filter, params)
   }
 
   async querySync(

abstract-relay.ts

@@ -3,9 +3,8 @@
 import type { Event, EventTemplate, VerifiedEvent, Nostr, NostrEvent } from './core.ts'
 import { matchFilters, type Filter } from './filter.ts'
 import { getHex64, getSubscriptionId } from './fakejson.ts'
-import { Queue, normalizeURL } from './utils.ts'
+import { normalizeURL } from './utils.ts'
 import { makeAuthEvent } from './nip42.ts'
-import { yieldThread } from './helpers.ts'
 
 type RelayWebSocket = WebSocket & {
   ping?(): void
@@ -51,8 +50,6 @@ export class AbstractRelay {
   private openCountRequests = new Map<string, CountResolver>()
   private openEventPublishes = new Map<string, EventPublishResolver>()
   private ws: RelayWebSocket | undefined
-  private incomingMessageQueue = new Queue<string>()
-  private queueRunning = false
   private challenge: string | undefined
   private authPromise: Promise<string> | undefined
   private serial: number = 0
@@ -269,122 +266,6 @@ export class AbstractRelay {
     }
   }
 
-  private async runQueue() {
-    this.queueRunning = true
-    while (true) {
-      if (false === this.handleNext()) {
-        break
-      }
-      await yieldThread()
-    }
-    this.queueRunning = false
-  }
-
-  private handleNext(): undefined | false {
-    const json = this.incomingMessageQueue.dequeue()
-    if (!json) {
-      return false
-    }
-
-    // shortcut EVENT sub
-    const subid = getSubscriptionId(json)
-    if (subid) {
-      const so = this.openSubs.get(subid as string)
-      if (!so) {
-        // this is an EVENT message, but for a subscription we don't have, so just stop here
-        return
-      }
-
-      // this will be called only when this message is a EVENT message for a subscription we have
-      // we do this before parsing the JSON to not have to do that for duplicate events
-      //   since JSON parsing is slow
-      const id = getHex64(json, 'id')
-      const alreadyHave = so.alreadyHaveEvent?.(id)
-
-      // notify any interested client that the relay has this event
-      // (do this after alreadyHaveEvent() because the client may rely on this to answer that)
-      so.receivedEvent?.(this, id)
-
-      if (alreadyHave) {
-        // if we had already seen this event we can just stop here
-        return
-      }
-    }
-
-    try {
-      let data = JSON.parse(json)
-      // we won't do any checks against the data since all failures (i.e. invalid messages from relays)
-      // will naturally be caught by the encompassing try..catch block
-
-      switch (data[0]) {
-        case 'EVENT': {
-          const so = this.openSubs.get(data[1] as string) as Subscription
-          const event = data[2] as NostrEvent
-          if (this.verifyEvent(event) && matchFilters(so.filters, event)) {
-            so.onevent(event)
-          }
-          if (!so.lastEmitted || so.lastEmitted < event.created_at) so.lastEmitted = event.created_at
-          return
-        }
-        case 'COUNT': {
-          const id: string = data[1]
-          const payload = data[2] as { count: number }
-          const cr = this.openCountRequests.get(id) as CountResolver
-          if (cr) {
-            cr.resolve(payload.count)
-            this.openCountRequests.delete(id)
-          }
-          return
-        }
-        case 'EOSE': {
-          const so = this.openSubs.get(data[1] as string)
-          if (!so) return
-          so.receivedEose()
-          return
-        }
-        case 'OK': {
-          const id: string = data[1]
-          const ok: boolean = data[2]
-          const reason: string = data[3]
-          const ep = this.openEventPublishes.get(id) as EventPublishResolver
-          if (ep) {
-            clearTimeout(ep.timeout)
-            if (ok) ep.resolve(reason)
-            else ep.reject(new Error(reason))
-            this.openEventPublishes.delete(id)
-          }
-          return
-        }
-        case 'CLOSED': {
-          const id: string = data[1]
-          const so = this.openSubs.get(id)
-          if (!so) return
-          so.closed = true
-          so.close(data[2] as string)
-          return
-        }
-        case 'NOTICE': {
-          this.onnotice(data[1] as string)
-          return
-        }
-        case 'AUTH': {
-          this.challenge = data[1] as string
-          if (this.onauth) {
-            this.auth(this.onauth)
-          }
-          return
-        }
-        default: {
-          const so = this.openSubs.get(data[1])
-          so?.oncustom?.(data)
-          return
-        }
-      }
-    } catch (err) {
-      return
-    }
-  }
-
   public async send(message: string) {
     if (!this.connectionPromise) throw new SendingOnClosedConnection(message, this.url)
 
@@ -488,9 +369,109 @@ export class AbstractRelay {
   // this is the function assigned to this.ws.onmessage
   // it's exposed for testing and debugging purposes
   public _onmessage(ev: MessageEvent<any>) {
-    this.incomingMessageQueue.enqueue(ev.data as string)
-    if (!this.queueRunning) {
-      this.runQueue()
+    const json = ev.data
+    if (!json) {
+      return false
+    }
+
+    // shortcut EVENT sub
+    const subid = getSubscriptionId(json)
+    if (subid) {
+      const so = this.openSubs.get(subid as string)
+      if (!so) {
+        // this is an EVENT message, but for a subscription we don't have, so just stop here
+        return
+      }
+
+      // this will be called only when this message is a EVENT message for a subscription we have
+      // we do this before parsing the JSON to not have to do that for duplicate events
+      //   since JSON parsing is slow
+      const id = getHex64(json, 'id')
+      const alreadyHave = so.alreadyHaveEvent?.(id)
+
+      // notify any interested client that the relay has this event
+      // (do this after alreadyHaveEvent() because the client may rely on this to answer that)
+      so.receivedEvent?.(this, id)
+
+      if (alreadyHave) {
+        // if we had already seen this event we can just stop here
+        return
+      }
+    }
+
+    try {
+      let data = JSON.parse(json)
+      // we won't do any checks against the data since all failures (i.e. invalid messages from relays)
+      // will naturally be caught by the encompassing try..catch block
+
+      switch (data[0]) {
+        case 'EVENT': {
+          const so = this.openSubs.get(data[1] as string) as Subscription
+          const event = data[2] as NostrEvent
+          if (this.verifyEvent(event) && matchFilters(so.filters, event)) {
+            so.onevent(event)
+          }
+          if (!so.lastEmitted || so.lastEmitted < event.created_at) so.lastEmitted = event.created_at
+          return
+        }
+        case 'COUNT': {
+          const id: string = data[1]
+          const payload = data[2] as { count: number }
+          const cr = this.openCountRequests.get(id) as CountResolver
+          if (cr) {
+            cr.resolve(payload.count)
+            this.openCountRequests.delete(id)
+          }
+          return
+        }
+        case 'EOSE': {
+          const so = this.openSubs.get(data[1] as string)
+          if (!so) return
+          so.receivedEose()
+          return
+        }
+        case 'OK': {
+          const id: string = data[1]
+          const ok: boolean = data[2]
+          const reason: string = data[3]
+          const ep = this.openEventPublishes.get(id) as EventPublishResolver
+          if (ep) {
+            clearTimeout(ep.timeout)
+            if (ok) ep.resolve(reason)
+            else ep.reject(new Error(reason))
+            this.openEventPublishes.delete(id)
+          }
+          return
+        }
+        case 'CLOSED': {
+          const id: string = data[1]
+          const so = this.openSubs.get(id)
+          if (!so) return
+          so.closed = true
+          so.close(data[2] as string)
+          return
+        }
+        case 'NOTICE': {
+          this.onnotice(data[1] as string)
+          return
+        }
+        case 'AUTH': {
+          this.challenge = data[1] as string
+          if (this.onauth) {
+            this.auth(this.onauth)
+          }
+          return
+        }
+        default: {
+          const so = this.openSubs.get(data[1])
+          so?.oncustom?.(data)
+          return
+        }
+      }
+    } catch (err) {
+      const [_, __, event] = JSON.parse(json)
+      ;(window as any).printer.maybe(event.pubkey, ':: caught err', event, this.url, err)
+      return
     }
   }
 }

helpers.ts

@@ -1,37 +1,5 @@
 import { verifiedSymbol, type Event, type Nostr, VerifiedEvent } from './core.ts'
 
-export async function yieldThread() {
-  return new Promise<void>((resolve, reject) => {
-    try {
-      // Check if MessageChannel is available
-      if (typeof MessageChannel !== 'undefined') {
-        const ch = new MessageChannel()
-        const handler = () => {
-          // @ts-ignore (typescript thinks this property should be called `removeListener`, but in fact it's `removeEventListener`)
-          ch.port1.removeEventListener('message', handler)
-          resolve()
-        }
-        // @ts-ignore (typescript thinks this property should be called `addListener`, but in fact it's `addEventListener`)
-        ch.port1.addEventListener('message', handler)
-        ch.port2.postMessage(0)
-        ch.port1.start()
-      } else {
-        if (typeof setImmediate !== 'undefined') {
-          setImmediate(resolve)
-        } else if (typeof setTimeout !== 'undefined') {
-          setTimeout(resolve, 0)
-        } else {
-          // Last resort - resolve immediately
-          resolve()
-        }
-      }
-    } catch (e) {
-      console.error('during yield: ', e)
-      reject(e)
-    }
-  })
-}
-
 export const alwaysTrue: Nostr['verifyEvent'] = (t: Event): t is VerifiedEvent => {
   t[verifiedSymbol] = true
   return true

nip27.test.ts

@@ -85,7 +85,7 @@ test('parse content with hashtags and emoji shortcodes', () => {
       ['emoji', 'alpaca', 'https://example.com/alpaca.png'],
     ],
     content:
-      'hey nostr:npub1hpslpc8c5sp3e2nhm2fr7swsfqpys5vyjar5dwpn7e7decps6r8qkcln63 check out :alpaca::alpaca: #alpaca at wss://alpaca.com! :star:',
+      'hey nostr:npub1hpslpc8c5sp3e2nhm2fr7swsfqpys5vyjar5dwpn7e7decps6r8qkcln63 check out :alpaca::alpaca: #alpaca at wss://alpaca.com! :star:\n\n#WORDS #486 5/6',
     created_at: 1234567890,
     pubkey: 'dummy',
     id: 'dummy',
@@ -105,6 +105,11 @@ test('parse content with hashtags and emoji shortcodes', () => {
     { type: 'relay', url: 'wss://alpaca.com/' },
     { type: 'text', text: '! ' },
     { type: 'emoji', shortcode: 'star', url: 'https://example.com/star.png' },
+    { type: 'text', text: '\n\n' },
+    { type: 'hashtag', value: 'WORDS' },
+    { type: 'text', text: ' ' },
+    { type: 'hashtag', value: '486' },
+    { type: 'text', text: ' 5/6' },
   ])
 })
 

nip27.ts

@@ -69,7 +69,7 @@ export function* parse(content: string | NostrEvent): Iterable<Block> {
 
     if (u === -1 || (h >= 0 && h < u)) {
       // parse hashtag
-      if (h === 0 || content[h - 1] === ' ') {
+      if (h === 0 || content[h - 1].match(noCharacter)) {
         const m = content.slice(h + 1, h + MAX_HASHTAG_LENGTH).match(noCharacter)
         const end = m ? h + 1 + m.index! : max
         yield { type: 'text', text: content.slice(prevIndex, h) }

package.json

@@ -16,71 +16,85 @@
   "types": "./lib/types/index.d.ts",
   "exports": {
     ".": {
+      "source": "./index.ts",
       "import": "./lib/esm/index.js",
       "require": "./lib/cjs/index.js",
       "types": "./lib/types/index.d.ts"
     },
     "./core": {
+      "source": "./core.ts",
       "import": "./lib/esm/core.js",
       "require": "./lib/cjs/core.js",
       "types": "./lib/types/core.d.ts"
     },
     "./pure": {
+      "source": "./pure.ts",
       "import": "./lib/esm/pure.js",
       "require": "./lib/cjs/pure.js",
       "types": "./lib/types/pure.d.ts"
     },
     "./wasm": {
+      "source": "./wasm.ts",
       "import": "./lib/esm/wasm.js",
       "require": "./lib/cjs/wasm.js",
       "types": "./lib/types/wasm.d.ts"
     },
     "./kinds": {
+      "source": "./kinds.ts",
       "import": "./lib/esm/kinds.js",
       "require": "./lib/cjs/kinds.js",
       "types": "./lib/types/kinds.d.ts"
     },
     "./filter": {
+      "source": "./filter.ts",
       "import": "./lib/esm/filter.js",
       "require": "./lib/cjs/filter.js",
       "types": "./lib/types/filter.d.ts"
     },
     "./abstract-relay": {
+      "source": "./abstract-relay.ts",
       "import": "./lib/esm/abstract-relay.js",
       "require": "./lib/cjs/abstract-relay.js",
       "types": "./lib/types/abstract-relay.d.ts"
     },
     "./relay": {
+      "source": "./relay.ts",
       "import": "./lib/esm/relay.js",
       "require": "./lib/cjs/relay.js",
       "types": "./lib/types/relay.d.ts"
     },
     "./abstract-pool": {
+      "source": "./abstract-pool.ts",
       "import": "./lib/esm/abstract-pool.js",
       "require": "./lib/cjs/abstract-pool.js",
       "types": "./lib/types/abstract-pool.d.ts"
     },
     "./pool": {
+      "source": "./pool.ts",
       "import": "./lib/esm/pool.js",
       "require": "./lib/cjs/pool.js",
       "types": "./lib/types/pool.d.ts"
     },
     "./references": {
+      "source": "./references.ts",
       "import": "./lib/esm/references.js",
       "require": "./lib/cjs/references.js",
       "types": "./lib/types/references.d.ts"
     },
     "./nip04": {
+      "source": "./nip04.ts",
       "import": "./lib/esm/nip04.js",
       "require": "./lib/cjs/nip04.js",
       "types": "./lib/types/nip04.d.ts"
     },
     "./nip05": {
+      "source": "./nip05.ts",
       "import": "./lib/esm/nip05.js",
       "require": "./lib/cjs/nip05.js",
       "types": "./lib/types/nip05.d.ts"
     },
     "./nip06": {
+      "source": "./nip06.ts",
       "import": "./lib/esm/nip06.js",
       "require": "./lib/cjs/nip06.js",
       "types": "./lib/types/nip06.d.ts"
@@ -89,146 +103,175 @@
       "types": "./lib/types/nip07.d.ts"
     },
     "./nip10": {
+      "source": "./nip10.ts",
       "import": "./lib/esm/nip10.js",
       "require": "./lib/cjs/nip10.js",
       "types": "./lib/types/nip10.d.ts"
     },
     "./nip11": {
+      "source": "./nip11.ts",
       "import": "./lib/esm/nip11.js",
       "require": "./lib/cjs/nip11.js",
       "types": "./lib/types/nip11.d.ts"
     },
     "./nip13": {
+      "source": "./nip13.ts",
       "import": "./lib/esm/nip13.js",
       "require": "./lib/cjs/nip13.js",
       "types": "./lib/types/nip13.d.ts"
     },
     "./nip17": {
+      "source": "./nip17.ts",
       "import": "./lib/esm/nip17.js",
       "require": "./lib/cjs/nip17.js",
       "types": "./lib/types/nip17.d.ts"
     },
     "./nip18": {
+      "source": "./nip18.ts",
       "import": "./lib/esm/nip18.js",
       "require": "./lib/cjs/nip18.js",
       "types": "./lib/types/nip18.d.ts"
     },
     "./nip19": {
+      "source": "./nip19.ts",
       "import": "./lib/esm/nip19.js",
       "require": "./lib/cjs/nip19.js",
       "types": "./lib/types/nip19.d.ts"
     },
     "./nip21": {
+      "source": "./nip21.ts",
       "import": "./lib/esm/nip21.js",
       "require": "./lib/cjs/nip21.js",
       "types": "./lib/types/nip21.d.ts"
     },
     "./nip25": {
+      "source": "./nip25.ts",
       "import": "./lib/esm/nip25.js",
       "require": "./lib/cjs/nip25.js",
       "types": "./lib/types/nip25.d.ts"
     },
     "./nip27": {
+      "source": "./nip27.ts",
       "import": "./lib/esm/nip27.js",
       "require": "./lib/cjs/nip27.js",
       "types": "./lib/types/nip27.d.ts"
     },
     "./nip28": {
+      "source": "./nip28.ts",
       "import": "./lib/esm/nip28.js",
       "require": "./lib/cjs/nip28.js",
       "types": "./lib/types/nip28.d.ts"
     },
     "./nip29": {
+      "source": "./nip29.ts",
       "import": "./lib/esm/nip29.js",
       "require": "./lib/cjs/nip29.js",
       "types": "./lib/types/nip29.d.ts"
     },
     "./nip30": {
+      "source": "./nip30.ts",
       "import": "./lib/esm/nip30.js",
       "require": "./lib/cjs/nip30.js",
       "types": "./lib/types/nip30.d.ts"
     },
     "./nip39": {
+      "source": "./nip39.ts",
       "import": "./lib/esm/nip39.js",
       "require": "./lib/cjs/nip39.js",
       "types": "./lib/types/nip39.d.ts"
     },
     "./nip42": {
+      "source": "./nip42.ts",
       "import": "./lib/esm/nip42.js",
       "require": "./lib/cjs/nip42.js",
       "types": "./lib/types/nip42.d.ts"
     },
     "./nip44": {
+      "source": "./nip44.ts",
       "import": "./lib/esm/nip44.js",
       "require": "./lib/cjs/nip44.js",
       "types": "./lib/types/nip44.d.ts"
     },
     "./nip46": {
+      "source": "./nip46.ts",
       "import": "./lib/esm/nip46.js",
       "require": "./lib/cjs/nip46.js",
       "types": "./lib/types/nip46.d.ts"
     },
     "./nip49": {
+      "source": "./nip49.ts",
       "import": "./lib/esm/nip49.js",
       "require": "./lib/cjs/nip49.js",
       "types": "./lib/types/nip49.d.ts"
     },
     "./nip54": {
+      "source": "./nip54.ts",
       "import": "./lib/esm/nip54.js",
       "require": "./lib/cjs/nip54.js",
       "types": "./lib/types/nip54.d.ts"
     },
     "./nip57": {
+      "source": "./nip57.ts",
       "import": "./lib/esm/nip57.js",
       "require": "./lib/cjs/nip57.js",
       "types": "./lib/types/nip57.d.ts"
     },
     "./nip59": {
+      "source": "./nip59.ts",
       "import": "./lib/esm/nip59.js",
       "require": "./lib/cjs/nip59.js",
       "types": "./lib/types/nip59.d.ts"
     },
     "./nip58": {
+      "source": "./nip58.ts",
       "import": "./lib/esm/nip58.js",
       "require": "./lib/cjs/nip58.js",
       "types": "./lib/types/nip58.d.ts"
     },
     "./nip75": {
+      "source": "./nip75.ts",
       "import": "./lib/esm/nip75.js",
       "require": "./lib/cjs/nip75.js",
       "types": "./lib/types/nip75.d.ts"
     },
     "./nip94": {
+      "source": "./nip94.ts",
       "import": "./lib/esm/nip94.js",
       "require": "./lib/cjs/nip94.js",
       "types": "./lib/types/nip94.d.ts"
     },
     "./nip98": {
+      "source": "./nip98.ts",
       "import": "./lib/esm/nip98.js",
       "require": "./lib/cjs/nip98.js",
       "types": "./lib/types/nip98.d.ts"
     },
     "./nip99": {
+      "source": "./nip99.ts",
       "import": "./lib/esm/nip99.js",
       "require": "./lib/cjs/nip99.js",
       "types": "./lib/types/nip99.d.ts"
     },
     "./nipb7": {
+      "source": "./nipb7.ts",
       "import": "./lib/esm/nipb7.js",
       "require": "./lib/cjs/nipb7.js",
       "types": "./lib/types/nipb7.d.ts"
     },
     "./fakejson": {
+      "source": "./fakejson.ts",
       "import": "./lib/esm/fakejson.js",
       "require": "./lib/cjs/fakejson.js",
       "types": "./lib/types/fakejson.d.ts"
     },
     "./signer": {
+      "source": "./signer.ts",
       "import": "./lib/esm/signer.js",
       "require": "./lib/cjs/signer.js",
       "types": "./lib/types/signer.d.ts"
     },
     "./utils": {
+      "source": "./utils.ts",
       "import": "./lib/esm/utils.js",
       "require": "./lib/cjs/utils.js",
       "types": "./lib/types/utils.d.ts"

utils.ts

@@ -123,62 +123,3 @@ export function mergeReverseSortedLists(list1: NostrEvent[], list2: NostrEvent[]
 
   return result
 }
-
-export class QueueNode<V> {
-  public value: V
-  public next: QueueNode<V> | null = null
-  public prev: QueueNode<V> | null = null
-
-  constructor(message: V) {
-    this.value = message
-  }
-}
-
-export class Queue<V> {
-  public first: QueueNode<V> | null
-  public last: QueueNode<V> | null
-
-  constructor() {
-    this.first = null
-    this.last = null
-  }
-
-  enqueue(value: V): boolean {
-    const newNode = new QueueNode(value)
-    if (!this.last) {
-      // list is empty
-      this.first = newNode
-      this.last = newNode
-    } else if (this.last === this.first) {
-      // list has a single element
-      this.last = newNode
-      this.last.prev = this.first
-      this.first.next = newNode
-    } else {
-      // list has elements, add as last
-      newNode.prev = this.last
-      this.last.next = newNode
-      this.last = newNode
-    }
-    return true
-  }
-
-  dequeue(): V | null {
-    if (!this.first) return null
-
-    if (this.first === this.last) {
-      const target = this.first
-      this.first = null
-      this.last = null
-      return target.value
-    }
-
-    const target = this.first
-    this.first = target.next
-    if (this.first) {
-      this.first.prev = null // fix: clean up prev pointer
-    }
-
-    return target.value
-  }
-}