@arkade-os/boltz-swap 0.3.7 → 0.3.8

package/dist/index.cjs

@@ -5036,6 +5036,28 @@ var ArkadeSwapsMessageHandler = class _ArkadeSwapsMessageHandler {
 };
 
 // src/serviceWorker/arkade-swaps-runtime.ts
+var import_sdk10 = require("@arkade-os/sdk");
+function isMessageBusNotInitializedError(error) {
+  return error instanceof Error && error.message.includes(import_sdk10.MESSAGE_BUS_NOT_INITIALIZED);
+}
+var DEDUPABLE_REQUEST_TYPES = /* @__PURE__ */ new Set([
+  "GET_FEES",
+  "GET_LIMITS",
+  "GET_SWAP_STATUS",
+  "GET_PENDING_SUBMARINE_SWAPS",
+  "GET_PENDING_REVERSE_SWAPS",
+  "GET_PENDING_CHAIN_SWAPS",
+  "GET_SWAP_HISTORY",
+  "QUOTE_SWAP",
+  "SM-GET_PENDING_SWAPS",
+  "SM-HAS_SWAP",
+  "SM-IS_PROCESSING",
+  "SM-GET_STATS"
+]);
+function getRequestDedupKey(request) {
+  const { id, tag, ...rest } = request;
+  return JSON.stringify(rest);
+}
 var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   constructor(messageTag, serviceWorker, swapRepository, withSwapManager) {
     this.messageTag = messageTag;
@@ -5050,6 +5072,10 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   actionExecutedListeners = /* @__PURE__ */ new Set();
   wsConnectedListeners = /* @__PURE__ */ new Set();
   wsDisconnectedListeners = /* @__PURE__ */ new Set();
+  initPayload = null;
+  reinitPromise = null;
+  pingPromise = null;
+  inflightRequests = /* @__PURE__ */ new Map();
   static async create(config) {
     const messageTag = config.messageTag ?? DEFAULT_MESSAGE_TAG;
     const swapRepository = config.swapRepository ?? new IndexedDbSwapRepository();
@@ -5059,18 +5085,20 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
       swapRepository,
       Boolean(config.swapManager)
     );
+    const initPayload = {
+      network: config.network,
+      arkServerUrl: config.arkServerUrl,
+      swapProvider: { baseUrl: config.swapProvider.getApiUrl() },
+      swapManager: config.swapManager
+    };
     const initMessage = {
       tag: messageTag,
       id: getRandomId(),
       type: "INIT_ARKADE_SWAPS",
-      payload: {
-        network: config.network,
-        arkServerUrl: config.arkServerUrl,
-        swapProvider: { baseUrl: config.swapProvider.getApiUrl() },
-        swapManager: config.swapManager
-      }
+      payload: initPayload
     };
     await svcArkadeSwaps.sendMessage(initMessage);
+    svcArkadeSwaps.initPayload = initPayload;
     return svcArkadeSwaps;
   }
   async startSwapManager() {
@@ -5611,17 +5639,23 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   async [Symbol.asyncDispose]() {
     return this.dispose();
   }
-  async sendMessage(request) {
+  sendMessageDirect(request) {
     return new Promise((resolve, reject) => {
-      const timeoutMs = 3e4;
-      let timeout;
       const cleanup = () => {
-        if (timeout) clearTimeout(timeout);
+        clearTimeout(timeoutId);
         navigator.serviceWorker.removeEventListener(
           "message",
           messageHandler
         );
       };
+      const timeoutId = setTimeout(() => {
+        cleanup();
+        reject(
+          new import_sdk10.ServiceWorkerTimeoutError(
+            `Service worker message timed out (${request.type})`
+          )
+        );
+      }, 3e4);
       const messageHandler = (event) => {
         const response = event.data;
         if (!response || response.tag !== this.messageTag || response.id !== request.id) {
@@ -5634,17 +5668,97 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
           resolve(response);
         }
       };
-      timeout = setTimeout(() => {
+      navigator.serviceWorker.addEventListener("message", messageHandler);
+      this.serviceWorker.postMessage(request);
+    });
+  }
+  async sendMessage(request) {
+    if (!DEDUPABLE_REQUEST_TYPES.has(request.type)) {
+      return this.sendMessageWithRetry(request);
+    }
+    const key = getRequestDedupKey(request);
+    const existing = this.inflightRequests.get(key);
+    if (existing) return existing;
+    const promise = this.sendMessageWithRetry(request).finally(() => {
+      this.inflightRequests.delete(key);
+    });
+    this.inflightRequests.set(key, promise);
+    return promise;
+  }
+  pingServiceWorker() {
+    if (this.pingPromise) return this.pingPromise;
+    this.pingPromise = new Promise((resolve, reject) => {
+      const pingId = getRandomId();
+      const cleanup = () => {
+        clearTimeout(timeoutId);
+        navigator.serviceWorker.removeEventListener(
+          "message",
+          onMessage
+        );
+      };
+      const timeoutId = setTimeout(() => {
         cleanup();
         reject(
-          new Error(
-            `Timed out waiting for service worker response: ${request.type}`
+          new import_sdk10.ServiceWorkerTimeoutError(
+            "Service worker ping timed out"
           )
         );
-      }, timeoutMs);
-      navigator.serviceWorker.addEventListener("message", messageHandler);
-      this.serviceWorker.postMessage(request);
+      }, 2e3);
+      const onMessage = (event) => {
+        if (event.data?.id === pingId && event.data?.tag === "PONG") {
+          cleanup();
+          resolve();
+        }
+      };
+      navigator.serviceWorker.addEventListener("message", onMessage);
+      this.serviceWorker.postMessage({
+        id: pingId,
+        tag: "PING"
+      });
+    }).finally(() => {
+      this.pingPromise = null;
+    });
+    return this.pingPromise;
+  }
+  // Send a message, retrying up to 2 times if the service worker was
+  // killed and restarted by the OS (mobile browsers do this aggressively).
+  async sendMessageWithRetry(request) {
+    if (this.initPayload) {
+      try {
+        await this.pingServiceWorker();
+      } catch {
+        await this.reinitialize();
+      }
+    }
+    const maxRetries = 2;
+    for (let attempt = 0; ; attempt++) {
+      try {
+        return await this.sendMessageDirect(request);
+      } catch (error) {
+        if (!isMessageBusNotInitializedError(error) || attempt >= maxRetries) {
+          throw error;
+        }
+        await this.reinitialize();
+      }
+    }
+  }
+  async reinitialize() {
+    if (this.reinitPromise) return this.reinitPromise;
+    this.reinitPromise = (async () => {
+      if (!this.initPayload) {
+        throw new Error("Cannot re-initialize: missing configuration");
+      }
+      const initMessage = {
+        tag: this.messageTag,
+        type: "INIT_ARKADE_SWAPS",
+        id: getRandomId(),
+        payload: this.initPayload
+      };
+      await this.sendMessageDirect(initMessage);
+    })().finally(() => {
+      this.reinitPromise = null;
     });
+    return this.reinitPromise;
   }
   initEventStream() {
     if (this.eventListenerInitialized) return;

package/dist/index.d.cts

@@ -562,6 +562,10 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     private actionExecutedListeners;
     private wsConnectedListeners;
     private wsDisconnectedListeners;
+    private initPayload;
+    private reinitPromise;
+    private pingPromise;
+    private inflightRequests;
     private constructor();
     static create(config: SvcWrkArkadeSwapsConfig): Promise<ServiceWorkerArkadeSwaps>;
     startSwapManager(): Promise<void>;
@@ -654,7 +658,11 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     refreshSwapsStatus(): Promise<void>;
     dispose(): Promise<void>;
     [Symbol.asyncDispose](): Promise<void>;
+    private sendMessageDirect;
     private sendMessage;
+    private pingServiceWorker;
+    private sendMessageWithRetry;
+    private reinitialize;
     private initEventStream;
     private handleEventMessage;
 }

package/dist/index.d.ts

@@ -562,6 +562,10 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     private actionExecutedListeners;
     private wsConnectedListeners;
     private wsDisconnectedListeners;
+    private initPayload;
+    private reinitPromise;
+    private pingPromise;
+    private inflightRequests;
     private constructor();
     static create(config: SvcWrkArkadeSwapsConfig): Promise<ServiceWorkerArkadeSwaps>;
     startSwapManager(): Promise<void>;
@@ -654,7 +658,11 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     refreshSwapsStatus(): Promise<void>;
     dispose(): Promise<void>;
     [Symbol.asyncDispose](): Promise<void>;
+    private sendMessageDirect;
     private sendMessage;
+    private pingServiceWorker;
+    private sendMessageWithRetry;
+    private reinitialize;
     private initEventStream;
     private handleEventMessage;
 }

package/dist/index.js

@@ -526,6 +526,31 @@ var ArkadeSwapsMessageHandler = class _ArkadeSwapsMessageHandler {
 };
 
 // src/serviceWorker/arkade-swaps-runtime.ts
+import {
+  MESSAGE_BUS_NOT_INITIALIZED,
+  ServiceWorkerTimeoutError
+} from "@arkade-os/sdk";
+function isMessageBusNotInitializedError(error) {
+  return error instanceof Error && error.message.includes(MESSAGE_BUS_NOT_INITIALIZED);
+}
+var DEDUPABLE_REQUEST_TYPES = /* @__PURE__ */ new Set([
+  "GET_FEES",
+  "GET_LIMITS",
+  "GET_SWAP_STATUS",
+  "GET_PENDING_SUBMARINE_SWAPS",
+  "GET_PENDING_REVERSE_SWAPS",
+  "GET_PENDING_CHAIN_SWAPS",
+  "GET_SWAP_HISTORY",
+  "QUOTE_SWAP",
+  "SM-GET_PENDING_SWAPS",
+  "SM-HAS_SWAP",
+  "SM-IS_PROCESSING",
+  "SM-GET_STATS"
+]);
+function getRequestDedupKey(request) {
+  const { id, tag, ...rest } = request;
+  return JSON.stringify(rest);
+}
 var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   constructor(messageTag, serviceWorker, swapRepository, withSwapManager) {
     this.messageTag = messageTag;
@@ -540,6 +565,10 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   actionExecutedListeners = /* @__PURE__ */ new Set();
   wsConnectedListeners = /* @__PURE__ */ new Set();
   wsDisconnectedListeners = /* @__PURE__ */ new Set();
+  initPayload = null;
+  reinitPromise = null;
+  pingPromise = null;
+  inflightRequests = /* @__PURE__ */ new Map();
   static async create(config) {
     const messageTag = config.messageTag ?? DEFAULT_MESSAGE_TAG;
     const swapRepository = config.swapRepository ?? new IndexedDbSwapRepository();
@@ -549,18 +578,20 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
       swapRepository,
       Boolean(config.swapManager)
     );
+    const initPayload = {
+      network: config.network,
+      arkServerUrl: config.arkServerUrl,
+      swapProvider: { baseUrl: config.swapProvider.getApiUrl() },
+      swapManager: config.swapManager
+    };
     const initMessage = {
       tag: messageTag,
       id: getRandomId(),
       type: "INIT_ARKADE_SWAPS",
-      payload: {
-        network: config.network,
-        arkServerUrl: config.arkServerUrl,
-        swapProvider: { baseUrl: config.swapProvider.getApiUrl() },
-        swapManager: config.swapManager
-      }
+      payload: initPayload
     };
     await svcArkadeSwaps.sendMessage(initMessage);
+    svcArkadeSwaps.initPayload = initPayload;
     return svcArkadeSwaps;
   }
   async startSwapManager() {
@@ -1101,17 +1132,23 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
   async [Symbol.asyncDispose]() {
     return this.dispose();
   }
-  async sendMessage(request) {
+  sendMessageDirect(request) {
     return new Promise((resolve, reject) => {
-      const timeoutMs = 3e4;
-      let timeout;
       const cleanup = () => {
-        if (timeout) clearTimeout(timeout);
+        clearTimeout(timeoutId);
         navigator.serviceWorker.removeEventListener(
           "message",
           messageHandler
         );
       };
+      const timeoutId = setTimeout(() => {
+        cleanup();
+        reject(
+          new ServiceWorkerTimeoutError(
+            `Service worker message timed out (${request.type})`
+          )
+        );
+      }, 3e4);
       const messageHandler = (event) => {
         const response = event.data;
         if (!response || response.tag !== this.messageTag || response.id !== request.id) {
@@ -1124,17 +1161,97 @@ var ServiceWorkerArkadeSwaps = class _ServiceWorkerArkadeSwaps {
           resolve(response);
         }
       };
-      timeout = setTimeout(() => {
+      navigator.serviceWorker.addEventListener("message", messageHandler);
+      this.serviceWorker.postMessage(request);
+    });
+  }
+  async sendMessage(request) {
+    if (!DEDUPABLE_REQUEST_TYPES.has(request.type)) {
+      return this.sendMessageWithRetry(request);
+    }
+    const key = getRequestDedupKey(request);
+    const existing = this.inflightRequests.get(key);
+    if (existing) return existing;
+    const promise = this.sendMessageWithRetry(request).finally(() => {
+      this.inflightRequests.delete(key);
+    });
+    this.inflightRequests.set(key, promise);
+    return promise;
+  }
+  pingServiceWorker() {
+    if (this.pingPromise) return this.pingPromise;
+    this.pingPromise = new Promise((resolve, reject) => {
+      const pingId = getRandomId();
+      const cleanup = () => {
+        clearTimeout(timeoutId);
+        navigator.serviceWorker.removeEventListener(
+          "message",
+          onMessage
+        );
+      };
+      const timeoutId = setTimeout(() => {
         cleanup();
         reject(
-          new Error(
-            `Timed out waiting for service worker response: ${request.type}`
+          new ServiceWorkerTimeoutError(
+            "Service worker ping timed out"
           )
         );
-      }, timeoutMs);
-      navigator.serviceWorker.addEventListener("message", messageHandler);
-      this.serviceWorker.postMessage(request);
+      }, 2e3);
+      const onMessage = (event) => {
+        if (event.data?.id === pingId && event.data?.tag === "PONG") {
+          cleanup();
+          resolve();
+        }
+      };
+      navigator.serviceWorker.addEventListener("message", onMessage);
+      this.serviceWorker.postMessage({
+        id: pingId,
+        tag: "PING"
+      });
+    }).finally(() => {
+      this.pingPromise = null;
+    });
+    return this.pingPromise;
+  }
+  // Send a message, retrying up to 2 times if the service worker was
+  // killed and restarted by the OS (mobile browsers do this aggressively).
+  async sendMessageWithRetry(request) {
+    if (this.initPayload) {
+      try {
+        await this.pingServiceWorker();
+      } catch {
+        await this.reinitialize();
+      }
+    }
+    const maxRetries = 2;
+    for (let attempt = 0; ; attempt++) {
+      try {
+        return await this.sendMessageDirect(request);
+      } catch (error) {
+        if (!isMessageBusNotInitializedError(error) || attempt >= maxRetries) {
+          throw error;
+        }
+        await this.reinitialize();
+      }
+    }
+  }
+  async reinitialize() {
+    if (this.reinitPromise) return this.reinitPromise;
+    this.reinitPromise = (async () => {
+      if (!this.initPayload) {
+        throw new Error("Cannot re-initialize: missing configuration");
+      }
+      const initMessage = {
+        tag: this.messageTag,
+        type: "INIT_ARKADE_SWAPS",
+        id: getRandomId(),
+        payload: this.initPayload
+      };
+      await this.sendMessageDirect(initMessage);
+    })().finally(() => {
+      this.reinitPromise = null;
     });
+    return this.reinitPromise;
   }
   initEventStream() {
     if (this.eventListenerInitialized) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/boltz-swap",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",
@@ -60,7 +60,7 @@
   "author": "Arkade-OS",
   "license": "MIT",
   "dependencies": {
-    "@arkade-os/sdk": "0.4.9",
+    "@arkade-os/sdk": "0.4.10",
     "@noble/hashes": "2.0.1",
     "@scure/base": "2.0.0",
     "@scure/btc-signer": "2.0.1",