iotagent-node-lib 2.24.0 → 2.25.0

package/.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Git checkout
         uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
       - name: Run Remark Markdown Linter
         run: |
           npm install
@@ -31,10 +31,10 @@ jobs:
     steps:
       - name: Git checkout
         uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 16.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
       - name: Run EsLint Node.js Linter
         run: |
           npm install
@@ -51,7 +51,6 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 12.x
           - 14.x
           - 16.x
     steps:
@@ -78,10 +77,10 @@ jobs:
     steps:
       - name: Git checkout
         uses: actions/checkout@v2
-      - name: 'Test Coverage with Node.js 12.x'
+      - name: 'Test Coverage with Node.js 16.x'
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
       - run: |
           npm install
           npm run test:coverage

package/CHANGES_NEXT_RELEASE

@@ -0,0 +1 @@
+

package/doc/advanced-topics.md

@@ -8,6 +8,7 @@
 -   [Autoprovision configuration (autoprovision)](#autoprovision-configuration-autoprovision)
 -   [Explicitly defined attributes (explicitAttrs)](#explicitly-defined-attributes-explicitattrs)
 -   [Configuring operation to persist the data in Context Broker (appendMode)](#configuring-operation-to-persist-the-data-in-context-broker-appendmode)
+-   [Differences between `autoprovision`, `explicitAttrs` and `appendMode`](#differences-between-autoprovision-explicitattrs-and-appendmode)
 -   [Data mapping plugins](#data-mapping-plugins)
     -   [Development](#development)
     -   [Provided plugins](#provided-plugins)
@@ -20,7 +21,6 @@
         -   [Bidirectionality plugin (bidirectional)](#bidirectionality-plugin-bidirectional)
     -   [Autoprovision configuration (autoprovision)](#autoprovision-configuration-autoprovision)
     -   [Explicitly defined attributes (explicitAttrs)](#explicitly-defined-attributes-explicitattrs)
-    -   [Configuring operation to persist the data in Context Broker (appendMode)](#configuring-operation-to-persist-the-data-in-context-broker-appendmode)
 
 ### Secured access to the Context Broker
 
@@ -368,6 +368,28 @@ This is a flag that can be enabled by activating the parameter `appendMode` in t
 activated, the update requests to the Context Broker will be performed always with APPEND type, instead of the default
 UPDATE. This have implications in the use of attributes with Context Providers, so this flag should be used with care.
 
+### Differences between `autoprovision`, `explicitAttrs` and `appendMode`
+
+Since those configuration parameters are quite similar, this section is intended to clarify the relation between them. 
+
+If `autoprovision` is set to `true` (default case), the agent will perform an initial request creating a new entity into 
+the Context Broker with **only** the static and active attributes provisioned in the config group, and also a new
+Device in the agent, every time a measure arrives with a new `device_id`. Otherwise, this measure is ignored. This is 
+something related to the **southbound**.
+
+What `explicitAttrs` does is to filter from the southbound the parameters that are not explicitly defined in the device 
+provision or config group. That also would avoid propagating the measures to the Context Broker.
+
+The default way the agent updates the information into the Context Broker is by using an update request. If 
+`appendMode=true`, the IoTA will use an append request instead of an update one. This means it will store 
+the attributes even if they are not present in the entity. This seems the same functionality that the one provided by
+`autoprovision`, but it is a different concept since the scope of this config is to setup how the IoT interacts with the
+context broker, this is something related to the **northbound**.
+
+Note that, even creating a group with `autoprovision=true` and `explicitAttrs=true`, if you do not provision previously 
+the entity in the Context Broker (having all attributes to be updated), it would fail if `appendMode=false`. For further 
+information check the issue [#1301](https://github.com/telefonicaid/iotagent-node-lib/issues/1301).
+
 ### Data mapping plugins
 
 The IoT Agent Library provides a plugin mechanism in order to facilitate reusing code that makes small transformations

package/doc/apiary/iotagent.apib

@@ -80,7 +80,7 @@ Fields in JSON object representing a configuration group are:
 |:-----------------------|:------------------------------------------------------------|
 |`apikey`                |It is a key used for devices belonging to this service. If "", service does not use apikey, but it must be specified.|
 |`token`                 |If authentication/authorization system is configured, IoT Agent works as user when it publishes information. That token allows that other components to verify the identity of IoT Agent. Depends on authentication and authorization system.|
-|`cbroker`               |Context Broker endpoint assigned to this service, it must be a real uri.|
+|`cbHost`                |Context Broker endpoint assigned to this service, it must be a real uri.|
 |`outgoing_route`        |It is an identifier for VPN/GRE tunnel. It is used when device is into a VPN and a command is sent.|
 |`resource`              |Path in IoTAgent. When protocol is HTTP a device could send information to this uri. In general, it is a uri in a HTTP server needed to load and execute a module.|
 |`entity_type`           |Entity type used in entity publication (overload default).|
@@ -126,7 +126,7 @@ Retrieve a configuration group.
                     "service": "service2",
                     "service_path": "/srvpath2",
                     "token": "token2",
-                    "cbroker": "http://127.0.0.1:1026",
+                    "cbHost": "http://127.0.0.1:1026",
                     "entity_type": "thing",
                     "resource": "/iot/d"
                 }
@@ -152,7 +152,7 @@ Retrieve a configuration group.
                     "service": "service2",
                     "service_path": "/srvpath2",
                     "token": "token2",
-                    "cbroker": "http://127.0.0.1:1026",
+                    "cbHost": "http://127.0.0.1:1026",
                     "entity_type": "thing",
                     "resource": "/iot/d"
                 }
@@ -162,7 +162,7 @@ Retrieve a configuration group.
 
 ### Create a configuration group [POST]
 
-Create a new configuration group. From service model, mandatory fields are: apikey, resource (cbroker field is temporary mandatory).
+Create a new configuration group. From service model, mandatory fields are: apikey, resource (cbHost field is temporary mandatory).
 
 + Request (application/json)
 
@@ -178,7 +178,7 @@ Create a new configuration group. From service model, mandatory fields are: apik
                 {
                   "apikey": "apikey3",
                   "token": "token2",
-                  "cbroker": "http://127.0.0.1:1026",
+                  "cbHost": "http://127.0.0.1:1026",
                   "entity_type": "thing",
                   "resource": "/iot/d"
                 }

package/doc/deprecated.md

@@ -12,13 +12,15 @@ longer. In particular:
 
 A list of deprecated features and the version in which they were deprecated follows:
 
--   Support to NGSI v1.
+-   Support to NGSI v1 (finally removed in 2.18.0)
 -   Support to Node.js v4 in iotagent-node-lib 2.8.1 (finally removed in 2.9.0)
 -   Support to Node.js v6 in iotagent-node-lib 2.9.0 (finally removed in 2.10.0)
 -   Support to Node.js v8 in iotagent-node-lib 2.12.0 (finally removed in 2.13.0)
 -   Support to Node.js v10 in iotagent-node-lib 2.15.0 (finally removed in 2.16.0)
+-   Support to Node.js v12 in iotagent-node-lib 2.24.0 (finally removed in 2.25.0)
+-   Support to NGSI-LD v1.3 in iotagent-node-lib 2.25.0
 
-The use of Node.js v12 is highly recommended.
+The use of Node.js v14 is highly recommended.
 
 ## Using old iotagent-node-lib versions
 
@@ -38,8 +40,9 @@ The following table provides information about the last iotagent-node-lib versio
 
 | **Removed feature**    | **Last iotagent-node-lib version supporting feature** | **That version release date** |
 | ---------------------- | ----------------------------------------------------- | ----------------------------- |
-| NGSI v1 API            | Not yet defined                                       | Not yet defined               |
-| Support to Node.js v4  | 2.8.1                                                 | December 19th, 2018                 |
-| Support to Node.js v6  | 2.9.0                                                 | May 22nd, 2019                      |
-| Support to Node.js v8  | 2.12.0                                                | April 7th, 2020                    |
-| Support to Node.js v10 | 2.15.0   | February 18th, 2021                |
+| NGSI v1 API            | 2.17.0                                                | August 30th, 2021             |
+| Support to Node.js v4  | 2.8.1                                                 | December 19th, 2018           |
+| Support to Node.js v6  | 2.9.0                                                 | May 22nd, 2019                |
+| Support to Node.js v8  | 2.12.0                                                | April 7th, 2020               |
+| Support to Node.js v10 | 2.15.0                                                | February 18th, 2021           |
+| Support to Node.js v12 | 2.24.0                                                | September 2nd, 2022           |

package/doc/expressionLanguage.md

@@ -75,7 +75,7 @@ can check the following example:
     "services": [
         {
             "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
-            "cbroker": "http://orion:1026",
+            "cbHost": "http://orion:1026",
             "entity_type": "Thing",
             "resource":    "/iot/d"
             "expressionLanguage": "jexl",
@@ -459,39 +459,49 @@ to incorporate new transformations from the IoT Agent configuration file in a fa
 
 Current common transformation set:
 
-| JEXL Transformation              | Equivalent JavaScript Function                                                                                          |
-| -------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
-| jsonparse: (str)                 | `JSON.parse(str);`                                                                                                      |
-| jsonstringify: (obj)             | `JSON.stringify(obj);`                                                                                                  |
-| indexOf: (val, char)             | `String(val).indexOf(char);`                                                                                            |
-| length: (val)                    | `String(val).length;`                                                                                                   |
-| trim: (val)                      | `String(val).trim();`                                                                                                   |
-| substr: (val, int1, int2)        | `String(val).substr(int1, int2);`                                                                                       |
-| addreduce: (arr)                 | <code>arr.reduce((i, v) &vert; i + v));</code>                                                                          |
-| lengtharray: (arr)               | `arr.length;`                                                                                                           |
-| typeof: (val)                    | `typeof val;`                                                                                                           |
-| isarray: (arr)                   | `Array.isArray(arr);`                                                                                                   |
-| isnan: (val)                     | `isNaN(val);`                                                                                                           |
-| parseint: (val)                  | `parseInt(val);`                                                                                                        |
-| parsefloat: (val)                | `parseFloat(val);`                                                                                                      |
-| toisodate: (val)                 | `new Date(val).toISOString();`                                                                                          |
-| timeoffset:(isostr)              | `new Date(isostr).getTimezoneOffset();`                                                                                 |
-| tostring: (val)                  | `val.toString();`                                                                                                       |
-| urlencode: (val)                 | `encodeURI(val);`                                                                                                       |
-| urldecode: (val)                 | `decodeURI(val);`                                                                                                       |
-| replacestr: (str, from, to)      | `str.replace(from, to);`                                                                                                |
-| replaceregexp: (str, reg, to)    | `str.replace(new RegExp(reg), to);`                                                                                     |
-| replaceallstr: (str, from, to)   | `str.replaceAll(from, to);`                                                                                             |
-| replaceallregexp: (str, reg, to) | `str.replaceAll(new RegExp(reg,"g"), to);`                                                                              |
-| split: (str, ch)                 | `str.split(ch);`                                                                                                        |
-| mapper: (val, values, choices)   | <code>choices[values.findIndex((target) &vert; target == val)]);</code>                                                 |
-| thmapper: (val, values, choices) | <code>choices[values.reduce((acc,curr,i,arr) &vert; (acc==0)&vert;&vert;acc?acc:val<=curr?acc=i:acc=null,null)];</code> |
-| bitwisemask: (i,mask,op,shf)     | <code>(op==="&"?parseInt(i)&mask: op==="&vert;"?parseInt(i)&vert;mask: op==="^"?parseInt(i)^mask:i)>>shf;</code>        |
-| slice: (arr, init, end)          | `arr.slice(init,end);`                                                                                                  |
-| addset: (arr, x)                 | <code>{ return Array.from((new Set(arr)).add(x)) }</code>                                                               |
-| removeset: (arr, x)              | <code>{ let s = new Set(arr); s.delete(x); return Array.from(s) }</code>                                                |
-| touppercase: (val)               | `String(val).toUpperCase()`                                                                                             |
-| tolowercase: (val)               | `String(val).toLowerCase()`                                                                                             |
+| JEXL Transformation                  | Equivalent JavaScript Function                                                                                          |
+| ------------------------------------ | ----------------------------------------------------------------------------------------------------------------------- |
+| jsonparse: (str)                     | `JSON.parse(str);`                                                                                                      |
+| jsonstringify: (obj)                 | `JSON.stringify(obj);`                                                                                                  |
+| indexOf: (val, char)                 | `String(val).indexOf(char);`                                                                                            |
+| length: (val)                        | `String(val).length;`                                                                                                   |
+| trim: (val)                          | `String(val).trim();`                                                                                                   |
+| substr: (val, int1, int2)            | `String(val).substr(int1, int2);`                                                                                       |
+| addreduce: (arr)                     | <code>arr.reduce((i, v) &vert; i + v));</code>                                                                          |
+| lengtharray: (arr)                   | `arr.length;`                                                                                                           |
+| typeof: (val)                        | `typeof val;`                                                                                                           |
+| isarray: (arr)                       | `Array.isArray(arr);`                                                                                                   |
+| isnan: (val)                         | `isNaN(val);`                                                                                                           |
+| parseint: (val)                      | `parseInt(val);`                                                                                                        |
+| parsefloat: (val)                    | `parseFloat(val);`                                                                                                      |
+| toisodate: (val)                     | `new Date(val).toISOString();`                                                                                          |
+| timeoffset:(isostr)                  | `new Date(isostr).getTimezoneOffset();`                                                                                 |
+| tostring: (val)                      | `val.toString();`                                                                                                       |
+| urlencode: (val)                     | `encodeURI(val);`                                                                                                       |
+| urldecode: (val)                     | `decodeURI(val);`                                                                                                       |
+| replacestr: (str, from, to)          | `str.replace(from, to);`                                                                                                |
+| replaceregexp: (str, reg, to)        | `str.replace(new RegExp(reg), to);`                                                                                     |
+| replaceallstr: (str, from, to)       | `str.replaceAll(from, to);`                                                                                             |
+| replaceallregexp: (str, reg, to)     | `str.replaceAll(new RegExp(reg,"g"), to);`                                                                              |
+| split: (str, ch)                     | `str.split(ch);`                                                                                                        |
+| joinarrtostr: (arr, ch)              | `arr.join(ch);`                                                                                                         |
+| concatarr: (arr, arr2)               | `arr.concat(arr2);`                                                                                                     |
+| mapper: (val, values, choices)       | <code>choices[values.findIndex((target) &vert; target == val)]);</code>                                                 |
+| thmapper: (val, values, choices)     | <code>choices[values.reduce((acc,curr,i,arr) &vert; (acc==0)&vert;&vert;acc?acc:val<=curr?acc=i:acc=null,null)];</code> |
+| bitwisemask: (i,mask,op,shf)         | <code>(op==="&"?parseInt(i)&mask: op==="&vert;"?parseInt(i)&vert;mask: op==="^"?parseInt(i)^mask:i)>>shf;</code>        |
+| slice: (arr, init, end)              | `arr.slice(init,end);`                                                                                                  |
+| addset: (arr, x)                     | <code>{ return Array.from((new Set(arr)).add(x)) }</code>                                                               |
+| removeset: (arr, x)                  | <code>{ let s = new Set(arr); s.delete(x); return Array.from(s) }</code>                                                |
+| touppercase: (val)                   | `String(val).toUpperCase()`                                                                                             |
+| tolowercase: (val)                   | `String(val).toLowerCase()`                                                                                             |
+| round: (val)                         | `Math.round(val)`                                                                                                       |
+| floor: (val)                         | `Math.floor(val)`                                                                                                       |
+| ceil: (val)                          | `Math.ceil(val)`                                                                                                        |
+| tofixed: (val, decimals)             | `Number.parseFloat(val).toFixed(decimals)`                                                                              |
+| gettime: (d)                         | `new Date(d).getTime()`                                                                                                 |
+| toisostring: (d)                     | `new Date(d).toISOString()`                                                                                             |
+| localestring: (d, timezone, options) | `new Date(d).toLocaleString(timezone, options)`                                                                         |
+| now: ()                              | `Date.now()`                                                                                                            |
 
 You have available this [JEXL interactive playground][99] with all the transformations already loaded, in which you can
 test all the functions described above.

package/doc/getting-started.md

@@ -56,7 +56,7 @@ curl -iX POST \
  "services": [
    {
      "apikey":      "4jggokgpepnvsb2uv4s40d59ov",
-     "cbroker":     "http://orion:1026",
+     "cbHost":     "http://orion:1026",
      "entity_type": "Device",
      "resource":    "/iot/d",
    }

package/examples/TTOpen-service.json

@@ -3,7 +3,7 @@
     {
       "resource": "/iot/d",
       "apikey": "pipopi",
-      "cbroker": "http://127.0.0.1:10026",
+      "cbHost": "http://127.0.0.1:10026",
       "entity_type": "ThinkingThing"
     }
   ]

package/lib/fiware-iotagent-lib.js

@@ -363,7 +363,8 @@ exports.dataPlugins = {
     timestampProcess: require('./plugins/timestampProcessPlugin'),
     expressionTransformation: require('./plugins/expressionPlugin'),
     multiEntity: require('./plugins/multiEntity'),
-    bidirectionalData: require('./plugins/bidirectionalData')
+    bidirectionalData: require('./plugins/bidirectionalData'),
+    utils: require('./plugins/pluginUtils')
 };
 
 exports.alarms = require('./services/common/alarmManagement');

package/lib/jexlTranformsMap.js

@@ -49,6 +49,8 @@ const map = {
     replaceallstr: (str, from, to) => str.replaceAll(from, to),
     replaceallregexp: (str, reg, to) => str.replaceAll(new RegExp(reg, 'g'), to),
     split: (str, ch) => str.split(ch),
+    joinarrtostr: (arr, ch) => arr.join(ch),
+    concatarr: (arr, arr2) => arr.concat(arr2),
     mapper: (val, values, choices) => choices[values.findIndex((target) => target === val)],
     thmapper: (val, values, choices) =>
         choices[
@@ -67,7 +69,16 @@ const map = {
         return Array.from(s);
     },
     touppercase: (val) => String(val).toUpperCase(),
-    tolowercase: (val) => String(val).toLowerCase()
+    tolowercase: (val) => String(val).toLowerCase(),
+    floor: (val) => Math.floor(val),
+    ceil: (val) => Math.ceil(val),
+    round: (val) => Math.round(val),
+    tofixed: (val, decimals) => Number.parseFloat(val).toFixed(decimals),
+    gettime: (d) => new Date(d).getTime(),
+    toisostring: (d) => new Date(d).toISOString(),
+    // https://developer.mozilla.org/es/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString
+    localestring: (d, timezone, options) => new Date(d).toLocaleString(timezone, options),
+    now: () => Date.now()
 };
 
 exports.map = map;

package/lib/plugins/jexlParser.js

@@ -141,8 +141,8 @@ function contextAvailable(expression, context) {
         jexl.evalSync(expression, context);
         return true;
     } catch (e) {
-        error = new errors.InvalidExpression(expression);
-        throw error;
+        logger.warn(logContext, 'Wrong expression found "[%j]" over "[%j]", it will be ignored', expression, context);
+        return false;
     }
 }
 

package/lib/services/devices/deviceService.js

@@ -132,7 +132,14 @@ function mergeArrays(original, newArray) {
  * @param {Object} configuration        Configuration data.
  */
 function mergeDeviceWithConfiguration(fields, defaults, deviceData, configuration, callback) {
-    logger.debug(context, 'deviceData before merge with conf: %j', deviceData);
+    logger.debug(
+        context,
+        'deviceData before merge with conf: %j defaults: %j fields: %j configuration %j',
+        deviceData,
+        defaults,
+        fields,
+        configuration
+    );
     for (let i = 0; i < fields.length; i++) {
         const confField = fields[i] === 'active' ? 'attributes' : fields[i];
         if (deviceData && deviceData[fields[i]] && ['active', 'lazy', 'commands'].indexOf(fields[i]) >= 0) {
@@ -362,6 +369,9 @@ function registerDevice(deviceObj, callback) {
                     if ('explicitAttrs' in deviceData && deviceData.explicitAttrs !== undefined) {
                         deviceObj.explicitAttrs = deviceData.explicitAttrs;
                     }
+                    if ('apikey' in deviceData && deviceData.apikey !== undefined) {
+                        deviceObj.apikey = deviceData.apikey;
+                    }
                     config.getRegistry().store(deviceObj, callback);
                 }
             }
@@ -619,8 +629,16 @@ function findOrCreate(deviceId, group, callback) {
             if ('expressionLanguage' in group && group.expressionLanguage !== undefined) {
                 newDevice.expressionLanguage = group.expressionLanguage;
             }
+            if (
+                (!('apikey' in newDevice) || newDevice.apikey === undefined) &&
+                'apikey' in group &&
+                group.apikey !== undefined
+            ) {
+                newDevice.apikey = group.apikey;
+            }
             // Check autoprovision flag in order to register or not device
             if (group.autoprovision === undefined || group.autoprovision === true) {
+                logger.debug(context, 'Registering autoprovision of Device %j for its conf %j', newDevice, group);
                 registerDevice(newDevice, function (error, device) {
                     callback(error, device, group);
                 });

package/lib/services/devices/devices-NGSI-v2.js

@@ -359,7 +359,9 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
             if ('expressionLanguage' in newDevice && newDevice.expressionLanguage !== undefined) {
                 oldDevice.expressionLanguage = newDevice.expressionLanguage;
             }
-
+            if ('apikey' in newDevice && newDevice.apikey !== undefined) {
+                oldDevice.explicitAttrs = newDevice.apikey;
+            }
             oldDevice.endpoint = newDevice.endpoint || oldDevice.endpoint;
 
             callback(null, oldDevice);

package/lib/services/northBound/restUtils.js

@@ -53,11 +53,9 @@ function checkMandatoryQueryParams(mandatoryAttributes, body, callback) {
     for (const p in mandatoryAttributes) {
         let found = false;
 
-        for (const i in body) {
-            if (body.hasOwnProperty(i)) {
-                if (i === mandatoryAttributes[p]) {
-                    found = true;
-                }
+        if (body.hasOwnProperty(mandatoryAttributes[p])) {
+            if (body[mandatoryAttributes[p]] !== '' && body[mandatoryAttributes[p]] !== null) {
+                found = true;
             }
         }
 

package/lib/templates/deviceGroup.json

@@ -24,7 +24,7 @@
             "description": "token",
             "type": "string"
           },
-          "cbroker": {
+          "cbHost": {
             "description": "uri for the context broker",
             "type": "string"
           },

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

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

@@ -0,0 +1,43 @@
+{
+  "devices": [
+    {
+      "device_id": "",
+      "protocol": "GENERIC_PROTO",
+      "entity_name": "TheFirstLight",
+      "entity_type": "TheLightType",
+      "timezone": "America/Santiago",
+      "endpoint": "http://fakedEndpoint:1234",
+      "transport": "MQTT",
+      "attributes": [
+        {
+          "name": "attr_name",
+          "type": "string"
+        }
+      ],
+      "lazy": [
+        {
+          "name": "luminance",
+          "type": "lumens"
+        }
+      ],
+      "static_attributes": [
+        {
+          "name": "hardcodedAttr",
+          "type": "hardcodedType",
+          "value": "hardcodedValue"
+        }
+      ],
+      "commands": [
+        {
+          "name": "commandAttr",
+          "type": "commandType"
+        }
+      ],
+      "internal_attributes": [
+        {
+          "customField": "customValue"
+        }
+      ]
+    }
+  ]
+}

package/test/unit/examples/mongoCollections/configurations.json

@@ -2,7 +2,7 @@
   {
     "apikey" : "7e5721f478220be21f41f4700e50be2",
     "token" : "e50b7781d5e2d39d577e7c15e4a21f470ed39d5777e7c15e2e2d39d5777e7c1e2",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "smart_gondor",
@@ -10,7 +10,7 @@
   },
   {
     "apikey" : "gdb13gq3f8q4beuk263besr8eh9ri",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "dumb_mordor",
@@ -25,7 +25,7 @@
   },
   {
     "apikey" : "hs4h2ke7oerfdvrexbyh54w2",
-    "cbroker" : "http://10.0.0.2:1026",
+    "cbHost" : "http://10.0.0.2:1026",
     "entity_type" : "device",
     "resource" : "/iot/d",
     "service" : "demo",

package/test/unit/expressions/jexlExpression-test.js

@@ -234,6 +234,26 @@ describe('Jexl expression interpreter', function () {
         });
     });
 
+    describe('When an concatarr function is used with an array', function () {
+        it('should work on the expression value', function (done) {
+            expressionParser.parse('array|concatarr(array)', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.deepEqual([1, 2, 1, 2]);
+                done();
+            });
+        });
+    });
+
+    describe('When an joinarrtostr function is used with an array', function () {
+        it('should work on the expression value', function (done) {
+            expressionParser.parse('array|joinarrtostr("_")', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.equal('1_2');
+                done();
+            });
+        });
+    });
+
     describe('When a function is applied to an array', function () {
         it('should work on the expression value', function (done) {
             expressionParser.parse('array[1]+1', scope, function (error, result) {
@@ -313,14 +333,15 @@ describe('Jexl expression interpreter', function () {
 
     describe('When a JSON parse transformation is applied', function () {
         it('should work on the expression value', function (done) {
-            expressionParser.parse('"{\\"name\\":\\"John\\",\\"surname\\":\\"Doe\\"}"|jsonparse', scope, function (
-                error,
-                result
-            ) {
-                should.not.exist(error);
-                result.should.eql(scope.object);
-                done();
-            });
+            expressionParser.parse(
+                '"{\\"name\\":\\"John\\",\\"surname\\":\\"Doe\\"}"|jsonparse',
+                scope,
+                function (error, result) {
+                    should.not.exist(error);
+                    result.should.eql(scope.object);
+                    done();
+                }
+            );
         });
     });