@wisdoverse/dsh-inline-media-viewer 1.0.2 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.0.5
+
+- Register the browser bundle under the scoped package name expected by the
+  DSH module loader.
+
+## 1.0.4
+
+- Read media candidates from the standard assistant-step projection so the
+  first inline preview renders reliably.
+- Avoid extracting duplicate paths from Markdown links, code spans, and URLs.
+
+## 1.0.3
+
+- Clarify and enforce the transport split: workspace files use the DSH host,
+  regular HTTP(S) media loads directly, and only recognized ComfyUI URLs use
+  the optional proxy.
+- Mark ComfyUI as optional throughout the bilingual settings UI and README.
+
 ## 1.0.2
 
 - Make the settings navigation and all setting copy react live to DSH's

package/README.md

@@ -8,7 +8,7 @@
   <a href="CHANGELOG.md"><img alt="Latest tag" src="https://img.shields.io/github/v/tag/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square&amp;label=version"></a>
   <a href="LICENSE"><img alt="License" src="https://img.shields.io/github/license/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square"></a>
   <a href="package.json"><img alt="Top language" src="https://img.shields.io/github/languages/top/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square"></a>
-  <a href="#configuration"><img alt="ComfyUI support" src="https://img.shields.io/badge/ComfyUI-supported-ff6f00?style=flat-square"></a>
+  <a href="#configuration"><img alt="Optional ComfyUI" src="https://img.shields.io/badge/ComfyUI-optional-ff6f00?style=flat-square"></a>
 </p>
 
 <p align="center">
@@ -40,9 +40,14 @@ audio/sound.mp3                    →  <audio controls>
 | --- | --- |
 | Inline rendering | Displays images, videos, and audio directly below the chat turn that mentions them. |
 | Workspace-safe reads | Resolves local paths with `realpath` and rejects traversal, out-of-workspace paths, and symlink escapes. |
-| ComfyUI proxy | Fetches recognized ComfyUI media URLs server-side from the configured origin, including for remote users and HTTPS pages. |
+| Optional ComfyUI proxy | Fetches recognized ComfyUI media URLs server-side from the configured origin, including for remote users and HTTPS pages. |
 | Bounded transfers | Limits each file or response to 48 MiB and remote requests to 20 seconds. |
-| User controls | Provides auto-render, per-turn item limit, media height, and ComfyUI origin settings. |
+| User controls | Provides auto-render, per-turn item limit, media height, and optional ComfyUI origin settings. |
+
+> [!NOTE]
+> ComfyUI is not required. Workspace files and regular HTTP(S) media URLs work
+> when ComfyUI is not installed or running; its proxy is activated only for
+> recognized ComfyUI URLs.
 
 ## Supported media
 
@@ -105,7 +110,7 @@ switch live between English and Chinese.
 | Auto-render detected media | On | On / off |
 | Maximum items per turn | `12` | `1`–`30` |
 | Maximum media height | `380 px` | `160`–`1200 px` |
-| ComfyUI origin | Empty | `http(s)://host[:port]` |
+| ComfyUI origin (optional) | Empty | `http(s)://host[:port]` |
 
 Settings are stored in the DSH settings document. Writes are available only on
 loopback connections; remote browsers can read settings but cannot persist
@@ -113,6 +118,7 @@ changes.
 
 ### ComfyUI origin
 
+- Skip this setting entirely if you do not use ComfyUI.
 - Leave the field empty to use `http://127.0.0.1:8188`.
 - Accepted forms are `http://host[:port]`, `https://host[:port]`, and bare
   `host[:port]` (`http` is assumed).

package/README.zh-CN.md

@@ -8,7 +8,7 @@
   <a href="CHANGELOG.md"><img alt="最新标签" src="https://img.shields.io/github/v/tag/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square&amp;label=version"></a>
   <a href="LICENSE"><img alt="许可证" src="https://img.shields.io/github/license/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square"></a>
   <a href="package.json"><img alt="主要语言" src="https://img.shields.io/github/languages/top/Wisdoverse/dsh-inline-media-viewer-plugin?style=flat-square"></a>
-  <a href="#配置"><img alt="支持 ComfyUI" src="https://img.shields.io/badge/ComfyUI-supported-ff6f00?style=flat-square"></a>
+  <a href="#配置"><img alt="可选 ComfyUI" src="https://img.shields.io/badge/ComfyUI-optional-ff6f00?style=flat-square"></a>
 </p>
 
 <p align="center">
@@ -39,9 +39,13 @@ audio/sound.mp3                    →  <audio controls>
 | --- | --- |
 | 内联渲染 | 在提及媒体的聊天消息下方直接显示图像、视频和音频。 |
 | 工作区安全读取 | 使用 `realpath` 解析本地路径，并拒绝目录穿越、工作区外路径和符号链接逃逸。 |
-| ComfyUI 代理 | 由服务端从配置的源站获取识别到的 ComfyUI 媒体 URL，使远程用户和 HTTPS 页面也能正常查看。 |
+| 可选 ComfyUI 代理 | 由服务端从配置的源站获取识别到的 ComfyUI 媒体 URL，使远程用户和 HTTPS 页面也能正常查看。 |
 | 资源限制 | 每个文件或响应最大 48 MiB，远程请求最长 20 秒。 |
-| 用户控制 | 提供自动渲染、每条消息的媒体数量、媒体高度和 ComfyUI 源站设置。 |
+| 用户控制 | 提供自动渲染、每条消息的媒体数量、媒体高度和可选的 ComfyUI 源站设置。 |
+
+> [!NOTE]
+> ComfyUI 不是必需依赖。即使没有安装或运行 ComfyUI，工作区文件和普通 HTTP(S)
+> 媒体 URL 仍可正常使用；只有识别为 ComfyUI 的 URL 才会启用代理。
 
 ## 支持的媒体格式
 
@@ -102,12 +106,13 @@ dsh plugin --profile web add @wisdoverse/dsh-inline-media-viewer
 | 自动渲染检测到的媒体 | 开启 | 开启 / 关闭 |
 | 每条消息的最大媒体数量 | `12` | `1`–`30` |
 | 媒体最大高度 | `380 px` | `160`–`1200 px` |
-| ComfyUI 源站 | 留空 | `http(s)://host[:port]` |
+| ComfyUI 源站（可选） | 留空 | `http(s)://host[:port]` |
 
 设置值保存在 DSH 设置文档中。只有回环连接可以写入；远程浏览器可以读取设置，但不能持久化修改。
 
 ### ComfyUI 源站
 
+- 不使用 ComfyUI 时无需配置此项。
 - 留空时使用 `http://127.0.0.1:8188`。
 - 支持 `http://host[:port]`、`https://host[:port]` 和不带协议的
   `host[:port]`（默认使用 `http`）。

package/client/client.js

@@ -1,5 +1,5 @@
 window.__ModuleLoader__.load({
-  id: "dsh-inline-media-viewer",
+  id: "@wisdoverse/dsh-inline-media-viewer",
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;
@@ -9,7 +9,6 @@ window.__ModuleLoader__.load({
     const { createElement: h, useEffect, useMemo, useState } = React;
     const CHANNEL = "/inline-media";
     const ENDPOINT = "read";
-    const DATA_KEY = "inlineMedia";
     const DISPLAY_CAP = 12;
     const SETTINGS_NAMESPACE = "inline-media";
     // Empty config = the host-side built-in default
@@ -88,79 +87,48 @@ window.__ModuleLoader__.load({
         found.push({ source, kind });
       };
 
-      for (const match of text.matchAll(/!?\[[^\]]*\]\(([^)]+)\)/g)) add(match[1]);
-      for (const match of text.matchAll(/`([^`\n]+)`/g)) add(match[1]);
-      for (const match of text.matchAll(/https?:\/\/[^\s<>"'`]+/gi)) add(match[0]);
+      let plain = text.replace(/!?\[[^\]]*\]\(([^)]+)\)/g, (match, source) => {
+        add(source);
+        return " ".repeat(match.length);
+      });
+      plain = plain.replace(/`([^`\n]+)`/g, (match, source) => {
+        add(source);
+        return " ".repeat(match.length);
+      });
+      plain = plain.replace(/https?:\/\/[^\s<>"'`]+/gi, (source) => {
+        add(source);
+        return " ".repeat(source.length);
+      });
 
       const ext = Array.from(MEDIA_EXTENSIONS).join("|");
       const pathPattern = new RegExp(
         String.raw`(?:\/|\.\.?\/|[\w.-]+\/)[^\s<>"'\x60()\[\]{}]+?\.(?:${ext})(?:\?[^\s<>"'\x60]*)?`,
         "gi",
       );
-      for (const match of text.matchAll(pathPattern)) add(match[0]);
+      for (const match of plain.matchAll(pathPattern)) add(match[0]);
       return found;
     }
 
-    function assistantText(event) {
-      if (event.type !== "assistant/message") return "";
-      const content = event.data && event.data.message && event.data.message.content;
-      if (!Array.isArray(content)) return "";
-      return content
-        .filter((block) => block && block.type === "text" && typeof block.text === "string")
-        .map((block) => block.text)
-        .join("\n");
-    }
-
-    const mediaDefinition = {
-      kind: DATA_KEY,
-      match(event) {
-        if (event.type === "turn/start") {
-          return { id: String(event.data.turn), role: "start" };
-        }
-        if (event.type === "assistant/message" && Number.isInteger(event.data && event.data.turn)) {
-          return { id: String(event.data.turn), role: "update" };
-        }
-        return null;
-      },
-      start(_context, match) {
-        return { turn: match.event.data.turn, candidates: [] };
-      },
-      update(context, match) {
-        const additions = extractCandidates(assistantText(match.event)).map((candidate) => ({
-          ...candidate,
-          seq: match.event.seq,
-        }));
-        if (additions.length === 0) return context.state;
-        const seen = new Set(context.state.candidates.map((candidate) => candidate.source));
-        const fresh = additions.filter((candidate) => {
-          if (seen.has(candidate.source)) return false;
-          seen.add(candidate.source);
-          return true;
-        });
-        if (fresh.length === 0) return context.state;
-        return {
-          ...context.state,
-          candidates: [...context.state.candidates, ...fresh].slice(0, DISPLAY_CAP),
-        };
-      },
-      buildLocationData(context, scope) {
-        if (scope !== "turn" || context.state === undefined) return null;
-        return {
-          kind: "turn",
-          turn: context.state.turn,
-          key: DATA_KEY,
-          value: { candidates: context.state.candidates },
-        };
-      },
-    };
-
     function selectMedia(owner) {
       const settings = readSettings();
       if (!settings.autoRender) return null;
-      const data = owner.turn.data.get(DATA_KEY);
-      if (!data || !Array.isArray(data.candidates)) return null;
-      const candidates = data.candidates.filter((candidate) => candidate.seq <= owner.seq);
-      return candidates.length === 0 ? null : candidates.slice(0, settings.displayCap);
+      const candidates = [];
+      const seen = new Set();
+      for (const step of owner.turn.steps) {
+        const assistant = step.data.get("assistant-step");
+        if (!assistant || !assistant.finalNode || assistant.finalNode.seq > owner.seq || !Array.isArray(assistant.blocks)) continue;
+        const text = assistant.blocks
+          .filter((block) => block && block.kind === "text" && typeof block.text === "string")
+          .map((block) => block.text)
+          .join("\n");
+        for (const candidate of extractCandidates(text)) {
+          if (seen.has(candidate.source)) continue;
+          seen.add(candidate.source);
+          candidates.push(candidate);
+          if (candidates.length === settings.displayCap) return candidates;
+        }
+      }
+      return candidates.length === 0 ? null : candidates;
     }
 
     function normalizeComfyOrigin(input) {
@@ -197,6 +165,11 @@ window.__ModuleLoader__.load({
       }
     }
 
+    function mediaTransport(source, comfyUrl) {
+      if (!/^https?:\/\//i.test(source)) return "workspace";
+      return isComfySource(source, comfyUrl) ? "comfy-proxy" : "direct";
+    }
+
     function basename(source) {
       try {
         const url = new URL(source);
@@ -209,7 +182,7 @@ window.__ModuleLoader__.load({
     }
 
     function MediaCard({ candidate, connection, sessionId, imageMaxPx, comfyUrl }) {
-      const proxied = !/^https?:\/\//i.test(candidate.source) || isComfySource(candidate.source, comfyUrl);
+      const proxied = mediaTransport(candidate.source, comfyUrl) !== "direct";
       const [state, setState] = useState(() => proxied
         ? { status: "loading", src: "" }
         : { status: "ready", src: candidate.source });
@@ -385,8 +358,8 @@ window.__ModuleLoader__.load({
         displayCapHint: "1–30",
         imageMaxPx: "媒体最大高度 (px)",
         imageMaxPxHint: "160–1200",
-        comfyUrl: "ComfyUI 地址",
-        comfyUrlHint: "主机代理拉流的服务器地址,格式 http(s)://host[:port];留空使用内置默认地址。",
+        comfyUrl: "ComfyUI 地址（可选）",
+        comfyUrlHint: "仅用于 ComfyUI 链接；不使用 ComfyUI 可保持为空，本地文件和普通网络 URL 不受影响。",
         comfyUrlError: "地址无效,请使用 http://host:8188 这类格式。",
         reset: "恢复默认",
         writable: "当前连接不可回写:设置仅临时保存在本会话,刷新后恢复默认。",
@@ -400,8 +373,8 @@ window.__ModuleLoader__.load({
         displayCapHint: "1–30",
         imageMaxPx: "Max media height (px)",
         imageMaxPxHint: "160–1200",
-        comfyUrl: "ComfyUI address",
-        comfyUrlHint: "Origin the host proxy fetches media from: http(s)://host[:port]; empty uses the built-in default.",
+        comfyUrl: "ComfyUI address (optional)",
+        comfyUrlHint: "Used only for ComfyUI links. Leave empty when not using ComfyUI; local files and regular web URLs work independently.",
         comfyUrlError: "Invalid address; use the http://host:8188 form.",
         reset: "Reset to defaults",
         writable: "This connection cannot write settings: values are session-local until a loopback connection is used.",
@@ -523,7 +496,7 @@ window.__ModuleLoader__.load({
     }
 
     const name = "dsh-inline-media-viewer";
-    const inject = ["slots", "conversationEvents", "connection", "settingsScope", "locale"];
+    const inject = ["slots", "connection", "settingsScope", "locale"];
 
     function apply(ctx) {
       const connection = ctx.get("connection");
@@ -531,7 +504,6 @@ window.__ModuleLoader__.load({
       const t = ctx.locale.bind(SETTINGS_NS);
       const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
       settingsScope = scope;
-      ctx.conversationEvents.register(mediaDefinition);
       ctx.slots.inject("conversation.chat.turnTail", () => ctx.slots.register({
         name: "conversation.chat.turnTail",
         select: selectMedia,
@@ -550,6 +522,7 @@ window.__ModuleLoader__.load({
     exports.apply = apply;
     exports.inject = inject;
     exports.name = name;
+    exports.testing = Object.freeze({ extractCandidates, mediaTransport, selectMedia });
     return module.exports;
   },
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wisdoverse/dsh-inline-media-viewer",
-  "version": "1.0.2",
-  "description": "Persistent inline image, video, and audio previews for DeepSeek Harness Web conversations, with workspace-confined local reads and a configurable ComfyUI proxy.",
+  "version": "1.0.5",
+  "description": "Persistent inline image, video, and audio previews for DeepSeek Harness Web conversations, with workspace-confined local reads and an optional ComfyUI proxy.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Wisdoverse/dsh-inline-media-viewer-plugin.git"