smart-bus 0.7.0 → 0.9.0

package/lib/commands.js

@@ -89,7 +89,7 @@ var AC = {
   },
 
   encode: function(data) {
-    var buffer = new Buffer(13);
+    var buffer = Buffer.allocUnsafe(13);
 
     var temperature = data.temperature || {};
     var current = data.current || {};
@@ -144,7 +144,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.scene]);
+      return Buffer.from([data.area, data.scene]);
     },
 
     response: 0x0003
@@ -180,7 +180,7 @@ module.exports = {
       var channels = data.channels || [];
       var length = channels.length;
       var bytes = Math.ceil(length / 8);
-      var buffer = new Buffer(3 + bytes);
+      var buffer = Buffer.allocUnsafe(3 + bytes);
 
       buffer.writeUInt8(data.area, 0);
       buffer.writeUInt8(data.scene, 1);
@@ -210,7 +210,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area]);
+      return Buffer.from([data.area]);
     },
 
     response: 0x000D
@@ -226,7 +226,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.scene]);
+      return Buffer.from([data.area, data.scene]);
     }
   },
 
@@ -266,7 +266,7 @@ module.exports = {
       var channels = data.channels || [];
       var length = channels.length;
       var bytes = Math.ceil(length / 8);
-      var buffer = new Buffer(2 + areas.length + bytes);
+      var buffer = Buffer.allocUnsafe(2 + areas.length + bytes);
 
       buffer.writeUInt8(areas.length, 0);
 
@@ -329,7 +329,7 @@ module.exports = {
       var device = data.device;
       var channels = data.channels;
       var length = channels.length;
-      var buffer = new Buffer(5 + length);
+      var buffer = Buffer.allocUnsafe(5 + length);
 
       word.encode(buffer, device.type, 0);
       buffer.writeUInt8(device.subnet, 2);
@@ -360,7 +360,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.scene]);
+      return Buffer.from([data.area, data.scene]);
     },
 
     response: 0x0001
@@ -391,7 +391,7 @@ module.exports = {
     encode: function(data) {
       var channels = data.channels || [];
       var length = channels.length;
-      var buffer = new Buffer(4 + length);
+      var buffer = Buffer.allocUnsafe(4 + length);
 
       buffer.writeUInt8(data.area, 0);
       buffer.writeUInt8(data.scene, 1);
@@ -420,7 +420,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(1);
+      var buffer = Buffer.allocUnsafe(1);
 
       status.encode(buffer, data.success, 0);
 
@@ -440,7 +440,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.sequence]);
+      return Buffer.from([data.area, data.sequence]);
     },
 
     response: 0x001B
@@ -456,7 +456,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.sequence]);
+      return Buffer.from([data.area, data.sequence]);
     }
   },
 
@@ -467,7 +467,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area]);
+      return Buffer.from([data.area]);
     },
 
     response: 0xE015
@@ -483,7 +483,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.area, data.sequence]);
+      return Buffer.from([data.area, data.sequence]);
     }
   },
 
@@ -502,7 +502,7 @@ module.exports = {
     encode: function(data) {
       var areas = data.areas || [];
       var length = areas.length;
-      var buffer = new Buffer(length);
+      var buffer = Buffer.allocUnsafe(length);
 
       for (var i = 0; i < length; i++)
         buffer.writeUInt8(areas[i].sequence, i);
@@ -524,7 +524,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(4);
+      var buffer = Buffer.allocUnsafe(4);
 
       buffer.writeUInt8(data.channel, 0);
       buffer.writeUInt8(data.level, 1);
@@ -546,7 +546,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(3);
+      var buffer = Buffer.allocUnsafe(3);
 
       buffer.writeUInt8(data.channel, 0);
       status.encode(buffer, data.success, 1);
@@ -576,7 +576,7 @@ module.exports = {
     encode: function(data) {
       var channels = data.channels || [];
       var length = channels.length;
-      var buffer = new Buffer(length + 1);
+      var buffer = Buffer.allocUnsafe(length + 1);
 
       buffer.writeUInt8(length, 0);
 
@@ -608,7 +608,7 @@ module.exports = {
     encode: function(data) {
       var channels = data.channels || [];
       var length = channels.length;
-      var buffer = new Buffer(length + 1);
+      var buffer = Buffer.allocUnsafe(length + 1);
 
       buffer.writeUInt8(length, 0);
 
@@ -631,7 +631,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.block, data.status ? 1 : 0]);
+      return Buffer.from([data.block, data.status ? 1 : 0]);
     }
   },
 
@@ -646,7 +646,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.block, data.status ? 1 : 0]);
+      return Buffer.from([data.block, data.status ? 1 : 0]);
     }
   },
 
@@ -657,7 +657,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.block]);
+      return Buffer.from([data.block]);
     }
   },
 
@@ -673,7 +673,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.block, data.status ? 1 : 0]);
+      return Buffer.from([data.block, data.status ? 1 : 0]);
     }
   },
 
@@ -688,7 +688,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.block, data.status ? 1 : 0]);
+      return Buffer.from([data.block, data.status ? 1 : 0]);
     }
   },
 
@@ -707,7 +707,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(8);
+      var buffer = Buffer.allocUnsafe(8);
 
       status.encode(buffer, data.success, 0);
       date.encode(buffer, data.date, 1);
@@ -727,7 +727,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(7);
+      var buffer = Buffer.allocUnsafe(7);
 
       date.encode(buffer, data.date, 0);
 
@@ -744,7 +744,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(1);
+      var buffer = Buffer.allocUnsafe(1);
 
       status.encode(buffer, data.success, 0);
 
@@ -759,7 +759,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(6);
+      var buffer = Buffer.allocUnsafe(6);
 
       date.encode(buffer, data.date, 0);
 
@@ -779,7 +779,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(2);
+      var buffer = Buffer.allocUnsafe(2);
 
       buffer.writeUInt8(data.switch, 0);
       buffer.writeUInt8(data.status ? 255 : 0, 1);
@@ -800,7 +800,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(2);
+      var buffer = Buffer.allocUnsafe(2);
 
       buffer.writeUInt8(data.switch, 0);
       buffer.writeUInt8(data.status ? 1 : 0, 1);
@@ -816,7 +816,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.switch]);
+      return Buffer.from([data.switch]);
     },
 
     response: 0xE019
@@ -833,7 +833,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(2);
+      var buffer = Buffer.allocUnsafe(2);
 
       buffer.writeUInt8(data.switch, 0);
       buffer.writeUInt8(data.status ? 1 : 0, 1);
@@ -860,7 +860,7 @@ module.exports = {
     encode: function(data) {
       var switches = data.switches || [];
       var length = switches.length;
-      var buffer = new Buffer(length + 1);
+      var buffer = Buffer.allocUnsafe(length + 1);
 
       buffer.writeUInt8(length, 0);
 
@@ -883,7 +883,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.curtain, data.status]);
+      return Buffer.from([data.curtain, data.status]);
     },
 
     response: 0xE3E1
@@ -900,7 +900,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.curtain, data.status]);
+      return Buffer.from([data.curtain, data.status]);
     }
   },
 
@@ -911,7 +911,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.curtain]);
+      return Buffer.from([data.curtain]);
     },
 
     response: 0xE3E3
@@ -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 new Buffer([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]);
+      }
     }
   },
 
@@ -953,7 +968,7 @@ module.exports = {
     encode: function(data) {
       var curtains = data.curtains || [];
       var length = curtains.length;
-      var buffer = new Buffer(length * 2);
+      var buffer = Buffer.allocUnsafe(length * 2);
 
       for (var i = 0; i < length; i++) {
         var curtain = curtains[i];
@@ -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
@@ -986,7 +1034,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.key, data.value]);
+      return Buffer.from([data.key, data.value]);
     },
 
     response: 0xE3D9
@@ -1003,7 +1051,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.key, data.value]);
+      return Buffer.from([data.key, data.value]);
     }
   },
 
@@ -1014,7 +1062,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.key]);
+      return Buffer.from([data.key]);
     },
 
     response: 0xE3DB
@@ -1031,7 +1079,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.key, data.value]);
+      return Buffer.from([data.key, data.value]);
     }
   },
 
@@ -1091,7 +1139,7 @@ module.exports = {
 
     encode: function(data) {
       var timerPresent = (data.timer === undefined) ? 0 : 1;
-      var buffer = new Buffer(8 + timerPresent);
+      var buffer = Buffer.allocUnsafe(8 + timerPresent);
       var temperature = data.temperature;
 
       buffer.writeUInt8(temperature.type, 0);
@@ -1128,7 +1176,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(7);
+      var buffer = Buffer.allocUnsafe(7);
       var temperature = data.temperature;
 
       buffer.writeInt8(temperature.type, 0);
@@ -1164,7 +1212,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(8);
+      var buffer = Buffer.allocUnsafe(8);
       var temperature = data.temperature;
 
       status.encode(buffer, data.success, 0);
@@ -1189,7 +1237,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.channel]);
+      return Buffer.from([data.channel]);
     },
 
     response: 0x1C5F
@@ -1227,7 +1275,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(13);
+      var buffer = Buffer.allocUnsafe(13);
 
       var work = data.work;
       var watering = data.watering;
@@ -1276,7 +1324,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(10);
+      var buffer = Buffer.allocUnsafe(10);
 
       var work = data.work;
       var temperature = data.temperature;
@@ -1324,7 +1372,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(10);
+      var buffer = Buffer.allocUnsafe(10);
 
       var work = data.work;
       var temperature = data.temperature;
@@ -1381,7 +1429,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.logic]);
+      return Buffer.from([data.logic]);
     },
 
     response: 0xDB01
@@ -1407,7 +1455,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(8);
+      var buffer = Buffer.allocUnsafe(8);
       var contacts = data.dryContacts || [];
 
       for (var i = 0; i < 2; i++)
@@ -1459,7 +1507,7 @@ module.exports = {
       var contacts = data.dryContacts || [];
       var hasSonic = data.hasOwnProperty('sonic');
 
-      var buffer = new Buffer(hasSonic ? 8 : 7);
+      var buffer = Buffer.allocUnsafe(hasSonic ? 8 : 7);
 
       status.encode(buffer, data.success, 0);
       buffer.writeUInt8(data.temperature + 20, 1);
@@ -1505,7 +1553,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(7);
+      var buffer = Buffer.allocUnsafe(7);
       var contacts = data.dryContacts || [];
 
       buffer.writeUInt8(data.temperature + 20, 0);
@@ -1554,7 +1602,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(10);
+      var buffer = Buffer.allocUnsafe(10);
       var contacts = data.dryContacts || [];
 
       status.encode(buffer, data.success, 0);
@@ -1599,7 +1647,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(9);
+      var buffer = Buffer.allocUnsafe(9);
       var contacts = data.dryContacts || [];
 
       status.encode(buffer, data.success, 0);
@@ -1625,7 +1673,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.channel]);
+      return Buffer.from([data.channel]);
     },
 
     response: 0xE3E8
@@ -1649,7 +1697,7 @@ module.exports = {
 
       if (temperature < 0) temperature = -temperature;
 
-      return new Buffer([data.channel, temperature | sign]);
+      return Buffer.from([data.channel, temperature | sign]);
     }
   },
 
@@ -1676,7 +1724,7 @@ module.exports = {
 
       if (temperature < 0) temperature = -temperature;
 
-      return new Buffer([data.channel, temperature | sign]);
+      return Buffer.from([data.channel, temperature | sign]);
     }
   },
 
@@ -1689,7 +1737,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.channel]);
+      return Buffer.from([data.channel]);
     },
 
     response: 0x1949
@@ -1705,7 +1753,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(5);
+      var buffer = Buffer.allocUnsafe(5);
 
       buffer.writeUInt8(data.channel, 0);
       buffer.writeFloatLE(data.temperature, 1);
@@ -1749,12 +1797,44 @@ module.exports = {
   // 0x021B
 
   /* 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: {
@@ -1766,7 +1846,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(2);
+      var buffer = Buffer.allocUnsafe(2);
 
       buffer.writeUInt8(data.area, 0);
       buffer.writeUInt8(data.switch, 1);
@@ -1789,7 +1869,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(3);
+      var buffer = Buffer.allocUnsafe(3);
       buffer.writeUInt8(data.area, 0);
       buffer.writeUInt8(data.switch, 1);
       buffer.writeUInt8(data.contact ? 1 : 0, 2);
@@ -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
@@ -1884,7 +2012,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(3);
+      var buffer = Buffer.allocUnsafe(3);
 
       buffer.writeUInt8(data.backlight, 0);
       buffer.writeUInt8(data.statusLights, 1);
@@ -1903,7 +2031,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(1);
+      var buffer = Buffer.allocUnsafe(1);
 
       status.encode(buffer, data.success, 0);
 
@@ -1924,7 +2052,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      var buffer = new Buffer(7);
+      var buffer = Buffer.allocUnsafe(7);
 
       buffer.writeUInt8(data.button, 0);
       buffer.writeUInt8(data.color.on[0], 1);
@@ -1947,7 +2075,7 @@ module.exports = {
     },
 
     encode: function(data) {
-      return new Buffer([data.button]);
+      return Buffer.from([data.button]);
     }
   }
 };