node-red-contrib-symi-mesh 1.6.5 → 1.6.7

package/examples/knx-sync-example.json

@@ -2,12 +2,12 @@
     {
         "id": "knx_sync_flow",
         "type": "tab",
-        "label": "Symi Mesh ↔ KNX 双向同步",
+        "label": "Symi Mesh - KNX Sync",
         "disabled": false,
-        "info": "展示Symi Mesh设备与KNX系统的完整双向同步，包括开关、调光灯、窗帘、温控器等所有设备类型"
+        "info": "Mesh设备与KNX系统双向同步示例"
     },
     {
-        "id": "symi_gateway",
+        "id": "symi_gateway_knx",
         "type": "symi-gateway",
         "name": "Symi网关",
         "connectionType": "tcp",
@@ -17,449 +17,87 @@
         "baudRate": "115200"
     },
     {
-        "id": "knx_gateway",
+        "id": "knx_gateway_config",
         "type": "knxUltimate-config",
         "host": "192.168.1.50",
         "port": "3671",
         "physAddr": "15.15.22",
         "hostProtocol": "TunnelUDP",
-        "suppress_ack_ldatareq": false,
         "loglevel": "error",
-        "name": "KNX网关",
-        "localEchoInTunneling": true,
-        "KNXEthInterface": "Auto",
-        "KNXEthInterfaceManuallyInput": ""
+        "name": "KNX Gateway",
+        "delaybetweentelegrams": 25,
+        "autoReconnect": "yes"
     },
     {
-        "id": "comment_switch_sync",
-        "type": "comment",
-        "z": "knx_sync_flow",
-        "name": "开关双向同步 (Symi ↔ KNX)",
-        "info": "Symi开关与KNX开关执行器双向同步",
-        "x": 150,
-        "y": 60,
-        "wires": []
-    },
-    {
-        "id": "symi_switch",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "三路开关",
-        "gateway": "symi_gateway",
-        "deviceMac": "14:27:c9:20:da:cc",
-        "outputFormat": "full",
-        "x": 130,
-        "y": 120,
-        "wires": [["switch_to_knx"]]
-    },
-    {
-        "id": "switch_to_knx",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "Symi→KNX转换",
-        "func": "// Symi开关状态转换为KNX格式\nconst channel = msg.channel || 1;\nconst value = msg.payload ? 1 : 0;\n\n// 根据通道设置KNX组地址\nconst gaMap = {\n    1: '1/1/1',\n    2: '1/1/2',\n    3: '1/1/3'\n};\n\nreturn {\n    payload: value,\n    destination: gaMap[channel]\n};",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 330,
-        "y": 120,
-        "wires": [["knx_out_switch"]]
-    },
-    {
-        "id": "knx_out_switch",
-        "type": "knxUltimate-out",
+        "id": "knx_input_node",
+        "type": "knxUltimate",
         "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX开关输出",
+        "server": "knx_gateway_config",
         "topic": "",
         "dpt": "1.001",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": false,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
+        "name": "KNX Input",
         "outputtype": "write",
-        "outputRBE": true,
-        "inputRBE": true,
-        "x": 560,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "knx_in_switch",
-        "type": "knxUltimate-in",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX开关输入",
-        "topic": "1/1/1",
-        "dpt": "1.001",
-        "initialread": false,
+        "outputRBE": "false",
+        "inputRBE": "false",
         "notifyreadrequest": false,
         "notifyresponse": true,
         "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "x": 140,
-        "y": 180,
-        "wires": [["knx_to_switch"]]
-    },
-    {
-        "id": "knx_to_switch",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "KNX→Symi转换",
-        "func": "// KNX状态转换为Symi格式\n// 根据组地址确定通道\nconst gaChannelMap = {\n    '1/1/1': 1,\n    '1/1/2': 2,\n    '1/1/3': 3\n};\n\nconst channel = gaChannelMap[msg.destination] || 1;\n\nreturn {\n    payload: msg.payload === 1,\n    channel: channel,\n    deviceMac: '14:27:c9:20:da:cc'\n};",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 330,
-        "y": 180,
-        "wires": [["symi_switch_control"]]
-    },
-    {
-        "id": "symi_switch_control",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "控制Symi开关",
-        "gateway": "symi_gateway",
-        "deviceMac": "",
-        "outputFormat": "full",
-        "x": 560,
-        "y": 180,
-        "wires": []
-    },
-    {
-        "id": "comment_light_sync",
-        "type": "comment",
-        "z": "knx_sync_flow",
-        "name": "调光灯双向同步 (Symi ↔ KNX)",
-        "info": "Symi调光灯与KNX调光执行器双向同步",
-        "x": 160,
-        "y": 260,
-        "wires": []
-    },
-    {
-        "id": "symi_light",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "双色调光灯",
-        "gateway": "symi_gateway",
-        "deviceMac": "e4:53:4c:93:46:84",
-        "outputFormat": "full",
-        "x": 140,
-        "y": 320,
-        "wires": [["light_to_knx"]]
-    },
-    {
-        "id": "light_to_knx",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "Symi灯光→KNX",
-        "func": "// Symi灯光状态转换为KNX DPT 1(开关) + DPT 5(亮度)\nconst msgs = [];\n\n// 开关状态\nif (msg.payload.switch !== undefined) {\n    msgs.push({\n        payload: msg.payload.switch ? 1 : 0,\n        destination: '2/1/1',  // KNX开关组地址\n        dpt: '1.001'\n    });\n}\n\n// 亮度\nif (msg.payload.brightness !== undefined) {\n    msgs.push({\n        payload: Math.round(msg.payload.brightness * 255 / 100),\n        destination: '2/1/2',  // KNX亮度组地址\n        dpt: '5.001'\n    });\n}\n\n// 色温(可选)\nif (msg.payload.colorTemp !== undefined) {\n    msgs.push({\n        payload: msg.payload.colorTemp,\n        destination: '2/1/3',  // KNX色温组地址\n        dpt: '5.001'\n    });\n}\n\nreturn [msgs];",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 340,
-        "y": 320,
-        "wires": [["knx_out_light"]]
-    },
-    {
-        "id": "knx_out_light",
-        "type": "knxUltimate-out",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX调光输出",
-        "topic": "",
-        "dpt": "1.001",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": false,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "outputtype": "write",
-        "outputRBE": true,
-        "inputRBE": true,
-        "x": 560,
-        "y": 320,
-        "wires": []
-    },
-    {
-        "id": "knx_in_light_switch",
-        "type": "knxUltimate-in",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX灯光开关",
-        "topic": "2/1/1",
-        "dpt": "1.001",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": true,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
+        "listenallga": true,
         "x": 150,
-        "y": 380,
-        "wires": [["knx_light_to_symi"]]
+        "y": 100,
+        "wires": [["knx_bridge_node"]]
     },
     {
-        "id": "knx_in_light_brightness",
-        "type": "knxUltimate-in",
+        "id": "knx_bridge_node",
+        "type": "symi-knx-bridge",
         "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX亮度",
-        "topic": "2/1/2",
-        "dpt": "5.001",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": true,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "x": 130,
-        "y": 420,
-        "wires": [["knx_light_to_symi"]]
+        "name": "KNX Bridge",
+        "gateway": "symi_gateway_knx",
+        "mappings": "[]",
+        "knxEntities": "[]",
+        "x": 350,
+        "y": 100,
+        "wires": [["knx_output_node"], ["debug_node"]]
     },
     {
-        "id": "knx_light_to_symi",
-        "type": "function",
+        "id": "knx_output_node",
+        "type": "knxUltimate",
         "z": "knx_sync_flow",
-        "name": "KNX→Symi灯光",
-        "func": "// KNX状态转换为Symi MQTT格式\nconst mac = 'e4534c934684';  // 双色调光灯MAC(无冒号)\n\n// 根据DPT类型处理\nif (msg.dpt === '1.001') {\n    // 开关控制\n    return {\n        topic: `symi_mesh/${mac}/light/set`,\n        payload: JSON.stringify({\n            state: msg.payload === 1 ? 'ON' : 'OFF'\n        })\n    };\n} else if (msg.dpt === '5.001') {\n    // 亮度控制\n    return {\n        topic: `symi_mesh/${mac}/light/set`,\n        payload: JSON.stringify({\n            brightness: msg.payload  // 0-255\n        })\n    };\n}\n\nreturn null;",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 340,
-        "y": 400,
-        "wires": [["mqtt_publish"]]
-    },
-    {
-        "id": "comment_cover_sync",
-        "type": "comment",
-        "z": "knx_sync_flow",
-        "name": "窗帘双向同步 (Symi ↔ KNX)",
-        "info": "Symi窗帘与KNX窗帘执行器双向同步",
-        "x": 150,
-        "y": 480,
-        "wires": []
-    },
-    {
-        "id": "symi_cover",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "智能窗帘",
-        "gateway": "symi_gateway",
-        "deviceMac": "d4:86:c0:81:d8:14",
-        "outputFormat": "full",
-        "x": 130,
-        "y": 540,
-        "wires": [["cover_to_knx"]]
-    },
-    {
-        "id": "cover_to_knx",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "Symi窗帘→KNX",
-        "func": "// Symi窗帘状态转换为KNX DPT 1(上下) + DPT 5(位置)\nconst msgs = [];\n\n// 运行状态转换\nif (msg.payload.curtainStatus !== undefined) {\n    const status = msg.payload.curtainStatus;\n    // 1=opening, 2=closing, 0/3=stopped\n    if (status === 1) {\n        msgs.push({\n            payload: 1,  // 上\n            destination: '3/1/1',\n            dpt: '1.008'\n        });\n    } else if (status === 2) {\n        msgs.push({\n            payload: 0,  // 下\n            destination: '3/1/1',\n            dpt: '1.008'\n        });\n    }\n}\n\n// 位置\nif (msg.payload.curtainPosition !== undefined) {\n    msgs.push({\n        payload: Math.round(msg.payload.curtainPosition * 255 / 100),\n        destination: '3/1/2',  // KNX位置组地址\n        dpt: '5.001'\n    });\n}\n\nreturn [msgs];",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 330,
-        "y": 540,
-        "wires": [["knx_out_cover"]]
-    },
-    {
-        "id": "knx_out_cover",
-        "type": "knxUltimate-out",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX窗帘输出",
+        "server": "knx_gateway_config",
         "topic": "",
-        "dpt": "1.008",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": false,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
+        "dpt": "0",
+        "name": "KNX Output (Universal Mode)",
         "outputtype": "write",
-        "outputRBE": true,
-        "inputRBE": true,
-        "x": 550,
-        "y": 540,
-        "wires": []
-    },
-    {
-        "id": "knx_in_cover",
-        "type": "knxUltimate-in",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX窗帘控制",
-        "topic": "3/1/1",
-        "dpt": "1.008",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": true,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "x": 150,
-        "y": 600,
-        "wires": [["knx_cover_to_symi"]]
-    },
-    {
-        "id": "knx_cover_to_symi",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "KNX→Symi窗帘",
-        "func": "// KNX窗帘控制转换为Symi MQTT格式\nconst mac = 'd486c081d814';\n\nif (msg.dpt === '1.008') {\n    // 上下控制\n    return {\n        topic: `symi_mesh/${mac}/cover/set`,\n        payload: msg.payload === 1 ? 'OPEN' : 'CLOSE'\n    };\n} else if (msg.dpt === '5.001') {\n    // 位置控制\n    return {\n        topic: `symi_mesh/${mac}/cover/position/set`,\n        payload: Math.round(msg.payload * 100 / 255).toString()\n    };\n}\n\nreturn null;",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 340,
-        "y": 600,
-        "wires": [["mqtt_publish"]]
-    },
-    {
-        "id": "comment_climate_sync",
-        "type": "comment",
-        "z": "knx_sync_flow",
-        "name": "温控器双向同步 (Symi ↔ KNX)",
-        "info": "Symi温控器与KNX空调控制器双向同步",
-        "x": 160,
-        "y": 680,
-        "wires": []
-    },
-    {
-        "id": "symi_climate",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "温控器",
-        "gateway": "symi_gateway",
-        "deviceMac": "14:2e:68:46:8c:ac",
-        "outputFormat": "full",
-        "x": 120,
-        "y": 740,
-        "wires": [["climate_to_knx"]]
-    },
-    {
-        "id": "climate_to_knx",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "Symi温控→KNX",
-        "func": "// Symi温控器状态转换为KNX DPT 9(温度) + DPT 20(模式)\nconst msgs = [];\n\n// 开关状态\nif (msg.payload.switch !== undefined) {\n    msgs.push({\n        payload: msg.payload.switch ? 1 : 0,\n        destination: '4/1/1',  // KNX空调开关\n        dpt: '1.001'\n    });\n}\n\n// 目标温度\nif (msg.payload.targetTemp !== undefined) {\n    msgs.push({\n        payload: msg.payload.targetTemp,\n        destination: '4/1/2',  // KNX温度设定\n        dpt: '9.001'\n    });\n}\n\n// 模式\nif (msg.payload.climateMode !== undefined) {\n    // 1=cool, 2=heat, 3=fan_only, 4=dry\n    msgs.push({\n        payload: msg.payload.climateMode,\n        destination: '4/1/3',  // KNX模式\n        dpt: '20.102'\n    });\n}\n\n// 风速\nif (msg.payload.fanMode !== undefined) {\n    msgs.push({\n        payload: msg.payload.fanMode,\n        destination: '4/1/4',  // KNX风速\n        dpt: '5.001'\n    });\n}\n\nreturn [msgs];",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 320,
-        "y": 740,
-        "wires": [["knx_out_climate"]]
-    },
-    {
-        "id": "knx_out_climate",
-        "type": "knxUltimate-out",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX温控输出",
-        "topic": "",
-        "dpt": "9.001",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": false,
+        "outputRBE": "false",
+        "inputRBE": "false",
         "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "outputtype": "write",
-        "outputRBE": true,
-        "inputRBE": true,
-        "x": 540,
-        "y": 740,
+        "listenallga": true,
+        "x": 550,
+        "y": 100,
         "wires": []
     },
     {
-        "id": "mqtt_publish",
-        "type": "mqtt out",
+        "id": "debug_node",
+        "type": "debug",
         "z": "knx_sync_flow",
-        "name": "MQTT发布",
-        "topic": "",
-        "qos": "0",
-        "retain": "false",
-        "respTopic": "",
-        "contentType": "",
-        "userProps": "",
-        "correl": "",
-        "expiry": "",
-        "broker": "",
+        "name": "Sync Debug",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
         "x": 550,
-        "y": 600,
+        "y": 160,
         "wires": []
     },
     {
-        "id": "comment_sensor_sync",
+        "id": "comment_usage",
         "type": "comment",
         "z": "knx_sync_flow",
-        "name": "传感器同步 (Symi → KNX)",
-        "info": "Symi传感器状态同步到KNX（单向）",
-        "x": 150,
-        "y": 820,
-        "wires": []
-    },
-    {
-        "id": "symi_motion",
-        "type": "symi-device",
-        "z": "knx_sync_flow",
-        "name": "人体感应器",
-        "gateway": "symi_gateway",
-        "deviceMac": "f3:cf:7d:3d:44:9c",
-        "outputFormat": "full",
+        "name": "使用说明",
+        "info": "1. 修改symi_gateway_knx的IP为网关实际地址\n2. 修改knx_gateway_config的IP为KNX网关地址\n3. 双击KNX Bridge节点配置映射:\n   - 导入KNX实体(组地址)\n   - 添加Mesh设备与KNX实体的映射\n4. 部署后等待20秒初始化完成\n5. 测试双向同步",
         "x": 140,
-        "y": 880,
-        "wires": [["motion_to_knx"]]
-    },
-    {
-        "id": "motion_to_knx",
-        "type": "function",
-        "z": "knx_sync_flow",
-        "name": "人体感应→KNX",
-        "func": "// Symi人体感应转换为KNX DPT 1\nif (msg.payload.motion !== undefined) {\n    return {\n        payload: msg.payload.motion ? 1 : 0,\n        destination: '5/1/1',  // KNX人体感应组地址\n        dpt: '1.002'\n    };\n}\nreturn null;",
-        "outputs": 1,
-        "noerr": 0,
-        "x": 330,
-        "y": 880,
-        "wires": [["knx_out_motion"]]
-    },
-    {
-        "id": "knx_out_motion",
-        "type": "knxUltimate-out",
-        "z": "knx_sync_flow",
-        "server": "knx_gateway",
-        "name": "KNX人体感应",
-        "topic": "",
-        "dpt": "1.002",
-        "initialread": false,
-        "notifyreadrequest": false,
-        "notifyresponse": false,
-        "notifywrite": true,
-        "notifyreadresponse": false,
-        "notifyreadrequestalsorespondtobus": false,
-        "notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized": "",
-        "listenallga": false,
-        "outputtype": "write",
-        "outputRBE": true,
-        "inputRBE": true,
-        "x": 540,
-        "y": 880,
+        "y": 40,
         "wires": []
     }
 ]
-

package/lib/device-manager.js

@@ -100,9 +100,36 @@ class DeviceInfo {
                 break;
             case 0x05:
                 // CURT_RUN_STATUS - 窗帘运行状态
-                // 0=到头/停止, 1=打开中, 2=关闭中, 3=暂停
+                // 【兼容两种协议】：
+                // 米家协议: 0=打开中, 1=关闭中, 2=停止
+                // 小程序协议: 1=打开, 2=关闭, 3=停止
+                // 通过status=0(仅米家)和status=3(仅小程序)来区分协议类型
                 if (parameters.length > 0) {
-                    this.state.curtainStatus = parameters[0];
+                    const status = parameters[0];
+                    this.state.curtainStatus = status;
+                    
+                    // 检测协议类型：status=0只在米家出现，status=3只在小程序出现
+                    if (status === 0) {
+                        this.state.curtainProtocol = 'mijia';
+                        this.state.curtainAction = 'opening';
+                    } else if (status === 3) {
+                        this.state.curtainProtocol = 'miniprogram';
+                        this.state.curtainAction = 'stopped';
+                    } else if (status === 1) {
+                        // status=1: 米家=关闭中, 小程序=打开
+                        if (this.state.curtainProtocol === 'mijia') {
+                            this.state.curtainAction = 'closing';
+                        } else {
+                            this.state.curtainAction = 'opening';
+                        }
+                    } else if (status === 2) {
+                        // status=2: 米家=停止, 小程序=关闭
+                        if (this.state.curtainProtocol === 'mijia') {
+                            this.state.curtainAction = 'stopped';
+                        } else {
+                            this.state.curtainAction = 'closing';
+                        }
+                    }
                 }
                 break;
             case 0x06:
@@ -161,7 +188,7 @@ class DeviceInfo {
                 // 目标温度TMPC_TEMP：1字节，直接温度值（16-30°C）
                 if (parameters.length > 0) {
                     const temp = parameters[0];
-                    if (temp >= 5 && temp <= 35) {
+                    if (temp >= 16 && temp <= 30) {
                         this.state.targetTemp = temp;
                         // 不推断开关状态，完全由0x02消息决定
                     }

package/lib/mqtt-helper.js

@@ -627,11 +627,11 @@ function convertStateValue(entityType, attrType, value, deviceType = null) {
             
         case 'climate':
             if (attrType === 0x16) {
-                // 当前温度：温度*100 -> 温度
+                // 当前温度：温度*100 -> 温度 (2字节小端序)
                 return (value / 100).toFixed(1);
             } else if (attrType === 0x1B) {
-                // 目标温度：温度*100 -> 温度
-                return (value / 100).toFixed(1);
+                // 目标温度：直接温度值 (1字节，16-30°C)
+                return value.toString();
             } else if (attrType === 0x1C) {
                 // 风速：1=high, 2=medium, 3=low, 4=auto
                 const fanModes = { 1: 'high', 2: 'medium', 3: 'low', 4: 'auto' };

package/lib/tcp-client.js

@@ -57,21 +57,37 @@ class TCPClient extends EventEmitter {
                 }
             }, 10000);
 
-            this.client.connect(this.port, this.host, () => {
+            // 使用family:4强制IPv4，避免Node.js 18+ Happy Eyeballs导致AggregateError
+            try {
+                this.client.connect({
+                    port: this.port,
+                    host: this.host,
+                    family: 4  // 强制IPv4
+                }, () => {
+                    if (!resolved && !rejected) {
+                        resolved = true;
+                        clearTimeout(timeout);
+                        this.connected = true;
+                        this.logger.log(`Connected to gateway at ${this.host}:${this.port}`);
+                        this.emit('connected');
+                        
+                        if (!this.processingQueue) {
+                            this.startQueueProcessor();
+                        }
+                        
+                        resolve();
+                    }
+                });
+            } catch (connectError) {
+                // 捕获同步错误（包括AggregateError）
                 if (!resolved && !rejected) {
-                    resolved = true;
+                    rejected = true;
                     clearTimeout(timeout);
-                    this.connected = true;
-                    this.logger.log(`Connected to gateway at ${this.host}:${this.port}`);
-                    this.emit('connected');
-                    
-                    if (!this.processingQueue) {
-                        this.startQueueProcessor();
-                    }
-                    
-                    resolve();
+                    this.logger.warn(`TCP连接同步错误: ${connectError.message || connectError}`);
+                    this.handleDisconnect();
+                    reject(connectError);
                 }
-            });
+            }
 
             this.client.on('data', (data) => {
                 try {
@@ -88,9 +104,13 @@ class TCPClient extends EventEmitter {
 
             this.client.on('error', (error) => {
                 clearTimeout(timeout);
+                // AggregateError特殊处理（Node.js 18+的IPv4/IPv6连接失败）
+                if (error.name === 'AggregateError' || error.errors) {
+                    this.logger.warn(`TCP连接失败: 无法连接到 ${this.host}:${this.port}`);
+                }
                 // 只在首次连接或重要错误时记录，避免大量重复日志
                 // ECONNRESET通常是网络波动，不记录错误
-                if (!this.connected && error.code !== 'ECONNREFUSED' && error.code !== 'ECONNRESET') {
+                else if (!this.connected && error.code !== 'ECONNREFUSED' && error.code !== 'ECONNRESET') {
                     this.logger.error('TCP client error:', error.message);
                 }