applesauce-relay 4.2.0 → 4.4.2

package/dist/group.d.ts

@@ -1,6 +1,7 @@
-import { Filter, type NostrEvent } from "nostr-tools";
+import { type NostrEvent } from "nostr-tools";
 import { BehaviorSubject, MonoTypeOperatorFunction, Observable } from "rxjs";
 import { IAsyncEventStoreActions, IAsyncEventStoreRead, IEventStoreActions, IEventStoreRead } from "applesauce-core";
+import { type FilterWithAnd } from "applesauce-core/helpers";
 import { NegentropySyncOptions, type ReconcileFunction } from "./negentropy.js";
 import { SyncDirection } from "./relay.js";
 import { CountResponse, FilterInput, IGroup, IGroupRelayInput, IRelay, PublishOptions, PublishResponse, RequestOptions, SubscriptionOptions, SubscriptionResponse } from "./types.js";
@@ -46,7 +47,7 @@ export declare class RelayGroup implements IGroup {
     /** Send an event to all relays */
     event(event: NostrEvent): Observable<PublishResponse>;
     /** Negentropy sync events with the relays and an event store */
-    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
+    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
     /** Publish an event to all relays with retries ( default 3 retries ) */
     publish(event: NostrEvent, opts?: PublishOptions): Promise<PublishResponse[]>;
     /** Request events from all relays and complete on EOSE */
@@ -54,7 +55,7 @@ export declare class RelayGroup implements IGroup {
     /** Open a subscription to all relays with retries ( default 3 retries ) */
     subscription(filters: FilterInput, opts?: GroupSubscriptionOptions): Observable<SubscriptionResponse>;
     /** Count events on all relays in the group */
-    count(filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
+    count(filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relays and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
 }

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/negentropy.d.ts

@@ -1,7 +1,7 @@
 import { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
-import { Filter } from "nostr-tools";
-import { MultiplexWebSocket } from "./types.js";
+import { type FilterWithAnd } from "applesauce-core/helpers";
 import { NegentropyStorageVector } from "./lib/negentropy.js";
+import { MultiplexWebSocket } from "./types.js";
 /**
  * A function that reconciles the storage vectors with a remote relay
  * @param have - The ids that the local storage has
@@ -15,7 +15,7 @@ export type NegentropySyncOptions = {
     signal?: AbortSignal;
 };
 /** Creates a NegentropyStorageVector from an event store and filter */
-export declare function buildStorageFromFilter(store: IEventStoreRead | IAsyncEventStoreRead, filter: Filter): Promise<NegentropyStorageVector>;
+export declare function buildStorageFromFilter(store: IEventStoreRead | IAsyncEventStoreRead, filter: FilterWithAnd): Promise<NegentropyStorageVector>;
 /** Creates a NegentropyStorageVector from an array of items */
 export declare function buildStorageVector(items: {
     id: string;
@@ -28,4 +28,4 @@ export declare function buildStorageVector(items: {
  */
 export declare function negentropySync(storage: NegentropyStorageVector, socket: MultiplexWebSocket & {
     next: (msg: any) => void;
-}, filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+}, filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;

package/dist/negentropy.js

@@ -1,6 +1,6 @@
 import { logger } from "applesauce-core";
-import { map, share, firstValueFrom, race, Observable } from "rxjs";
 import { nanoid } from "nanoid";
+import { firstValueFrom, map, Observable, race, share } from "rxjs";
 import { Negentropy, NegentropyStorageVector } from "./lib/negentropy.js";
 const log = logger.extend("negentropy");
 /** Creates a NegentropyStorageVector from an event store and filter */

package/dist/pool.d.ts

@@ -1,5 +1,5 @@
 import type { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
-import { FilterMap, OutboxMap } from "applesauce-core/helpers";
+import { FilterMap, OutboxMap, type FilterWithAnd } from "applesauce-core/helpers";
 import { Filter, type NostrEvent } from "nostr-tools";
 import { BehaviorSubject, Observable, Subject } from "rxjs";
 import { RelayGroup } from "./group.js";
@@ -26,7 +26,7 @@ export declare class RelayPool implements IPool {
     /** Send an EVENT message to multiple relays */
     event(relays: IPoolRelayInput, event: NostrEvent): Observable<PublishResponse>;
     /** Negentropy sync event ids with the relays and an event store */
-    negentropy(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Publish an event to multiple relays */
     publish(relays: IPoolRelayInput, event: Parameters<RelayGroup["publish"]>[0], opts?: Parameters<RelayGroup["publish"]>[1]): Promise<PublishResponse[]>;
     /** Request events from multiple relays */
@@ -38,7 +38,7 @@ export declare class RelayPool implements IPool {
     /** Open a subscription for an {@link OutboxMap} and filter */
     outboxSubscription(outboxes: OutboxMap | Observable<OutboxMap>, filter: Omit<Filter, "authors">, options?: Parameters<RelayGroup["subscription"]>[1]): Observable<SubscriptionResponse>;
     /** Count events on multiple relays */
-    count(relays: IPoolRelayInput, filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
+    count(relays: IPoolRelayInput, filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relays and an event store */
-    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
 }

package/dist/pool.js

@@ -1,4 +1,4 @@
-import { createFilterMap, isFilterEqual, normalizeURL } from "applesauce-core/helpers";
+import { createFilterMap, isFilterEqual, normalizeURL, } from "applesauce-core/helpers";
 import { BehaviorSubject, distinctUntilChanged, isObservable, map, of, Subject } from "rxjs";
 import { RelayGroup } from "./group.js";
 import { Relay } from "./relay.js";

package/dist/relay.d.ts

@@ -1,5 +1,6 @@
 import { IAsyncEventStoreRead, IEventStoreRead, logger } from "applesauce-core";
-import { type Filter, type NostrEvent } from "nostr-tools";
+import { type FilterWithAnd } from "applesauce-core/helpers";
+import { type NostrEvent } from "nostr-tools";
 import { RelayInformation } from "nostr-tools/nip11";
 import { BehaviorSubject, MonoTypeOperatorFunction, Observable, RepeatConfig, RetryConfig, Subject } from "rxjs";
 import { WebSocketSubject, WebSocketSubjectConfig } from "rxjs/webSocket";
@@ -105,13 +106,13 @@ export declare class Relay implements IRelay {
     /** Create a REQ observable that emits events or "EOSE" or errors */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Create a COUNT observable that emits a single count response */
-    count(filters: Filter | Filter[], id?: string): Observable<CountResponse>;
+    count(filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<CountResponse>;
     /** Send an EVENT or AUTH message and return an observable of PublishResponse that completes or errors */
     event(event: NostrEvent, verb?: "EVENT" | "AUTH"): Observable<PublishResponse>;
     /** send and AUTH message */
     auth(event: NostrEvent): Promise<PublishResponse>;
     /** Negentropy sync event ids with the relay and an event store */
-    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Authenticate with the relay using a signer */
     authenticate(signer: AuthSigner): Promise<PublishResponse>;
     /** Internal operator for creating the retry() operator */
@@ -129,7 +130,7 @@ export declare class Relay implements IRelay {
     /** Publishes an event to the relay and retries when relay errors or responds with auth-required ( default 3 retries ) */
     publish(event: NostrEvent, opts?: PublishOptions): Promise<PublishResponse>;
     /** Negentropy sync events with the relay and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
     /** Force close the connection */
     close(): void;
     /** An async method that returns the NIP-11 information document for the relay */

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/dist/types.d.ts

@@ -1,11 +1,12 @@
-import type { EventTemplate, Filter, NostrEvent } from "nostr-tools";
+import type { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
+import type { FilterWithAnd } from "applesauce-core/helpers";
+import type { EventTemplate, NostrEvent } from "nostr-tools";
 import type { RelayInformation } from "nostr-tools/nip11";
 import type { Observable, repeat, retry } from "rxjs";
 import type { WebSocketSubject } from "rxjs/webSocket";
+import type { GroupNegentropySyncOptions, GroupRequestOptions, GroupSubscriptionOptions } from "./group.js";
 import type { NegentropySyncOptions, ReconcileFunction } from "./negentropy.js";
-import type { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
 import type { SyncDirection } from "./relay.js";
-import type { GroupNegentropySyncOptions, GroupRequestOptions, GroupSubscriptionOptions } from "./group.js";
 export type SubscriptionResponse = NostrEvent | "EOSE";
 export type PublishResponse = {
     ok: boolean;
@@ -59,7 +60,7 @@ export type AuthSigner = {
     signEvent: (event: EventTemplate) => NostrEvent | Promise<NostrEvent>;
 };
 /** Filters that can be passed to request methods on the pool or relay */
-export type FilterInput = Filter | Filter[] | Observable<Filter | Filter[]> | ((relay: IRelay) => Filter | Filter[] | Observable<Filter | Filter[]>);
+export type FilterInput = FilterWithAnd | FilterWithAnd[] | Observable<FilterWithAnd | FilterWithAnd[]> | ((relay: IRelay) => FilterWithAnd | FilterWithAnd[] | Observable<FilterWithAnd | FilterWithAnd[]>);
 export interface IRelay extends MultiplexWebSocket {
     url: string;
     message$: Observable<any>;
@@ -81,13 +82,13 @@ export interface IRelay extends MultiplexWebSocket {
     /** Send a REQ message */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send a COUNT message */
-    count(filters: Filter | Filter[], id?: string): Observable<CountResponse>;
+    count(filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<CountResponse>;
     /** Send an EVENT message */
     event(event: NostrEvent): Observable<PublishResponse>;
     /** Send an AUTH message */
     auth(event: NostrEvent): Promise<PublishResponse>;
     /** Negentropy sync event ids with the relay and an event store */
-    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Authenticate with the relay using a signer */
     authenticate(signer: AuthSigner): Promise<PublishResponse>;
     /** Send an EVENT message with retries */
@@ -97,7 +98,7 @@ export interface IRelay extends MultiplexWebSocket {
     /** Open a subscription with retries */
     subscription(filters: FilterInput, opts?: SubscriptionOptions): Observable<SubscriptionResponse>;
     /** Negentropy sync events with the relay and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
     /** Get the NIP-11 information document for the relay */
     getInformation(): Promise<RelayInformation | null>;
     /** Get the limitations for the relay */
@@ -112,7 +113,7 @@ export interface IGroup {
     /** Send an EVENT message */
     event(event: Parameters<IRelay["event"]>[0]): Observable<PublishResponse>;
     /** Negentropy sync event ids with the relays and an event store */
-    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Add a relay to the group */
     add(relay: IRelay): void;
     /** Remove a relay from the group */
@@ -126,9 +127,9 @@ export interface IGroup {
     /** Open a subscription with retries */
     subscription(filters: Parameters<IRelay["subscription"]>[0], opts?: GroupSubscriptionOptions): Observable<SubscriptionResponse>;
     /** Count events on the relays and an event store */
-    count(filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
+    count(filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relay and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
 }
 /** Signals emitted by the pool */
 export interface IPoolSignals {
@@ -148,7 +149,7 @@ export interface IPool extends IPoolSignals {
     /** Send an EVENT message */
     event(relays: IPoolRelayInput, event: NostrEvent): Observable<PublishResponse>;
     /** Negentropy sync event ids with the relays and an event store */
-    negentropy(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
+    negentropy(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
     /** Send an EVENT message to relays with retries */
     publish(relays: IPoolRelayInput, event: Parameters<IGroup["publish"]>[0], opts?: Parameters<IGroup["publish"]>[1]): Promise<PublishResponse[]>;
     /** Send a REQ message to relays with retries */
@@ -156,7 +157,7 @@ export interface IPool extends IPoolSignals {
     /** Open a subscription to relays with retries */
     subscription(relays: IPoolRelayInput, filters: Parameters<IGroup["subscription"]>[0], opts?: Parameters<IGroup["subscription"]>[1]): Observable<SubscriptionResponse>;
     /** Count events on the relays and an event store */
-    count(relays: IPoolRelayInput, filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
+    count(relays: IPoolRelayInput, filters: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relay and an event store */
-    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "4.2.0",
+  "version": "4.4.2",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "^4.2.0",
+    "applesauce-core": "^4.4.0",
     "nanoid": "^5.0.9",
     "nostr-tools": "~2.17",
     "rxjs": "^7.8.1"