From 03ed5a0190dc25bb91c403aa095e415848918e8a Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Fri, 3 Apr 2026 15:51:00 -0700 Subject: [PATCH] Fix worker URL matching. --- src/lib/vault/index.ts | 3 ++- src/lib/vault/vault-worker.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/vault/index.ts b/src/lib/vault/index.ts index a7219bf..ba22262 100644 --- a/src/lib/vault/index.ts +++ b/src/lib/vault/index.ts @@ -33,7 +33,7 @@ export class Vault { this.#isTerminated = false this.#queue = [] //@ts-expect-error - this.#url = URL.createObjectURL(new Blob([VAULT_WORKER], { type: 'text/javascript' })) + BROWSER: this.#url = URL.createObjectURL(new Blob([VAULT_WORKER], { type: 'text/javascript' })) BROWSER: this.#worker = new Worker(this.#url, { type: 'module' }) BROWSER: this.#worker.addEventListener('message', message => { this.#report(message.data) @@ -47,6 +47,7 @@ export class Vault { NODE: this.#worker.on('message', message => { this.#report(message) }) + NODE: this.#url = this.#worker.threadId.toString() } get isLocked (): boolean { return this.#isLocked } diff --git a/src/lib/vault/vault-worker.ts b/src/lib/vault/vault-worker.ts index c918301..196ede5 100644 --- a/src/lib/vault/vault-worker.ts +++ b/src/lib/vault/vault-worker.ts @@ -2,7 +2,7 @@ //! SPDX-License-Identifier: GPL-3.0-or-later import * as nano25519 from 'nano25519' -import { parentPort } from 'node:worker_threads' +import { parentPort, threadId } from 'node:worker_threads' import { BIP44_COIN_NANO } from '../constants' import { Bip39, Bip44, Blake2b, WalletAesGcm } from '../crypto' import { WalletType } from '../wallet' @@ -22,7 +22,8 @@ let _mnemonic: ArrayBuffer | undefined = undefined const listener = (event: MessageEvent): void => { const { url, id } = event.data - if (url !== location.href) return + BROWSER: if (url !== location.href) return + NODE: if (url !== threadId.toString()) return NODE: if (parentPort == null) setTimeout(() => listener(event), 0) const data = _parseData(event.data) const action = _parseAction(data) -- 2.47.3