bizydraft 0.2.76.dev20251027100756__py3-none-any.whl → 0.2.77__py3-none-any.whl

bizydraft/static/js/postEvent.js

@@ -21,77 +21,47 @@ app.registerExtension({
     pingTimeoutTimer: null, // ping超时计时器
 
     /**
-     * 为特定socket开始心跳检测（每个socket独立的心跳）
+     * 开始心跳检测
      */
-    startPingForSocket(socket) {
-        if (!socket || socket.readyState !== WebSocket.OPEN) {
+    startPing() {
+        this.stopPing();
+
+        if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
             return;
         }
 
-        // 在socket对象上存储心跳状态
-        socket.pongReceived = false;
         // 立即发送一次ping消息
-        socket.send('ping');
+        this.pongReceived = false;
+        this.socket.send('ping');
 
         // 设置ping超时检测
-        socket.pingTimeoutTimer = setTimeout(() => {
-            if (!socket.pongReceived && socket.readyState === WebSocket.OPEN) {
-                console.log('心跳检测超时，关闭此连接');
-                this.stopPingForSocket(socket);
-                socket.close();
+        this.pingTimeoutTimer = setTimeout(() => {
+            if (!this.pongReceived) {
+                this.stopPing();
+                this.reconnect();
             }
         }, this.pingTimeout);
 
         // 设置定时发送ping
-        socket.pingTimer = setInterval(() => {
-            if (socket.readyState === WebSocket.OPEN) {
-                socket.pongReceived = false;
-                socket.send('ping');
+        this.pingTimer = setInterval(() => {
+            if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+                this.pongReceived = false;
+                this.socket.send('ping');
                 // 设置ping超时检测
-                socket.pingTimeoutTimer = setTimeout(() => {
+                this.pingTimeoutTimer = setTimeout(() => {
                     // 如果没有收到pong响应
-                    if (!socket.pongReceived) {
-                        console.log('心跳检测超时，关闭此连接');
-                        this.stopPingForSocket(socket);
-                        socket.close();
+                    if (!this.pongReceived) {
+                        console.log('心跳检测超时，重新连接WebSocket');
+                        this.stopPing();
+                        this.reconnect();
                     }
                 }, this.pingTimeout);
             } else {
-                this.stopPingForSocket(socket);
+                this.stopPing();
             }
         }, this.pingInterval);
     },
 
-    /**
-     * 停止特定socket的心跳检测
-     */
-    stopPingForSocket(socket) {
-        if (!socket) return;
-
-        if (socket.pingTimer) {
-            clearInterval(socket.pingTimer);
-            socket.pingTimer = null;
-        }
-
-        if (socket.pingTimeoutTimer) {
-            clearTimeout(socket.pingTimeoutTimer);
-            socket.pingTimeoutTimer = null;
-        }
-    },
-
-    /**
-     * 开始心跳检测（保留向后兼容）
-     */
-    startPing() {
-        this.stopPing();
-
-        if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
-            return;
-        }
-        // 使用新的socket专用心跳方法
-        this.startPingForSocket(this.socket);
-    },
-
     /**
      * 停止心跳检测
      */
@@ -132,6 +102,8 @@ app.registerExtension({
         // 标记为连接中
         this.isConnecting = true;
 
+        // 先关闭现有连接
+        this.closeSocket();
 
         const url = customUrl || app.api.socket.url;
         console.log('创建WebSocket连接:', url);
@@ -145,32 +117,20 @@ app.registerExtension({
                 console.log('WebSocket连接已打开');
                 // 清除连接中标志
                 self.isConnecting = false;
-                // 存储为单例（最新的连接）
+                // 存储为单例
                 self.socket = socket;
                 // 替换app.api.socket
                 app.api.socket = socket;
-                // 为这个socket启动独立的心跳检测
-                self.startPingForSocket(socket);
+                // 开始心跳检测
+                self.startPing();
             };
 
             socket.onmessage = function (event) {
                 try {
-                    // 从 WebSocket URL 中提取 taskId
-                    let taskIdFromUrl = null;
-                    try {
-                        const urlParams = new URLSearchParams(socket.url.split('?')[1]);
-                        taskIdFromUrl = urlParams.get('taskId');
-                        if (taskIdFromUrl) {
-                            taskIdFromUrl = parseInt(taskIdFromUrl, 10);
-                        }
-                        console.log('taskIdFromUrl:', taskIdFromUrl);
-                    } catch (e) {
-                        console.warn('无法从 WebSocket URL 中提取 taskId:', e);
-                    }
                     // 处理心跳响应
                     if (event.data === 'pong') {
-                        // 标记此socket收到pong响应
-                        socket.pongReceived = true;
+                        // 标记收到pong响应
+                        self.pongReceived = true;
                         return;
                     }
                     if (event.data instanceof ArrayBuffer) {
@@ -242,40 +202,26 @@ app.registerExtension({
                     if (event.data === '[DONE]') {
                         console.log('收到[DONE]消息，任务已完成，停止心跳并关闭连接');
                         self.taskRunning = false;
-                        self.stopPingForSocket(socket);
-                        if (socket.readyState === WebSocket.OPEN) {
-                            socket.close(1000);
-                        }
+                        self.stopPing();
+                        self.closeSocket(1000);
                         return;
                     }
                       const msg = JSON.parse(event.data)
-                        // 发送进度信息，添加从 URL 中提取的 taskId
-                        if (msg.progress_info) {
-                            const progressData = { ...msg.progress_info };
-                            if (taskIdFromUrl && !progressData.task_id) {
-                                progressData.task_id = taskIdFromUrl;
-                            }
-                            window.parent.postMessage({
-                                type: 'functionResult',
-                                method: 'progress_info_change',
-                                result: progressData
-                            }, '*');
-                        }
+                        window.parent.postMessage({
+                            type: 'functionResult',
+                            method: 'progress_info_change',
+                            result: msg.progress_info
+                        }, '*');
 
                       switch (msg.type) {
                         case 'load_start':
                         case 'load_end':
                         case 'prompt_id':
-                          // 发送准备状态信息，添加从 URL 中提取的 taskId
-                          const preparingData = { ...msg };
-                          if (taskIdFromUrl) {
-                            preparingData.task_id = taskIdFromUrl;
-                            console.log(`🔗 [WebSocket] 添加 task_id=${taskIdFromUrl} 到 ${msg.type} 消息`);
-                          }
+                          // 发送准备状态信息
                           window.parent.postMessage({
                             type: 'functionResult',
                             method: 'preparingStatus',
-                            result: preparingData
+                            result: msg
                           }, '*')
                           break
                         case 'status':
@@ -344,20 +290,20 @@ app.registerExtension({
                 console.log('WebSocket 错误:', error);
                 // 清除连接中标志
                 self.isConnecting = false;
-                // 停止此socket的心跳检测
-                self.stopPingForSocket(socket);
+                // 停止心跳
+                self.stopPing();
             };
 
             socket.onclose = function(event) {
                 console.log('WebSocket 连接已关闭, 状态码:', event.code, event.reason);
                 // 清除连接中标志
                 self.isConnecting = false;
-                // 停止此socket的心跳检测
-                self.stopPingForSocket(socket);
-                // 清理单例引用（如果这是当前活跃的socket）
+                // 清理单例引用
                 if (self.socket === socket) {
                     self.socket = null;
                 }
+                // 停止心跳
+                self.stopPing();
             };
 
             socket.registeredTypes = new Set();

{bizydraft-0.2.76.dev20251027100756.dist-info → bizydraft-0.2.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.76.dev20251027100756
+Version: 0.2.77
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.76.dev20251027100756.dist-info → bizydraft-0.2.77.dist-info}/RECORD

@@ -20,14 +20,14 @@ bizydraft/static/js/hookLoadModel.js,sha256=TWVmfKp45ta-nE6U5rY3Bv9wiaEBp0QMNt2x
 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=o9yA3d3fuIHG7KBXI8GbZA4iGGWaPsw6Ec6N1xB4QsA,42427
+bizydraft/static/js/postEvent.js,sha256=dnstkIU_898KvVka1wP8d1TJDLlAphDYghgpQpkTmLM,39864
 bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE,2432
 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/static/js/hookLoad/media.js,sha256=5I34YUKBzxOhNQqdIvQrzaNhJcSpEUadAeDC8HsJ2Z4,2614
 bizydraft/static/js/hookLoad/model.js,sha256=JNFwnkiEQi_g1JauhjvA6V1XfXr3D5CuRodI4p_B0Ts,10570
-bizydraft-0.2.76.dev20251027100756.dist-info/METADATA,sha256=ddd2ywM1bCzBQuPyRQ8tA_QU-QOieBQYILLSQO6ZGeo,180
-bizydraft-0.2.76.dev20251027100756.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.76.dev20251027100756.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.76.dev20251027100756.dist-info/RECORD,,
+bizydraft-0.2.77.dist-info/METADATA,sha256=cSYdudyvrhRy3YH90u_Sk2LM8VCUHvSvrjTO2jAcBUA,162
+bizydraft-0.2.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.77.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.77.dist-info/RECORD,,