beauticode-dsh 1.0.2 → 1.0.3

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 该 Cordis 插件向 DSH Web 注入 beautiCode 浏览器客户端，并提供本机鉴权接口。支持图片、MP4、播放位置、静音、摸鱼模式以及清除背景。
 
-装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：可从文件夹选图片或 MP4、清除、开关声音、切换已保存主题。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。
+装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：可从文件夹选图片或 MP4、清除、开关声音、切换已保存主题，以及打开「皮肤中心」安装已审核的社区皮肤。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。设置 `BEAUTICODE_SKIN_CENTER` 或填写 `skin-center.json` 后，皮肤中心才会显示远程目录。
 
 插件也会注册对话工具（`beauticode_*`）和斜杠命令（`/bg`、`/bg-theme`、`/bg-clear`）。不需要托盘；托盘若已在跑则复用它。
 

package/agent.mjs

@@ -240,6 +240,39 @@ export function createBeauticodeActions(dataRootOrOptions) {
       });
     },
 
+    async importTheme(input, signal) {
+      const name = String(input?.name ?? "").trim();
+      const imagePath = String(input?.imagePath ?? "").trim();
+      if (!name || !imagePath) fail("导入皮肤必须提供名称和图片。");
+      const body = {
+        name,
+        imagePath,
+      };
+      if (typeof input.videoPath === "string" && input.videoPath.trim()) {
+        body.videoPath = input.videoPath.trim();
+      }
+      if (input.effects) body.effects = input.effects;
+      if (input.source) body.source = input.source;
+      const resolved = await backend();
+      if (resolved.kind === "tray") {
+        const result = await request({
+          method: "POST",
+          path: "/theme/import",
+          body,
+          signal,
+          timeoutMs: 30 * 60 * 1000,
+        });
+        if (!result || result.ok === false) fail(result?.error || "导入皮肤失败。");
+        return {
+          ok: true,
+          theme: result.theme,
+          message: `已保存皮肤「${result.theme.name}」。`,
+        };
+      }
+      const theme = await resolved.session.importSavedTheme(body);
+      return { ok: true, theme, message: `已保存皮肤「${theme.name}」。` };
+    },
+
     async listThemes(signal) {
       const resolved = await backend();
       if (resolved.kind === "tray") {

package/bin/beauticode-dsh

@@ -1,252 +1,7 @@
-#!/usr/bin/env node
-/**
- * One-line installer: npx beauticode-dsh
- *
- * Copies this package to a stable local folder and writes the DSH patch so
- * `dsh web` loads beautiCode. Does not start DeepSeek Harness.
- */
-import fs from "node:fs";
-import fsp from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
-
-function findPackageRoot(startDir) {
-  let dir = startDir;
-  for (let i = 0; i < 5; i += 1) {
-    if (
-      fs.existsSync(path.join(dir, "package.json")) &&
-      fs.existsSync(path.join(dir, "index.mjs"))
-    ) {
-      return dir;
-    }
-    const parent = path.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-  return startDir;
-}
-
-const here = findPackageRoot(path.dirname(fileURLToPath(import.meta.url)));
-const pluginName = "beauticode-dsh";
-const bridgeId = "beauticode-bridge";
-
-function argValue(argv, name) {
-  const idx = argv.indexOf(name);
-  if (idx === -1) return null;
-  const value = argv[idx + 1];
-  return value && !value.startsWith("--") ? value : null;
-}
-
-function defaultDataRoot() {
-  if (process.env.BEAUTICODE_DATA_ROOT) return process.env.BEAUTICODE_DATA_ROOT;
-  if (process.env.LOCALAPPDATA) {
-    return path.join(process.env.LOCALAPPDATA, "beautiCode");
-  }
-  return path.join(os.homedir(), ".beauticode");
-}
-
-function defaultDshHome() {
-  return process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
-}
-
-function toFileUri(filePath) {
-  const full = path.resolve(filePath).replaceAll("\\", "/");
-  if (/^[A-Za-z]:/.test(full)) return `file:///${full}`;
-  return pathToFileURL(full).href;
-}
-
-function fileUriInsert(uri) {
-  return [
-    "# beauticode-bridge (installer)",
-    "- insert:",
-    "    - id: beauticode-bridge",
-    `      name: '${uri}'`,
-    "      inject: [webServer]",
-    "",
-  ].join("\n");
-}
-
-function packageInsert() {
-  return [
-    "# beauticode-bridge (installer)",
-    "- insert:",
-    "    - id: beauticode-bridge",
-    `      name: '${pluginName}'`,
-    "      inject: [webServer]",
-    "",
-  ].join("\n");
-}
-
-function hasBridge(text) {
-  return new RegExp(`^\\s*-\\s*id:\\s*${bridgeId}\\s*$`, "m").test(text);
-}
-
-function stripBridge(text) {
-  const patterns = [
-    /(?:^|\r?\n)# beauticode-bridge \(installer\)\r?\n- insert:\r?\n(?:[ \t]+.*\r?\n)*/g,
-    /(?:^|\r?\n)- insert:\r?\n(?:[ \t]+.*\r?\n)*?[ \t]+-\s*id:\s*beauticode-bridge\r?\n(?:[ \t]+.*\r?\n)*/g,
-  ];
-  let next = text;
-  for (const pattern of patterns) next = next.replace(pattern, "\n");
-  return next;
-}
-
-async function writePatch(filePath, body) {
-  await fsp.mkdir(path.dirname(filePath), { recursive: true });
-  if (!fs.existsSync(filePath)) {
-    await fsp.writeFile(filePath, body, "utf8");
-    return;
-  }
-  const raw = await fsp.readFile(filePath, "utf8");
-  if (hasBridge(raw)) {
-    const replaced = raw.replace(
-      /(?:# beauticode-bridge \(installer\)\r?\n)?- insert:\r?\n(?:[ \t]+.*\r?\n)*?[ \t]+-\s*id:\s*beauticode-bridge\r?\n(?:[ \t]+.*\r?\n)*/,
-      body,
-    );
-    await fsp.writeFile(filePath, replaced.endsWith("\n") ? replaced : `${replaced}\n`, "utf8");
-    return;
-  }
-  const stripped = raw.trim();
-  if (stripped === "" || stripped === "[]") {
-    await fsp.writeFile(filePath, body, "utf8");
-    return;
-  }
-  await fsp.writeFile(filePath, `${stripped}\n\n${body}`, "utf8");
-}
-
-async function removePatch(filePath) {
-  if (!fs.existsSync(filePath)) return false;
-  const raw = await fsp.readFile(filePath, "utf8");
-  if (!hasBridge(raw)) return false;
-  const cleaned = stripBridge(raw).trim();
-  if (cleaned === "" || cleaned === "[]") {
-    await fsp.writeFile(
-      filePath,
-      "# Your patch layer for this dsh profile.\n[]\n",
-      "utf8",
-    );
-    return true;
-  }
-  await fsp.writeFile(filePath, `${cleaned}\n`, "utf8");
-  return true;
-}
-
-function shouldCopy(source) {
-  const relative = path.relative(here, source);
-  if (relative.startsWith("test") || relative.includes(`${path.sep}test${path.sep}`)) {
-    return false;
-  }
-  if (relative.endsWith(".test.mjs")) return false;
-  return true;
-}
-
-async function sameInstalledVersion(dest) {
-  try {
-    const incoming = JSON.parse(await fsp.readFile(path.join(here, "package.json"), "utf8"));
-    const installed = JSON.parse(await fsp.readFile(path.join(dest, "package.json"), "utf8"));
-    return (
-      incoming.name === installed.name &&
-      incoming.version === installed.version &&
-      fs.existsSync(path.join(dest, "index.mjs")) &&
-      fs.existsSync(path.join(dest, "vendor", "adapter-dsh", "index.js"))
-    );
-  } catch {
-    return false;
-  }
-}
-
-async function copyPackage(dest) {
-  if (await sameInstalledVersion(dest)) return false;
-  await fsp.rm(dest, { recursive: true, force: true });
-  await fsp.cp(here, dest, {
-    recursive: true,
-    filter: (source) => shouldCopy(source),
-  });
-  return true;
-}
-
-async function ensureEngine(dest) {
-  const vendor = path.join(dest, "vendor", "adapter-dsh", "index.js");
-  if (fs.existsSync(vendor)) return;
-  const packPath = path.resolve(here, "../../scripts/pack-dsh-plugin.mjs");
-  if (!fs.existsSync(packPath)) {
-    throw new Error("插件包不完整：缺少本机导入引擎。请重新执行 npx beauticode-dsh。");
-  }
-  const { stageEngineInto } = await import(pathToFileURL(packPath).href);
-  await stageEngineInto(dest);
-}
-
-async function install(opts) {
-  const dest = path.resolve(opts.pluginHome);
-  const dshHome = path.resolve(opts.dshHome);
-  const webProfile = path.join(dshHome, "profiles", "web");
-  const webPatch = path.join(webProfile, "cordis.patch.yml");
-  const webPackage = path.join(webProfile, "package.json");
-  const homePatch = path.join(dshHome, "cordis.patch.yml");
-
-  await fsp.mkdir(dest, { recursive: true });
-  const copied = await copyPackage(dest);
-  await ensureEngine(dest);
-  const indexFile = path.join(dest, "index.mjs");
-  if (!fs.existsSync(indexFile)) {
-    throw new Error(`缺少插件入口：${indexFile}`);
-  }
-
-  if (fs.existsSync(webPackage)) {
-    await writePatch(webPatch, fileUriInsert(toFileUri(indexFile)));
-    if (fs.existsSync(homePatch)) {
-      const homeRaw = await fsp.readFile(homePatch, "utf8");
-      if (hasBridge(homeRaw)) await removePatch(homePatch);
-    }
-    console.log(`已写入 ${webPatch}`);
-    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
-    console.log("请自己运行：npx @deepseek-ai/dsh web");
-    return { dest, patch: webPatch };
-  }
-
-  await fsp.mkdir(dshHome, { recursive: true });
-  await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
-  console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
-  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
-  console.log("请自己运行：npx @deepseek-ai/dsh web");
-  return { dest, patch: homePatch };
-}
-
-async function uninstall(opts) {
-  const dshHome = path.resolve(opts.dshHome);
-  const removed = [];
-  if (await removePatch(path.join(dshHome, "profiles", "web", "cordis.patch.yml"))) {
-    removed.push("web patch");
-  }
-  if (await removePatch(path.join(dshHome, "cordis.patch.yml"))) {
-    removed.push("home patch");
-  }
-  const dest = path.resolve(opts.pluginHome);
-  if (fs.existsSync(dest)) {
-    await fsp.rm(dest, { recursive: true, force: true });
-    removed.push(dest);
-  }
-  console.log(removed.length ? `已移除：${removed.join("、")}` : "没有可移除的 beautiCode 插件接线。");
-  return { removed };
-}
-
-export async function runCli(argv = process.argv.slice(2)) {
-  const dshHome = argValue(argv, "--dsh-home") || defaultDshHome();
-  const pluginHome =
-    argValue(argv, "--plugin-home") || path.join(defaultDataRoot(), "plugin");
-  const opts = { dshHome, pluginHome };
-  if (argv.includes("--remove")) return uninstall(opts);
-  return install(opts);
-}
-
-const launchedDirectly =
-  Boolean(process.argv[1]) &&
-  pathToFileURL(path.resolve(process.argv[1])).href.toLowerCase() ===
-    import.meta.url.toLowerCase();
-if (launchedDirectly) {
-  runCli().catch((error) => {
-    console.error(error instanceof Error ? error.message : String(error));
-    process.exit(1);
-  });
-}
+#!/usr/bin/env node
+import { runCli } from "../cli.js";
+
+runCli().catch((error) => {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
+});

package/cli.js

@@ -92,35 +92,54 @@ function stripBridge(text) {
   return next;
 }
 
+function overlayPayload(text) {
+  return text
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line && !line.startsWith("#"))
+    .join("\n");
+}
+
+function isEmptyOverlay(text) {
+  const payload = overlayPayload(text);
+  return payload === "" || payload === "[]";
+}
+
+// DSH seeds overlays as `# comment\n[]`. `[]` is already a complete YAML
+// document, so appending `- insert:` makes js-yaml throw.
+function keptOverlay(text) {
+  const withoutFlowEmpty = text
+    .split(/\r?\n/)
+    .filter((line) => line.trim() !== "[]")
+    .join("\n");
+  if (isEmptyOverlay(withoutFlowEmpty)) return "";
+  return withoutFlowEmpty.trim();
+}
+
+function withTrailingNewline(text) {
+  return text.endsWith("\n") ? text : `${text}\n`;
+}
+
 async function writePatch(filePath, body) {
   await fsp.mkdir(path.dirname(filePath), { recursive: true });
+  const insert = withTrailingNewline(body);
   if (!fs.existsSync(filePath)) {
-    await fsp.writeFile(filePath, body, "utf8");
+    await fsp.writeFile(filePath, insert, "utf8");
     return;
   }
   const raw = await fsp.readFile(filePath, "utf8");
-  if (hasBridge(raw)) {
-    const replaced = raw.replace(
-      /(?:# beauticode-bridge \(installer\)\r?\n)?- insert:\r?\n(?:[ \t]+.*\r?\n)*?[ \t]+-\s*id:\s*beauticode-bridge\r?\n(?:[ \t]+.*\r?\n)*/,
-      body,
-    );
-    await fsp.writeFile(filePath, replaced.endsWith("\n") ? replaced : `${replaced}\n`, "utf8");
-    return;
-  }
-  const stripped = raw.trim();
-  if (stripped === "" || stripped === "[]") {
-    await fsp.writeFile(filePath, body, "utf8");
-    return;
-  }
-  await fsp.writeFile(filePath, `${stripped}\n\n${body}`, "utf8");
+  const remainder = hasBridge(raw) ? stripBridge(raw) : raw;
+  const kept = keptOverlay(remainder);
+  const next = kept ? `${kept}\n\n${insert}` : insert;
+  await fsp.writeFile(filePath, withTrailingNewline(next), "utf8");
 }
 
 async function removePatch(filePath) {
   if (!fs.existsSync(filePath)) return false;
   const raw = await fsp.readFile(filePath, "utf8");
   if (!hasBridge(raw)) return false;
-  const cleaned = stripBridge(raw).trim();
-  if (cleaned === "" || cleaned === "[]") {
+  const kept = keptOverlay(stripBridge(raw));
+  if (!kept) {
     await fsp.writeFile(
       filePath,
       "# Your patch layer for this dsh profile.\n[]\n",
@@ -128,7 +147,7 @@ async function removePatch(filePath) {
     );
     return true;
   }
-  await fsp.writeFile(filePath, `${cleaned}\n`, "utf8");
+  await fsp.writeFile(filePath, withTrailingNewline(kept), "utf8");
   return true;
 }
 

package/console.js

@@ -64,6 +64,9 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     '<button type="button" class="bc-btn" data-act="clear">清除</button>' +
     '<button type="button" class="bc-btn" data-act="sound">声音</button>' +
     "</div>" +
+    '<div class="bc-row">' +
+    '<button type="button" class="bc-btn" data-act="gallery">皮肤中心</button>' +
+    "</div>" +
     '<div class="bc-themes" hidden>' +
     '<button type="button" class="bc-theme-toggle" aria-expanded="false">已保存主题</button>' +
     '<div class="bc-theme-list" hidden></div>' +
@@ -236,6 +239,15 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     fileInput.accept = VIDEO_ACCEPT;
     fileInput.click();
   });
+  pop.querySelector('[data-act="gallery"]').addEventListener("click", (event) => {
+    event.stopPropagation();
+    setOpen(false);
+    if (window.BeauticodeGallery) {
+      void window.BeauticodeGallery.open();
+      return;
+    }
+    showMessage("皮肤中心脚本尚未加载。");
+  });
   pop.querySelector('[data-act="clear"]').addEventListener("click", () => {
     currentThemeId = "";
     void run(() => request("/__beauticode/ui/clear", { method: "POST" }));
@@ -294,6 +306,9 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
   document.addEventListener("keydown", (event) => {
     if (event.key === "Escape" && !pop.hidden) setOpen(false);
   });
+  document.addEventListener("beauticode-gallery-installed", () => {
+    void refresh();
+  });
 
   const observer = new MutationObserver(() => place());
   observer.observe(document.documentElement, { childList: true, subtree: true });

package/control-client.mjs

@@ -90,6 +90,47 @@ export function isPidAlive(pid) {
   }
 }
 
+let livenessModulePromise;
+
+function loadCoreLiveness() {
+  if (!livenessModulePromise) {
+    livenessModulePromise = (async () => {
+      const candidates = [
+        "@beauticode/core",
+        new URL("./vendor/core/index.js", import.meta.url).href,
+        new URL("../../packages/core/dist/index.js", import.meta.url).href,
+      ];
+      for (const specifier of candidates) {
+        try {
+          const mod = await import(specifier);
+          if (typeof mod.isRecordedPidLive === "function") return mod;
+        } catch {
+          /* try the next resolution path */
+        }
+      }
+      return null;
+    })();
+  }
+  return livenessModulePromise;
+}
+
+async function isLiveRecordedPid(pid, startedAt, mtimeMs) {
+  if (!isPidAlive(pid)) return false;
+  const recorded =
+    typeof startedAt === "string" && startedAt
+      ? startedAt
+      : Number.isFinite(mtimeMs)
+        ? new Date(mtimeMs).toISOString()
+        : null;
+  try {
+    const core = await loadCoreLiveness();
+    if (core) return await core.isRecordedPidLive(pid, recorded);
+  } catch {
+    /* fall back to the cheap PID check */
+  }
+  return true;
+}
+
 export function stripPathQuotes(value) {
   const text = String(value ?? "").trim();
   if (text.length >= 2) {
@@ -195,6 +236,7 @@ export async function writeDshControlFile(opts) {
     pid,
     url: new URL(url).origin,
     token,
+    startedAt: new Date().toISOString(),
   });
 }
 
@@ -219,6 +261,7 @@ export async function writeSessionHostFile(opts) {
     pid,
     url: new URL(url).origin,
     token,
+    startedAt: new Date().toISOString(),
   });
 }
 
@@ -253,8 +296,11 @@ export async function removeDshControlFile(opts) {
 export async function readDshControlFile(dataRoot, opts = {}) {
   const file = controlFilePath(dataRoot);
   let raw;
+  let mtimeMs = 0;
   try {
-    raw = await fs.readFile(file, "utf8");
+    const [text, stat] = await Promise.all([fs.readFile(file, "utf8"), fs.stat(file)]);
+    raw = text;
+    mtimeMs = stat.mtimeMs;
   } catch (error) {
     if (error && typeof error === "object" && error.code === "ENOENT") return null;
     throw error;
@@ -277,13 +323,19 @@ export async function readDshControlFile(dataRoot, opts = {}) {
   ) {
     return null;
   }
-  if (!opts.allowDead && !isPidAlive(parsed.pid)) return null;
+  if (
+    !opts.allowDead &&
+    !(await isLiveRecordedPid(parsed.pid, parsed.startedAt, mtimeMs))
+  ) {
+    return null;
+  }
   return {
     schema: CONTROL_SCHEMA,
     host: "dsh",
     pid: parsed.pid,
     url: new URL(parsed.url).origin,
     token: parsed.token,
+    startedAt: typeof parsed.startedAt === "string" ? parsed.startedAt : null,
   };
 }
 
@@ -305,8 +357,11 @@ export async function removeSessionHostFile(opts) {
 export async function readSessionHostFile(dataRoot, opts = {}) {
   const file = sessionHostFilePath(dataRoot);
   let raw;
+  let mtimeMs = 0;
   try {
-    raw = await fs.readFile(file, "utf8");
+    const [text, stat] = await Promise.all([fs.readFile(file, "utf8"), fs.stat(file)]);
+    raw = text;
+    mtimeMs = stat.mtimeMs;
   } catch (error) {
     if (error && typeof error === "object" && error.code === "ENOENT") return null;
     throw error;
@@ -329,21 +384,30 @@ export async function readSessionHostFile(dataRoot, opts = {}) {
   ) {
     return null;
   }
-  if (!opts.allowDead && !isPidAlive(parsed.pid)) return null;
+  if (
+    !opts.allowDead &&
+    !(await isLiveRecordedPid(parsed.pid, parsed.startedAt, mtimeMs))
+  ) {
+    return null;
+  }
   return {
     schema: SESSION_HOST_SCHEMA,
     host: parsed.host,
     pid: parsed.pid,
     url: new URL(parsed.url).origin,
     token: parsed.token,
+    startedAt: typeof parsed.startedAt === "string" ? parsed.startedAt : null,
   };
 }
 
 export async function readTrayClaim(dataRoot, opts = {}) {
   const file = trayClaimFilePath(dataRoot);
   let raw;
+  let mtimeMs = 0;
   try {
-    raw = await fs.readFile(file, "utf8");
+    const [text, stat] = await Promise.all([fs.readFile(file, "utf8"), fs.stat(file)]);
+    raw = text;
+    mtimeMs = stat.mtimeMs;
   } catch (error) {
     if (error && typeof error === "object" && error.code === "ENOENT") return null;
     throw error;
@@ -362,7 +426,12 @@ export async function readTrayClaim(dataRoot, opts = {}) {
   ) {
     return null;
   }
-  if (!opts.allowDead && !isPidAlive(parsed.pid)) return null;
+  if (
+    !opts.allowDead &&
+    !(await isLiveRecordedPid(parsed.pid, parsed.startedAt, mtimeMs))
+  ) {
+    return null;
+  }
   return {
     schema: TRAY_CLAIM_SCHEMA,
     pid: parsed.pid,

package/cordis.patch.yml

@@ -1,4 +1,4 @@
 - insert:
     - id: beauticode-bridge
-      name: 'beauticode-dsh'
+      name: beauticode-dsh
       inject: [webServer]