applesauce-relay 4.4.0 → 5.0.0

package/dist/group.d.ts

@@ -1,10 +1,9 @@
-import { type NostrEvent } from "nostr-tools";
+import { IAsyncEventStoreActions, IEventStoreActions } from "applesauce-core/event-store";
+import type { Filter, NostrEvent } from "applesauce-core/helpers";
 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";
+import { CountResponse, FilterInput, IGroup, IGroupRelayInput, IRelay, NegentropyReadStore, NegentropySyncStore, PublishOptions, PublishResponse, RequestOptions, SubscriptionOptions, SubscriptionResponse } from "./types.js";
 /** Options for negentropy sync on a group of relays */
 export type GroupNegentropySyncOptions = NegentropySyncOptions & {
     /** Whether to sync in parallel (default true) */
@@ -47,7 +46,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: FilterWithAnd, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
+    negentropy(store: NegentropyReadStore, filter: Filter, 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 */
@@ -55,7 +54,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
+    count(filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relays and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: NegentropySyncStore | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
 }

package/dist/group.js

@@ -1,6 +1,7 @@
+import { EventMemory } from "applesauce-core/event-store";
+import { filterDuplicateEvents } from "applesauce-core/observable";
 import { nanoid } from "nanoid";
 import { BehaviorSubject, catchError, combineLatest, defaultIfEmpty, defer, endWith, filter, from, identity, ignoreElements, lastValueFrom, map, merge, of, scan, share, switchMap, take, takeWhile, toArray, } from "rxjs";
-import { EventMemory, filterDuplicateEvents, } from "applesauce-core";
 import { completeOnEose } from "./operators/complete-on-eose.js";
 import { onlyEvents } from "./operators/only-events.js";
 import { reverseSwitchMap } from "./operators/reverse-switch-map.js";
@@ -124,9 +125,7 @@ export class RelayGroup {
                 upstream.set(relay, observable);
             }
             return merge(...observables);
-        }), 
-        // Ensure a single upstream
-        share());
+        }));
     }
     /**
      * Make a request to all relays
@@ -137,7 +136,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/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./group.js";
 export * from "./liveness.js";
+export * from "./management.js";
 export * from "./pool.js";
 export * from "./relay.js";
 export * from "./types.js";

package/dist/index.js

@@ -1,5 +1,6 @@
 export * from "./group.js";
 export * from "./liveness.js";
+export * from "./management.js";
 export * from "./pool.js";
 export * from "./relay.js";
 export * from "./types.js";

package/dist/lib/negentropy.js

@@ -1,6 +1,6 @@
 // (C) 2023 Doug Hoyte. MIT license
 // Modified by hzrd149 to be TypeScript and work without the window.cyrpto.subtle API
-import { sha256 } from "@noble/hashes/sha256";
+import { sha256 } from "@noble/hashes/sha2";
 const PROTOCOL_VERSION = 0x61; // Version 1
 const ID_SIZE = 32;
 const FINGERPRINT_SIZE = 16;

package/dist/management.d.ts

@@ -0,0 +1,169 @@
+import { logger } from "applesauce-core";
+import { Observable } from "rxjs";
+import { AuthSigner } from "./types.js";
+import { Relay } from "./relay.js";
+/** Base request structure for all NIP-86 requests */
+export interface TRelayRequest<Method extends string, Params extends any[] = any[]> {
+    /** The method to call */
+    method: Method;
+    /** Parameters for the method */
+    params: Params;
+}
+/** Base response structure for all NIP-86 responses */
+export type TRelayErrorResponse = {
+    /** Error message, non-null in case of error */
+    error: string;
+    result: null;
+};
+export type TRelaySuccessResponse<Result> = {
+    error: null;
+    /** Result object, null in case of error */
+    result: Result;
+};
+/** Merged relay management method and response types */
+export type TRelayMethod<Method extends string = string, Params extends any[] = any[], Result extends any = any> = {
+    /** Method string */
+    method: Method;
+    /** Request type */
+    request: TRelayRequest<Method, Params>;
+    /** Response success type */
+    response: TRelaySuccessResponse<Result>;
+    /** Response error type */
+    error: TRelayErrorResponse;
+};
+export type SupportedMethodsMethod = TRelayMethod<"supportedmethods", [], string[]>;
+export type BanPubkeyMethod = TRelayMethod<"banpubkey", [string, string?], true>;
+export type ListBannedPubkeysMethod = TRelayMethod<"listbannedpubkeys", [], Array<{
+    pubkey: string;
+    reason?: string;
+}>>;
+export type AllowPubkeyMethod = TRelayMethod<"allowpubkey", [string, string?], true>;
+export type ListAllowedPubkeysMethod = TRelayMethod<"listallowedpubkeys", [
+], Array<{
+    pubkey: string;
+    reason?: string;
+}>>;
+export type ListEventsNeedingModerationMethod = TRelayMethod<"listeventsneedingmoderation", [
+], Array<{
+    id: string;
+    reason?: string;
+}>>;
+export type AllowEventMethod = TRelayMethod<"allowevent", [string, string?], true>;
+export type BanEventMethod = TRelayMethod<"banevent", [string, string?], true>;
+export type ListBannedEventsMethod = TRelayMethod<"listbannedevents", [], Array<{
+    id: string;
+    reason?: string;
+}>>;
+export type ChangeRelayNameMethod = TRelayMethod<"changerelayname", [string], true>;
+export type ChangeRelayDescriptionMethod = TRelayMethod<"changerelaydescription", [string], true>;
+export type ChangeRelayIconMethod = TRelayMethod<"changerelayicon", [string], true>;
+export type AllowKindMethod = TRelayMethod<"allowkind", [number], true>;
+export type DisallowKindMethod = TRelayMethod<"disallowkind", [number], true>;
+export type ListAllowedKindsMethod = TRelayMethod<"listallowedkinds", [], number[]>;
+export type BlockIpMethod = TRelayMethod<"blockip", [string, string?], true>;
+export type UnblockIpMethod = TRelayMethod<"unblockip", [string], true>;
+export type ListBlockedIpsMethod = TRelayMethod<"listblockedips", [], Array<{
+    ip: string;
+    reason?: string;
+}>>;
+/** Union type for all relay management method definitions */
+export type RelayManagementMethods = SupportedMethodsMethod | BanPubkeyMethod | ListBannedPubkeysMethod | AllowPubkeyMethod | ListAllowedPubkeysMethod | ListEventsNeedingModerationMethod | AllowEventMethod | BanEventMethod | ListBannedEventsMethod | ChangeRelayNameMethod | ChangeRelayDescriptionMethod | ChangeRelayIconMethod | AllowKindMethod | DisallowKindMethod | ListAllowedKindsMethod | BlockIpMethod | UnblockIpMethod | ListBlockedIpsMethod;
+/** Custom error for relay management operations */
+export declare class RelayManagementError extends Error {
+    readonly method?: string | undefined;
+    readonly statusCode?: number | undefined;
+    constructor(message: string, method?: string | undefined, statusCode?: number | undefined);
+}
+/** RelayManagement class for NIP-86 relay management API */
+export declare class RelayManagement {
+    #private;
+    readonly relay: Relay;
+    readonly signer: AuthSigner;
+    protected log: typeof logger;
+    protected httpUrl: string;
+    constructor(relay: Relay, signer: AuthSigner);
+    /**
+     * Core request method that handles all RPC calls with NIP-98 authentication
+     */
+    request<Method extends RelayManagementMethods>(method: Method["method"], params: Method["request"]["params"]): Promise<Method["response"]["result"]>;
+    /** Get list of supported methods */
+    supportedMethods(): Promise<string[]>;
+    /** Ban a pubkey */
+    banPubkey(pubkey: string, reason?: string): Promise<true>;
+    /** List all banned pubkeys */
+    listBannedPubkeys(): Promise<Array<{
+        pubkey: string;
+        reason?: string;
+    }>>;
+    /** Allow a pubkey */
+    allowPubkey(pubkey: string, reason?: string): Promise<true>;
+    /** List all allowed pubkeys */
+    listAllowedPubkeys(): Promise<Array<{
+        pubkey: string;
+        reason?: string;
+    }>>;
+    /** List events needing moderation */
+    listEventsNeedingModeration(): Promise<Array<{
+        id: string;
+        reason?: string;
+    }>>;
+    /** Allow an event */
+    allowEvent(eventId: string, reason?: string): Promise<true>;
+    /** Ban an event */
+    banEvent(eventId: string, reason?: string): Promise<true>;
+    /** List all banned events */
+    listBannedEvents(): Promise<Array<{
+        id: string;
+        reason?: string;
+    }>>;
+    /** Change relay name */
+    changeRelayName(name: string): Promise<true>;
+    /** Change relay description */
+    changeRelayDescription(description: string): Promise<true>;
+    /** Change relay icon */
+    changeRelayIcon(iconUrl: string): Promise<true>;
+    /** Allow a kind */
+    allowKind(kind: number): Promise<true>;
+    /** Disallow a kind */
+    disallowKind(kind: number): Promise<true>;
+    /** List all allowed kinds */
+    listAllowedKinds(): Promise<number[]>;
+    /** Block an IP address */
+    blockIp(ip: string, reason?: string): Promise<true>;
+    /** Unblock an IP address */
+    unblockIp(ip: string): Promise<true>;
+    /** List all blocked IPs */
+    listBlockedIps(): Promise<Array<{
+        ip: string;
+        reason?: string;
+    }>>;
+    /** Observable that emits supported methods when subscribed */
+    supportMethods$: Observable<string[]>;
+    /** Observable that emits banned pubkeys when subscribed */
+    bannedPubkeys$: Observable<Array<{
+        pubkey: string;
+        reason?: string;
+    }>>;
+    /** Observable that emits allowed pubkeys when subscribed */
+    allowedPubkeys$: Observable<Array<{
+        pubkey: string;
+        reason?: string;
+    }>>;
+    /** Observable that emits events needing moderation when subscribed */
+    eventsNeedingModeration$: Observable<Array<{
+        id: string;
+        reason?: string;
+    }>>;
+    /** Observable that emits banned events when subscribed */
+    bannedEvents$: Observable<Array<{
+        id: string;
+        reason?: string;
+    }>>;
+    /** Observable that emits allowed kinds when subscribed */
+    allowedKinds$: Observable<number[]>;
+    /** Observable that emits blocked IPs when subscribed */
+    blockedIps$: Observable<Array<{
+        ip: string;
+        reason?: string;
+    }>>;
+}

package/dist/management.js

@@ -0,0 +1,202 @@
+import { logger } from "applesauce-core";
+import { ensureHttpURL } from "applesauce-core/helpers/url";
+import { getToken } from "nostr-tools/nip98";
+import { BehaviorSubject, from, shareReplay, throwError } from "rxjs";
+import { catchError, switchMap } from "rxjs/operators";
+/** Custom error for relay management operations */
+export class RelayManagementError extends Error {
+    method;
+    statusCode;
+    constructor(message, method, statusCode) {
+        super(message);
+        this.method = method;
+        this.statusCode = statusCode;
+        this.name = "RelayManagementError";
+    }
+}
+/** RelayManagement class for NIP-86 relay management API */
+export class RelayManagement {
+    relay;
+    signer;
+    log = logger.extend("RelayManagement");
+    httpUrl;
+    // Internal refresh triggers for observables
+    #refreshSupportMethods$ = new BehaviorSubject(undefined);
+    #refreshBannedPubkeys$ = new BehaviorSubject(undefined);
+    #refreshAllowedPubkeys$ = new BehaviorSubject(undefined);
+    #refreshEventsNeedingModeration$ = new BehaviorSubject(undefined);
+    #refreshBannedEvents$ = new BehaviorSubject(undefined);
+    #refreshAllowedKinds$ = new BehaviorSubject(undefined);
+    #refreshBlockedIps$ = new BehaviorSubject(undefined);
+    constructor(relay, signer) {
+        this.relay = relay;
+        this.signer = signer;
+        this.log = this.log.extend(relay.url);
+        this.httpUrl = ensureHttpURL(relay.url);
+    }
+    /**
+     * Core request method that handles all RPC calls with NIP-98 authentication
+     */
+    async request(method, params) {
+        const requestBody = {
+            method,
+            params,
+        };
+        const requestBodyString = JSON.stringify(requestBody);
+        // Generate NIP-98 token using getToken from nostr-tools
+        const authHeader = await getToken(this.httpUrl, "POST", (event) => this.signer.signEvent(event), true, // includeAuthorizationScheme - returns "Nostr <token>" format
+        requestBody);
+        // Make the HTTP request
+        const response = await fetch(this.httpUrl, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/nostr+json+rpc",
+                Authorization: authHeader,
+            },
+            body: requestBodyString,
+        });
+        // Handle HTTP errors
+        if (!response.ok) {
+            if (response.status === 401) {
+                throw new RelayManagementError("Unauthorized: Invalid or missing NIP-98 authentication", method, response.status);
+            }
+            const errorText = await response.text().catch(() => "Unknown error");
+            throw new RelayManagementError(`HTTP ${response.status}: ${errorText}`, method, response.status);
+        }
+        // Parse the response
+        const data = await response.json();
+        // Handle RPC errors
+        if (data.error) {
+            throw new RelayManagementError(`RPC error: ${data.error}`, method, response.status);
+        }
+        return data.result;
+    }
+    // Convenience methods for each RPC call
+    /** Get list of supported methods */
+    async supportedMethods() {
+        return this.request("supportedmethods", []);
+    }
+    /** Ban a pubkey */
+    async banPubkey(pubkey, reason) {
+        const result = await this.request("banpubkey", reason ? [pubkey, reason] : [pubkey]);
+        this.#refreshBannedPubkeys$.next();
+        return result;
+    }
+    /** List all banned pubkeys */
+    async listBannedPubkeys() {
+        return this.request("listbannedpubkeys", []);
+    }
+    /** Allow a pubkey */
+    async allowPubkey(pubkey, reason) {
+        const result = await this.request("allowpubkey", reason ? [pubkey, reason] : [pubkey]);
+        this.#refreshAllowedPubkeys$.next();
+        this.#refreshBannedPubkeys$.next(); // Also refresh banned list in case it was unbanned
+        return result;
+    }
+    /** List all allowed pubkeys */
+    async listAllowedPubkeys() {
+        return this.request("listallowedpubkeys", []);
+    }
+    /** List events needing moderation */
+    async listEventsNeedingModeration() {
+        return this.request("listeventsneedingmoderation", []);
+    }
+    /** Allow an event */
+    async allowEvent(eventId, reason) {
+        const result = await this.request("allowevent", reason ? [eventId, reason] : [eventId]);
+        this.#refreshBannedEvents$.next(); // Also refresh banned list in case it was unbanned
+        this.#refreshEventsNeedingModeration$.next();
+        return result;
+    }
+    /** Ban an event */
+    async banEvent(eventId, reason) {
+        const result = await this.request("banevent", reason ? [eventId, reason] : [eventId]);
+        this.#refreshBannedEvents$.next();
+        this.#refreshEventsNeedingModeration$.next();
+        return result;
+    }
+    /** List all banned events */
+    async listBannedEvents() {
+        return this.request("listbannedevents", []);
+    }
+    /** Change relay name */
+    async changeRelayName(name) {
+        return this.request("changerelayname", [name]);
+    }
+    /** Change relay description */
+    async changeRelayDescription(description) {
+        return this.request("changerelaydescription", [description]);
+    }
+    /** Change relay icon */
+    async changeRelayIcon(iconUrl) {
+        return this.request("changerelayicon", [iconUrl]);
+    }
+    /** Allow a kind */
+    async allowKind(kind) {
+        const result = await this.request("allowkind", [kind]);
+        this.#refreshAllowedKinds$.next();
+        return result;
+    }
+    /** Disallow a kind */
+    async disallowKind(kind) {
+        const result = await this.request("disallowkind", [kind]);
+        this.#refreshAllowedKinds$.next();
+        return result;
+    }
+    /** List all allowed kinds */
+    async listAllowedKinds() {
+        return this.request("listallowedkinds", []);
+    }
+    /** Block an IP address */
+    async blockIp(ip, reason) {
+        const result = await this.request("blockip", reason ? [ip, reason] : [ip]);
+        this.#refreshBlockedIps$.next();
+        return result;
+    }
+    /** Unblock an IP address */
+    async unblockIp(ip) {
+        const result = await this.request("unblockip", [ip]);
+        this.#refreshBlockedIps$.next();
+        return result;
+    }
+    /** List all blocked IPs */
+    async listBlockedIps() {
+        return this.request("listblockedips", []);
+    }
+    // Reactive observables for list methods
+    /** Observable that emits supported methods when subscribed */
+    supportMethods$ = this.#refreshSupportMethods$.pipe(switchMap(() => from(this.supportedMethods())), catchError((error) => {
+        this.log("Error fetching supported methods:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits banned pubkeys when subscribed */
+    bannedPubkeys$ = this.#refreshBannedPubkeys$.pipe(switchMap(() => from(this.listBannedPubkeys())), catchError((error) => {
+        this.log("Error fetching banned pubkeys:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits allowed pubkeys when subscribed */
+    allowedPubkeys$ = this.#refreshAllowedPubkeys$.pipe(switchMap(() => from(this.listAllowedPubkeys())), catchError((error) => {
+        this.log("Error fetching allowed pubkeys:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits events needing moderation when subscribed */
+    eventsNeedingModeration$ = this.#refreshEventsNeedingModeration$.pipe(switchMap(() => from(this.listEventsNeedingModeration())), catchError((error) => {
+        this.log("Error fetching events needing moderation:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits banned events when subscribed */
+    bannedEvents$ = this.#refreshBannedEvents$.pipe(switchMap(() => from(this.listBannedEvents())), catchError((error) => {
+        this.log("Error fetching banned events:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits allowed kinds when subscribed */
+    allowedKinds$ = this.#refreshAllowedKinds$.pipe(switchMap(() => from(this.listAllowedKinds())), catchError((error) => {
+        this.log("Error fetching allowed kinds:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+    /** Observable that emits blocked IPs when subscribed */
+    blockedIps$ = this.#refreshBlockedIps$.pipe(switchMap(() => from(this.listBlockedIps())), catchError((error) => {
+        this.log("Error fetching blocked IPs:", error);
+        return throwError(() => error);
+    }), shareReplay(1));
+}

package/dist/negentropy.d.ts

@@ -1,5 +1,5 @@
 import { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
-import { type FilterWithAnd } from "applesauce-core/helpers";
+import { type Filter } from "applesauce-core/helpers";
 import { NegentropyStorageVector } from "./lib/negentropy.js";
 import { MultiplexWebSocket } from "./types.js";
 /**
@@ -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: FilterWithAnd): Promise<NegentropyStorageVector>;
+export declare function buildStorageFromFilter(store: IEventStoreRead | IAsyncEventStoreRead, filter: Filter): 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: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+}, filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;

package/dist/operators/complete-on-eose.d.ts

@@ -1,5 +1,5 @@
 import { MonoTypeOperatorFunction, OperatorFunction } from "rxjs";
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { SubscriptionResponse } from "../types.js";
 export declare function completeOnEose(includeEose: true): MonoTypeOperatorFunction<SubscriptionResponse>;
 export declare function completeOnEose(): OperatorFunction<SubscriptionResponse, NostrEvent>;

package/dist/operators/only-events.d.ts

@@ -1,5 +1,5 @@
 import { OperatorFunction } from "rxjs";
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { SubscriptionResponse } from "../types.js";
 /** Filter subscription responses and only return the events */
 export declare function onlyEvents(): OperatorFunction<SubscriptionResponse, NostrEvent>;

package/dist/operators/to-event-store.d.ts

@@ -1,6 +1,6 @@
 import { OperatorFunction } from "rxjs";
 import { IEventStore } from "applesauce-core";
-import { NostrEvent } from "nostr-tools";
+import { NostrEvent } from "applesauce-core/helpers/event";
 import { SubscriptionResponse } from "../types.js";
 /**
  * Adds all events to event store and returns a deduplicated timeline when EOSE is received

package/dist/pool.d.ts

@@ -1,15 +1,17 @@
-import type { IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core";
-import { FilterMap, OutboxMap, type FilterWithAnd } from "applesauce-core/helpers";
-import { Filter, type NostrEvent } from "nostr-tools";
+import type { NostrEvent } from "applesauce-core/helpers/event";
+import { Filter } from "applesauce-core/helpers/filter";
+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 { CountResponse, FilterInput, IPool, IPoolRelayInput, IRelay, PublishResponse, SubscriptionResponse } from "./types.js";
+import type { CountResponse, FilterInput, IPool, IPoolRelayInput, IRelay, NegentropyReadStore, NegentropySyncStore, PublishResponse, SubscriptionResponse } from "./types.js";
 export declare class RelayPool implements IPool {
     options?: RelayOptions | undefined;
     relays$: BehaviorSubject<Map<string, Relay>>;
     get relays(): Map<string, Relay>;
+    /** Whether to ignore relays that are ready=false */
+    ignoreOffline: boolean;
     /** A signal when a relay is added */
     add$: Subject<IRelay>;
     /** A signal when a relay is removed */
@@ -18,7 +20,7 @@ export declare class RelayPool implements IPool {
     /** Get or create a new relay connection */
     relay(url: string): Relay;
     /** Create a group of relays */
-    group(relays: IPoolRelayInput): RelayGroup;
+    group(relays: IPoolRelayInput, ignoreOffline?: boolean): RelayGroup;
     /** Removes a relay from the pool and defaults to closing the connection */
     remove(relay: string | IRelay, close?: boolean): void;
     /** Make a REQ to multiple relays that does not deduplicate events */
@@ -26,7 +28,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: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(relays: IPoolRelayInput, store: NegentropyReadStore, filter: Filter, 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 +40,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
+    count(relays: IPoolRelayInput, filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relays and an event store */
-    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(relays: IPoolRelayInput, store: NegentropySyncStore | NostrEvent[], filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
 }

package/dist/pool.js

@@ -1,4 +1,6 @@
-import { createFilterMap, isFilterEqual, normalizeURL, } from "applesauce-core/helpers";
+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, of, Subject } from "rxjs";
 import { RelayGroup } from "./group.js";
 import { Relay } from "./relay.js";
@@ -8,6 +10,8 @@ export class RelayPool {
     get relays() {
         return this.relays$.value;
     }
+    /** Whether to ignore relays that are ready=false */
+    ignoreOffline = true;
     /** A signal when a relay is added */
     add$ = new Subject();
     /** A signal when a relay is removed */
@@ -27,14 +31,21 @@ 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 */
-    group(relays) {
-        return new RelayGroup(Array.isArray(relays)
+    group(relays, ignoreOffline = this.ignoreOffline) {
+        let input = Array.isArray(relays)
             ? relays.map((url) => this.relay(url))
-            : relays.pipe(map((urls) => urls.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)));
+        }
+        return new RelayGroup(input);
     }
     /** Removes a relay from the pool and defaults to closing the connection */
     remove(relay, close = true) {
@@ -57,15 +68,17 @@ export class RelayPool {
     }
     /** Make a REQ to multiple relays that does not deduplicate events */
     req(relays, filters, id) {
-        return this.group(relays).req(filters, id);
+        // Never filter out offline relays in manual methods
+        return this.group(relays, false).req(filters, id);
     }
     /** Send an EVENT message to multiple relays */
     event(relays, event) {
-        return this.group(relays).event(event);
+        // Never filter out offline relays in manual methods
+        return this.group(relays, false).event(event);
     }
     /** Negentropy sync event ids with the relays and an event store */
     negentropy(relays, store, filter, reconcile, opts) {
-        return this.group(relays).negentropy(store, filter, reconcile, opts);
+        return this.group(relays, false).negentropy(store, filter, reconcile, opts);
     }
     /** Publish an event to multiple relays */
     publish(relays, event, opts) {

package/dist/relay.d.ts

@@ -1,11 +1,10 @@
-import { IAsyncEventStoreRead, IEventStoreRead, logger } from "applesauce-core";
-import { type FilterWithAnd } from "applesauce-core/helpers";
-import { type NostrEvent } from "nostr-tools";
-import { RelayInformation } from "nostr-tools/nip11";
+import { logger } from "applesauce-core";
+import { NostrEvent } from "applesauce-core/helpers/event";
+import { Filter } from "applesauce-core/helpers/filter";
 import { BehaviorSubject, MonoTypeOperatorFunction, Observable, RepeatConfig, RetryConfig, Subject } from "rxjs";
 import { WebSocketSubject, WebSocketSubjectConfig } from "rxjs/webSocket";
 import { type NegentropySyncOptions, type ReconcileFunction } from "./negentropy.js";
-import { AuthSigner, CountResponse, FilterInput, IRelay, PublishOptions, PublishResponse, RequestOptions, SubscriptionOptions, SubscriptionResponse } from "./types.js";
+import { AuthSigner, CountResponse, FilterInput, IRelay, NegentropyReadStore, NegentropySyncStore, PublishOptions, PublishResponse, RelayInformation, RequestOptions, SubscriptionOptions, SubscriptionResponse } from "./types.js";
 /** Flags for the negentropy sync type */
 export declare enum SyncDirection {
     RECEIVE = 1,
@@ -26,13 +25,21 @@ export type RelayOptions = {
     publishTimeout?: number;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive?: number;
+    /** Default retry config for subscription() method */
+    subscriptionRetry?: RetryConfig;
+    /** Default retry config for request() method */
+    requestRetry?: RetryConfig;
+    /** Default retry config for publish() method */
+    publishRetry?: RetryConfig;
 };
 export declare class Relay implements IRelay {
     url: string;
     protected log: typeof logger;
     protected socket: WebSocketSubject<any>;
+    /** Internal subject that tracks the ready state of the relay */
+    protected _ready$: BehaviorSubject<boolean>;
     /** Whether the relay is ready for subscriptions or event publishing. setting this to false will cause all .req and .event observables to hang until the relay is ready */
-    protected ready$: BehaviorSubject<boolean>;
+    ready$: Observable<boolean>;
     /** A method that returns an Observable that emits when the relay should reconnect */
     reconnectTimer: (error: CloseEvent | Error, attempts: number) => Observable<number>;
     /** How many times the relay has tried to reconnect */
@@ -62,6 +69,8 @@ export declare class Relay implements IRelay {
     /** An observable that emits the NIP-11 information document for the relay */
     information$: Observable<RelayInformation | null>;
     protected _nip11: RelayInformation | null;
+    /** An observable that emits the icon URL for the relay, or the favicon.ico URL for the relay */
+    icon$: Observable<string | undefined>;
     /** An observable that emits the limitations for the relay */
     limitations$: Observable<RelayInformation["limitation"] | null>;
     /** An array of supported NIPs from the NIP-11 information document */
@@ -72,6 +81,7 @@ export declare class Relay implements IRelay {
     close$: Subject<CloseEvent>;
     /** An observable that emits when underlying websocket is closing due to unsubscription */
     closing$: Subject<void>;
+    get ready(): boolean;
     get connected(): boolean;
     get challenge(): string | null;
     get notices(): string[];
@@ -86,6 +96,12 @@ export declare class Relay implements IRelay {
     publishTimeout: number;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive: number;
+    /** Default retry config for subscription() method */
+    protected subscriptionReconnect: RetryConfig;
+    /** Default retry config for request() method */
+    protected requestReconnect: RetryConfig;
+    /** Default retry config for publish() method */
+    protected publishRetry: RetryConfig;
     protected receivedAuthRequiredForReq: BehaviorSubject<boolean>;
     protected receivedAuthRequiredForEvent: BehaviorSubject<boolean>;
     authRequiredForRead$: Observable<boolean>;
@@ -106,13 +122,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<CountResponse>;
+    count(filters: Filter | Filter[], 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: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: NegentropyReadStore, filter: Filter, 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 */
@@ -130,7 +146,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: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: NegentropySyncStore, filter: Filter, 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

@@ -1,14 +1,19 @@
 import { logger } from "applesauce-core";
-import { ensureHttpURL } from "applesauce-core/helpers";
-import { simpleTimeout } from "applesauce-core/observable";
+import { ensureHttpURL } from "applesauce-core/helpers/url";
+import { mapEventsToStore, simpleTimeout } from "applesauce-core/observable";
 import { nanoid } from "nanoid";
-import { nip42 } from "nostr-tools";
+import { makeAuthEvent } from "nostr-tools/nip42";
 import { BehaviorSubject, catchError, combineLatest, defer, endWith, filter, finalize, firstValueFrom, from, identity, ignoreElements, isObservable, lastValueFrom, map, merge, mergeMap, mergeWith, NEVER, Observable, of, repeat, retry, scan, share, shareReplay, Subject, switchMap, take, takeUntil, tap, throwError, timeout, timer, } from "rxjs";
 import { webSocket } from "rxjs/webSocket";
 import { completeOnEose } from "./operators/complete-on-eose.js";
 import { markFromRelay } from "./operators/mark-from-relay.js";
 const AUTH_REQUIRED_PREFIX = "auth-required:";
-const DEFAULT_RETRY_CONFIG = { count: 10, delay: 1000, resetOnSuccess: true };
+/** Default retry config for all methods */
+const DEFAULT_RETRY_CONFIG = {
+    count: 3,
+    delay: 1000,
+    resetOnSuccess: true,
+};
 /** Flags for the negentropy sync type */
 export var SyncDirection;
 (function (SyncDirection) {
@@ -23,8 +28,10 @@ export class Relay {
     url;
     log = logger.extend("Relay");
     socket;
+    /** Internal subject that tracks the ready state of the relay */
+    _ready$ = new BehaviorSubject(true);
     /** Whether the relay is ready for subscriptions or event publishing. setting this to false will cause all .req and .event observables to hang until the relay is ready */
-    ready$ = new BehaviorSubject(true);
+    ready$ = this._ready$.asObservable();
     /** A method that returns an Observable that emits when the relay should reconnect */
     reconnectTimer;
     /** How many times the relay has tried to reconnect */
@@ -54,6 +61,8 @@ export class Relay {
     /** An observable that emits the NIP-11 information document for the relay */
     information$;
     _nip11 = null;
+    /** An observable that emits the icon URL for the relay, or the favicon.ico URL for the relay */
+    icon$;
     /** An observable that emits the limitations for the relay */
     limitations$;
     /** An array of supported NIPs from the NIP-11 information document */
@@ -65,6 +74,9 @@ export class Relay {
     /** An observable that emits when underlying websocket is closing due to unsubscription */
     closing$ = new Subject();
     // sync state
+    get ready() {
+        return this._ready$.value;
+    }
     get connected() {
         return this.connected$.value;
     }
@@ -91,6 +103,12 @@ export class Relay {
     publishTimeout = 30_000;
     /** How long to keep the connection alive after nothing is subscribed (default 30s) */
     keepAlive = 30_000;
+    /** Default retry config for subscription() method */
+    subscriptionReconnect;
+    /** Default retry config for request() method */
+    requestReconnect;
+    /** Default retry config for publish() method */
+    publishRetry;
     // Subjects that track if an "auth-required" message has been received for REQ or EVENT
     receivedAuthRequiredForReq = new BehaviorSubject(false);
     receivedAuthRequiredForEvent = new BehaviorSubject(false);
@@ -124,6 +142,10 @@ export class Relay {
             this.publishTimeout = opts.publishTimeout;
         if (opts?.keepAlive !== undefined)
             this.keepAlive = opts.keepAlive;
+        // Set retry configs
+        this.subscriptionReconnect = { ...DEFAULT_RETRY_CONFIG, ...(opts?.subscriptionRetry ?? {}) };
+        this.requestReconnect = { ...DEFAULT_RETRY_CONFIG, ...(opts?.requestRetry ?? {}) };
+        this.publishRetry = { ...DEFAULT_RETRY_CONFIG, ...(opts?.publishRetry ?? {}) };
         // Create an observable that tracks boolean authentication state
         this.authenticated$ = this.authenticationResponse$.pipe(map((response) => response?.ok === true));
         /** Use the static method to create a new reconnect method for this relay */
@@ -134,12 +156,20 @@ export class Relay {
             this.connected$.next(true);
             this.attempts$.next(0);
             this.error$.next(null);
+            // Reset to clean state
             this.resetState();
         });
         this.close$.subscribe((event) => {
-            this.log("Disconnected");
-            this.connected$.next(false);
+            if (this.connected$.value)
+                this.log("Disconnected");
+            else
+                this.log("Failed to connect");
+            // Chnaged the connected state to false
+            if (this.connected$.value)
+                this.connected$.next(false);
+            // Increment the attempts counter
             this.attempts$.next(this.attempts$.value + 1);
+            // Reset the state
             this.resetState();
             // Start the reconnect timer if the connection was not closed cleanly
             if (!event.wasClean)
@@ -165,9 +195,17 @@ export class Relay {
         shareReplay(1));
         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));
+        this.icon$ = this.information$.pipe(map((info) => info?.icon || new URL("/favicon.ico", ensureHttpURL(this.url)).toString()));
         // 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
@@ -219,13 +257,15 @@ export class Relay {
     }
     /** Set ready = false and start the reconnect timer */
     startReconnectTimer(error) {
-        if (!this.ready$.value)
+        if (!this.ready)
             return;
         this.error$.next(error instanceof Error ? error : new Error("Connection error"));
-        this.ready$.next(false);
+        this._ready$.next(false);
         this.reconnectTimer(error, this.attempts$.value)
             .pipe(take(1))
-            .subscribe(() => this.ready$.next(true));
+            .subscribe(() => {
+            this._ready$.next(true);
+        });
     }
     /** Wait for authentication state, make connection and then wait for authentication if required */
     waitForAuth(
@@ -244,7 +284,7 @@ export class Relay {
     /** Wait for the relay to be ready to accept connections */
     waitForReady(observable) {
         // Don't wait if the relay is already ready
-        if (this.ready$.value)
+        if (this.ready)
             return observable;
         else
             return this.ready$.pipe(
@@ -320,9 +360,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 +381,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 +415,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) {
@@ -407,7 +443,7 @@ export class Relay {
     authenticate(signer) {
         if (!this.challenge)
             throw new Error("Have not received authentication challenge");
-        const p = signer.signEvent(nip42.makeAuthEvent(this.url, this.challenge));
+        const p = signer.signEvent(makeAuthEvent(this.url, this.challenge));
         const start = p instanceof Promise ? from(p) : of(p);
         return lastValueFrom(start.pipe(switchMap((event) => this.auth(event))));
     }
@@ -463,7 +499,7 @@ export class Relay {
     subscription(filters, opts) {
         return this.req(filters, opts?.id).pipe(
         // Retry on connection errors
-        this.customRetryOperator(opts?.retries ?? opts?.reconnect ?? true, DEFAULT_RETRY_CONFIG), 
+        this.customRetryOperator(opts?.reconnect ?? true, this.subscriptionReconnect), 
         // Create resubscribe logic (repeat operator)
         this.customRepeatOperator(opts?.resubscribe), 
         // Single subscription
@@ -473,7 +509,7 @@ export class Relay {
     request(filters, opts) {
         return this.req(filters, opts?.id).pipe(
         // Retry on connection errors
-        this.customRetryOperator(opts?.retries ?? opts?.reconnect ?? true, DEFAULT_RETRY_CONFIG), 
+        this.customRetryOperator(opts?.reconnect ?? true, this.requestReconnect), 
         // Create resubscribe logic (repeat operator)
         this.customRepeatOperator(opts?.resubscribe), 
         // Complete when EOSE is received
@@ -490,11 +526,9 @@ export class Relay {
             return of(result);
         }), 
         // Retry the publish until it succeeds or the number of retries is reached
-        this.customRetryOperator(opts?.retries ?? opts?.reconnect ?? true, DEFAULT_RETRY_CONFIG), 
+        this.customRetryOperator(opts?.retries ?? opts?.reconnect ?? true, this.publishRetry), 
         // 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) {
@@ -524,7 +558,15 @@ export class Relay {
                 }
                 // Fetch missing events from the relay
                 if (direction & SyncDirection.RECEIVE && need.length > 0) {
-                    await lastValueFrom(this.req({ ids: need }).pipe(completeOnEose(), tap((event) => observer.next(event))));
+                    await lastValueFrom(this.req({ ids: need }).pipe(
+                    // Complete when EOSE is received
+                    completeOnEose(), 
+                    // Add events to the store if its writable
+                    Reflect.has(store, "add")
+                        ? mapEventsToStore(store)
+                        : identity, 
+                    // Pass events to observer
+                    tap((event) => observer.next(event))));
                 }
             }, { signal: controller.signal })
                 // Complete the observable when the sync is complete

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-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 { IAsyncEventStoreActions, IAsyncEventStoreRead, IEventStoreRead } from "applesauce-core/event-store";
+import type { Filter } from "applesauce-core/helpers/filter";
+import type { EventTemplate, NostrEvent } from "applesauce-core/helpers/event";
+import type { RelayInformation as CoreRelayInformation } 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";
@@ -19,14 +19,10 @@ export type CountResponse = {
 export type MultiplexWebSocket<T = any> = Pick<WebSocketSubject<T>, "multiplex">;
 /** Options for the publish method on the pool and relay */
 export type PublishOptions = {
+    /** Number of times to retry the publish. default is 3 */
+    retries?: boolean | number | Parameters<typeof retry>[0];
     /**
-     * Number of times to retry the publish. default is 10
-     * @see https://rxjs.dev/api/index/function/retry
-     * @deprecated use `reconnect` instead
-     */
-    retries?: number | Parameters<typeof retry>[0];
-    /**
-     * Whether to reconnect when socket fails to connect. default is true (10 retries with 1 second delay)
+     * Whether to reconnect when socket fails to connect. default is true (3 retries with 1 second delay)
      * @see https://rxjs.dev/api/index/function/retry
      */
     reconnect?: boolean | number | Parameters<typeof retry>[0];
@@ -39,19 +35,13 @@ export type RequestOptions = SubscriptionOptions;
 export type SubscriptionOptions = {
     /** Custom REQ id for the subscription */
     id?: string;
-    /**
-     * Number of times to retry the subscription if the relay fails to connect. default is 10
-     * @see https://rxjs.dev/api/index/function/retry
-     * @deprecated use `reconnect` instead
-     */
-    retries?: number | Parameters<typeof retry>[0];
     /**
      * Whether to resubscribe if the subscription is closed by the relay. default is false
      * @see https://rxjs.dev/api/index/function/repeat
      */
     resubscribe?: boolean | number | Parameters<typeof repeat>[0];
     /**
-     * Whether to reconnect when socket is closed. default is true (10 retries with 1 second delay)
+     * Whether to reconnect when socket is closed. default is true (3 retries with 1 second delay)
      * @see https://rxjs.dev/api/index/function/retry
      */
     reconnect?: boolean | number | Parameters<typeof retry>[0];
@@ -60,7 +50,17 @@ 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 = FilterWithAnd | FilterWithAnd[] | Observable<FilterWithAnd | FilterWithAnd[]> | ((relay: IRelay) => FilterWithAnd | FilterWithAnd[] | Observable<FilterWithAnd | FilterWithAnd[]>);
+export type FilterInput = Filter | Filter[] | Observable<Filter | Filter[]> | ((relay: IRelay) => Filter | Filter[] | Observable<Filter | Filter[]>);
+export type RelayInformation = CoreRelayInformation & {
+    /** An array of attributes that describe the relay type/characteristics */
+    attributes?: string[];
+};
+/** A read only event store for negentropy sync */
+export type NegentropyReadStore = IEventStoreRead | IAsyncEventStoreRead | NostrEvent[];
+/** A writeable event store for negentropy sync */
+export type NegentropyWriteStore = (IAsyncEventStoreRead & IAsyncEventStoreActions) | (IEventStoreRead & IAsyncEventStoreActions);
+/** An event store that can be used for negentropy sync */
+export type NegentropySyncStore = NegentropyReadStore | NegentropyWriteStore;
 export interface IRelay extends MultiplexWebSocket {
     url: string;
     message$: Observable<any>;
@@ -82,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<CountResponse>;
+    count(filters: Filter | Filter[], 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: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: NegentropyReadStore, filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Authenticate with the relay using a signer */
     authenticate(signer: AuthSigner): Promise<PublishResponse>;
     /** Send an EVENT message with retries */
@@ -98,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: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: NegentropySyncStore, filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
     /** Get the NIP-11 information document for the relay */
     getInformation(): Promise<RelayInformation | null>;
     /** Get the limitations for the relay */
@@ -113,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: FilterWithAnd, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
+    negentropy(store: NegentropyReadStore, filter: Filter, reconcile: ReconcileFunction, opts?: NegentropySyncOptions): Promise<boolean>;
     /** Add a relay to the group */
     add(relay: IRelay): void;
     /** Remove a relay from the group */
@@ -127,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
+    count(filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relay and an event store */
-    sync(store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(store: NegentropySyncStore, filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
 }
 /** Signals emitted by the pool */
 export interface IPoolSignals {
@@ -149,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: FilterWithAnd, reconcile: ReconcileFunction, opts?: GroupNegentropySyncOptions): Promise<boolean>;
+    negentropy(relays: IPoolRelayInput, store: NegentropyReadStore, filter: Filter, 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 */
@@ -157,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: FilterWithAnd | FilterWithAnd[], id?: string): Observable<Record<string, CountResponse>>;
+    count(relays: IPoolRelayInput, filters: Filter | Filter[], id?: string): Observable<Record<string, CountResponse>>;
     /** Negentropy sync events with the relay and an event store */
-    sync(relays: IPoolRelayInput, store: IEventStoreRead | IAsyncEventStoreRead | NostrEvent[], filter: FilterWithAnd, direction?: SyncDirection): Observable<NostrEvent>;
+    sync(relays: IPoolRelayInput, store: NegentropySyncStore, filter: Filter, direction?: SyncDirection): Observable<NostrEvent>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "4.4.0",
+  "version": "5.0.0",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -24,6 +24,11 @@
       "require": "./dist/pool.js",
       "types": "./dist/pool.d.ts"
     },
+    "./group": {
+      "import": "./dist/group.js",
+      "require": "./dist/group.js",
+      "types": "./dist/group.d.ts"
+    },
     "./relay": {
       "import": "./dist/relay.js",
       "require": "./dist/relay.js",
@@ -52,17 +57,17 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "^4.4.0",
+    "applesauce-core": "^5.0.0",
     "nanoid": "^5.0.9",
-    "nostr-tools": "~2.17",
+    "nostr-tools": "~2.19",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
-    "applesauce-signers": "^4.2.0",
+    "applesauce-signers": "^5.0.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3",
-    "vitest": "^3.2.4",
+    "vitest": "^4.0.15",
     "vitest-websocket-mock": "^0.5.0"
   },
   "funding": {