@arkade-os/sdk 0.4.1 → 0.4.3

package/dist/cjs/wallet/delegator.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DelegatorManagerImpl = void 0;
+exports.findDestinationOutputIndex = findDestinationOutputIndex;
 const __1 = require("..");
 const base_1 = require("@scure/base");
 const base_2 = require("../script/base");
 const forfeit_1 = require("../forfeit");
 const btc_signer_1 = require("@scure/btc-signer");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const networks_1 = require("../networks");
 const asset_1 = require("./asset");
 const extension_1 = require("../extension");
@@ -173,7 +175,7 @@ async function delegate(identity, delegatorProvider, arkInfoProvider, vtxos, des
         script: destinationScript,
         amount: amount,
     });
-    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds);
+    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds, destinationScript);
     const forfeitOutputScript = btc_signer_1.OutScript.encode((0, btc_signer_1.Address)((0, networks_1.getNetwork)(network)).decode(forfeitAddress));
     const forfeits = await Promise.all(vtxos
         .filter((v) => !(0, __1.isRecoverable)(v))
@@ -218,7 +220,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
     });
     return identity.sign(tx);
 }
-async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt) {
+async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt, destinationScript) {
     // if some of the inputs hold assets, build the asset packet and append as output
     // in the intent proof tx, there is a "fake" input at index 0
     // so the real coin indices are offset by +1
@@ -232,8 +234,11 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         }
     }
     let outputAssets;
-    let assetOutputIndex; // where to send the assets
+    const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
     if (assetInputs.size > 0) {
+        if (assetOutputIndex === -1) {
+            throw new Error("Cannot assign assets: no output matches the destination address");
+        }
         // collect all input assets and assign them to the first offchain output
         const allAssets = new Map();
         for (const [, assets] of assetInputs) {
@@ -246,11 +251,6 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         for (const [assetId, amount] of allAssets) {
             outputAssets.push({ assetId, amount: Number(amount) });
         }
-        const firstOffchainIndex = outputs.findIndex((_, i) => !onchainOutputsIndexes.includes(i));
-        if (firstOffchainIndex === -1) {
-            throw new Error("Cannot settle assets without an offchain output");
-        }
-        assetOutputIndex = firstOffchainIndex;
     }
     const recipients = outputs.map((output, i) => ({
         address: "", // not needed for asset packet creation
@@ -275,6 +275,13 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         message,
     };
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+function findDestinationOutputIndex(outputs, destinationScript) {
+    return outputs.findIndex((o) => o.script && (0, utils_js_1.equalBytes)(o.script, destinationScript));
+}
 function getDayTimestamp(timestamp) {
     const date = new Date(timestamp);
     date.setUTCHours(0, 0, 0, 0);

package/dist/cjs/worker/messageBus.js

@@ -9,7 +9,7 @@ const identity_1 = require("../identity");
 const wallet_1 = require("../wallet/wallet");
 const base_1 = require("@scure/base");
 class MessageBus {
-    constructor(walletRepository, contractRepository, { messageHandlers, tickIntervalMs = 10000, debug = false, buildServices, }) {
+    constructor(walletRepository, contractRepository, { messageHandlers, tickIntervalMs = 10000, messageTimeoutMs = 30000, debug = false, buildServices, }) {
         this.walletRepository = walletRepository;
         this.contractRepository = contractRepository;
         this.running = false;
@@ -17,8 +17,10 @@ class MessageBus {
         this.tickInProgress = false;
         this.debug = false;
         this.initialized = false;
+        this.boundOnMessage = this.onMessage.bind(this);
         this.handlers = new Map(messageHandlers.map((u) => [u.messageTag, u]));
         this.tickIntervalMs = tickIntervalMs;
+        this.messageTimeoutMs = messageTimeoutMs;
         this.debug = debug;
         this.buildServicesFn = buildServices ?? this.buildServices.bind(this);
     }
@@ -29,7 +31,7 @@ class MessageBus {
         if (this.debug)
             console.log("MessageBus starting");
         // Hook message routing
-        self.addEventListener("message", this.onMessage.bind(this));
+        self.addEventListener("message", this.boundOnMessage);
         // activate service worker immediately
         self.addEventListener("install", () => {
             self.skipWaiting();
@@ -52,7 +54,7 @@ class MessageBus {
             self.clearTimeout(this.tickTimeout);
             this.tickTimeout = null;
         }
-        self.removeEventListener("message", this.onMessage.bind(this));
+        self.removeEventListener("message", this.boundOnMessage);
         await Promise.all(Array.from(this.handlers.values()).map((updater) => updater.stop()));
     }
     scheduleNextTick() {
@@ -78,7 +80,7 @@ class MessageBus {
             const now = Date.now();
             for (const updater of this.handlers.values()) {
                 try {
-                    const response = await updater.tick(now);
+                    const response = await this.withTimeout(updater.tick(now), `${updater.messageTag}:tick`);
                     if (this.debug)
                         console.log(`[${updater.messageTag}] outgoing tick response:`, response);
                     if (response && response.length > 0) {
@@ -169,12 +171,25 @@ class MessageBus {
             throw new Error("Missing privateKey or publicKey in configuration object");
         }
     }
-    async onMessage(event) {
+    onMessage(event) {
+        // Keep the service worker alive while async work is pending.
+        // Without this, the browser may terminate the SW mid-operation,
+        // causing all pending responses to be lost silently.
+        const promise = this.processMessage(event);
+        if (typeof event.waitUntil === "function") {
+            event.waitUntil(promise);
+        }
+        return promise;
+    }
+    async processMessage(event) {
         const { id, tag, broadcast } = event.data;
         if (tag === "INITIALIZE_MESSAGE_BUS") {
             if (this.debug) {
                 console.log("Init Command received");
             }
+            // Intentionally not wrapped with withTimeout: initialization
+            // performs network calls (buildServices) and handler startup
+            // that may legitimately exceed the message timeout.
             await this.waitForInit(event.data.config);
             event.source?.postMessage({ id, tag });
             if (this.debug) {
@@ -208,7 +223,7 @@ class MessageBus {
         }
         if (broadcast) {
             const updaters = Array.from(this.handlers.values());
-            const results = await Promise.allSettled(updaters.map((updater) => updater.handleMessage(event.data)));
+            const results = await Promise.allSettled(updaters.map((updater) => this.withTimeout(updater.handleMessage(event.data), updater.messageTag)));
             results.forEach((result, index) => {
                 const updater = updaters[index];
                 if (result.status === "fulfilled") {
@@ -239,7 +254,7 @@ class MessageBus {
             return;
         }
         try {
-            const response = await updater.handleMessage(event.data);
+            const response = await this.withTimeout(updater.handleMessage(event.data), tag);
             if (this.debug)
                 console.log(`[${tag}] outgoing response:`, response);
             if (response) {
@@ -253,6 +268,27 @@ class MessageBus {
             event.source?.postMessage({ id, tag, error });
         }
     }
+    /**
+     * Race `promise` against a timeout. Note: this does NOT cancel the
+     * underlying work — the original promise keeps running. This is safe
+     * here because only the caller (not the handler) posts the response.
+     */
+    withTimeout(promise, label) {
+        if (this.messageTimeoutMs <= 0)
+            return promise;
+        return new Promise((resolve, reject) => {
+            const timer = self.setTimeout(() => {
+                reject(new Error(`Message handler timed out after ${this.messageTimeoutMs}ms (${label})`));
+            }, this.messageTimeoutMs);
+            promise.then((val) => {
+                self.clearTimeout(timer);
+                resolve(val);
+            }, (err) => {
+                self.clearTimeout(timer);
+                reject(err);
+            });
+        });
+    }
     /**
      * Returns the registered SW for the path.
      * It uses the functions in `service-worker-manager.ts` module.

package/dist/esm/wallet/delegator.js

@@ -3,6 +3,7 @@ import { base64, hex } from "@scure/base";
 import { scriptFromTapLeafScript } from '../script/base.js';
 import { buildForfeitTxWithOutput } from '../forfeit.js';
 import { Address, OutScript, SigHash } from "@scure/btc-signer";
+import { equalBytes } from "@scure/btc-signer/utils.js";
 import { getNetwork } from '../networks.js';
 import { createAssetPacket } from './asset.js';
 import { Extension } from '../extension/index.js';
@@ -169,7 +170,7 @@ async function delegate(identity, delegatorProvider, arkInfoProvider, vtxos, des
         script: destinationScript,
         amount: amount,
     });
-    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds);
+    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds, destinationScript);
     const forfeitOutputScript = OutScript.encode(Address(getNetwork(network)).decode(forfeitAddress));
     const forfeits = await Promise.all(vtxos
         .filter((v) => !isRecoverable(v))
@@ -214,7 +215,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
     });
     return identity.sign(tx);
 }
-async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt) {
+async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt, destinationScript) {
     // if some of the inputs hold assets, build the asset packet and append as output
     // in the intent proof tx, there is a "fake" input at index 0
     // so the real coin indices are offset by +1
@@ -228,8 +229,11 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         }
     }
     let outputAssets;
-    let assetOutputIndex; // where to send the assets
+    const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
     if (assetInputs.size > 0) {
+        if (assetOutputIndex === -1) {
+            throw new Error("Cannot assign assets: no output matches the destination address");
+        }
         // collect all input assets and assign them to the first offchain output
         const allAssets = new Map();
         for (const [, assets] of assetInputs) {
@@ -242,11 +246,6 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         for (const [assetId, amount] of allAssets) {
             outputAssets.push({ assetId, amount: Number(amount) });
         }
-        const firstOffchainIndex = outputs.findIndex((_, i) => !onchainOutputsIndexes.includes(i));
-        if (firstOffchainIndex === -1) {
-            throw new Error("Cannot settle assets without an offchain output");
-        }
-        assetOutputIndex = firstOffchainIndex;
     }
     const recipients = outputs.map((output, i) => ({
         address: "", // not needed for asset packet creation
@@ -271,6 +270,13 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         message,
     };
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+export function findDestinationOutputIndex(outputs, destinationScript) {
+    return outputs.findIndex((o) => o.script && equalBytes(o.script, destinationScript));
+}
 function getDayTimestamp(timestamp) {
     const date = new Date(timestamp);
     date.setUTCHours(0, 0, 0, 0);

package/dist/esm/worker/messageBus.js

@@ -6,7 +6,7 @@ import { ReadonlySingleKey, SingleKey } from '../identity/index.js';
 import { ReadonlyWallet, Wallet } from '../wallet/wallet.js';
 import { hex } from "@scure/base";
 export class MessageBus {
-    constructor(walletRepository, contractRepository, { messageHandlers, tickIntervalMs = 10000, debug = false, buildServices, }) {
+    constructor(walletRepository, contractRepository, { messageHandlers, tickIntervalMs = 10000, messageTimeoutMs = 30000, debug = false, buildServices, }) {
         this.walletRepository = walletRepository;
         this.contractRepository = contractRepository;
         this.running = false;
@@ -14,8 +14,10 @@ export class MessageBus {
         this.tickInProgress = false;
         this.debug = false;
         this.initialized = false;
+        this.boundOnMessage = this.onMessage.bind(this);
         this.handlers = new Map(messageHandlers.map((u) => [u.messageTag, u]));
         this.tickIntervalMs = tickIntervalMs;
+        this.messageTimeoutMs = messageTimeoutMs;
         this.debug = debug;
         this.buildServicesFn = buildServices ?? this.buildServices.bind(this);
     }
@@ -26,7 +28,7 @@ export class MessageBus {
         if (this.debug)
             console.log("MessageBus starting");
         // Hook message routing
-        self.addEventListener("message", this.onMessage.bind(this));
+        self.addEventListener("message", this.boundOnMessage);
         // activate service worker immediately
         self.addEventListener("install", () => {
             self.skipWaiting();
@@ -49,7 +51,7 @@ export class MessageBus {
             self.clearTimeout(this.tickTimeout);
             this.tickTimeout = null;
         }
-        self.removeEventListener("message", this.onMessage.bind(this));
+        self.removeEventListener("message", this.boundOnMessage);
         await Promise.all(Array.from(this.handlers.values()).map((updater) => updater.stop()));
     }
     scheduleNextTick() {
@@ -75,7 +77,7 @@ export class MessageBus {
             const now = Date.now();
             for (const updater of this.handlers.values()) {
                 try {
-                    const response = await updater.tick(now);
+                    const response = await this.withTimeout(updater.tick(now), `${updater.messageTag}:tick`);
                     if (this.debug)
                         console.log(`[${updater.messageTag}] outgoing tick response:`, response);
                     if (response && response.length > 0) {
@@ -166,12 +168,25 @@ export class MessageBus {
             throw new Error("Missing privateKey or publicKey in configuration object");
         }
     }
-    async onMessage(event) {
+    onMessage(event) {
+        // Keep the service worker alive while async work is pending.
+        // Without this, the browser may terminate the SW mid-operation,
+        // causing all pending responses to be lost silently.
+        const promise = this.processMessage(event);
+        if (typeof event.waitUntil === "function") {
+            event.waitUntil(promise);
+        }
+        return promise;
+    }
+    async processMessage(event) {
         const { id, tag, broadcast } = event.data;
         if (tag === "INITIALIZE_MESSAGE_BUS") {
             if (this.debug) {
                 console.log("Init Command received");
             }
+            // Intentionally not wrapped with withTimeout: initialization
+            // performs network calls (buildServices) and handler startup
+            // that may legitimately exceed the message timeout.
             await this.waitForInit(event.data.config);
             event.source?.postMessage({ id, tag });
             if (this.debug) {
@@ -205,7 +220,7 @@ export class MessageBus {
         }
         if (broadcast) {
             const updaters = Array.from(this.handlers.values());
-            const results = await Promise.allSettled(updaters.map((updater) => updater.handleMessage(event.data)));
+            const results = await Promise.allSettled(updaters.map((updater) => this.withTimeout(updater.handleMessage(event.data), updater.messageTag)));
             results.forEach((result, index) => {
                 const updater = updaters[index];
                 if (result.status === "fulfilled") {
@@ -236,7 +251,7 @@ export class MessageBus {
             return;
         }
         try {
-            const response = await updater.handleMessage(event.data);
+            const response = await this.withTimeout(updater.handleMessage(event.data), tag);
             if (this.debug)
                 console.log(`[${tag}] outgoing response:`, response);
             if (response) {
@@ -250,6 +265,27 @@ export class MessageBus {
             event.source?.postMessage({ id, tag, error });
         }
     }
+    /**
+     * Race `promise` against a timeout. Note: this does NOT cancel the
+     * underlying work — the original promise keeps running. This is safe
+     * here because only the caller (not the handler) posts the response.
+     */
+    withTimeout(promise, label) {
+        if (this.messageTimeoutMs <= 0)
+            return promise;
+        return new Promise((resolve, reject) => {
+            const timer = self.setTimeout(() => {
+                reject(new Error(`Message handler timed out after ${this.messageTimeoutMs}ms (${label})`));
+            }, this.messageTimeoutMs);
+            promise.then((val) => {
+                self.clearTimeout(timer);
+                resolve(val);
+            }, (err) => {
+                self.clearTimeout(timer);
+                reject(err);
+            });
+        });
+    }
     /**
      * Returns the registered SW for the path.
      * It uses the functions in `service-worker-manager.ts` module.

package/dist/types/wallet/delegator.d.ts

@@ -1,5 +1,7 @@
+import { TransactionOutput } from "@scure/btc-signer/psbt";
 import { ArkProvider, DelegateInfo, ExtendedVirtualCoin, Identity, Outpoint } from "..";
 import { DelegatorProvider } from "../providers/delegator";
+import { Bytes } from "@scure/btc-signer/utils";
 export interface IDelegatorManager {
     delegate(vtxos: ExtendedVirtualCoin[], destination: string, delegateAt?: Date): Promise<{
         delegated: Outpoint[];
@@ -24,3 +26,8 @@ export declare class DelegatorManagerImpl implements IDelegatorManager {
         }[];
     }>;
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+export declare function findDestinationOutputIndex(outputs: TransactionOutput[], destinationScript: Bytes): number;

package/dist/types/worker/messageBus.d.ts

@@ -48,6 +48,7 @@ export interface MessageHandler<REQ extends RequestEnvelope = RequestEnvelope, R
 type Options = {
     messageHandlers: MessageHandler[];
     tickIntervalMs?: number;
+    messageTimeoutMs?: number;
     debug?: boolean;
     buildServices?: (config: Initialize["config"]) => Promise<{
         arkProvider: ArkProvider;
@@ -76,13 +77,15 @@ export declare class MessageBus {
     private readonly contractRepository;
     private handlers;
     private tickIntervalMs;
+    private messageTimeoutMs;
     private running;
     private tickTimeout;
     private tickInProgress;
     private debug;
     private initialized;
     private readonly buildServicesFn;
-    constructor(walletRepository: WalletRepository, contractRepository: ContractRepository, { messageHandlers, tickIntervalMs, debug, buildServices, }: Options);
+    private readonly boundOnMessage;
+    constructor(walletRepository: WalletRepository, contractRepository: ContractRepository, { messageHandlers, tickIntervalMs, messageTimeoutMs, debug, buildServices, }: Options);
     start(): Promise<void>;
     stop(): Promise<void>;
     private scheduleNextTick;
@@ -90,6 +93,13 @@ export declare class MessageBus {
     private waitForInit;
     private buildServices;
     private onMessage;
+    private processMessage;
+    /**
+     * Race `promise` against a timeout. Note: this does NOT cancel the
+     * underlying work — the original promise keeps running. This is safe
+     * here because only the caller (not the handler) posts the response.
+     */
+    private withTimeout;
     /**
      * Returns the registered SW for the path.
      * It uses the functions in `service-worker-manager.ts` module.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",