From da7138f4781967fd29b649e162f60676761f5a39 Mon Sep 17 00:00:00 2001
From: Chris Duncan <chris@codecow.com>
Date: Fri, 26 Jun 2026 22:37:47 -0700
Subject: [PATCH] Fix autolocking.

---
 src/lib/vault/index.ts        |  1 +
 src/lib/vault/vault-worker.ts | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/lib/vault/index.ts b/src/lib/vault/index.ts
index e020c39..736add6 100644
--- a/src/lib/vault/index.ts
+++ b/src/lib/vault/index.ts
@@ -116,6 +116,7 @@ export class Vault {
 			if (typeof isLocked === 'boolean' && this.#isLocked !== isLocked) {
 				this.#isLocked = isLocked
 				this.dispatchEvent(new Event(isLocked ? LOCKED : UNLOCKED))
+				if (id === 'autolock') return
 			}
 			const task = this.#tasks.get(id)
 			if (task == null) {
diff --git a/src/lib/vault/vault-worker.ts b/src/lib/vault/vault-worker.ts
index 3573311..34e3334 100644
--- a/src/lib/vault/vault-worker.ts
+++ b/src/lib/vault/vault-worker.ts
@@ -127,7 +127,7 @@ async function config (timeout?: number): Promise<void> {
 				throw new RangeError('Timeout must be at most 10 minutes')
 			}
 			_timeout = timeout * 1000
-			_timer = new VaultTimer(() => lock(), _timeout)
+			_timer = new VaultTimer(_autolock, _timeout)
 		}
 		return Promise.resolve()
 	} catch (err) {
@@ -188,7 +188,7 @@ async function derive (index?: number): Promise<Record<string, number | ArrayBuf
 			const prv = new Uint8Array(result)
 			const pub = nano25519_derive(prv)
 			prv.fill(0)
-			_timer = new VaultTimer(() => lock(), _timeout)
+			_timer = new VaultTimer(_autolock, _timeout)
 			return { index, publicKey: pub.buffer }
 		})
 	} catch (err) {
@@ -252,7 +252,7 @@ async function sign (index?: number, data?: ArrayBuffer): Promise<Record<string,
 			const pub = nano25519_derive(prv)
 			const sig = nano25519_sign(new Uint8Array(data), new Uint8Array([...prv, ...pub]))
 			prv.fill(0)
-			_timer = new VaultTimer(() => lock(), _timeout)
+			_timer = new VaultTimer(_autolock, _timeout)
 			return { signature: sig.buffer }
 		})
 	} catch (err) {
@@ -295,7 +295,7 @@ async function unlock (type?: WalletType, key?: CryptoKey, iv?: ArrayBuffer, enc
 			_seed = seed
 			_mnemonic = mnemonic
 			_locked = false
-			_timer = new VaultTimer(lock, _timeout)
+			_timer = new VaultTimer(_autolock, _timeout)
 			return Promise.resolve({ isLocked: false })
 		})
 		.catch(err => {
@@ -325,7 +325,7 @@ async function update (key?: CryptoKey, salt?: ArrayBuffer): Promise<Record<stri
 		}
 		return WalletAesGcm.encrypt(_type, key, _seed, _mnemonic)
 			.then(({ iv, encrypted }) => {
-				_timer = new VaultTimer(() => lock(), _timeout)
+				_timer = new VaultTimer(_autolock, _timeout)
 				return { iv, salt, encrypted }
 			})
 	} catch (err) {
@@ -379,6 +379,13 @@ function verify (seed?: ArrayBuffer, mnemonicPhrase?: string): Promise<Record<st
 	}
 }
 
+async function _autolock (): Promise<void> {
+	const { isLocked } = await lock()
+	const id = 'autolock'
+	BROWSER: self.postMessage({ url: location.href, id, isLocked })
+	NODE: parentPort?.postMessage({ data: { url: threadId.toString(), id, isLocked } })
+}
+
 function _ckd (index: number): Promise<ArrayBuffer> {
 	if (_seed == null) {
 		throw new Error('Wallet seed not found')
-- 
2.52.0