dsh-comfyui-canvas 0.1.9 → 0.1.10

package/lib/client.js

@@ -10,6 +10,31 @@ var STATE_KEY = "__dsh_comfyui_state__";
 // 当前生效的 ComfyUI 地址（默认；设置行更改后由 scope 覆盖）。
 var activeBase = DEFAULT_BASE;
 
+// 内存回退设置（2026-09-24）：核心 #4587 移除客户端 settingsScope 服务后
+// scope 缺失，分屏/rail 状态改用模块级内存态维持交互（页面会话内有效，
+// 不跨重启持久化；host 侧无感知，画布专注标记等 host 联动降级）。
+var MEMORY_STORE = { splitEnabledBySession: {}, railClosedBySession: {}, railWidth: DEFAULT_RAIL };
+var MEMORY_SNAPSHOT = { value: MEMORY_STORE, writable: true };
+var MEMORY_LISTENERS = [];
+function memoryNotify() {
+  var copy = MEMORY_LISTENERS.slice();
+  for (var i = 0; i < copy.length; i++) { try { copy[i](); } catch (e) { /* listener error ignored */ } }
+}
+function memorySubscribe(cb) {
+  MEMORY_LISTENERS.push(cb);
+  return function () {
+    var idx = MEMORY_LISTENERS.indexOf(cb);
+    if (idx >= 0) MEMORY_LISTENERS.splice(idx, 1);
+  };
+}
+function memorySnapshot() { return MEMORY_SNAPSHOT; }
+function memorySetPath(key, value) {
+  MEMORY_STORE[key] = value;
+  // 换新引用（useSyncExternalStore 用 Object.is 判定变更），仅真实变更时更新。
+  MEMORY_SNAPSHOT = { value: MEMORY_STORE, writable: true };
+  memoryNotify();
+}
+
 // 画布 iframe 永久挂载在 body 上，从不动它：标签切换只改显隐。
 // 激活时用 fixed 定位对齐视图区（含顶栏），卸载时 visibility:hidden，
 // iframe 文档保持存活，切换标签/插件重载都不会重新加载 ComfyUI。
@@ -523,10 +548,11 @@ function positionSplit(outer) {
 function ComfyUISplitToggle(props) {
   var sessionId = String(props.sessionId ?? "root");
   var scope = props.scope;
+  var useScopeStore = scope && typeof scope.subscribe === "function" && typeof scope.getSnapshot === "function";
   var snapshot = React.useSyncExternalStore(
-    function (cb) { return scope && typeof scope.subscribe === "function" ? scope.subscribe(cb) : function () {}; },
-    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
-    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
+    function (cb) { return useScopeStore ? scope.subscribe(cb) : memorySubscribe(cb); },
+    function () { return useScopeStore ? scope.getSnapshot() : memorySnapshot(); },
+    function () { return useScopeStore ? scope.getSnapshot() : memorySnapshot(); },
   );
   var value = (snapshot && snapshot.value) || {};
   var map = value.splitEnabledBySession || {};
@@ -593,6 +619,8 @@ function ComfyUISplitToggle(props) {
     applyRailWidth(w);
     if (scope && typeof scope.set === "function") {
       scope.set("railWidth", w).catch(function () { /* recover handled by scope */ });
+    } else {
+      memorySetPath("railWidth", w);
     }
     // 拖动中实时重算画布覆盖层与把手位置（rail 左缘随宽度变化），
     // 否则把手会停在起点，脱离 rail 边界。
@@ -672,6 +700,8 @@ function ComfyUISplitToggle(props) {
     next[sessionId] = !enabled;
     if (scope && typeof scope.set === "function") {
       scope.set("splitEnabledBySession", next).catch(function () { /* recover handled by scope */ });
+    } else {
+      memorySetPath("splitEnabledBySession", next);
     }
   };
 
@@ -681,6 +711,8 @@ function ComfyUISplitToggle(props) {
     next[sessionId] = !railClosed;
     if (scope && typeof scope.set === "function") {
       scope.set("railClosedBySession", next).catch(function () { /* recover handled by scope */ });
+    } else {
+      memorySetPath("railClosedBySession", next);
     }
   };
 
@@ -780,10 +812,11 @@ function ComfyUISplitToggle(props) {
 
 function ComfyUISettingsRow(props) {
   var scope = props.scope;
+  var useScopeStore = scope && typeof scope.subscribe === "function" && typeof scope.getSnapshot === "function";
   var snapshot = React.useSyncExternalStore(
-    function (cb) { return scope && typeof scope.subscribe === "function" ? scope.subscribe(cb) : function () {}; },
-    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
-    function () { return scope && typeof scope.getSnapshot === "function" ? scope.getSnapshot() : null; },
+    function (cb) { return useScopeStore ? scope.subscribe(cb) : memorySubscribe(cb); },
+    function () { return useScopeStore ? scope.getSnapshot() : memorySnapshot(); },
+    function () { return useScopeStore ? scope.getSnapshot() : memorySnapshot(); },
   );
   var value = (snapshot && snapshot.value) || {};
   var baseUrl = typeof value.baseUrl === "string" && value.baseUrl ? value.baseUrl : DEFAULT_BASE;
@@ -809,19 +842,32 @@ function ComfyUISettingsRow(props) {
   var titleStyle = { fontSize: "13px", fontWeight: "600", color: "var(--dsw-alias-label-primary,#e8e8e8)" };
 
   function setField(field, raw) {
-    if (!writable || !scope.set) return;
+    if (!writable) return;
     var next = raw === "" ? null : raw;
-    scope.set(field, next).catch(function () { /* recover handled by scope */ });
+    if (scope && typeof scope.set === "function") {
+      scope.set(field, next).catch(function () { /* recover handled by scope */ });
+    } else {
+      memorySetPath(field, next);
+    }
   }
 
   // 插件更新请求：settings 页「检查更新 / 更新」按钮把 updateRequest 写进
   // settings，host watcher 执行 registry 检查或安装，并把结果写回
   // pluginUpdate（status / latestVersion / message / checkedAt / updatedAt）。
   function requestUpdate(action) {
-    if (!writable || !scope.set) return;
-    scope.set("updateRequest", { requested: true, action: action }).catch(function () { /* recover handled by scope */ });
+    if (!writable) return;
+    // 0.1.7 新核心下设置写入通道已迁移（settingsScope 移除）：更新请在插件市场
+    // 操作。保留 scope 写入以兼容旧核心 host watcher；缺失时给出可见指引。
+    if (scope && typeof scope.set === "function") {
+      scope.set("updateRequest", { requested: true, action: action }).catch(function () { /* recover handled by scope */ });
+    } else {
+      setMarketNote("更新请在左侧「插件市场」中操作（DSH 0.1.7 起，本设置页的更新通道已随 settingsScope 一并迁移）。");
+    }
   }
   var upStatus = value.pluginUpdate || {};
+  var noteState = React.useState("");
+  var marketNote = noteState[0];
+  var setMarketNote = noteState[1];
   var btnRowStyle = {
     border: "1px solid var(--dsw-alias-border-l2,#3a3a40)",
     borderRadius: "6px", padding: "6px 12px",
@@ -956,20 +1002,130 @@ function ComfyUISettingsRow(props) {
           background: "var(--dsw-alias-state-business-primary,#3b82f6)", color: "#fff",
         }),
       }, upStatus.status === "updating" ? "更新中…" : "更新到 v" + (upStatus.latestVersion || "")) : null,
+      marketNote ? React.createElement("div", {
+        style: { fontSize: "12px", color: "var(--dsw-alias-state-warn-primary,#d29922)", lineHeight: 1.5, whiteSpace: "pre-wrap" },
+      }, marketNote) : null,
     ),
   );
 }
 
-var inject = ["slots"];
+// ComfyUI 独立标签视图（2026-09-25，替代分屏按钮）：conversation.view
+// 容器内画布 —— iframe + 顶栏（刷新/重启/关闭）+ CanvasStatusOverlay 状态层。
+// 画布标签的 iframe + 顶栏持久实例（2026-09-25 v2）：浏览器里 iframe 一旦脱离 DOM
+// （removeChild）其浏览上下文即被销毁，重挂必然重载。正确做法（旧 buildCanvas 同款）：
+// 常驻挂到 body、永不 removeChild，激活时 fixed 定位到标签容器并 display:flex，
+// 离开时仅 display:none —— iframe 文档保活，切回秒开不重载。
+var TAB_CANVAS = null;
+
+function CanvasTab(props) {
+  var scope = props.scope;
+  var hostRef = React.useRef(null);
+  React.useEffect(function () {
+    var host = hostRef.current;
+    if (!host) return;
+    var frame, bar, outer;
+    if (!TAB_CANVAS) {
+      outer = document.createElement("div");
+      outer.style.cssText = "position:fixed;display:none;z-index:40;flex-direction:column;overflow:hidden;background:var(--dsw-alias-bg-layer-1,#232324);";
+      bar = document.createElement("div");
+      bar.style.cssText = "flex:none;display:flex;align-items:center;gap:12px;padding:0 12px;height:34px;background:var(--dsw-alias-bg-layer-1,#232324);border-bottom:1px solid var(--dsw-alias-border-l1,rgba(128,128,128,.25));font-size:13px;";
+      var title = document.createElement("strong");
+      title.textContent = "ComfyUI";
+      bar.appendChild(title);
+      var actionBtn = function (label, action) {
+        var btn = document.createElement("button");
+        btn.type = "button";
+        btn.textContent = label;
+        btn.title = label;
+        btn.setAttribute("aria-label", label);
+        btn.style.cssText = "background:transparent;border:none;color:var(--dsw-alias-state-business-primary,#8ab4f8);cursor:pointer;font-size:12px;padding:2px 6px;";
+        btn.addEventListener("click", function () {
+          document.dispatchEvent(new CustomEvent("dsh-comfyui-control", { bubbles: true, detail: { action: action } }));
+        });
+        return btn;
+      };
+      var refreshBtn = document.createElement("button");
+      refreshBtn.type = "button";
+      refreshBtn.textContent = "刷新";
+      refreshBtn.title = "刷新画布";
+      refreshBtn.setAttribute("aria-label", "刷新画布");
+      refreshBtn.style.cssText = "background:transparent;border:none;color:var(--dsw-alias-state-business-primary,#8ab4f8);cursor:pointer;font-size:12px;padding:2px 6px;";
+      refreshBtn.addEventListener("click", function () {
+        var url;
+        try { url = new URL(frame.src || activeBase); } catch (e) { url = null; }
+        if (url) { url.searchParams.set("_dsh_reload", String(Date.now())); frame.src = url.toString(); }
+        else { frame.src = (frame.src || activeBase).split("#")[0] + "?_dsh_reload=" + Date.now(); }
+      });
+      var right = document.createElement("div");
+      right.style.cssText = "margin-left:auto;display:flex;align-items:center;gap:8px;";
+      right.appendChild(refreshBtn);
+      right.appendChild(actionBtn("重启", "restart"));
+      right.appendChild(actionBtn("关闭", "stop"));
+      bar.appendChild(right);
+      frame = document.createElement("iframe");
+      frame.title = "ComfyUI";
+      frame.style.cssText = "flex:1;width:100%;border:none;display:block;background:#fff;";
+      frame.src = activeBase;
+      outer.appendChild(bar);
+      outer.appendChild(frame);
+      document.body.appendChild(outer);
+      TAB_CANVAS = { outer: outer, frame: frame, bar: bar };
+    } else {
+      outer = TAB_CANVAS.outer;
+      frame = TAB_CANVAS.frame;
+      bar = TAB_CANVAS.bar;
+    }
+    var fit = function () {
+      var h = hostRef.current;
+      if (!h) return;
+      var r = h.getBoundingClientRect();
+      outer.style.left = r.left + "px";
+      outer.style.top = r.top + "px";
+      outer.style.width = r.width + "px";
+      outer.style.height = r.height + "px";
+    };
+    fit();
+    outer.style.display = "flex";
+    var sync = function () {
+      // frame.src 常带尾斜杠而 activeBase 不带——裸 !== 会让每次挂载都重置 src
+      // 导致 ComfyUI 重载。归一化后仅当地址真正变化才更新。
+      var want = String(activeBase).replace(/\/+$/, "");
+      var cur = String(frame.src).replace(/\/+$/, "");
+      if (cur !== want) frame.src = activeBase;
+    };
+    var unsub = scope && typeof scope.subscribe === "function" ? scope.subscribe(sync) : memorySubscribe(sync);
+    // 画布标签全屏：隐藏常驻 composer（见 data-dsh-comfyui-fullscreen CSS）。
+    document.documentElement.setAttribute("data-dsh-comfyui-fullscreen", "1");
+    var ro = typeof ResizeObserver === "function" ? new ResizeObserver(fit) : null;
+    if (ro) ro.observe(host);
+    window.addEventListener("resize", fit);
+    return function () {
+      if (typeof unsub === "function") unsub();
+      if (ro) ro.disconnect();
+      window.removeEventListener("resize", fit);
+      document.documentElement.removeAttribute("data-dsh-comfyui-fullscreen");
+      // 仅隐藏，不摘除：iframe 浏览上下文保活，切回秒开。
+      outer.style.display = "none";
+    };
+  }, []);
+  return React.createElement("div", {
+    ref: hostRef,
+    style: { position: "relative", width: "100%", height: "100%", background: "var(--dsw-alias-bg-layer-1,#232324)", overflow: "hidden" },
+  }, React.createElement(CanvasStatusOverlay, { scope: scope, sessionId: props.sessionId || "root" }));
+}
+
+var inject = ["slots", "configForms"];
 
 function apply(ctx) {
-  // 2026-09-24: 核心 #4587 移除了客户端 settingsScope 服务，且 cordis ctx 代理对
-// 未注入服务的属性访问（ctx.settingsScope）会直接抛 "cannot get property...
-// without inject"，导致客户端 apply 失败。改用 ctx.get()（缺失返回 undefined）。
-var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScope") : undefined;
-  var scope = settingsScopeService && typeof settingsScopeService.bind === "function"
-    ? settingsScopeService.bind({ namespace: NAMESPACE })
-    : undefined;
+  // 2026-09-25: DSH 0.1.7 新核心 — 配置经 entry Config（profile 支撑）的
+  // ConfigForm 读写（ctx.configForms.get(NAMESPACE)，接口与旧 scope 一致）；
+  // 缺失时回退到模块级内存存储（会话内有效）。旧 settingsScope 服务已移除。
+  var configForm = null;
+  if (ctx.configForms && typeof ctx.configForms.get === "function") {
+    try { configForm = ctx.configForms.get(NAMESPACE); } catch (e) { configForm = null; }
+  }
+  var scope = configForm && typeof configForm.subscribe === "function"
+    && typeof configForm.getSnapshot === "function" ? configForm : null;
   // 画布顶栏「重启 / 关闭 ComfyUI」按钮 → 写 settings.comfyControl，
   // host watcher 执行 kill / restart（结果由可达性探测反映到状态圆点）。
   document.addEventListener("dsh-comfyui-control", function (e) {
@@ -980,7 +1136,7 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
   });
   // 让画布 iframe 使用设置里的地址（并跟随变更）。
   var syncConfig = function () {
-    var snap = scope ? scope.getSnapshot() : undefined;
+    var snap = scope ? scope.getSnapshot() : memorySnapshot();
     var v = snap && snap.value;
     var base = v && typeof v.baseUrl === "string" && v.baseUrl
       ? v.baseUrl : DEFAULT_BASE;
@@ -991,7 +1147,11 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
     var state = canvasState();
     if (state.canvas) {
       var frame = state.canvas.querySelector("iframe");
-      if (frame && frame.src !== base) frame.src = base;
+      // frame.src 常带尾斜杠而 base 不带——裸 !== 恒真会把分屏 iframe 每次
+      // 重载；归一化后仅地址真正变化才更新（与标签 sync 同款修复）。
+      if (frame && String(frame.src).replace(/\/+$/, "") !== String(base).replace(/\/+$/, "")) {
+        frame.src = base;
+      }
       var link = state.canvas.querySelector("a");
       if (link) link.href = base;
     }
@@ -999,6 +1159,7 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
     applyRailWidth(v?.railWidth != null ? v.railWidth : DEFAULT_RAIL);
   };
   if (scope) scope.subscribe(syncConfig);
+  else memorySubscribe(syncConfig);
 
   // 全局看门狗：保证分屏标记与真实分屏态一致，杜绝 data-dsh-split-on 残留。
   // 挤压规则只在 html[data-dsh-split-on="1"] 时生效；一旦残留打上该属性，
@@ -1012,7 +1173,7 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
     return tab ? (tab.textContent || "").trim() : "";
   };
   var enforceSplitMarker = function () {
-    var snap = scope ? scope.getSnapshot() : undefined;
+    var snap = scope ? scope.getSnapshot() : memorySnapshot();
     var v = snap && snap.value ? snap.value : {};
     var map = v.splitEnabledBySession || {};
     var anyEnabled = Object.keys(map).some(function (k) { return map[k] === true; });
@@ -1041,6 +1202,7 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
   };
   var splitWatchdog = null;
   if (scope) scope.subscribe(enforceSplitMarker);
+  else memorySubscribe(enforceSplitMarker);
   if (typeof MutationObserver === "function") {
     splitWatchdog = new MutationObserver(enforceSplitMarker);
     splitWatchdog.observe(
@@ -1065,7 +1227,7 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
   var onNarrow = function () {
     var now = narrowQuery ? narrowQuery.matches : (window.innerWidth < 1200);
     if (now && !narrowWas) {
-      var snap = scope ? scope.getSnapshot() : undefined;
+      var snap = scope ? scope.getSnapshot() : memorySnapshot();
       var v = snap && snap.value ? snap.value : {};
       var map = v.splitEnabledBySession || {};
       var anyEnabled = Object.keys(map).some(function (k) { return map[k] === true; });
@@ -1074,6 +1236,8 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
         for (var k in map) cleared[k] = false;
         if (scope && typeof scope.set === "function") {
           scope.set("splitEnabledBySession", cleared).catch(function () { /* recover handled by scope */ });
+        } else {
+          memorySetPath("splitEnabledBySession", cleared);
         }
         // 同步清理 DOM，避免 settings 异步落地前挤压样式/画布残留。
         document.documentElement.removeAttribute("data-dsh-split-on");
@@ -1137,6 +1301,11 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
       '  margin-left: auto !important;',
       '  overflow: hidden !important;',
       '}',
+      // ComfyUI 画布标签全屏：隐藏常驻 composer（ConversationRoot 的
+      // composerSeat 不随视图切换消失，需插件隐藏，否则画布被输入框占底）。
+      'html[data-dsh-comfyui-fullscreen="1"] [data-composer-seat] {',
+      '  display: none !important;',
+      '}',
     ].join("\n");
     document.head.appendChild(splitStyle);
   }
@@ -1154,10 +1323,19 @@ var settingsScopeService = typeof ctx.get === "function" ? ctx.get("settingsScop
     registerSettingsNavIcon(settingsLabel);
   }
 
-  // 分屏入口（唯一）：会话标头右侧 utilities 槽（官方 0.1.2 原生插槽）。
-  // 不注册 conversation.view 条目——会话标签栏不再有 ComfyUI 标签，画布只在
-  // 分屏开启时出现（点本按钮 = 画布左 + 对话 rail 右）。布局完全由插件
-  // 覆盖层 + data-* 挤压实现。
+  // ComfyUI 独立标签（第一入口）：conversation.view 画布视图（全屏画布）。
+  ctx.slots.inject("conversation.view", function () {
+    return ctx.slots.register({
+      name: "conversation.view",
+      id: "comfyui-canvas-view",
+      order: 20,
+      label: function () { return "ComfyUI"; },
+      inject: function (sessionId) { return { sessionId: String(sessionId), scope: scope }; }
+    }, CanvasTab);
+  });
+
+  // 分屏入口（第二入口，2026-09-25 起与独立标签并存）：会话标头右侧 utilities 槽。
+  // 在「对话」标签内开分屏 = 画布左 + 主对话 rail 右（可折叠），与旧版行为一致。
   ctx.slots.inject("conversation.session.header.utilities", function () {
     return ctx.slots.register({
       name: "conversation.session.header.utilities",