@michengai/dsh-automation 0.1.55 → 0.1.59

package/lib/index.js

@@ -1655,8 +1655,8 @@ function emoji() {
 }
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+var mac = (delimiter2) => {
+  const escapedDelim = escapeRegex(delimiter2 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -23336,7 +23336,7 @@ import { spawn } from "node:child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { basename, dirname, isAbsolute, resolve } from "node:path";
+import { basename, delimiter, dirname, isAbsolute, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 var PLUGIN_UPDATE_HEADER = "x-michengai-plugin-update";
 var PLUGIN_UPDATE_IPC = "apply-plugin-updates";
@@ -23353,9 +23353,16 @@ function isTrustedUpdateRequest(request) {
   if (!isLoopbackAddress(request.socket?.remoteAddress)) return false;
   const site = header(request, "sec-fetch-site");
   if (site !== void 0 && site !== "same-origin") return false;
-  const origin = header(request, "origin");
   const host = header(request, "host");
-  if (origin === void 0 || host === void 0) return false;
+  if (host === void 0 || host === "") return false;
+  const origin = header(request, "origin");
+  if (origin === void 0 || origin === "") {
+    try {
+      return isLoopbackAddress(new URL(`http://${host}`).hostname);
+    } catch {
+      return false;
+    }
+  }
   try {
     const url2 = new URL(origin);
     return (url2.protocol === "http:" || url2.protocol === "https:") && isLoopbackAddress(url2.hostname) && url2.host === host;
@@ -23380,14 +23387,14 @@ function isDshCliEntry(entry, manifest, packageRoot) {
   const bin = typeof value.bin === "string" ? value.bin : typeof value.bin === "object" && value.bin !== null ? value.bin.dsh : void 0;
   return typeof bin === "string" && bin !== "" && !isAbsolute(bin) && resolve(packageRoot, bin) === resolve(entry);
 }
-function cliEntry() {
-  const value = process.argv[1];
+function cliEntry(argv = process.argv, cwd = process.cwd(), exists = existsSync2) {
+  const value = argv[1];
   if (value === void 0 || value === "") return void 0;
-  const entry = value.startsWith("file:") ? fileURLToPath(value) : resolve(process.cwd(), value);
-  if (!existsSync2(entry)) return void 0;
+  const entry = value.startsWith("file:") ? fileURLToPath(value) : resolve(cwd, value);
+  if (!exists(entry)) return void 0;
   for (let directory = dirname(entry); ; ) {
     const manifestPath = resolve(directory, "package.json");
-    if (existsSync2(manifestPath)) {
+    if (exists(manifestPath)) {
       try {
         if (isDshCliEntry(entry, JSON.parse(readFileSync2(manifestPath, "utf8")), directory)) return entry;
       } catch {
@@ -23398,21 +23405,75 @@ function cliEntry() {
     directory = parent;
   }
 }
-function runtime(ctx) {
-  const profiles = ctx.get?.("desktopProfiles");
-  const desktopPnpm = ctx.get?.("desktopPnpm");
+function optionalService(ctx, name2) {
+  try {
+    return typeof ctx.get === "function" ? ctx.get(name2) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isOfficialDesktopHostEntry(entry) {
+  return entry !== void 0 && entry !== "" && entry.replaceAll("\\", "/").includes("/dsh-desktop-host/");
+}
+function stringEnvironment(value) {
+  if (value === null || typeof value !== "object") return void 0;
+  const env = {};
+  for (const [key, item] of Object.entries(value)) if (typeof item === "string") env[key] = item;
+  return Object.keys(env).length === 0 ? void 0 : env;
+}
+function packageManagerFrom(value) {
+  if (value === null || typeof value !== "object") return void 0;
+  const item = value;
+  if (typeof item.command !== "string" || item.command === "") return void 0;
+  if (!Array.isArray(item.args) || !item.args.every((arg) => typeof arg === "string")) return void 0;
+  const env = stringEnvironment(item.env);
+  return { command: item.command, args: item.args, ...env === void 0 ? {} : { env } };
+}
+function packageManagerFromArgv(argv, exists, execPath, pathEnv) {
+  if (!isOfficialDesktopHostEntry(argv[1])) return void 0;
+  const pnpm = argv[5];
+  if (typeof pnpm !== "string" || !isAbsolute(pnpm) || !exists(pnpm)) return void 0;
+  const bin = argv[6];
+  const path = typeof bin === "string" && bin !== "" ? `${bin}${delimiter}${pathEnv ?? ""}` : pathEnv;
+  return { command: execPath, args: ["--expose-internals", pnpm], env: { ELECTRON_RUN_AS_NODE: "1", ...typeof path === "string" && path !== "" ? { PATH: path } : {} } };
+}
+function pluginManagerFrom(value) {
+  if (value === null || typeof value !== "object" || typeof value.installBundle !== "function") return void 0;
+  return value;
+}
+function resolveUpdateRuntime(ctx, options = {}) {
+  const argv = options.argv ?? process.argv;
+  const env = options.env ?? process.env;
+  const cwd = options.cwd ?? process.cwd();
+  const home = options.homeDir ?? homedir2();
+  const exists = options.exists ?? existsSync2;
+  const execPath = options.execPath ?? process.execPath;
+  const profiles = optionalService(ctx, "desktopProfiles");
+  const desktopPnpm = optionalService(ctx, "desktopPnpm");
   if (profiles?.current !== void 0) {
     const current = profiles.current;
-    if (!validProfileName(current.name) || typeof current.dir !== "string" || !isAbsolute(current.dir)) {
-      throw new Error("\u5F53\u524D Desktop Profile \u4FE1\u606F\u65E0\u6548\uFF0C\u8BF7\u91CD\u542F\u540E\u91CD\u8BD5\u3002");
-    }
-    return { profileName: current.name, profileDir: resolve(current.dir), ...typeof desktopPnpm?.runPlugin === "function" ? { desktopPnpm } : {} };
-  }
-  const profileDir = resolve(process.env.DSH_PROFILE_DIR ?? resolve(homedir2(), ".dsh", "profiles", "web"));
-  const selected = profileNameFromArgv(process.argv);
-  const profileName = validProfileName(selected) ? selected : validProfileName(basename(profileDir)) ? basename(profileDir) : "web";
-  const entry = cliEntry();
-  return { profileName, profileDir, ...entry === void 0 ? {} : { cliEntry: entry } };
+    if (!validProfileName(current?.name) || typeof current.dir !== "string" || !isAbsolute(current.dir)) throw new Error("\u5F53\u524D Desktop Profile \u4FE1\u606F\u65E0\u6548\uFF0C\u8BF7\u91CD\u542F\u540E\u91CD\u8BD5\u3002");
+    const runnable = typeof desktopPnpm?.runPlugin === "function";
+    return { profileName: current.name, profileDir: resolve(current.dir), officialDesktop: false, canAutoUpdate: runnable, ...runnable ? { desktopPnpm } : {} };
+  }
+  const launched = optionalService(ctx, "profileContext");
+  const official = isOfficialDesktopHostEntry(argv[1]) || launched?.name === "desktop";
+  const launchedDir = typeof launched?.dir === "string" && isAbsolute(launched.dir) ? resolve(launched.dir) : void 0;
+  const projectDir = official && typeof argv[3] === "string" && isAbsolute(argv[3]) ? resolve(argv[3]) : void 0;
+  const cwdProfile = official && exists(resolve(cwd, "package.json")) ? resolve(cwd) : void 0;
+  const profileDir = launchedDir ?? projectDir ?? cwdProfile ?? resolve(env.DSH_PROFILE_DIR ?? resolve(home, ".dsh", "profiles", "web"));
+  const selected = profileNameFromArgv(argv);
+  const profileName = validProfileName(launched?.name) ? launched.name : official ? "desktop" : validProfileName(selected) ? selected : validProfileName(basename(profileDir)) ? basename(profileDir) : "web";
+  const packageManager = official ? packageManagerFrom(launched?.packageManager) ?? packageManagerFromArgv(argv, exists, execPath, env.PATH) : void 0;
+  const pluginManager = official && packageManager === void 0 ? pluginManagerFrom(optionalService(ctx, "pluginManager")) : void 0;
+  const entry = official ? void 0 : cliEntry(argv, cwd, exists);
+  return { profileName, profileDir, officialDesktop: official, canAutoUpdate: packageManager !== void 0 || pluginManager !== void 0 || entry !== void 0, ...packageManager === void 0 ? {} : { packageManager }, ...pluginManager === void 0 ? {} : { pluginManager }, ...entry === void 0 ? {} : { cliEntry: entry } };
+}
+function shouldNotifyParent(target, send = process.send) {
+  return target.officialDesktop !== true && target.desktopPnpm === void 0 && target.packageManager === void 0 && typeof send === "function";
+}
+function runtime(ctx) {
+  return resolveUpdateRuntime(ctx);
 }
 function parseSemver(value) {
   const match2 = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(value);
@@ -23478,7 +23539,7 @@ async function status(options, target) {
     latestCheckFailed: latest === void 0,
     updateAvailable: latest !== void 0 && isNewerVersion(current, latest),
     profileName: target.profileName,
-    canAutoUpdate: target.desktopPnpm !== void 0 || target.cliEntry !== void 0
+    canAutoUpdate: target.canAutoUpdate
   };
 }
 async function runCliInstall(target, packageSpec) {
@@ -23513,10 +23574,50 @@ async function runCliInstall(target, packageSpec) {
   });
 }
 async function install(target, packageSpec) {
-  if (target.desktopPnpm === void 0) return runCliInstall(target, packageSpec);
-  const handle = target.desktopPnpm.runPlugin(["add", "--config.minimumReleaseAge=0", packageSpec, "--registry=https://registry.npmjs.org/"], target.profileDir);
-  const result = await handle.done;
-  if (result.exitCode !== 0) throw new Error(`\u66F4\u65B0\u8FDB\u7A0B\u9000\u51FA\u7801 ${String(result.exitCode)}\u3002`);
+  if (target.desktopPnpm !== void 0) {
+    const handle = target.desktopPnpm.runPlugin(["add", "--config.minimumReleaseAge=0", packageSpec, "--registry=https://registry.npmjs.org/"], target.profileDir);
+    const result = await handle.done;
+    if (result.exitCode !== 0) throw new Error(`\u66F4\u65B0\u8FDB\u7A0B\u9000\u51FA\u7801 ${String(result.exitCode)}\u3002`);
+    return;
+  }
+  if (target.packageManager !== void 0) {
+    const manager = target.packageManager;
+    await new Promise((resolvePromise, reject) => {
+      const child = spawn(manager.command, [...manager.args, "add", "--config.minimumReleaseAge=0", packageSpec, "--registry=https://registry.npmjs.org/"], {
+        cwd: target.profileDir,
+        windowsHide: true,
+        stdio: ["ignore", "pipe", "pipe"],
+        env: { ...process.env, ...manager.env, NO_COLOR: "1" }
+      });
+      let detail = "";
+      child.stdout?.on("data", (chunk) => {
+        detail = (detail + String(chunk)).slice(-4e3);
+      });
+      child.stderr?.on("data", (chunk) => {
+        detail = (detail + String(chunk)).slice(-4e3);
+      });
+      const timer = setTimeout(() => {
+        child.kill();
+        reject(new Error("\u66F4\u65B0\u8D85\u65F6\uFF0C\u8BF7\u6539\u7528\u624B\u5DE5\u66F4\u65B0\u3002"));
+      }, 10 * 6e4);
+      child.once("error", (error51) => {
+        clearTimeout(timer);
+        reject(error51);
+      });
+      child.once("exit", (code) => {
+        clearTimeout(timer);
+        if (code === 0) resolvePromise();
+        else reject(new Error(detail.trim() || `\u66F4\u65B0\u8FDB\u7A0B\u9000\u51FA\u7801 ${String(code)}`));
+      });
+    });
+    return;
+  }
+  if (target.pluginManager !== void 0) {
+    const result = await target.pluginManager.installBundle(packageSpec);
+    if (result.application === "applied" || result.application === "restart-required" || result.application === "overridden") return;
+    throw new Error(result.error?.message || result.packageResult?.output || "\u66F4\u65B0\u5931\u8D25\uFF0C\u8BF7\u67E5\u770B\u670D\u52A1\u7AEF\u65E5\u5FD7\u3002");
+  }
+  return runCliInstall(target, packageSpec);
 }
 function json3(response, statusCode, value) {
   response.writeHead(statusCode, { "content-type": "application/json; charset=utf-8", "cache-control": "no-store" });
@@ -23569,9 +23670,9 @@ function registerPluginUpdater(ctx, options) {
         } finally {
           installing = false;
         }
-        const notifyParent = target.desktopPnpm === void 0 && typeof process.send === "function";
+        const notifyParent = shouldNotifyParent(target);
         const autoReload = target.desktopPnpm !== void 0 || notifyParent;
-        json3(response, 200, { ...before, updatedVersion: before.latestVersion, restartRequired: true, autoReload });
+        json3(response, 200, { ...before, updatedVersion: before.latestVersion, restartRequired: true, autoReload, ...target.officialDesktop ? { restartDesktop: true } : {} });
         if (notifyParent) setTimeout(() => {
           process.send?.(PLUGIN_UPDATE_IPC);
         }, 150).unref?.();

package/lib/types/plugin-updater.d.ts

@@ -9,13 +9,60 @@ type HostRequest = {
         remoteAddress?: string;
     };
 };
+type DesktopPnpmHandle = {
+    done: Promise<{
+        exitCode: number | null;
+        signal: NodeJS.Signals | null;
+    }>;
+    cancel(): void;
+};
+type DesktopPnpm = {
+    runPlugin(args: readonly string[], invokingDir: string, signal?: AbortSignal): DesktopPnpmHandle;
+};
+type PackageManagerLaunch = {
+    command: string;
+    args: readonly string[];
+    env?: NodeJS.ProcessEnv;
+};
+type PluginManagerInstall = {
+    installBundle(spec: string): Promise<{
+        application?: string;
+        error?: {
+            message?: string;
+        };
+        packageResult?: {
+            output?: string;
+        };
+    }>;
+};
 export type PluginUpdaterOptions = {
     readonly endpoint: string;
     readonly packageName: string;
     readonly manifestUrl: URL;
 };
+type Runtime = {
+    profileName: string;
+    profileDir: string;
+    desktopPnpm?: DesktopPnpm;
+    cliEntry?: string;
+    packageManager?: PackageManagerLaunch;
+    pluginManager?: PluginManagerInstall;
+    officialDesktop: boolean;
+    canAutoUpdate: boolean;
+};
 export declare function isTrustedUpdateRequest(request: HostRequest): boolean;
 export declare function isDshCliEntry(entry: string, manifest: unknown, packageRoot: string): boolean;
+export declare function resolveUpdateRuntime(ctx: {
+    get?: (name: string) => unknown;
+}, options?: {
+    argv?: readonly string[];
+    env?: NodeJS.ProcessEnv;
+    cwd?: string;
+    homeDir?: string;
+    exists?: (path: string) => boolean;
+    execPath?: string;
+}): Runtime;
+export declare function shouldNotifyParent(target: Runtime, send?: unknown): boolean;
 export declare function isNewerVersion(currentValue: string, candidateValue: string): boolean;
 export declare function registerPluginUpdater(ctx: Context, options: PluginUpdaterOptions): () => void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-automation",
-  "version": "0.1.55",
+  "version": "0.1.59",
   "description": "DSH Automation — 在独立 DSH Session 中按计划执行和管理编码任务 · Schedule and manage coding tasks in isolated DSH sessions",
   "type": "module",
   "packageManager": "pnpm@11.22.0",