applesauce-wallet-connect 4.0.0 → 4.1.0

package/dist/wallet-service.js

@@ -7,7 +7,7 @@ import { WalletLegacyNotificationBlueprint, WalletNotificationBlueprint } from "
 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 { NotImplementedError, WalletBaseError } from "./helpers/error.js";
 import { getWalletRequest, isValidWalletRequest, isWalletRequestExpired, unlockWalletRequest, WALLET_REQUEST_KIND, } from "./helpers/request.js";
 import { getConnectionMethods, } from "./interop.js";
 /** NIP-47 Wallet Service implementation */
@@ -23,6 +23,8 @@ export class WalletService {
     /** A method for publishing events */
     publishMethod;
     log = logger.extend("WalletService");
+    /** A special method for getting the generic wallet information */
+    getInfo;
     /** The relays to use for the service */
     relays;
     /** The signer used for creating and unlocking events */
@@ -162,7 +164,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);
         }
@@ -192,44 +196,27 @@ export class WalletService {
     /** Process a decrypted wallet request */
     async processRequest(requestEvent, request) {
         const handler = this.handlers[request.method];
-        if (!handler) {
-            await this.sendErrorResponse(requestEvent, "NOT_IMPLEMENTED", `Method ${request.method} not supported`);
-            return;
-        }
         try {
-            let result;
-            const method = request.method; // Store method for use in catch block
-            switch (method) {
-                case "pay_invoice":
-                    result = await handler(request.params);
-                    break;
-                case "multi_pay_invoice":
-                    result = await handler(request.params);
-                    break;
-                case "pay_keysend":
-                    result = await handler(request.params);
-                    break;
-                case "multi_pay_keysend":
-                    result = await handler(request.params);
-                    break;
-                case "make_invoice":
-                    result = await handler(request.params);
-                    break;
-                case "lookup_invoice":
-                    result = await handler(request.params);
-                    break;
-                case "list_transactions":
-                    result = await handler(request.params);
-                    break;
-                case "get_balance":
-                    result = await handler(request.params);
-                    break;
-                case "get_info":
-                    result = await handler(request.params);
-                    break;
+            let result = undefined;
+            // If the user has not implemented the method
+            if (!handler) {
+                // If its the get_info try to use the builtin getInfo method
+                if (request.method === "get_info") {
+                    result = { ...(this.getInfo?.() ?? {}), ...this.support };
+                }
+                else {
+                    // Else throw not supported error
+                    throw new NotImplementedError(`Method ${request.method} not supported`);
+                }
             }
+            // Otherwise use the user provided handler
+            if (!result && handler)
+                result = await handler(request.params);
+            // Throw if failed to get result
+            if (!result)
+                throw new NotImplementedError(`Method ${request.method} not supported`);
             // Send success response
-            await this.sendSuccessResponse(requestEvent, method, result);
+            await this.sendSuccessResponse(requestEvent, request.method, result);
         }
         catch (error) {
             this.log(`Error executing ${request.method}:`, error);
@@ -273,7 +260,7 @@ export class WalletService {
     /** Send a response event */
     async sendResponse(requestEvent, response) {
         try {
-            const draft = await create({ signer: this.signer }, WalletResponseBlueprint, requestEvent, response);
+            const draft = await create({ signer: this.signer }, WalletResponseBlueprint(requestEvent, response));
             const event = await this.signer.signEvent(draft);
             await this.publishMethod(this.relays, event);
         }
@@ -284,10 +271,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": "4.0.0",
+  "version": "4.1.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-core": "^4.0.0",
+    "applesauce-core": "^4.1.0",
     "applesauce-factory": "^4.0.0",
     "nostr-tools": "~2.17",
     "rxjs": "^7.8.1"