@web-auto/webauto 0.1.6 → 0.1.7

package/apps/desktop-console/dist/main/index.mjs

@@ -270,6 +270,7 @@ async function importConfigFromFile(filePath) {
 // src/main/core-daemon-manager.mts
 import { spawn } from "child_process";
 import path2 from "path";
+import { existsSync as existsSync2 } from "fs";
 import { fileURLToPath } from "url";
 var REPO_ROOT = path2.resolve(path2.dirname(fileURLToPath(import.meta.url)), "../../../..");
 var CORE_HEALTH_URLS = ["http://127.0.0.1:7701/health", "http://127.0.0.1:7704/health"];
@@ -283,11 +284,33 @@ function resolveNodeBin() {
   if (explicit) return explicit;
   const npmNode = String(process.env.npm_node_execpath || "").trim();
   if (npmNode) return npmNode;
-  return process.platform === "win32" ? "node.exe" : "node";
+  const fromPath = resolveOnPath(process.platform === "win32" ? ["node.exe", "node.cmd", "node"] : ["node"]);
+  if (fromPath) return fromPath;
+  return process.execPath;
 }
 function resolveNpxBin() {
+  const fromPath = resolveOnPath(
+    process.platform === "win32" ? ["npx.cmd", "npx.exe", "npx.bat", "npx.ps1"] : ["npx"]
+  );
+  if (fromPath) return fromPath;
   return process.platform === "win32" ? "npx.cmd" : "npx";
 }
+function resolveOnPath(candidates) {
+  const pathEnv = process.env.PATH || process.env.Path || "";
+  const dirs = pathEnv.split(path2.delimiter).filter(Boolean);
+  for (const dir of dirs) {
+    for (const name of candidates) {
+      const full = path2.join(dir, name);
+      if (existsSync2(full)) return full;
+    }
+  }
+  return null;
+}
+function quoteCmdArg(value) {
+  if (!value) return '""';
+  if (!/[\s"]/u.test(value)) return value;
+  return `"${value.replace(/"/g, '""')}"`;
+}
 async function checkHttpHealth(url) {
   try {
     const res = await fetch(url, { signal: AbortSignal.timeout(1e3) });
@@ -332,7 +355,18 @@ async function runNodeScript(scriptPath, timeoutMs) {
 }
 async function runCommand(command, args, timeoutMs) {
   return new Promise((resolve) => {
-    const child = spawn(command, args, {
+    const lower = String(command || "").toLowerCase();
+    let spawnCommand2 = command;
+    let spawnArgs = args;
+    if (process.platform === "win32" && (lower.endsWith(".cmd") || lower.endsWith(".bat"))) {
+      spawnCommand2 = "cmd.exe";
+      const cmdLine = [quoteCmdArg(command), ...args.map(quoteCmdArg)].join(" ");
+      spawnArgs = ["/d", "/s", "/c", cmdLine];
+    } else if (process.platform === "win32" && lower.endsWith(".ps1")) {
+      spawnCommand2 = "powershell.exe";
+      spawnArgs = ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", command, ...args];
+    }
+    const child = spawn(spawnCommand2, spawnArgs, {
       cwd: REPO_ROOT,
       stdio: "ignore",
       windowsHide: true,
@@ -365,7 +399,11 @@ async function startCoreDaemon() {
     console.error("[CoreDaemonManager] Failed to start unified API service");
     return false;
   }
-  const startedBrowser = await runCommand(resolveNpxBin(), ["--yes", "@web-auto/camo", "init"], 4e4);
+  const startedBrowser = await runCommand(
+    resolveNpxBin(),
+    ["--yes", "--package=@web-auto/camo", "camo", "init"],
+    4e4
+  );
   if (!startedBrowser) {
     console.error("[CoreDaemonManager] Failed to start camo browser backend");
     return false;
@@ -691,28 +729,26 @@ var StateBridge = class {
 var stateBridge = new StateBridge();
 
 // src/main/env-check.mts
-import { promisify } from "node:util";
-import { exec, spawnSync } from "node:child_process";
-import { existsSync as existsSync2 } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { existsSync as existsSync3 } from "node:fs";
 import path4 from "node:path";
 import os3 from "node:os";
-var execAsync = promisify(exec);
 function resolveWebautoRoot() {
   const portableRoot = String(process.env.WEBAUTO_PORTABLE_ROOT || process.env.WEBAUTO_ROOT || "").trim();
   return portableRoot ? path4.join(portableRoot, ".webauto") : path4.join(os3.homedir(), ".webauto");
 }
 function resolveNpxBin2() {
   if (process.platform !== "win32") return "npx";
-  const resolved = resolveOnPath(["npx.cmd", "npx.exe", "npx.bat", "npx.ps1"]);
+  const resolved = resolveOnPath2(["npx.cmd", "npx.exe", "npx.bat", "npx.ps1"]);
   return resolved || "npx.cmd";
 }
-function resolveOnPath(candidates) {
+function resolveOnPath2(candidates) {
   const pathEnv = process.env.PATH || process.env.Path || "";
   const dirs = pathEnv.split(path4.delimiter).filter(Boolean);
   for (const dir of dirs) {
     for (const name of candidates) {
       const full = path4.join(dir, name);
-      if (existsSync2(full)) return full;
+      if (existsSync3(full)) return full;
     }
   }
   return null;
@@ -729,7 +765,7 @@ ${String(stderr || "")}`.trim();
   }
   return "unknown";
 }
-function quoteCmdArg(value) {
+function quoteCmdArg2(value) {
   if (!value) return '""';
   if (!/[\s"]/u.test(value)) return value;
   return `"${value.replace(/"/g, '""')}"`;
@@ -739,7 +775,7 @@ function runVersionCheck(command, args, explicitPath) {
     const lower = String(command || "").toLowerCase();
     let ret;
     if (process.platform === "win32" && (lower.endsWith(".cmd") || lower.endsWith(".bat"))) {
-      const cmdLine = [quoteCmdArg(command), ...args.map(quoteCmdArg)].join(" ");
+      const cmdLine = [quoteCmdArg2(command), ...args.map(quoteCmdArg2)].join(" ");
       ret = spawnSync("cmd.exe", ["/d", "/s", "/c", cmdLine], {
         encoding: "utf8",
         timeout: 8e3,
@@ -773,6 +809,14 @@ function runVersionCheck(command, args, explicitPath) {
     return { installed: false, error: String(err) };
   }
 }
+function resolvePathFromOutput(stdout) {
+  const lines = String(stdout || "").split(/\r?\n/).map((x) => x.trim()).filter(Boolean);
+  for (let i = lines.length - 1; i >= 0; i -= 1) {
+    const line = lines[i];
+    if (line.startsWith("/") || /^[A-Z]:\\/i.test(line)) return line;
+  }
+  return "";
+}
 async function checkCamoCli() {
   const camoCandidates = process.platform === "win32" ? ["camo.cmd", "camo.exe", "camo.bat", "camo.ps1"] : ["camo"];
   for (const candidate of camoCandidates) {
@@ -788,7 +832,7 @@ async function checkCamoCli() {
   for (const localRoot of localRoots) {
     for (const suffix of camoCandidates) {
       const candidate = path4.resolve(localRoot, suffix);
-      if (!existsSync2(candidate)) continue;
+      if (!existsSync3(candidate)) continue;
       const ret = runVersionCheck(candidate, ["help"], candidate);
       if (ret.installed) return ret;
     }
@@ -813,51 +857,32 @@ async function checkServices() {
   return { unifiedApi, camoRuntime, searchGate };
 }
 async function checkFirefox() {
-  try {
-    const pythonBin = process.platform === "win32" ? "python" : "python3";
-    const ret = spawnSync(pythonBin, ["-m", "camoufox", "path"], {
-      encoding: "utf8",
-      timeout: 8e3,
-      windowsHide: true
-    });
-    if (ret.status === 0) {
-      const lines = String(ret.stdout || "").split(/\r?\n/).map((x) => x.trim()).filter(Boolean);
-      for (let i = lines.length - 1; i >= 0; i -= 1) {
-        const line = lines[i];
-        if (line && (line.startsWith("/") || /^[A-Z]:\\/.test(line))) return { installed: true, path: line };
-      }
-      return { installed: true };
-    }
-  } catch {
-  }
-  const platform = process.platform;
-  try {
-    if (platform === "win32") {
-      const programFiles = process.env.PROGRAMFILES || "C:\\Program Files";
-      const programFilesX86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-      const localAppData = process.env.LOCALAPPDATA || path4.join(os3.homedir(), "AppData", "Local");
-      const possiblePaths = [
-        path4.join(programFiles, "Mozilla Firefox", "firefox.exe"),
-        path4.join(programFilesX86, "Mozilla Firefox", "firefox.exe"),
-        path4.join(localAppData, "Mozilla Firefox", "firefox.exe")
-      ];
-      for (const firefoxPath2 of possiblePaths) {
-        if (existsSync2(firefoxPath2)) return { installed: true, path: firefoxPath2 };
-      }
-      return { installed: false };
+  const candidates = process.platform === "win32" ? [
+    { command: "python", args: ["-m", "camoufox", "path"] },
+    { command: "py", args: ["-3", "-m", "camoufox", "path"] },
+    { command: resolveNpxBin2(), args: ["--yes", "--package=camoufox", "camoufox", "path"] }
+  ] : [
+    { command: "python3", args: ["-m", "camoufox", "path"] },
+    { command: resolveNpxBin2(), args: ["--yes", "--package=camoufox", "camoufox", "path"] }
+  ];
+  for (const candidate of candidates) {
+    try {
+      const ret = spawnSync(candidate.command, candidate.args, {
+        encoding: "utf8",
+        timeout: 8e3,
+        windowsHide: true
+      });
+      if (ret.status !== 0) continue;
+      const resolvedPath = resolvePathFromOutput(String(ret.stdout || ""));
+      return resolvedPath ? { installed: true, path: resolvedPath } : { installed: true };
+    } catch {
     }
-    const macBundle = "/Applications/Firefox.app/Contents/MacOS/firefox";
-    if (platform === "darwin" && existsSync2(macBundle)) return { installed: true, path: macBundle };
-    const { stdout } = await execAsync("which firefox", { timeout: 3e3 });
-    const firefoxPath = String(stdout || "").trim();
-    return firefoxPath ? { installed: true, path: firefoxPath } : { installed: false };
-  } catch {
-    return { installed: false };
   }
+  return { installed: false };
 }
 async function checkGeoIP() {
   const geoIpPath = path4.join(resolveWebautoRoot(), "geoip", "GeoLite2-City.mmdb");
-  if (existsSync2(geoIpPath)) {
+  if (existsSync3(geoIpPath)) {
     return { installed: true, path: geoIpPath };
   }
   return { installed: false };

package/apps/desktop-console/dist/renderer/index.js

@@ -1553,7 +1553,7 @@ function renderSetupWizard(root, ctx2) {
       <div class="env-item" id="env-camo" style="display:flex; align-items:center; justify-content:space-between; gap:8px;">
         <span style="display:flex; align-items:center; gap:8px; min-width:0;">
           <span class="icon" style="color: var(--text-4);">\u25CB</span>
-          <span class="env-label">Camo CLI</span>
+          <span class="env-label">Camo CLI (@web-auto/camo)</span>
         </span>
         <button id="repair-camo-btn" class="secondary" style="display:none; flex:0 0 auto;">\u4E00\u952E\u4FEE\u590D</button>
       </div>
@@ -1567,14 +1567,14 @@ function renderSetupWizard(root, ctx2) {
       <div class="env-item" id="env-browser" style="display:flex; align-items:center; justify-content:space-between; gap:8px;">
         <span style="display:flex; align-items:center; gap:8px; min-width:0;">
           <span class="icon" style="color: var(--text-4);">\u25CB</span>
-          <span class="env-label">Camo Runtime\uFF08\u53EF\u9009\uFF09</span>
+          <span class="env-label">Camo Runtime Service (7704\uFF0C\u53EF\u9009)</span>
         </span>
         <button id="repair-core2-btn" class="secondary" style="display:none; flex:0 0 auto;">\u4E00\u952E\u4FEE\u590D</button>
       </div>
       <div class="env-item" id="env-firefox" style="display:flex; align-items:center; justify-content:space-between; gap:8px;">
         <span style="display:flex; align-items:center; gap:8px; min-width:0;">
           <span class="icon" style="color: var(--text-4);">\u25CB</span>
-          <span class="env-label">Camoufox Browser</span>
+          <span class="env-label">Camoufox Runtime (python -m camoufox)</span>
         </span>
         <button id="repair-runtime-btn" class="secondary" style="display:none; flex:0 0 auto;">\u4E00\u952E\u4FEE\u590D</button>
       </div>
@@ -1706,7 +1706,7 @@ function renderSetupWizard(root, ctx2) {
       setupStatusText.textContent = "\u6B63\u5728\u62C9\u8D77\u6838\u5FC3\u670D\u52A1...";
       const res = await ctx2.api.envRepairDeps({ core: true }).catch((err) => ({ ok: false, error: err?.message || String(err) }));
       const ok = res?.ok !== false;
-      const detail = res?.error || (ok ? "" : "\u6838\u5FC3\u670D\u52A1\u542F\u52A8\u5931\u8D25");
+      const detail = res?.error || res?.core?.error || res?.core?.services?.error || (ok ? "" : "\u6838\u5FC3\u670D\u52A1\u542F\u52A8\u5931\u8D25");
       return { ok, detail };
     }
     if (typeof ctx2.api?.envRepairCore === "function") {
@@ -1720,7 +1720,7 @@ function renderSetupWizard(root, ctx2) {
   }
   async function repairInstall({ browser, geoip, reinstall, uninstall }) {
     if (typeof ctx2.api?.envRepairDeps === "function") {
-      setupStatusText.textContent = reinstall ? "\u6B63\u5728\u5378\u8F7D\u5E76\u91CD\u88C5\u8D44\u6E90\uFF08Camoufox/GeoIP\uFF09..." : geoip && browser ? "\u6B63\u5728\u5B89\u88C5\u4F9D\u8D56\uFF08Camoufox/GeoIP\uFF09..." : geoip ? "\u6B63\u5728\u5B89\u88C5 GeoIP\uFF08\u53EF\u9009\uFF09..." : "\u6B63\u5728\u5B89\u88C5 Camoufox...";
+      setupStatusText.textContent = reinstall ? "\u6B63\u5728\u5378\u8F7D\u5E76\u91CD\u88C5\u8D44\u6E90\uFF08Camoufox Runtime/GeoIP\uFF09..." : geoip && browser ? "\u6B63\u5728\u5B89\u88C5\u4F9D\u8D56\uFF08Camoufox Runtime/GeoIP\uFF09..." : geoip ? "\u6B63\u5728\u5B89\u88C5 GeoIP\uFF08\u53EF\u9009\uFF09..." : "\u6B63\u5728\u5B89\u88C5 Camoufox Runtime...";
       const res = await ctx2.api.envRepairDeps({
         browser: Boolean(browser),
         geoip: Boolean(geoip),
@@ -1728,11 +1728,11 @@ function renderSetupWizard(root, ctx2) {
         uninstall: Boolean(uninstall)
       }).catch((err) => ({ ok: false, error: err?.message || String(err) }));
       const ok = res?.ok !== false;
-      const detail = res?.error || (ok ? "" : "\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25");
+      const detail = res?.error || res?.install?.error || res?.install?.stderr || res?.install?.stdout || res?.install?.json?.error || (ok ? "" : "\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25");
       return { ok, detail };
     }
     if (typeof ctx2.api?.cmdRunJson === "function") {
-      setupStatusText.textContent = reinstall ? "\u6B63\u5728\u5378\u8F7D\u5E76\u91CD\u88C5\u8D44\u6E90\uFF08Camoufox/GeoIP\uFF09..." : geoip && browser ? "\u6B63\u5728\u5B89\u88C5\u4F9D\u8D56\uFF08Camoufox/GeoIP\uFF09..." : geoip ? "\u6B63\u5728\u5B89\u88C5 GeoIP\uFF08\u53EF\u9009\uFF09..." : "\u6B63\u5728\u5B89\u88C5 Camoufox...";
+      setupStatusText.textContent = reinstall ? "\u6B63\u5728\u5378\u8F7D\u5E76\u91CD\u88C5\u8D44\u6E90\uFF08Camoufox Runtime/GeoIP\uFF09..." : geoip && browser ? "\u6B63\u5728\u5B89\u88C5\u4F9D\u8D56\uFF08Camoufox Runtime/GeoIP\uFF09..." : geoip ? "\u6B63\u5728\u5B89\u88C5 GeoIP\uFF08\u53EF\u9009\uFF09..." : "\u6B63\u5728\u5B89\u88C5 Camoufox Runtime...";
       const script = ctx2.api.pathJoin("apps", "webauto", "entry", "xhs-install.mjs");
       const args = [script];
       if (reinstall) args.push("--reinstall");
@@ -1761,7 +1761,12 @@ function renderSetupWizard(root, ctx2) {
       if (!res.ok) ok = false;
       if (res.detail) detail = res.detail;
     }
-    if (missing.camo || missing.runtime) {
+    if (missing.camo && !missing.core) {
+      const res = await repairCoreServices();
+      if (!res.ok) ok = false;
+      if (res.detail) detail = res.detail;
+    }
+    if (missing.runtime) {
       const res = await repairInstall({ browser: true });
       if (!res.ok) ok = false;
       if (res.detail) detail = res.detail;
@@ -1837,7 +1842,7 @@ function renderSetupWizard(root, ctx2) {
       updateCompleteStatus();
       if (!envReady) {
         const missing = [];
-        if (!snapshot?.camo?.installed) missing.push("camo");
+        if (!snapshot?.camo?.installed) missing.push("camo-cli");
         if (!snapshot?.services?.unifiedApi) missing.push("unified-api");
         if (!snapshot?.firefox?.installed) missing.push("camoufox-runtime");
         setupStatusText.textContent = `\u5B58\u5728\u5F85\u4FEE\u590D\u9879: ${missing.join(", ")}`;
@@ -2069,10 +2074,14 @@ function renderSetupWizard(root, ctx2) {
     const snapshot = await collectEnvironment();
     return await repairMissing(snapshot);
   });
-  envReinstallAllBtn.onclick = () => void runRepair("\u4E00\u952E\u5378\u8F7D\u91CD\u88C5\u8D44\u6E90", () => repairInstall({ browser: true, geoip: true, reinstall: true }));
+  envReinstallAllBtn.onclick = () => void runRepair("\u4E00\u952E\u5378\u8F7D\u91CD\u88C5\u8D44\u6E90", () => (async () => {
+    const core = await repairCoreServices();
+    if (!core.ok) return core;
+    return repairInstall({ browser: true, geoip: true, reinstall: true });
+  })());
   repairCoreBtn.onclick = () => void runRepair("\u4FEE\u590D\u6838\u5FC3\u670D\u52A1", repairCoreServices);
   repairCore2Btn.onclick = () => void runRepair("\u4FEE\u590D\u6838\u5FC3\u670D\u52A1", repairCoreServices);
-  repairCamoBtn.onclick = () => void runRepair("\u4FEE\u590D Camoufox CLI/Runtime", () => repairInstall({ browser: true }));
+  repairCamoBtn.onclick = () => void runRepair("\u4FEE\u590D Camo CLI", repairCoreServices);
   repairRuntimeBtn.onclick = () => void runRepair("\u4FEE\u590D Camoufox Runtime", () => repairInstall({ browser: true }));
   repairGeoipBtn.onclick = () => void runRepair("\u5B89\u88C5 GeoIP", () => repairInstall({ geoip: true }));
   addAccountBtn.onclick = addAccount;
@@ -3726,7 +3735,7 @@ function renderAccountManager(root, ctx2) {
     <div class="env-status-grid">
       <div class="env-item" id="env-camo">
         <span class="icon" style="color: var(--text-4);">\u25CB</span>
-        <span>Camo CLI</span>
+        <span>Camo CLI (@web-auto/camo)</span>
       </div>
       <div class="env-item" id="env-unified">
         <span class="icon" style="color: var(--text-4);">\u25CB</span>
@@ -3734,11 +3743,11 @@ function renderAccountManager(root, ctx2) {
       </div>
       <div class="env-item" id="env-browser">
         <span class="icon" style="color: var(--text-4);">\u25CB</span>
-        <span>Camo Runtime\uFF08\u53EF\u9009\uFF09</span>
+        <span>Camo Runtime Service (7704\uFF0C\u53EF\u9009)</span>
       </div>
       <div class="env-item" id="env-firefox">
         <span class="icon" style="color: var(--text-4);">\u25CB</span>
-        <span>Camoufox Browser</span>
+        <span>Camoufox Runtime (python -m camoufox)</span>
       </div>
     </div>
     <div class="btn-group" style="margin-top: var(--gap);">

package/apps/webauto/entry/xhs-install.mjs

@@ -57,6 +57,22 @@ function resolveNpxBin(platform = process.platform, pathEnv = process.env.PATH |
   return resolved || 'npx.cmd';
 }
 
+function resolveNpmBin(platform = process.platform, pathEnv = process.env.PATH || process.env.Path || '') {
+  if (platform !== 'win32') return 'npm';
+  const resolved = resolveOnPath(
+    ['npm.cmd', 'npm.exe', 'npm.bat', 'npm.ps1'],
+    pathEnv,
+    ';',
+  );
+  return resolved || 'npm.cmd';
+}
+
+function runPackageCommand(packageName, commandArgs) {
+  const viaNpx = run(resolveNpxBin(), ['--yes', `--package=${packageName}`, ...commandArgs]);
+  if (viaNpx.status === 0) return viaNpx;
+  return run(resolveNpmBin(), ['exec', '--yes', `--package=${packageName}`, '--', ...commandArgs]);
+}
+
 function resolveWebautoRoot() {
   const portableRoot = String(process.env.WEBAUTO_PORTABLE_ROOT || process.env.WEBAUTO_ROOT || '').trim();
   if (portableRoot) return path.join(portableRoot, '.webauto');
@@ -79,11 +95,13 @@ function checkCamoufoxInstalled() {
     const ret = run(candidate.cmd, candidate.args);
     if (ret.status === 0) return true;
   }
+  const npxRet = runPackageCommand('camoufox', ['camoufox', 'path']);
+  if (npxRet.status === 0) return true;
   return false;
 }
 
 function installCamoufox() {
-  const ret = run(resolveNpxBin(), ['--yes', '--package=camoufox', 'camoufox', 'fetch']);
+  const ret = runPackageCommand('camoufox', ['camoufox', 'fetch']);
   return ret.status === 0;
 }
 
@@ -92,12 +110,12 @@ function checkGeoIPInstalled() {
 }
 
 function installGeoIP() {
-  const ret = run(resolveNpxBin(), ['--yes', '--package=@web-auto/camo', 'camo', 'init', 'geoip']);
+  const ret = runPackageCommand('@web-auto/camo', ['camo', 'init', 'geoip']);
   return ret.status === 0;
 }
 
 function uninstallCamoufox() {
-  const ret = run(resolveNpxBin(), ['--yes', '--package=camoufox', 'camoufox', 'remove']);
+  const ret = runPackageCommand('camoufox', ['camoufox', 'remove']);
   return ret.status === 0;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-auto/webauto",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "type": "module",
   "bin": {
     "webauto": "bin/webauto.mjs"