@bitpoolos/edge-bacnet 1.0.6 → 1.1.0

package/resources/node-bacnet/lib/npdu.js

@@ -0,0 +1,123 @@
+'use strict';
+
+const baEnum      = require('./enum');
+const debug       = require('debug')('bacnet:npdu:debug');
+const trace       = require('debug')('bacnet:npdu:trace');
+
+const DEFAULT_HOP_COUNT = 0xFF;
+const BACNET_PROTOCOL_VERSION = 1;
+const BACNET_ADDRESS_TYPES = {
+  NONE: 0,
+  IP: 1
+};
+
+const decodeTarget = (buffer, offset) => {
+  let len = 0;
+  const target = {type: BACNET_ADDRESS_TYPES.NONE, net: (buffer[offset + len++] << 8) | (buffer[offset + len++] << 0)};
+  const adrLen = buffer[offset + len++];
+  if (adrLen > 0) {
+    target.adr = [];
+    for (let i = 0; i < adrLen; i++) {
+      target.adr.push(buffer[offset + len++]);
+    }
+  }
+  return {
+    target,
+    len
+  };
+};
+
+const encodeTarget = (buffer, target) => {
+  buffer.buffer[buffer.offset++] = (target.net & 0xFF00) >> 8;
+  buffer.buffer[buffer.offset++] = (target.net & 0x00FF) >> 0;
+  if (target.net === 0xFFFF || !target.adr) {
+    buffer.buffer[buffer.offset++] = 0;
+  } else {
+    buffer.buffer[buffer.offset++] = target.adr.length;
+    if (target.adr.length > 0) {
+      for (let i = 0; i < target.adr.length; i++) {
+        buffer.buffer[buffer.offset++] = target.adr[i];
+      }
+    }
+  }
+};
+
+module.exports.decodeFunction = (buffer, offset) => {
+  if (buffer[offset + 0] !== BACNET_PROTOCOL_VERSION) {
+    return undefined;
+  }
+  return buffer[offset + 1];
+};
+
+module.exports.decode = (buffer, offset) => {
+  let adrLen;
+  const orgOffset = offset;
+  offset++;
+  const funct = buffer[offset++];
+  let destination;
+  if (funct & baEnum.NpduControlBit.DESTINATION_SPECIFIED) {
+    const tmpDestination = decodeTarget(buffer, offset);
+    offset += tmpDestination.len;
+    destination = tmpDestination.target;
+  }
+  let source;
+  if (funct & baEnum.NpduControlBit.SOURCE_SPECIFIED) {
+    const tmpSource = decodeTarget(buffer, offset);
+    offset += tmpSource.len;
+    source = tmpSource.target;
+  }
+  let hopCount = 0;
+  if (funct & baEnum.NpduControlBit.DESTINATION_SPECIFIED) {
+    hopCount = buffer[offset++];
+  }
+  let networkMsgType = baEnum.NetworkLayerMessageType.WHO_IS_ROUTER_TO_NETWORK;
+  let vendorId = 0;
+  if (funct & baEnum.NpduControlBit.NETWORK_LAYER_MESSAGE) {
+    networkMsgType = buffer[offset++];
+    if (networkMsgType >= 0x80) {
+      vendorId = (buffer[offset++] << 8) | (buffer[offset++] << 0);
+    } else if (networkMsgType === baEnum.NetworkLayerMessageType.WHO_IS_ROUTER_TO_NETWORK) {
+      offset += 2;
+    }
+  }
+  if (buffer[orgOffset + 0] !== BACNET_PROTOCOL_VERSION) {
+    return undefined;
+  }
+  return {
+    len: offset - orgOffset,
+    funct,
+    destination,
+    source,
+    hopCount,
+    networkMsgType,
+    vendorId
+  };
+};
+
+module.exports.encode = (buffer, funct, destination, source, hopCount, networkMsgType, vendorId) => {
+  const hasDestination = destination && destination.net > 0;
+  const hasSource = source && source.net > 0 && source.net !== 0xFFFF;
+
+  buffer.buffer[buffer.offset++] = BACNET_PROTOCOL_VERSION;
+  buffer.buffer[buffer.offset++] = funct | (hasDestination ? baEnum.NpduControlBit.DESTINATION_SPECIFIED : 0) | (hasSource ? baEnum.NpduControlBit.SOURCE_SPECIFIED : 0);
+
+  if (hasDestination) {
+    encodeTarget(buffer, destination);
+  }
+
+  if (hasSource) {
+    encodeTarget(buffer, source);
+  }
+
+  if (hasDestination) {
+    buffer.buffer[buffer.offset++] = hopCount || DEFAULT_HOP_COUNT;
+  }
+
+  if ((funct & baEnum.NpduControlBit.NETWORK_LAYER_MESSAGE) > 0) {
+    buffer.buffer[buffer.offset++] = networkMsgType;
+    if (networkMsgType >= 0x80) {
+      buffer.buffer[buffer.offset++] = (vendorId & 0xFF00) >> 8;
+      buffer.buffer[buffer.offset++] = (vendorId & 0x00FF) >> 0;
+    }
+  }
+};

package/resources/{bacstack → node-bacnet}/lib/services/add-list-element.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, objectId, propertyId, arrayIndex, values) => {
   baAsn1.encodeContextObjectId(buffer, 0, objectId.type, objectId.instance);
@@ -20,7 +20,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
   let result;
   let decodedValue;
-  const value = {};
+  let value = {};
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
@@ -41,17 +41,23 @@ module.exports.decode = (buffer, offset, apduLen) => {
     value.property.index = baEnum.ASN1_ARRAY_ALL;
   }
   const values = [];
-  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 3)) return;
+  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 3)) {
+    return undefined;
+  }
   len++;
   while ((apduLen - len) > 1) {
     result = baAsn1.bacappDecodeApplicationData(buffer, offset + len, apduLen + offset, value.objectId.type, value.property.id);
-    if (!result) return;
+    if (!result) {
+      return undefined;
+    }
     len += result.len;
     delete result.len;
     values.push(result);
   }
   value.values = values;
-  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 3)) return;
+  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 3)) {
+    return undefined;
+  }
   len++;
   value.len = len;
   return value;

package/resources/{bacstack → node-bacnet}/lib/services/alarm-acknowledge.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, ackProcessId, eventObjectId, eventStateAcknowledged, ackSource, eventTimeStamp, ackTimeStamp) => {
   baAsn1.encodeContextUnsigned(buffer, 0, ackProcessId);
@@ -14,7 +14,7 @@ module.exports.encode = (buffer, ackProcessId, eventObjectId, eventStateAcknowle
 
 module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
-  const value = {};
+  let value = {};
   let result;
   let decodedValue;
   let date;

package/resources/{bacstack → node-bacnet}/lib/services/alarm-summary.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, alarms) => {
   alarms.forEach((alarm) => {
@@ -16,7 +17,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let decodedValue;
   const alarms = [];
   while ((apduLen - 3 - len) > 0) {
-    const value = {};
+    let value = {};
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
     decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
@@ -35,7 +36,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
     alarms.push(value);
   }
   return {
-    len: len,
-    alarms: alarms
+    len,
+    alarms
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/atomic-read-file.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, isStream, objectId, position, count) => {
   baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
@@ -28,7 +28,9 @@ module.exports.decode = (buffer, offset) => {
   let count = 0;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.OBJECTIDENTIFIER) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.OBJECTIDENTIFIER) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
   objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
@@ -37,44 +39,56 @@ module.exports.decode = (buffer, offset) => {
     len++;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.SIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.SIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     position = decodedValue.value;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.UNSIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.UNSIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     count = decodedValue.value;
-    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) return;
+    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) {
+      return undefined;
+    }
     len++;
   } else if (baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
     isStream = false;
     len++;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.SIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.SIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     position = decodedValue.value;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.UNSIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.UNSIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     count = decodedValue.value;
-    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
+    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+      return undefined;
+    }
     len++;
   } else {
-    return;
+    return undefined;
   }
   return {
-    len: len,
-    isStream: isStream,
-    objectId: objectId,
-    position: position,
-    count: count
+    len,
+    isStream,
+    objectId,
+    position,
+    count
   };
 };
 
@@ -100,40 +114,49 @@ module.exports.decodeAcknowledge = (buffer, offset) => {
   let len = 0;
   let result;
   let decodedValue;
+  let endOfFile;
   let isStream;
   let position;
   let targetBuffer;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.BOOLEAN) return;
-  const endOfFile = result.value > 0;
+  if (result.tagNumber !== baEnum.ApplicationTag.BOOLEAN) {
+    return undefined;
+  }
+  endOfFile = result.value > 0;
   if (baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 0)) {
     isStream = true;
     len++;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.SIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.SIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     position = decodedValue.value;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.OCTET_STRING) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.OCTET_STRING) {
+      return undefined;
+    }
     targetBuffer = buffer.slice(offset + len, offset + len + result.value);
     len += result.value;
-    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) return;
+    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) {
+      return undefined;
+    }
     len++;
   } else if (baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
     isStream = false;
-    throw new Error('NotImplemented');
+    throw new Error('NotImplemented'); //TODO is this catched somewhere or will it kill the process?
   } else {
-    return;
+    return undefined;
   }
   return {
-    len: len,
-    endOfFile: endOfFile,
-    isStream: isStream,
-    position: position,
+    len,
+    endOfFile,
+    isStream,
+    position,
     buffer: targetBuffer
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/atomic-write-file.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, isStream, objectId, position, blocks) => {
   baAsn1.encodeApplicationObjectId(buffer, objectId.type, objectId.instance);
@@ -27,65 +27,81 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let decodedValue;
   let isStream;
   let position;
-  const blocks = [];
+  let blocks = [];
   let blockCount;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.OBJECTIDENTIFIER) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.OBJECTIDENTIFIER) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
-  const objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
+  let objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
   if (baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 0)) {
     isStream = true;
     len++;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.SIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.SIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     position = decodedValue.value;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.OCTET_STRING) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.OCTET_STRING) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeOctetString(buffer, offset + len, apduLen, 0, result.value);
     len += decodedValue.len;
     blocks.push(decodedValue.value);
-    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) return;
+    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 0)) {
+      return undefined;
+    }
     len++;
   } else if (baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
     isStream = false;
     len++;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.SIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.SIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     position = decodedValue.value;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== baEnum.ApplicationTags.UNSIGNED_INTEGER) return;
+    if (result.tagNumber !== baEnum.ApplicationTag.UNSIGNED_INTEGER) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     blockCount = decodedValue.value;
     for (let i = 0; i < blockCount; i++) {
       result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
       len += result.len;
-      if (result.tagNumber !== baEnum.ApplicationTags.OCTET_STRING) return;
+      if (result.tagNumber !== baEnum.ApplicationTag.OCTET_STRING) {
+        return undefined;
+      }
       decodedValue = baAsn1.decodeOctetString(buffer, offset + len, apduLen, 0, result.value);
       len += decodedValue.len;
       blocks.push(decodedValue.value);
     }
-    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
+    if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+      return undefined;
+    }
     len++;
   } else {
-    return;
+    return undefined;
   }
   return {
-    len: len,
-    isStream: isStream,
-    objectId: objectId,
-    position: position,
-    blocks: blocks
+    len,
+    isStream,
+    objectId,
+    position,
+    blocks
   };
 };
 
@@ -101,6 +117,7 @@ module.exports.decodeAcknowledge = (buffer, offset) => {
   let len = 0;
   let isStream = false;
   let position = 0;
+  let decodedValue;
   const result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   if (result.tagNumber === 0) {
@@ -108,14 +125,14 @@ module.exports.decodeAcknowledge = (buffer, offset) => {
   } else if (result.tagNumber === 1) {
     isStream = false;
   } else {
-    return;
+    return undefined;
   }
-  const decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
+  decodedValue = baAsn1.decodeSigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   position = decodedValue.value;
   return {
-    len: len,
-    isStream: isStream,
-    position: position
+    len,
+    isStream,
+    position
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/cov-notify.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, subscriberProcessId, initiatingDeviceId, monitoredObjectId, timeRemaining, values) => {
   baAsn1.encodeContextUnsigned(buffer, 0, subscriberProcessId);
@@ -31,37 +31,49 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
   let result;
   let decodedValue;
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) return;
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   const subscriberProcessId = decodedValue.value;
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 1)) return;
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 1)) {
+    return undefined;
+  }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
   const initiatingDeviceId = {type: decodedValue.objectType, instance: decodedValue.instance};
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 2)) return;
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 2)) {
+    return undefined;
+  }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
   const monitoredObjectId = {type: decodedValue.objectType, instance: decodedValue.instance};
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 3)) return;
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 3)) {
+    return undefined;
+  }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   const timeRemaining = decodedValue.value;
-  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 4)) return;
+  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 4)) {
+    return undefined;
+  }
   len++;
   const values = [];
   while ((apduLen - len) > 1 && !baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 4)) {
-    const newEntry = {};
+    let newEntry = {};
     newEntry.property = {};
-    if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) return;
+    if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) {
+      return undefined;
+    }
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
     decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
@@ -76,12 +88,16 @@ module.exports.decode = (buffer, offset, apduLen) => {
     } else {
       newEntry.property.index = baEnum.ASN1_ARRAY_ALL;
     }
-    if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 2)) return;
+    if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 2)) {
+      return undefined;
+    }
     len++;
     const properties = [];
     while ((apduLen - len) > 1 && !baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 2)) {
       decodedValue = baAsn1.bacappDecodeApplicationData(buffer, offset + len, apduLen + offset, monitoredObjectId.type, newEntry.property.id);
-      if (!decodedValue) return;
+      if (!decodedValue) {
+        return undefined;
+      }
       len += decodedValue.len;
       delete decodedValue.len;
       properties.push(decodedValue);
@@ -100,11 +116,11 @@ module.exports.decode = (buffer, offset, apduLen) => {
     values.push(newEntry);
   }
   return {
-    len: len,
-    subscriberProcessId: subscriberProcessId,
-    initiatingDeviceId: initiatingDeviceId,
-    monitoredObjectId: monitoredObjectId,
-    timeRemaining: timeRemaining,
-    values: values
+    len,
+    subscriberProcessId,
+    initiatingDeviceId,
+    monitoredObjectId,
+    timeRemaining,
+    values
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/create-object.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, objectId, values) => {
   baAsn1.encodeOpeningTag(buffer, 0);
@@ -35,26 +35,32 @@ module.exports.decode = (buffer, offset, apduLen) => {
   len += result.len;
   if ((result.tagNumber === 0) && (apduLen > len)) {
     apduLen -= len;
-    if (apduLen < 4) return;
+    if (apduLen < 4) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeContextObjectId(buffer, offset + len, 1);
     len += decodedValue.len;
     objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
   } else {
-    return;
+    return undefined;
   }
   if (baAsn1.decodeIsClosingTag(buffer, offset + len)) {
     len++;
   }
-  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) return;
+  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   while ((apduLen - len) > 1) {
-    const newEntry = {};
+    let newEntry = {};
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== 0) return;
+    if (result.tagNumber !== 0) {
+      return undefined;
+    }
     decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
     len += decodedValue.len;
-    const propertyId = decodedValue.value;
+    let propertyId = decodedValue.value;
     let arraIndex = baEnum.ASN1_ARRAY_ALL;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
@@ -70,7 +76,9 @@ module.exports.decode = (buffer, offset, apduLen) => {
       const values = [];
       while (!baAsn1.decodeIsClosingTag(buffer, offset + len)) {
         decodedValue = baAsn1.bacappDecodeApplicationData(buffer, offset + len, apduLen + offset, objectId.type, propertyId);
-        if (!decodedValue) return;
+        if (!decodedValue) {
+          return undefined;
+        }
         len += decodedValue.len;
         delete decodedValue.len;
         values.push(decodedValue);
@@ -78,15 +86,17 @@ module.exports.decode = (buffer, offset, apduLen) => {
       len++;
       newEntry.value = values;
     } else {
-      return;
+      return undefined;
     }
     valueList.push(newEntry);
   }
-  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
+  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   return {
-    len: len,
-    objectId: objectId,
+    len,
+    objectId,
     values: valueList
   };
 };