Avoid infinite loop on failed claim; allow concurrent thunks

packages/app/src/thunk.ts

@@ -117,7 +117,7 @@ export const publishThunk = (request: ThunkRequest) => {
 
 export const thunkWorker = new Worker<Thunk>()
 
-thunkWorker.addGlobalHandler(async (thunk: Thunk) => {
+thunkWorker.addGlobalHandler((thunk: Thunk) => {
   let event = thunk.event
 
   // Handle abort immediately if possible
@@ -128,6 +128,8 @@ thunkWorker.addGlobalHandler(async (thunk: Thunk) => {
     event = event.wrap
   }
 
+  // Avoid making this function async so multiple publishes can run concurrently
+  Promise.resolve().then(async () => {
     // If the event was already signed, leave it alone. Otherwise, sign it now. This is to
     // decrease apparent latency in the UI that results from waiting for remote signers
     if (!isSignedEvent(event)) {
@@ -182,3 +184,4 @@ thunkWorker.addGlobalHandler(async (thunk: Thunk) => {
       }
     })
   })
+})

packages/net/src/Connection.ts

@@ -1,4 +1,5 @@
 import {Emitter, Worker, sleep} from '@welshman/lib'
+import {AUTH_JOIN} from '@welshman/util'
 import {ConnectionMeta} from './ConnectionMeta'
 import {ConnectionAuth, AuthStatus} from './ConnectionAuth'
 import {Socket, isMessage, asMessage} from './Socket'
@@ -43,7 +44,7 @@ export class Connection extends Emitter {
         }
 
         // Allow relay requests through
-        if (verb === 'EVENT' && extra[0].kind === 28934) {
+        if (verb === 'EVENT' && extra[0].kind === AUTH_JOIN) {
           return false
         }
 

packages/net/src/ConnectionAuth.ts

@@ -46,8 +46,6 @@ export class ConnectionAuth {
       const [id, ok, message] = extra
 
       if (id === this.request) {
-        this.challenge = undefined
-        this.request = undefined
         this.message = message
         this.status = ok ? Ok : Forbidden
       }

packages/net/src/ConnectionMeta.ts

@@ -1,3 +1,4 @@
+import {AUTH_JOIN} from '@welshman/util'
 import type {SignedEvent, Filter} from '@welshman/util'
 import type {Message} from './Socket'
 import type {Connection} from './Connection'
@@ -86,20 +87,16 @@ export class ConnectionMeta {
   }
 
   onReceiveOk([verb, eventId, ok, notice]: Message) {
-    // Re-enqueue pending events when auth challenge is received
-    if (notice?.startsWith('auth-required:')) {
     const pub = this.pendingPublishes.get(eventId)
 
-      if (pub) {
+    if (!pub) return
+
+    // Re-enqueue pending events when auth challenge is received
+    if (notice?.startsWith('auth-required:') && pub.event.kind !== AUTH_JOIN) {
       this.cxn.send(['EVENT', pub.event])
-      }
+    } else {
-    }
-
-    const publish = this.pendingPublishes.get(eventId)
-
-    if (publish) {
       this.responseCount++
-      this.responseTimer += Date.now() - publish.sent
+      this.responseTimer += Date.now() - pub.sent
       this.pendingPublishes.delete(eventId)
     }
   }