Improve socket auth, outbox loading, some other things

2025-06-19 12:51:05 -07:00
parent 1940deea20
commit 24acae704d
6 changed files with 46 additions and 20 deletions
@@ -114,19 +114,21 @@ export class AuthState extends EventEmitter {
  async attemptAuth(sign: (event: StampedEvent) => Promise<SignedEvent>) {
    this.socket.attemptToOpen()

-    await poll({
-      signal: AbortSignal.timeout(800),
-      condition: () => this.status === AuthStatus.Requested,
-    })
+    if (![AuthStatus.Forbidden, AuthStatus.Ok].includes(this.status)) {
+      await poll({
+        signal: AbortSignal.timeout(800),
+        condition: () => this.status === AuthStatus.Requested,
+      })

-    if (this.status === AuthStatus.Requested) {
-      await this.doAuth(sign)
+      if (this.status === AuthStatus.Requested) {
+        await this.doAuth(sign)
+      }
+
+      await poll({
+        signal: AbortSignal.timeout(800),
+        condition: () => this.status !== AuthStatus.PendingResponse,
+      })
    }
-
-    await poll({
-      signal: AbortSignal.timeout(800),
-      condition: () => this.status !== AuthStatus.PendingResponse,
-    })
  }

  cleanup() {