node-red-contrib-symi-mesh 1.2.4 → 1.3.1

package/nodes/symi-mqtt.html

@@ -1,7 +1,6 @@
 <script type="text/javascript">
     RED.nodes.registerType('symi-mqtt', {
-        category: 'Symi Mesh',
-        color: '#DB4437',
+        category: 'config',
         defaults: {
             name: { value: '' },
             gateway: { value: '', type: 'symi-gateway', required: true },
@@ -10,44 +9,50 @@
             mqttPassword: { value: '' },
             mqttPrefix: { value: 'homeassistant' }
         },
-        inputs: 0,
-        outputs: 0,
-        icon: 'bridge-dash.png',
         label: function() {
-            return this.name || 'MQTT桥接';
+            return this.name || 'MQTT配置';
+        },
+        oneditprepare: function() {
+            // 自动填充默认值到输入框
+            if (!this.mqttBroker || this.mqttBroker === '') {
+                $('#node-config-input-mqttBroker').val('mqtt://localhost:1883');
+            }
+            if (!this.mqttPrefix || this.mqttPrefix === '') {
+                $('#node-config-input-mqttPrefix').val('homeassistant');
+            }
         }
     });
 </script>
 
 <script type="text/html" data-template-name="symi-mqtt">
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> 名称</label>
-        <input type="text" id="node-input-name" placeholder="MQTT桥接">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> 名称</label>
+        <input type="text" id="node-config-input-name" placeholder="MQTT配置">
     </div>
-    
+
     <div class="form-row">
-        <label for="node-input-gateway"><i class="fa fa-server"></i> 网关</label>
-        <input type="text" id="node-input-gateway">
+        <label for="node-config-input-gateway"><i class="fa fa-server"></i> 网关</label>
+        <input type="text" id="node-config-input-gateway">
     </div>
-    
+
     <div class="form-row">
-        <label for="node-input-mqttBroker"><i class="fa fa-rss"></i> MQTT地址</label>
-        <input type="text" id="node-input-mqttBroker" placeholder="mqtt://localhost:1883">
+        <label for="node-config-input-mqttBroker"><i class="fa fa-rss"></i> MQTT地址</label>
+        <input type="text" id="node-config-input-mqttBroker" placeholder="mqtt://localhost:1883">
     </div>
-    
+
     <div class="form-row">
-        <label for="node-input-mqttUsername"><i class="fa fa-user"></i> 用户名</label>
-        <input type="text" id="node-input-mqttUsername" placeholder="可选">
+        <label for="node-config-input-mqttUsername"><i class="fa fa-user"></i> 用户名</label>
+        <input type="text" id="node-config-input-mqttUsername" placeholder="可选">
     </div>
-    
+
     <div class="form-row">
-        <label for="node-input-mqttPassword"><i class="fa fa-lock"></i> 密码</label>
-        <input type="password" id="node-input-mqttPassword" placeholder="可选">
+        <label for="node-config-input-mqttPassword"><i class="fa fa-lock"></i> 密码</label>
+        <input type="password" id="node-config-input-mqttPassword" placeholder="可选">
     </div>
-    
+
     <div class="form-row">
-        <label for="node-input-mqttPrefix"><i class="fa fa-folder-open"></i> HA前缀</label>
-        <input type="text" id="node-input-mqttPrefix" placeholder="homeassistant">
+        <label for="node-config-input-mqttPrefix"><i class="fa fa-folder-open"></i> HA前缀</label>
+        <input type="text" id="node-config-input-mqttPrefix" placeholder="homeassistant">
     </div>
 </script>
 

package/nodes/symi-mqtt.js

@@ -10,18 +10,20 @@ module.exports = function(RED) {
     function SymiMQTTNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
-        
+
         node.gateway = RED.nodes.getNode(config.gateway);
-        node.mqttBroker = config.mqttBroker;
-        node.mqttUsername = config.mqttUsername;
-        node.mqttPassword = config.mqttPassword;
-        node.mqttPrefix = config.mqttPrefix || 'homeassistant';
-        
+
         if (!node.gateway) {
             node.error('未配置网关');
             node.status({ fill: 'red', shape: 'ring', text: '未配置网关' });
             return;
         }
+
+        // 使用配置的MQTT参数，如果为空则使用默认值
+        node.mqttBroker = config.mqttBroker || 'mqtt://localhost:1883';
+        node.mqttUsername = config.mqttUsername;
+        node.mqttPassword = config.mqttPassword;
+        node.mqttPrefix = config.mqttPrefix || 'homeassistant';
         
         node.mqttClient = null;
         node.publishedDevices = new Set();
@@ -209,6 +211,24 @@ module.exports = function(RED) {
         });
     };
 
+    SymiMQTTNode.prototype.subscribeSceneTriggers = function(roomNo) {
+        const node = this;
+        const topic = `symi_mesh/room_${roomNo}/scene/+/trigger`;
+
+        if (!node.mqttClient || !node.mqttClient.connected) {
+            node.warn('MQTT客户端未连接，无法订阅场景触发');
+            return;
+        }
+
+        node.mqttClient.subscribe(topic, (err) => {
+            if (err) {
+                node.error(`订阅场景触发主题失败: ${err.message}`);
+            } else {
+                node.log(`已订阅场景触发主题: ${topic}`);
+            }
+        });
+    };
+
     // 发布设备初始状态
     function publishInitialDeviceState(device, node) {
         const macClean = device.macAddress.replace(/:/g, '').toLowerCase();
@@ -311,7 +331,10 @@ module.exports = function(RED) {
         
         switch (attrType) {
             case 0x02:
+            case 0x45:
                 // 开关状态反馈 (TYPE_ON_OFF)
+                // 0x02: 1-4路开关状态反馈
+                // 0x45: 6路开关状态反馈（场景执行时使用）
                 // 窗帘(type=5)不使用0x02，忽略避免误操作
                 if (device.deviceType === 5) {
                     node.debug(`窗帘设备忽略0x02消息（窗帘使用0x05/0x06）`);
@@ -852,13 +875,20 @@ module.exports = function(RED) {
 
     SymiMQTTNode.prototype.handleMQTTMessage = function(topic, message) {
         const node = this;
+
+        // 检查是否是场景触发消息
+        if (topic.match(/symi_mesh\/room_\w+\/scene\/\d+\/trigger/)) {
+            node.emit('scene-trigger', topic, message);
+            return;
+        }
+
         const deviceMac = node.subscriptions.get(topic);
-        
+
         if (!deviceMac) {
             node.warn(`未找到topic订阅: ${topic}`);
             return;
         }
-        
+
         const device = node.gateway.getDevice(deviceMac);
         if (!device) {
             node.warn(`设备未找到: ${deviceMac}`);
@@ -866,24 +896,24 @@ module.exports = function(RED) {
         }
         
         const payload = message.toString();
-        node.debug(`[MQTT收到] topic=${topic}, payload=${payload}, deviceType=${device.deviceType}, isThreeInOne=${device.isThreeInOne}`);
-        
+        node.log(`[MQTT收到] topic=${topic}, payload=${payload}, deviceType=${device.deviceType}, isThreeInOne=${device.isThreeInOne}`);
+
         const commands = node.parseMQTTCommand(topic, payload, device);
-        
+
         if (commands && commands.length > 0) {
-            node.debug(`[MQTT解析] 解析出${commands.length}个命令:`);
+            node.log(`[MQTT解析] 解析出${commands.length}个命令:`);
             commands.forEach((cmd, idx) => {
-                node.debug(`  命令${idx + 1}: attrType=0x${cmd.attrType.toString(16).toUpperCase()}, param=[${Array.from(cmd.param).map(p => '0x' + p.toString(16).toUpperCase()).join(', ')}]`);
+                node.log(`  命令${idx + 1}: attrType=0x${cmd.attrType.toString(16).toUpperCase()}, param=[${Array.from(cmd.param).map(p => '0x' + p.toString(16).toUpperCase()).join(', ')}]`);
             });
-            
+
             // 使用for循环而不是forEach以正确处理async
             (async () => {
                 for (const command of commands) {
                     const paramHex = Array.from(command.param).map(p => '0x' + p.toString(16).toUpperCase()).join(' ');
-                    node.debug(`[MQTT发送] → 网关: addr=0x${device.networkAddress.toString(16).toUpperCase()}, attr=0x${command.attrType.toString(16).toUpperCase()}, param=[${paramHex}]`);
+                    node.log(`[MQTT发送] → 网关: addr=0x${device.networkAddress.toString(16).toUpperCase()}, attr=0x${command.attrType.toString(16).toUpperCase()}, param=[${paramHex}]`);
                     try {
                         await node.gateway.sendControl(device.networkAddress, command.attrType, command.param);
-                        node.debug(`[MQTT发送] ✓ 成功: ${device.name}`);
+                        node.log(`[MQTT发送] ✓ 成功: ${device.name}`);
                         
                         // 立即发布状态更新（optimistic update）
                         node.publishCommandFeedback(device, command, payload, topic);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-red-contrib-symi-mesh",
-  "version": "1.2.4",
-  "description": "Node-RED节点集合，用于通过TCP/串口连接Symi蓝牙Mesh网关，支持Home Assistant MQTT Discovery自动发现",
+  "version": "1.3.1",
+  "description": "Node-RED节点集合，用于通过TCP/串口连接Symi蓝牙Mesh网关，支持Home Assistant MQTT Discovery自动发现和云端数据同步",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -30,10 +30,12 @@
     "nodes": {
       "symi-gateway": "nodes/symi-gateway.js",
       "symi-device": "nodes/symi-device.js",
-      "symi-mqtt": "nodes/symi-mqtt.js"
+      "symi-mqtt": "nodes/symi-mqtt.js",
+      "symi-cloud-sync": "nodes/symi-cloud-sync.js"
     }
   },
   "dependencies": {
+    "axios": "^1.13.2",
     "mqtt": "^5.3.0",
     "serialport": "^12.0.0"
   },