applesauce-wallet-connect 3.0.0 → 3.1.0

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export * as Blueprints from "./blueprints/index.js";
 export * as Helpers from "./helpers/index.js";
 export * from "./wallet-connect.js";
 export * from "./wallet-service.js";
-export * from "./types.js";
+export * from "./interop.js";

package/dist/index.js

@@ -2,4 +2,4 @@ export * as Blueprints from "./blueprints/index.js";
 export * as Helpers from "./helpers/index.js";
 export * from "./wallet-connect.js";
 export * from "./wallet-service.js";
-export * from "./types.js";
+export * from "./interop.js";

package/dist/interop.d.ts

@@ -0,0 +1,35 @@
+import { Filter, NostrEvent } from "nostr-tools";
+import { ObservableInput } from "rxjs";
+/** A method used to subscribe to events on a set of relays */
+export type NostrSubscriptionMethod = (relays: string[], filters: Filter[]) => ObservableInput<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> | ObservableInput<any>;
+/** A simple pool type that combines the subscription and publish methods */
+export type NostrPool = {
+    subscription: NostrSubscriptionMethod;
+    publish: NostrPublishMethod;
+};
+/** Options for setting the subscription and publish methods */
+export type NostrConnectionMethodsOptions = {
+    /** An optional method for subscribing to relays */
+    subscriptionMethod?: NostrSubscriptionMethod;
+    /** An optional method for publishing events */
+    publishMethod?: NostrPublishMethod;
+    /** An optional pool for connection methods */
+    pool?: NostrPool;
+};
+/** A class that implements has global fallback methods for subscription and publish methods */
+export interface NostrConnectionClassMethods {
+    new (...args: any[]): any;
+    /** A fallback method to use for subscriptionMethod if none is passed in when creating the client */
+    subscriptionMethod: NostrSubscriptionMethod | undefined;
+    /** A fallback method to use for publishMethod if none is passed in when creating the client */
+    publishMethod: NostrPublishMethod | undefined;
+    /** A fallback pool to use if none is pass in when creating the signer */
+    pool: NostrPool | undefined;
+}
+/** Get the subscription and publish methods for a NostrConnect class */
+export declare function getConnectionMethods(options: NostrConnectionMethodsOptions, cls?: NostrConnectionClassMethods): {
+    subscriptionMethod: NostrSubscriptionMethod;
+    publishMethod: NostrPublishMethod;
+};

package/dist/interop.js

@@ -0,0 +1,19 @@
+/** Get the subscription and publish methods for a NostrConnect class */
+export function getConnectionMethods(options, cls) {
+    const subscriptionMethod = options.subscriptionMethod ||
+        options.pool?.subscription.bind(options.pool) ||
+        cls?.subscriptionMethod ||
+        cls?.pool?.subscription.bind(cls.pool);
+    if (!subscriptionMethod)
+        throw new Error("Missing subscriptionMethod, either pass a method or set subscriptionMethod globally on the class");
+    const publishMethod = options.publishMethod ||
+        options.pool?.publish.bind(options.pool) ||
+        cls?.publishMethod ||
+        cls?.pool?.publish.bind(cls.pool);
+    if (!publishMethod)
+        throw new Error("Missing publishMethod, either pass a method or set publishMethod globally on the class");
+    return {
+        subscriptionMethod,
+        publishMethod,
+    };
+}

package/dist/wallet-connect.d.ts

@@ -3,9 +3,9 @@ import { EventSigner } from "applesauce-factory";
 import { NostrEvent } from "nostr-tools";
 import { BehaviorSubject, Observable, Subscription } from "rxjs";
 import { GetBalanceResult, GetInfoResult, ListTransactionsResult, LookupInvoiceResult, MakeInvoiceParams, MakeInvoiceResult, NotificationType, PayInvoiceResult, PayKeysendResult, WalletAuthURI, WalletConnectEncryptionMethod, WalletConnectURI, WalletMethod, WalletNotification, WalletRequest, WalletResponse, WalletSupport } from "./helpers/index.js";
-import { NostrPool, NostrPublishMethod, NostrSubscriptionMethod } from "./types.js";
+import { NostrConnectionMethodsOptions, NostrPool, NostrPublishMethod, NostrSubscriptionMethod } from "./interop.js";
 export type SerializedWalletConnect = WalletConnectURI;
-export type WalletConnectOptions = {
+export type WalletConnectOptions = NostrConnectionMethodsOptions & {
     /** The secret to use for the connection */
     secret: Uint8Array;
     /** The relays to use for the connection */
@@ -14,12 +14,6 @@ export type WalletConnectOptions = {
     service?: string;
     /** Default timeout for RPC requests in milliseconds */
     timeout?: number;
-    /** A method for subscribing to relays */
-    subscriptionMethod?: NostrSubscriptionMethod;
-    /** A method for publishing events */
-    publishMethod?: NostrPublishMethod;
-    /** An optional pool for connection methods */
-    pool?: NostrPool;
 };
 export declare class WalletConnect {
     /** A fallback method to use for subscriptionMethod if none is passed in when creating the client */

package/dist/wallet-connect.js

@@ -2,10 +2,11 @@ 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, ReplaySubject, share, switchMap, takeUntil, tap, timer, toArray, } from "rxjs";
+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 { WalletRequestBlueprint } from "./blueprints/index.js";
 import { createWalletError } from "./helpers/error.js";
 import { createWalletAuthURI, getPreferredEncryption, getWalletNotification, getWalletRequestEncryption, getWalletResponse, getWalletResponseRequestId, getWalletSupport, isWalletNotificationLocked, isWalletResponseLocked, parseWalletConnectURI, supportsMethod, supportsNotifications, supportsNotificationType, unlockWalletNotification, unlockWalletResponse, WALLET_INFO_KIND, WALLET_LEGACY_NOTIFICATION_KIND, WALLET_NOTIFICATION_KIND, WALLET_RESPONSE_KIND, } from "./helpers/index.js";
+import { getConnectionMethods, } from "./interop.js";
 export class WalletConnect {
     /** A fallback method to use for subscriptionMethod if none is passed in when creating the client */
     static subscriptionMethod = undefined;
@@ -58,15 +59,7 @@ export class WalletConnect {
             },
         };
         // Get the subscription and publish methods
-        const subscriptionMethod = options.subscriptionMethod ||
-            options.pool?.subscription ||
-            WalletConnect.subscriptionMethod ||
-            WalletConnect.pool?.subscription;
-        if (!subscriptionMethod)
-            throw new Error("Missing subscriptionMethod, either pass a method or set WalletConnect.subscriptionMethod");
-        const publishMethod = options.publishMethod || options.pool?.publish || WalletConnect.publishMethod || WalletConnect.pool?.publish;
-        if (!publishMethod)
-            throw new Error("Missing publishMethod, either pass a method or set WalletConnect.publishMethod");
+        const { subscriptionMethod, publishMethod } = getConnectionMethods(options, WalletConnect);
         // Use arrow functions so "this" isn't bound to the signer
         this.subscriptionMethod = (relays, filters) => subscriptionMethod(relays, filters);
         this.publishMethod = (relays, event) => publishMethod(relays, event);
@@ -75,10 +68,14 @@ export class WalletConnect {
             const client = getPublicKey(this.secret);
             // If the service is not known yet, subscribe to a wallet info event tagging the client
             if (!service)
-                return this.subscriptionMethod(this.relays, [{ kinds: [WALLET_INFO_KIND], "#p": [client] }]).pipe(
+                return from(this.subscriptionMethod(this.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 this.subscriptionMethod(this.relays, [
+            return from(this.subscriptionMethod(this.relays, [
                 // Subscribe to response events
                 {
                     kinds: [WALLET_RESPONSE_KIND, WALLET_NOTIFICATION_KIND, WALLET_LEGACY_NOTIFICATION_KIND],
@@ -87,7 +84,11 @@ export class WalletConnect {
                 },
                 // Subscribe to wallet info events
                 { kinds: [WALLET_INFO_KIND], authors: [service] },
-            ]).pipe(
+            ])).pipe(
+            // Keep the connection open indefinitely
+            repeat(), 
+            // Retry on connection failure
+            retry(), 
             // Ignore strings (support for applesauce-relay)
             filter((event) => typeof event !== "string"), 
             // Only include events from the wallet service

package/dist/wallet-service.d.ts

@@ -1,13 +1,13 @@
 import { EventSigner } from "applesauce-factory";
 import { NostrEvent } from "nostr-tools";
 import { Observable, Subscription } from "rxjs";
+import { WalletAuthURI } from "./helpers/auth-uri.js";
 import { WalletErrorCode } from "./helpers/error.js";
 import { NotificationType, WalletNotification } from "./helpers/notification.js";
 import { GetBalanceParams, GetInfoParams, ListTransactionsParams, LookupInvoiceParams, MakeInvoiceParams, MultiPayInvoiceParams, MultiPayKeysendParams, PayInvoiceParams, PayKeysendParams, WalletRequest } from "./helpers/request.js";
 import { GetBalanceResult, GetInfoResult, ListTransactionsResult, LookupInvoiceResult, MakeInvoiceResult, MultiPayInvoiceResult, MultiPayKeysendResult, PayInvoiceResult, PayKeysendResult, WalletResponse } from "./helpers/response.js";
 import { WalletSupport } from "./helpers/support.js";
-import { NostrPool, NostrPublishMethod, NostrSubscriptionMethod } from "./types.js";
-import { WalletAuthURI } from "./helpers/auth-uri.js";
+import { NostrConnectionMethodsOptions, NostrPool, NostrPublishMethod, NostrSubscriptionMethod } from "./interop.js";
 /** Handler function for pay_invoice method */
 export type PayInvoiceHandler = (params: PayInvoiceParams) => Promise<PayInvoiceResult>;
 /** Handler function for multi_pay_invoice method */
@@ -45,7 +45,7 @@ export type SerializedWalletService = {
     relays: string[];
 };
 /** Options for creating a WalletService */
-export interface WalletServiceOptions {
+export interface WalletServiceOptions extends NostrConnectionMethodsOptions {
     /** The relays to use for the service */
     relays: string[];
     /** The signer to use for creating and unlocking events */
@@ -58,12 +58,6 @@ export interface WalletServiceOptions {
     handlers: WalletServiceHandlers;
     /** An array of notifications this wallet supports */
     notifications?: NotificationType[];
-    /** An optional method for subscribing to relays */
-    subscriptionMethod?: NostrSubscriptionMethod;
-    /** An optional method for publishing events */
-    publishMethod?: NostrPublishMethod;
-    /** An optional pool for connection methods */
-    pool?: NostrPool;
 }
 /** NIP-47 Wallet Service implementation */
 export declare class WalletService {

package/dist/wallet-service.js

@@ -1,14 +1,15 @@
 import { logger } from "applesauce-core";
 import { create } from "applesauce-factory";
 import { generateSecretKey, getPublicKey, verifyEvent } from "nostr-tools";
-import { filter, mergeMap, share } from "rxjs";
+import { filter, from, mergeMap, repeat, retry, share } from "rxjs";
+import { bytesToHex } from "@noble/hashes/utils";
 import { WalletLegacyNotificationBlueprint, WalletNotificationBlueprint } from "./blueprints/notification.js";
 import { WalletResponseBlueprint } from "./blueprints/response.js";
 import { WalletSupportBlueprint } from "./blueprints/support.js";
+import { parseWalletAuthURI } from "./helpers/auth-uri.js";
 import { WalletBaseError } from "./helpers/error.js";
 import { getWalletRequest, isWalletRequestExpired, isWalletRequestLocked, unlockWalletRequest, WALLET_REQUEST_KIND, } from "./helpers/request.js";
-import { bytesToHex } from "@noble/hashes/utils";
-import { parseWalletAuthURI } from "./helpers/auth-uri.js";
+import { getConnectionMethods, } from "./interop.js";
 /** NIP-47 Wallet Service implementation */
 export class WalletService {
     /** A fallback method to use for subscriptionMethod if none is passed in when creating the client */
@@ -56,15 +57,7 @@ export class WalletService {
             this.client = getPublicKey(this.secret);
         }
         // Get the subscription and publish methods
-        const subscriptionMethod = options.subscriptionMethod ||
-            options.pool?.subscription ||
-            WalletService.subscriptionMethod ||
-            WalletService.pool?.subscription;
-        if (!subscriptionMethod)
-            throw new Error("Missing subscriptionMethod, either pass a method or set WalletService.subscriptionMethod");
-        const publishMethod = options.publishMethod || options.pool?.publish || WalletService.publishMethod || WalletService.pool?.publish;
-        if (!publishMethod)
-            throw new Error("Missing publishMethod, either pass a method or set WalletService.publishMethod");
+        const { subscriptionMethod, publishMethod } = getConnectionMethods(options, WalletService);
         // Use arrow functions so "this" isn't bound to the signer
         this.subscriptionMethod = (relays, filters) => subscriptionMethod(relays, filters);
         this.publishMethod = (relays, event) => publishMethod(relays, event);
@@ -91,13 +84,17 @@ export class WalletService {
         // Get our public key
         this.pubkey = await this.signer.getPublicKey();
         // Create shared request observable with ref counting and timer
-        this.events$ = this.subscriptionMethod(this.relays, [
+        this.events$ = from(this.subscriptionMethod(this.relays, [
             {
                 kinds: [WALLET_REQUEST_KIND],
                 "#p": [this.pubkey], // Only requests directed to us
                 authors: [this.client], // Only requests from the client
             },
-        ]).pipe(
+        ])).pipe(
+        // Keep the connection open indefinitely
+        repeat(), 
+        // Retry on connection failure
+        retry(), 
         // Ignore strings (support for applesauce-relay)
         filter((event) => typeof event !== "string"), 
         // Only include valid wallet request events

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet-connect",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -58,9 +58,9 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "^3.0.0",
-    "applesauce-factory": "^3.0.0",
-    "nostr-tools": "^2.13",
+    "applesauce-core": "^3.1.0",
+    "applesauce-factory": "^3.1.0",
+    "nostr-tools": "~2.15",
     "@noble/hashes": "^1.7.1",
     "rxjs": "^7.8.1"
   },

package/dist/types.d.ts

@@ -1,11 +0,0 @@
-import { Filter, NostrEvent } from "nostr-tools";
-import { Observable } from "rxjs";
-/** A method used to subscribe to events on a set of relays */
-export type NostrSubscriptionMethod = (relays: string[], filters: Filter[]) => Observable<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> | Observable<any>;
-/** A simple pool type that combines the subscription and publish methods */
-export type NostrPool = {
-    subscription: NostrSubscriptionMethod;
-    publish: NostrPublishMethod;
-};

package/dist/types.js

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