om-memory-system 5.8.0 → 5.9.0

package/dist/cli/web-command.js

@@ -156,7 +156,7 @@ export async function runWebCommand(args, options = {}, online, handover = {}, u
     const { existsSync } = await import("node:fs");
     // Every restart onto the new copy runs the launcher, the login item's included.
     const canRestart = () => existsSync(launcherPath(ommsDir()));
-    server.setWebUpdate(startWebUpdate(() => powerAction("update"), canRestart));
+    server.setWebUpdate(startWebUpdate(() => powerAction("update"), canRestart, () => server.powerActionRunning));
     // A newer `web install` asked this web app to give up the port.
     server.setOnStepAside(async () => {
         clearInterval(keeper);

package/dist/services/web-server.d.ts

@@ -43,7 +43,7 @@ export declare class WebServer {
     private readonly startedAt;
     private onPowerActionCallback;
     private webUpdate;
-    private powerActionRunning;
+    powerActionRunning: boolean;
     private stepAsideTimer;
     private holdOffTimer;
     private portsExhaustedNotified;

package/dist/services/web-server.js

@@ -173,7 +173,7 @@ export class WebServer {
     startedAt = Date.now();
     onPowerActionCallback = null;
     webUpdate = null;
-    powerActionRunning = false;
+    powerActionRunning = false; // public: the automatic update stays quiet while one runs
     stepAsideTimer = null;
     holdOffTimer = null;
     portsExhaustedNotified = false;

package/dist/services/web-update-runtime.d.ts

@@ -1,5 +1,5 @@
 import { WebUpdate, type InstallDeps } from "./web-update.js";
 /** The npm check and installer of a standalone web app, with the real process, npm, and clock. */
-export declare function startWebUpdate(restart: () => Promise<string | undefined>, canRestart: () => boolean): WebUpdate;
+export declare function startWebUpdate(restart: () => Promise<string | undefined>, canRestart: () => boolean, autoBlocked?: () => boolean): WebUpdate;
 /** The real npm process, shared by the update button and `web update`. */
 export declare function nodeInstallDeps(): InstallDeps;

package/dist/services/web-update-runtime.js

@@ -5,7 +5,7 @@ import { log } from "./logger.js";
 import { packageVersion } from "./package-version.js";
 import { WebUpdate } from "./web-update.js";
 /** The npm check and installer of a standalone web app, with the real process, npm, and clock. */
-export function startWebUpdate(restart, canRestart) {
+export function startWebUpdate(restart, canRestart, autoBlocked) {
     const update = new WebUpdate({
         version: packageVersion(),
         enabled: process.env.OMMS_DISABLE_UPDATE_CHECK !== "1",
@@ -18,6 +18,7 @@ export function startWebUpdate(restart, canRestart) {
         globalVersion: () => globalCommandVersion({ find: () => null }).version,
         restart,
         canRestart,
+        autoBlocked,
         now: () => Date.now(),
     });
     update.start();

package/dist/services/web-update.d.ts

@@ -4,6 +4,8 @@ export declare const UPDATE_CHECK_INTERVAL_MS: number;
 export declare const STATUS_RECHECK_AFTER_MS: number;
 /** An install that takes longer is stopped, and the web app keeps serving. */
 export declare const INSTALL_TIMEOUT_MS: number;
+/** An automatic start waits this long after a failed automatic install. */
+export declare const AUTO_RETRY_AFTER_MS: number;
 export type UpdateState = "idle" | "installing" | "restarting" | "failed";
 /** The `update` field of `GET /api/web/status`. */
 export interface UpdateStatus {
@@ -39,6 +41,8 @@ export interface WebUpdateDeps {
     globalVersion: () => string | null;
     /** False when no restart could serve the new copy, such as a missing launcher. Checked before npm runs. */
     canRestart: () => boolean;
+    /** True while a Stop or Restart runs; the automatic start stays quiet then. */
+    autoBlocked?: () => boolean;
     /** Stop npm and its children. On Windows the shell wrapper alone would leave npm running. */
     killTree: (child: InstallChild) => Promise<void>;
     /** Restart onto the newest copy. Returns a failure code when this web app keeps serving. */
@@ -68,12 +72,16 @@ export declare class WebUpdate {
     private started;
     private lastCheck;
     private checking;
+    private autoRetryAt;
+    private autoAttempt;
     constructor(deps: WebUpdateDeps);
     /** Check now, then every 10 minutes. A second call does nothing. */
     start(): void;
     /** Read npm `latest`. A failed read keeps the last result. Calls during a read share it. */
     check(): Promise<void>;
     private read;
+    /** Start the install the Update button starts, once a check found a release. */
+    private maybeAutoInstall;
     status(): UpdateStatus;
     private canInstall;
     /** Start the install and the restart. A request while one runs joins it. */

package/dist/services/web-update.js

@@ -9,6 +9,8 @@ export const UPDATE_CHECK_INTERVAL_MS = 10 * 60 * 1000;
 export const STATUS_RECHECK_AFTER_MS = 60 * 1000;
 /** An install that takes longer is stopped, and the web app keeps serving. */
 export const INSTALL_TIMEOUT_MS = 5 * 60 * 1000;
+/** An automatic start waits this long after a failed automatic install. */
+export const AUTO_RETRY_AFTER_MS = 30 * 60 * 1000;
 /** Only a plain release reaches the npm arguments; the value comes from the registry. */
 const PLAIN_VERSION = /^\d+\.\d+\.\d+$/;
 /** Enough of npm's error stream to find a code; the rest is dropped. */
@@ -29,6 +31,8 @@ export class WebUpdate {
     started = false;
     lastCheck = -Infinity;
     checking = null;
+    autoRetryAt = -Infinity;
+    autoAttempt = false;
     constructor(deps) {
         this.deps = deps;
     }
@@ -55,6 +59,25 @@ export class WebUpdate {
             return;
         }
         this.available = availableUpdate(this.deps.version, latest);
+        this.maybeAutoInstall();
+    }
+    /** Start the install the Update button starts, once a check found a release. */
+    maybeAutoInstall() {
+        if (this.state === "installing" || this.state === "restarting")
+            return;
+        if (!this.available)
+            return;
+        if (this.deps.now() < this.autoRetryAt)
+            return;
+        // A check can finish while a Stop or Restart runs; the manual route has the same gate.
+        if (this.deps.autoBlocked?.())
+            return;
+        if (!this.canInstall())
+            return;
+        if (this.requestInstall() !== "accepted")
+            return;
+        this.autoAttempt = true;
+        this.deps.log("Web app auto-update started", { from: this.deps.version, to: this.available });
     }
     status() {
         // An open page polls the status, so a release shows within about a minute.
@@ -78,6 +101,7 @@ export class WebUpdate {
             return "no-update";
         if (!this.canInstall())
             return "cannot-install";
+        this.autoAttempt = false;
         this.state = "installing";
         this.code = null;
         void this.install(this.available);
@@ -96,6 +120,9 @@ export class WebUpdate {
         const fail = (code, exitCode) => {
             this.state = "failed";
             this.code = code;
+            // Only an automatic start waits before trying again; the button always works.
+            if (this.autoAttempt)
+                this.autoRetryAt = this.deps.now() + AUTO_RETRY_AFTER_MS;
             record("failed", code, exitCode);
         };
         const { code, exitCode } = await runGlobalInstall(this.deps, target);