applesauce-relay 0.0.0-next-20250404075518 → 0.0.0-next-20250404095409

package/dist/group.js

@@ -1,13 +1,18 @@
-import { combineLatest, filter, map, merge } from "rxjs";
-import { onlyEvents } from "./operators/only-events.js";
+import { catchError, combineLatest, EMPTY, filter, map, merge, of } from "rxjs";
 import { nanoid } from "nanoid";
+import { onlyEvents } from "./operators/only-events.js";
 export class RelayGroup {
     relays;
     constructor(relays) {
         this.relays = relays;
     }
-    req(filters, id = nanoid()) {
-        const requests = this.relays.reduce((acc, r) => ({ ...acc, [r.url]: r.req(filters, id) }), {});
+    req(filters, id = nanoid(8)) {
+        const requests = this.relays.reduce((acc, relay) => ({
+            ...acc,
+            [relay.url]: relay.req(filters, id).pipe(
+            // Ignore connection errors
+            catchError(() => EMPTY)),
+        }), {});
         // Create stream of events only
         const events = merge(...Object.values(requests)).pipe(onlyEvents());
         // Create stream that emits EOSE when all relays have sent EOSE
@@ -18,6 +23,8 @@ export class RelayGroup {
         return merge(events, eose);
     }
     event(event) {
-        return merge(...this.relays.map((r) => r.event(event)));
+        return merge(...this.relays.map((relay) => relay.event(event).pipe(
+        // Catch error and return as PublishResponse
+        catchError((err) => of({ ok: false, from: relay.url, message: err?.message || "Unknown error" })))));
     }
 }

package/dist/relay.d.ts

@@ -30,9 +30,11 @@ export declare class Relay implements IRelay {
     constructor(url: string, opts?: RelayOptions);
     protected waitForAuth<T extends unknown = unknown>(requireAuth: BehaviorSubject<boolean>, observable: Observable<T>): Observable<T>;
     multiplex<T>(open: () => any, close: () => any, filter: (message: any) => boolean): Observable<T>;
+    /** Send a message to the relay */
     next(message: any): void;
+    /** Create a REQ observable that emits events | "EOSE" or errors */
     req(filters: Filter | Filter[], id?: string): Observable<SubscriptionResponse>;
-    /** send an Event message */
+    /** send an Event message and always return an observable of PublishResponse that completes or errors */
     event(event: NostrEvent, verb?: "EVENT" | "AUTH"): Observable<PublishResponse>;
     /** send and AUTH message */
     auth(event: NostrEvent): Observable<{

package/dist/relay.js

@@ -1,4 +1,4 @@
-import { BehaviorSubject, combineLatest, filter, ignoreElements, map, merge, NEVER, of, scan, share, switchMap, take, takeWhile, tap, timeout, } from "rxjs";
+import { BehaviorSubject, combineLatest, defer, filter, ignoreElements, map, merge, NEVER, of, scan, share, switchMap, take, takeWhile, tap, timeout, } from "rxjs";
 import { webSocket } from "rxjs/webSocket";
 import { nanoid } from "nanoid";
 import { logger } from "applesauce-core";
@@ -97,7 +97,7 @@ export class Relay {
         share());
     }
     waitForAuth(
-    // require BehaviorSubject so it always has a value
+    // NOTE: require BehaviorSubject so it always has a value
     requireAuth, observable) {
         return combineLatest([requireAuth, this.authenticated$]).pipe(
         // wait for auth not required or authenticated
@@ -110,9 +110,11 @@ export class Relay {
     multiplex(open, close, filter) {
         return this.socket.multiplex(open, close, filter);
     }
+    /** Send a message to the relay */
     next(message) {
         this.socket.next(message);
     }
+    /** Create a REQ observable that emits events | "EOSE" or errors */
     req(filters, id = nanoid()) {
         const request = this.socket
             .multiplex(() => (Array.isArray(filters) ? ["REQ", id, ...filters] : ["REQ", id, filters]), () => ["CLOSE", id], (message) => (message[0] === "EVENT" || message[0] === "CLOSE" || message[0] === "EOSE") && message[1] === id)
@@ -144,22 +146,24 @@ export class Relay {
         // Wait for auth if required and make sure to start the watch tower
         return this.waitForAuth(this.authRequiredForReq, merge(this.watchTower, request));
     }
-    /** send an Event message */
+    /** send an Event message and always return an observable of PublishResponse that completes or errors */
     event(event, verb = "EVENT") {
-        const base = this.socket
-            .multiplex(() => [verb, event], () => void 0, (m) => m[0] === "OK" && m[1] === event.id)
-            .pipe(
-        // format OK message
-        map((m) => ({ ok: m[2], message: m[3], from: this.url })));
+        const base = defer(() => {
+            // Send event when subscription starts
+            this.socket.next([verb, event]);
+            return this.socket.pipe(filter((m) => m[0] === "OK" && m[1] === event.id), 
+            // format OK message
+            map((m) => ({ ok: m[2], message: m[3], from: this.url })));
+        });
         // Start the watch tower with the observable
         const withWatchTower = merge(this.watchTower, base);
-        // A complete operators
+        // Add complete operators
         const observable = withWatchTower.pipe(
         // complete on first value
         take(1), 
         // listen for OK auth-required
         tap(({ ok, message }) => {
-            if (ok === false && message.startsWith("auth-required") && !this.authRequiredForPublish.value) {
+            if (ok === false && message?.startsWith("auth-required") && !this.authRequiredForPublish.value) {
                 this.log("Auth required for publish");
                 this.authRequiredForPublish.next(true);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "0.0.0-next-20250404075518",
+  "version": "0.0.0-next-20250404095409",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "0.0.0-next-20250404075518",
+    "applesauce-core": "0.0.0-next-20250404095409",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"