beauticode-dsh 1.0.0 → 1.0.2

package/README.zh-CN.md

@@ -8,17 +8,17 @@
 
 beautiCode **不启动** DeepSeek Harness。请先自己运行 `dsh web`。
 
-不需要 fork 仓库。发布到 npm 之后，一行安装：
+不需要 fork 仓库。一行安装：
 
 ```sh
-npx @beauticode/dsh-plugin
+npx beauticode-dsh
 npx @deepseek-ai/dsh web
 ```
 
 已有 pnpm 时也可以：
 
 ```sh
-npx @deepseek-ai/dsh plugin --profile web add @beauticode/dsh-plugin
+npx @deepseek-ai/dsh plugin --profile web add beauticode-dsh
 npx @deepseek-ai/dsh web
 ```
 

package/bin/beauticode-dsh

@@ -11,7 +11,23 @@ import os from "node:os";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-const here = path.dirname(fileURLToPath(import.meta.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";
 
@@ -125,12 +141,29 @@ function shouldCopy(source) {
   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) {
@@ -153,7 +186,7 @@ async function install(opts) {
   const homePatch = path.join(dshHome, "cordis.patch.yml");
 
   await fsp.mkdir(dest, { recursive: true });
-  await copyPackage(dest);
+  const copied = await copyPackage(dest);
   await ensureEngine(dest);
   const indexFile = path.join(dest, "index.mjs");
   if (!fs.existsSync(indexFile)) {
@@ -161,13 +194,13 @@ async function install(opts) {
   }
 
   if (fs.existsSync(webPackage)) {
-    await writePatch(webPatch, packageInsert());
+    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(`插件已复制到 ${dest}`);
+    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
     console.log("请自己运行：npx @deepseek-ai/dsh web");
     return { dest, patch: webPatch };
   }
@@ -175,7 +208,7 @@ async function install(opts) {
   await fsp.mkdir(dshHome, { recursive: true });
   await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
   console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
-  console.log(`插件已复制到 ${dest}`);
+  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
   console.log("请自己运行：npx @deepseek-ai/dsh web");
   return { dest, patch: homePatch };
 }

package/cli.js

@@ -11,7 +11,23 @@ import os from "node:os";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
-const here = path.dirname(fileURLToPath(import.meta.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";
 
@@ -125,12 +141,29 @@ function shouldCopy(source) {
   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) {
@@ -153,7 +186,7 @@ async function install(opts) {
   const homePatch = path.join(dshHome, "cordis.patch.yml");
 
   await fsp.mkdir(dest, { recursive: true });
-  await copyPackage(dest);
+  const copied = await copyPackage(dest);
   await ensureEngine(dest);
   const indexFile = path.join(dest, "index.mjs");
   if (!fs.existsSync(indexFile)) {
@@ -161,13 +194,13 @@ async function install(opts) {
   }
 
   if (fs.existsSync(webPackage)) {
-    await writePatch(webPatch, packageInsert());
+    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(`插件已复制到 ${dest}`);
+    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
     console.log("请自己运行：npx @deepseek-ai/dsh web");
     return { dest, patch: webPatch };
   }
@@ -175,7 +208,7 @@ async function install(opts) {
   await fsp.mkdir(dshHome, { recursive: true });
   await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
   console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
-  console.log(`插件已复制到 ${dest}`);
+  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
   console.log("请自己运行：npx @deepseek-ai/dsh web");
   return { dest, patch: homePatch };
 }

package/client.js

@@ -189,7 +189,6 @@ html[data-bc-fish="true"] #root{opacity:0!important;visibility:hidden!important;
   function loadImage(url) {
     const image = new Image();
     image.alt = "";
-    image.crossOrigin = "anonymous";
     image.decoding = "async";
     return new Promise((resolve, reject) => {
       image.onload = () => resolve(image);
@@ -298,7 +297,6 @@ html[data-bc-fish="true"] #root{opacity:0!important;visibility:hidden!important;
       video.playsInline = true;
       video.preload = "auto";
       video.poster = payload.imageUrl;
-      video.crossOrigin = "anonymous";
       video.src = payload.videoUrl;
       node.replaceChildren(image, video);
       await waitForVideo(video);

package/host-apply.mjs

@@ -10,7 +10,7 @@ import { canvasImagePath } from "./presets.mjs";
 const sessions = new Map();
 
 export const ENGINE_MISSING_MESSAGE =
-  "beautiCode 插件未能加载本机导入引擎。请执行 npx @beauticode/dsh-plugin，或从完整安装目录加载桥接。";
+  "beautiCode 插件未能加载本机导入引擎。请执行 npx beauticode-dsh，或从完整安装目录加载桥接。";
 
 export function resolvePluginBaseUrl(ctx) {
   const port = ctx?.webServer?.port;

package/index.mjs

@@ -168,12 +168,16 @@ function publicStatus(current, modes, clients, clientStates) {
   const playback =
     activeAcks.find((ack) => ack.ok === true && ack.playback?.hasVideo === true)
       ?.playback ?? null;
+  const failedAcks = activeAcks.filter((ack) => ack.ok !== true);
   return {
     ok: true,
     connectedClients: clients.size,
     current,
     readyClients: activeAcks.filter((ack) => ack.ok === true).length,
-    failedClients: activeAcks.filter((ack) => ack.ok !== true).length,
+    failedClients: failedAcks.length,
+    lastRenderError:
+      failedAcks.find((ack) => typeof ack.error === "string" && ack.error)?.error ??
+      null,
     visibleClients: activeAcks.filter((ack) => ack.ok === true && ack.visible === true).length,
     modeReadyClients: modeReady.length,
     blockedClients: modeReady.filter((ack) => ack.blocked === true).length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beauticode-dsh",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Cordis plugin: image/video backgrounds for DeepSeek Harness web.",
   "type": "module",
   "main": "./index.mjs",

package/vendor/adapter-dsh/bridge.js

@@ -120,9 +120,12 @@ export class DshHostApplier {
                     };
                 }
                 if (currentMatches && last.failedClients > 0 && last.readyClients === 0) {
+                    const detail = typeof last.lastRenderError === "string" && last.lastRenderError
+                        ? ` (${last.lastRenderError})`
+                        : "";
                     return {
                         status: "fail",
-                        reason: "DeepSeek Harness client failed to render the background.",
+                        reason: `DeepSeek Harness client failed to render the background.${detail}`,
                         details: { ...last },
                     };
                 }

package/vendor/core/media-server.js

@@ -50,12 +50,24 @@ async function hashOpenedFile(handle, size) {
     }
     return hash.digest("hex");
 }
-/** Exact match or app://* prefix (hub is loopback-only). */
+function isLoopbackHttpOrigin(origin) {
+    try {
+        const url = new URL(origin);
+        return (url.protocol === "http:" &&
+            ["127.0.0.1", "localhost", "[::1]"].includes(url.hostname.toLowerCase()));
+    }
+    catch {
+        return false;
+    }
+}
+/** Exact match, loopback HTTP, or app://* prefix (hub is loopback-only). */
 function matchTrustedOrigin(origin, trusted) {
     if (!origin)
         return null;
     if (trusted.has(origin))
         return origin;
+    if (isLoopbackHttpOrigin(origin))
+        return origin;
     for (const prefix of TRUSTED_ORIGIN_PREFIXES) {
         if (origin.startsWith(prefix))
             return origin;
@@ -316,7 +328,7 @@ export class LoopbackMediaHub {
             queryToken = "";
         }
         const tokenOk = headerToken === pathToken || queryToken === pathToken;
-        if ((origin && !trustedOrigin) || !tokenOk) {
+        if ((origin && !trustedOrigin && !isLoopbackHttpOrigin(origin)) || !tokenOk) {
             response.writeHead(403, { "Cache-Control": "no-store" });
             response.end();
             return;