smart-bus 0.8.0 → 0.9.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.9.0
+
+  * Add Get Curtain Duration commands (`0xE800`, `0xE801`)
+  * Add Dry Contact Multi-Channel Status command (`0x6F00`)
+  * Add Dry Contact broadcast status commands (`0x15D0`, `0x15D1`)
+  * Fix `0xE3E3` Curtain Status to support optional duration field
+  * Add comprehensive test coverage for new commands
+  * Maintain 100% backward compatibility with existing implementations
+
 ## 0.8.0
 
   * Update for Node.js v22 compatibility

package/lib/commands.js

@@ -921,14 +921,29 @@ module.exports = {
   // FIXME: same as 0xE3E1
   0xE3E3: {
     parse: function(buffer) {
-      return {
+      var data = {
         curtain: buffer.readUInt8(0),
         status: buffer.readUInt8(1)
       };
+      // Duration field (4 bytes total) - in deciseconds (0.1 second units)
+      if (buffer.length >= 4) {
+        data.duration = buffer.readUInt16BE(2) / 10;
+      }
+      return data;
     },
 
     encode: function(data) {
-      return Buffer.from([data.curtain, data.status]);
+      // Support both 2-byte (legacy) and 4-byte (with duration) formats
+      if (data.duration !== undefined) {
+        var buffer = Buffer.allocUnsafe(4);
+        buffer.writeUInt8(data.curtain, 0);
+        buffer.writeUInt8(data.status, 1);
+        var duration = data.duration * 10;
+        buffer.writeUInt16BE(duration, 2);
+        return buffer;
+      } else {
+        return Buffer.from([data.curtain, data.status]);
+      }
     }
   },
 
@@ -966,6 +981,39 @@ module.exports = {
     }
   },
 
+  // 7.1.6 Get Curtain Duration Request
+  0xE800: {
+    parse: function(buffer) {
+      return {
+        channel: buffer.readUInt8(0)
+      };
+    },
+
+    encode: function(data) {
+      return Buffer.from([data.channel]);
+    },
+
+    response: 0xE801
+  },
+
+  // 7.1.7 Get Curtain Duration Response
+  0xE801: {
+    parse: function(buffer) {
+      return {
+        channel: buffer.readUInt8(0),
+        duration: buffer.readUInt16BE(2)
+      };
+    },
+
+    encode: function(data) {
+      var buffer = Buffer.allocUnsafe(4);
+      buffer.writeUInt8(data.channel, 0);
+      buffer.writeUInt8(0, 1); // Reserved
+      buffer.writeUInt16BE(data.duration || 0, 2);
+      return buffer;
+    }
+  },
+
   /* 8. GPRS Control */
 
   // 8.1.1 GPRS Control
@@ -1751,10 +1799,42 @@ module.exports = {
   /* 16. Dry Contact */
 
   // 16.1.1 Auto broadcast Dry Contact Status
-  // 0x15D0
+  0x15D0: {
+    parse: function(buffer) {
+      return {
+        area: buffer.readUInt8(0),
+        channel: buffer.readUInt8(1),
+        status: buffer.readUInt8(2) === 0
+      };
+    },
+
+    encode: function(data) {
+      var buffer = Buffer.allocUnsafe(3);
+      buffer.writeUInt8(data.area, 0);
+      buffer.writeUInt8(data.channel, 1);
+      buffer.writeUInt8(data.status ? 0 : 1, 2);
+      return buffer;
+    }
+  },
 
   // 16.1.2 Response Auto broadcast Dry Contact Status
-  // 0x15D1
+  0x15D1: {
+    parse: function(buffer) {
+      return {
+        area: buffer.readUInt8(0),
+        channel: buffer.readUInt8(1),
+        status: buffer.readUInt8(2) === 0
+      };
+    },
+
+    encode: function(data) {
+      var buffer = Buffer.allocUnsafe(3);
+      buffer.writeUInt8(data.area, 0);
+      buffer.writeUInt8(data.channel, 1);
+      buffer.writeUInt8(data.status ? 0 : 1, 2);
+      return buffer;
+    }
+  },
 
   // 16.1.3 Read Dry Contact Status
   0x15CE: {
@@ -1798,6 +1878,54 @@ module.exports = {
     }
   },
 
+  // 16.1.5 Dry Contact Multi-Channel Status
+  0x6F00: {
+    parse: function(buffer) {
+      var data = {
+        declaredChannels: buffer.readUInt8(1),
+        statusMask: buffer.readUInt16BE(2),
+        channels: []
+      };
+      
+      // Include subnet if present
+      if (buffer.length >= 4) {
+        data.subnet = buffer.readUInt8(0);
+      }
+      
+      // Parse 16-bit mask for up to 16 channels
+      var mask = data.statusMask;
+      var channels = data.channels;
+      
+      for (var i = 0; i < 16; i++) {
+        channels.push({
+          number: i + 1,
+          status: !!(mask & (1 << i))
+        });
+      }
+      
+      return data;
+    },
+
+    encode: function(data) {
+      var buffer = Buffer.allocUnsafe(4);
+      buffer.writeUInt8(data.subnet || 0, 0);
+      buffer.writeUInt8(data.declaredChannels || 16, 1);
+      
+      var mask = 0;
+      var channels = data.channels || [];
+      
+      for (var i = 0; i < channels.length; i++) {
+        if (channels[i].status) {
+          mask |= 1 << (i);
+        }
+      }
+      
+      buffer.writeUInt16BE(mask, 2);
+      
+      return buffer;
+    }
+  },
+
   /* 17. DLP Music Play Control Command */
 
   // 17.1.1 Read Z-audio Current Status

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smart-bus",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "MIT",
   "description": "Node.js implementation of HDL SmartBus protocol",
   "repository": "caligo-mentis/smart-bus",

package/test/fixtures/commands.js

@@ -293,7 +293,7 @@ module.exports = {
   // 5.1.7 Response Read System Date and Time
   '0xDA01': {
     payload: Buffer.from('F812020C16020E01', 'hex'),
-    data: { success: true, date: new Date(2018, 1, 12, 22, 02, 14) }
+    data: { success: true, date: new Date(2018, 1, 12, 22, 2, 14) }
   },
 
   // 5.1.8 Modify Read System Date and Time
@@ -374,7 +374,8 @@ module.exports = {
   // 7.1.4 Response Read Status of Curtain Switch
   '0xE3E3': [
     { payload: Buffer.from('0102', 'hex'), data: { curtain: 1, status: 2 } },
-    { payload: Buffer.from('115A', 'hex'), data: { curtain: 17, status: 90 } }
+    { payload: Buffer.from('115A', 'hex'), data: { curtain: 17, status: 90 } },
+    { payload: Buffer.from('010201F4', 'hex'), data: { curtain: 1, status: 2, duration: 50.0 } }
   ],
 
   // 7.1.5 Broadcast Status of Status of Curtain Switches
@@ -386,6 +387,18 @@ module.exports = {
     ] }
   },
 
+  // 7.1.6 Get Curtain Duration Request
+  '0xE800': [
+    { payload: Buffer.from('01', 'hex'), data: { channel: 1 } },
+    { payload: Buffer.from('0A', 'hex'), data: { channel: 10 } }
+  ],
+
+  // 7.1.7 Get Curtain Duration Response
+  '0xE801': [
+    { payload: Buffer.from('01001388', 'hex'), data: { channel: 1, duration: 5000 } },
+    { payload: Buffer.from('030007D0', 'hex'), data: { channel: 3, duration: 2000 } }
+  ],
+
   /* 9. Panel Control */
 
   // 9.1.1 Panel Control
@@ -782,6 +795,30 @@ module.exports = {
     }
   ],
 
+  // 16.1.1 Auto broadcast Dry Contact Status
+  '0x15D0': [
+    {
+      payload: Buffer.from('010200', 'hex'),
+      data: { area: 1, channel: 2, status: true }
+    },
+    {
+      payload: Buffer.from('020301', 'hex'),
+      data: { area: 2, channel: 3, status: false }
+    }
+  ],
+
+  // 16.1.2 Response Auto broadcast Dry Contact Status
+  '0x15D1': [
+    {
+      payload: Buffer.from('010100', 'hex'),
+      data: { area: 1, channel: 1, status: true }
+    },
+    {
+      payload: Buffer.from('030401', 'hex'),
+      data: { area: 3, channel: 4, status: false }
+    }
+  ],
+
   // 16.1.3 Read Dry Contact Status
   '0x15CE': {
     payload: Buffer.from('0102', 'hex'),
@@ -800,6 +837,62 @@ module.exports = {
     }
   ],
 
+  // 16.1.5 Dry Contact Multi-Channel Status
+  '0x6F00': [
+    {
+      payload: Buffer.from('01080F00', 'hex'),
+      data: {
+        subnet: 1,
+        declaredChannels: 8,
+        statusMask: 0x0F00,
+        channels: [
+          { number: 1, status: false },
+          { number: 2, status: false },
+          { number: 3, status: false },
+          { number: 4, status: false },
+          { number: 5, status: false },
+          { number: 6, status: false },
+          { number: 7, status: false },
+          { number: 8, status: false },
+          { number: 9, status: true },
+          { number: 10, status: true },
+          { number: 11, status: true },
+          { number: 12, status: true },
+          { number: 13, status: false },
+          { number: 14, status: false },
+          { number: 15, status: false },
+          { number: 16, status: false }
+        ]
+      }
+    },
+    {
+      payload: Buffer.from('0216AA55', 'hex'),
+      data: {
+        subnet: 2,
+        declaredChannels: 22,
+        statusMask: 0xAA55,
+        channels: [
+          { number: 1, status: true },
+          { number: 2, status: false },
+          { number: 3, status: true },
+          { number: 4, status: false },
+          { number: 5, status: true },
+          { number: 6, status: false },
+          { number: 7, status: true },
+          { number: 8, status: false },
+          { number: 9, status: false },
+          { number: 10, status: true },
+          { number: 11, status: false },
+          { number: 12, status: true },
+          { number: 13, status: false },
+          { number: 14, status: true },
+          { number: 15, status: false },
+          { number: 16, status: true }
+        ]
+      }
+    }
+  ],
+
   /* XX. Undocumented Operation Codes */
 
   // XX.1 Panel