From bc8e2f46fd3ee29896586670941b8da273249e61 Mon Sep 17 00:00:00 2001
From: Laan Tungir <laantungir@proton.md>
Date: Wed, 27 May 2026 15:17:45 -0400
Subject: [PATCH] Improve shared worker nsigner routing with explicit active
 signing port registration

---
 www/js/init-ndk.mjs | 16 ++++++++++++++++
 www/js/version.json |  6 +++---
 www/ndk-worker.js   |  7 ++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/www/js/init-ndk.mjs b/www/js/init-ndk.mjs
index 1cb0b12..9bbb655 100644
--- a/www/js/init-ndk.mjs
+++ b/www/js/init-ndk.mjs
@@ -335,6 +335,7 @@ async function ensureAuthenticated() {
             window.addEventListener('nlAuth', authHandler);
             window.addEventListener('nlAuthRestored', authHandler);
             window.addEventListener('nlMethodSelected', authHandler);
+            window.addEventListener('nlAuthStateChanged', authHandler);
         });
     }
     
@@ -484,6 +485,18 @@ function isExpectedSignerCapabilityError(method, error) {
 /**
  * Handle sign request from worker
  */
+function tryRegisterActiveSigningPort() {
+    if (!ndkWorker?.port) return;
+    try {
+        const auth = window?.NOSTR_LOGIN_LITE?.getAuthState?.() || window?.nostr?.authState || null;
+        if (auth?.method === 'nsigner' && auth?.signer?.driver) {
+            ndkWorker.port.postMessage({ type: 'setActiveSigningPort' });
+        }
+    } catch (_) {
+        // ignore
+    }
+}
+
 async function handleSignRequest(requestId, method, params) {
     try {
         let result;
@@ -526,6 +539,9 @@ async function handleSignRequest(requestId, method, params) {
             requestId: requestId,
             result: result
         });
+
+        // If this tab successfully signs using hardware signer, pin worker routing to this tab.
+        tryRegisterActiveSigningPort();
         
     } catch (error) {
         if (isExpectedSignerCapabilityError(method, error)) {
diff --git a/www/js/version.json b/www/js/version.json
index c6d477b..77ac45b 100644
--- a/www/js/version.json
+++ b/www/js/version.json
@@ -1,5 +1,5 @@
 {
-  "VERSION": "v0.7.11",
-  "VERSION_NUMBER": "0.7.11",
-  "BUILD_DATE": "2026-05-03T11:00:46.559Z"
+  "VERSION": "v0.7.12",
+  "VERSION_NUMBER": "0.7.12",
+  "BUILD_DATE": "2026-05-27T19:17:45.501Z"
 }
diff --git a/www/ndk-worker.js b/www/ndk-worker.js
index 830ad01..f54b6f8 100644
--- a/www/ndk-worker.js
+++ b/www/ndk-worker.js
@@ -6106,7 +6106,6 @@ self.onconnect = (event) => {
     activeSigningPort = port;
 
     port.onmessage = async (e) => {
-        activeSigningPort = port;
         const {
             type,
             pubkey,
@@ -6180,6 +6179,12 @@ self.onconnect = (event) => {
             case 'ndkFetchEvents':
                 await handleNdkFetchEvents(requestId, filters, port);
                 break;
+
+            case 'setActiveSigningPort':
+                activeSigningPort = port;
+                console.log('[Worker] Active signing port set explicitly by page');
+                port.postMessage({ type: 'activeSigningPortSet' });
+                break;
                 
             case 'signResponse':
                 handleSignResponse(requestId, result, error);