iotagent-node-lib 2.26.0 → 3.0.0

package/lib/services/ngsi/ngsiUtils.js

@@ -90,10 +90,10 @@ function isFloat(value) {
 }
 
 /**
- * It casts attribute values which are reported using JSON native types
+ * It casts attribute values which are reported using JSON parsing
  *
  * @param      {String}  payload  The payload
- * @return     {String}           New payload where attributes's values are casted to the corresponding JSON types
+ * @return     {String}           New payload where attributes's values are casted to the corresponding JSON values
  */
 function castJsonNativeAttributes(payload) {
     if (!config.getConfig().autocast) {
@@ -105,28 +105,13 @@ function castJsonNativeAttributes(payload) {
             /* eslint-disable-next-line  no-prototype-builtins */
             payload.hasOwnProperty(key) &&
             payload[key].value &&
-            payload[key].type &&
             typeof payload[key].value === 'string'
         ) {
-            if (payload[key].type === 'Number' && isFloat(payload[key].value)) {
-                payload[key].value = Number.parseFloat(payload[key].value);
-            } else if (payload[key].type === 'Number' && Number.parseInt(payload[key].value)) {
-                payload[key].value = Number.parseInt(payload[key].value);
-            } else if (payload[key].type === 'Boolean') {
-                payload[key].value = payload[key].value === 'true' || payload[key].value === '1';
-            } else if (payload[key].type === 'None') {
-                payload[key].value = null;
-            } else if (payload[key].type === 'Array' || payload[key].type === 'Object') {
-                try {
-                    const parsedValue = JSON.parse(payload[key].value);
-                    payload[key].value = parsedValue;
-                } catch (e) {
-                    logger.error(
-                        context,
-                        'Bad attribute value type. Expecting JSON Array or JSON Object. Received:%s',
-                        payload[key].value
-                    );
-                }
+            try {
+                const parsedValue = JSON.parse(payload[key].value);
+                payload[key].value = parsedValue;
+            } catch (e) {
+                // Keep value as is
             }
         }
     }
@@ -223,6 +208,14 @@ function getMetaData(typeInformation, name, metadata) {
             }
         }
     }
+    if (typeInformation.lazy) {
+        for (i = 0; i < typeInformation.lazy.length; i++) {
+            /* jshint camelcase: false */
+            if (name === typeInformation.lazy[i].object_id) {
+                return typeInformation.lazy[i].metadata;
+            }
+        }
+    }
     if (typeInformation.staticAttributes) {
         for (i = 0; i < typeInformation.staticAttributes.length; i++) {
             if (name === typeInformation.staticAttributes[i].name) {

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": "2.26.0",
+  "version": "3.0.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",

package/test/unit/general/loglevel-api_test.js

@@ -73,8 +73,6 @@ describe('Log level API', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
                 done();
             });
         });

package/test/unit/ngsi-ld/examples/contextRequests/updateContextAliasPlugin1.json

@@ -2,11 +2,6 @@
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:Light:light1",
-        "pressure": {
-            "type": "Property",
-            "unitCode": "Hgmm",
-            "value": 20071103
-        },
         "temperature": {
             "type": "Property",
             "unitCode": "CEL",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextAutocast10.json

@@ -1,7 +1,7 @@
 [
     {
         "@context": "http://context.json-ld",
-        "configuration": {
+        "date": {
             "type": "Property",
             "value": {
                 "@type": "Date",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextAutocast8.json

@@ -1,7 +1,7 @@
 [
     {
         "@context": "http://context.json-ld",
-        "configuration": {
+        "time": {
             "type": "Property",
             "value": {
                 "@type": "Time",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextAutocast9.json

@@ -1,7 +1,7 @@
 [
     {
         "@context": "http://context.json-ld",
-        "configuration": {
+        "dateTime": {
             "type": "Property",
             "value": {
                 "@type": "DateTime",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin32.json

@@ -1,17 +1,18 @@
 [
-  {
-    "@context": "http://context.json-ld",
-    "location": {
-      "type": "GeoProperty",
-      "value": {
-        "coordinates": [
-          13,
-          52
-        ],
-        "type": "Point"
-      }
-    },
-    "id": "urn:ngsi-ld:GPS:gps1",
-    "type": "GPS"
-  }
+    {
+        "@context": "http://context.json-ld",
+        "id": "urn:ngsi-ld:GPS:gps1",
+        "type": "GPS",
+        "location": {
+            "type": "GeoProperty",
+            "value": {
+                "coordinates": [
+                    13,
+                    52
+                ],
+                "type": "Point"
+            },
+            "observedAt": "1970-01-01T00:00:00.001Z"
+        }
+    }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin4.json

@@ -1,24 +1,24 @@
 [
     {
         "@context": "http://context.json-ld",
-        "humidity12": {
+        "id": "urn:ngsi-ld:WeatherStation:ws1",
+        "type": "WeatherStation",
+        "weather": {
             "type": "Property",
             "value": {
-                "@type": "Percentage",
-                "@value": "12"
+                "@type": "Summary",
+                "@value": "Humidity 6 and pressure 1040"
             }
         },
-        "id": "urn:ngsi-ld:WeatherStation:ws1",
         "pressure25": {
             "type": "Property",
             "value": 52
         },
-        "type": "WeatherStation",
-        "weather": {
+        "humidity12": {
             "type": "Property",
             "value": {
-                "@type": "Summary",
-                "@value": "Humidity 6 and pressure 1040"
+                "@type": "Percentage",
+                "@value": "12"
             }
         }
     }

package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin4a.json

@@ -1,36 +1,36 @@
 [
-        {
-            "@context": "http://context.json-ld",
-            "pressure25": {
-                "type": "Property",
-                "value": 52
-            },
-            "humidity12": {
-                "type": "Property",
-                "value": {
-                    "@type": "Percentage",
-                    "@value": "12"
-                }
-            },
-            "weather": {
-                "type": "Property",
-                "value": {
-                    "@type": "Summary",
-                    "@value": "Humidity 6 and pressure 1040"
-                }
-            },
-            "alive": {
-                "type": "Property",
-                "value": {
-                    "@type": "None",
-                    "@value": "undefined"
-                }
-            },
-            "updated": {
-                "type": "Property",
-                "value": true
-            },
-            "id": "urn:ngsi-ld:WeatherStation:ws1",
-            "type": "WeatherStation"
+    {
+        "@context": "http://context.json-ld",
+        "id": "urn:ngsi-ld:WeatherStation:ws1",
+        "type": "WeatherStation",
+        "weather": {
+            "type": "Property",
+            "value": {
+                "@type": "Summary",
+                "@value": "Humidity 6 and pressure 1040"
+            }
+        },
+        "pressure25": {
+            "type": "Property",
+            "value": 52
+        },
+        "humidity12": {
+            "type": "Property",
+            "value": {
+                "@type": "Percentage",
+                "@value": "12"
+            }
+        },
+        "alive": {
+            "type": "Property",
+            "value": {
+                "@type": "None",
+                "@value": "undefined"
+            }
+        },
+        "updated": {
+            "type": "Property",
+            "value": true
         }
-    ]
+    }
+]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin5.json

@@ -6,26 +6,26 @@
     },
     {
         "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
+        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "type": "Higrometer",
         "pressure": {
             "type": "Property",
             "value": {
                 "@type": "Hgmm",
-                "@value": "17"
+                "@value": "16"
             }
-        },
-        "type": "Higrometer"
+        }
     },
     {
         "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "id": "urn:ngsi-ld:Higrometer:Higro2002",
+        "type": "Higrometer",
         "pressure": {
             "type": "Property",
             "value": {
                 "@type": "Hgmm",
-                "@value": "16"
+                "@value": "17"
             }
-        },
-        "type": "Higrometer"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin6.json

@@ -12,25 +12,5 @@
             "type": "Property",
             "value": 38
         }
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO2",
-        "type": "WM"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO3",
-        "type": "WM"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO4",
-        "type": "WM"
-    },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO5",
-        "type": "WM"
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin7.json

@@ -31,11 +31,6 @@
             "value": 40
         }
     },
-    {
-        "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:WM:SO4",
-        "type": "WM"
-    },
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:WM:SO5",

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin8.json

@@ -6,27 +6,27 @@
     },
     {
         "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2002",
+        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "type": "Higrometer",
         "pressure": {
             "type": "Property",
-            "unitCode": "Hgmm",
             "value": {
                 "@type": "Hgmm",
-                "@value": "17"
+                "@value": "16"
             }
-        },
-        "type": "Higrometer"
+        }
     },
     {
         "@context": "http://context.json-ld",
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "id": "urn:ngsi-ld:Higrometer:Higro2002",
+        "type": "Higrometer",
         "pressure": {
             "type": "Property",
             "value": {
                 "@type": "Hgmm",
-                "@value": "16"
-            }
-        },
-        "type": "Higrometer"
+                "@value": "17"
+            },
+            "unitCode": "Hgmm"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin1.json

@@ -1,6 +1,8 @@
 [
     {
         "@context": "http://context.json-ld",
+        "id": "urn:ngsi-ld:WeatherStation:ws4",
+        "type": "WeatherStation",
         "pressure": {
             "type": "Property",
             "value": {
@@ -8,20 +10,19 @@
                 "@value": "52"
             },
             "observedAt": "2016-05-30T16:25:22.304Z"
-        },
-        "id": "urn:ngsi-ld:WeatherStation:ws4",
-        "type": "WeatherStation"
+        }
     },
     {
         "@context": "http://context.json-ld",
+        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "type": "Higrometer",
         "humidity": {
             "type": "Property",
             "value": {
                 "@type": "Percentage",
                 "@value": "12"
-            }
-        },
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer"
+            },
+            "observedAt": "2023-03-21T18:30:30.948Z"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json

@@ -6,14 +6,15 @@
     },
     {
         "@context": "http://context.json-ld",
+        "id": "urn:ngsi-ld:Higrometer:Higro2000",
+        "type": "Higrometer",
         "humidity": {
             "type": "Property",
             "value": {
                 "@type": "Percentage",
                 "@value": "12"
-            }
-        },
-        "id": "urn:ngsi-ld:Higrometer:Higro2000",
-        "type": "Higrometer"
+            },
+            "observedAt": "2023-03-21T16:54:11.464Z"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin3.json

@@ -14,7 +14,7 @@
                 "@type": "Percentage",
                 "@value": "16"
             },
-            "observedAt": "2018-06-13T13:28:34.611Z"
+            "observedAt": "2023-03-21T16:57:54.046Z"
         }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextProcessTimestamp.json

@@ -2,11 +2,11 @@
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:Light:light1",
+        "type": "Light",
         "state": {
-            "observedAt": "2016-05-30T16:25:22.304Z",
             "type": "Property",
-            "value": true
-        },
-        "type": "Light"
+            "value": true,
+            "observedAt": "2016-05-30T16:25:22.304Z"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextTimestampOverride.json

@@ -2,10 +2,11 @@
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:Light:light1",
+        "type": "Light",
         "state": {
             "type": "Property",
-            "value": true
-        },
-        "type": "Light"
+            "value": true,
+            "observedAt": "2015-12-14T08:06:01.468Z"
+        }
     }
 ]

package/test/unit/ngsi-ld/examples/contextRequests/updateContextTimestampOverrideWithoutMilis.json

@@ -2,10 +2,11 @@
     {
         "@context": "http://context.json-ld",
         "id": "urn:ngsi-ld:Light:light1",
+        "type": "Light",
         "state": {
             "type": "Property",
-            "value": true
-        },
-        "type": "Light"
+            "value": true,
+            "observedAt": "2022-10-22T22:22:22.000Z"
+        }
     }
 ]

package/test/unit/ngsi-ld/expressions/expressionBasedTransformations-test.js

@@ -198,9 +198,6 @@ describe('NGSI-LD - Expression-based transformations plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });
@@ -746,13 +743,13 @@ describe('NGSI-LD - Expression-based transformations plugin', function () {
         });
     });
 
-    describe('When an update comes for attributes without expressions and Object type', function () {
+    describe('When an update comes for attributes without expressions and Array type', function () {
         // Case: Update for a JSON array attribute without expression
 
         const values = [
             {
                 name: 'r',
-                type: 'Object',
+                type: 'Array',
                 value: ['v0.1', 'v0.2', 'v0.3']
             }
         ];

package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js

@@ -293,13 +293,10 @@ const iotAgentConfigTS = {
 
 describe('NGSI-LD: JEXL', function () {
     beforeEach(function (done) {
-        logger.setLevel('FATAL');
+        //logger.setLevel('FATAL');
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });
@@ -964,9 +961,6 @@ describe('NGSI-LD: JEXL - Timestamps', function () {
 
         iotAgentLib.activate(iotAgentConfigTS, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.expressionTransformation.update);
                 done();
             });
         });

package/test/unit/ngsi-ld/ngsiService/autocast-test.js

@@ -75,6 +75,18 @@ const iotAgentConfig = {
                 {
                     name: 'configuration',
                     type: 'Object'
+                },
+                {
+                    name: 'date',
+                    type: 'Date'
+                },
+                {
+                    name: 'time',
+                    type: 'Time'
+                },
+                {
+                    name: 'dateTime',
+                    type: 'DateTime'
                 }
             ]
         }
@@ -327,7 +339,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with Time type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'time',
                 type: 'Time',
                 value: '2016-04-30T14:59:46.000Z'
             }
@@ -360,7 +372,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with DateTime type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'dateTime',
                 type: 'DateTime',
                 value: '2016-04-30Z'
             }
@@ -393,7 +405,7 @@ describe('NGSI-LD - JSON native types autocast test', function () {
     describe('When the IoT Agent receives new information from a device. Observation with Date type', function () {
         const values = [
             {
-                name: 'configuration',
+                name: 'date',
                 type: 'Date',
                 value: '2016-04-30T14:59:46.000Z'
             }

package/test/unit/ngsi-ld/plugins/alias-plugin_test.js

@@ -117,8 +117,6 @@ describe('NGSI-LD - Attribute alias plugin', function () {
 
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.attributeAlias.update);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.attributeAlias.query);
                 done();
             });
         });

package/test/unit/ngsi-ld/plugins/compress-timestamp-plugin_test.js

@@ -123,8 +123,6 @@ describe('NGSI-LD - Timestamp compression plugin', function () {
         logger.setLevel('FATAL');
         iotAgentLib.activate(iotAgentConfig, function () {
             iotAgentLib.clearAll(function () {
-                iotAgentLib.addUpdateMiddleware(iotAgentLib.dataPlugins.compressTimestamp.updateNgsi2);
-                iotAgentLib.addQueryMiddleware(iotAgentLib.dataPlugins.compressTimestamp.queryNgsi2);
                 done();
             });
         });
@@ -214,33 +212,4 @@ describe('NGSI-LD - Timestamp compression plugin', function () {
             });
         });
     });
-
-    describe('When a query comes for a timestamp through the plugin', function () {
-        const values = ['state', 'TheTargetValue'];
-
-        beforeEach(function () {
-            nock.cleanAll();
-
-            contextBrokerMock = nock('http://192.168.1.1:1026')
-                .matchHeader('fiware-service', 'smartgondor')
-                .get('/ngsi-ld/v1/entities/urn:ngsi-ld:Light:light1?attrs=state,TheTargetValue')
-                .reply(
-                    200,
-                    utils.readExampleFile(
-                        './test/unit/ngsi-ld/examples/contextResponses/queryContextCompressTimestamp1Success.json'
-                    )
-                );
-        });
-
-        it('should return an entity with all its timestamps without separators (basic format)', function (done) {
-            iotAgentLib.query('light1', 'Light', '', values, function (error, response) {
-                should.not.exist(error);
-                should.exist(response);
-                should.exist(response.TheTargetValue);
-                should.exist(response.TheTargetValue.value);
-                response.TheTargetValue.value.should.equal('20071103T131805');
-                done();
-            });
-        });
-    });
 });