applesauce-relay 4.4.0 → 4.4.2

package/dist/group.js

@@ -124,9 +124,7 @@ export class RelayGroup {
                 upstream.set(relay, observable);
             }
             return merge(...observables);
-        }), 
-        // Ensure a single upstream
-        share());
+        }));
     }
     /**
      * Make a request to all relays
@@ -137,7 +135,9 @@ export class RelayGroup {
     }
     /** Send an event to all relays */
     event(event) {
-        return this.internalPublish((relay) => relay.event(event));
+        return this.internalPublish((relay) => relay.event(event)).pipe(
+        // Ensure a single upstream subscription
+        share());
     }
     /** Negentropy sync events with the relays and an event store */
     async negentropy(store, filter, reconcile, opts) {

package/dist/relay.js

@@ -166,8 +166,15 @@ export class Relay {
         this.limitations$ = this.information$.pipe(map((info) => (info ? info.limitation : null)));
         this.supported$ = this.information$.pipe(map((info) => info && Array.isArray(info.supported_nips) ? info.supported_nips.filter((n) => typeof n === "number") : null));
         // Create observables that track if auth is required for REQ or EVENT
-        this.authRequiredForRead$ = this.receivedAuthRequiredForReq.pipe(tap((required) => required && this.log("Auth required for REQ")), shareReplay(1));
-        this.authRequiredForPublish$ = this.receivedAuthRequiredForEvent.pipe(tap((required) => required && this.log("Auth required for EVENT")), shareReplay(1));
+        this.authRequiredForRead$ = this.receivedAuthRequiredForReq;
+        this.authRequiredForPublish$ = this.receivedAuthRequiredForEvent;
+        // Log when auth is required
+        this.authRequiredForRead$
+            .pipe(filter((r) => r === true), take(1))
+            .subscribe(() => this.log("Auth required for REQ"));
+        this.authRequiredForPublish$
+            .pipe(filter((r) => r === true), take(1))
+            .subscribe(() => this.log("Auth required for EVENT"));
         // Update the notices state
         const listenForNotice = this.socket.pipe(
         // listen for NOTICE messages
@@ -320,9 +327,7 @@ export class Relay {
     /** Create a COUNT observable that emits a single count response */
     count(filters, id = nanoid()) {
         // Create an observable that filters responses from the relay to just the ones for this COUNT
-        const messages = this.socket.pipe(filter((m) => Array.isArray(m) && (m[0] === "COUNT" || m[0] === "CLOSED") && m[1] === id), 
-        // Singleton (prevents duplicate subscriptions)
-        share());
+        const messages = this.socket.pipe(filter((m) => Array.isArray(m) && (m[0] === "COUNT" || m[0] === "CLOSED") && m[1] === id));
         // Send the COUNT message and listen for response
         const observable = defer(() => {
             // Send the COUNT message when subscription starts
@@ -343,11 +348,10 @@ export class Relay {
         timeout({
             first: this.eoseTimeout,
             with: () => throwError(() => new Error("COUNT timeout")),
-        }), 
-        // Only create one upstream subscription
-        share());
+        }));
         // Start the watch tower and wait for auth if required
-        return this.waitForReady(this.waitForAuth(this.authRequiredForRead$, observable));
+        // Use share() to prevent multiple subscriptions from creating duplicate COUNT messages
+        return this.waitForReady(this.waitForAuth(this.authRequiredForRead$, observable)).pipe(share());
     }
     /** Send an EVENT or AUTH message and return an observable of PublishResponse that completes or errors */
     event(event, verb = "EVENT") {
@@ -378,14 +382,13 @@ 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
+        // Use share() to prevent multiple subscriptions from creating duplicate EVENT messages
         if (verb === "AUTH")
-            return this.waitForReady(observable);
+            return this.waitForReady(observable).pipe(share());
         else
-            return this.waitForReady(this.waitForAuth(this.authRequiredForPublish$, observable));
+            return this.waitForReady(this.waitForAuth(this.authRequiredForPublish$, observable)).pipe(share());
     }
     /** send and AUTH message */
     auth(event) {
@@ -492,9 +495,7 @@ export class Relay {
         // Retry the publish until it succeeds or the number of retries is reached
         this.customRetryOperator(opts?.retries ?? opts?.reconnect ?? true, DEFAULT_RETRY_CONFIG), 
         // Add timeout for publishing
-        this.customTimeoutOperator(opts?.timeout, this.publishTimeout), 
-        // Single subscription
-        share()));
+        this.customTimeoutOperator(opts?.timeout, this.publishTimeout)));
     }
     /** Negentropy sync events with the relay and an event store */
     sync(store, filter, direction = SyncDirection.RECEIVE) {

package/package.json

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