@arkade-os/sdk 0.4.0-next.1 → 0.4.0-next.2

package/dist/cjs/wallet/serviceWorker/wallet.js

@@ -169,12 +169,20 @@ class ServiceWorkerReadonlyWallet {
     // send a message and wait for a response
     async sendMessage(request) {
         return new Promise((resolve, reject) => {
+            const cleanup = () => {
+                clearTimeout(timeoutId);
+                navigator.serviceWorker.removeEventListener("message", messageHandler);
+            };
+            const timeoutId = setTimeout(() => {
+                cleanup();
+                reject(new Error(`Service worker message timed out (${request.type})`));
+            }, 30000);
             const messageHandler = (event) => {
                 const response = event.data;
                 if (request.id !== response.id) {
                     return;
                 }
-                navigator.serviceWorker.removeEventListener("message", messageHandler);
+                cleanup();
                 if (response.error) {
                     reject(response.error);
                 }

package/dist/cjs/worker/messageBus.js

@@ -107,8 +107,19 @@ class MessageBus {
         }
     }
     async waitForInit(config) {
-        if (this.initialized)
-            return;
+        if (this.initialized) {
+            // Stop existing handlers before re-initializing.
+            // This handles the case where CLEAR was called, which nullifies
+            // handler state (readonlyWallet, etc.) without resetting the
+            // initialized flag. Without this, handlers never get start()
+            // called again and all messages fail with "not initialized".
+            //
+            // Clear the flag first so onMessage() rejects incoming messages
+            // during the stop/start window instead of routing them to
+            // half-reset handlers. Restored to true after start() completes.
+            this.initialized = false;
+            await Promise.all(Array.from(this.handlers.values()).map((h) => h.stop().catch(() => { })));
+        }
         const services = await this.buildServicesFn(config);
         // Start all handlers
         for (const updater of this.handlers.values()) {
@@ -168,6 +179,15 @@ class MessageBus {
         if (!this.initialized) {
             if (this.debug)
                 console.warn("Event received before initialization, dropping", event.data);
+            // Send error response so the caller's promise rejects instead of
+            // hanging forever. This happens when the browser kills and restarts
+            // the service worker — the new instance has initialized=false and
+            // messages arrive before INITIALIZE_MESSAGE_BUS is re-sent.
+            event.source?.postMessage({
+                id,
+                tag: tag ?? "unknown",
+                error: new Error("MessageBus not initialized"),
+            });
             return;
         }
         if (!id || !tag) {

package/dist/esm/wallet/serviceWorker/wallet.js

@@ -166,12 +166,20 @@ export class ServiceWorkerReadonlyWallet {
     // send a message and wait for a response
     async sendMessage(request) {
         return new Promise((resolve, reject) => {
+            const cleanup = () => {
+                clearTimeout(timeoutId);
+                navigator.serviceWorker.removeEventListener("message", messageHandler);
+            };
+            const timeoutId = setTimeout(() => {
+                cleanup();
+                reject(new Error(`Service worker message timed out (${request.type})`));
+            }, 30000);
             const messageHandler = (event) => {
                 const response = event.data;
                 if (request.id !== response.id) {
                     return;
                 }
-                navigator.serviceWorker.removeEventListener("message", messageHandler);
+                cleanup();
                 if (response.error) {
                     reject(response.error);
                 }

package/dist/esm/worker/messageBus.js

@@ -104,8 +104,19 @@ export class MessageBus {
         }
     }
     async waitForInit(config) {
-        if (this.initialized)
-            return;
+        if (this.initialized) {
+            // Stop existing handlers before re-initializing.
+            // This handles the case where CLEAR was called, which nullifies
+            // handler state (readonlyWallet, etc.) without resetting the
+            // initialized flag. Without this, handlers never get start()
+            // called again and all messages fail with "not initialized".
+            //
+            // Clear the flag first so onMessage() rejects incoming messages
+            // during the stop/start window instead of routing them to
+            // half-reset handlers. Restored to true after start() completes.
+            this.initialized = false;
+            await Promise.all(Array.from(this.handlers.values()).map((h) => h.stop().catch(() => { })));
+        }
         const services = await this.buildServicesFn(config);
         // Start all handlers
         for (const updater of this.handlers.values()) {
@@ -165,6 +176,15 @@ export class MessageBus {
         if (!this.initialized) {
             if (this.debug)
                 console.warn("Event received before initialization, dropping", event.data);
+            // Send error response so the caller's promise rejects instead of
+            // hanging forever. This happens when the browser kills and restarts
+            // the service worker — the new instance has initialized=false and
+            // messages arrive before INITIALIZE_MESSAGE_BUS is re-sent.
+            event.source?.postMessage({
+                id,
+                tag: tag ?? "unknown",
+                error: new Error("MessageBus not initialized"),
+            });
             return;
         }
         if (!id || !tag) {

package/package.json

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