fix(bacnet-asn1): correct octet-string encoding and decoding

fh1ch · May 30, 2017 · aee51a5 · aee51a5
1 parent f10984b
commit aee51a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/lib/bacnet-asn1.js b/lib/bacnet-asn1.js
@@ -175,7 +175,7 @@ var encode_octetString = function(buffer, octetString, octetOffset, octetCount)
 };
 
 var encode_application_octetString = function(buffer, octetString, octetOffset, octetCount) {
-  encodeTag(buffer, baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_octetString, false, octetCount);
+  encodeTag(buffer, baEnum.BacnetApplicationTags.BACNET_APPLICATION_TAG_OCTET_STRING, false, octetCount);
   encode_octetString(buffer, octetString, octetOffset, octetCount);
 };
 
@@ -865,9 +865,13 @@ var decode_double_safe = function(buffer, offset, lenValue) {
 };
 
 var decode_octetString = function(buffer, offset, maxLength, octetStringOffset, octetStringLength) {
+  var octetString = [];
+  for (var i = octetStringOffset; i < (octetStringOffset + octetStringLength); i++) {
+    octetString.push(buffer[offset + i]);
+  }
   return {
     len: octetStringLength,
-    value: Buffer.from(buffer.slice(offset, octetStringLength))
+    value: octetString
   };
 };
 

diff --git a/test/unit/bacnet-services.spec.js b/test/unit/bacnet-services.spec.js
@@ -191,12 +191,11 @@ describe('bacstack - Services layer', function() {
       });
     });
 
-    xit('should successfully encode and decode an octet-string value', function() {
+    it('should successfully encode and decode an octet-string value', function() {
       var buffer = utils.getBuffer();
       baServices.EncodeReadPropertyAcknowledge(buffer, {type: 8, instance: 40000}, 81, 0xFFFFFFFF, [
-        // FIXME: correct octet-string implementation
-        // {Tag: 6, Value: []}
-        // {Tag: 6, Value: [1, 2, 100, 200]}
+        {Tag: 6, Value: []},
+        {Tag: 6, Value: [1, 2, 100, 200]}
       ]);
       var result = baServices.DecodeReadPropertyAcknowledge(buffer.buffer, 0, buffer.offset);
       delete result.len;
@@ -210,8 +209,8 @@ describe('bacstack - Services layer', function() {
           propertyIdentifier: 81
         },
         valueList: [
-          {type: 6, value: [], len: 0},
-          {type: 6, value: [1, 2, 100, 200], len: 4}
+          {type: 6, value: [], len: 1},
+          {type: 6, value: [1, 2, 100, 200], len: 5}
         ]
       });
     });