applesauce-relay 0.0.0-next-20250916134023 → 0.0.0-next-20250918142212

package/dist/group.d.ts

@@ -1,12 +1,12 @@
 import { type NostrEvent } from "nostr-tools";
 import { Observable } from "rxjs";
-import { IEventStoreActions } from "applesauce-core";
+import { IAsyncEventStoreActions, IEventStoreActions } from "applesauce-core";
 import { FilterInput, IGroup, IRelay, PublishOptions, PublishResponse, RequestOptions, SubscriptionOptions, SubscriptionResponse } from "./types.js";
 export declare class RelayGroup implements IGroup {
     relays: IRelay[];
     constructor(relays: IRelay[]);
     /** Takes an array of observables and only emits EOSE when all observables have emitted EOSE */
-    protected mergeEOSE(requests: Observable<SubscriptionResponse>[], eventStore?: IEventStoreActions): Observable<import("nostr-tools").Event | "EOSE">;
+    protected mergeEOSE(requests: Observable<SubscriptionResponse>[], eventStore?: IEventStoreActions | IAsyncEventStoreActions): Observable<import("nostr-tools").Event | "EOSE">;
     /**
      * Make a request to all relays
      * @note This does not deduplicate events

package/dist/pool.d.ts

@@ -1,5 +1,5 @@
 import { type NostrEvent } from "nostr-tools";
-import { BehaviorSubject, Observable } from "rxjs";
+import { BehaviorSubject, Observable, Subject } from "rxjs";
 import { RelayGroup } from "./group.js";
 import { Relay, RelayOptions } from "./relay.js";
 import { FilterInput, IPool, IRelay, PublishResponse, SubscriptionResponse } from "./types.js";
@@ -9,6 +9,10 @@ export declare class RelayPool implements IPool {
     get groups(): Map<string, RelayGroup>;
     relays$: BehaviorSubject<Map<string, Relay>>;
     get relays(): Map<string, Relay>;
+    /** A signal when a relay is added */
+    add$: Subject<IRelay>;
+    /** A signal when a relay is removed */
+    remove$: Subject<IRelay>;
     /** An array of relays to never connect to */
     blacklist: Set<string>;
     constructor(options?: RelayOptions | undefined);

package/dist/pool.js

@@ -1,4 +1,4 @@
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, Subject } from "rxjs";
 import { normalizeURL } from "applesauce-core/helpers";
 import { RelayGroup } from "./group.js";
 import { Relay } from "./relay.js";
@@ -12,10 +12,27 @@ export class RelayPool {
     get relays() {
         return this.relays$.value;
     }
+    /** A signal when a relay is added */
+    add$ = new Subject();
+    /** A signal when a relay is removed */
+    remove$ = new Subject();
     /** An array of relays to never connect to */
     blacklist = new Set();
     constructor(options) {
         this.options = options;
+        // Listen for relays being added and removed to emit connect / disconnect signals
+        // const listeners = new Map<IRelay, Subscription>();
+        // this.add$.subscribe((relay) =>
+        //   listeners.set(
+        //     relay,
+        //     relay.connected$.subscribe((conn) => (conn ? this.connect$.next(relay) : this.disconnect$.next(relay))),
+        //   ),
+        // );
+        // this.remove$.subscribe((relay) => {
+        //   const listener = listeners.get(relay);
+        //   if (listener) listener.unsubscribe();
+        //   listeners.delete(relay);
+        // });
     }
     filterBlacklist(urls) {
         return urls.filter((url) => !this.blacklist.has(url));
@@ -35,6 +52,7 @@ export class RelayPool {
         relay = new Relay(url, this.options);
         this.relays.set(url, relay);
         this.relays$.next(this.relays);
+        this.add$.next(relay);
         return relay;
     }
     /** Create a group of relays */
@@ -68,6 +86,7 @@ export class RelayPool {
             instance?.close();
         this.relays.delete(instance.url);
         this.relays$.next(this.relays);
+        this.remove$.next(instance);
     }
     /** Make a REQ to multiple relays that does not deduplicate events */
     req(relays, filters, id) {

package/dist/relay.d.ts

@@ -14,6 +14,8 @@ export type RelayOptions = {
     eoseTimeout?: number;
     /** How long to wait for an OK message from the relay (default 10s) */
     eventTimeout?: number;
+    /** How long to wait for a publish to complete (default 30s) */
+    publishTimeout?: number;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive?: number;
 };
@@ -70,6 +72,8 @@ export declare class Relay implements IRelay {
     eoseTimeout: number;
     /** How long to wait for an OK message from the relay (default 10s) */
     eventTimeout: number;
+    /** How long to wait for a publish to complete (default 30s) */
+    publishTimeout: number;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive: number;
     protected receivedAuthRequiredForReq: BehaviorSubject<boolean>;
@@ -101,6 +105,8 @@ export declare class Relay implements IRelay {
     protected customRetryOperator<T extends unknown = unknown>(times: undefined | boolean | number | RetryConfig, base?: RetryConfig): MonoTypeOperatorFunction<T>;
     /** Internal operator for creating the repeat() operator */
     protected customRepeatOperator<T extends unknown = unknown>(times: undefined | boolean | number | RepeatConfig | undefined): MonoTypeOperatorFunction<T>;
+    /** Internal operator for creating the timeout() operator */
+    protected customTimeoutOperator<T extends unknown = unknown>(timeout: undefined | boolean | number, defaultTimeout: number): MonoTypeOperatorFunction<T>;
     /** Creates a REQ that retries when relay errors ( default 3 retries ) */
     subscription(filters: Filter | Filter[], opts?: SubscriptionOptions): Observable<SubscriptionResponse>;
     /** Makes a single request that retires on errors and completes on EOSE */

package/dist/relay.js

@@ -77,6 +77,8 @@ export class Relay {
     eoseTimeout = 10_000;
     /** How long to wait for an OK message from the relay (default 10s) */
     eventTimeout = 10_000;
+    /** How long to wait for a publish to complete (default 30s) */
+    publishTimeout = 30_000;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive = 30_000;
     // Subjects that track if an "auth-required" message has been received for REQ or EVENT
@@ -108,6 +110,8 @@ export class Relay {
             this.eoseTimeout = opts.eoseTimeout;
         if (opts?.eventTimeout !== undefined)
             this.eventTimeout = opts.eventTimeout;
+        if (opts?.publishTimeout !== undefined)
+            this.publishTimeout = opts.publishTimeout;
         if (opts?.keepAlive !== undefined)
             this.keepAlive = opts.keepAlive;
         // Create an observable that tracks boolean authentication state
@@ -378,6 +382,18 @@ export class Relay {
         else
             return repeat(times);
     }
+    /** Internal operator for creating the timeout() operator */
+    customTimeoutOperator(timeout, defaultTimeout) {
+        // Do nothing if disabled
+        if (timeout === false)
+            return identity;
+        // If true default to 30 seconds
+        else if (timeout === true)
+            return simpleTimeout(defaultTimeout);
+        // Otherwise use the timeout value or default to 30 seconds
+        else
+            return simpleTimeout(timeout ?? defaultTimeout);
+    }
     /** Creates a REQ that retries when relay errors ( default 3 retries ) */
     subscription(filters, opts) {
         return this.req(filters, opts?.id).pipe(
@@ -410,6 +426,8 @@ 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()));
     }

package/dist/types.d.ts

@@ -21,6 +21,8 @@ export type PublishOptions = {
      * @see https://rxjs.dev/api/index/function/retry
      */
     reconnect?: boolean | number | Parameters<typeof retry>[0];
+    /** Timeout for publish in milliseconds (default 30 seconds) */
+    timeout?: number | boolean;
 };
 /** Options for the request method on the pool and relay */
 export type RequestOptions = SubscriptionOptions;
@@ -58,6 +60,7 @@ export interface IRelay extends MultiplexWebSocket {
     challenge$: Observable<string | null>;
     authenticated$: Observable<boolean>;
     notices$: Observable<string[]>;
+    error$: Observable<Error | null>;
     readonly connected: boolean;
     readonly authenticated: boolean;
     readonly challenge: string | null;
@@ -91,7 +94,12 @@ export interface IGroup {
     /** Open a subscription with retries */
     subscription(filters: FilterInput, opts?: SubscriptionOptions): Observable<SubscriptionResponse>;
 }
-export interface IPool {
+/** Signals emitted by the pool */
+export interface IPoolSignals {
+    add$: Observable<IRelay>;
+    remove$: Observable<IRelay>;
+}
+export interface IPool extends IPoolSignals {
     /** Get or create a relay */
     relay(url: string): IRelay;
     /** Create a relay group */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "0.0.0-next-20250916134023",
+  "version": "0.0.0-next-20250918142212",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -52,14 +52,14 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "0.0.0-next-20250916134023",
+    "applesauce-core": "0.0.0-next-20250918142212",
     "nanoid": "^5.0.9",
     "nostr-tools": "~2.15",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
-    "applesauce-signers": "0.0.0-next-20250916134023",
+    "applesauce-signers": "0.0.0-next-20250918142212",
     "typescript": "^5.7.3",
     "vitest": "^3.2.4",
     "vitest-websocket-mock": "^0.5.0"