beauticode-dsh 1.0.5 → 1.0.12

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 该 Cordis 插件向 DSH Web 注入 beautiCode 浏览器客户端，并提供本机鉴权接口。支持图片、MP4、播放位置、静音、摸鱼模式以及清除背景。
 
-装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：可从文件夹选图片或 MP4、清除、开关声音、切换或删除已保存主题，以及打开「皮肤中心」安装已审核的社区皮肤。导入的图片和视频会自动进入已保存主题。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。设置 `BEAUTICODE_SKIN_CENTER` 或填写 `skin-center.json` 后，皮肤中心才会显示远程目录。
+装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：在 Windows 上点击图片或视频会打开系统文件选择器，选好后在页面内命名，背景立即应用并进入已保存主题；也可以清除、开关声音、切换或删除主题，以及打开「皮肤中心」安装已审核的社区皮肤。本地导入只在 Node 端保存绝对路径，并通过带 Range 支持的回环媒体服务读取原文件，不复制用户选择的图片或整段视频主文件。Windows 强制使用本地引用；原生选择器不可用时会明确报错，不会静默上传或复制媒体。非 Windows 环境保留兼容上传，并明确提示该模式会保存托管副本。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。设置 `BEAUTICODE_SKIN_CENTER` 或填写 `skin-center.json` 后，皮肤中心才会显示远程目录。
 
 插件也会注册对话工具（`beauticode_*`）和斜杠命令（`/bg`、`/bg-theme`、`/bg-clear`）。不需要托盘；托盘若已在跑则复用它。
 
@@ -40,7 +40,7 @@ npx @deepseek-ai/dsh web
 
 手动接入时：
 
-1. 修改 `cordis.patch.example.yml` 中的 `file:///.../index.mjs`。
+1. 修改 `cordis.patch.yml` 中的插件接入项；优先使用上面的安装命令自动完成接线。
 2. 确保 DSH 和 beautiCode 使用相同的 `BEAUTICODE_DATA_ROOT`。
 3. 自己运行 `dsh web`（或带 `--patch`）。
 4. 打开页面后用侧栏「背景」，或输入 `/bg <本机绝对路径>`，或直接跟 AI 说把某个视频/图片设为背景。

package/agent.mjs

@@ -61,15 +61,20 @@ async function chineseError(error) {
   return raw || "操作失败。";
 }
 
-async function unwrapApplyResult(result, fallbackMode, message) {
-  if (!result || result.ok === false) {
-    fail(await chineseError(result?.error || "操作失败。"));
-  }
-  return {
-    ok: true,
-    generation: result.generation ?? null,
-    mode: result.mode ?? fallbackMode,
-    message,
+async function unwrapApplyResult(result, fallbackMode, message) {
+  if (!result || result.ok === false) {
+    const failure = new Error(await chineseError(result?.error || "操作失败。"));
+    if (result?.sourceMode != null) failure.sourceMode = result.sourceMode;
+    if (result?.timings != null) failure.timings = result.timings;
+    throw failure;
+  }
+  return {
+    ok: true,
+    generation: result.generation ?? null,
+    mode: result.mode ?? fallbackMode,
+    sourceMode: result.sourceMode ?? null,
+    timings: result.timings ?? null,
+    message,
     ...(result.theme
       ? {
           theme: {
@@ -98,7 +103,7 @@ function normalizeActionOptions(dataRootOrOptions) {
     : {};
 }
 
-function unwrapApply(result, fallbackMode, message) {
+function unwrapApply(result, fallbackMode, message) {
   if (!result || result.ok === false) {
     fail(result?.error || "操作失败。");
   }
@@ -116,18 +121,24 @@ function unwrapApply(result, fallbackMode, message) {
           },
         }
       : {}),
-  };
-}
-
-function presentStatus(status) {
-  return {
+  };
+}
+
+function presentStatus(status) {
+  const background = status.manifest?.background ?? status.background ?? null;
+  return {
     ok: true,
     hostReady: status.hostReady === true || status.sessions > 0,
     sessions: status.sessions ?? 0,
     fish: status.fish === true,
     muted: status.muted !== false,
     tone: status.tone ?? "dark",
-    background: status.manifest?.background ?? status.background ?? null,
+    background,
+    sourceMode: background
+      ? background.source?.kind === "local"
+        ? "local"
+        : "managed"
+      : "clear",
     themeId: typeof status.themeId === "string" && status.themeId ? status.themeId : null,
     message: formatStatusText(status),
   };
@@ -167,21 +178,26 @@ export function createBeauticodeActions(dataRootOrOptions) {
       }
       const effects = effectsForPreset(options?.effects?.preset) || options?.effects || null;
       const persistTheme = options?.persistTheme !== false;
-      const themeName =
-        String(options?.themeName ?? "").trim() ||
-        themeNameFromFilePath(inspected.path, "图片");
-      const input = { type: "image", imagePath: inspected.path };
-      if (effects) input.effects = effects;
-      const resolved = await backend();
-      if (resolved.kind === "tray") {
-        const body = { imagePath: inspected.path, persistTheme, themeName };
-        if (effects) body.effects = effects;
-        const result = await request({
-          method: "POST",
-          path: "/apply/image",
-          body,
-          signal,
-        });
+      const themeName =
+        String(options?.themeName ?? "").trim() ||
+        themeNameFromFilePath(inspected.path, "图片");
+      const source = options?.source === "managed" ? "managed" : "local";
+      const input = { type: "image", imagePath: inspected.path, source };
+      if (effects) input.effects = effects;
+      const resolved = await backend();
+      if (resolved.kind === "tray") {
+        const result = await request({
+          method: "POST",
+          path: persistTheme ? "/theme/apply" : "/apply/image",
+          body: persistTheme
+            ? { name: themeName, input }
+            : {
+                imagePath: inspected.path,
+                source,
+                ...(effects ? { effects } : {}),
+              },
+          signal,
+        });
         return unwrapApplyResult(
           result,
           "image",
@@ -189,10 +205,10 @@ export function createBeauticodeActions(dataRootOrOptions) {
             ? `已将「${result.theme?.name || themeName}」设为背景。`
             : "已将图片设为背景。",
         );
-      }
-      const applied = persistTheme
-        ? await resolved.session.applyImportedMedia(input, { name: themeName })
-        : await resolved.session.apply(input);
+      }
+      const applied = persistTheme
+        ? await resolved.session.applyAndSaveTheme(input, themeName)
+        : await resolved.session.apply(input);
       return unwrapApplyResult(
         applied,
         "image",
@@ -245,11 +261,12 @@ export function createBeauticodeActions(dataRootOrOptions) {
         fail("beauticode_apply_video 只接受 .mp4 文件。");
       }
       const persistTheme = input?.persistTheme !== false;
-      const themeName =
-        String(input?.themeName ?? "").trim() ||
-        themeNameFromFilePath(inspected.path, "视频");
-      const body = { videoPath: inspected.path, persistTheme, themeName };
-      const localInput = { type: "video", videoPath: inspected.path };
+      const themeName =
+        String(input?.themeName ?? "").trim() ||
+        themeNameFromFilePath(inspected.path, "视频");
+      const source = input?.source === "managed" ? "managed" : "local";
+      const body = { videoPath: inspected.path, persistTheme, themeName, source };
+      const localInput = { type: "video", videoPath: inspected.path, source };
       if (typeof input.poster === "string" && input.poster.trim()) {
         const poster = await inspectLocalMedia(input.poster);
         if (!poster.ok) fail(poster.error);
@@ -265,14 +282,14 @@ export function createBeauticodeActions(dataRootOrOptions) {
         body.startAt = startAt;
         localInput.startAt = startAt;
       }
-      const resolved = await backend();
-      if (resolved.kind === "tray") {
-        const result = await request({
-          method: "POST",
-          path: "/apply/video",
-          body,
-          signal,
-        });
+      const resolved = await backend();
+      if (resolved.kind === "tray") {
+        const result = await request({
+          method: "POST",
+          path: persistTheme ? "/theme/apply" : "/apply/video",
+          body: persistTheme ? { name: themeName, input: localInput } : body,
+          signal,
+        });
         return unwrapApplyResult(
           result,
           "video",
@@ -280,10 +297,10 @@ export function createBeauticodeActions(dataRootOrOptions) {
             ? `已将「${result.theme?.name || themeName}」设为背景。`
             : "已将视频设为背景。",
         );
-      }
-      const applied = persistTheme
-        ? await resolved.session.applyImportedMedia(localInput, { name: themeName })
-        : await resolved.session.apply(localInput);
+      }
+      const applied = persistTheme
+        ? await resolved.session.applyAndSaveTheme(localInput, themeName)
+        : await resolved.session.apply(localInput);
       return unwrapApplyResult(
         applied,
         "video",

package/cli.js

@@ -46,9 +46,17 @@ function defaultDataRoot() {
   return path.join(os.homedir(), ".beauticode");
 }
 
-function defaultDshHome() {
-  return process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
-}
+function defaultDshHome() {
+  return process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
+}
+
+function defaultPluginHome(dshHome) {
+  return path.join(path.resolve(dshHome), "plugins", pluginName);
+}
+
+function legacyDefaultPluginHome() {
+  return path.join(defaultDataRoot(), "plugin");
+}
 
 function toFileUri(filePath) {
   const full = path.resolve(filePath).replaceAll("\\", "/");
@@ -222,15 +230,34 @@ async function sameInstalledVersion(dest) {
   }
 }
 
-async function copyPackage(dest) {
+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;
-}
+  return true;
+}
+
+async function removeLegacyManagedPlugin(legacyHome, currentHome) {
+  if (!legacyHome) return false;
+  const legacy = path.resolve(legacyHome);
+  if (legacy === path.resolve(currentHome) || !fs.existsSync(legacy)) return false;
+  try {
+    const pkg = JSON.parse(await fsp.readFile(path.join(legacy, "package.json"), "utf8"));
+    if (
+      ![pluginName, "@beauticode/dsh-plugin"].includes(pkg.name) ||
+      !fs.existsSync(path.join(legacy, "index.mjs"))
+    ) {
+      return false;
+    }
+  } catch {
+    return false;
+  }
+  await fsp.rm(legacy, { recursive: true, force: true });
+  return true;
+}
 
 async function ensureEngine(dest) {
   const vendor = path.join(dest, "vendor", "adapter-dsh", "index.js");
@@ -320,7 +347,7 @@ async function removeWebPackageDep(webPackage) {
   return true;
 }
 
-async function install(opts) {
+async function install(opts) {
   const dest = path.resolve(opts.pluginHome);
   const dshHome = path.resolve(opts.dshHome);
   const webProfile = path.join(dshHome, "profiles", "web");
@@ -340,21 +367,25 @@ async function install(opts) {
     await linkPluginIntoProfile(webProfile, dest);
     await ensureWebPackageDep(webPackage, dest);
     await writePatch(webPatch, packageInsert());
-    if (fs.existsSync(homePatch)) {
+    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");
+      if (hasBridge(homeRaw)) await removePatch(homePatch);
+    }
+    const migrated = await removeLegacyManagedPlugin(opts.legacyPluginHome, dest);
+    console.log(`已写入 ${webPatch}`);
+    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
+    if (migrated) console.log("已迁移 1.0.5 的旧插件目录，已保留主题数据。");
+    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");
+  await fsp.mkdir(dshHome, { recursive: true });
+  await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
+  const migrated = await removeLegacyManagedPlugin(opts.legacyPluginHome, dest);
+  console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
+  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
+  if (migrated) console.log("已迁移 1.0.5 的旧插件目录，已保留主题数据。");
+  console.log("请自己运行：npx @deepseek-ai/dsh web");
   return { dest, patch: homePatch };
 }
 
@@ -386,11 +417,15 @@ async function uninstall(opts) {
   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 };
+export async function runCli(argv = process.argv.slice(2)) {
+  const dshHome = argValue(argv, "--dsh-home") || defaultDshHome();
+  const requestedPluginHome = argValue(argv, "--plugin-home");
+  const pluginHome = requestedPluginHome || defaultPluginHome(dshHome);
+  const opts = {
+    dshHome,
+    pluginHome,
+    legacyPluginHome: requestedPluginHome ? null : legacyDefaultPluginHome(),
+  };
   if (argv.includes("--remove")) return uninstall(opts);
   return install(opts);
 }

package/client.js

@@ -197,25 +197,103 @@ html[data-bc-fish="true"] #root{opacity:0!important;visibility:hidden!important;
     });
   }
 
-  function waitForVideo(video) {
-    if (video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA) return Promise.resolve();
-    return new Promise((resolve, reject) => {
-      const done = () => {
-        cleanup();
-        resolve();
-      };
-      const failed = () => {
-        cleanup();
-        reject(new Error("MP4 加载或解码失败"));
-      };
-      const cleanup = () => {
-        video.removeEventListener("loadeddata", done);
-        video.removeEventListener("error", failed);
-      };
+  function describeVideoState(video, phase) {
+    const mediaErrorNames = {
+      1: "MEDIA_ERR_ABORTED",
+      2: "MEDIA_ERR_NETWORK",
+      3: "MEDIA_ERR_DECODE",
+      4: "MEDIA_ERR_SRC_NOT_SUPPORTED",
+    };
+    const code = Number(video?.error?.code) || 0;
+    const mediaError = code ? mediaErrorNames[code] || `MEDIA_ERR_${code}` : "none";
+    return `${phase}；mediaError=${mediaError}；readyState=${video?.readyState ?? -1}；networkState=${video?.networkState ?? -1}；paused=${Boolean(video?.paused)}`;
+  }
+
+  function waitForVideo(video, timeoutMs = 20_000) {
+    if (video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA) return Promise.resolve();
+    return new Promise((resolve, reject) => {
+      const done = () => {
+        cleanup();
+        resolve();
+      };
+      const failed = () => {
+        cleanup();
+        reject(new Error(describeVideoState(video, "MP4 加载或解码失败")));
+      };
+      const timer = setTimeout(() => {
+        cleanup();
+        reject(new Error(describeVideoState(video, "等待视频首帧超时")));
+      }, timeoutMs);
+      const cleanup = () => {
+        clearTimeout(timer);
+        video.removeEventListener("loadeddata", done);
+        video.removeEventListener("error", failed);
+      };
       video.addEventListener("loadeddata", done, { once: true });
       video.addEventListener("error", failed, { once: true });
-    });
-  }
+    });
+  }
+
+  function waitForStablePlayback(video, timeoutMs = 8_000) {
+    return new Promise((resolve, reject) => {
+      const startedAt = performance.now();
+      const initialTime = Number.isFinite(video.currentTime) ? video.currentTime : 0;
+      let frameSeen = false;
+      let settled = false;
+      let frameRequest = null;
+
+      const cleanup = () => {
+        clearInterval(timer);
+        video.removeEventListener("playing", check);
+        video.removeEventListener("timeupdate", check);
+        video.removeEventListener("error", failed);
+        if (frameRequest != null && typeof video.cancelVideoFrameCallback === "function") {
+          video.cancelVideoFrameCallback(frameRequest);
+        }
+      };
+      const finish = (error) => {
+        if (settled) return;
+        settled = true;
+        cleanup();
+        if (error) reject(error);
+        else resolve();
+      };
+      const failed = () => {
+        finish(new Error(describeVideoState(video, "视频解码器报告失败")));
+      };
+      const check = () => {
+        if (settled) return;
+        if (video.error) {
+          failed();
+          return;
+        }
+        const progressed =
+          Number.isFinite(video.currentTime) && video.currentTime >= initialTime + 0.08;
+        if (
+          video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA &&
+          !video.paused &&
+          (frameSeen || progressed)
+        ) {
+          finish();
+          return;
+        }
+        if (performance.now() - startedAt >= timeoutMs) {
+          finish(new Error(describeVideoState(video, "视频未在稳定窗口内输出首帧")));
+        }
+      };
+      const timer = setInterval(check, 100);
+      video.addEventListener("playing", check);
+      video.addEventListener("timeupdate", check);
+      video.addEventListener("error", failed, { once: true });
+      if (typeof video.requestVideoFrameCallback === "function") {
+        frameRequest = video.requestVideoFrameCallback(() => {
+          frameSeen = true;
+          check();
+        });
+      }
+      check();
+    });
+  }
 
   function seekVideo(video, value) {
     const requested = Number(value);
@@ -299,11 +377,13 @@ html[data-bc-fish="true"] #root{opacity:0!important;visibility:hidden!important;
       video.poster = payload.imageUrl;
       video.src = payload.videoUrl;
       node.replaceChildren(image, video);
-      await waitForVideo(video);
-      if (activePayload !== payload) return;
-      seekVideo(video, payload.startAt);
-      await playWithPreference(video);
-      document.documentElement.dataset.bcActive = "true";
+      await waitForVideo(video);
+      if (activePayload !== payload) return;
+      seekVideo(video, payload.startAt);
+      await playWithPreference(video);
+      await waitForStablePlayback(video);
+      if (activePayload !== payload) return;
+      document.documentElement.dataset.bcActive = "true";
       document.documentElement.dataset.bcMedia = "video";
       const visible = video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA && !video.paused;
       await acknowledgeRender(payload, visible, visible, visible ? null : "视频未开始播放");