dsh-plugin-update 0.1.2 → 0.3.0

package/dist/store.js

@@ -3,7 +3,11 @@ import { createHash, randomUUID } from "node:crypto";
 import { mkdir, open, readFile, rename, realpath, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { installRecipe } from "./commands.js";
-import { BACKUP_FILE, LEGACY_PLUGIN_ID, LOCK_FILE, STATE_FILE } from "./config.js";
+import { BACKUP_FILE, LEGACY_PLUGIN_ID, LOCK_FILE, SKIPPED_FILE, STATE_FILE } from "./config.js";
+import { emptyBatchSession, normalizeBatchSession } from "./batch.js";
+import { normalizeQueueState } from "./queue.js";
+import { validReleaseVersion } from "./service.js";
+import { sanitizeDetail } from "./redaction.js";
 const LEGACY_SEGMENT = "updates";
 const LEGACY_DIR_PLUGIN = LEGACY_PLUGIN_ID;
 const JOB_STATES = ["installing", "verifying", "restart-required", "completed", "failed", "interrupted"];
@@ -173,6 +177,228 @@ function createUpdateDiskPorts(homeDir, pluginId, profileDir, deps = {}) {
   }
   return { paths, legacyPaths, readJob, writeJob, tryAcquireLock, releaseLock, backupJob };
 }
+const QUEUE_DIR_SEGMENT = "update-queue";
+const QUEUE_FILE = "queue.json";
+const QUEUE_LOCK_FILE = "global.lock";
+const QUEUE_LOCK_STALE_MS = 15 * 6e4;
+function queuePathsForUpdate(homeDir, profileDir) {
+  if (typeof homeDir !== "string" || !homeDir || typeof profileDir !== "string" || !profileDir) return null;
+  const directory = join(homeDir, QUEUE_DIR_SEGMENT, shortHash(profileDir));
+  return { directory, file: join(directory, QUEUE_FILE), lock: join(directory, QUEUE_LOCK_FILE) };
+}
+function queueFail() {
+  return Object.assign(new Error("queue-unavailable"), { code: "queue-unavailable" });
+}
+function createUpdateQueuePorts(homeDir, profileDir, deps = {}) {
+  const paths = queuePathsForUpdate(homeDir, profileDir);
+  const readText = deps.readFileImpl ?? ((filename, encoding) => readFile(filename, encoding));
+  const statFile = deps.statImpl ?? ((filename) => stat(filename));
+  const now = deps.nowImpl ?? Date.now;
+  async function readQueue() {
+    if (!paths) throw queueFail();
+    try {
+      if ((await statFile(paths.file)).size > 10 * 1024 * 1024) throw queueFail();
+      return normalizeQueueState(JSON.parse(await readText(paths.file, "utf8")));
+    } catch (error) {
+      if (error && error.code === "ENOENT") {
+        return normalizeQueueState(null);
+      }
+      throw error && error.code ? error : queueFail();
+    }
+  }
+  async function writeQueue(state) {
+    if (!paths) throw queueFail();
+    try {
+      await mkdir(paths.directory, { recursive: true, mode: 448 });
+      const temporary = `${paths.file}.${randomUUID()}.tmp`;
+      try {
+        await writeFile(temporary, `${JSON.stringify(normalizeQueueState(state), null, 2)}
+`, { mode: 384, flag: "wx" });
+        await rename(temporary, paths.file);
+      } catch {
+        throw queueFail();
+      } finally {
+        await unlink(temporary).catch(() => {
+        });
+      }
+    } catch (error) {
+      throw error && error.code ? error : queueFail();
+    }
+  }
+  async function readLockRaw() {
+    if (!paths) return null;
+    try {
+      if ((await statFile(paths.lock)).size > 1024 * 1024) return null;
+      return JSON.parse(await readText(paths.lock, "utf8"));
+    } catch {
+      return null;
+    }
+  }
+  async function tryAcquireGlobalLock(lockId, pluginId, opts = {}) {
+    if (!paths) return false;
+    if (typeof lockId !== "string" || !lockId || typeof pluginId !== "string" || !pluginId) return false;
+    const timeoutMs = typeof opts.timeoutMs === "number" && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : QUEUE_LOCK_STALE_MS;
+    try {
+      await mkdir(paths.directory, { recursive: true, mode: 448 });
+      const handle = await open(paths.lock, "wx", 384);
+      try {
+        await handle.writeFile(JSON.stringify({ id: lockId, pluginId, pid: process.pid, startedAt: now() }));
+      } finally {
+        await handle.close();
+      }
+      return true;
+    } catch (error) {
+      if (!error || error.code !== "EEXIST") return false;
+      try {
+        const current = await readLockRaw();
+        const startedAt = current && typeof current["startedAt"] === "number" ? current["startedAt"] : 0;
+        if (!current || now() - startedAt < timeoutMs) return false;
+        await unlink(paths.lock).catch(() => {
+        });
+        const handle = await open(paths.lock, "wx", 384);
+        try {
+          await handle.writeFile(JSON.stringify({ id: lockId, pluginId, pid: process.pid, startedAt: now() }));
+        } finally {
+          await handle.close();
+        }
+        return true;
+      } catch {
+        return false;
+      }
+    }
+  }
+  async function releaseGlobalLock(lockId) {
+    if (!paths) return;
+    try {
+      const current = await readLockRaw();
+      if (current && current.id === lockId) await unlink(paths.lock).catch(() => {
+      });
+    } catch {
+    }
+  }
+  return { paths, readQueue, writeQueue, tryAcquireGlobalLock, releaseGlobalLock };
+}
+const BATCH_FILE = "batch.json";
+const BATCH_FILE_MAX_BYTES = 1024 * 1024;
+function batchPathsForUpdate(homeDir, profileDir) {
+  const queue = queuePathsForUpdate(homeDir, profileDir);
+  if (!queue) return null;
+  return { directory: queue.directory, file: join(queue.directory, BATCH_FILE) };
+}
+function batchFail() {
+  return Object.assign(new Error("batch-unavailable"), { code: "batch-unavailable" });
+}
+function createBatchDiskPorts(homeDir, profileDir, deps = {}) {
+  const paths = batchPathsForUpdate(homeDir, profileDir);
+  const readText = deps.readFileImpl ?? ((filename, encoding) => readFile(filename, encoding));
+  const statFile = deps.statImpl ?? ((filename) => stat(filename));
+  async function readBatch() {
+    if (!paths) return emptyBatchSession();
+    try {
+      if ((await statFile(paths.file)).size > BATCH_FILE_MAX_BYTES) return emptyBatchSession();
+      return normalizeBatchSession(JSON.parse(await readText(paths.file, "utf8")));
+    } catch {
+      return emptyBatchSession();
+    }
+  }
+  async function writeBatch(session) {
+    if (!paths) throw batchFail();
+    const normalized = normalizeBatchSession(session);
+    try {
+      await mkdir(paths.directory, { recursive: true, mode: 448 });
+      const temporary = `${paths.file}.${randomUUID()}.tmp`;
+      try {
+        await writeFile(temporary, `${JSON.stringify(normalized, null, 2)}
+`, { mode: 384, flag: "wx" });
+        await rename(temporary, paths.file);
+      } catch {
+        throw batchFail();
+      } finally {
+        await unlink(temporary).catch(() => {
+        });
+      }
+    } catch (error) {
+      throw error && error.code ? error : batchFail();
+    }
+  }
+  async function clearBatch() {
+    if (!paths) return;
+    await writeBatch(emptyBatchSession());
+  }
+  return { paths, readBatch, writeBatch, clearBatch };
+}
+const MAX_SKIPPED_ENTRIES = 50;
+function skipKey(pluginId, version) {
+  return `${String(pluginId)}@${String(version)}`;
+}
+function normalizeSkipped(raw) {
+  if (!raw || typeof raw !== "object") return [];
+  const list = raw.skipped;
+  if (!Array.isArray(list)) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const item of list) {
+    if (!item || typeof item !== "object") continue;
+    const version = item.version;
+    const skippedAt = item.skippedAt;
+    if (!validReleaseVersion(version) || seen.has(version)) continue;
+    seen.add(version);
+    out.push({ version, skippedAt: typeof skippedAt === "number" && Number.isFinite(skippedAt) ? skippedAt : 0 });
+  }
+  return out.slice(0, MAX_SKIPPED_ENTRIES);
+}
+function isVersionSkipped(skipped, version) {
+  if (!validReleaseVersion(version)) return false;
+  return normalizeSkipped({ skipped }).some((entry) => entry.version === version);
+}
+function addSkipped(skipped, version, now) {
+  if (!validReleaseVersion(version)) throw fail("install-failed");
+  const at = typeof now === "number" && Number.isFinite(now) ? now : Date.now();
+  const rest = normalizeSkipped({ skipped }).filter((entry) => entry.version !== version);
+  return [{ version, skippedAt: at }, ...rest].slice(0, MAX_SKIPPED_ENTRIES);
+}
+function clearSkipped(skipped, version) {
+  const base = normalizeSkipped({ skipped });
+  if (version === void 0) return [];
+  return base.filter((entry) => entry.version !== version);
+}
+function createSkipDiskPorts(homeDir, pluginId, profileDir, deps = {}) {
+  const paths = pathsForUpdate(homeDir, pluginId, profileDir);
+  const file = paths ? join(paths.directory, SKIPPED_FILE) : null;
+  const readText = deps.readFileImpl ?? ((filename, encoding) => readFile(filename, encoding));
+  const statFile = deps.statImpl ?? ((filename) => stat(filename));
+  async function readSkipped() {
+    if (!file) return [];
+    try {
+      if ((await statFile(file)).size > 64 * 1024) return [];
+      return normalizeSkipped(JSON.parse(await readText(file, "utf8")));
+    } catch {
+      return [];
+    }
+  }
+  async function writeSkipped(skipped) {
+    if (!file || !paths) throw fail("install-failed");
+    const normalized = normalizeSkipped({ skipped });
+    await mkdir(paths.directory, { recursive: true, mode: 448 });
+    const temporary = `${file}.${randomUUID()}.tmp`;
+    try {
+      await writeFile(temporary, `${JSON.stringify({ skipped: normalized }, null, 2)}
+`, { mode: 384, flag: "wx" });
+      await rename(temporary, file);
+    } catch {
+      throw fail("install-failed");
+    } finally {
+      await unlink(temporary).catch(() => {
+      });
+    }
+  }
+  async function clearSkippedVersion(version) {
+    const next = clearSkipped(await readSkipped(), version);
+    await writeSkipped(next);
+    return next;
+  }
+  return { file, readSkipped, writeSkipped, clearSkippedVersion };
+}
 const CLI_PACKAGE_NAME = "@deepseek-ai/dsh";
 const INSTALL_STDIO = { stdin: "ignore", stdout: { maxBytes: 64 * 1024 }, stderr: { maxBytes: 64 * 1024 } };
 const TERMINATION_GRACE_MS = 3e3;
@@ -294,19 +520,11 @@ async function runDesktopService(recipe, parts) {
   if (code !== 0) throw withExit(fail("install-failed"), code);
   return code;
 }
-const DETAIL_MAX = 300;
 const MANAGER_OK = ["applied", "restart-required", "overridden"];
 function withDetail(error, detail) {
   if (detail) error.detail = detail;
   return error;
 }
-const ABSOLUTE_PATH_RE = /[A-Za-z]:\\[^\s"']*|(^|\s)\/[^\s"']+/g;
-function sanitizeDetail(text) {
-  const flat = String(text ?? "").replace(/\s+/g, " ").trim();
-  if (!flat) return "";
-  const noPath = flat.replace(ABSOLUTE_PATH_RE, (_whole, lead) => `${lead || ""}<\u8DEF\u5F84>`);
-  return noPath.length > DETAIL_MAX ? `${noPath.slice(0, DETAIL_MAX)}\u2026` : noPath;
-}
 function detailText(error) {
   if (typeof error === "string") return sanitizeDetail(error);
   if (error instanceof Error) return sanitizeDetail(error.message);
@@ -315,7 +533,12 @@ function detailText(error) {
     const code = typeof shape.code === "string" ? shape.code : "";
     const said = typeof shape.diagnostic === "string" ? shape.diagnostic : typeof shape.message === "string" ? shape.message : "";
     const line = [code, said].filter(Boolean).join(": ");
-    if (line) return sanitizeDetail(line);
+    if (line) {
+      const clean = sanitizeDetail(line);
+      if (clean) return clean;
+      if (code) return sanitizeDetail(code);
+      return "";
+    }
     try {
       return sanitizeDetail(JSON.stringify(error));
     } catch {
@@ -460,7 +683,6 @@ function createUpdateExecutor(parts = {}) {
       emitInstall(parts, recipe, false, error?.exitCode ?? exitCode, Date.now() - startedAt);
       const detail = error?.detail;
       throw Object.assign(fail("install-failed"), {
-        debug: String(error?.stack || error),
         ...typeof detail === "string" && detail ? { detail } : {}
       });
     }
@@ -468,10 +690,27 @@ function createUpdateExecutor(parts = {}) {
 }
 const __executorInternals = { INSTALL_STDIO, TERMINATION_GRACE_MS, CLI_PACKAGE_NAME };
 export {
+  BATCH_FILE,
+  BATCH_FILE_MAX_BYTES,
+  MAX_SKIPPED_ENTRIES,
+  QUEUE_DIR_SEGMENT,
+  QUEUE_FILE,
+  QUEUE_LOCK_FILE,
+  QUEUE_LOCK_STALE_MS,
   __executorInternals,
+  addSkipped,
+  batchPathsForUpdate,
+  clearSkipped,
+  createBatchDiskPorts,
+  createSkipDiskPorts,
   createUpdateDiskPorts,
   createUpdateExecutor,
+  createUpdateQueuePorts,
+  isVersionSkipped,
   legacyPathsForUpdate,
+  normalizeSkipped,
   pathsForUpdate,
-  resolveCliEntry
+  queuePathsForUpdate,
+  resolveCliEntry,
+  skipKey
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-update",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "description": "可复用的更新系统装成的 npm 包：任何 DSH 插件照文档能集成检查更新等功能（地图 #579）",
   "license": "MIT",
   "author": "王辰浩",
@@ -12,8 +12,32 @@
     "node": ">=22"
   },
   "type": "module",
+  "types": "./dist/host.d.ts",
   "exports": {
-    ".": "./dist/host.js",
+    ".": {
+      "types": "./dist/host.d.ts",
+      "default": "./dist/host.js"
+    },
+    "./panel": {
+      "types": "./dist/panel.d.ts",
+      "default": "./dist/panel.js"
+    },
+    "./client": {
+      "types": "./dist/client.d.ts",
+      "default": "./dist/client.js"
+    },
+    "./batch": {
+      "types": "./dist/host-batch.d.ts",
+      "default": "./dist/host-batch.js"
+    },
+    "./panel-batch": {
+      "types": "./dist/panel-batch.d.ts",
+      "default": "./dist/panel-batch.js"
+    },
+    "./entry": {
+      "types": "./dist/entry.d.ts",
+      "default": "./dist/entry.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -21,6 +45,7 @@
     "derive-client-values.mjs",
     "event-list.template.json",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "publishConfig": {