iotagent-node-lib 3.0.0 → 3.2.0

package/lib/templates/createDeviceLax.json

@@ -38,7 +38,7 @@
           },
           "expressionLanguage": {
             "description": "Expression language used to apply expressions for this device",
-            "type": "boolean"
+            "type": "string"
           },
           "explicitAttrs": {
             "description": "Flag about only provisioned attributes will be processed to Context Broker"
@@ -98,13 +98,15 @@
                 },
                 "expression": {
                   "description": "Optional expression for measurement transformation",
-                  "type": "string",
-                  "pattern": "^([^<>;'=]+)+$"
+                  "type": "string"
+                },
+                "skipValue": {
+                  "description": "Attribute is skipped when result of apply expression is this value",
+                  "type": "any"
                 },
                 "entity_name": {
                   "description": "Optional entity name for multientity updates",
-                  "type": "string",
-                  "pattern": "^([^<>;'=\"]+)+$"
+                  "type": "string"
                 },
                 "entity_type": {
                   "description": "Optional entity type for multientity updatess",

package/lib/templates/updateDevice.json

@@ -88,10 +88,13 @@
             "description": "Optional expression for measurement transformation",
             "type": "string"
           },
+          "skipValue": {
+            "description": "Attribute is skipped when result of apply expression is this value",
+            "type": "any"
+          },
           "entity_name": {
             "description": "Optional entity name for multientity updates",
-            "type": "string",
-            "pattern": "^([^<>;'=\"]+)+$"
+            "type": "string"
           },
           "entity_type": {
             "description": "Optional entity type for multientity updatess",

package/lib/templates/updateDeviceLax.json

@@ -79,13 +79,11 @@
           },
           "expression": {
             "description": "Optional expression for measurement transformation",
-            "type": "string",
-            "pattern": "^([^<>;'=]+)+$"
+            "type": "string"
           },
           "entity_name": {
             "description": "Optional entity name for multientity updates",
-            "type": "string",
-            "pattern": "^([^<>;'=\"]+)+$"
+            "type": "string"
           },
           "entity_type": {
             "description": "Optional entity type for multientity updatess",
@@ -158,4 +156,4 @@
       "type": "array"
     }
   }
-}
+}

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": "3.0.0",
+  "version": "3.2.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",
@@ -23,7 +23,7 @@
   },
   "main": "lib/fiware-iotagent-lib",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "scripts": {
     "clean": "rm -rf package-lock.json && rm -rf node_modules && rm -rf coverage",

package/test/unit/examples/deviceProvisioningRequests/provisionBidirectionalDevice.json

@@ -12,17 +12,17 @@
         {
           "name":"location",
           "type":"geo:point",
-          "expression": "${latitude}, ${longitude}",
+          "expression": "latitude,longitude",
           "reverse": [
             {
               "object_id":"latitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, indexOf(@location, \",\") + 1, length(@location)))}"
+              "type": "Number",
+              "expression": "location | split(', ')[1] | parsefloat()"
             },
             {
               "object_id":"longitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, 0, indexOf(@location, \",\")))}"
+              "type": "Number",
+              "expression": "location | split(', ')[0] | parsefloat()"
             }
           ]
         }

package/test/unit/examples/deviceProvisioningRequests/provisionMinimumDevice4.json

@@ -3,6 +3,7 @@
     {
       "device_id": "MicroLight1",
       "protocol": "GENERIC_PROTO",
+      "expressionLanguage": "jexl",
       "attributes": [
         {
           "name": "attr_name",

package/test/unit/examples/groupProvisioningRequests/bidirectionalGroup.json

@@ -14,13 +14,13 @@
           "reverse": [
             {
               "object_id":"latitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, indexOf(@location, \",\") + 1, length(@location)))}"
+              "type": "Number",
+              "expression": "location | split(', ')[1] | parsefloat()"
             },
             {
               "object_id":"longitude",
-              "type": "string",
-              "expression": "${trim(substr(@location, 0, indexOf(@location, \",\")))}"
+              "type": "Number",
+              "expression": "location | split(', ')[0] | parsefloat()"
             }
           ]
         }

package/test/unit/general/config-multi-core-test.js

@@ -32,7 +32,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js

@@ -37,7 +37,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     authentication: {
         // Next line is syntactically correct from a configuration point of

package/test/unit/general/deviceService-test.js

@@ -36,7 +36,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -34,7 +34,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/general/startup-test.js

@@ -38,7 +38,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/general/statistics-persistence_test.js

@@ -37,6 +37,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     stats: {

package/test/unit/general/statistics-service_test.js

@@ -32,6 +32,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     stats: {

package/test/unit/lazyAndCommands/commandRegistry_test.js

@@ -35,6 +35,7 @@ const iotAgentConfig = {
     server: {
         name: 'testAgent',
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/memoryRegistry/deviceRegistryMemory_test.js

@@ -38,6 +38,7 @@ const iotAgentConfig = {
     server: {
         name: 'testAgent',
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/mongodb/mongodb-connectionoptions-test.js

@@ -38,6 +38,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     stats: {

package/test/unit/mongodb/mongodb-group-registry-test.js

@@ -40,6 +40,7 @@ const iotAgentConfig = {
     server: {
         name: 'testAgent',
         port: 4041,
+        host: 'localhost',
         baseRoot: '/'
     },
     types: {},

package/test/unit/mongodb/mongodb-registry-test.js

@@ -38,7 +38,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -40,7 +40,6 @@ const iotAgentConfig = {
         ngsiVersion: 'ld',
         jsonLdContext: 'http://context.json-ld'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
         port: 4041
     },
@@ -266,7 +265,6 @@ const iotAgentConfigTS = {
         ngsiVersion: 'ld',
         jsonLdContext: 'http://context.json-ld'
     },
-    defaultExpressionLanguage: 'jexl',
     server: {
         port: 4041
     },

package/test/unit/ngsi-ld/general/config-jsonld-contexts-test.js

@@ -37,7 +37,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/general/contextBrokerOAuthSecurityAccess-test.js

@@ -42,7 +42,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     authentication: {
         type: 'oauth2',

package/test/unit/ngsi-ld/general/deviceService-test.js

@@ -40,7 +40,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/general/https-support-test.js

@@ -42,7 +42,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/general/iotam-autoregistration-test.js

@@ -39,7 +39,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/general/startup-test.js

@@ -37,7 +37,8 @@ const iotAgentConfig = {
         port: '1026'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -135,7 +136,7 @@ describe('NGSI-LD - Startup tests', function () {
                 config.getConfig().contextBroker.url.should.equal('http://cbhost:1111');
                 config.getConfig().contextBroker.ngsiVersion.should.equal('ld');
                 config.getConfig().contextBroker.jsonLdContext.should.equal('http://context.jsonld');
-                config.getConfig().contextBroker.fallbackTenant.should.equal( 'openiot');
+                config.getConfig().contextBroker.fallbackTenant.should.equal('openiot');
                 config.getConfig().contextBroker.fallbackPath.should.equal('smartgondor');
                 config.getConfig().server.ldSupport.null.should.equal(false);
                 config.getConfig().server.ldSupport.datasetId.should.equal(false);

package/test/unit/ngsi-ld/lazyAndCommands/active-devices-attribute-update-test.js

@@ -43,7 +43,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/lazyAndCommands/command-test.js

@@ -44,7 +44,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -1224,10 +1225,7 @@ describe('NGSI-LD - Command functionalities', function () {
 
     describe('When a query arrives to the IoT Agent with registered commands but no lazy attributes', function () {
         const options = {
-            url:
-                'http://localhost:' +
-                iotAgentConfig.server.port +
-                '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2',
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2',
             method: 'GET',
             headers: {
                 'fiware-service': 'smartgondor',
@@ -1246,8 +1244,8 @@ describe('NGSI-LD - Command functionalities', function () {
                 should.exist(attributes);
                 attributes.length.should.equal(0);
                 callback(null, {
-                        id: 'urn:ngsi-ld:Robot:r2d2',
-                        type: 'Robot'
+                    id: 'urn:ngsi-ld:Robot:r2d2',
+                    type: 'Robot'
                 });
             });
 

package/test/unit/ngsi-ld/lazyAndCommands/lazy-devices-test.js

@@ -45,7 +45,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -324,11 +325,12 @@ describe('NGSI-LD - IoT Agent Lazy Devices', function () {
                 .post('/ngsi-ld/v1/entityOperations/upsert/')
                 .reply(204);
 
-            async.series([apply(iotAgentLib.activate, iotAgentConfig), apply(iotAgentLib.register, device1)], function (
-                error
-            ) {
-                done();
-            });
+            async.series(
+                [apply(iotAgentLib.activate, iotAgentConfig), apply(iotAgentLib.register, device1)],
+                function (error) {
+                    done();
+                }
+            );
         });
 
         it('should not give any error', function (done) {

package/test/unit/ngsi-ld/lazyAndCommands/merge-patch-test.js

@@ -45,6 +45,7 @@ const iotAgentConfig = {
     },
     server: {
         port: 4041,
+        host: 'localhost',
         ldSupport: {
             null: true,
             datasetId: false,
@@ -53,8 +54,8 @@ const iotAgentConfig = {
     },
     types: {
         Robot: {
-            internalAttributes:[],
-            commands:[
+            internalAttributes: [],
+            commands: [
                 {
                     name: 'position',
                     object_id: 'pos',
@@ -125,24 +126,21 @@ describe('NGSI-LD - Merge-Patch functionalities', function () {
 
     describe('When a merge-patch PATCH  arrives to the IoT Agent as Context Provider', function () {
         const options = {
-            url:
-                'http://localhost:' +
-                iotAgentConfig.server.port +
-                '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2',
+            url: 'http://localhost:' + iotAgentConfig.server.port + '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2',
             method: 'PATCH',
             json: {
-                "position": {
-                    "type": "Property",
-                    "value": {
-                        "moveTo" : [12,34],
-                        "observedAt": "urn:ngsi-ld:null",
-                        "precision": {
-                            "value": 0.95,
-                            "unitCode": "C62"
-                        } 
-                    } 
+                position: {
+                    type: 'Property',
+                    value: {
+                        moveTo: [12, 34],
+                        observedAt: 'urn:ngsi-ld:null',
+                        precision: {
+                            value: 0.95,
+                            unitCode: 'C62'
+                        }
+                    }
                 },
-                "orientation" : "urn:ngsi-ld:null"
+                orientation: 'urn:ngsi-ld:null'
             },
             headers: {
                 'fiware-service': 'smartgondor',
@@ -188,7 +186,6 @@ describe('NGSI-LD - Merge-Patch functionalities', function () {
         });
     });
 
-
     xdescribe('When a partial update PATCH with an NGSI-LD Null arrives to the IoT Agent as Context Provider', function () {
         const options = {
             url:
@@ -197,8 +194,8 @@ describe('NGSI-LD - Merge-Patch functionalities', function () {
                 '/ngsi-ld/v1/entities/urn:ngsi-ld:Robot:r2d2/attrs/position',
             method: 'PATCH',
             json: {
-                "type": "Property",
-                "value": "urn:ngsi-ld:null"
+                type: 'Property',
+                value: 'urn:ngsi-ld:null'
             },
             headers: {
                 'fiware-service': 'smartgondor',
@@ -236,10 +233,9 @@ describe('NGSI-LD - Merge-Patch functionalities', function () {
             });
 
             request(options, function (error, response, body) {
-                console.error(error)
+                console.error(error);
                 should.not.exist(error);
 
-
                 response.statusCode.should.equal(204);
                 handlerCalled.should.equal(1);
                 done();

package/test/unit/ngsi-ld/lazyAndCommands/polling-commands-test.js

@@ -43,7 +43,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

package/test/unit/ngsi-ld/ngsiService/active-devices-test.js

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {

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

@@ -41,7 +41,8 @@ const iotAgentConfig = {
         jsonLdContext: 'http://context.json-ld'
     },
     server: {
-        port: 4041
+        port: 4041,
+        host: 'localhost'
     },
     types: {
         Light: {
@@ -69,44 +70,41 @@ describe('NGSI-LD - LanguageProperty test', function () {
         iotAgentLib.deactivate(done);
     });
 
-    describe(
-        'When the IoT Agent receives new exonym from a device name with LanguageProperty type and a JSON object',
-        function () {
-            const values = [
-                {
-                    name: 'name',
-                    type: 'LanguageProperty',
-                    value:  {
-                       el: "Κωνσταντινούπολις",
-                       en: "Constantinople",
-                       tr: "İstanbul"
-                    }
+    describe('When the IoT Agent receives new exonym from a device name with LanguageProperty type and a JSON object', function () {
+        const values = [
+            {
+                name: 'name',
+                type: 'LanguageProperty',
+                value: {
+                    el: 'Κωνσταντινούπολις',
+                    en: 'Constantinople',
+                    tr: 'İstanbul'
                 }
-            ];
+            }
+        ];
 
-            beforeEach(function (done) {
-                nock.cleanAll();
+        beforeEach(function (done) {
+            nock.cleanAll();
 
-                contextBrokerMock = nock('http://192.168.1.1:1026')
-                    .matchHeader('fiware-service', 'smartgondor')
-                    .post(
-                        '/ngsi-ld/v1/entityOperations/upsert/?options=update',
-                        utils.readExampleFile(
-                            './test/unit/ngsi-ld/examples/contextRequests/updateContextLanguageProperties1.json'
-                        )
+            contextBrokerMock = nock('http://192.168.1.1:1026')
+                .matchHeader('fiware-service', 'smartgondor')
+                .post(
+                    '/ngsi-ld/v1/entityOperations/upsert/?options=update',
+                    utils.readExampleFile(
+                        './test/unit/ngsi-ld/examples/contextRequests/updateContextLanguageProperties1.json'
                     )
-                    .reply(204);
+                )
+                .reply(204);
 
-                iotAgentLib.activate(iotAgentConfig, done);
-            });
+            iotAgentLib.activate(iotAgentConfig, done);
+        });
 
-            it('should change the value of the corresponding attribute in the context broker', function (done) {
-                iotAgentLib.update('light1', 'Light', '', values, function (error) {
-                    should.not.exist(error);
-                    contextBrokerMock.done();
-                    done();
-                });
+        it('should change the value of the corresponding attribute in the context broker', function (done) {
+            iotAgentLib.update('light1', 'Light', '', values, function (error) {
+                should.not.exist(error);
+                contextBrokerMock.done();
+                done();
             });
-        }
-    );
+        });
+    });
 });