iotagent-node-lib 4.3.0 → 4.5.0

package/lib/services/ngsi/ngsiService.js

@@ -144,9 +144,9 @@ function executeWithDeviceInformation(operationFunction) {
             // For preregistered devices, augment the existing deviceInformation with selected attributes.
             if (!callback) {
                 callback = deviceInformation;
-                typeInformation = deviceGroup || { ...config.getConfig(), ...configDeviceInfo };
+                typeInformation = deviceGroup || { ...config.getConfigForTypeInformation(), ...configDeviceInfo };
             } else {
-                typeInformation = { ...config.getConfig(), ...deviceInformation };
+                typeInformation = { ...config.getConfigForTypeInformation(), ...deviceInformation };
                 attributeList.forEach((key) => {
                     typeInformation[key] =
                         typeInformation[key] || (deviceGroup || {})[key] || (configDeviceInfo || {})[key];

package/lib/services/ngsi/subscription-NGSI-LD.js

@@ -89,7 +89,7 @@ function createSubscriptionHandlerNgsiLD(device, triggers, store, callback) {
                 triggers
             });
 
-            config.getRegistry().update(device, callback);
+            config.getRegistry().update(device, device, callback);
         } else {
             callback(null, response.headers.location);
         }
@@ -203,7 +203,7 @@ function createUnsubscribeHandlerNgsiLD(device, id, callback) {
             callback(new errors.BadRequest(body.orionError.details));
         } else {
             device.subscriptions.splice(device.subscriptions.indexOf(id), 1);
-            config.getRegistry().update(device, callback);
+            config.getRegistry().update(device, device, callback);
         }
     };
 }

package/lib/services/ngsi/subscription-NGSI-v2.js

@@ -91,7 +91,7 @@ function createSubscriptionHandlerNgsi2(device, triggers, store, callback) {
                 triggers
             });
 
-            config.getRegistry().update(device, callback);
+            config.getRegistry().update(device, device, callback);
         } else {
             callback(null, response.headers.location);
         }
@@ -203,7 +203,7 @@ function createUnsubscribeHandlerNgsi2(device, id, callback) {
             callback(new errors.BadRequest(body.orionError.details));
         } else {
             device.subscriptions.splice(device.subscriptions.indexOf(id), 1);
-            config.getRegistry().update(device, callback);
+            config.getRegistry().update(device, device, callback);
         }
     };
 }

package/lib/services/northBound/deviceProvisioningServer.js

@@ -398,11 +398,11 @@ function handleRemoveDevices(req, res, next) {
  * This middleware handles updates in the provisioning devices. The only attribute
  */
 function handleUpdateDevice(req, res, next) {
-    function applyUpdatingHandler(device, callback) {
+    function applyUpdatingHandler(newDevice, oldDevice, callback) {
         if (updatingHandler) {
-            updatingHandler(device, callback);
+            updatingHandler(newDevice, oldDevice, callback);
         } else {
-            callback(null, device);
+            callback(null, newDevice);
         }
     }
 
@@ -429,10 +429,11 @@ function handleUpdateDevice(req, res, next) {
                         isTypeOrNameUpdated = true;
                     }
                     async.waterfall(
-                        [apply(applyUpdatingHandler, newDevice)],
+                        [apply(applyUpdatingHandler, newDevice, device)],
                         function handleUpdating(error, newDeviceUpdated) {
                             deviceService.updateRegister(
                                 newDeviceUpdated,
+                                device,
                                 isTypeOrNameUpdated,
                                 function handleDeviceUpdate(error) {
                                     if (error) {

package/lib/services/northBound/northboundServer.js

@@ -56,8 +56,8 @@ function start(config, callback) {
     northboundServer.app.set('port', config.server.port);
     northboundServer.app.set('host', config.server.host || '0.0.0.0');
     northboundServer.app.use(domainUtils.requestDomain);
-    northboundServer.app.use(bodyParser.json());
-    northboundServer.app.use(bodyParser.json({ type: 'application/*+json' }));
+    northboundServer.app.use(bodyParser.json({ limit: config.expressLimit }));
+    northboundServer.app.use(bodyParser.json({ type: 'application/*+json', limit: config.expressLimit }));
 
     if (config.logLevel && config.logLevel === 'DEBUG') {
         northboundServer.app.use(middlewares.traceRequest);

package/package.json

@@ -2,7 +2,7 @@
   "name": "iotagent-node-lib",
   "license": "AGPL-3.0-only",
   "description": "IoT Agent library to interface with NGSI Context Broker",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",
@@ -45,7 +45,7 @@
   "dependencies": {
     "async": "2.6.4",
     "body-parser": "~1.20.0",
-    "express": "~4.18.1",
+    "express": "~4.19.2",
     "got": "~11.8.5",
     "jexl": "2.3.0",
     "jison": "0.4.18",

package/scripts/legacy_expression_tool/requirements.txt

@@ -1,3 +1,3 @@
 matplotlib==3.7.1
 pandas==2.0.2
-pymongo==4.3.3
+pymongo==4.6.3

package/test/functional/README.md

@@ -39,7 +39,7 @@ test cases are automatically generated. Each test case is defined as an object w
         or if the `transport` element is not defined. See the "Advanced features" section for more information.
     -   `shouldName`: The name of the `IT` test case. This will be used to generate the test case name in the mocha test
         suite.
-    -   `type`: The type of the test case. This can be `single` or `multientity`. See the "Advanced features" section
+    -   `type`: The type of the test case. This can be `single`, `multimeasure` or `multientity`. See the "Advanced features" section
         for more information.
     -   `measure`: The JSON object that will be sent to the IoTA JSON measure API. This will be used to send the
         measure. It contains the following elements:
@@ -199,41 +199,11 @@ as a batch operation (see the following example).
 
 #### Multimeasures
 
-It is also supported to test cases in which is sent more than one measure. To do so, you need to define the test case
-`expectation` as an array, with one object for each measurement. Then, the suite will recognize the array length and will
-expect the same number of NGSI requests. I.E:
+It is also supported to test cases in which is sent more than one measure. To do so, you need to set add to the test case 
+the parameter `should.type` to the value `'multimeasure'`.
 
-```js
-[
-    {
-        id: 'TheLightType2:MQTT_2',
-        type: 'TheLightType2',
-        temperature: {
-            value: 10,
-            type: 'Number'
-        },
-        status: {
-            value: false,
-            type: 'Boolean'
-        }
-    },
-    {
-        id: 'TheLightType2:MQTT_2',
-        type: 'TheLightType2',
-        temperature: {
-            value: 20,
-            type: 'Number'
-        },
-        status: {
-            value: true,
-            type: 'Boolean'
-        }
-    }
-];
-```
-
-You also should define the measure as multimeasure. This is done by defining the `measure` JSON element as an array of
-objects. Each object will be a measure that will be sent to the Context Broker in a different request. I.E:
+You must define the measure as multimeasure. This is done by defining the `measure` JSON element as an array of
+objects. I.E:
 
 ```javascript
 measure: {
@@ -246,16 +216,69 @@ measure: {
     json: [
         {
             s: false,
-            t: 10
+            t: 21
         },
         {
             s: true,
-            t: 20
+            t: 22
+        },
+        {
+            s: false,
+            t: 23
+        }
+    ]
+}
+```
+
+And you should define the test case `expectation` as an object, following a Context Broker batch operation. I.E:
+
+```js
+expectation: {
+    actionType: 'append',
+    entities: [
+        {
+            id: 'TheLightType2:MQTT_2',
+            type: 'TheLightType2',
+            temperature: {
+                type: 'Number',
+                value: 21
+            },
+            status: {
+                type: 'Boolean',
+                value: false
+            }
+        },
+        {
+            id: 'TheLightType2:MQTT_2',
+            type: 'TheLightType2',
+            temperature: {
+                type: 'Number',
+                value: 22
+            },
+            status: {
+                type: 'Boolean',
+                value: true
+            }
+        },
+        {
+            id: 'TheLightType2:MQTT_2',
+            type: 'TheLightType2',
+            temperature: {
+                type: 'Number',
+                value: 23
+            },
+            status: {
+                type: 'Boolean',
+                value: false
+            }
         }
     ]
 }
 ```
 
+Then, a batch request would be sent to the Context Broker containing the different measures. More information about
+how the IoT Agent send multimeasures to the Context Broker [here](/doc/api.md#multimeasure-support).
+
 #### Transport
 
 The test suite supports using the internal node lib function `iotAgentLib.update`, `HTTP` or `MQTT` for measure sending.