applesauce-relay 0.0.0-next-20250522030625 → 0.0.0-next-20250606170247

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 wait for authentication if relay info document has limitations.auth_required = true", async () => {
+    it("should open connection and 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,10 +162,20 @@ 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
-        relay.authenticated$.next(true);
+        expect(relay.authenticated).toBe(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/negentropy.d.ts

@@ -1,8 +1,8 @@
-import { ISyncEventStore } from "applesauce-core";
+import { IEventStoreRead } from "applesauce-core";
 import { Filter } from "nostr-tools";
 import { MultiplexWebSocket } from "./types.js";
 import { NegentropyStorageVector } from "./lib/negentropy.js";
-export declare function buildStorageFromFilter(store: ISyncEventStore, filter: Filter): NegentropyStorageVector;
+export declare function buildStorageFromFilter(store: IEventStoreRead, filter: Filter): NegentropyStorageVector;
 export declare function buildStorageVector(items: {
     id: string;
     created_at: number;

package/dist/negentropy.js

@@ -5,7 +5,7 @@ import { Negentropy, NegentropyStorageVector } from "./lib/negentropy.js";
 const log = logger.extend("negentropy");
 export function buildStorageFromFilter(store, filter) {
     const storage = new NegentropyStorageVector();
-    for (const event of store.getAll(filter))
+    for (const event of store.getByFilters(filter))
         storage.insert(event.created_at, event.id);
     storage.seal();
     return storage;

package/dist/relay.d.ts

@@ -61,12 +61,12 @@ export declare class Relay implements IRelay {
     protected authRequiredForReq: Observable<boolean>;
     protected authRequiredForEvent: Observable<boolean>;
     protected resetState(): void;
-    /** An internal observable that is responsible for watching all messages and updating state */
+    /** An internal observable that is responsible for watching all messages and updating state, subscribing to it will trigger a connection to the relay */
     protected watchTower: Observable<never>;
     constructor(url: string, opts?: RelayOptions);
     /** Set ready = false and start the reconnect timer */
     protected startReconnectTimer(error: Error | CloseEvent): void;
-    /** Wait for ready and authenticated */
+    /** Wait for authentication state, make connection and then wait for authentication if required */
     protected waitForAuth<T extends unknown = unknown>(requireAuth: Observable<boolean>, observable: Observable<T>): Observable<T>;
     /** Wait for the relay to be ready to accept connections */
     protected waitForReady<T extends unknown = unknown>(observable: Observable<T>): Observable<T>;

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, map, merge, mergeMap, 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, ignoreElements, isObservable, map, merge, mergeMap, mergeWith, NEVER, of, 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";
@@ -85,7 +85,7 @@ export class Relay {
         if (this.receivedAuthRequiredForEvent.value)
             this.receivedAuthRequiredForEvent.next(false);
     }
-    /** An internal observable that is responsible for watching all messages and updating state */
+    /** An internal observable that is responsible for watching all messages and updating state, subscribing to it will trigger a connection to the relay */
     watchTower;
     constructor(url, opts) {
         this.url = url;
@@ -190,11 +190,13 @@ export class Relay {
             .pipe(take(1))
             .subscribe(() => this.ready$.next(true));
     }
-    /** Wait for ready and authenticated */
+    /** Wait for authentication state, make connection and then wait for authentication if required */
     waitForAuth(
     // NOTE: require BehaviorSubject so it always has a value
     requireAuth, observable) {
         return combineLatest([requireAuth, this.authenticated$]).pipe(
+        // Once the auth state is known, make a connection and watch for auth challenges
+        mergeWith(this.watchTower), 
         // wait for auth not required or authenticated
         filter(([required, authenticated]) => !required || authenticated), 
         // complete after the first value so this does not repeat
@@ -284,10 +286,8 @@ export class Relay {
             // format OK message
             map((m) => ({ ok: m[2], message: m[3], from: this.url })));
         });
-        // Start the watch tower with the observable
-        const withWatchTower = merge(this.watchTower, base);
-        // Add complete operators
-        const observable = withWatchTower.pipe(
+        // Start the watch tower and add complete operators
+        const observable = merge(this.watchTower, base).pipe(
         // complete on first value
         take(1), 
         // listen for OK auth-required

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-relay",
-  "version": "0.0.0-next-20250522030625",
+  "version": "0.0.0-next-20250606170247",
   "description": "nostr relay communication framework built on rxjs",
   "type": "module",
   "main": "dist/index.js",
@@ -54,14 +54,14 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "0.0.0-next-20250522030625",
+    "applesauce-core": "0.0.0-next-20250606170247",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.13",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
-    "applesauce-signers": "0.0.0-next-20250522030625",
+    "applesauce-signers": "0.0.0-next-20250606170247",
     "@vitest/expect": "^3.1.1",
     "typescript": "^5.7.3",
     "vitest": "^3.1.1",