@linxin666/dsh-remote-web-ui 0.1.13 → 0.1.14

package/lib/index.js

@@ -1715,30 +1715,85 @@ async function checkUpdates(deps) {
 /** Cap on captured pnpm output (keeps error payloads bounded). */
 const OUTPUT_CAP = 16 * 1024;
 /**
-* Run the update: `pnpm update <packages>` inside the profile directory.
+* Windows cmd command-not-found stderr. With shell:true a missing shim
+* exits with code 1 (cmd cannot report ENOENT), so the fallback chain
+* detects this message instead of the spawn error event.
+*/
+const WIN_CMD_MISSING_RE = /not recognized as an internal or external command/i;
+/**
+* Run the update inside the profile directory. Tries pnpm first, falls back
+* to corepack and then npx when the previous command is missing (ENOENT);
+* all candidates share one hard timeout and keep accumulating output.
 * @param deps - profile dir, package list, and spawn/timeout seams.
 * @returns the outcome with captured output.
 */
 function runUpdate(deps) {
 	return new Promise((resolve) => {
-		const child = (deps.spawnImpl ?? spawn)("pnpm", ["update", ...deps.packages], {
+		const spawnImpl = deps.spawnImpl ?? spawn;
+		const packages = deps.packages;
+		const platform = deps.platform ?? process.platform;
+		const spawnOptions = {
 			cwd: deps.profileDir,
 			stdio: [
 				"ignore",
 				"pipe",
 				"pipe"
-			]
-		});
+			],
+			...platform === "win32" ? { shell: true } : {}
+		};
+		const candidates = [
+			{
+				command: "pnpm",
+				args: ["update", ...packages]
+			},
+			{
+				command: "corepack",
+				args: [
+					"pnpm",
+					"update",
+					...packages
+				]
+			},
+			{
+				command: "npx",
+				args: [
+					"--yes",
+					"pnpm",
+					"update",
+					...packages
+				]
+			}
+		];
 		let output = "";
+		let currentOutput = "";
 		const append = (chunk) => {
 			output += chunk.toString("utf8");
 			if (output.length > OUTPUT_CAP) output = output.slice(output.length - OUTPUT_CAP);
+			currentOutput += chunk.toString("utf8");
+			if (currentOutput.length > OUTPUT_CAP) currentOutput = currentOutput.slice(currentOutput.length - OUTPUT_CAP);
+		};
+		let currentChild;
+		let finished = false;
+		const finish = (result) => {
+			if (finished) return;
+			finished = true;
+			clearTimeout(timer);
+			resolve(result);
 		};
-		child.stdout?.on("data", append);
-		child.stderr?.on("data", append);
 		const timer = setTimeout(() => {
-			child.kill("SIGTERM");
-			resolve({
+			if (finished) return;
+			if (platform === "win32") {
+				const pid = currentChild?.pid;
+				if (pid !== void 0 && pid > 0) try {
+					spawnImpl("taskkill", [
+						"/pid",
+						String(pid),
+						"/t",
+						"/f"
+					], { stdio: "ignore" });
+				} catch {}
+			} else currentChild?.kill("SIGTERM");
+			finish({
 				ok: false,
 				exitCode: null,
 				output,
@@ -1746,27 +1801,59 @@ function runUpdate(deps) {
 				errorCode: "timeout"
 			});
 		}, deps.timeoutMs ?? 10 * 6e4);
-		child.on("error", (error) => {
-			clearTimeout(timer);
-			const missing = error.code === "ENOENT";
-			resolve({
-				ok: false,
-				exitCode: null,
-				output,
-				error: missing ? "pnpm not found on PATH" : error.message,
-				errorCode: missing ? "pnpm-missing" : void 0
+		const runCandidate = (index) => {
+			if (finished) return;
+			if (index >= candidates.length) {
+				finish({
+					ok: false,
+					exitCode: null,
+					output,
+					error: "pnpm not found on PATH (tried pnpm, corepack, npx); install pnpm and restart the app",
+					errorCode: "pnpm-missing"
+				});
+				return;
+			}
+			const candidate = candidates[index];
+			currentOutput = "";
+			const child = spawnImpl(candidate.command, candidate.args, spawnOptions);
+			currentChild = child;
+			let settled = false;
+			const once = (fn) => {
+				if (settled) return;
+				settled = true;
+				fn();
+			};
+			child.stdout?.on("data", append);
+			child.stderr?.on("data", append);
+			child.on("error", (error) => {
+				once(() => {
+					if (error.code === "ENOENT") runCandidate(index + 1);
+					else finish({
+						ok: false,
+						exitCode: null,
+						output,
+						error: error.message,
+						errorCode: void 0
+					});
+				});
 			});
-		});
-		child.on("close", (code) => {
-			clearTimeout(timer);
-			resolve({
-				ok: code === 0,
-				exitCode: code,
-				output,
-				error: code === 0 ? void 0 : "pnpm exited with code " + String(code),
-				...code === 0 ? {} : { errorCode: "pnpm-failed" }
+			child.on("close", (code) => {
+				if (settled || finished) return;
+				if (platform === "win32" && code !== 0 && WIN_CMD_MISSING_RE.test(currentOutput)) {
+					runCandidate(index + 1);
+					return;
+				}
+				settled = true;
+				finish({
+					ok: code === 0,
+					exitCode: code,
+					output,
+					error: code === 0 ? void 0 : "pnpm exited with code " + String(code),
+					...code === 0 ? {} : { errorCode: "pnpm-failed" }
+				});
 			});
-		});
+		};
+		runCandidate(0);
 	});
 }
 //#endregion

package/lib/types/client/locales.js

@@ -96,7 +96,7 @@ export const zh = {
     'update.packages': '组件版本',
     'update.retry': '重新检查',
     'update.close': '关闭更新面板',
-    'update.error.pnpmMissing': '未找到 pnpm，请先安装 pnpm（brew install pnpm 或 corepack enable）。',
+    'update.error.pnpmMissing': '未找到 pnpm，已尝试 pnpm / corepack / npx 仍不可用。请安装 pnpm 后重启应用（Windows: npm install -g pnpm 或 corepack enable；macOS: brew install pnpm 或 corepack enable）。',
     'update.error.timeout': '更新超时，已终止安装进程，请重试。',
     'update.error.notFound': '未找到 dsh-web-ui 聚合包安装，无法更新。',
     'update.error.link': '当前为本地开发模式（链接安装），无法自动更新。',
@@ -200,7 +200,7 @@ export const en = {
     'update.packages': 'Component versions',
     'update.retry': 'Check again',
     'update.close': 'Close update panel',
-    'update.error.pnpmMissing': 'pnpm was not found. Install it first (brew install pnpm or corepack enable).',
+    'update.error.pnpmMissing': 'pnpm was not found (tried pnpm / corepack / npx). Install pnpm and restart the app (Windows: npm install -g pnpm or corepack enable; macOS: brew install pnpm or corepack enable).',
     'update.error.timeout': 'The update timed out and the install process was killed; try again.',
     'update.error.notFound': 'The dsh-web-ui aggregate package is not installed; nothing to update.',
     'update.error.link': 'Local development mode (link install) — automatic update is unavailable.',

package/lib/types/update.d.ts

@@ -180,9 +180,13 @@ export interface UpdateRunDeps {
     spawnImpl?: typeof spawn;
     /** Hard timeout; the child is killed on expiry. */
     timeoutMs?: number;
+    /** Platform override (defaults to process.platform; test seam). */
+    platform?: NodeJS.Platform;
 }
 /**
- * Run the update: `pnpm update <packages>` inside the profile directory.
+ * Run the update inside the profile directory. Tries pnpm first, falls back
+ * to corepack and then npx when the previous command is missing (ENOENT);
+ * all candidates share one hard timeout and keep accumulating output.
  * @param deps - profile dir, package list, and spawn/timeout seams.
  * @returns the outcome with captured output.
  */

package/lib/types/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update.ts"],"names":[],"mappings":"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"}

package/lib/types/update.js

@@ -286,48 +286,144 @@ export async function checkUpdates(deps) {
 /** Cap on captured pnpm output (keeps error payloads bounded). */
 const OUTPUT_CAP = 16 * 1024;
 /**
- * Run the update: `pnpm update <packages>` inside the profile directory.
+ * Windows cmd command-not-found stderr. With shell:true a missing shim
+ * exits with code 1 (cmd cannot report ENOENT), so the fallback chain
+ * detects this message instead of the spawn error event.
+ */
+const WIN_CMD_MISSING_RE = /not recognized as an internal or external command/i;
+/**
+ * Run the update inside the profile directory. Tries pnpm first, falls back
+ * to corepack and then npx when the previous command is missing (ENOENT);
+ * all candidates share one hard timeout and keep accumulating output.
  * @param deps - profile dir, package list, and spawn/timeout seams.
  * @returns the outcome with captured output.
  */
 export function runUpdate(deps) {
     return new Promise((resolve) => {
-        const child = (deps.spawnImpl ?? spawn)('pnpm', ['update', ...deps.packages], {
+        const spawnImpl = deps.spawnImpl ?? spawn;
+        const packages = deps.packages;
+        const platform = deps.platform ?? process.platform;
+        // Windows ships pnpm/corepack/npx as .cmd shims; Node's spawn cannot
+        // start .cmd files directly (ENOENT even when installed), so route
+        // them through cmd.exe there. POSIX spawns stay shell-free.
+        const spawnOptions = {
             cwd: deps.profileDir,
             stdio: ['ignore', 'pipe', 'pipe'],
-        });
+            ...(platform === 'win32' ? { shell: true } : {}),
+        };
+        // Ordered fallback chain: each is tried only when the previous one is
+        // missing on PATH (ENOENT on the spawn error event, never on close).
+        const candidates = [
+            { command: 'pnpm', args: ['update', ...packages] },
+            { command: 'corepack', args: ['pnpm', 'update', ...packages] },
+            { command: 'npx', args: ['--yes', 'pnpm', 'update', ...packages] },
+        ];
+        // `output` accumulates across candidates for UI display; `currentOutput`
+        // is reset per candidate and carries only that candidate's own diagnostics
+        // (its tail is subject to OUTPUT_CAP). The win32 missing-command test must
+        // run against `currentOutput` so a previous candidate's 'not recognized'
+        // stderr cannot misclassify a real failure in the next one.
         let output = '';
+        let currentOutput = '';
         const append = (chunk) => {
             output += chunk.toString('utf8');
             if (output.length > OUTPUT_CAP)
                 output = output.slice(output.length - OUTPUT_CAP);
+            currentOutput += chunk.toString('utf8');
+            if (currentOutput.length > OUTPUT_CAP)
+                currentOutput = currentOutput.slice(currentOutput.length - OUTPUT_CAP);
+        };
+        let currentChild;
+        // Terminal guard: once a result is produced the promise is settled and no
+        // further candidate is started (a killed child's late close must not
+        // respawn anything after a timeout resolution).
+        let finished = false;
+        const finish = (result) => {
+            if (finished)
+                return;
+            finished = true;
+            clearTimeout(timer);
+            resolve(result);
         };
-        child.stdout?.on('data', append);
-        child.stderr?.on('data', append);
         const timer = setTimeout(() => {
-            child.kill('SIGTERM');
-            resolve({ ok: false, exitCode: null, output, error: 'update timed out; install process killed', errorCode: 'timeout' });
+            if (finished)
+                return;
+            if (platform === 'win32') {
+                // cmd.exe under shell:true only kills the shell wrapper; kill the whole
+                // process tree best-effort so pnpm/npx do not keep running.
+                const pid = currentChild?.pid;
+                if (pid !== undefined && pid > 0) {
+                    try {
+                        spawnImpl('taskkill', ['/pid', String(pid), '/t', '/f'], { stdio: 'ignore' });
+                    }
+                    catch {
+                        // Best-effort kill; fall through to the timeout result.
+                    }
+                }
+            }
+            else {
+                currentChild?.kill('SIGTERM');
+            }
+            finish({ ok: false, exitCode: null, output, error: 'update timed out; install process killed', errorCode: 'timeout' });
         }, deps.timeoutMs ?? 10 * 60_000);
-        child.on('error', (error) => {
-            clearTimeout(timer);
-            const missing = error.code === 'ENOENT';
-            resolve({
-                ok: false,
-                exitCode: null,
-                output,
-                error: missing ? 'pnpm not found on PATH' : error.message,
-                errorCode: missing ? 'pnpm-missing' : undefined,
+        const runCandidate = (index) => {
+            if (finished)
+                return;
+            if (index >= candidates.length) {
+                finish({
+                    ok: false,
+                    exitCode: null,
+                    output,
+                    error: 'pnpm not found on PATH (tried pnpm, corepack, npx); install pnpm and restart the app',
+                    errorCode: 'pnpm-missing',
+                });
+                return;
+            }
+            const candidate = candidates[index];
+            currentOutput = '';
+            const child = spawnImpl(candidate.command, candidate.args, spawnOptions);
+            currentChild = child;
+            let settled = false;
+            const once = (fn) => {
+                if (settled)
+                    return;
+                settled = true;
+                fn();
+            };
+            child.stdout?.on('data', append);
+            child.stderr?.on('data', append);
+            child.on('error', (error) => {
+                once(() => {
+                    if (error.code === 'ENOENT') {
+                        // Command missing: try the next candidate in the chain.
+                        runCandidate(index + 1);
+                    }
+                    else {
+                        finish({ ok: false, exitCode: null, output, error: error.message, errorCode: undefined });
+                    }
+                });
             });
-        });
-        child.on('close', (code) => {
-            clearTimeout(timer);
-            resolve({
-                ok: code === 0,
-                exitCode: code,
-                output,
-                error: code === 0 ? undefined : 'pnpm exited with code ' + String(code),
-                ...(code === 0 ? {} : { errorCode: 'pnpm-failed' }),
+            child.on('close', (code) => {
+                if (settled || finished)
+                    return;
+                // Windows + shell: a missing command reports exit 1 with
+                // 'not recognized' instead of ENOENT — keep the chain going. Checked
+                // against this candidate's own output so a prior fallback's stderr
+                // cannot misclassify a real failure here.
+                if (platform === 'win32' && code !== 0 && WIN_CMD_MISSING_RE.test(currentOutput)) {
+                    runCandidate(index + 1);
+                    return;
+                }
+                settled = true;
+                finish({
+                    ok: code === 0,
+                    exitCode: code,
+                    output,
+                    error: code === 0 ? undefined : 'pnpm exited with code ' + String(code),
+                    ...(code === 0 ? {} : { errorCode: 'pnpm-failed' }),
+                });
             });
-        });
+        };
+        runCandidate(0);
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-remote-web-ui",
   "description": "Mobile remote control for the dsh web GUI: scan-to-pair QR entry beside the settings button, one-time pairing tokens, live device status, and revocable mobile sessions",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/client/locales.ts

@@ -97,7 +97,7 @@ export const zh = {
   'update.packages': '组件版本',
   'update.retry': '重新检查',
   'update.close': '关闭更新面板',
-  'update.error.pnpmMissing': '未找到 pnpm，请先安装 pnpm（brew install pnpm 或 corepack enable）。',
+  'update.error.pnpmMissing': '未找到 pnpm，已尝试 pnpm / corepack / npx 仍不可用。请安装 pnpm 后重启应用（Windows: npm install -g pnpm 或 corepack enable；macOS: brew install pnpm 或 corepack enable）。',
   'update.error.timeout': '更新超时，已终止安装进程，请重试。',
   'update.error.notFound': '未找到 dsh-web-ui 聚合包安装，无法更新。',
   'update.error.link': '当前为本地开发模式（链接安装），无法自动更新。',
@@ -208,7 +208,7 @@ export const en = {
   'update.packages': 'Component versions',
   'update.retry': 'Check again',
   'update.close': 'Close update panel',
-  'update.error.pnpmMissing': 'pnpm was not found. Install it first (brew install pnpm or corepack enable).',
+  'update.error.pnpmMissing': 'pnpm was not found (tried pnpm / corepack / npx). Install pnpm and restart the app (Windows: npm install -g pnpm or corepack enable; macOS: brew install pnpm or corepack enable).',
   'update.error.timeout': 'The update timed out and the install process was killed; try again.',
   'update.error.notFound': 'The dsh-web-ui aggregate package is not installed; nothing to update.',
   'update.error.link': 'Local development mode (link install) — automatic update is unavailable.',

package/src/update.ts

@@ -383,53 +383,143 @@ export interface UpdateRunDeps {
   spawnImpl?: typeof spawn
   /** Hard timeout; the child is killed on expiry. */
   timeoutMs?: number
+  /** Platform override (defaults to process.platform; test seam). */
+  platform?: NodeJS.Platform
 }
 
 /** Cap on captured pnpm output (keeps error payloads bounded). */
 const OUTPUT_CAP = 16 * 1024
 
 /**
- * Run the update: `pnpm update <packages>` inside the profile directory.
+ * Windows cmd command-not-found stderr. With shell:true a missing shim
+ * exits with code 1 (cmd cannot report ENOENT), so the fallback chain
+ * detects this message instead of the spawn error event.
+ */
+const WIN_CMD_MISSING_RE = /not recognized as an internal or external command/i
+
+/**
+ * Run the update inside the profile directory. Tries pnpm first, falls back
+ * to corepack and then npx when the previous command is missing (ENOENT);
+ * all candidates share one hard timeout and keep accumulating output.
  * @param deps - profile dir, package list, and spawn/timeout seams.
  * @returns the outcome with captured output.
  */
 export function runUpdate(deps: UpdateRunDeps): Promise<UpdateRunResult> {
   return new Promise((resolve) => {
-    const child = (deps.spawnImpl ?? spawn)('pnpm', ['update', ...deps.packages], {
+    const spawnImpl = deps.spawnImpl ?? spawn
+    const packages = deps.packages
+    const platform = deps.platform ?? process.platform
+    // Windows ships pnpm/corepack/npx as .cmd shims; Node's spawn cannot
+    // start .cmd files directly (ENOENT even when installed), so route
+    // them through cmd.exe there. POSIX spawns stay shell-free.
+    const spawnOptions: Record<string, unknown> = {
       cwd: deps.profileDir,
       stdio: ['ignore', 'pipe', 'pipe'],
-    })
+      ...(platform === 'win32' ? { shell: true } : {}),
+    }
+    // Ordered fallback chain: each is tried only when the previous one is
+    // missing on PATH (ENOENT on the spawn error event, never on close).
+    const candidates: ReadonlyArray<{ command: string; args: string[] }> = [
+      { command: 'pnpm', args: ['update', ...packages] },
+      { command: 'corepack', args: ['pnpm', 'update', ...packages] },
+      { command: 'npx', args: ['--yes', 'pnpm', 'update', ...packages] },
+    ]
+    // `output` accumulates across candidates for UI display; `currentOutput`
+    // is reset per candidate and carries only that candidate's own diagnostics
+    // (its tail is subject to OUTPUT_CAP). The win32 missing-command test must
+    // run against `currentOutput` so a previous candidate's 'not recognized'
+    // stderr cannot misclassify a real failure in the next one.
     let output = ''
+    let currentOutput = ''
     const append = (chunk: Buffer): void => {
       output += chunk.toString('utf8')
       if (output.length > OUTPUT_CAP) output = output.slice(output.length - OUTPUT_CAP)
+      currentOutput += chunk.toString('utf8')
+      if (currentOutput.length > OUTPUT_CAP) currentOutput = currentOutput.slice(currentOutput.length - OUTPUT_CAP)
+    }
+    let currentChild: ReturnType<typeof spawnImpl> | undefined
+    // Terminal guard: once a result is produced the promise is settled and no
+    // further candidate is started (a killed child's late close must not
+    // respawn anything after a timeout resolution).
+    let finished = false
+    const finish = (result: UpdateRunResult): void => {
+      if (finished) return
+      finished = true
+      clearTimeout(timer)
+      resolve(result)
     }
-    child.stdout?.on('data', append)
-    child.stderr?.on('data', append)
     const timer = setTimeout(() => {
-      child.kill('SIGTERM')
-      resolve({ ok: false, exitCode: null, output, error: 'update timed out; install process killed', errorCode: 'timeout' })
+      if (finished) return
+      if (platform === 'win32') {
+        // cmd.exe under shell:true only kills the shell wrapper; kill the whole
+        // process tree best-effort so pnpm/npx do not keep running.
+        const pid = (currentChild as { pid?: number } | undefined)?.pid
+        if (pid !== undefined && pid > 0) {
+          try {
+            spawnImpl('taskkill', ['/pid', String(pid), '/t', '/f'], { stdio: 'ignore' })
+          } catch {
+            // Best-effort kill; fall through to the timeout result.
+          }
+        }
+      } else {
+        currentChild?.kill('SIGTERM')
+      }
+      finish({ ok: false, exitCode: null, output, error: 'update timed out; install process killed', errorCode: 'timeout' })
     }, deps.timeoutMs ?? 10 * 60_000)
-    child.on('error', (error: Error) => {
-      clearTimeout(timer)
-      const missing = (error as NodeJS.ErrnoException).code === 'ENOENT'
-      resolve({
-        ok: false,
-        exitCode: null,
-        output,
-        error: missing ? 'pnpm not found on PATH' : error.message,
-        errorCode: missing ? 'pnpm-missing' : undefined,
+    const runCandidate = (index: number): void => {
+      if (finished) return
+      if (index >= candidates.length) {
+        finish({
+          ok: false,
+          exitCode: null,
+          output,
+          error: 'pnpm not found on PATH (tried pnpm, corepack, npx); install pnpm and restart the app',
+          errorCode: 'pnpm-missing',
+        })
+        return
+      }
+      const candidate = candidates[index]
+      currentOutput = ''
+      const child = spawnImpl(candidate.command, candidate.args, spawnOptions)
+      currentChild = child
+      let settled = false
+      const once = (fn: () => void): void => {
+        if (settled) return
+        settled = true
+        fn()
+      }
+      child.stdout?.on('data', append)
+      child.stderr?.on('data', append)
+      child.on('error', (error: Error) => {
+        once(() => {
+          if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+            // Command missing: try the next candidate in the chain.
+            runCandidate(index + 1)
+          } else {
+            finish({ ok: false, exitCode: null, output, error: error.message, errorCode: undefined })
+          }
+        })
       })
-    })
-    child.on('close', (code) => {
-      clearTimeout(timer)
-      resolve({
-        ok: code === 0,
-        exitCode: code,
-        output,
-        error: code === 0 ? undefined : 'pnpm exited with code ' + String(code),
-        ...(code === 0 ? {} : { errorCode: 'pnpm-failed' as const }),
+      child.on('close', (code: number | null) => {
+        if (settled || finished) return
+        // Windows + shell: a missing command reports exit 1 with
+        // 'not recognized' instead of ENOENT — keep the chain going. Checked
+        // against this candidate's own output so a prior fallback's stderr
+        // cannot misclassify a real failure here.
+        if (platform === 'win32' && code !== 0 && WIN_CMD_MISSING_RE.test(currentOutput)) {
+          runCandidate(index + 1)
+          return
+        }
+        settled = true
+        finish({
+          ok: code === 0,
+          exitCode: code,
+          output,
+          error: code === 0 ? undefined : 'pnpm exited with code ' + String(code),
+          ...(code === 0 ? {} : { errorCode: 'pnpm-failed' as const }),
+        })
       })
-    })
+    }
+    runCandidate(0)
   })
 }