applesauce-wallet-connect 0.0.0-next-20250923113611 → 0.0.0-next-20251009073624

package/README.md

@@ -41,10 +41,10 @@ Create a wallet service that handles NIP-47 requests:
 
 ```typescript
 import { WalletService } from "applesauce-wallet-connect";
-import { SimpleSigner } from "applesauce-signers";
+import { PrivateKeySigner } from "applesauce-signers";
 
 // Create a signer for the service
-const signer = new SimpleSigner();
+const signer = new PrivateKeySigner();
 
 // Define method handlers
 const handlers = {

package/dist/blueprints/support.d.ts

@@ -1,4 +1,9 @@
 import { EventBlueprint } from "applesauce-factory";
 import { WalletSupport } from "../helpers/support.js";
-/** Creates a wallet info event */
-export declare function WalletSupportBlueprint(info: WalletSupport, client?: string): EventBlueprint;
+/**
+ * Creates a wallet info event
+ * @param info - The wallet support information
+ * @param client - The client pubkey
+ * @param overrideRelay - An optional relay to tell the client which relay to use (for nostr+walletauth URI connections)
+ */
+export declare function WalletSupportBlueprint(info: WalletSupport, client?: string, overrideRelay?: string): EventBlueprint;

package/dist/blueprints/support.js

@@ -2,9 +2,14 @@ import { blueprint } from "applesauce-factory";
 import { setContent } from "applesauce-factory/operations/content";
 import { includeSingletonTag } from "applesauce-factory/operations";
 import { WALLET_INFO_KIND } from "../helpers/support.js";
-/** Creates a wallet info event */
-export function WalletSupportBlueprint(info, client) {
+/**
+ * Creates a wallet info event
+ * @param info - The wallet support information
+ * @param client - The client pubkey
+ * @param overrideRelay - An optional relay to tell the client which relay to use (for nostr+walletauth URI connections)
+ */
+export function WalletSupportBlueprint(info, client, overrideRelay) {
     return blueprint(WALLET_INFO_KIND, setContent(info.methods.join(" ")), info.encryption ? includeSingletonTag(["encryption", info.encryption.join(" ")]) : undefined, info.notifications ? includeSingletonTag(["notifications", info.notifications.join(" ")]) : undefined, 
     // An optional client pubkey to notify the service is created (used for nostr+walletauth URI connections)
-    client ? includeSingletonTag(["p", client]) : undefined);
+    client ? includeSingletonTag(overrideRelay ? ["p", client, overrideRelay] : ["p", client]) : undefined);
 }

package/dist/wallet-connect.d.ts

@@ -14,6 +14,8 @@ export type WalletConnectOptions = NostrConnectionMethodsOptions & {
     service?: string;
     /** Default timeout for RPC requests in milliseconds */
     timeout?: number;
+    /** Whether to accept the relay hint from the wallet service */
+    acceptRelayHint?: boolean;
 };
 export declare class WalletConnect {
     /** A fallback method to use for subscriptionMethod if none is passed in when creating the client */
@@ -30,7 +32,10 @@ export declare class WalletConnect {
     readonly secret: Uint8Array;
     protected readonly signer: EventSigner;
     /** The relays to use for the connection */
-    readonly relays: string[];
+    protected relays$: BehaviorSubject<string[]>;
+    get relays(): string[];
+    /** Whether to accept the relay hint from the wallet service */
+    acceptRelayHint: boolean;
     /** The wallet service public key ( unset if waiting for service ) */
     service$: BehaviorSubject<string | undefined>;
     get service(): string | undefined;

package/dist/wallet-connect.js

@@ -2,7 +2,7 @@ import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
 import { simpleTimeout } from "applesauce-core";
 import { create } from "applesauce-factory";
 import { finalizeEvent, getPublicKey, nip04, nip44, verifyEvent } from "nostr-tools";
-import { BehaviorSubject, defer, filter, firstValueFrom, from, fromEvent, identity, ignoreElements, lastValueFrom, map, merge, mergeMap, repeat, ReplaySubject, retry, share, switchMap, takeUntil, tap, timer, toArray, } from "rxjs";
+import { BehaviorSubject, combineLatest, defer, filter, firstValueFrom, from, fromEvent, identity, ignoreElements, lastValueFrom, map, merge, mergeMap, of, repeat, ReplaySubject, retry, share, switchMap, take, takeUntil, tap, timer, toArray, } from "rxjs";
 import { WalletRequestBlueprint } from "./blueprints/index.js";
 import { createWalletError } from "./helpers/error.js";
 import { createWalletAuthURI, getPreferredEncryption, getWalletRequestEncryption, getWalletResponseRequestId, getWalletSupport, isValidWalletNotification, isValidWalletResponse, parseWalletConnectURI, supportsMethod, supportsNotifications, supportsNotificationType, unlockWalletNotification, unlockWalletResponse, WALLET_INFO_KIND, WALLET_LEGACY_NOTIFICATION_KIND, WALLET_NOTIFICATION_KIND, WALLET_RESPONSE_KIND, } from "./helpers/index.js";
@@ -22,7 +22,12 @@ export class WalletConnect {
     secret;
     signer;
     /** The relays to use for the connection */
-    relays;
+    relays$ = new BehaviorSubject([]);
+    get relays() {
+        return this.relays$.value;
+    }
+    /** Whether to accept the relay hint from the wallet service */
+    acceptRelayHint;
     /** The wallet service public key ( unset if waiting for service ) */
     service$ = new BehaviorSubject(undefined);
     get service() {
@@ -42,7 +47,8 @@ export class WalletConnect {
     waitForService$;
     constructor(options) {
         this.secret = options.secret;
-        this.relays = options.relays;
+        this.relays$.next(options.relays);
+        this.acceptRelayHint = options.acceptRelayHint ?? true;
         this.service$.next(options.service);
         this.defaultTimeout = options.timeout || 30000; // 30 second default timeout
         // Create a signer for the factory
@@ -64,18 +70,18 @@ export class WalletConnect {
         this.subscriptionMethod = (relays, filters) => subscriptionMethod(relays, filters);
         this.publishMethod = (relays, event) => publishMethod(relays, event);
         // Create shared observable for all wallet events
-        this.events$ = this.service$.pipe(switchMap((service) => {
+        this.events$ = combineLatest([this.service$, this.relays$]).pipe(switchMap(([service, relays]) => {
             const client = getPublicKey(this.secret);
             // If the service is not known yet, subscribe to a wallet info event tagging the client
             if (!service)
-                return from(this.subscriptionMethod(this.relays, [{ kinds: [WALLET_INFO_KIND], "#p": [client] }])).pipe(
+                return from(this.subscriptionMethod(relays, [{ kinds: [WALLET_INFO_KIND], "#p": [client] }])).pipe(
                 // Keep the connection open indefinitely
                 repeat(), 
                 // Retry on connection failure
                 retry(), 
                 // Ignore strings (support for applesauce-relay)
                 filter((event) => typeof event !== "string"));
-            return from(this.subscriptionMethod(this.relays, [
+            return from(this.subscriptionMethod(relays, [
                 // Subscribe to response events
                 {
                     kinds: [WALLET_RESPONSE_KIND, WALLET_NOTIFICATION_KIND, WALLET_LEGACY_NOTIFICATION_KIND],
@@ -104,18 +110,29 @@ export class WalletConnect {
         }));
         this.encryption$ = this.support$.pipe(map((info) => (info ? getPreferredEncryption(info) : "nip04")));
         this.notifications$ = this.events$.pipe(filter((event) => isValidWalletNotification(event)), mergeMap((event) => this.handleNotificationEvent(event)));
-        this.waitForService$ = this.events$.pipe(
-        // Complete when the service is set
-        takeUntil(this.service$), 
-        // Only listen for wallet info events
-        filter((event) => event.kind === WALLET_INFO_KIND && !this.service), 
-        // Set the service to the pubkey of the wallet info event
-        tap((event) => {
-            // Set the service to the pubkey of the wallet info event
-            this.service$.next(event.pubkey);
-        }), 
-        // Get the service pubkey from the event
-        map((event) => event.pubkey), 
+        this.waitForService$ = defer(() => 
+        // If service is already set, return it
+        this.service$.value
+            ? of(this.service$.value)
+            : // Otherwise listen for new wallet info events
+                this.events$.pipe(
+                // Only listen for wallet info events
+                filter((event) => event.kind === WALLET_INFO_KIND), 
+                // Set the service to the pubkey of the wallet info event
+                tap((event) => {
+                    // Set the service to the pubkey of the wallet info event
+                    this.service$.next(event.pubkey);
+                    // Switch to the relay from the service if its set
+                    if (this.acceptRelayHint) {
+                        const relay = event.tags.find((t) => t[0] === "p" && t[2])?.[2];
+                        if (relay)
+                            this.relays$.next([relay]);
+                    }
+                }), 
+                // Get the service pubkey from the event
+                map((event) => event.pubkey), 
+                // Complete after the first value
+                take(1))).pipe(
         // Only create a single subscription to avoid multiple side effects
         share());
     }
@@ -144,7 +161,7 @@ export class WalletConnect {
     request(request, options = {}) {
         if (!this.service)
             throw new Error("WalletConnect is not connected to a service");
-        // Create the request evnet
+        // Create the request event
         return defer(async () => {
             // Get the preferred encryption method for the wallet
             const encryption = await firstValueFrom(this.encryption$);

package/dist/wallet-service.d.ts

@@ -82,7 +82,7 @@ export declare class WalletService {
     /** The service's public key */
     pubkey: string | null;
     /** The client's secret key */
-    protected secret: Uint8Array;
+    protected secret?: Uint8Array;
     /** The client's public key */
     client: string;
     /** Shared observable for all wallet request events */
@@ -115,5 +115,8 @@ export declare class WalletService {
     /** Send a response event */
     protected sendResponse(requestEvent: WalletRequestEvent, response: WalletResponse): Promise<void>;
     /** Creates a service for a nostr+walletauth URI */
-    static fromAuthURI(uri: string | WalletAuthURI, options: Omit<WalletServiceOptions, "relays">): WalletService;
+    static fromAuthURI(uri: string | WalletAuthURI, options: Omit<WalletServiceOptions, "relays"> & {
+        /** A relay or method to select a single relay for the client and service to communicate over */
+        overrideRelay?: string | ((relays: string[]) => string);
+    }): WalletService;
 }

package/dist/wallet-service.js

@@ -49,10 +49,16 @@ export class WalletService {
         this.handlers = options.handlers;
         // Set the client's secret and public key
         if (options.secret) {
+            // Service was created with a custom secret
             this.secret = options.secret;
             this.client = getPublicKey(this.secret);
         }
+        else if (options.client) {
+            // Service was restored with only the clients pubkey
+            this.client = options.client;
+        }
         else {
+            // Generate secret and client pubkey
             this.secret = generateSecretKey();
             this.client = getPublicKey(this.secret);
         }
@@ -131,6 +137,8 @@ export class WalletService {
     }
     /** Get the connection URI for the service */
     getConnectURI() {
+        if (!this.secret)
+            throw new Error("Service was not created with a secret");
         if (!this.pubkey)
             throw new Error("Service is not running");
         if (!this.relays.length)
@@ -154,7 +162,9 @@ export class WalletService {
     /** Publish the wallet support event */
     async publishSupportEvent() {
         try {
-            const draft = await create({ signer: this.signer }, WalletSupportBlueprint, this.support, this.client);
+            // Tell the client which relay to use if there is only one (for nostr+walletauth URI connections)
+            const overrideRelay = this.relays.length === 1 ? this.relays[0] : undefined;
+            const draft = await create({ signer: this.signer }, WalletSupportBlueprint, this.support, this.client, overrideRelay);
             const event = await this.signer.signEvent(draft);
             await this.publishMethod(this.relays, event);
         }
@@ -276,10 +286,13 @@ export class WalletService {
     }
     /** Creates a service for a nostr+walletauth URI */
     static fromAuthURI(uri, options) {
-        const { client, relays } = typeof uri === "string" ? parseWalletAuthURI(uri) : uri;
+        const authURI = typeof uri === "string" ? parseWalletAuthURI(uri) : uri;
+        const relays = options.overrideRelay
+            ? [typeof options.overrideRelay === "function" ? options.overrideRelay(authURI.relays) : options.overrideRelay]
+            : authURI.relays;
         return new WalletService({
             ...options,
-            client,
+            client: authURI.client,
             relays,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet-connect",
-  "version": "0.0.0-next-20250923113611",
+  "version": "0.0.0-next-20251009073624",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "0.0.0-next-20250923113611",
-    "applesauce-factory": "0.0.0-next-20250923113611",
+    "applesauce-core": "^4.0.0",
+    "applesauce-factory": "^4.0.0",
     "nostr-tools": "~2.17",
     "rxjs": "^7.8.1"
   },