applesauce-relay 0.0.0-next-20250716144720 → 0.0.0-next-20250718173521

package/README.md

@@ -56,9 +56,8 @@ const event = {
   // ... other required fields
 };
 
-relay.event(event).subscribe((response) => {
-  console.log(`Published:`, response.ok);
-});
+const response = await relay.publish(event);
+console.log(`Published:`, response.ok);
 ```
 
 ### Relay Pool
@@ -85,7 +84,8 @@ pool
   });
 
 // Publish to multiple relays
-pool.event(relays, event).subscribe((response) => {
+const responses = await pool.publish(relays, event);
+responses.forEach((response) => {
   console.log(`Published to ${response.from}:`, response.ok);
 });
 ```
@@ -112,7 +112,8 @@ group
   });
 
 // Publish to all relays in group
-group.event(event).subscribe((response) => {
+const responses = await group.publish(event);
+responses.forEach((response) => {
   console.log(`Published to ${response.from}:`, response.ok);
 });
 ```

package/dist/__tests__/relay.test.js

@@ -144,7 +144,7 @@ describe("req", () => {
         // Verify the second subscription received the event and EOSE
         expect(secondSub.getValues()).toEqual([expect.objectContaining(mockEvent), "EOSE"]);
     });
-    it("should open connection and wait for authentication if relay info document has limitations.auth_required = true", async () => {
+    it("should wait for authentication if relay info document has limitations.auth_required = true", async () => {
         // Mock the fetchInformationDocument method to return a document with auth_required = true
         vi.spyOn(Relay, "fetchInformationDocument").mockImplementation(() => of({
             name: "Auth Required Relay",
@@ -162,20 +162,10 @@ describe("req", () => {
         const sub = subscribeSpyTo(relay.req([{ kinds: [1] }], "sub1"));
         // Wait 10ms to ensure the information document is fetched
         await new Promise((resolve) => setTimeout(resolve, 10));
-        // Wait for connection
-        await server.connected;
         // Verify no REQ message was sent yet (waiting for auth)
         expect(server).not.toHaveReceivedMessages(["REQ", "sub1", { kinds: [1] }]);
-        // Send AUTH challenge
-        server.send(["AUTH", "challenge"]);
-        // Send auth response
-        subscribeSpyTo(relay.auth(mockEvent));
-        // Verify the auth event was sent
-        await expect(server.nextMessage).resolves.toEqual(["AUTH", mockEvent]);
-        // Accept auth
-        server.send(["OK", mockEvent.id, true, ""]);
         // Simulate successful authentication
-        expect(relay.authenticated).toBe(true);
+        relay.authenticated$.next(true);
         // Now the REQ should be sent
         await expect(server).toReceiveMessage(["REQ", "sub1", { kinds: [1] }]);
         // Send EVENT and EOSE to complete the subscription

package/dist/group.d.ts

@@ -9,7 +9,7 @@ export declare class RelayGroup implements IGroup {
     /** Make a request to all relays */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an event to all relays */
-    event(event: NostrEvent): Observable<PublishResponse>;
+    event(event: NostrEvent, opts?: PublishOptions): Observable<PublishResponse>;
     /** Publish an event to all relays with retries ( default 3 retries ) */
     publish(event: NostrEvent, opts?: PublishOptions): Promise<PublishResponse[]>;
     /** Request events from all relays with retries ( default 3 retries ) */

package/dist/group.js

@@ -28,8 +28,8 @@ export class RelayGroup {
         return this.mergeEOSE(...requests);
     }
     /** Send an event to all relays */
-    event(event) {
-        return merge(...this.relays.map((relay) => relay.event(event).pipe(
+    event(event, opts) {
+        return merge(...this.relays.map((relay) => relay.event(event, opts).pipe(
         // Catch error and return as PublishResponse
         catchError((err) => of({ ok: false, from: relay.url, message: err?.message || "Unknown error" })))));
     }

package/dist/pool.d.ts

@@ -20,7 +20,7 @@ export declare class RelayPool implements IPool {
     /** Make a REQ to multiple relays that does not deduplicate events */
     req(relays: string[], filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an EVENT message to multiple relays */
-    event(relays: string[], event: NostrEvent): Observable<PublishResponse>;
+    event(relays: string[], event: NostrEvent, opts?: PublishOptions): Observable<PublishResponse>;
     /** Publish an event to multiple relays */
     publish(relays: string[], event: NostrEvent, opts?: PublishOptions): Promise<PublishResponse[]>;
     /** Request events from multiple relays */

package/dist/pool.js

@@ -55,8 +55,8 @@ export class RelayPool {
         return this.group(relays).req(filters, id);
     }
     /** Send an EVENT message to multiple relays */
-    event(relays, event) {
-        return this.group(relays).event(event);
+    event(relays, event, opts) {
+        return this.group(relays).event(event, opts);
     }
     /** Publish an event to multiple relays */
     publish(relays, event, opts) {

package/dist/relay.d.ts

@@ -79,7 +79,9 @@ export declare class Relay implements IRelay {
     /** Create a REQ observable that emits events or "EOSE" or errors */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an EVENT or AUTH message and return an observable of PublishResponse that completes or errors */
-    event(event: NostrEvent, verb?: "EVENT" | "AUTH"): Observable<PublishResponse>;
+    event(event: NostrEvent, opts?: PublishOptions & {
+        verb?: "EVENT" | "AUTH";
+    }): Observable<PublishResponse>;
     /** send and AUTH message */
     auth(event: NostrEvent): Promise<PublishResponse>;
     /** Authenticate with the relay using a signer */

package/dist/relay.js

@@ -2,7 +2,7 @@ import { logger } from "applesauce-core";
 import { simpleTimeout } from "applesauce-core/observable";
 import { nanoid } from "nanoid";
 import { nip42 } from "nostr-tools";
-import { BehaviorSubject, catchError, combineLatest, defer, endWith, filter, finalize, from, ignoreElements, isObservable, lastValueFrom, map, merge, mergeMap, mergeWith, NEVER, of, retry, scan, share, shareReplay, Subject, switchMap, take, takeUntil, tap, throwError, timeout, timer, } from "rxjs";
+import { BehaviorSubject, catchError, combineLatest, defer, endWith, filter, finalize, from, identity, ignoreElements, isObservable, lastValueFrom, map, merge, mergeMap, mergeWith, NEVER, of, pipe, retry, scan, share, shareReplay, Subject, switchMap, take, takeUntil, tap, throwError, timeout, timer, } from "rxjs";
 import { webSocket } from "rxjs/webSocket";
 import { ensureHttpURL } from "applesauce-core/helpers";
 import { completeOnEose } from "./operators/complete-on-eose.js";
@@ -286,7 +286,8 @@ export class Relay {
         return this.waitForReady(this.waitForAuth(this.authRequiredForRead$, observable));
     }
     /** Send an EVENT or AUTH message and return an observable of PublishResponse that completes or errors */
-    event(event, verb = "EVENT") {
+    event(event, opts) {
+        const verb = opts?.verb || "EVENT";
         const base = defer(() => {
             // Send event when subscription starts
             this.socket.next([verb, event]);
@@ -316,13 +317,27 @@ export class Relay {
         if (verb === "AUTH")
             return this.waitForReady(observable);
         else
-            return this.waitForReady(this.waitForAuth(this.authRequiredForPublish$, observable));
+            return this.waitForReady(this.waitForAuth(this.authRequiredForPublish$, observable)).pipe(
+            // If retry is set, add a pipeline for retrying the event
+            opts?.retries
+                ? pipe(
+                // If the relay responds with auth-required, throw an error for the retry operator to handle
+                mergeMap((result) => {
+                    if (result.ok === false && result.message?.startsWith("auth-required:"))
+                        return throwError(() => new Error(result.message));
+                    return of(result);
+                }), 
+                // Retry the event until it succeeds or the number of retries is reached
+                retry(opts.retries))
+                : identity);
     }
     /** send and AUTH message */
     auth(event) {
-        return lastValueFrom(this.event(event, "AUTH").pipe(
+        return lastValueFrom(this.event(event, { verb: "AUTH" }).pipe(
         // update authenticated
-        tap((result) => this.authenticationResponse$.next(result))));
+        tap((result) => {
+            this.authenticationResponse$.next(result);
+        })));
     }
     /** Authenticate with the relay using a signer */
     authenticate(signer) {
@@ -348,14 +363,7 @@ export class Relay {
     }
     /** Publishes an event to the relay and retries when relay errors or responds with auth-required ( default 3 retries ) */
     publish(event, opts) {
-        return lastValueFrom(this.event(event).pipe(mergeMap((result) => {
-            // If the relay responds with auth-required, throw an error for the retry operator to handle
-            if (result.ok === false && result.message?.startsWith("auth-required:"))
-                return throwError(() => new Error(result.message));
-            return of(result);
-        }), 
-        // Retry the publish until it succeeds or the number of retries is reached
-        retry(opts?.retries ?? 3)));
+        return lastValueFrom(this.event(event, { ...opts, verb: "EVENT" }));
     }
     /** Static method to fetch the NIP-11 information document for a relay */
     static fetchInformationDocument(url) {

package/dist/types.d.ts

@@ -39,7 +39,7 @@ export interface IRelay extends MultiplexWebSocket {
     /** Send a REQ message */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an EVENT message */
-    event(event: NostrEvent): Observable<PublishResponse>;
+    event(event: NostrEvent, opts?: PublishOptions): Observable<PublishResponse>;
     /** Send an AUTH message */
     auth(event: NostrEvent): Promise<PublishResponse>;
     /** Authenticate with the relay using a signer */
@@ -63,7 +63,7 @@ export interface IGroup {
     /** Send a REQ message */
     req(filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an EVENT message */
-    event(event: NostrEvent): Observable<PublishResponse>;
+    event(event: NostrEvent, opts?: PublishOptions): Observable<PublishResponse>;
     /** Send an EVENT message with retries */
     publish(event: NostrEvent, opts?: {
         retries?: number;
@@ -87,7 +87,7 @@ export interface IPool {
     /** Send a REQ message */
     req(relays: string[], filters: FilterInput, id?: string): Observable<SubscriptionResponse>;
     /** Send an EVENT message */
-    event(relays: string[], event: NostrEvent): Observable<PublishResponse>;
+    event(relays: string[], event: NostrEvent, opts?: PublishOptions): Observable<PublishResponse>;
     /** Send an EVENT message to relays with retries */
     publish(relays: string[], event: NostrEvent, opts?: {
         retries?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "0.0.0-next-20250716144720",
+  "version": "0.0.0-next-20250718173521",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
-    "applesauce-signers": "^2.0.0",
+    "applesauce-signers": "0.0.0-next-20250718173521",
     "@vitest/expect": "^3.1.1",
     "typescript": "^5.7.3",
     "vitest": "^3.2.3",