applesauce-signers 0.0.0-next-20250511152752 → 0.0.0-next-20250526151506

package/dist/signers/nostr-connect-signer.d.ts

@@ -82,8 +82,10 @@ interface Observer<T> {
 type Subscribable<T extends unknown> = {
     subscribe: (observer: Partial<Observer<T>>) => Unsubscribable;
 };
-export type NostrSubscriptionMethod = (relays: string[], filters: Filter[]) => Subscribable<NostrEvent>;
-export type NostrPublishMethod = (relays: string[], event: NostrEvent) => any | Promise<any>;
+/** A method used to subscribe to events on a set of relays */
+export type NostrSubscriptionMethod = (relays: string[], filters: Filter[]) => Subscribable<NostrEvent | string>;
+/** A method used for publishing an event, can return a Promise that completes when published or an Observable that completes when published*/
+export type NostrPublishMethod = (relays: string[], event: NostrEvent) => Promise<any> | Subscribable<any>;
 export type NostrConnectAppMetadata = {
     name?: string;
     image?: string;

package/dist/signers/nostr-connect-signer.js

@@ -104,7 +104,7 @@ export class NostrConnectSigner {
                 "#p": [pubkey],
             },
         ]).subscribe({
-            next: (event) => this.handleEvent(event),
+            next: (event) => typeof event !== "string" && this.handleEvent(event),
         });
         this.log("Opened", this.relays);
     }
@@ -195,10 +195,16 @@ export class NostrConnectSigner {
         const request = { id, method, params };
         const encrypted = await this.signer.nip44.encrypt(this.remote, JSON.stringify(request));
         const event = await this.createRequestEvent(encrypted, this.remote, kind);
-        this.log(`Sending request ${id} (${method}) ${JSON.stringify(params)}`);
+        this.log(`Sending ${id} (${method}) ${JSON.stringify(params)}`);
         const p = createDefer();
         this.requests.set(id, p);
-        await this.publishMethod?.(this.relays, event);
+        const result = this.publishMethod?.(this.relays, event);
+        // Handle returned Promise or Observable
+        if (result instanceof Promise)
+            await result;
+        else if ("subscribe" in result)
+            await new Promise((res) => result.subscribe({ complete: res }));
+        this.log(`Sent ${id} (${method})`);
         return p;
     }
     /** Connect to remote signer */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-signers",
-  "version": "0.0.0-next-20250511152752",
+  "version": "0.0.0-next-20250526151506",
   "description": "Signer classes for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -36,10 +36,10 @@
     "@noble/hashes": "^1.7.1",
     "@noble/secp256k1": "^1.7.1",
     "@scure/base": "^1.2.4",
-    "applesauce-core": "0.0.0-next-20250511152752",
+    "applesauce-core": "0.0.0-next-20250526151506",
     "debug": "^4.4.0",
     "nanoid": "^5.0.9",
-    "nostr-tools": "^2.10.4"
+    "nostr-tools": "^2.13"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

package/dist/logger.d.ts

@@ -1,2 +0,0 @@
-import debug from "debug";
-export declare const logger: debug.Debugger;

package/dist/logger.js

@@ -1,2 +0,0 @@
-import debug from "debug";
-export const logger = debug("applesauce:signer");

package/dist/signers/nostr-connect-signer.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/signers/nostr-connect-signer.test.js

@@ -1,23 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { NostrConnectSigner } from "./nostr-connect-signer.js";
-import { SimpleSigner } from "./simple-signer.js";
-describe("NostrConnectSigner", () => {
-    describe("connection", () => {
-        it("should call subscription method with filters", async () => {
-            const relays = ["wss://relay.signer.com"];
-            const subscription = vi.fn().mockReturnValue({ subscribe: vi.fn() });
-            const publish = vi.fn(async () => { });
-            const client = new SimpleSigner();
-            const remote = new SimpleSigner();
-            const signer = new NostrConnectSigner({
-                relays,
-                remote: await remote.getPublicKey(),
-                signer: client,
-                subscriptionMethod: subscription,
-                publishMethod: publish,
-            });
-            signer.connect();
-            expect(subscription).toHaveBeenCalledWith(relays, [{ "#p": [await client.getPublicKey()], kinds: [24133] }]);
-        });
-    });
-});