@bitpoolos/edge-bacnet 1.0.6 → 1.1.0

package/resources/{bacstack → node-bacnet}/lib/services/read-property.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, objectType, objectInstance, propertyId, arrayIndex) => {
   if (objectType <= baEnum.ASN1_MAX_OBJECT) {
@@ -11,7 +11,7 @@ module.exports.encode = (buffer, objectType, objectInstance, propertyId, arrayIn
     baAsn1.encodeContextEnumerated(buffer, 1, propertyId);
   }
   if (arrayIndex !== baEnum.ASN1_ARRAY_ALL) {
-    baAsn1.encodeContextUnsigned(buffer, 2, arrayIndex || baEnum.ASN1_ARRAY_ALL);
+    baAsn1.encodeContextUnsigned(buffer, 2, (arrayIndex || arrayIndex === 0) ? arrayIndex : baEnum.ASN1_ARRAY_ALL);
   }
 };
 
@@ -19,16 +19,22 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
   let result;
   let decodedValue;
-  if (apduLen < 7) return;
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) return;
+  if (apduLen < 7) {
+    return undefined;
+  }
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
-  const objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
-  const property = {};
+  let objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
+  let property = {};
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   len += decodedValue.len;
   property.id = decodedValue.value;
@@ -41,14 +47,16 @@ module.exports.decode = (buffer, offset, apduLen) => {
       len += decodedValue.len;
       property.index = decodedValue.value;
     } else {
-      return;
+      return undefined;
     }
   }
-  if (len < apduLen) return;
+  if (len < apduLen) {
+    return undefined;
+  }
   return {
-    len: len,
-    objectId: objectId,
-    property: property
+    len,
+    objectId,
+    property
   };
 };
 
@@ -68,9 +76,11 @@ module.exports.encodeAcknowledge = (buffer, objectId, propertyId, arrayIndex, va
 module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
   let result;
   let decodedValue;
-  const objectId = {};
-  const property = {};
-  if (!baAsn1.decodeIsContextTag(buffer, offset, 0)) return;
+  let objectId = {};
+  let property = {};
+  if (!baAsn1.decodeIsContextTag(buffer, offset, 0)) {
+    return undefined;
+  }
   let len = 1;
   result = baAsn1.decodeObjectId(buffer, offset + len);
   len += result.len;
@@ -78,7 +88,9 @@ module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
   objectId.instance = result.instance;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   result = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   len += result.len;
   property.id = result.value;
@@ -92,21 +104,27 @@ module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
     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, objectId.type, property.id);
-    if (!result) return;
+    if (!result) {
+      return undefined;
+    }
     len += result.len;
     delete result.len;
     values.push(result);
   }
-  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 3)) return;
+  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 3)) {
+    return undefined;
+  }
   len++;
   return {
-    len: len,
-    objectId: objectId,
-    property: property,
-    values: values
+    len,
+    objectId,
+    property,
+    values
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/read-range.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, requestType, position, time, count) => {
   baAsn1.encodeContextObjectId(buffer, 0, objectId.type, objectId.instance);
@@ -42,15 +42,19 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let position;
   let time;
   let count;
-  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) return;
+  if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len, 0);
   len += decodedValue.len;
-  const objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
-  const property = {};
+  let objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
+  let property = {};
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   len += decodedValue.len;
   property.id = decodedValue.value;
@@ -67,7 +71,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
     result = baAsn1.decodeTagNumber(buffer, offset + len);
     len += result.len;
     switch (result.tagNumber) {
-      case 3: {
+      case 3:
         requestType = baEnum.ReadRangeType.BY_POSITION;
         result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
         len += result.len;
@@ -80,7 +84,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
         len += decodedValue.len;
         count = decodedValue.value;
         break;
-      } case 6: {
+      case 6:
         requestType = baEnum.ReadRangeType.BY_SEQUENCE_NUMBER;
         result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
         len += result.len;
@@ -93,7 +97,7 @@ module.exports.decode = (buffer, offset, apduLen) => {
         len += decodedValue.len;
         count = decodedValue.value;
         break;
-      } case 7: {
+      case 7:
         requestType = baEnum.ReadRangeType.BY_TIME_REFERENCE_TIME_COUNT;
         decodedValue = baAsn1.decodeApplicationDate(buffer, offset + len);
         len += decodedValue.len;
@@ -108,20 +112,20 @@ module.exports.decode = (buffer, offset, apduLen) => {
         len += decodedValue.len;
         count = decodedValue.value;
         break;
-      } default:
-        return;
+      default:
+        return undefined;
     }
     result = baAsn1.decodeTagNumber(buffer, offset + len);
     len += result.len;
   }
   return {
-    len: len,
-    objectId: objectId,
-    property: property,
-    requestType: requestType,
-    position: position,
-    time: time,
-    count: count
+    len,
+    objectId,
+    property,
+    requestType,
+    position,
+    time,
+    count
   };
 };
 
@@ -148,7 +152,9 @@ module.exports.decodeAcknowledge = (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;
+  }
   len++;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
@@ -156,7 +162,9 @@ module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
   const property = {index: baEnum.ASN1_ARRAY_ALL};
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   len += decodedValue.len;
   property.id = decodedValue.value;
@@ -177,15 +185,17 @@ module.exports.decodeAcknowledge = (buffer, offset, apduLen) => {
   decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   const itemCount = decodedValue.value;
-  if (!(baAsn1.decodeIsOpeningTag(buffer, offset + len))) return;
+  if (!(baAsn1.decodeIsOpeningTag(buffer, offset + len))) {
+    return undefined;
+  }
   len++;
   const rangeBuffer = buffer.slice(offset + len, apduLen - 3);
   return {
-    objectId: objectId,
-    property: property,
-    resultFlag: resultFlag,
-    itemCount: itemCount,
-    rangeBuffer: rangeBuffer,
-    len: len
+    objectId,
+    property,
+    resultFlag,
+    itemCount,
+    rangeBuffer,
+    len
   };
 };

package/resources/node-bacnet/lib/services/register-foreign-device.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
+
+module.exports.encode = (buffer, ttl, length = 2) => {
+  baAsn1.encodeUnsigned(buffer, ttl, length);
+};
+
+module.exports.decode = (buffer, offset, length = 2) => {
+  let len = 0;
+  let result = baAsn1.decodeUnsigned(buffer, offset + len, length);
+  len += result.len;
+  return {
+    len,
+    ttl: result.value,
+  };
+};

package/resources/{bacstack → node-bacnet}/lib/services/reinitialize-device.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, state, password) => {
   baAsn1.encodeContextEnumerated(buffer, 0, state);
@@ -11,16 +12,20 @@ module.exports.encode = (buffer, state, password) => {
 
 module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
-  const value = {};
+  let value = {};
   let result;
-  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;
   let decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   value.state = decodedValue.value;
   len += decodedValue.len;
   if (len < apduLen) {
-    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.decodeCharacterString(buffer, offset + len, apduLen - (offset + len), result.value);

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

@@ -1,6 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, subscriberProcessId, monitoredObjectId, cancellationRequest, issueConfirmedNotifications, lifetime) => {
   baAsn1.encodeContextUnsigned(buffer, 0, subscriberProcessId);
@@ -13,16 +14,20 @@ module.exports.encode = (buffer, subscriberProcessId, monitoredObjectId, cancell
 
 module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
-  const value = {};
+  let value = {};
   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;
   value.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);

package/resources/{bacstack → node-bacnet}/lib/services/subscribe-property.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, monitoredObjectId, cancellationRequest, issueConfirmedNotifications, lifetime, monitoredProperty, covIncrementPresent, covIncrement) => {
   baAsn1.encodeContextUnsigned(buffer, 0, subscriberProcessId);
@@ -23,16 +23,20 @@ module.exports.encode = (buffer, subscriberProcessId, monitoredObjectId, cancell
 
 module.exports.decode = (buffer, offset) => {
   let len = 0;
-  const value = {};
+  let value = {};
   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;
   value.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);
@@ -55,10 +59,14 @@ module.exports.decode = (buffer, offset) => {
     len += decodedValue.len;
     value.lifetime = decodedValue.value;
   }
-  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 4)) return;
+  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 4)) {
+    return undefined;
+  }
   len++;
   value.monitoredProperty = {};
-  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);
@@ -72,7 +80,9 @@ module.exports.decode = (buffer, offset) => {
     len += decodedValue.len;
     value.monitoredProperty.index = decodedValue.value;
   }
-  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 4)) return;
+  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 4)) {
+    return undefined;
+  }
   len++;
   value.covIncrement = 0;
   if (baAsn1.decodeIsContextTag(buffer, offset + len, 5)) {

package/resources/{bacstack → node-bacnet}/lib/services/time-sync.js

@@ -1,7 +1,26 @@
+/**
+ * The timeSync event represents the request to synchronize the local time to
+ * the received time.
+ *
+ * @event bacnet.timeSync
+ * @param {date} dateTime - The time to be synchronized to.
+ *
+ * @example
+ * const bacnet = require('node-bacnet');
+ * const client = new bacnet();
+ *
+ * client.on('timeSync', (msg) => {
+ *   console.log(
+ *     'address: ', msg.header.address,
+ *     ' - dateTime: ', msg.payload.dateTime
+ *   );
+ * });
+ */
+
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, time) => {
   baAsn1.encodeApplicationDate(buffer, time);
@@ -13,16 +32,20 @@ module.exports.decode = (buffer, offset, length) => {
   let result;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.DATE) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.DATE) {
+    return undefined;
+  }
   const date = baAsn1.decodeDate(buffer, offset + len);
   len += date.len;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.TIME) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.TIME) {
+    return undefined;
+  }
   const time = baAsn1.decodeBacnetTime(buffer, offset + len);
   len += time.len;
   return {
-    len: len,
+    len,
     value: new Date(date.value.getFullYear(), date.value.getMonth(), date.value.getDate(), time.value.getHours(), time.value.getMinutes(), time.value.getSeconds(), time.value.getMilliseconds())
   };
 };

package/resources/{bacstack → node-bacnet}/lib/services/who-has.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, lowLimit, highLimit, objectId, objectName) => {
   if ((lowLimit >= 0) && (lowLimit <= baEnum.ASN1_MAX_INSTANCE) && (highLimit >= 0) && (highLimit <= baEnum.ASN1_MAX_INSTANCE)) {
@@ -17,7 +17,7 @@ module.exports.encode = (buffer, lowLimit, highLimit, objectId, objectName) => {
 
 module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
-  const value = {};
+  let value = {};
   let decodedValue;
   let result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;

package/resources/{bacstack → node-bacnet}/lib/services/who-is.js

@@ -1,7 +1,28 @@
+/**
+ * The whoIs event represents the request for an IAm reponse to detect all
+ * devices in a BACNET network.
+ *
+ * @event bacnet.whoIs
+ * @param {number=} lowLimit - The lowest BACnet ID being queried.
+ * @param {number=} highLimit - The highest BACnet ID being queried.
+ *
+ * @example
+ * const bacnet = require('node-bacnet');
+ * const client = new bacnet();
+ *
+ * client.on('whoIs', (msg) => {
+ *   console.log(
+ *     'address: ', msg.header.address,
+ *     ' - lowLimit: ', msg.payload.lowLimit,
+ *     ' - highLimit: ', msg.payload.highLimit
+ *   );
+ * });
+ */
+
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 module.exports.encode = (buffer, lowLimit, highLimit) => {
   if ((lowLimit >= 0) && (lowLimit <= baEnum.ASN1_MAX_INSTANCE) && (highLimit >= 0) && (highLimit <= baEnum.ASN1_MAX_INSTANCE)) {
@@ -12,22 +33,34 @@ module.exports.encode = (buffer, lowLimit, highLimit) => {
 
 module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
-  const value = {};
-  if (apduLen <= 0) return {};
+  let value = {};
+  if (apduLen <= 0) {
+    return {}; // TODO: why??
+  }
   let result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 0) return;
-  if (apduLen <= len) return;
+  if (result.tagNumber !== 0) {
+    return undefined;
+  }
+  if (apduLen <= len) {
+    return undefined;
+  }
   let decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   if (decodedValue.value <= baEnum.ASN1_MAX_INSTANCE) {
     value.lowLimit = decodedValue.value;
   }
-  if (apduLen <= len) return;
+  if (apduLen <= len) {
+    return undefined;
+  }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
-  if (apduLen <= len) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
+  if (apduLen <= len) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   if (decodedValue.value <= baEnum.ASN1_MAX_INSTANCE) {

package/resources/{bacstack → node-bacnet}/lib/services/write-property-multiple.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const baAsn1 = require('../asn1');
-const baEnum = require('../enum');
+const baAsn1      = require('../asn1');
+const baEnum      = require('../enum');
 
 const encode = module.exports.encode = (buffer, objectId, values) => {
   baAsn1.encodeContextObjectId(buffer, 0, objectId.type, objectId.instance);
@@ -27,28 +27,37 @@ module.exports.decode = (buffer, offset, apduLen) => {
   let len = 0;
   let result;
   let decodedValue;
+  let objectId;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if ((result.tagNumber !== 0) || (apduLen <= len)) return;
+  if ((result.tagNumber !== 0) || (apduLen <= len)) {
+    return undefined;
+  }
   apduLen -= len;
-  if (apduLen < 4) return;
+  if (apduLen < 4) {
+    return undefined;
+  }
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
-  const objectId = {
+  objectId = {
     type: decodedValue.objectType,
     instance: decodedValue.instance
   };
-  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) return;
+  if (!baAsn1.decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   const _values = [];
   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 arrayIndex = baEnum.ASN1_ARRAY_ALL;
     result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
@@ -60,11 +69,15 @@ module.exports.decode = (buffer, offset, apduLen) => {
       len += result.len;
     }
     newEntry.property = {id: propertyId, index: arrayIndex};
-    if ((result.tagNumber !== 2) || (!baAsn1.decodeIsOpeningTag(buffer, offset + len - 1))) return;
+    if ((result.tagNumber !== 2) || (!baAsn1.decodeIsOpeningTag(buffer, offset + len - 1))) {
+      return undefined;
+    }
     const values = [];
     while ((len + offset) <= buffer.length && !baAsn1.decodeIsClosingTag(buffer, offset + len)) {
-      const value = baAsn1.bacappDecodeApplicationData(buffer, offset + len, apduLen + offset, objectId.type, propertyId);
-      if (!value) return;
+      let value = baAsn1.bacappDecodeApplicationData(buffer, offset + len, apduLen + offset, objectId.type, propertyId);
+      if (!value) {
+        return undefined;
+      }
       len += value.len;
       delete value.len;
       values.push(value);
@@ -83,12 +96,16 @@ module.exports.decode = (buffer, offset, apduLen) => {
     }
     newEntry.priority = priority;
     _values.push(newEntry);
+    if (baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+      len++;
+    }
+  }
+  if (baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+    len++;
   }
-  if (!baAsn1.decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
-  len++;
   return {
-    len: len,
-    objectId: objectId,
+    len,
+    objectId,
     values: _values
   };
 };