applesauce-relay 0.0.0-next-20250430195017 → 0.0.0-next-20250430200159

package/dist/__tests__/relay.test.js

@@ -115,6 +115,14 @@ describe("req", () => {
         // Verify the subscription completed
         expect(spy.receivedError()).toBe(true);
     });
+    it("should not send multiple REQ messages for multiple subscriptions", async () => {
+        const sub = relay.req([{ kinds: [1] }], "sub1");
+        sub.subscribe();
+        sub.subscribe();
+        // Wait for all messages to be sent
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        expect(server.messages).toEqual([["REQ", "sub1", { kinds: [1] }]]);
+    });
     it("should wait for authentication if relay responds with auth-required", async () => {
         // First subscription to trigger auth-required
         const firstSub = subscribeSpyTo(relay.req([{ kinds: [1] }], "sub1"), { expectErrors: true });

package/dist/relay.js

@@ -191,7 +191,9 @@ export class Relay {
             .subscribe(() => this.ready$.next(true));
     }
     /** Wait for ready and authenticated */
-    waitForAuth(requireAuth, observable) {
+    waitForAuth(
+    // NOTE: require BehaviorSubject so it always has a value
+    requireAuth, observable) {
         return combineLatest([requireAuth, this.authenticated$]).pipe(
         // wait for auth not required or authenticated
         filter(([required, authenticated]) => !required || authenticated), 
@@ -202,7 +204,7 @@ export class Relay {
     }
     /** Wait for the relay to be ready to accept connections */
     waitForReady(observable) {
-        // If the relay is ready, don't wait
+        // Don't wait if the relay is already ready
         if (this.ready$.value)
             return observable;
         else
@@ -253,7 +255,9 @@ export class Relay {
         timeout({
             first: this.eoseTimeout,
             with: () => merge(of("EOSE"), NEVER),
-        }));
+        }), 
+        // Only create one upstream subscription
+        share());
         // Wait for auth if required and make sure to start the watch tower
         return this.waitForReady(this.waitForAuth(this.authRequiredForReq, observable));
     }
@@ -283,7 +287,9 @@ export class Relay {
         timeout({
             first: this.eventTimeout,
             with: () => of({ ok: false, from: this.url, message: "Timeout" }),
-        }));
+        }), 
+        // Only create one upstream subscription
+        share());
         // skip wait for auth if verb is AUTH
         if (verb === "AUTH")
             return this.waitForReady(observable);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "0.0.0-next-20250430195017",
+  "version": "0.0.0-next-20250430200159",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",