@bitpoolos/edge-bacnet 1.0.6 → 1.1.0

package/resources/{bacstack → node-bacnet}/lib/asn1.js

@@ -1,105 +1,105 @@
-var iconv         = require('iconv-lite');
-var baEnum        = require('./enum');
-
-var BACNET_MAX_OBJECT = module.exports.BACNET_MAX_OBJECT = 0x3FF;
-var BACNET_INSTANCE_BITS = module.exports.BACNET_INSTANCE_BITS = 22;
-var BACNET_MAX_INSTANCE = module.exports.BACNET_MAX_INSTANCE = 0x3FFFFF;
-var MAX_BITSTRING_BYTES = module.exports.MAX_BITSTRING_BYTES = 15;
-var BACNET_ARRAY_ALL = module.exports.BACNET_ARRAY_ALL = 0xFFFFFFFF;
-var BACNET_NO_PRIORITY = module.exports.BACNET_NO_PRIORITY = 0;
-var BACNET_MIN_PRIORITY = module.exports.BACNET_MIN_PRIORITY = 1;
-var BACNET_MAX_PRIORITY = module.exports.BACNET_MAX_PRIORITY = 16;
-
-var getBuffer = function() {
+'use strict';
+
+const iconv       = require('iconv-lite');
+const baEnum      = require('./enum');
+const debug       = require('debug')('bacnet:asn1:debug');
+const trace       = require('debug')('bacnet:asn1:trace');
+
+const START_YEAR = module.exports.START_YEAR = 1900;
+const MAX_YEARS  = module.exports.MAX_YEARS = 256;
+
+const getBuffer = () => {
   return {
     buffer: Buffer.alloc(1472),
     offset: 0
   };
 };
 
-var getSignedLength = function(value) {
+const getSignedLength = (value) => {
   if ((value >= -128) && (value < 128)) return 1;
   else if ((value >= -32768) && (value < 32768)) return 2;
   else if ((value > -8388608) && (value < 8388608)) return 3;
   else return 4;
 };
 
-var getUnsignedLength = function(value) {
+const getUnsignedLength = (value) => {
   if (value < 0x100) return 1;
   else if (value < 0x10000) return 2;
   else if (value < 0x1000000) return 3;
   else return 4;
 };
 
-var getEncodingType = function(encoding, decodingBuffer, decodingOffset) {
+const getEncodingType = (encoding, decodingBuffer, decodingOffset) => {
   switch (encoding) {
-    case baEnum.CharacterStringEncodings.CHARACTER_UTF8:
-      return 'utf8';
-    case baEnum.CharacterStringEncodings.CHARACTER_UCS2:
+    case baEnum.CharacterStringEncoding.UCS_2:
       if (decodingBuffer && decodingBuffer[decodingOffset] === 0xFF && decodingBuffer[decodingOffset + 1] === 0xFE) {
         return 'ucs2';
       }
       return 'UTF-16BE';  // Default to big-endian
-    case baEnum.CharacterStringEncodings.CHARACTER_ISO8859_1:
+    case baEnum.CharacterStringEncoding.ISO_8859_1:
       return 'latin1';
-    case baEnum.CharacterStringEncodings.CHARACTER_UCS4:
-      return 'utf8';      // HACK: There is currently no support for UTF-32
-    case baEnum.CharacterStringEncodings.CHARACTER_MS_DBCS:
+    case baEnum.CharacterStringEncoding.MICROSOFT_DBCS:
       return 'cp850';
-    case baEnum.CharacterStringEncodings.CHARACTER_JISX_0208:
+    case baEnum.CharacterStringEncoding.JIS_X_0208:
       return 'Shift_JIS';
     default:
       return 'utf8';
   }
 };
 
-var encodeUnsigned = function(buffer, value, length) {
+const encodeUnsigned = module.exports.encodeUnsigned = (buffer, value, length) => {
   buffer.buffer.writeUIntBE(value, buffer.offset, length, true);
   buffer.offset += length;
 };
 
-var encodeBacnetUnsigned = function(buffer, value) {
+const encodeBacnetUnsigned = (buffer, value) => {
   encodeUnsigned(buffer, value, getUnsignedLength(value));
 };
 
-var encodeSigned = function(buffer, value, length) {
+const encodeSigned = (buffer, value, length) => {
   buffer.buffer.writeIntBE(value, buffer.offset, length, true);
   buffer.offset += length;
 };
 
-var encodeBacnetSigned = function(buffer, value) {
+const encodeBacnetSigned = (buffer, value) => {
   encodeSigned(buffer, value, getSignedLength(value));
 };
 
-var encodeBacnetReal = function(buffer, value) {
+const encodeBacnetReal = (buffer, value) => {
   buffer.buffer.writeFloatBE(value, buffer.offset, true);
   buffer.offset += 4;
 };
 
-var encodeBacnetDouble = function(buffer, value) {
+const encodeBacnetDouble = (buffer, value) => {
   buffer.buffer.writeDoubleBE(value, buffer.offset, true);
   buffer.offset += 8;
 };
 
-var decodeUnsigned = module.exports.decodeUnsigned = function(buffer, offset, length) {
+const decodeUnsigned = module.exports.decodeUnsigned = (buffer, offset, length) => {
+  if (length === 0) {
+    return {
+      len: 0,
+      value: 0
+    };
+  }
   return {
     len: length,
     value: buffer.readUIntBE(offset, length, true)
   };
 };
 
-var decodeEnumerated = module.exports.decodeEnumerated = function(buffer, offset, lenValue) {
+const decodeEnumerated = module.exports.decodeEnumerated = (buffer, offset, lenValue) => {
   return decodeUnsigned(buffer, offset, lenValue);
 };
 
-var encodeBacnetObjectId = module.exports.encodeBacnetObjectId = function(buffer, objectType, instance) {
-  var value = ((objectType & BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | (instance & BACNET_MAX_INSTANCE);
+const encodeBacnetObjectId = module.exports.encodeBacnetObjectId = (buffer, objectType, instance) => {
+  const value = (((objectType & baEnum.ASN1_MAX_OBJECT) << baEnum.ASN1_INSTANCE_BITS) | (instance & baEnum.ASN1_MAX_INSTANCE)) >>> 0;
   encodeUnsigned(buffer, value, 4);
 };
 
-var encodeTag = module.exports.encodeTag = function(buffer, tagNumber, contextSpecific, lenValueType) {
-  var len = 1;
-  var tmp = new Array(3);
+const encodeTag = module.exports.encodeTag = (buffer, tagNumber, contextSpecific, lenValueType) => {
+  let len = 1;
+  const tmp = new Array(3);
   tmp[0] = 0;
   if (contextSpecific) {
     tmp[0] |= 0x8;
@@ -135,119 +135,119 @@ var encodeTag = module.exports.encodeTag = function(buffer, tagNumber, contextSp
   }
 };
 
-var encodeBacnetEnumerated = function(buffer, value) {
+const encodeBacnetEnumerated = (buffer, value) => {
   encodeBacnetUnsigned(buffer, value);
 };
 
-var isExtendedTagNumber = function(x) {
+const isExtendedTagNumber = (x) => {
   return (x & 0xF0) === 0xF0;
 };
 
-var isExtendedValue = function(x) {
+const isExtendedValue = (x) => {
   return (x & 0x07) === 5;
 };
 
-var isContextSpecific = function(x) {
+const isContextSpecific = (x) => {
   return (x & 0x8) === 0x8;
 };
 
-var isOpeningTag = function(x) {
+const isOpeningTag = (x) => {
   return (x & 0x07) === 6;
 };
 
-var isClosingTag = function(x) {
+const isClosingTag = (x) => {
   return (x & 0x07) === 7;
 };
 
-var encodeContextReal = module.exports.encodeContextReal = function(buffer, tagNumber, value) {
+const encodeContextReal = module.exports.encodeContextReal = (buffer, tagNumber, value) => {
   encodeTag(buffer, tagNumber, true, 4);
   encodeBacnetReal(buffer, value);
 };
 
-var encodeContextUnsigned = module.exports.encodeContextUnsigned = function(buffer, tagNumber, value) {
+const encodeContextUnsigned = module.exports.encodeContextUnsigned = (buffer, tagNumber, value) => {
   encodeTag(buffer, tagNumber, true, getUnsignedLength(value));
   encodeBacnetUnsigned(buffer, value);
 };
 
-var encodeContextEnumerated = module.exports.encodeContextEnumerated = function(buffer, tagNumber, value) {
+const encodeContextEnumerated = module.exports.encodeContextEnumerated = (buffer, tagNumber, value) => {
   encodeContextUnsigned(buffer, tagNumber, value);
 };
 
-var encodeOctetString = function(buffer, octetString, octetOffset, octetCount) {
+const encodeOctetString = (buffer, octetString, octetOffset, octetCount) => {
   if (octetString) {
-    for (var i = octetOffset; i < (octetOffset + octetCount); i++) {
+    for (let i = octetOffset; i < (octetOffset + octetCount); i++) {
       buffer.buffer[buffer.offset++] = octetString[i];
     }
   }
 };
 
-var encodeApplicationOctetString = module.exports.encodeApplicationOctetString = function(buffer, octetString, octetOffset, octetCount) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OCTET_STRING, false, octetCount);
+const encodeApplicationOctetString = module.exports.encodeApplicationOctetString = (buffer, octetString, octetOffset, octetCount) => {
+  encodeTag(buffer, baEnum.ApplicationTag.OCTET_STRING, false, octetCount);
   encodeOctetString(buffer, octetString, octetOffset, octetCount);
 };
 
-var encodeApplicationNull = function(buffer) {
-  buffer.buffer[buffer.offset++] = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_NULL;
+const encodeApplicationNull = (buffer) => {
+  buffer.buffer[buffer.offset++] = baEnum.ApplicationTag.NULL;
 };
 
-var encodeApplicationBoolean = module.exports.encodeApplicationBoolean = function(buffer, booleanValue) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BOOLEAN, false, booleanValue ? 1 : 0);
+const encodeApplicationBoolean = module.exports.encodeApplicationBoolean = (buffer, booleanValue) => {
+  encodeTag(buffer, baEnum.ApplicationTag.BOOLEAN, false, booleanValue ? 1 : 0);
 };
 
-var encodeApplicationReal = function(buffer, value) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_REAL, false, 4);
+const encodeApplicationReal = (buffer, value) => {
+  encodeTag(buffer, baEnum.ApplicationTag.REAL, false, 4);
   encodeBacnetReal(buffer, value);
 };
 
-var encodeApplicationDouble = function(buffer, value) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DOUBLE, false, 8);
+const encodeApplicationDouble = (buffer, value) => {
+  encodeTag(buffer, baEnum.ApplicationTag.DOUBLE, false, 8);
   encodeBacnetDouble(buffer, value);
 };
 
-var bitstringBytesUsed = function(bitString) {
-  var len = 0;
+const bitstringBytesUsed = (bitString) => {
+  let len = 0;
   if (bitString.bitsUsed > 0) {
-    var lastBit = bitString.bitsUsed - 1;
-    var usedBytes = (lastBit / 8) + 1;
+    const lastBit = bitString.bitsUsed - 1;
+    const usedBytes = (lastBit / 8) + 1;
     len = Math.floor(usedBytes);
   }
   return len;
 };
 
-var encodeApplicationObjectId = module.exports.encodeApplicationObjectId = function(buffer, objectType, instance) {
-  var tmp = getBuffer();
+const encodeApplicationObjectId = module.exports.encodeApplicationObjectId = (buffer, objectType, instance) => {
+  const tmp = getBuffer();
   encodeBacnetObjectId(tmp, objectType, instance);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID, false, tmp.offset);
+  encodeTag(buffer, baEnum.ApplicationTag.OBJECTIDENTIFIER, false, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
   buffer.offset += tmp.offset;
 };
 
-var encodeApplicationUnsigned = module.exports.encodeApplicationUnsigned = function(buffer, value) {
-  var tmp = getBuffer();
+const encodeApplicationUnsigned = module.exports.encodeApplicationUnsigned = (buffer, value) => {
+  const tmp = getBuffer();
   encodeBacnetUnsigned(tmp, value);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT, false, tmp.offset);
+  encodeTag(buffer, baEnum.ApplicationTag.UNSIGNED_INTEGER, false, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
   buffer.offset += tmp.offset;
 };
 
-var encodeApplicationEnumerated = module.exports.encodeApplicationEnumerated = function(buffer, value) {
-  var tmp = getBuffer();
+const encodeApplicationEnumerated = module.exports.encodeApplicationEnumerated = (buffer, value) => {
+  const tmp = getBuffer();
   encodeBacnetEnumerated(tmp, value);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED, false, tmp.offset);
+  encodeTag(buffer, baEnum.ApplicationTag.ENUMERATED, false, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
   buffer.offset += tmp.offset;
 };
 
-var encodeApplicationSigned = module.exports.encodeApplicationSigned = function(buffer, value) {
-  var tmp = getBuffer();
+const encodeApplicationSigned = module.exports.encodeApplicationSigned = (buffer, value) => {
+  const tmp = getBuffer();
   encodeBacnetSigned(tmp, value);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_SIGNED_INT, false, tmp.offset);
+  encodeTag(buffer, baEnum.ApplicationTag.SIGNED_INTEGER, false, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
   buffer.offset += tmp.offset;
 };
 
-var byteReverseBits = function(inByte) {
-  var outByte = 0;
+const byteReverseBits = (inByte) => {
+  let outByte = 0;
   if ((inByte & 1) > 0) {
     outByte |= 0x80;
   }
@@ -275,37 +275,35 @@ var byteReverseBits = function(inByte) {
   return outByte;
 };
 
-var bitstringOctet = function(bitString, octetIndex) {
-  var octet = 0;
-  if (bitString.value) {
-    if (octetIndex < MAX_BITSTRING_BYTES) {
-      octet = bitString.value[octetIndex];
-    }
+const bitstringOctet = (bitString, octetIndex) => {
+  let octet = 0;
+  if (bitString.value && octetIndex < baEnum.ASN1_MAX_BITSTRING_BYTES) {
+    octet = bitString.value[octetIndex];
   }
   return octet;
 };
 
-var encodeBitstring = function(buffer, bitString) {
+const encodeBitstring = (buffer, bitString) => {
   if (bitString.bitsUsed === 0) {
     buffer.buffer[buffer.offset++] = 0;
   } else {
-    var usedBytes = bitstringBytesUsed(bitString);
-    var remainingUsedBits = bitString.bitsUsed - ((usedBytes - 1) * 8);
+    const usedBytes = bitstringBytesUsed(bitString);
+    const remainingUsedBits = bitString.bitsUsed - ((usedBytes - 1) * 8);
     buffer.buffer[buffer.offset++] = 8 - remainingUsedBits;
-    for (var i = 0; i < usedBytes; i++) {
+    for (let i = 0; i < usedBytes; i++) {
       buffer.buffer[buffer.offset++] = byteReverseBits(bitstringOctet(bitString, i));
     }
   }
 };
 
-var encodeApplicationBitstring = module.exports.encodeApplicationBitstring = function(buffer, bitString) {
-  var bitStringEncodedLength = 1;
+const encodeApplicationBitstring = module.exports.encodeApplicationBitstring = (buffer, bitString) => {
+  let bitStringEncodedLength = 1;
   bitStringEncodedLength += bitstringBytesUsed(bitString);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BIT_STRING, false, bitStringEncodedLength);
+  encodeTag(buffer, baEnum.ApplicationTag.BIT_STRING, false, bitStringEncodedLength);
   encodeBitstring(buffer, bitString);
 };
 
-var encodeBacnetDate = function(buffer, value) {
+const encodeBacnetDate = module.exports.encodeBacnetDate = (buffer, value) => {
   if (value === new Date(1, 1, 1)) {
     buffer.buffer[buffer.offset++] = 0xFF;
     buffer.buffer[buffer.offset++] = 0xFF;
@@ -313,50 +311,51 @@ var encodeBacnetDate = function(buffer, value) {
     buffer.buffer[buffer.offset++] = 0xFF;
     return;
   }
-  if (value.getFullYear() >= 1900) {
-    buffer.buffer[buffer.offset++] = (value.getFullYear() - 1900);
-  } else if (value.getFullYear() < 0x100) {
+
+  if (value.getFullYear() >= START_YEAR) {
+    buffer.buffer[buffer.offset++] = (value.getFullYear() - START_YEAR);
+  } else if (value.getFullYear() < MAX_YEARS /* 1900 + 255 max */) {
     buffer.buffer[buffer.offset++] = value.getFullYear();
   } else {
-    return;
+    throw new Error('invaide year: '+ value.getFullYear());
   }
   buffer.buffer[buffer.offset++] = value.getMonth();
   buffer.buffer[buffer.offset++] = value.getDate();
   buffer.buffer[buffer.offset++] = (value.getDay() === 0) ? 7 : value.getDay();
 };
 
-var encodeApplicationDate = module.exports.encodeApplicationDate = function(buffer, value) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATE, false, 4);
+const encodeApplicationDate = module.exports.encodeApplicationDate = (buffer, value) => {
+  encodeTag(buffer, baEnum.ApplicationTag.DATE, false, 4);
   encodeBacnetDate(buffer, value);
 };
 
-var encodeBacnetTime = function(buffer, value) {
+const encodeBacnetTime = (buffer, value) => {
   buffer.buffer[buffer.offset++] = value.getHours();
   buffer.buffer[buffer.offset++] = value.getMinutes();
   buffer.buffer[buffer.offset++] = value.getSeconds();
   buffer.buffer[buffer.offset++] = value.getMilliseconds() / 10;
 };
 
-var encodeApplicationTime = module.exports.encodeApplicationTime = function(buffer, value) {
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIME, false, 4);
+const encodeApplicationTime = module.exports.encodeApplicationTime = (buffer, value) => {
+  encodeTag(buffer, baEnum.ApplicationTag.TIME, false, 4);
   encodeBacnetTime(buffer, value);
 };
 
-var bacappEncodeDatetime = function(buffer, value) {
+const bacappEncodeDatetime = (buffer, value) => {
   if (value !== new Date(1, 1, 1)) {
     encodeApplicationDate(buffer, value);
     encodeApplicationTime(buffer, value);
   }
 };
 
-var encodeContextObjectId = module.exports.encodeContextObjectId = function(buffer, tagNumber, objectType, instance) {
+const encodeContextObjectId = module.exports.encodeContextObjectId = (buffer, tagNumber, objectType, instance) => {
   encodeTag(buffer, tagNumber, true, 4);
   encodeBacnetObjectId(buffer, objectType, instance);
 };
 
-var encodeOpeningTag = module.exports.encodeOpeningTag = function(buffer, tagNumber) {
-  var len = 1;
-  var tmp = new Array(2);
+const encodeOpeningTag = module.exports.encodeOpeningTag = (buffer, tagNumber) => {
+  let len = 1;
+  const tmp = new Array(2);
   tmp[0] = 0x8;
   if (tagNumber <= 14) {
     tmp[0] |= (tagNumber << 4);
@@ -370,9 +369,9 @@ var encodeOpeningTag = module.exports.encodeOpeningTag = function(buffer, tagNum
   buffer.offset += len;
 };
 
-var encodeClosingTag = module.exports.encodeClosingTag = function(buffer, tagNumber) {
-  var len = 1;
-  var tmp = new Array(2);
+const encodeClosingTag = module.exports.encodeClosingTag = (buffer, tagNumber) => {
+  let len = 1;
+  const tmp = new Array(2);
   tmp[0] = 0x8;
   if (tagNumber <= 14) {
     tmp[0] |= (tagNumber << 4);
@@ -386,25 +385,25 @@ var encodeClosingTag = module.exports.encodeClosingTag = function(buffer, tagNum
   buffer.offset += len;
 };
 
-var encodeReadAccessSpecification = module.exports.encodeReadAccessSpecification = function(buffer, value) {
+const encodeReadAccessSpecification = module.exports.encodeReadAccessSpecification = (buffer, value) => {
   encodeContextObjectId(buffer, 0, value.objectId.type, value.objectId.instance);
   encodeOpeningTag(buffer, 1);
-  value.properties.forEach(function(p) {
+  value.properties.forEach((p) => {
     encodeContextEnumerated(buffer, 0, p.id);
-    if (p.index && p.index !== BACNET_ARRAY_ALL) {
+    if (p.index && p.index !== baEnum.ASN1_ARRAY_ALL) {
       encodeContextUnsigned(buffer, 1, p.index);
     }
   });
   encodeClosingTag(buffer, 1);
 };
 
-var encodeContextBoolean = module.exports.encodeContextBoolean = function(buffer, tagNumber, booleanValue) {
+const encodeContextBoolean = module.exports.encodeContextBoolean = (buffer, tagNumber, booleanValue) => {
   encodeTag(buffer, tagNumber, true, 1);
   buffer.buffer.writeUInt8(booleanValue ? 1 : 0, buffer.offset, true);
   buffer.offset += 1;
 };
 
-var encodeCovSubscription = function(buffer, value) {
+const encodeCovSubscription = (buffer, value) => {
   encodeOpeningTag(buffer, 0);
   encodeOpeningTag(buffer, 0);
   encodeOpeningTag(buffer, 1);
@@ -421,7 +420,7 @@ var encodeCovSubscription = function(buffer, value) {
   encodeOpeningTag(buffer, 1);
   encodeContextObjectId(buffer, 0, value.monitoredObjectId.type, value.monitoredObjectId.instance);
   encodeContextEnumerated(buffer, 1, value.monitoredProperty.id);
-  if (value.monitoredProperty.index !== BACNET_ARRAY_ALL) {
+  if (value.monitoredProperty.index !== baEnum.ASN1_ARRAY_ALL) {
     encodeContextUnsigned(buffer, 2, value.monitoredProperty.index);
   }
   encodeClosingTag(buffer, 1);
@@ -432,129 +431,131 @@ var encodeCovSubscription = function(buffer, value) {
   }
 };
 
-var bacappEncodeApplicationData = module.exports.bacappEncodeApplicationData = function(buffer, value) {
+const bacappEncodeApplicationData = module.exports.bacappEncodeApplicationData = (buffer, value) => {
   if (value.value === null) {
-    value.type = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_NULL;
+    value.type = baEnum.ApplicationTag.NULL;
   }
   switch (value.type) {
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_NULL:
+    case baEnum.ApplicationTag.NULL:
       encodeApplicationNull(buffer);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BOOLEAN:
+    case baEnum.ApplicationTag.BOOLEAN:
       encodeApplicationBoolean(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT:
+    case baEnum.ApplicationTag.UNSIGNED_INTEGER:
       encodeApplicationUnsigned(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_SIGNED_INT:
+    case baEnum.ApplicationTag.SIGNED_INTEGER:
       encodeApplicationSigned(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_REAL:
+    case baEnum.ApplicationTag.REAL:
       encodeApplicationReal(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DOUBLE:
+    case baEnum.ApplicationTag.DOUBLE:
       encodeApplicationDouble(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OCTET_STRING:
+    case baEnum.ApplicationTag.OCTET_STRING:
       encodeApplicationOctetString(buffer, value.value, 0, value.value.length);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CHARACTER_STRING:
+    case baEnum.ApplicationTag.CHARACTER_STRING:
       encodeApplicationCharacterString(buffer, value.value, value.encoding);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BIT_STRING:
+    case baEnum.ApplicationTag.BIT_STRING:
       encodeApplicationBitstring(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED:
+    case baEnum.ApplicationTag.ENUMERATED:
       encodeApplicationEnumerated(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATE:
+    case baEnum.ApplicationTag.DATE:
       encodeApplicationDate(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIME:
+    case baEnum.ApplicationTag.TIME:
       encodeApplicationTime(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIMESTAMP:
+    case baEnum.ApplicationTag.TIMESTAMP:
       bacappEncodeTimestamp(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATETIME:
+    case baEnum.ApplicationTag.DATETIME:
       bacappEncodeDatetime(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID:
+    case baEnum.ApplicationTag.OBJECTIDENTIFIER:
       encodeApplicationObjectId(buffer, (value.value).type, (value.value).instance);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_COV_SUBSCRIPTION:
+    case baEnum.ApplicationTag.COV_SUBSCRIPTION:
       encodeCovSubscription(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_READ_ACCESS_RESULT:
+    case baEnum.ApplicationTag.READ_ACCESS_RESULT:
       encodeReadAccessResult(buffer, value.value);
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_READ_ACCESS_SPECIFICATION:
+    case baEnum.ApplicationTag.READ_ACCESS_SPECIFICATION:
       encodeReadAccessSpecification(buffer, value.value);
       break;
+    case undefined:
+      throw new Error('Cannot encode a value if the type has not been specified');
     default:
-      throw 'Unknown type';
+      throw 'No encode for ApplicationTag type: ' + baEnum.getEnumName(baEnum.ApplicationTag, value.type);
   }
 };
 
-var bacappEncodeDeviceObjPropertyRef = function(buffer, value) {
+const bacappEncodeDeviceObjPropertyRef = (buffer, value) => {
   encodeContextObjectId(buffer, 0, value.objectId.type, value.objectId.instance);
   encodeContextEnumerated(buffer, 1, value.id);
-  if (value.arrayIndex !== BACNET_ARRAY_ALL) {
+  if (value.arrayIndex !== baEnum.ASN1_ARRAY_ALL) {
     encodeContextUnsigned(buffer, 2, value.arrayIndex);
   }
-  if (value.deviceIndentifier.type === baEnum.ObjectTypes.OBJECT_DEVICE) {
+  if (value.deviceIndentifier.type === baEnum.ObjectType.DEVICE) {
     encodeContextObjectId(buffer, 3, value.deviceIndentifier.type, value.deviceIndentifier.instance);
   }
 };
 
-var bacappEncodeContextDeviceObjPropertyRef = module.exports.bacappEncodeContextDeviceObjPropertyRef = function(buffer, tagNumber, value) {
+const bacappEncodeContextDeviceObjPropertyRef = module.exports.bacappEncodeContextDeviceObjPropertyRef = (buffer, tagNumber, value) => {
   encodeOpeningTag(buffer, tagNumber);
   bacappEncodeDeviceObjPropertyRef(buffer, value);
   encodeClosingTag(buffer, tagNumber);
 };
 
-var bacappEncodePropertyState = module.exports.bacappEncodePropertyState = function(buffer, value) {
+const bacappEncodePropertyState = module.exports.bacappEncodePropertyState = (buffer, value) => {
   switch (value.type) {
-    case baEnum.PropertyStateTypes.BOOLEAN_VALUE:
-      encodeContextBoolean(buffer, 0, value.state === 1 ? true : false);
+    case baEnum.PropertyStates.BOOLEAN_VALUE:
+      encodeContextBoolean(buffer, 0, value.state === 1);
       break;
-    case baEnum.PropertyStateTypes.BINARY_VALUE:
+    case baEnum.PropertyStates.BINARY_VALUE:
       encodeContextEnumerated(buffer, 1, value.state);
       break;
-    case baEnum.PropertyStateTypes.EVENT_TYPE:
+    case baEnum.PropertyStates.EVENT_TYPE:
       encodeContextEnumerated(buffer, 2, value.state);
       break;
-    case baEnum.PropertyStateTypes.POLARITY:
+    case baEnum.PropertyStates.POLARITY:
       encodeContextEnumerated(buffer, 3, value.state);
       break;
-    case baEnum.PropertyStateTypes.PROGRAM_CHANGE:
+    case baEnum.PropertyStates.PROGRAM_CHANGE:
       encodeContextEnumerated(buffer, 4, value.state);
       break;
-    case baEnum.PropertyStateTypes.PROGRAM_STATE:
+    case baEnum.PropertyStates.PROGRAM_STATE:
       encodeContextEnumerated(buffer, 5, value.state);
       break;
-    case baEnum.PropertyStateTypes.REASON_FOR_HALT:
+    case baEnum.PropertyStates.REASON_FOR_HALT:
       encodeContextEnumerated(buffer, 6, value.state);
       break;
-    case baEnum.PropertyStateTypes.RELIABILITY:
+    case baEnum.PropertyStates.RELIABILITY:
       encodeContextEnumerated(buffer, 7, value.state);
       break;
-    case baEnum.PropertyStateTypes.STATE:
+    case baEnum.PropertyStates.STATE:
       encodeContextEnumerated(buffer, 8, value.state);
       break;
-    case baEnum.PropertyStateTypes.SYSTEM_STATUS:
+    case baEnum.PropertyStates.SYSTEM_STATUS:
       encodeContextEnumerated(buffer, 9, value.state);
       break;
-    case baEnum.PropertyStateTypes.UNITS:
+    case baEnum.PropertyStates.UNITS:
       encodeContextEnumerated(buffer, 10, value.state);
       break;
-    case baEnum.PropertyStateTypes.UNSIGNED_VALUE:
+    case baEnum.PropertyStates.UNSIGNED_VALUE:
       encodeContextUnsigned(buffer, 11, value.state);
       break;
-    case baEnum.PropertyStateTypes.LIFE_SAFETY_MODE:
+    case baEnum.PropertyStates.LIFE_SAFETY_MODE:
       encodeContextEnumerated(buffer, 12, value.state);
       break;
-    case baEnum.PropertyStateTypes.LIFE_SAFETY_STATE:
+    case baEnum.PropertyStates.LIFE_SAFETY_STATE:
       encodeContextEnumerated(buffer, 13, value.state);
       break;
     default:
@@ -562,34 +563,36 @@ var bacappEncodePropertyState = module.exports.bacappEncodePropertyState = funct
   }
 };
 
-var encodeContextBitstring = module.exports.encodeContextBitstring = function(buffer, tagNumber, bitString) {
-  var bitStringEncodedLength = 1;
+const encodeContextBitstring = module.exports.encodeContextBitstring = (buffer, tagNumber, bitString) => {
+  let bitStringEncodedLength = 1;
   bitStringEncodedLength += bitstringBytesUsed(bitString);
   encodeTag(buffer, tagNumber, true, bitStringEncodedLength);
   encodeBitstring(buffer, bitString);
 };
 
-var encodeContextSigned = module.exports.encodeContextSigned = function(buffer, tagNumber, value) {
+const encodeContextSigned = module.exports.encodeContextSigned = (buffer, tagNumber, value) => {
   encodeTag(buffer, tagNumber, true, getSignedLength(value));
   encodeBacnetSigned(buffer, value);
 };
 
-var encodeContextTime = function(buffer, tagNumber, value) {
+const encodeContextTime = (buffer, tagNumber, value) => {
   encodeTag(buffer, tagNumber, true, 4);
   encodeBacnetTime(buffer, value);
 };
 
-var bacappEncodeContextDatetime = function(buffer, tagNumber, value) {
+const bacappEncodeContextDatetime = (buffer, tagNumber, value) => {
   if (value !== new Date(1, 1, 1)) {
     encodeOpeningTag(buffer, tagNumber);
     bacappEncodeDatetime(buffer, value);
     encodeClosingTag(buffer, tagNumber);
+  } else {
+    throw new Error('wrong Datetime while bacapp encoding context');
   }
 };
 
-var decodeTagNumber = module.exports.decodeTagNumber = function(buffer, offset) {
-  var len = 1;
-  var tagNumber;
+const decodeTagNumber = module.exports.decodeTagNumber = (buffer, offset) => {
+  let len = 1;
+  let tagNumber;
   if (isExtendedTagNumber(buffer[offset])) {
     tagNumber = buffer[offset + 1];
     len++;
@@ -597,46 +600,46 @@ var decodeTagNumber = module.exports.decodeTagNumber = function(buffer, offset)
     tagNumber = buffer[offset] >> 4;
   }
   return {
-    len: len,
-    tagNumber: tagNumber
+    len,
+    tagNumber
   };
 };
 
-var decodeIsContextTag = module.exports.decodeIsContextTag = function(buffer, offset, tagNumber) {
-  var result = decodeTagNumber(buffer, offset);
+const decodeIsContextTag = module.exports.decodeIsContextTag = (buffer, offset, tagNumber) => {
+  const result = decodeTagNumber(buffer, offset);
   return isContextSpecific(buffer[offset]) && result.tagNumber === tagNumber;
 };
 
-var decodeIsOpeningTagNumber = module.exports.decodeIsOpeningTagNumber = function(buffer, offset, tagNumber) {
-  var result = decodeTagNumber(buffer, offset);
+const decodeIsOpeningTagNumber = module.exports.decodeIsOpeningTagNumber = (buffer, offset, tagNumber) => {
+  const result = decodeTagNumber(buffer, offset);
   return isOpeningTag(buffer[offset]) && result.tagNumber === tagNumber;
 };
 
-var decodeIsClosingTagNumber = module.exports.decodeIsClosingTagNumber = function(buffer, offset, tagNumber) {
-  var result = decodeTagNumber(buffer, offset);
+const decodeIsClosingTagNumber = module.exports.decodeIsClosingTagNumber = (buffer, offset, tagNumber) => {
+  const result = decodeTagNumber(buffer, offset);
   return isClosingTag(buffer[offset]) && result.tagNumber === tagNumber;
 };
 
-var decodeIsClosingTag = module.exports.decodeIsClosingTag = function(buffer, offset) {
+const decodeIsClosingTag = module.exports.decodeIsClosingTag = (buffer, offset) => {
   return (buffer[offset] & 0x07) === 7;
 };
 
-var decodeIsOpeningTag = module.exports.decodeIsOpeningTag = function(buffer, offset) {
+const decodeIsOpeningTag = module.exports.decodeIsOpeningTag = (buffer, offset) => {
   return (buffer[offset] & 0x07) === 6;
 };
 
-var decodeObjectId = module.exports.decodeObjectId = function(buffer, offset) {
-  var result = decodeUnsigned(buffer, offset, 4);
-  var objectType = (result.value >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT;
-  var instance = result.value & BACNET_MAX_INSTANCE;
+const decodeObjectId = module.exports.decodeObjectId = (buffer, offset) => {
+  const result = decodeUnsigned(buffer, offset, 4);
+  const objectType = (result.value >> baEnum.ASN1_INSTANCE_BITS) & baEnum.ASN1_MAX_OBJECT;
+  const instance = result.value & baEnum.ASN1_MAX_INSTANCE;
   return {
     len: result.len,
-    objectType: objectType,
-    instance: instance
+    objectType,
+    instance
   };
 };
 
-var decodeObjectIdSafe = function(buffer, offset, lenValue) {
+const decodeObjectIdSafe = (buffer, offset, lenValue) => {
   if (lenValue !== 4) {
     return {
       len: 0,
@@ -648,10 +651,10 @@ var decodeObjectIdSafe = function(buffer, offset, lenValue) {
   }
 };
 
-var decodeTagNumberAndValue = module.exports.decodeTagNumberAndValue = function(buffer, offset) {
-  var value;
-  var result = decodeTagNumber(buffer, offset);
-  var len = result.len;
+const decodeTagNumberAndValue = module.exports.decodeTagNumberAndValue = (buffer, offset) => {
+  let value;
+  let result = decodeTagNumber(buffer, offset);
+  let len = result.len;
   if (isExtendedValue(buffer[offset])) {
     if (buffer[offset + len] === 255) {
       len++;
@@ -675,20 +678,22 @@ var decodeTagNumberAndValue = module.exports.decodeTagNumberAndValue = function(
     value = buffer[offset] & 0x07;
   }
   return {
-    len: len,
+    len,
     tagNumber: result.tagNumber,
-    value: value
+    value
   };
 };
 
-var bacappDecodeApplicationData = module.exports.bacappDecodeApplicationData = function(buffer, offset, maxOffset, objectType, propertyId) {
+const bacappDecodeApplicationData = module.exports.bacappDecodeApplicationData = (buffer, offset, maxOffset, objectType, propertyId) => {
   if (!isContextSpecific(buffer[offset])) {
-    var result = decodeTagNumberAndValue(buffer, offset);
+    let result = decodeTagNumberAndValue(buffer, offset);
     if (result) {
-      var len = result.len;
+      let len = result.len;
       result = bacappDecodeData(buffer, offset + len, maxOffset, result.tagNumber, result.value);
-      if (!result) return;
-      var resObj = {
+      if (!result) {
+        return undefined;
+      }
+      let resObj = {
         len: len + result.len,
         type: result.type,
         value: result.value
@@ -702,12 +707,12 @@ var bacappDecodeApplicationData = module.exports.bacappDecodeApplicationData = f
   }
 };
 
-var encodeReadAccessResult = module.exports.encodeReadAccessResult = function(buffer, value) {
+const encodeReadAccessResult = module.exports.encodeReadAccessResult = (buffer, value) => {
   encodeContextObjectId(buffer, 0, value.objectId.type, value.objectId.instance);
   encodeOpeningTag(buffer, 1);
-  value.values.forEach(function(item) {
+  value.values.forEach((item) => {
     encodeContextEnumerated(buffer, 2, item.property.id);
-    if (item.property.index !== BACNET_ARRAY_ALL) {
+    if (item.property.index !== baEnum.ASN1_ARRAY_ALL) {
       encodeContextUnsigned(buffer, 3, item.property.index);
     }
     if (item.value && item.value[0] && item.value[0].value && item.value[0].value.type === 'BacnetError') {
@@ -717,7 +722,7 @@ var encodeReadAccessResult = module.exports.encodeReadAccessResult = function(bu
       encodeClosingTag(buffer, 5);
     } else {
       encodeOpeningTag(buffer, 4);
-      item.value.forEach(function(subItem) {
+      item.value.forEach((subItem) => {
         bacappEncodeApplicationData(buffer, subItem);
       });
       encodeClosingTag(buffer, 4);
@@ -726,30 +731,36 @@ var encodeReadAccessResult = module.exports.encodeReadAccessResult = function(bu
   encodeClosingTag(buffer, 1);
 };
 
-var decodeReadAccessResult = module.exports.decodeReadAccessResult = function(buffer, offset, apduLen) {
-  var len = 0;
-  var value = {};
-  if (!decodeIsContextTag(buffer, offset + len, 0)) return;
+const decodeReadAccessResult = module.exports.decodeReadAccessResult = (buffer, offset, apduLen) => {
+  let len = 0;
+  let value = {};
+  if (!decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  var result = decodeObjectId(buffer, offset + len);
+  let result = decodeObjectId(buffer, offset + len);
   value.objectId = {
     type: result.objectType,
     instance: result.instance
   };
   len += result.len;
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) return -1;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return -1; // TODO: why?
+  }
   len++;
 
-  var values = [];
+  const values = [];
   while ((apduLen - len) > 0) {
-    var newEntry = {};
+    let newEntry = {};
     if (decodeIsClosingTagNumber(buffer, offset + len, 1)) {
       len++;
       break;
     }
     result = decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== 2) return;
+    if (result.tagNumber !== 2) {
+      return undefined;
+    }
     result = decodeEnumerated(buffer, offset + len, result.value);
     newEntry.id = result.value;
     len += result.len;
@@ -761,17 +772,19 @@ var decodeReadAccessResult = module.exports.decodeReadAccessResult = function(bu
       newEntry.index = result.value;
       len += result.len;
     } else {
-      newEntry.index = BACNET_ARRAY_ALL;
+      newEntry.index = baEnum.ASN1_ARRAY_ALL;
     }
     result = decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
     if (result.tagNumber === 4) {
-      var localValues = [];
+      const localValues = [];
       while ((len + offset) <= buffer.length && !decodeIsClosingTagNumber(buffer, offset + len, 4)) {
-        var localResult = bacappDecodeApplicationData(buffer, offset + len, apduLen + offset - 1, value.objectId.type, newEntry.id);
-        if (!localResult) return;
+        let localResult = bacappDecodeApplicationData(buffer, offset + len, apduLen + offset - 1, value.objectId.type, newEntry.id);
+        if (!localResult) {
+          return undefined;
+        }
         len += localResult.len;
-        var resObj = {
+        let resObj = {
           value: localResult.value,
           type: localResult.type
         };
@@ -779,20 +792,22 @@ var decodeReadAccessResult = module.exports.decodeReadAccessResult = function(bu
         if (localResult.encoding !== undefined) resObj.encoding = localResult.encoding;
         localValues.push(resObj);
       }
-      if (!decodeIsClosingTagNumber(buffer, offset + len, 4)) return;
-      if ((localValues.count === 2) && (localValues[0].type === baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATE) && (localValues[1].type === baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIME)) {
-        var date = localValues[0].value;
-        var time = localValues[1].value;
-        var bdatetime = new Date(date.year, date.month, date.day, time.hour, time.minute, time.second, time.millisecond);
+      if (!decodeIsClosingTagNumber(buffer, offset + len, 4)) {
+        return undefined;
+      }
+      if ((localValues.count === 2) && (localValues[0].type === baEnum.ApplicationTag.DATE) && (localValues[1].type === baEnum.ApplicationTag.TIME)) {
+        const date = localValues[0].value;
+        const time = localValues[1].value;
+        const bdatetime = new Date(date.year, date.month, date.day, time.hour, time.minute, time.second, time.millisecond);
         newEntry.value = [
-          {type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATETIME, value: bdatetime}
+          {type: baEnum.ApplicationTag.DATETIME, value: bdatetime}
         ];
       } else {
         newEntry.value = localValues;
       }
       len++;
     } else if (result.tagNumber === 5) {
-      var err = {};
+      let err = {};
       result = decodeTagNumberAndValue(buffer, offset + len);
       len += result.len;
       result = decodeEnumerated(buffer, offset + len, result.value);
@@ -803,37 +818,39 @@ var decodeReadAccessResult = module.exports.decodeReadAccessResult = function(bu
       result = decodeEnumerated(buffer, offset + len, result.value);
       len += result.len;
       err.errorCode = result.value;
-      if (!decodeIsClosingTagNumber(buffer, offset + len, 5)) return;
+      if (!decodeIsClosingTagNumber(buffer, offset + len, 5)) {
+        return undefined;
+      }
       len++;
-      newEntry.value = {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ERROR,
+      newEntry.value = [{
+        type: baEnum.ApplicationTag.ERROR,
         value: err
-      };
+      }];
     }
     values.push(newEntry);
   }
   value.values = values;
   return {
-    len: len,
-    value: value
+    len,
+    value
   };
 };
 
-var decodeSigned = module.exports.decodeSigned = function(buffer, offset, length) {
+const decodeSigned = module.exports.decodeSigned = (buffer, offset, length) => {
   return {
     len: length,
     value: buffer.readIntBE(offset, length, true)
   };
 };
 
-var decodeReal = module.exports.decodeReal = function(buffer, offset) {
+const decodeReal = module.exports.decodeReal = (buffer, offset) => {
   return {
     len: 4,
     value: buffer.readFloatBE(offset, true)
   };
 };
 
-var decodeRealSafe = function(buffer, offset, lenValue) {
+const decodeRealSafe = (buffer, offset, lenValue) => {
   if (lenValue !== 4) {
     return {
       len: lenValue,
@@ -844,14 +861,14 @@ var decodeRealSafe = function(buffer, offset, lenValue) {
   }
 };
 
-var decodeDouble = function(buffer, offset) {
+const decodeDouble = (buffer, offset) => {
   return {
     len: 8,
     value: buffer.readDoubleBE(offset, true)
   };
 };
 
-var decodeDoubleSafe = function(buffer, offset, lenValue) {
+const decodeDoubleSafe = (buffer, offset, lenValue) => {
   if (lenValue !== 8) {
     return {
       len: lenValue,
@@ -862,9 +879,9 @@ var decodeDoubleSafe = function(buffer, offset, lenValue) {
   }
 };
 
-var decodeOctetString = function(buffer, offset, maxLength, octetStringOffset, octetStringLength) {
-  var octetString = [];
-  for (var i = octetStringOffset; i < (octetStringOffset + octetStringLength); i++) {
+const decodeOctetString = module.exports.decodeOctetString = (buffer, offset, maxLength, octetStringOffset, octetStringLength) => {
+  const octetString = [];
+  for (let i = octetStringOffset; i < (octetStringOffset + octetStringLength); i++) {
     octetString.push(buffer[offset + i]);
   }
   return {
@@ -873,73 +890,52 @@ var decodeOctetString = function(buffer, offset, maxLength, octetStringOffset, o
   };
 };
 
-var decodeContextOctetString = function(buffer, offset, maxLength, tagNumber, octetString, octetStringOffset) {
-  if (decodeIsContextTag(buffer, offset, tagNumber)) {
-    var result = decodeTagNumberAndValue(buffer, offset);
-    return {
-      len: result.lenValue + result.len,
-      value: Buffer.from(buffer.slice(offset, result.lenValue))
-    };
-  } else {
-    return;
-  }
-};
-
-var multiCharsetCharacterstringDecode = function(buffer, offset, maxLength, encoding, length) {
-  var stringBuf = Buffer.alloc(length);
+const multiCharsetCharacterstringDecode = (buffer, offset, maxLength, encoding, length) => {
+  const stringBuf = Buffer.alloc(length);
   buffer.copy(stringBuf, 0, offset, offset + length);
   return {
     value: iconv.decode(stringBuf, getEncodingType(encoding, buffer, offset)),
     len: length + 1,
-    encoding: encoding
+    encoding
   };
 };
 
-var decodeCharacterString = module.exports.decodeCharacterString = function(buffer, offset, maxLength, lenValue) {
+const decodeCharacterString = module.exports.decodeCharacterString = (buffer, offset, maxLength, lenValue) => {
   return multiCharsetCharacterstringDecode(buffer, offset + 1, maxLength, buffer[offset], lenValue - 1);
 };
 
-var bitstringSetOctet = function(bitString, index, octet) {
-  var status = false;
-  if (index < MAX_BITSTRING_BYTES) {
-    bitString.value[index] = octet;
-    status = true;
-  }
-  return status;
-};
-
-var bitstringSetBitsUsed = function(bitString, bytesUsed, unusedBits) {
+const bitstringSetBitsUsed = (bitString, bytesUsed, unusedBits) => {
   bitString.bitsUsed = bytesUsed * 8;
   bitString.bitsUsed -= unusedBits;
 };
 
-var decodeBitstring = module.exports.decodeBitstring = function(buffer, offset, lenValue) {
-  var len = 0;
-  var bitString = {};
+const decodeBitstring = module.exports.decodeBitstring = (buffer, offset, lenValue) => {
+  let len = 0;
+  let bitString = {};
   bitString.value = [];
   if (lenValue > 0) {
-    var bytesUsed = lenValue - 1;
-    if (bytesUsed <= MAX_BITSTRING_BYTES) {
+    const bytesUsed = lenValue - 1;
+    if (bytesUsed <= baEnum.ASN1_MAX_BITSTRING_BYTES) {
       len = 1;
-      for (var i = 0; i < bytesUsed; i++) {
+      for (let i = 0; i < bytesUsed; i++) {
         bitString.value.push(byteReverseBits(buffer[offset + len++]));
       }
-      var unusedBits = buffer[offset] & 0x07;
+      const unusedBits = buffer[offset] & 0x07;
       bitstringSetBitsUsed(bitString, bytesUsed, unusedBits);
     }
   }
   return {
-    len: len,
+    len,
     value: bitString
   };
 };
 
-var decodeDate = module.exports.decodeDate = function(buffer, offset) {
-  var date;
-  var year = buffer[offset] + 1900;
-  var month = buffer[offset + 1];
-  var day = buffer[offset + 2];
-  var wday = buffer[offset + 3];
+const decodeDate = module.exports.decodeDate = (buffer, offset) => {
+  let date;
+  const year = buffer[offset] + 1900;
+  const month = buffer[offset + 1];
+  const day = buffer[offset + 2];
+  const wday = buffer[offset + 3];
   if (month === 0xFF && day === 0xFF && wday === 0xFF && (year - 1900) === 0xFF) {
     date = new Date(1, 1, 1);
   } else {
@@ -951,7 +947,7 @@ var decodeDate = module.exports.decodeDate = function(buffer, offset) {
   };
 };
 
-var decodeDateSafe = function(buffer, offset, lenValue) {
+const decodeDateSafe = (buffer, offset, lenValue) => {
   if (lenValue !== 4) {
     return {
       len: lenValue,
@@ -962,25 +958,24 @@ var decodeDateSafe = function(buffer, offset, lenValue) {
   }
 };
 
-var decodeApplicationDate = module.exports.decodeApplicationDate = function(buffer, offset) {
-  var result = decodeTagNumber(buffer, offset);
-  if (result.tagNumber === baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATE) {
-    var value = decodeDate(buffer, offset + 1);
+const decodeApplicationDate = module.exports.decodeApplicationDate = (buffer, offset) => {
+  const result = decodeTagNumber(buffer, offset);
+  if (result.tagNumber === baEnum.ApplicationTag.DATE) {
+    const value = decodeDate(buffer, offset + 1);
     return {
       len: value.len + 1,
-      value: value
+      value
     };
-  } else {
-    return;
   }
+  return undefined;
 };
 
-var decodeBacnetTime = module.exports.decodeBacnetTime = function(buffer, offset) {
-  var value;
-  var hour = buffer[offset + 0];
-  var min = buffer[offset + 1];
-  var sec = buffer[offset + 2];
-  var hundredths = buffer[offset + 3];
+const decodeBacnetTime = module.exports.decodeBacnetTime = (buffer, offset) => {
+  let value;
+  const hour = buffer[offset + 0];
+  const min = buffer[offset + 1];
+  const sec = buffer[offset + 2];
+  let hundredths = buffer[offset + 3];
   if (hour === 0xFF && min === 0xFF && sec === 0xFF && hundredths === 0xFF) {
     value = new Date(1, 1, 1);
   } else {
@@ -989,11 +984,11 @@ var decodeBacnetTime = module.exports.decodeBacnetTime = function(buffer, offset
   }
   return {
     len: 4,
-    value: value
+    value
   };
 };
 
-var decodeBacnetTimeSafe = function(buffer, offset, lenValue) {
+const decodeBacnetTimeSafe = (buffer, offset, lenValue) => {
   if (lenValue !== 4) {
     return {
       len: lenValue,
@@ -1004,96 +999,95 @@ var decodeBacnetTimeSafe = function(buffer, offset, lenValue) {
   }
 };
 
-var decodeApplicationTime = module.exports.decodeApplicationTime = function(buffer, offset) {
-  var result = decodeTagNumber(buffer, offset);
-  if (result.tagNumber === baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIME) {
-    var value = decodeBacnetTime(buffer, offset + 1);
+const decodeApplicationTime = module.exports.decodeApplicationTime = (buffer, offset) => {
+  const result = decodeTagNumber(buffer, offset);
+  if (result.tagNumber === baEnum.ApplicationTag.TIME) {
+    const value = decodeBacnetTime(buffer, offset + 1);
     return {
       len: value.len + 1,
-      value: value
+      value
     };
-  } else {
-    return;
   }
+  return undefined;
 };
 
-var decodeBacnetDatetime = function(buffer, offset) {
-  var len = 0;
-  var date = decodeApplicationDate(buffer, offset + len);
+const decodeBacnetDatetime = (buffer, offset) => {
+  let len = 0;
+  const date = decodeApplicationDate(buffer, offset + len);
   len += date.len;
-  var time = decodeApplicationTime(buffer, offset + len);
+  const time = decodeApplicationTime(buffer, offset + len);
   len += time.len;
   return {
-    len: len,
+    len,
     value: new Date(date.year, date.month, date.day, time.hour, time.minute, time.second, time.millisecond)
   };
 };
 
-var bacappDecodeData = function(buffer, offset, maxLength, tagDataType, lenValueType) {
-  var result;
-  var value = {
+const bacappDecodeData = (buffer, offset, maxLength, tagDataType, lenValueType) => {
+  let result;
+  let value = {
     len: 0,
     type: tagDataType
   };
   switch (tagDataType) {
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_NULL:
+    case baEnum.ApplicationTag.NULL:
       value.value = null;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BOOLEAN:
-      value.value = lenValueType > 0 ? true : false;
+    case baEnum.ApplicationTag.BOOLEAN:
+      value.value = lenValueType > 0;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT:
+    case baEnum.ApplicationTag.UNSIGNED_INTEGER:
       result = decodeUnsigned(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_SIGNED_INT:
+    case baEnum.ApplicationTag.SIGNED_INTEGER:
       result = decodeSigned(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_REAL:
+    case baEnum.ApplicationTag.REAL:
       result = decodeRealSafe(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DOUBLE:
+    case baEnum.ApplicationTag.DOUBLE:
       result = decodeDoubleSafe(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OCTET_STRING:
+    case baEnum.ApplicationTag.OCTET_STRING:
       result = decodeOctetString(buffer, offset, maxLength, 0, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CHARACTER_STRING:
+    case baEnum.ApplicationTag.CHARACTER_STRING:
       result = decodeCharacterString(buffer, offset, maxLength, lenValueType);
       value.len += result.len;
       value.value = result.value;
       value.encoding = result.encoding;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BIT_STRING:
+    case baEnum.ApplicationTag.BIT_STRING:
       result = decodeBitstring(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED:
+    case baEnum.ApplicationTag.ENUMERATED:
       result = decodeEnumerated(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_DATE:
+    case baEnum.ApplicationTag.DATE:
       result = decodeDateSafe(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIME:
+    case baEnum.ApplicationTag.TIME:
       result = decodeBacnetTimeSafe(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = result.value;
       break;
-    case baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID:
+    case baEnum.ApplicationTag.OBJECTIDENTIFIER:
       result = decodeObjectIdSafe(buffer, offset, lenValueType);
       value.len += result.len;
       value.value = {type: result.objectType, instance: result.instance};
@@ -1104,115 +1098,115 @@ var bacappDecodeData = function(buffer, offset, maxLength, tagDataType, lenValue
   return value;
 };
 
-var bacappContextTagType = function(property, tagNumber) {
-  var tag = baEnum.ApplicationTags.MAX_BACNET_APPLICATION_TAG;
+const bacappContextTagType = (property, tagNumber) => {
+  let tag = 0;
   switch (property) {
-    case baEnum.PropertyIds.PROP_ACTUAL_SHED_LEVEL:
-    case baEnum.PropertyIds.PROP_REQUESTED_SHED_LEVEL:
-    case baEnum.PropertyIds.PROP_EXPECTED_SHED_LEVEL:
+    case baEnum.PropertyIdentifier.ACTUAL_SHED_LEVEL:
+    case baEnum.PropertyIdentifier.REQUESTED_SHED_LEVEL:
+    case baEnum.PropertyIdentifier.EXPECTED_SHED_LEVEL:
       switch (tagNumber) {
         case 0:
         case 1:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT;
+          tag = baEnum.ApplicationTag.UNSIGNED_INTEGER;
           break;
         case 2:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_REAL;
+          tag = baEnum.ApplicationTag.REAL;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_ACTION:
+    case baEnum.PropertyIdentifier.ACTION:
       switch (tagNumber) {
         case 0:
         case 1:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         case 2:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED;
+          tag = baEnum.ApplicationTag.ENUMERATED;
           break;
         case 3:
         case 5:
         case 6:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT;
+          tag = baEnum.ApplicationTag.UNSIGNED_INTEGER;
           break;
         case 7:
         case 8:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BOOLEAN;
+          tag = baEnum.ApplicationTag.BOOLEAN;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_LIST_OF_GROUP_MEMBERS:
+    case baEnum.PropertyIdentifier.LIST_OF_GROUP_MEMBERS:
       switch (tagNumber) {
         case 0:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_EXCEPTION_SCHEDULE:
+    case baEnum.PropertyIdentifier.EXCEPTION_SCHEDULE:
       switch (tagNumber) {
         case 1:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         case 3:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT;
+          tag = baEnum.ApplicationTag.UNSIGNED_INTEGER;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_LOG_DEVICE_OBJECT_PROPERTY:
+    case baEnum.PropertyIdentifier.LOG_DEVICE_OBJECT_PROPERTY:
       switch (tagNumber) {
         case 0:
         case 3:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         case 1:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_ENUMERATED;
+          tag = baEnum.ApplicationTag.ENUMERATED;
           break;
         case 2:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT;
+          tag = baEnum.ApplicationTag.UNSIGNED_INTEGER;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_SUBORDINATE_LIST:
+    case baEnum.PropertyIdentifier.SUBORDINATE_LIST:
       switch (tagNumber) {
         case 0:
         case 1:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_RECIPIENT_LIST:
+    case baEnum.PropertyIdentifier.RECIPIENT_LIST:
       switch (tagNumber) {
         case 0:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_ID;
+          tag = baEnum.ApplicationTag.OBJECTIDENTIFIER;
           break;
         default:
           break;
       }
       break;
-    case baEnum.PropertyIds.PROP_ACTIVE_COV_SUBSCRIPTIONS:
+    case baEnum.PropertyIdentifier.ACTIVE_COV_SUBSCRIPTIONS:
       switch (tagNumber) {
         case 0:
         case 1:
           break;
         case 2:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_BOOLEAN;
+          tag = baEnum.ApplicationTag.BOOLEAN;
           break;
         case 3:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT;
+          tag = baEnum.ApplicationTag.UNSIGNED_INTEGER;
           break;
         case 4:
-          tag = baEnum.ApplicationTags.BACNET_APPLICATION_TAG_REAL;
+          tag = baEnum.ApplicationTag.REAL;
           break;
         default:
           break;
@@ -1224,17 +1218,21 @@ var bacappContextTagType = function(property, tagNumber) {
   return tag;
 };
 
-var decodeDeviceObjPropertyRef = function(buffer, offset) {
-  var len = 0;
-  var arrayIndex = BACNET_ARRAY_ALL;
-  if (!decodeIsContextTag(buffer, offset + len, 0)) return;
+const decodeDeviceObjPropertyRef = (buffer, offset) => {
+  let len = 0;
+  let arrayIndex = baEnum.ASN1_ARRAY_ALL;
+  if (!decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  var objectId = decodeObjectId(buffer, offset + len);
+  let objectId = decodeObjectId(buffer, offset + len);
   len += objectId.len;
-  var result = decodeTagNumberAndValue(buffer, offset + len);
+  let result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
-  var id = decodeEnumerated(buffer, offset + len, result.value);
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
+  let id = decodeEnumerated(buffer, offset + len, result.value);
   len += id.len;
   result = decodeTagNumberAndValue(buffer, offset + len);
   if (result.tagNumber === 2) {
@@ -1250,7 +1248,7 @@ var decodeDeviceObjPropertyRef = function(buffer, offset) {
     }
   }
   return {
-    len: len,
+    len,
     value: {
       objectId: objectId,
       id: id
@@ -1258,36 +1256,48 @@ var decodeDeviceObjPropertyRef = function(buffer, offset) {
   };
 };
 
-var decodeReadAccessSpecification = module.exports.decodeReadAccessSpecification = function(buffer, offset, apduLen) {
-  var len = 0;
-  var value = {};
-  if (!decodeIsContextTag(buffer, offset + len, 0)) return;
+const decodeReadAccessSpecification = module.exports.decodeReadAccessSpecification = (buffer, offset, apduLen) => {
+  let len = 0;
+  let value = {};
+  if (!decodeIsContextTag(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  var decodedValue = decodeObjectId(buffer, offset + len);
+  let decodedValue = decodeObjectId(buffer, offset + len);
   value.objectId = {
     type: decodedValue.objectType,
     instance: decodedValue.instance
   };
   len += decodedValue.len;
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) return;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
-  var propertyIdAndArrayIndex = [];
+  const propertyIdAndArrayIndex = [];
   while ((apduLen - len) > 1 && !decodeIsClosingTagNumber(buffer, offset + len, 1)) {
-    var propertyRef = {};
-    if (!isContextSpecific(buffer[offset + len])) return;
-    var result = decodeTagNumberAndValue(buffer, offset + len);
+    let propertyRef = {};
+    if (!isContextSpecific(buffer[offset + len])) {
+      return undefined;
+    }
+    let result = decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== 0) return;
-    if ((len + result.value) >= apduLen) return;
+    if (result.tagNumber !== 0) {
+      return undefined;
+    }
+    if ((len + result.value) >= apduLen) {
+      return undefined;
+    }
     decodedValue = decodeEnumerated(buffer, offset + len, result.value);
     propertyRef.id = decodedValue.value;
     len += decodedValue.len;
-    propertyRef.index = BACNET_ARRAY_ALL;
+    propertyRef.index = baEnum.ASN1_ARRAY_ALL;
     if (isContextSpecific(buffer[offset + len]) && !isClosingTag(buffer[offset + len])) {
-      var tmp = decodeTagNumberAndValue(buffer, offset + len);
+      const tmp = decodeTagNumberAndValue(buffer, offset + len);
       if (tmp.tagNumber === 1) {
         len += tmp.len;
-        if ((len + tmp.value) >= apduLen) return;
+        if ((len + tmp.value) >= apduLen) {
+          return undefined;
+        }
         decodedValue = decodeUnsigned(buffer, offset + len, tmp.value);
         propertyRef.index = decodedValue.value;
         len += decodedValue.len;
@@ -1295,56 +1305,80 @@ var decodeReadAccessSpecification = module.exports.decodeReadAccessSpecification
     }
     propertyIdAndArrayIndex.push(propertyRef);
   }
-  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
+  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   value.properties = propertyIdAndArrayIndex;
   return {
-    len: len,
-    value: value
+    len,
+    value
   };
 };
 
-var decodeCovSubscription = function(buffer, offset, apduLen) {
-  var len = 0;
-  var value = {};
-  var result;
-  var decodedValue;
+const decodeCovSubscription = (buffer, offset, apduLen) => {
+  let len = 0;
+  let value = {};
+  let result;
+  let decodedValue;
   value.recipient = {};
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 0)) return;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 0)) return;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) return;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.UNSIGNED_INTEGER) {
+    return undefined;
+  }
   decodedValue = decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   value.recipient.net = decodedValue.value;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OCTET_STRING) return;
+  if (result.tagNumber !== baEnum.ApplicationTag.OCTET_STRING) {
+    return undefined;
+  }
   decodedValue = decodeOctetString(buffer, offset + len, apduLen,  0, result.value);
   len += decodedValue.len;
   value.recipient.adr = decodedValue.value;
-  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
+  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
-  if (!decodeIsClosingTagNumber(buffer, offset + len, 0)) return;
+  if (!decodeIsClosingTagNumber(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   decodedValue = decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   value.subscriptionProcessId = decodedValue.value;
-  if (!decodeIsClosingTagNumber(buffer, offset + len, 0)) return;
+  if (!decodeIsClosingTagNumber(buffer, offset + len, 0)) {
+    return undefined;
+  }
   len++;
-  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) return;
+  if (!decodeIsOpeningTagNumber(buffer, offset + len, 1)) {
+    return undefined;
+  }
   len++;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 0) return;
+  if (result.tagNumber !== 0) {
+    return undefined;
+  }
   decodedValue = decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
   value.monitoredObjectId = {
@@ -1353,7 +1387,9 @@ var decodeCovSubscription = function(buffer, offset, apduLen) {
   };
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 1) return;
+  if (result.tagNumber !== 1) {
+    return undefined;
+  }
   decodedValue = decodeEnumerated(buffer, offset + len, result.value);
   len += decodedValue.len;
   value.monitoredProperty = {};
@@ -1365,36 +1401,44 @@ var decodeCovSubscription = function(buffer, offset, apduLen) {
     len += decodedValue.len;
     value.monitoredProperty.index = decodedValue.value;
   } else {
-    value.monitoredProperty.index = BACNET_ARRAY_ALL;
+    value.monitoredProperty.index = baEnum.ASN1_ARRAY_ALL;
+  }
+  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) {
+    return undefined;
   }
-  if (!decodeIsClosingTagNumber(buffer, offset + len, 1)) return;
   len++;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 2) return;
-  value.issueConfirmedNotifications = buffer[offset + len] > 0 ? true : false;
+  if (result.tagNumber !== 2) {
+    return undefined;
+  }
+  value.issueConfirmedNotifications = buffer[offset + len] > 0;
   len++;
   result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  if (result.tagNumber !== 3) return;
+  if (result.tagNumber !== 3) {
+    return undefined;
+  }
   decodedValue = decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   value.timeRemaining = decodedValue.value;
   if (len < apduLen && !isClosingTag(buffer[offset + len])) {
     result = decodeTagNumberAndValue(buffer, offset + len);
     len += result.len;
-    if (result.tagNumber !== 4) return;
+    if (result.tagNumber !== 4) {
+      return undefined;
+    }
     decodedValue = decodeReal(buffer, offset + len);
     len += decodedValue.len;
     value.covIncrement = decodedValue.value;
   }
   return {
-    len: len,
-    value: value
+    len,
+    value
   };
 };
 
-var decodeCalendarDate = function(buffer, offset) {
+const decodeCalendarDate = (buffer, offset) => {
   return {
     len: 4,
     year: buffer[offset],
@@ -1404,20 +1448,20 @@ var decodeCalendarDate = function(buffer, offset) {
   };
 };
 
-var decodeCalendarDateRange = function(buffer, offset) {
-  var len = 1;
-  var startDate = decodeDate(buffer, offset + len);
+const decodeCalendarDateRange = (buffer, offset) => {
+  let len = 1;
+  const startDate = decodeDate(buffer, offset + len);
   len += startDate.len + 1;
-  var endDate = decodeDate(buffer, offset + len);
+  const endDate = decodeDate(buffer, offset + len);
   len += endDate.len + 1;
   return {
-    len: len,
-    startDate: startDate,
-    endDate: endDate
+    len,
+    startDate,
+    endDate
   };
 };
 
-var decodeCalendarWeekDay = function(buffer, offset) {
+const decodeCalendarWeekDay = (buffer, offset) => {
   return {
     len: 3,
     month: buffer[offset],
@@ -1426,12 +1470,12 @@ var decodeCalendarWeekDay = function(buffer, offset) {
   };
 };
 
-var decodeCalendar = function(buffer, offset, apduLen) {
-  var len = 0;
-  var entries = [];
-  var decodedValue;
+const decodeCalendar = (buffer, offset, apduLen) => {
+  let len = 0;
+  const entries = [];
+  let decodedValue;
   while (len < apduLen) {
-    var result = decodeTagNumber(buffer, offset + len);
+    const result = decodeTagNumber(buffer, offset + len);
     len += result.len;
     switch (result.tagNumber) {
       case 0:
@@ -1458,100 +1502,116 @@ var decodeCalendar = function(buffer, offset, apduLen) {
   }
 };
 
-var bacappDecodeContextApplicationData = function(buffer, offset, maxOffset, objectType, propertyId) {
-  var len = 0;
-  var result;
+const bacappDecodeContextApplicationData = (buffer, offset, maxOffset, objectType, propertyId) => {
+  let len = 0;
+  let result;
   if (isContextSpecific(buffer[offset])) {
-    if (propertyId === baEnum.PropertyIds.PROP_LIST_OF_GROUP_MEMBERS) {
+    if (propertyId === baEnum.PropertyIdentifier.LIST_OF_GROUP_MEMBERS) {
       result = decodeReadAccessSpecification(buffer, offset, maxOffset);
-      if (!result) return;
+      if (!result) {
+        return undefined;
+      }
       return {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_READ_ACCESS_SPECIFICATION,
+        type: baEnum.ApplicationTag.READ_ACCESS_SPECIFICATION,
         value: result.value,
         len: result.len
       };
-    } else if (propertyId === baEnum.PropertyIds.PROP_ACTIVE_COV_SUBSCRIPTIONS) {
+    } else if (propertyId === baEnum.PropertyIdentifier.ACTIVE_COV_SUBSCRIPTIONS) {
       result = decodeCovSubscription(buffer, offset, maxOffset);
-      if (!result) return;
+      if (!result) {
+        return undefined;
+      }
       return {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_COV_SUBSCRIPTION,
+        type: baEnum.ApplicationTag.COV_SUBSCRIPTION,
         value: result.value,
         len: result.len
       };
-    } else if (objectType === baEnum.ObjectTypes.OBJECT_GROUP && propertyId === baEnum.acnetPropertyIds.PROP_PRESENT_VALUE) {
+    } else if (objectType === baEnum.ObjectType.GROUP && propertyId === baEnum.PropertyIdentifier.PRESENT_VALUE) {
       result = decodeReadAccessResult(buffer, offset, maxOffset);
-      if (!result) return;
+      if (!result) {
+        return undefined;
+      }
       return {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_READ_ACCESS_RESULT,
+        type: baEnum.ApplicationTag.READ_ACCESS_RESULT,
         value: result.value,
         len: result.len
       };
-    } else if (propertyId === baEnum.PropertyIds.PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES || propertyId === baEnum.PropertyIds.PROP_LOG_DEVICE_OBJECT_PROPERTY  || propertyId === baEnum.PropertyIds.PROP_OBJECT_PROPERTY_REFERENCE) {
+    } else if (propertyId === baEnum.PropertyIdentifier.LIST_OF_OBJECT_PROPERTY_REFERENCES || propertyId === baEnum.PropertyIdentifier.LOG_DEVICE_OBJECT_PROPERTY  || propertyId === baEnum.PropertyIdentifier.OBJECT_PROPERTY_REFERENCE) {
       result = decodeDeviceObjPropertyRef(buffer, offset, maxOffset);
-      if (!result) return;
+      if (!result) {
+        return undefined;
+      }
       return {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_OBJECT_PROPERTY_REFERENCE,
+        type: baEnum.ApplicationTag.OBJECT_PROPERTY_REFERENCE,
         value: result.value,
         len: result.len
       };
-    } else if (propertyId === baEnum.PropertyIds.PROP_DATE_LIST) {
+    } else if (propertyId === baEnum.PropertyIdentifier.DATE_LIST) {
       result = decodeCalendar(buffer, offset, maxOffset);
-      if (!result) return;
+      if (!result) {
+        return undefined;
+      }
       return {
-        type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CONTEXT_SPECIFIC_DECODED,
+        type: baEnum.ApplicationTag.CONTEXT_SPECIFIC_DECODED,
         value: result.value,
         len: result.len
       };
-    } else if (propertyId === baEnum.PropertyIds.PROP_EVENT_TIME_STAMPS) {
-      var subEvtResult;
-      var evtResult = decodeTagNumberAndValue(buffer, offset + len);
+    } else if (propertyId === baEnum.PropertyIdentifier.EVENT_TIME_STAMPS) {
+      let subEvtResult;
+      let evtResult = decodeTagNumberAndValue(buffer, offset + len);
       len += 1;
       if (evtResult.tagNumber === 0) {
         subEvtResult = decodeBacnetTime(buffer, offset + 1);
         return {
-          type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIMESTAMP,
+          type: baEnum.ApplicationTag.TIMESTAMP,
           value: subEvtResult.value,
           len: subEvtResult.len + 1
         };
       } else if (evtResult.tagNumber === 1) {
         subEvtResult = decodeUnsigned(buffer, offset + len, evtResult.value);
         return {
-          type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_UNSIGNED_INT,
+          type: baEnum.ApplicationTag.UNSIGNED_INTEGER,
           value: subEvtResult.value,
           len: subEvtResult.len + 1
         };
       } else if (evtResult.tagNumber === 2) {
         subEvtResult = decodeBacnetDatetime(buffer, offset + len);
         return {
-          type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_TIMESTAMP,
+          type: baEnum.ApplicationTag.TIMESTAMP,
           value: subEvtResult.value,
           len: subEvtResult.len + 2
         };
       } else {
-        return;
+        return undefined;
       }
     }
-    var list = [];
-    var tagResult = decodeTagNumberAndValue(buffer, offset + len);
-    var multipleValues = isOpeningTag(buffer[offset + len]);
+    const list = [];
+    let tagResult = decodeTagNumberAndValue(buffer, offset + len);
+    let multipleValues = isOpeningTag(buffer[offset + len]);
     while (((len + offset) <= maxOffset) && !isClosingTag(buffer[offset + len])) {
-      var subResult = decodeTagNumberAndValue(buffer, offset + len);
-      if (!subResult) return;
+      let subResult = decodeTagNumberAndValue(buffer, offset + len);
+      if (!subResult) {
+        return undefined;
+      }
       if (subResult.value === 0) {
         len += subResult.len;
-        result = bacappDecodeApplicationData(buffer, offset + len, maxOffset, baEnum.ObjectTypes.MAX_BACNET_OBJECT_TYPE, baEnum.PropertyIds.MAX_BACNET_PROPERTY_ID);
-        if (!result) return;
+        result = bacappDecodeApplicationData(buffer, offset + len, maxOffset, baEnum.ASN1_MAX_OBJECT_TYPE, baEnum.ASN1_MAX_PROPERTY_ID);
+        if (!result) {
+          return undefined;
+        }
         list.push(result);
         len += result.len;
       } else {
-        var overrideTagNumber = bacappContextTagType(propertyId, subResult.tagNumber);
-        if (overrideTagNumber !== baEnum.ApplicationTags.MAX_BACNET_APPLICATION_TAG) {
+        const overrideTagNumber = bacappContextTagType(propertyId, subResult.tagNumber);
+        if (overrideTagNumber !== baEnum.ASN1_MAX_APPLICATION_TAG) {
           subResult.tagNumber = overrideTagNumber;
         }
-        var bacappResult = bacappDecodeData(buffer, offset + len + subResult.len, maxOffset, subResult.tagNumber, subResult.value);
-        if (!bacappResult) return;
+        let bacappResult = bacappDecodeData(buffer, offset + len + subResult.len, maxOffset, subResult.tagNumber, subResult.value);
+        if (!bacappResult) {
+          return undefined;
+        }
         if (bacappResult.len === subResult.value) {
-          var resObj = {
+          let resObj = {
             value: bacappResult.value,
             type: bacappResult.type
           };
@@ -1562,152 +1622,110 @@ var bacappDecodeContextApplicationData = function(buffer, offset, maxOffset, obj
         } else {
           list.push({
             value: buffer.slice(offset + len + subResult.len, offset + len + subResult.len + subResult.value),
-            type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CONTEXT_SPECIFIC_ENCODED
+            type: baEnum.ApplicationTag.CONTEXT_SPECIFIC_ENCODED
           });
           len += subResult.len + subResult.value;
         }
       }
       if (multipleValues === false) {
         return {
-          len: len,
+          len,
           value: list[0],
-          type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CONTEXT_SPECIFIC_DECODED
+          type: baEnum.ApplicationTag.CONTEXT_SPECIFIC_DECODED
         };
       }
     }
-    if ((len + offset) > maxOffset) return;
+    if ((len + offset) > maxOffset) {
+      return undefined;
+    }
     if (decodeIsClosingTagNumber(buffer, offset + len, tagResult.tagNumber)) {
       len++;
     }
     return {
-      len: len,
+      len,
       value: list,
-      type: baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CONTEXT_SPECIFIC_DECODED
+      type: baEnum.ApplicationTag.CONTEXT_SPECIFIC_DECODED
     };
-  } else {
-    return;
   }
+  return undefined;
 };
 
-var bacappEncodeTimestamp = function(buffer, value) {
+const bacappEncodeTimestamp = module.exports.bacappEncodeTimestamp = (buffer, value) => {
   switch (value.type) {
-    case baEnum.TimestampTags.TIME_STAMP_TIME:
+    case baEnum.TimeStamp.TIME:
       encodeContextTime(buffer, 0, value.value);
       break;
-    case baEnum.TimestampTags.TIME_STAMP_SEQUENCE:
+    case baEnum.TimeStamp.SEQUENCE_NUMBER:
       encodeContextUnsigned(buffer, 1, value.value);
       break;
-    case baEnum.TimestampTags.TIME_STAMP_DATETIME:
+    case baEnum.TimeStamp.DATETIME:
       bacappEncodeContextDatetime(buffer, 2, value.value);
       break;
-    case baEnum.TimestampTags.TIME_STAMP_NONE:
-      break;
     default:
       throw new Error('NOT_IMPLEMENTED');
   }
 };
 
-var bacappEncodeContextTimestamp = module.exports.bacappEncodeContextTimestamp = function(buffer, tagNumber, value) {
-  if (value.type !== baEnum.TimestampTags.TIME_STAMP_NONE) {
-    encodeOpeningTag(buffer, tagNumber);
-    bacappEncodeTimestamp(buffer, value);
-    encodeClosingTag(buffer, tagNumber);
-  }
+const bacappEncodeContextTimestamp = module.exports.bacappEncodeContextTimestamp = (buffer, tagNumber, value) => {
+  encodeOpeningTag(buffer, tagNumber);
+  bacappEncodeTimestamp(buffer, value);
+  encodeClosingTag(buffer, tagNumber);
 };
 
-var decodeContextCharacterString = module.exports.decodeContextCharacterString = function(buffer, offset, maxLength, tagNumber) {
-  var len = 0;
-  if (!decodeIsContextTag(buffer, offset + len, tagNumber)) return;
-  var result = decodeTagNumberAndValue(buffer, offset + len);
+const decodeContextCharacterString = module.exports.decodeContextCharacterString = (buffer, offset, maxLength, tagNumber) => {
+  let len = 0;
+  if (!decodeIsContextTag(buffer, offset + len, tagNumber)) {
+    return undefined;
+  }
+  const result = decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
-  var decodedValue = multiCharsetCharacterstringDecode(buffer, offset + 1 + len, maxLength, buffer[offset + len], result.value - 1);
-  if (!decodedValue) return;
+  const decodedValue = multiCharsetCharacterstringDecode(buffer, offset + 1 + len, maxLength, buffer[offset + len], result.value - 1);
+  if (!decodedValue) {
+    return undefined;
+  }
   len += result.value;
   return {
-    len: len,
+    len,
     value: decodedValue.value,
     encoding: decodedValue.encoding
   };
 };
 
-var decodeIsContextTagWithLength = function(buffer, offset, tagNumber) {
-  var result = decodeTagNumber(buffer, offset);
+const decodeIsContextTagWithLength = (buffer, offset, tagNumber) => {
+  const result = decodeTagNumber(buffer, offset);
   return {
     len: result.len,
     value: isContextSpecific(buffer[offset]) && (result.tagNumber === tagNumber)
   };
 };
 
-var decodeContextBacnetTime = function(buffer, offset, tagNumber) {
-  var result = decodeIsContextTagWithLength(buffer, offset, tagNumber);
-  if (!result.value) return;
-  var decodedValue = decodeBacnetTime(buffer, offset + result.len);
-  return {
-    len: result.len + decodedValue.len,
-    value: decodedValue.value
-  };
-};
-
-var decodeContextDate = function(buffer, offset, tagNumber) {
-  var result = decodeIsContextTagWithLength(buffer, offset, tagNumber);
-  if (!result.value) return;
-  var decodedValue = decodeDate(buffer, offset + result.len);
-  return {
-    len: result.len + decodedValue.len,
-    value: decodedValue.value
-  };
-};
-
-module.exports.decodeContextObjectId = function(buffer, offset, tagNumber) {
-  var result = decodeIsContextTagWithLength(buffer, offset, tagNumber);
-  if (!result.value) return;
-  var decodedValue = decodeObjectId(buffer, offset + result.len);
+module.exports.decodeContextObjectId = (buffer, offset, tagNumber) => {
+  const result = decodeIsContextTagWithLength(buffer, offset, tagNumber);
+  if (!result.value) {
+    return undefined;
+  }
+  const decodedValue = decodeObjectId(buffer, offset + result.len);
   decodedValue.len = decodedValue.len + result.len;
   return decodedValue;
 };
 
-var bacappDecodeContextData = function(buffer, offset, maxApduLen, propertyTag) {
-  var len = 0;
-  var decodedValue;
-  if (isContextSpecific(buffer[offset])) {
-    var result = decodeTagNumberAndValue(buffer, offset);
-    len = result.len;
-    if (len > 0 && (len <= maxApduLen) && !decodeIsClosingTagNumber(buffer, offset + len, result.tagNumber)) {
-      if (propertyTag < baEnum.ApplicationTags.MAX_BACNET_APPLICATION_TAG) {
-        decodedValue = bacappDecodeData(buffer, offset + len, maxApduLen, propertyTag, result.value);
-        len += decodedValue.len;
-      } else if (result.value > 0) {
-        len += result.value;
-      } else {
-        return;
-      }
-    } else if (len === 1) {
-      len = 0;
-    }
-  }
-  return {
-    len: len,
-    value: decodedValue ? decodedValue.value : decodedValue
-  };
-};
-
-var encodeBacnetCharacterString = function(buffer, value, encoding) {
-  encoding = encoding || baEnum.CharacterStringEncodings.CHARACTER_UTF8;
+const encodeBacnetCharacterString = (buffer, value, encoding) => {
+  encoding = encoding || baEnum.CharacterStringEncoding.UTF_8;
   buffer.buffer[buffer.offset++] = encoding;
-  var bufEncoded = iconv.encode(value, getEncodingType(encoding));
+  const bufEncoded = iconv.encode(value, getEncodingType(encoding));
   buffer.offset += bufEncoded.copy(buffer.buffer, buffer.offset);
 };
 
-var encodeApplicationCharacterString = module.exports.encodeApplicationCharacterString = function(buffer, value, encoding) {
-  var tmp = getBuffer();
+const encodeApplicationCharacterString = module.exports.encodeApplicationCharacterString = (buffer, value, encoding) => {
+  const tmp = getBuffer();
   encodeBacnetCharacterString(tmp, value, encoding);
-  encodeTag(buffer, baEnum.ApplicationTags.BACNET_APPLICATION_TAG_CHARACTER_STRING, false, tmp.offset);
+  encodeTag(buffer, baEnum.ApplicationTag.CHARACTER_STRING, false, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);
   buffer.offset += tmp.offset;
 };
 
-var encodeContextCharacterString = module.exports.encodeContextCharacterString = function(buffer, tagNumber, value, encoding) {
-  var tmp = getBuffer();
+const encodeContextCharacterString = module.exports.encodeContextCharacterString = (buffer, tagNumber, value, encoding) => {
+  const tmp = getBuffer();
   encodeBacnetCharacterString(tmp, value, encoding);
   encodeTag(buffer, tagNumber, true, tmp.offset);
   tmp.buffer.copy(buffer.buffer, buffer.offset, 0, tmp.offset);