bizydraft 0.2.78.dev20251029061927__py3-none-any.whl → 0.2.78.dev20251030100819__py3-none-any.whl

bizydraft/static/js/hookLoad/media.js

@@ -5,7 +5,7 @@ import { fetchMediaConfig } from './configLoader.js'
 let mediaConfigCache = null;
 let mediaConfigLoadPromise = null;
 
-const mediaNodeList = [
+export const mediaNodeList = [
     'LoadImage',
     'LoadImageMask',
     'LoadAudio',
@@ -24,7 +24,7 @@ export const possibleMediaWidgetNames = [
 ];
 
 // 获取媒体配置的API函数（使用共享配置加载器）
-async function fetchMediaConfigWithCache() {
+export async function fetchMediaConfigWithCache() {
     if (mediaConfigCache) return mediaConfigCache;
     if (mediaConfigLoadPromise) return mediaConfigLoadPromise;
 
@@ -70,7 +70,6 @@ export async function computeIsMediaNode(nodeName) {
 
     // 2. 检查media_load_nodes的keys
     const config = await fetchMediaConfigWithCache();
-    console.log('config', config);
     if (config) {
         if (config.hasOwnProperty(nodeName)) {
             return true;

bizydraft/static/js/{hookLoadImage.js → hookLoadMedia.js}

@@ -1,6 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { getCookie, computeExt, hideWidget } from './tool.js';
-import { getMediaNodeConfig, getMediaInputKeys, possibleMediaWidgetNames, computeIsMediaNode } from './hookLoad/media.js';
+import { getMediaNodeConfig, getMediaInputKeys, possibleMediaWidgetNames, computeIsMediaNode, mediaNodeList, fetchMediaConfigWithCache } from './hookLoad/media.js';
 
 
 
@@ -141,7 +141,6 @@ app.registerExtension({
                             const existingDescriptor = Object.getOwnPropertyDescriptor(va_widget, 'value');
                             if (existingDescriptor && !existingDescriptor.configurable) {
                                 // 如果不可配置，跳过重新定义
-                                console.warn(`Cannot redefine property 'value' on widget ${va_widget.name}`);
                                 return;
                             }
 
@@ -287,12 +286,23 @@ app.registerExtension({
                 await getData()
 
 
-                function applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, currentNodeId) {
+                async function applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, currentNodeId) {
                     if (workflowParams && workflowParams.nodes) {
-                        // 根据当前节点ID查找对应的节点数据，而不是总是选择第一个
-                        const imageNode = workflowParams.nodes.find(async item =>
-                            await computeIsMediaNode(item.type) && item.id === currentNodeId
+                        // 先获取配置，然后将 mediaNodeList 和配置的 keys 合并
+                        const config = await fetchMediaConfigWithCache();
+                        const allMediaNodeTypes = new Set(mediaNodeList);
+                        if (config) {
+                            // 将配置中的 keys 添加到集合中
+                            for (const key of Object.keys(config)) {
+                                allMediaNodeTypes.add(key);
+                            }
+                        }
+
+                        // 使用同步的 includes 查找匹配的节点（完全避免循环中的异步）
+                        const imageNode = workflowParams.nodes.find(item =>
+                            item.id === currentNodeId && allMediaNodeTypes.has(item.type)
                         )
+
                         if (imageNode && imageNode.widgets_values && imageNode.widgets_values[0]) {
                             const item = imageNode.widgets_values[0].split('/')
                             image_list.push({
@@ -310,12 +320,12 @@ app.registerExtension({
 
                 // 如果有存储的工作流数据，应用图像设置
                 if (window.currentWorkflowData) {
-                    applyWorkflowImageSettings(window.currentWorkflowData, image_list, media_widget, image_name_widget, this.id);
+                    await applyWorkflowImageSettings(window.currentWorkflowData, image_list, media_widget, image_name_widget, this.id);
                     // 清除存储的数据，避免重复处理
                     delete window.currentWorkflowData;
                 } else {
                     // 原有的调用
-                    applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, this.id);
+                    await applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, this.id);
                 }
                 //在这里发个postmessage
                 window.parent.postMessage({

bizydraft/static/js/hookLoadModel.js

@@ -28,10 +28,10 @@ app.registerExtension({
         }, 100)
 
         // 异步获取节点配置
-        const nodeConfig = await getNodeConfig(nodeData.name);
-        if (nodeConfig) {
-            const onNodeCreated = nodeType.prototype.onNodeCreated;
-            nodeType.prototype.onNodeCreated = function() {
+        const onNodeCreated = nodeType.prototype.onNodeCreated;
+        nodeType.prototype.onNodeCreated = async function() {
+            const nodeConfig = await getNodeConfig(nodeData.name);
+            if (nodeConfig) {
                 try {
                     const inputs = nodeConfig.config.inputs;
                     const inputKeys = Object.keys(inputs);

bizydraft/static/js/main.js

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

{bizydraft-0.2.78.dev20251029061927.dist-info → bizydraft-0.2.78.dev20251030100819.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.78.dev20251029061927
+Version: 0.2.78.dev20251030100819
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.78.dev20251029061927.dist-info → bizydraft-0.2.78.dev20251030100819.dist-info}/RECORD

@@ -15,9 +15,9 @@ bizydraft/static/js/clipspaceToOss.js,sha256=brfEPs71Tky5Dnc47UXNEFeFlESDE3kQvUH
 bizydraft/static/js/disableComfyWebSocket.js,sha256=ZDOVlU3v3EvWpMRkD8s_AnO43vuWojVLLjkF2pNEVrA,1957
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=YvafKzypgXH8nD-7Fwwf_lXUSU80OWk7D4Emqj-PV88,3700
-bizydraft/static/js/hookLoadImage.js,sha256=R1HUNn-kml-e_NczEH2egVerydhHDoTNCNePN9yC-Tk,17244
-bizydraft/static/js/hookLoadModel.js,sha256=TWVmfKp45ta-nE6U5rY3Bv9wiaEBp0QMNt2xaQ3fs9g,6720
-bizydraft/static/js/main.js,sha256=PRe4LdsquEQWrZDnVd4ubpVQuD1eDIedAXFFazKdoKQ,188
+bizydraft/static/js/hookLoadMedia.js,sha256=JYKKqapidi6PUIyRhyPhdGNqQW90nnLANk6qnvojIlU,17725
+bizydraft/static/js/hookLoadModel.js,sha256=VeDjnL67ncMvQTAh7WmdchzB_bTbj6dqlDR83wXUDN4,6726
+bizydraft/static/js/main.js,sha256=-pMeAG8vkKO6yq9zXCeHI78KezGn0r9AhYm65DuZrVI,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=_EyA71m5DwGbhHsuf1amKhpLUBxfBWZaMMxViNhuYzU,43481
@@ -26,9 +26,9 @@ bizydraft/static/js/tool.js,sha256=2Hhv2J18OaFZRWmHIlseahjd5Ot7ZVxUPb5z46YeXIo,2
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
 bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
 bizydraft/static/js/hookLoad/configLoader.js,sha256=R1k0GKdEmv4IIxdT2F-oOI9X9I19ECe77P_1tO3XxgY,2525
-bizydraft/static/js/hookLoad/media.js,sha256=uL31qpH_Rv1oOieUQO3bMHqHEXCQ7o11Id5U43td6io,2460
+bizydraft/static/js/hookLoad/media.js,sha256=_JhQhXmNiwfCEBtrQLrsIhEzdjL_mdY-9s5bXXjzB7Y,2439
 bizydraft/static/js/hookLoad/model.js,sha256=aHvEPt9k3CcrawHSYnQYcvbtTRwIztk-XDRA3lvgXvA,9890
-bizydraft-0.2.78.dev20251029061927.dist-info/METADATA,sha256=hf6fs-Oqq0ElZJIf8nCkJgly_Hkd315X1_h028psf8Y,180
-bizydraft-0.2.78.dev20251029061927.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.78.dev20251029061927.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.78.dev20251029061927.dist-info/RECORD,,
+bizydraft-0.2.78.dev20251030100819.dist-info/METADATA,sha256=pe11bzcezv005LAhUDOgsK0C8MWfi8Oxrz9DUKJf494,180
+bizydraft-0.2.78.dev20251030100819.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.78.dev20251030100819.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.78.dev20251030100819.dist-info/RECORD,,