Merge pull request #736 from Keshav-NEC/Fix_for_690

Fix for binary data representation when sending data through HTTP & MQTT

CHANGES_NEXT_RELEASE

@@ -1 +1 @@
-
+- Fix: binary data representation when sending data through HTTP & MQTT (#690)

docs/roadmap.md

@@ -5,8 +5,8 @@ This product is a FIWARE Generic Enabler. If you would like to learn about the o
 
 ### Introduction
 
-This IoT Agent uses the [FIWARE IoT Agent Node.js Library](https://github.com/telefonicaid/iotagent-node-lib) framework. 
-This is why most of the functionalities of this component depend on the new features of the library itself. 
+This IoT Agent uses the [FIWARE IoT Agent Node.js Library](https://github.com/telefonicaid/iotagent-node-lib) framework.
+This is why most of the functionalities of this component depend on the new features of the library itself.
 
 For this reason, the roadmap of this component would be defined by the IoT Agent Node Library Roadmap that you can check
 [here](https://github.com/telefonicaid/iotagent-node-lib/blob/master/doc/roadmap.md)

lib/bindings/HTTPBinding.js

@@ -127,7 +127,9 @@ function parseData(req, res, next) {
         next(error);
     } else {
         req.jsonPayload = data;
-
+        if (req.body !== undefined ) {
+            data = data.toString('hex');
+        }
         config.getLogger().debug(context, 'Parsed data: [%j]', data);
         next();
     }
@@ -290,6 +292,7 @@ function handleIncomingMeasure(req, res, next) {
 
         if (req.attr && req.jsonPayload) {
             config.getLogger().debug(context, 'Parsing attr [%s] with value [%s]', req.attr, req.jsonPayload);
+            req.jsonPayload = req.jsonPayload.toString('hex');
             const theAttr = [{ name: req.attr, value: req.jsonPayload, type: 'None' }];
             attributeArr.push(theAttr);
         } else {

test/unit/ngsiv2/MQTT_receive_measures-test2.js

@@ -395,4 +395,24 @@ describe('MQTT: Measure reception ', function () {
             });
         });
     });
+    describe('When a POST single Raw measure arrives for the HTTP binding', function () {
+        beforeEach(function () {
+            contextBrokerMock
+                .matchHeader('fiware-service', 'smartgondor')
+                .matchHeader('fiware-servicepath', '/gardens')
+                .post(
+                    '/v2/entities?options=upsert',
+                    utils.readExampleFile('./test/unit/ngsiv2/contextRequests/singleMeasuresRawTypes1.json')
+                )
+                .reply(204);
+        });
+        it('should send its value to the Context Broker', function (done) {
+            mqttClient.publish('/1234/MQTT_2/attrs/humidity', 'A$Ci1', null, function (error) {
+                setTimeout(function () {
+                    contextBrokerMock.done();
+                    done();
+                }, 100);
+            });
+        });
+    });
 });

test/unit/ngsiv2/contextRequests/singleMeasuresRawTypes.json

@@ -3,12 +3,6 @@
     "type":"AnMQTTDevice",     
   "humidity":{
     "type": "degrees",
-     "value": { 
-         "type": "Buffer",
-         "data": [
-             51,
-             50
-         ]
-     }
+     "value": "3332"
   }
 }

test/unit/ngsiv2/contextRequests/singleMeasuresRawTypes1.json

@@ -0,0 +1,8 @@
+{
+    "id":"Second MQTT Device",
+    "type":"AnMQTTDevice", 
+  "humidity":{
+    "type": "degrees",
+    "value": "4124436931"
+  }
+}