@steve31415/baselib 3.48.1 → 3.48.2

package/dist/extension-self-update.d.ts

@@ -17,6 +17,16 @@ export declare const ATTEMPT_KEY = "selfUpdateAttempt";
 export declare const LOADED_KEY = "selfUpdateLoaded";
 /** chrome.storage.session: epoch ms until which the extension is busy (an open overlay renews it). */
 export declare const BUSY_LEASE_KEY = "selfUpdateBusyUntil";
+/** chrome.storage.session: epoch ms of the previous check (to notice the machine just woke). */
+export declare const LAST_CHECK_KEY = "selfUpdateLastCheck";
+/**
+ * A check that comes more than this long after the previous one follows a
+ * sleep (checks run on a 1-minute alarm): it only waits. Chrome fires the
+ * overdue alarm the moment the machine wakes, before a page's lease-renewal
+ * timer has had its turn, so a lease that lapsed during the sleep must not
+ * count as "not busy" yet.
+ */
+export declare const WOKE_GAP_MS: number;
 interface Seen {
     code: string;
     since: number;
@@ -65,10 +75,12 @@ export declare function decideUpdate(input: {
 /**
  * Check and reload when the rules allow. `shipped`: the code the server last
  * said it deployed (null when unknown). `busy`: the extension's own work in
- * flight; the busy lease and open extension pages are checked here too.
+ * flight — pass a function, so it is read at the moment of the reload rather
+ * than before the disk checks; the busy lease and open extension pages are
+ * checked here too. The first check after a sleep only waits (WOKE_GAP_MS).
  */
 export declare function maybeSelfUpdate(options: {
-    busy: boolean;
+    busy: boolean | (() => boolean);
     shipped: string | null | undefined;
     log?: (message: string) => void;
 }): Promise<UpdateAction | 'busy'>;

package/dist/extension-self-update.js

@@ -35,6 +35,16 @@ export const ATTEMPT_KEY = 'selfUpdateAttempt';
 export const LOADED_KEY = 'selfUpdateLoaded';
 /** chrome.storage.session: epoch ms until which the extension is busy (an open overlay renews it). */
 export const BUSY_LEASE_KEY = 'selfUpdateBusyUntil';
+/** chrome.storage.session: epoch ms of the previous check (to notice the machine just woke). */
+export const LAST_CHECK_KEY = 'selfUpdateLastCheck';
+/**
+ * A check that comes more than this long after the previous one follows a
+ * sleep (checks run on a 1-minute alarm): it only waits. Chrome fires the
+ * overdue alarm the moment the machine wakes, before a page's lease-renewal
+ * timer has had its turn, so a lease that lapsed during the sleep must not
+ * count as "not busy" yet.
+ */
+export const WOKE_GAP_MS = 2 * 60 * 1000;
 function hex(bytes) {
     return Array.from(new Uint8Array(bytes), (b) => b.toString(16).padStart(2, '0')).join('');
 }
@@ -149,9 +159,15 @@ export function decideUpdate(input) {
 /**
  * Check and reload when the rules allow. `shipped`: the code the server last
  * said it deployed (null when unknown). `busy`: the extension's own work in
- * flight; the busy lease and open extension pages are checked here too.
+ * flight — pass a function, so it is read at the moment of the reload rather
+ * than before the disk checks; the busy lease and open extension pages are
+ * checked here too. The first check after a sleep only waits (WOKE_GAP_MS).
  */
 export async function maybeSelfUpdate(options) {
+    const { [LAST_CHECK_KEY]: lastCheck } = await chrome.storage.session.get(LAST_CHECK_KEY);
+    const started = Date.now();
+    await chrome.storage.session.set({ [LAST_CHECK_KEY]: started });
+    const justWoke = typeof lastCheck === 'number' && started - lastCheck > WOKE_GAP_MS;
     const loaded = await loadedCode();
     const disk = await diskCode();
     const { [SEEN_KEY]: seen } = await chrome.storage.session.get(SEEN_KEY);
@@ -169,7 +185,10 @@ export async function maybeSelfUpdate(options) {
     if (decision.action !== 'reload' || !decision.seen)
         return decision.action;
     const target = decision.seen.code;
-    if (options.busy || (await busyLeaseActive(now)) || (await extensionPageOpen()))
+    if (justWoke)
+        return 'wait';
+    const busy = typeof options.busy === 'function' ? options.busy() : options.busy;
+    if (busy || (await busyLeaseActive(Date.now())) || (await extensionPageOpen()))
         return 'busy';
     options.log?.(`code ${target} is deployed and on disk (running ${loaded}): reloading.`);
     await chrome.storage.local.set({ [ATTEMPT_KEY]: { code: target, at: now } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steve31415/baselib",
-  "version": "3.48.1",
+  "version": "3.48.2",
   "description": "Plasticine new-world shared platform library: logging, auth, service-to-service auth, db, HTTP, sync, app updates",
   "type": "module",
   "license": "MIT",