bizydraft 0.2.72.dev20251013070955__py3-none-any.whl → 0.2.73.dev20251015100429__py3-none-any.whl

bizydraft/static/js/clipspaceToOss.js

@@ -12,6 +12,11 @@ function findOssUrl(filename) {
         || window.CLIPSPACE_TO_OSS_MAP[`${filename} [output]`];
 }
 
+// 去掉末尾的 " [input]" 或 " [output]" 后缀
+function stripTypeSuffix(value) {
+    if (!value || typeof value !== 'string') return value;
+    return value.replace(/\s\[(input|output)\]$/i, '');
+}
 // ═══════════════════════════════════════════════════════════════════════════
 // 工具函数：替换 clipspace URL 为 OSS URL
 // ═══════════════════════════════════════════════════════════════════════════
@@ -51,9 +56,6 @@ function replaceClipspaceUrl(urlString) {
         },
         set(value) {
             const modifiedValue = replaceClipspaceUrl(value);
-            if (modifiedValue !== value) {
-                console.log('[BizyDraft Image] Redirected:', value, '->', modifiedValue);
-            }
             originalSrcDescriptor.set.call(this, modifiedValue);
         },
         configurable: true
@@ -63,15 +65,10 @@ function replaceClipspaceUrl(urlString) {
     HTMLImageElement.prototype.setAttribute = function(name, value) {
         if (name === 'src') {
             const modifiedValue = replaceClipspaceUrl(value);
-            if (modifiedValue !== value) {
-                console.log('[BizyDraft setAttribute] Redirected to OSS');
-            }
             return originalSetAttribute.call(this, name, modifiedValue);
         }
         return originalSetAttribute.call(this, name, value);
     };
-
-    console.log('[BizyDraft] Image interceptor installed');
 })();
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -87,7 +84,6 @@ api.fetchApi = async function(url, options) {
     if (!isUploadApi || !response.ok) {
         return response;
     }
-
     try {
         const data = await response.clone().json();
 
@@ -95,9 +91,7 @@ api.fetchApi = async function(url, options) {
         const isOssUpload = data.subfolder?.includes('http://') || data.subfolder?.includes('https://')
                          || data.name?.startsWith('http://') || data.name?.startsWith('https://');
 
-        if (!isOssUpload) {
-            return response;
-        }
+        if (!isOssUpload) return response;
 
         // 构造完整的 OSS URL
         const ossUrl = data.subfolder?.includes('http')
@@ -114,9 +108,6 @@ api.fetchApi = async function(url, options) {
                 const idMatch = filename.match(/(\d+)/);
                 const baseId = idMatch?.[1];
 
-                console.log('[BizyDraft Upload]', url, '-', filename, `(${imageFile.size} bytes)`);
-                console.log('[BizyDraft Upload] Backend response:', data.name);
-
                 // 第一次 /upload/mask 的结果是涂改后的完整图片
                 if (baseId && url.includes('/upload/mask')) {
                     const firstMaskKey = `__FIRST_MASK_${baseId}__`;
@@ -130,20 +121,15 @@ api.fetchApi = async function(url, options) {
                          `clipspace-painted-${baseId}.png`, `clipspace-painted-masked-${baseId}.png`
                         ].forEach(v => window.CLIPSPACE_TO_OSS_MAP[v] = ossUrl);
 
-                        console.log('[BizyDraft Upload] ✅ First mask upload, saved to all variants');
                     } else {
                         // 后续 mask 上传，使用首次的 URL
                         finalUrl = window.CLIPSPACE_TO_OSS_MAP[firstMaskKey];
-                        console.log('[BizyDraft Upload] ⏭️  Later mask upload, using first URL');
                     }
                 } else if (baseId) {
                     // /upload/image 的上传，如果已有 mask 则使用 mask 的 URL
                     const firstMaskUrl = window.CLIPSPACE_TO_OSS_MAP[`__FIRST_MASK_${baseId}__`];
                     if (firstMaskUrl) {
                         finalUrl = firstMaskUrl;
-                        console.log('[BizyDraft Upload] 📎 Image upload, using first mask URL');
-                    } else {
-                        console.log('[BizyDraft Upload] ⏳ Image upload, awaiting mask');
                     }
                 }
 
@@ -157,18 +143,44 @@ api.fetchApi = async function(url, options) {
                     window.CLIPSPACE_TO_OSS_MAP[filenameWithoutSuffix] = finalUrl;
                 }
 
-                console.log('[BizyDraft Upload] 💾 Mapped:', filename, '->', finalUrl);
             }
         }
 
         // 同时保存后端返回的文件名映射
         window.CLIPSPACE_TO_OSS_MAP[data.name] = finalUrl;
 
+        // 🔧 修改 ComfyApp.clipspace，让它使用 OSS URL 而不是 clipspace 路径
+        if (window.app?.constructor?.clipspace) {
+            const clipspace = window.app.constructor.clipspace;
+
+            // 修改 clipspace.images
+            if (clipspace.images && clipspace.images.length > 0) {
+                const clipImage = clipspace.images[clipspace.selectedIndex || 0];
+                if (clipImage && clipImage.subfolder === 'clipspace') {
+                    clipspace.images[clipspace.selectedIndex || 0] = {
+                        filename: finalUrl,
+                        subfolder: ''
+                    };
+                }
+            }
+
+            // 修改 clipspace.widgets
+            if (clipspace.widgets) {
+                const imageWidgetIndex = clipspace.widgets.findIndex(w => w.name === 'image');
+                if (imageWidgetIndex >= 0) {
+                    const widgetValue = clipspace.widgets[imageWidgetIndex].value;
+                    if (widgetValue && typeof widgetValue === 'object' && widgetValue.subfolder === 'clipspace') {
+                        clipspace.widgets[imageWidgetIndex].value = {
+                            filename: finalUrl,
+                            subfolder: ''
+                        };
+                    }
+                }
+            }
+        }
+
         // 篡改响应，让 ComfyUI 使用完整的 OSS URL
         const modifiedData = { ...data, name: finalUrl, subfolder: '' };
-        console.log('[BizyDraft Upload] ✅ Response modified');
-        console.log('═══════════════════════════════════════════════════════\n');
-
         return new Response(JSON.stringify(modifiedData), {
             status: response.status,
             statusText: response.statusText,
@@ -176,7 +188,7 @@ api.fetchApi = async function(url, options) {
         });
 
     } catch (e) {
-        console.error('[BizyDraft Upload] ❌ Error:', e);
+        console.error('[BizyDraft Upload] Error:', e);
         return response;
     }
 };
@@ -187,8 +199,6 @@ function convertClipspacePathsInPrompt(prompt) {
         return prompt;
     }
 
-    let conversionsCount = 0;
-
     for (const [nodeId, node] of Object.entries(prompt)) {
         if (!node?.inputs) continue;
 
@@ -200,27 +210,62 @@ function convertClipspacePathsInPrompt(prompt) {
                     const ossUrl = findOssUrl(filename);
 
                     if (ossUrl) {
-                        console.log('[BizyDraft Prompt] Converting:', inputValue, '->', ossUrl);
                         node.inputs[inputKey] = ossUrl;
 
                         if (inputKey === 'image' && node.inputs['image_name']) {
                             node.inputs['image_name'] = ossUrl.split('/').pop();
                         }
-
-                        conversionsCount++;
                     }
                 }
             }
         }
     }
 
-    if (conversionsCount > 0) {
-        console.log(`[BizyDraft Prompt] Converted ${conversionsCount} path(s)`);
-    }
-
     return prompt;
 }
 
+// ═══════════════════════════════════════════════════════════════════════════
+// 拦截 pasteFromClipspace，确保 widget.value 使用 OSS URL
+// ═══════════════════════════════════════════════════════════════════════════
+function interceptPasteFromClipspace() {
+    const ComfyApp = window.app?.constructor;
+    if (!ComfyApp || !ComfyApp.pasteFromClipspace) return;
+
+    const originalPasteFromClipspace = ComfyApp.pasteFromClipspace;
+    ComfyApp.pasteFromClipspace = function(node) {
+        // 调用原始函数
+        originalPasteFromClipspace.call(this, node);
+
+        // 修正 widget.value
+        if (node.widgets) {
+            const imageWidget = node.widgets.find(w => w.name === 'image');
+            if (imageWidget && typeof imageWidget.value === 'string') {
+                const value = imageWidget.value;
+
+                // 1) 如果是 clipspace 路径格式，替换为 OSS URL
+                if (value.includes('clipspace/')) {
+                    // 提取文件名
+                    const match = value.match(/clipspace\/([\w-]+\.(?:png|jpg|jpeg|webp|gif))(\s\[(input|output)\])?/i);
+                    if (match) {
+                        const filename = match[1];
+                        const ossUrl = findOssUrl(filename);
+
+                        if (ossUrl) {
+                            imageWidget.value = ossUrl;
+                        }
+                    }
+                }
+                // 2) 如果是 "https://... [input]" 这样的字符串，移除后缀
+                else if (/https?:\/\/.*\.(png|jpg|jpeg|webp|gif)\s\[(input|output)\]$/i.test(value)) {
+                    const cleaned = stripTypeSuffix(value);
+                    if (cleaned !== value) {
+                        imageWidget.value = cleaned;
+                    }
+                }
+            }
+        }
+    };
+}
 // 注册 ComfyUI 扩展
 app.registerExtension({
     name: "bizyair.clipspace.to.oss",
@@ -228,16 +273,44 @@ app.registerExtension({
     async setup() {
         const originalGraphToPrompt = app.graphToPrompt;
 
+        // 在构建 Prompt 之前，先清理所有 widget 的值，去掉多余的后缀
+        function sanitizeGraphWidgets(graph) {
+            const nodes = graph?._nodes || [];
+            for (const node of nodes) {
+                if (!node?.widgets) continue;
+                for (const widget of node.widgets) {
+                    if (typeof widget?.value === 'string') {
+                        widget.value = stripTypeSuffix(widget.value);
+                    }
+                }
+            }
+        }
+
         app.graphToPrompt = async function(...args) {
+            // 预清理，避免 workflow.widgets_values 和 prompt 输入里包含 [input]/[output]
+            try { sanitizeGraphWidgets(app.graph); } catch (e) {}
+
             const result = await originalGraphToPrompt.apply(this, args);
 
             if (result?.output) {
-                result.output = convertClipspacePathsInPrompt(result.output);
+                // 二次清理并转换 clipspace
+                const cleaned = convertClipspacePathsInPrompt(result.output);
+                // 额外移除任何字符串输入中的类型后缀
+                for (const nodeId of Object.keys(cleaned || {})) {
+                    const node = cleaned[nodeId];
+                    if (!node?.inputs) continue;
+                    for (const key of Object.keys(node.inputs)) {
+                        const v = node.inputs[key];
+                        node.inputs[key] = typeof v === 'string' ? stripTypeSuffix(v) : v;
+                    }
+                }
+                result.output = cleaned;
             }
 
             return result;
         };
 
-        console.log('[BizyDraft] Extension registered');
+        // 拦截 pasteFromClipspace
+        interceptPasteFromClipspace();
     }
 });

bizydraft/static/js/disableComfyWebSocket.js

@@ -0,0 +1,37 @@
+// 保存原始的 WebSocket 构造函数
+const OriginalWebSocket = window.WebSocket;
+
+class FakeWebSocket {
+  constructor(url) {
+    this.url = url;
+    this.readyState = WebSocket.CONNECTING;  // 核心：保持 CONNECTING 状态
+    console.warn('[BizyDraft] 已阻止 WebSocket 连接:', url);
+  }
+  send() {}
+  close() {}
+  addEventListener() {}
+  removeEventListener() {}
+}
+
+window.WebSocket = function(url, protocols) {
+  //精确拦截/ws请求
+  if (typeof url === 'string' && /^wss?:\/\/[^/]+\/ws(\?.*)?$/.test(url)) {
+    return new FakeWebSocket(url);
+  }
+  // 其他连接正常创建，不影响
+  return new OriginalWebSocket(url, protocols);
+};
+
+// 保留 WebSocket 的静态属性和原型
+Object.setPrototypeOf(window.WebSocket, OriginalWebSocket);
+window.WebSocket.prototype = OriginalWebSocket.prototype;
+
+// 复制静态常量（使用 defineProperty 避免只读属性错误）
+['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'].forEach(prop => {
+  Object.defineProperty(window.WebSocket, prop, {
+    value: OriginalWebSocket[prop],
+    writable: false,
+    enumerable: true,
+    configurable: true
+  });
+});

bizydraft/static/js/main.js

@@ -1,4 +1,5 @@
 // 主入口文件，导入所有模块
+import "./disableComfyWebSocket.js";
 import "./hookLoadImage.js";
 import "./postEvent.js";
 import "./handleStyle.js";

{bizydraft-0.2.72.dev20251013070955.dist-info → bizydraft-0.2.73.dev20251015100429.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.72.dev20251013070955
+Version: 0.2.73.dev20251015100429
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.72.dev20251013070955.dist-info → bizydraft-0.2.73.dev20251015100429.dist-info}/RECORD

@@ -11,12 +11,13 @@ bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
 bizydraft/server.py,sha256=L2zoJgOisr65IRphOyko74AdsLel59gh55peyMaUrO8,2102
 bizydraft/workflow_io.py,sha256=MYhJbpgkv8hrA5k_aolijOTrWpTtu62nzRznA4hv8JE,4298
 bizydraft/static/js/aiAppHandler.js,sha256=OQRhhoqvc8iZeCvHTtdaD2VTYBGzkeAGdCk1UMO2RZs,17525
-bizydraft/static/js/clipspaceToOss.js,sha256=QEd14hbp-gvsK4EszThcVbsqmUeXt0hcxdfoQyZUpDg,10902
+bizydraft/static/js/clipspaceToOss.js,sha256=brfEPs71Tky5Dnc47UXNEFeFlESDE3kQvUH8ducpIew,14265
+bizydraft/static/js/disableComfyWebSocket.js,sha256=nL6DjLUdC2FlAqfYPaFW-dAtkamv01c461W0DUupIKk,1124
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=liIzTu-wnV172g58gHWGLYTfd86xpJxL4A-HuHpFnq4,3616
 bizydraft/static/js/hookLoadImage.js,sha256=aFRWkgJW-Cp-YHjZh-3j-vsVcNaDZpBVoQqcFZ2Po0g,8186
 bizydraft/static/js/hookLoadModel.js,sha256=GIvew1mDcJhgyyaJif0tFGNdFQo_LzlTQfBZQ2lg2Tw,17032
-bizydraft/static/js/main.js,sha256=7ijEPNQu9WtZZFQVrxby-ThG3ZJQ53feEiPrQTXrZns,151
+bizydraft/static/js/main.js,sha256=PRe4LdsquEQWrZDnVd4ubpVQuD1eDIedAXFFazKdoKQ,188
 bizydraft/static/js/nodeFocusHandler.js,sha256=24xXbS4Q-GjJdRqf11i-1pBo8MkOJ24F7MHFV44EG6Q,4683
 bizydraft/static/js/nodeParamsFilter.js,sha256=H7lBB0G8HNqoGhOCH1hNXqPU-rPlrFyTxg_f_JgLEMk,4168
 bizydraft/static/js/postEvent.js,sha256=dnstkIU_898KvVka1wP8d1TJDLlAphDYghgpQpkTmLM,39864
@@ -24,7 +25,7 @@ bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE
 bizydraft/static/js/tool.js,sha256=VupamUuh7tYiDnBTrL5Z_yLmhJinskhzRXwE3zfsKZM,2901
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
 bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
-bizydraft-0.2.72.dev20251013070955.dist-info/METADATA,sha256=KIlZZuVsJrep6mJiYaeN-WJEtOFpDK6x5-lH-wF61XQ,180
-bizydraft-0.2.72.dev20251013070955.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.72.dev20251013070955.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.72.dev20251013070955.dist-info/RECORD,,
+bizydraft-0.2.73.dev20251015100429.dist-info/METADATA,sha256=VQh_RS2B5UguQtmdCPuD0np5AG4PFB5B8WMYLvuxPOo,180
+bizydraft-0.2.73.dev20251015100429.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.73.dev20251015100429.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.73.dev20251015100429.dist-info/RECORD,,