saros-proxy 1.1.2 → 1.2.0

package/dist/cli/update-check.d.ts

@@ -1,6 +1,28 @@
 /**
  * update-check.ts — Check npm registry for newer versions.
  */
+import { getVersion } from '../version.js';
+/** Backwards-compatible alias for the shared cached version read. */
+export { getVersion as getCurrentVersion };
+export declare function isValidVersion(version: string): boolean;
+/**
+ * Compare two semver-like version strings. Returns:
+ *   -1 if a < b
+ *    0 if a == b
+ *    1 if a > b
+ *
+ * A prerelease sorts below its stable release (`1.1.3-rc.1 < 1.1.3`), as
+ * `saros-proxy update` uses this to decide whether to install.
+ */
+export declare function compareVersions(a: string, b: string): number;
+/**
+ * Read the `latest` version from the npm registry.
+ *
+ * Throws a human-readable error when the registry cannot answer — callers that
+ * only warn (the boot check) swallow it, `update --check` reports it.
+ * `fetchImpl` is injectable so tests never touch the network.
+ */
+export declare function fetchLatestVersion(fetchImpl?: typeof fetch): Promise<string>;
 /**
  * Check npm registry for the latest version.
  * Prints a warning to stderr if a newer version is available.

package/dist/cli/update-check.js

@@ -1,61 +1,120 @@
 /**
  * update-check.ts — Check npm registry for newer versions.
  */
-import { readFileSync } from 'node:fs';
-import { resolve, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-let currentVersion;
-function getCurrentVersion() {
-    if (!currentVersion) {
-        try {
-            const pkgPath = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..', 'package.json');
-            const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-            currentVersion = pkg.version;
-        }
-        catch {
-            currentVersion = '0.0.0';
-        }
-    }
-    return currentVersion;
+import { getVersion } from '../version.js';
+const REGISTRY_URL = 'https://registry.npmjs.org/saros-proxy/latest';
+const REGISTRY_TIMEOUT_MS = 5000;
+/**
+ * A registry version must be plain semver before it is interpolated into an
+ * `npm install` argument (on Windows that runs through a shell).
+ */
+const VERSION_PATTERN = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
+/** Backwards-compatible alias for the shared cached version read. */
+export { getVersion as getCurrentVersion };
+export function isValidVersion(version) {
+    return VERSION_PATTERN.test(version);
+}
+/**
+ * Split semver into numeric core and prerelease. Build metadata (`+…`) is
+ * ignored: it does not participate in precedence.
+ */
+function parseVersion(version) {
+    const withoutBuild = version.trim().replace(/^v/, '').split('+')[0];
+    const dash = withoutBuild.indexOf('-');
+    const core = (dash === -1 ? withoutBuild : withoutBuild.slice(0, dash))
+        .split('.')
+        .map(Number);
+    return {
+        core,
+        prerelease: dash === -1 ? null : withoutBuild.slice(dash + 1).split('.'),
+    };
 }
 /**
  * Compare two semver-like version strings. Returns:
  *   -1 if a < b
  *    0 if a == b
  *    1 if a > b
+ *
+ * A prerelease sorts below its stable release (`1.1.3-rc.1 < 1.1.3`), as
+ * `saros-proxy update` uses this to decide whether to install.
  */
-function compareVersions(a, b) {
-    const aParts = a.split('.').map(Number);
-    const bParts = b.split('.').map(Number);
-    for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
-        const aVal = aParts[i] ?? 0;
-        const bVal = bParts[i] ?? 0;
+export function compareVersions(a, b) {
+    const left = parseVersion(a);
+    const right = parseVersion(b);
+    const coreLength = Math.max(left.core.length, right.core.length);
+    for (let i = 0; i < coreLength; i++) {
+        const aVal = left.core[i] ?? 0;
+        const bVal = right.core[i] ?? 0;
         if (aVal < bVal)
             return -1;
         if (aVal > bVal)
             return 1;
     }
+    if (left.prerelease === null && right.prerelease === null)
+        return 0;
+    if (left.prerelease === null)
+        return 1;
+    if (right.prerelease === null)
+        return -1;
+    const prereleaseLength = Math.max(left.prerelease.length, right.prerelease.length);
+    for (let i = 0; i < prereleaseLength; i++) {
+        const aId = left.prerelease[i];
+        const bId = right.prerelease[i];
+        if (aId === undefined)
+            return -1;
+        if (bId === undefined)
+            return 1;
+        const aNumeric = /^\d+$/.test(aId);
+        const bNumeric = /^\d+$/.test(bId);
+        if (aNumeric && bNumeric) {
+            const diff = Number(aId) - Number(bId);
+            if (diff !== 0)
+                return diff < 0 ? -1 : 1;
+        }
+        else if (aNumeric !== bNumeric) {
+            // Numeric identifiers have lower precedence than alphanumeric ones.
+            return aNumeric ? -1 : 1;
+        }
+        else if (aId !== bId) {
+            return aId < bId ? -1 : 1;
+        }
+    }
     return 0;
 }
+/**
+ * Read the `latest` version from the npm registry.
+ *
+ * Throws a human-readable error when the registry cannot answer — callers that
+ * only warn (the boot check) swallow it, `update --check` reports it.
+ * `fetchImpl` is injectable so tests never touch the network.
+ */
+export async function fetchLatestVersion(fetchImpl = fetch) {
+    const res = await fetchImpl(REGISTRY_URL, {
+        signal: AbortSignal.timeout(REGISTRY_TIMEOUT_MS),
+    });
+    if (!res.ok) {
+        throw new Error(`registry responded with HTTP ${res.status}`);
+    }
+    const data = (await res.json());
+    if (typeof data.version !== 'string' || data.version.length === 0) {
+        throw new Error('registry response has no version field');
+    }
+    if (!isValidVersion(data.version)) {
+        throw new Error(`registry returned an invalid version: ${data.version}`);
+    }
+    return data.version;
+}
 /**
  * Check npm registry for the latest version.
  * Prints a warning to stderr if a newer version is available.
  * Never throws — failures are silently ignored.
  */
 export async function checkForUpdate() {
-    const current = getCurrentVersion();
+    const current = getVersion();
     try {
-        const res = await fetch('https://registry.npmjs.org/saros-proxy/latest', {
-            signal: AbortSignal.timeout(5000),
-        });
-        if (!res.ok)
-            return;
-        const data = (await res.json());
-        const latest = data.version;
-        if (!latest)
-            return;
+        const latest = await fetchLatestVersion();
         if (compareVersions(current, latest) < 0) {
-            console.warn(`\n⚠️  Update available: ${current} → ${latest}. Run: npm install -g saros-proxy\n`);
+            console.warn(`\n⚠️  Update available: ${current} → ${latest}. Run: saros-proxy update\n`);
         }
     }
     catch {

package/dist/cli/update-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/cli/update-check.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,IAAI,cAAkC,CAAC;AAEvC,SAAS,iBAAiB;IACxB,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAC7F,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAwB,CAAC;YAC9E,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,cAAc,GAAG,OAAO,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,CAAS,EAAE,CAAS;IAC3C,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAChE,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,GAAG,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC3B,IAAI,IAAI,GAAG,IAAI;YAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,+CAA+C,EAAE;YACvE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;QACpB,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAyB,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CACV,2BAA2B,OAAO,MAAM,MAAM,qCAAqC,CACpF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,6CAA6C;IAC/C,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../../src/cli/update-check.ts"],"names":[],"mappings":"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"}

package/dist/cli/update.d.ts

@@ -0,0 +1,99 @@
+/**
+ * update.ts — `saros-proxy update`: replace a global npm install and restart
+ * whatever was serving.
+ *
+ * Safety rules:
+ *   - only a package living in the npm global prefix is updated (--force
+ *     overrides), so a git checkout is never replaced behind the user's back;
+ *   - the running proxy is stopped first and is always restarted after a
+ *     failed install, so the host is never left without a proxy;
+ *   - success is verified by reading the installed package.json and by
+ *     checking the restarted proxy's /health version, not by npm's exit code.
+ */
+export interface UpdateArgs {
+    check: boolean;
+    yes: boolean;
+    force: boolean;
+    /** Port override for stop/start/health (`--port`). */
+    port?: number;
+    /** Config path override for stop/start/health (`--config`). */
+    config?: string;
+    error?: string;
+}
+/** Where and how to stop/start the proxy for this update. */
+export interface ServiceOptions {
+    port?: number;
+    configPath?: string;
+    /** Entry point of the package that must serve after the update. */
+    entryPoint?: string;
+}
+export interface DaemonStateSnapshot {
+    running: boolean;
+    port: number;
+    pid?: string | null;
+    health?: Record<string, unknown>;
+}
+export interface UpdateDependencies {
+    currentVersion: string;
+    /** Registry lookup; rejects with a human-readable reason. */
+    fetchLatestVersion: () => Promise<string>;
+    /** Run npm/systemctl. Throws on non-zero; returns trimmed stdout. */
+    exec: (command: string, args: readonly string[], options?: ExecOptions) => string;
+    packageRoot: string;
+    readInstalledVersion: (packageRoot: string) => string | null;
+    isTTY: boolean;
+    confirm: (message: string) => Promise<boolean>;
+    getDaemonState: () => Promise<DaemonStateSnapshot>;
+    daemonStop: (options: ServiceOptions) => Promise<boolean>;
+    daemonStart: (options: ServiceOptions) => Promise<void>;
+    systemdActive: () => boolean;
+    systemdStop: () => void;
+    systemdStart: () => void;
+    probeHealth: (port: number) => Promise<{
+        ok: boolean;
+        body?: Record<string, unknown>;
+    }>;
+    daemonLogPath: string;
+    sleep: (ms: number) => Promise<void>;
+    healthAttempts: number;
+    healthDelayMs: number;
+    platform: NodeJS.Platform;
+}
+export interface ExecOptions {
+    /** Inherit stdio so npm's progress/errors reach the user directly. */
+    inherit?: boolean;
+}
+/** Restart path: systemd unit, PID-file daemon, or nothing was running. */
+export type RestartMode = 'systemd' | 'daemon' | 'none';
+/** Parse `update` arguments. The first invalid option is reported. */
+export declare function parseUpdateArgs(argv: readonly string[]): UpdateArgs;
+/**
+ * The proxy to restart: an active systemd unit outranks the PID-file daemon
+ * (a unit-managed process usually has no PID file), and nothing is started
+ * when neither was running before the update.
+ */
+export declare function chooseRestartMode(daemonRunning: boolean, systemdActive: boolean): RestartMode;
+/** Is the running package the one npm considers global? */
+export declare function isGlobalInstall(packageRoot: string, npmGlobalRoot: string, platform?: NodeJS.Platform): boolean;
+/** Read `<packageRoot>/package.json`'s version, or null when unusable. */
+export declare function readPackageVersion(packageRoot: string): string | null;
+/**
+ * Poll /health until it answers `status: ok` with the expected version.
+ * The version check is what distinguishes the freshly installed proxy from
+ * the old process that is still shutting down on the same port; `null`
+ * accepts any version, for a rollback that cannot know which release npm
+ * left on disk.
+ */
+export declare function waitForUpdatedProxy(probe: () => Promise<{
+    ok: boolean;
+    body?: Record<string, unknown>;
+}>, expectedVersion: string | null, attempts: number, delayMs: number, sleep: (ms: number) => Promise<void>): Promise<{
+    ok: boolean;
+    body?: Record<string, unknown>;
+}>;
+/**
+ * Run `saros-proxy update [--check] [--yes] [--force]`.
+ * Returns the process exit code; never calls process.exit so the whole flow
+ * is testable.
+ */
+export declare function runUpdateCommand(argv: readonly string[], overrides?: Partial<UpdateDependencies>): Promise<number>;