node-red-contrib-symi-modbus 2.6.8 → 2.6.9

package/nodes/homekit-bridge.html

@@ -51,6 +51,11 @@
                 renderRelayNameConfig();
             });
 
+            // 添加刷新按钮
+            $("#btn-refresh-homekit").on("click", function() {
+                renderRelayNameConfig();
+            });
+
             // 初始渲染
             renderRelayNameConfig();
             
@@ -69,21 +74,30 @@
                 var masterNodeId = $("#node-input-masterNode").val();
                 var container = $("#relay-names-container");
                 container.empty();
-                
+
                 if (!masterNodeId) {
                     container.html('<div style="padding: 20px; text-align: center; color: #999;">请先选择主站节点</div>');
                     return;
                 }
-                
-                // 获取主站节点配置
-                var masterNode = RED.nodes.node(masterNodeId);
-                if (!masterNode || !masterNode.slaves || masterNode.slaves.length === 0) {
-                    container.html('<div style="padding: 20px; text-align: center; color: #999;">主站节点未配置从站</div>');
-                    return;
-                }
-                
-                // 遍历所有从站和线圈
-                masterNode.slaves.forEach(function(slave) {
+
+                // 显示加载中
+                container.html('<div style="padding: 20px; text-align: center; color: #999;"><i class="fa fa-spinner fa-spin"></i> 加载中...</div>');
+
+                // 通过HTTP API获取主站节点的最新配置
+                $.ajax({
+                    url: '/homekit-bridge/master-config/' + masterNodeId,
+                    method: 'GET',
+                    success: function(masterConfig) {
+                        if (!masterConfig || !masterConfig.slaves || masterConfig.slaves.length === 0) {
+                            container.html('<div style="padding: 20px; text-align: center; color: #999;">主站节点未配置从站</div>');
+                            return;
+                        }
+
+                        // 清空容器
+                        container.empty();
+
+                        // 遍历所有从站和线圈
+                        masterConfig.slaves.forEach(function(slave) {
                     var slaveSection = $('<div class="slave-section" style="margin-bottom: 20px; padding: 15px; border: 1px solid #e0e0e0; border-radius: 8px; background: #f9f9f9;">');
                     
                     slaveSection.html(`
@@ -115,14 +129,19 @@
                     container.append(slaveSection);
                 });
                 
-                // 绑定输入事件
-                $(".relay-name-input").on("input", function() {
-                    var key = $(this).data("key");
-                    var value = $(this).val().trim();
-                    if (value) {
-                        node.relayNames[key] = value;
-                    } else {
-                        delete node.relayNames[key];
+                        // 绑定输入事件
+                        $(".relay-name-input").on("input", function() {
+                            var key = $(this).data("key");
+                            var value = $(this).val().trim();
+                            if (value) {
+                                node.relayNames[key] = value;
+                            } else {
+                                delete node.relayNames[key];
+                            }
+                        });
+                    },
+                    error: function(xhr, status, error) {
+                        container.html('<div style="padding: 20px; text-align: center; color: #f44336;"><i class="fa fa-exclamation-triangle"></i> 加载失败: ' + error + '</div>');
                     }
                 });
             }
@@ -148,10 +167,13 @@
 
     <div class="form-row">
         <label for="node-input-masterNode"><i class="fa fa-microchip"></i> 主站节点</label>
-        <select id="node-input-masterNode" style="width: 70%;">
+        <select id="node-input-masterNode" style="width: 55%;">
             <option value="">请选择主站节点</option>
         </select>
-        <div style="font-size: 11px; color: #999; margin-top: 5px;">选择要桥接的Modbus主站节点</div>
+        <button type="button" id="btn-refresh-homekit" class="red-ui-button" style="margin-left: 5px;">
+            <i class="fa fa-refresh"></i> 刷新
+        </button>
+        <div style="font-size: 11px; color: #999; margin-top: 5px;">选择要桥接的Modbus主站节点，点击刷新按钮更新显示</div>
     </div>
 
     <hr style="margin: 20px 0; border: none; border-top: 1px solid #e0e0e0;">
@@ -186,7 +208,7 @@
         <label style="width: 100%; margin-bottom: 10px;">
             <i class="fa fa-list"></i> 继电器名称配置
         </label>
-        <div id="relay-names-container" style="width: 100%; max-height: 400px; overflow-y: auto; border: 1px solid #e0e0e0; border-radius: 4px; padding: 10px; background: white;">
+        <div id="relay-names-container" style="width: 100%; max-height: 600px; overflow-y: auto; border: 1px solid #e0e0e0; border-radius: 4px; padding: 10px; background: white;">
             <div style="padding: 20px; text-align: center; color: #999;">请先选择主站节点</div>
         </div>
         <div style="font-size: 11px; color: #999; margin-top: 5px;">

package/nodes/homekit-bridge.js

@@ -324,5 +324,23 @@ module.exports = function(RED) {
     }
 
     RED.nodes.registerType("homekit-bridge", HomekitBridgeNode);
+
+    // HTTP API：获取主站节点配置
+    RED.httpAdmin.get('/homekit-bridge/master-config/:id', function(req, res) {
+        var masterNodeId = req.params.id;
+        var masterNode = RED.nodes.getNode(masterNodeId);
+
+        if (!masterNode) {
+            res.status(404).json({error: '主站节点不存在'});
+            return;
+        }
+
+        // 返回主站配置（包括最新的从站列表）
+        // 从站列表存储在 node.config.slaves 中
+        res.json({
+            slaves: (masterNode.config && masterNode.config.slaves) ? masterNode.config.slaves : [],
+            relayNames: masterNode.relayNames || {}
+        });
+    });
 };
 

package/nodes/mesh-protocol.js

@@ -0,0 +1,286 @@
+// Symi蓝牙Mesh网关协议处理模块
+// 协议版本: V1.3.1
+// 支持TCP/IP和串口通信
+
+module.exports = function(RED) {
+    'use strict';
+
+    // 协议常量
+    const PROTOCOL = {
+        HEADER: 0x53,
+        // 操作码
+        OP_GET_DEVICE_LIST: 0x12,
+        OP_DEVICE_CONTROL: 0x30,
+        OP_QUERY_STATUS: 0x32,
+        OP_SCENE_CONTROL: 0x34,
+        OP_STATUS_EVENT: 0x80,
+        OP_DEVICE_LIST_RESPONSE: 0x92,
+        OP_CONTROL_RESPONSE: 0xB0,
+        OP_SCENE_RESPONSE: 0xB4,
+        // 消息类型
+        MSG_TYPE_SWITCH: 0x02,      // 开关状态（1-4路）
+        MSG_TYPE_DIMMER: 0x03,      // 调光状态
+        MSG_TYPE_RGB: 0x04,         // 五色调光
+        MSG_TYPE_CURTAIN: 0x05,     // 窗帘动作
+        MSG_TYPE_CURTAIN_POS: 0x06, // 窗帘位置
+        MSG_TYPE_THERMOSTAT: 0x07,  // 温控器
+        MSG_TYPE_SWITCH_6: 0x45,    // 6路开关状态
+        // 设备类型
+        DEVICE_TYPE_SWITCH: 0x01,
+        DEVICE_TYPE_DIMMER: 0x02,
+        DEVICE_TYPE_DUAL_COLOR: 0x04,
+        DEVICE_TYPE_CURTAIN: 0x05,
+        DEVICE_TYPE_CARD_POWER: 0x09,
+        DEVICE_TYPE_THERMOSTAT: 0x0A,
+        DEVICE_TYPE_PIR: 0x0C,
+        DEVICE_TYPE_RGB: 0x18,
+        DEVICE_TYPE_THERMOSTAT_3IN1: 0x94
+    };
+
+    // 计算异或校验和
+    function calculateChecksum(buffer) {
+        let checksum = 0;
+        for (let i = 0; i < buffer.length; i++) {
+            checksum ^= buffer[i];
+        }
+        return checksum;
+    }
+
+    // 构建获取设备列表请求帧
+    function buildGetDeviceListFrame() {
+        const buffer = Buffer.from([
+            PROTOCOL.HEADER,           // 0x53
+            PROTOCOL.OP_GET_DEVICE_LIST, // 0x12
+            0x00                       // Length = 0
+        ]);
+        const checksum = calculateChecksum(buffer);
+        return Buffer.concat([buffer, Buffer.from([checksum])]);
+    }
+
+    // 解析设备列表响应
+    function parseDeviceListResponse(frames) {
+        const devices = [];
+        
+        for (let i = 0; i < frames.length; i++) {
+            const frame = frames[i];
+            
+            // 验证帧头
+            if (frame[0] !== PROTOCOL.HEADER || frame[1] !== PROTOCOL.OP_DEVICE_LIST_RESPONSE) {
+                continue;
+            }
+            
+            const sequence = frame[2];
+            const length = frame[3];
+            
+            if (sequence === 0x00) {
+                // 第一帧：设备总数
+                const totalDevices = frame[4];
+                continue;
+            }
+            
+            // 解析设备数据
+            let offset = 4;
+            while (offset + 10 <= frame.length - 1) {
+                const shortAddr = frame[offset] | (frame[offset + 1] << 8); // 小端序
+                const deviceType = frame[offset + 2];
+                const mac = Buffer.from([
+                    frame[offset + 3],
+                    frame[offset + 4],
+                    frame[offset + 5],
+                    frame[offset + 6],
+                    frame[offset + 7],
+                    frame[offset + 8]
+                ]);
+                const buttons = frame[offset + 9];
+                
+                devices.push({
+                    shortAddr: shortAddr,
+                    type: deviceType,
+                    mac: mac.toString('hex').toUpperCase().match(/.{2}/g).join(':'),
+                    buttons: buttons
+                });
+                
+                offset += 10;
+            }
+        }
+        
+        return devices;
+    }
+
+    // 构建开关控制帧（带当前状态，保持其他路不变）
+    function buildSwitchControlFrame(shortAddr, buttonNumber, totalButtons, state, currentStates) {
+        let stateValue;
+
+        if (totalButtons === 1) {
+            // 单路开关
+            stateValue = state ? 0x02 : 0x01;
+            const buffer = Buffer.from([
+                PROTOCOL.HEADER,
+                PROTOCOL.OP_DEVICE_CONTROL,
+                0x05,  // Length
+                shortAddr & 0xFF,
+                (shortAddr >> 8) & 0xFF,
+                0x00,  // ACK = 0
+                0x05,  // 重传5次
+                PROTOCOL.MSG_TYPE_SWITCH,
+                stateValue
+            ]);
+            const checksum = calculateChecksum(buffer);
+            return Buffer.concat([buffer, Buffer.from([checksum])]);
+        } else if (totalButtons >= 2 && totalButtons <= 4) {
+            // 2-4路开关：使用当前状态构建完整状态值
+            if (currentStates && currentStates.length === totalButtons) {
+                stateValue = buildMultiSwitchState(currentStates, buttonNumber, state);
+            } else {
+                // 如果没有当前状态，只设置目标按钮，其他位设为00（保持不变）
+                const bitPos = (buttonNumber - 1) * 2;
+                stateValue = (state ? 0x02 : 0x01) << bitPos;
+            }
+
+            const buffer = Buffer.from([
+                PROTOCOL.HEADER,
+                PROTOCOL.OP_DEVICE_CONTROL,
+                0x05,  // Length
+                shortAddr & 0xFF,
+                (shortAddr >> 8) & 0xFF,
+                0x00,  // ACK = 0
+                0x05,  // 重传5次
+                PROTOCOL.MSG_TYPE_SWITCH,
+                stateValue
+            ]);
+            const checksum = calculateChecksum(buffer);
+            return Buffer.concat([buffer, Buffer.from([checksum])]);
+        } else if (totalButtons === 6) {
+            // 6路开关：2字节状态值（小端序）
+            let stateValue16;
+            if (currentStates && currentStates.length === totalButtons) {
+                stateValue16 = buildMultiSwitchState(currentStates, buttonNumber, state);
+            } else {
+                // 如果没有当前状态，只设置目标按钮，其他位设为00（保持不变）
+                const bitPos = (buttonNumber - 1) * 2;
+                stateValue16 = (state ? 0x02 : 0x01) << bitPos;
+            }
+
+            const buffer = Buffer.from([
+                PROTOCOL.HEADER,
+                PROTOCOL.OP_DEVICE_CONTROL,
+                0x06,  // Length
+                shortAddr & 0xFF,
+                (shortAddr >> 8) & 0xFF,
+                0x00,  // ACK = 0
+                0x05,  // 重传5次
+                PROTOCOL.MSG_TYPE_SWITCH,
+                stateValue16 & 0xFF,
+                (stateValue16 >> 8) & 0xFF
+            ]);
+            const checksum = calculateChecksum(buffer);
+            return Buffer.concat([buffer, Buffer.from([checksum])]);
+        }
+
+        return null;
+    }
+
+    // 解析状态事件帧
+    function parseStatusEvent(frame) {
+        // 验证帧头
+        if (frame[0] !== PROTOCOL.HEADER || frame[1] !== PROTOCOL.OP_STATUS_EVENT) {
+            return null;
+        }
+
+        const subOp = frame[2];
+        const length = frame[3];
+        const shortAddr = frame[4] | (frame[5] << 8); // 小端序
+        const msgType = frame[6];
+
+        const event = {
+            subOp: subOp,
+            shortAddr: shortAddr,
+            msgType: msgType
+        };
+
+        // 根据消息类型解析状态
+        if (msgType === PROTOCOL.MSG_TYPE_SWITCH) {
+            // 1-4路开关状态
+            const stateValue = frame[7];
+            event.states = parseMultiSwitchState(stateValue, 4);
+        } else if (msgType === PROTOCOL.MSG_TYPE_SWITCH_6) {
+            // 6路开关状态
+            const stateLow = frame[7];
+            const stateHigh = frame[8];
+            const stateValue = stateLow | (stateHigh << 8);
+            event.states = parseMultiSwitchState(stateValue, 6);
+        } else if (msgType === PROTOCOL.MSG_TYPE_DIMMER) {
+            // 调光灯状态
+            event.brightness = frame[7];
+            event.colorTemp = frame[8];
+        } else if (msgType === PROTOCOL.MSG_TYPE_CURTAIN) {
+            // 窗帘动作状态
+            event.action = frame[7]; // 0=停止, 1=打开中, 2=关闭中
+        } else if (msgType === PROTOCOL.MSG_TYPE_CURTAIN_POS) {
+            // 窗帘位置状态
+            event.position = frame[7]; // 0-100%
+        }
+
+        return event;
+    }
+
+    // 解析多路开关状态值
+    function parseMultiSwitchState(stateValue, totalButtons) {
+        const states = [];
+
+        for (let i = 0; i < totalButtons; i++) {
+            const bitPos = i * 2;
+            const bits = (stateValue >> bitPos) & 0x03;
+
+            if (bits === 0x01) {
+                states.push(false); // 关
+            } else if (bits === 0x02) {
+                states.push(true);  // 开
+            } else {
+                states.push(null);  // 保持不变或未知
+            }
+        }
+
+        return states;
+    }
+
+    // 构建多路开关状态值（用于控制时保持其他路不变）
+    function buildMultiSwitchState(currentStates, buttonNumber, newState) {
+        let stateValue = 0;
+
+        for (let i = 0; i < currentStates.length; i++) {
+            const bitPos = i * 2;
+            let bits;
+
+            if (i === buttonNumber - 1) {
+                // 要改变的按钮
+                bits = newState ? 0x02 : 0x01;
+            } else {
+                // 保持不变的按钮
+                if (currentStates[i] === true) {
+                    bits = 0x02;
+                } else if (currentStates[i] === false) {
+                    bits = 0x01;
+                } else {
+                    bits = 0x00; // 保持不变
+                }
+            }
+
+            stateValue |= (bits << bitPos);
+        }
+
+        return stateValue;
+    }
+
+    return {
+        PROTOCOL,
+        calculateChecksum,
+        buildGetDeviceListFrame,
+        parseDeviceListResponse,
+        buildSwitchControlFrame,
+        parseStatusEvent,
+        parseMultiSwitchState,
+        buildMultiSwitchState
+    };
+};
+