Merge pull request #84 from fh1ch/refactor/es6

refactor: rework whole project to utilize ES6
fh1ch · Dec 30, 2017 · 65f9385 · 65f9385
2 parents 229095c + 9415810
commit 65f9385
Show file tree

Hide file tree

Showing 40 changed files with 1,672 additions and 1,621 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -43,6 +43,8 @@
     "browser": true,
     "node": true,
 
+    "esversion": 6,
+
     "globals": {
         "describe": false,
         "it": false

diff --git a/README.md b/README.md
@@ -63,13 +63,13 @@ following services are already supported at this point in time:
 ### Example
 
 ``` js
-var bacnet = require('bacstack');
+const bacnet = require('bacstack');
 
 // Initialize BACStack
-var client = new bacnet({adpuTimeout: 6000});
+const client = new bacnet({adpuTimeout: 6000});
 
 // Discover Devices
-client.on('iAm', function(device) {
+client.on('iAm', (device) => {
   console.log('address: ', device.address);
   console.log('deviceId: ', device.deviceId);
   console.log('maxAdpu: ', device.maxAdpu);
@@ -79,11 +79,11 @@ client.on('iAm', function(device) {
 client.whoIs();
 
 // Read Device Object
-var requestArray = [{
+const requestArray = [{
   objectId: {type: 8, instance: 4194303},
   properties: [{id: 8}]
 }];
-client.readPropertyMultiple('192.168.1.43', requestArray, function(err, value) {
+client.readPropertyMultiple('192.168.1.43', requestArray, (err, value) => {
   console.log('value: ', value);
 });
 ```

diff --git a/index.js b/index.js
@@ -1,2 +1,4 @@
+'use strict';
+
 module.exports = require('./lib/client');
 module.exports.enum = require('./lib/enum');
diff --git a/lib/adpu.js b/lib/adpu.js
@@ -1,15 +1,17 @@
-var baEnum = require('./enum');
+'use strict';
 
-var getDecodedType = module.exports.getDecodedType = function(buffer, offset) {
+const baEnum      = require('./enum');
+
+const getDecodedType = module.exports.getDecodedType = (buffer, offset) => {
   return buffer[offset];
 };
 
-module.exports.setDecodedType = function(buffer, offset, type) {
+module.exports.setDecodedType = (buffer, offset, type) => {
   buffer[offset] = type;
 };
 
-module.exports.getDecodedInvokeId = function(buffer, offset) {
-  var type = getDecodedType(buffer, offset);
+module.exports.getDecodedInvokeId = (buffer, offset) => {
+  const type = getDecodedType(buffer, offset);
   switch (type & baEnum.PduTypes.PDU_TYPE_MASK) {
     case baEnum.PduTypes.PDU_TYPE_SIMPLE_ACK:
     case baEnum.PduTypes.PDU_TYPE_COMPLEX_ACK:
@@ -24,7 +26,7 @@ module.exports.getDecodedInvokeId = function(buffer, offset) {
   }
 };
 
-module.exports.encodeConfirmedServiceRequest = function(buffer, type, service, maxSegments, maxAdpu, invokeId, sequencenumber, proposedWindowSize) {
+module.exports.encodeConfirmedServiceRequest = (buffer, type, service, maxSegments, maxAdpu, invokeId, sequencenumber, proposedWindowSize) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = maxSegments | maxAdpu;
   buffer.buffer[buffer.offset++] = invokeId;
@@ -35,19 +37,19 @@ module.exports.encodeConfirmedServiceRequest = function(buffer, type, service, m
   buffer.buffer[buffer.offset++] = service;
 };
 
-module.exports.decodeConfirmedServiceRequest = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var maxSegments = buffer[offset] & 0xF0;
-  var maxAdpu = buffer[offset++] & 0x0F;
-  var invokeId = buffer[offset++];
-  var sequencenumber = 0;
-  var proposedWindowNumber = 0;
+module.exports.decodeConfirmedServiceRequest = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const maxSegments = buffer[offset] & 0xF0;
+  const maxAdpu = buffer[offset++] & 0x0F;
+  const invokeId = buffer[offset++];
+  let sequencenumber = 0;
+  let proposedWindowNumber = 0;
   if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
     sequencenumber = buffer[offset++];
     proposedWindowNumber = buffer[offset++];
   }
-  var service = buffer[offset++];
+  const service = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
@@ -60,33 +62,33 @@ module.exports.decodeConfirmedServiceRequest = function(buffer, offset) {
   };
 };
 
-module.exports.encodeUnconfirmedServiceRequest = function(buffer, type, service) {
+module.exports.encodeUnconfirmedServiceRequest = (buffer, type, service) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = service;
 };
 
-module.exports.decodeUnconfirmedServiceRequest = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var service = buffer[offset++];
+module.exports.decodeUnconfirmedServiceRequest = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const service = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
     service: service
   };
 };
 
-module.exports.encodeSimpleAck = function(buffer, type, service, invokeId) {
+module.exports.encodeSimpleAck = (buffer, type, service, invokeId) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = invokeId;
   buffer.buffer[buffer.offset++] = service;
 };
 
-module.exports.decodeSimpleAck = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var invokeId = buffer[offset++];
-  var service = buffer[offset++];
+module.exports.decodeSimpleAck = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const invokeId = buffer[offset++];
+  const service = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
@@ -95,8 +97,8 @@ module.exports.decodeSimpleAck = function(buffer, offset) {
   };
 };
 
-module.exports.encodeComplexAck = function(buffer, type, service, invokeId, sequencenumber, proposedWindowNumber) {
-  var len = 3;
+module.exports.encodeComplexAck = (buffer, type, service, invokeId, sequencenumber, proposedWindowNumber) => {
+  let len = 3;
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = invokeId;
   if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
@@ -108,17 +110,17 @@ module.exports.encodeComplexAck = function(buffer, type, service, invokeId, sequ
   return len;
 };
 
-module.exports.decodeComplexAck = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var invokeId = buffer[offset++];
-  var sequencenumber = 0;
-  var proposedWindowNumber = 0;
+module.exports.decodeComplexAck = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const invokeId = buffer[offset++];
+  let sequencenumber = 0;
+  let proposedWindowNumber = 0;
   if ((type & baEnum.PduTypes.SEGMENTED_MESSAGE) > 0) {
     sequencenumber = buffer[offset++];
     proposedWindowNumber = buffer[offset++];
   }
-  var service = buffer[offset++];
+  const service = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
@@ -129,19 +131,19 @@ module.exports.decodeComplexAck = function(buffer, offset) {
   };
 };
 
-module.exports.encodeSegmentAck = function(buffer, type, originalInvokeId, sequencenumber, actualWindowSize) {
+module.exports.encodeSegmentAck = (buffer, type, originalInvokeId, sequencenumber, actualWindowSize) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = originalInvokeId;
   buffer.buffer[buffer.offset++] = sequencenumber;
   buffer.buffer[buffer.offset++] = actualWindowSize;
 };
 
-module.exports.decodeSegmentAck = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var originalInvokeId = buffer[offset++];
-  var sequencenumber = buffer[offset++];
-  var actualWindowSize = buffer[offset++];
+module.exports.decodeSegmentAck = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const originalInvokeId = buffer[offset++];
+  const sequencenumber = buffer[offset++];
+  const actualWindowSize = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
@@ -151,17 +153,17 @@ module.exports.decodeSegmentAck = function(buffer, offset) {
   };
 };
 
-module.exports.encodeError = function(buffer, type, service, invokeId) {
+module.exports.encodeError = (buffer, type, service, invokeId) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = invokeId;
   buffer.buffer[buffer.offset++] = service;
 };
 
-module.exports.decodeError = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var invokeId = buffer[offset++];
-  var service = buffer[offset++];
+module.exports.decodeError = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const invokeId = buffer[offset++];
+  const service = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,
@@ -170,17 +172,17 @@ module.exports.decodeError = function(buffer, offset) {
   };
 };
 
-module.exports.encodeAbort = function(buffer, type, invokeId, reason) {
+module.exports.encodeAbort = (buffer, type, invokeId, reason) => {
   buffer.buffer[buffer.offset++] = type;
   buffer.buffer[buffer.offset++] = invokeId;
   buffer.buffer[buffer.offset++] = reason;
 };
 
-module.exports.decodeAbort = function(buffer, offset) {
-  var orgOffset = offset;
-  var type = buffer[offset++];
-  var invokeId = buffer[offset++];
-  var reason = buffer[offset++];
+module.exports.decodeAbort = (buffer, offset) => {
+  const orgOffset = offset;
+  const type = buffer[offset++];
+  const invokeId = buffer[offset++];
+  const reason = buffer[offset++];
   return {
     len: offset - orgOffset,
     type: type,