applesauce-relay 6.0.2 → 6.0.3

package/dist/pool.d.ts

@@ -4,15 +4,18 @@ import { FilterMap, OutboxMap } from "applesauce-core/helpers/relay-selection";
 import { BehaviorSubject, Observable, Subject } from "rxjs";
 import { RelayGroup } from "./group.js";
 import type { NegentropySyncOptions, ReconcileFunction } from "./negentropy.js";
-import { Relay, SyncDirection, type RelayOptions } from "./relay.js";
-import type { RelayCountResponse, FilterInput, GroupReqOptions, GroupReqMessage, PoolRelayInput, NegentropyReadStore, NegentropySyncStore, PublishResponse, RelayStatus } from "./types.js";
+import { Relay, type RelayOptions, SyncDirection } from "./relay.js";
+import type { FilterInput, GroupReqMessage, GroupReqOptions, NegentropyReadStore, NegentropySyncStore, PoolRelayInput, PublishResponse, RelayCountResponse, RelayStatus } from "./types.js";
 export declare class RelayPool {
     options?: RelayOptions | undefined;
     relays$: BehaviorSubject<Map<string, Relay>>;
     get relays(): Map<string, Relay>;
     /** Observable of relay status for all relays in the pool */
     status$: Observable<Record<string, RelayStatus>>;
-    /** Whether to ignore relays that are ready=false */
+    /**
+     * Whether to ignore relays that are ready=false
+     * @deprecated use {@link ignoreUnhealthyRelays} in group() or request() input
+     */
     ignoreOffline: boolean;
     /** A signal when a relay is added */
     add$: Subject<Relay>;

package/dist/pool.js

@@ -1,7 +1,7 @@
 import { isFilterEqual } from "applesauce-core/helpers/filter";
 import { createFilterMap } from "applesauce-core/helpers/relay-selection";
 import { normalizeURL } from "applesauce-core/helpers/url";
-import { BehaviorSubject, distinctUntilChanged, isObservable, map, merge, of, scan, shareReplay, startWith, Subject, switchMap, } from "rxjs";
+import { BehaviorSubject, combineLatest, distinctUntilChanged, filter, isObservable, map, merge, of, scan, shareReplay, startWith, Subject, switchMap, take, } from "rxjs";
 import { RelayGroup } from "./group.js";
 import { Relay } from "./relay.js";
 export class RelayPool {
@@ -12,8 +12,11 @@ export class RelayPool {
     }
     /** Observable of relay status for all relays in the pool */
     status$;
-    /** Whether to ignore relays that are ready=false */
-    ignoreOffline = true;
+    /**
+     * Whether to ignore relays that are ready=false
+     * @deprecated use {@link ignoreUnhealthyRelays} in group() or request() input
+     */
+    ignoreOffline = false;
     /** A signal when a relay is added */
     add$ = new Subject();
     /** A signal when a relay is removed */
@@ -55,11 +58,17 @@ export class RelayPool {
             ? relays.map((url) => this.relay(url))
             : relays.pipe(map((urls) => urls.map((url) => this.relay(url))));
         if (ignoreOffline) {
-            // Filter out the offline relays
-            if (Array.isArray(input))
-                input = input.filter((relay) => relay.ready);
-            else
-                input = input.pipe(map((relays) => relays.filter((relay) => relay.ready)));
+            // Convert input to an observable so it can react to relays becoming ready.
+            // Each relay is included once `ready$` first emits true, and stays included
+            // afterwards (subsequent ready=false changes are ignored since the request
+            // or subscription will have already started).
+            const input$ = Array.isArray(input) ? of(input) : input;
+            input = input$.pipe(switchMap((relays) => {
+                if (relays.length === 0)
+                    return of([]);
+                const signals = relays.map((relay) => relay.ready$.pipe(filter((ready) => ready), take(1), map(() => relay), startWith(null)));
+                return combineLatest(signals).pipe(map((arr) => arr.filter((r) => r !== null)));
+            }));
         }
         return new RelayGroup(input);
     }
@@ -84,17 +93,15 @@ export class RelayPool {
     }
     /** Make a REQ to multiple relays that does not deduplicate events */
     req(relays, filters, opts) {
-        // Never filter out offline relays in manual methods
-        return this.group(relays, false).req(filters, opts);
+        return this.group(relays).req(filters, opts);
     }
     /** Send an EVENT message to multiple relays */
     event(relays, event) {
-        // Never filter out offline relays in manual methods
-        return this.group(relays, false).event(event);
+        return this.group(relays).event(event);
     }
     /** Negentropy sync event ids with the relays and an event store */
     negentropy(relays, store, filter, reconcile, opts) {
-        return this.group(relays, false).negentropy(store, filter, reconcile, opts);
+        return this.group(relays).negentropy(store, filter, reconcile, opts);
     }
     /** Publish an event to multiple relays */
     publish(relays, event, opts) {
@@ -134,10 +141,12 @@ export class RelayPool {
     }
     /** Count events on multiple relays */
     count(relays, filters, id) {
-        return this.group(relays).count(filters, id);
+        // Never filter out offline relays in manual methods
+        return this.group(relays, false).count(filters, id);
     }
     /** Negentropy sync events with the relays and an event store */
     sync(relays, store, filter, direction) {
-        return this.group(relays).sync(store, filter, direction);
+        // Never filter out offline relays in manual methods
+        return this.group(relays, false).sync(store, filter, direction);
     }
 }

package/package.json

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