fix(services): correct readRangeAcknowledge implementation

fh1ch · fh1ch · commit 52c6d02fe82e · 2018-01-11T07:28:55.000+01:00
diff --git a/lib/services.js b/lib/services.js
@@ -1297,7 +1297,7 @@ module.exports.decodeEventNotifyData = (buffer, offset) => {
 module.exports.encodeReadRangeAcknowledge = (buffer, objectId, propertyId, arrayIndex, resultFlags, itemCount, applicationData, requestType, firstSequence) => {
   baAsn1.encodeContextObjectId(buffer, 0, objectId.type, objectId.instance);
   baAsn1.encodeContextEnumerated(buffer, 1, propertyId);
-  if (arrayIndex === baAsn1.BACNET_ARRAY_ALL) {
+  if (arrayIndex !== baAsn1.BACNET_ARRAY_ALL) {
     baAsn1.encodeContextUnsigned(buffer, 2, arrayIndex);
   }
   baAsn1.encodeContextBitstring(buffer, 3, resultFlags);
@@ -1317,42 +1317,45 @@ module.exports.decodeReadRangeAcknowledge = (buffer, offset, apduLen) => {
   let len = 0;
   let result;
   let decodedValue;
-  let resultFlag;
   if (!baAsn1.decodeIsContextTag(buffer, offset + len, 0)) return;
   len++;
   decodedValue = baAsn1.decodeObjectId(buffer, offset + len);
   len += decodedValue.len;
-  let objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
-  let property = {};
+  const objectId = {type: decodedValue.objectType, instance: decodedValue.instance};
+  const property = {index: baAsn1.BACNET_ARRAY_ALL};
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
   if (result.tagNumber !== 1) return;
   decodedValue = baAsn1.decodeEnumerated(buffer, offset + len, result.value);
   len += decodedValue.len;
   property.id = decodedValue.value;
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
-  len += result.len;
   if ((result.tagNumber === 2) && (len < apduLen)) {
+    len += result.len;
     decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
     len += decodedValue.len;
     property.index = decodedValue.value;
-  } else {
-    decodedValue = baAsn1.decodeBitstring(buffer, offset + len, 2);
-    len += decodedValue.len;
-    resultFlag = decodedValue.value;
   }
   result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
   len += result.len;
+  decodedValue = baAsn1.decodeBitstring(buffer, offset + len, result.value);
+  len += decodedValue.len;
+  const resultFlag = decodedValue.value;
+  result = baAsn1.decodeTagNumberAndValue(buffer, offset + len);
+  len += result.len;
   decodedValue = baAsn1.decodeUnsigned(buffer, offset + len, result.value);
   len += decodedValue.len;
   const itemCount = decodedValue.value;
   if (!(baAsn1.decodeIsOpeningTag(buffer, offset + len))) return;
-  len += 1;
-  const rangeBuffer = buffer.slice(offset + len, buffer.length - offset - len - 1);
+  len++;
+  const rangeBuffer = buffer.slice(offset + len, apduLen - 3);
   return {
-    len: len,
+    objectId: objectId,
+    property: property,
+    resultFlag: resultFlag,
     itemCount: itemCount,
-    rangeBuffer: rangeBuffer
+    rangeBuffer: rangeBuffer,
+    len: len,
   };
 };
 
diff --git a/test/unit/bacnet-services.spec.js b/test/unit/bacnet-services.spec.js
@@ -1652,23 +1652,18 @@ describe('bacstack - Services layer', () => {
     });
   });
 
-  // TODO: Correct test behaviour
-  describe.skip('ReadRangeAcknowledge', () => {
+  describe('ReadRangeAcknowledge', () => {
     it('should successfully encode and decode', () => {
       const buffer = utils.getBuffer();
       baServices.encodeReadRangeAcknowledge(buffer, {type: 12, instance: 500}, 5048, 0xFFFFFFFF, {bitsUsed: 24, value: [1, 2, 3]}, 12, Buffer.from([1, 2, 3]), 2, 2);
       const result = baServices.decodeReadRangeAcknowledge(buffer.buffer, 0, buffer.offset);
       delete result.len;
       expect(result).to.deep.equal({
-        count: 0,
-        objectId: {type: 61, instance: 35},
-        position: 10,
-        property: {
-          index: 0xFFFFFFFF,
-          id: 85
-        },
-        requestType: 1,
-        time: undefined
+        objectId: {type: 12, instance: 500},
+        itemCount: 12,
+        property: {id: 5048, index: 0xFFFFFFFF},
+        resultFlag: {bitsUsed: 24, value: [1, 2, 3]},
+        rangeBuffer: Buffer.from([1, 2, 3])
       });
     });
   });
