@michengai/dsh-archive-manager 1.0.13 → 1.0.16

package/lib/plugin-updater.js

@@ -4,7 +4,7 @@ import { spawn } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { homedir } 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";
 const PLUGIN_UPDATE_HEADER = "x-michengai-plugin-update";
 const PLUGIN_UPDATE_IPC = "apply-plugin-updates";
@@ -21,9 +21,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 url = new URL(origin);
     return (url.protocol === "http:" || url.protocol === "https:") && isLoopbackAddress(url.hostname) && url.host === host;
@@ -48,14 +55,14 @@ function isDshCliEntry(entry, manifest, packageRoot) {
   const bin = typeof item.bin === "string" ? item.bin : typeof item.bin === "object" && item.bin !== null ? "dsh" in item.bin ? item.bin.dsh : void 0 : 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 = existsSync) {
+  const value = argv[1];
   if (value === void 0 || value === "") return void 0;
-  const entry = value.startsWith("file:") ? fileURLToPath(value) : resolve(process.cwd(), value);
-  if (!existsSync(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 (existsSync(manifestPath)) {
+    if (exists(manifestPath)) {
       try {
         if (isDshCliEntry(entry, JSON.parse(readFileSync(manifestPath, "utf8")), directory)) return entry;
       } catch {
@@ -66,21 +73,98 @@ function cliEntry() {
     directory = parent;
   }
 }
-function runtime(ctx) {
-  const profiles = ctx.get?.("desktopProfiles");
-  const desktopPnpm = ctx.get?.("desktopPnpm");
+function optionalService(ctx, name) {
+  try {
+    return typeof ctx.get === "function" ? ctx.get(name) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function isOfficialDesktopHostEntry(entry) {
+  if (entry === void 0 || entry === "") return false;
+  return 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 ?? homedir();
+  const exists = options.exists ?? existsSync;
+  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)) {
+    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 runnable = typeof desktopPnpm?.runPlugin === "function";
+    return {
+      profileName: current.name,
+      profileDir: resolve(current.dir),
+      officialDesktop: false,
+      canAutoUpdate: runnable,
+      ...runnable ? { desktopPnpm } : {}
+    };
   }
-  const profileDir = resolve(process.env.DSH_PROFILE_DIR ?? resolve(homedir(), ".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 } };
+  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 match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(value);
@@ -146,7 +230,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) {
@@ -181,11 +265,55 @@ async function runCliInstall(target, packageSpec) {
     });
   });
 }
+async function runPackageManagerInstall(target, packageSpec) {
+  const manager = target.packageManager;
+  if (manager === void 0) throw new Error("\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u81EA\u52A8\u66F4\u65B0\uFF0C\u8BF7\u4F7F\u7528\u624B\u5DE5\u66F4\u65B0\u547D\u4EE4\u3002");
+  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", (error) => {
+      clearTimeout(timer);
+      reject(error);
+    });
+    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)}`));
+    });
+  });
+}
+async function runPluginManagerInstall(target, packageSpec) {
+  const manager = target.pluginManager;
+  if (manager === void 0) throw new Error("\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u81EA\u52A8\u66F4\u65B0\uFF0C\u8BF7\u4F7F\u7528\u624B\u5DE5\u66F4\u65B0\u547D\u4EE4\u3002");
+  const result = await manager.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");
+}
 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) return runPackageManagerInstall(target, packageSpec);
+  if (target.pluginManager !== void 0) return runPluginManagerInstall(target, packageSpec);
+  return runCliInstall(target, packageSpec);
 }
 function json(response, statusCode, value) {
   response.writeHead(statusCode, { "content-type": "application/json; charset=utf-8", "cache-control": "no-store" });
@@ -262,9 +390,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;
-        json(response, 200, { ...before, updatedVersion: before.latestVersion, restartRequired: true, autoReload });
+        json(response, 200, { ...before, updatedVersion: before.latestVersion, restartRequired: true, autoReload, ...target.officialDesktop ? { restartDesktop: true } : {} });
         if (notifyParent) setTimeout(() => {
           process.send?.(PLUGIN_UPDATE_IPC);
         }, 150).unref?.();
@@ -289,5 +417,7 @@ export {
   isDshCliEntry,
   isNewerVersion,
   isTrustedUpdateRequest,
-  registerPluginUpdater
+  registerPluginUpdater,
+  resolveUpdateRuntime,
+  shouldNotifyParent
 };

package/lib/projcache.js

@@ -326,7 +326,7 @@ function installArchiveProjectionCacheGuards(cache, table) {
 }
 const projectionOverlay = Symbol.for("dsh-archive-manager.projcache-overlay");
 async function installArchiveProjectionCache(cache) {
-  const target = cache;
+  const target = Reflect.get(cache, symbols.original) ?? cache;
   if (target[projectionOverlay] === true) return async () => {
   };
   const domain = await target.ctx.storageDomain.open(safeProjectionCacheDomainSpec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "归档、恢复、收藏和永久删除会话，并诊断损坏的会话日志。 · Archive, restore, favorite, and permanently delete sessions, and diagnose damaged session logs.",
   "type": "module",
   "packageManager": "pnpm@11.22.0",