iotagent-node-lib 2.18.0 → 2.19.0

package/doc/installationguide.md

@@ -56,9 +56,10 @@ allowing the computer to interpret the rest of the data with more clarity and de
 }
 ```
 
-Under mixed mode, **NGSI v2** payloads are used for context broker communications by default, but this payload may also be switched
-to **NGSI LD** at service group or device provisioning time using the `ngsiVersion` field in the provisioning API.
-The `ngsiVersion` field switch may be added at either group or device level, with the device level overriding the group setting.
+Under mixed mode, **NGSI v2** payloads are used for context broker communications by default, but this payload may also
+be switched to **NGSI LD** at service group or device provisioning time using the `ngsiVersion` field in the
+provisioning API. The `ngsiVersion` field switch may be added at either group or device level, with the device level
+overriding the group setting.
 
 -   **server**: configuration used to create the Context Server (port where the IoT Agent will be listening as a Context
     Provider and base root to prefix all the paths). The `port` attribute is required. If no `baseRoot` attribute is
@@ -159,7 +160,7 @@ used for the same purpose. For instance:
 
 ```javascript
 {
-    type: "mongodb";
+    type: 'mongodb';
 }
 ```
 
@@ -241,8 +242,8 @@ used for the same purpose. For instance:
 -   **singleConfigurationMode**: enables the Single Configuration mode for backwards compatibility (see description in
     the Overview). Default to false.
 -   **timestamp**: if this flag is activated:
-    -   For NGSI-v2, the IoT Agent will add a `TimeInstant` metadata attribute to all the attributes updated from
-        device information. This flag is overwritten by `timestamp` flag in group or device
+    -   For NGSI-v2, the IoT Agent will add a `TimeInstant` metadata attribute to all the attributes updated from device
+        information. This flag is overwritten by `timestamp` flag in group or device
     -   With NGSI-LD, the standard `observedAt` property-of-a-property is created instead.
 -   **defaultResource**: default string to use as resource for the registration of new Configurations (if no resource is
     provided).
@@ -273,10 +274,11 @@ used for the same purpose. For instance:
     NGSILD-Path has not yet been included in the NGSI-LD standard (it has been proposed for the next update of the
     standard, but the final decision has yet been confirmed), take into account it could change
 -   **explicitAttrs**: if this flag is activated, only provisioned attributes will be processed to Context Broker. This
-    flag is overwritten by `explicitAttrs` flag in group or device provision.
+    flag is overwritten by `explicitAttrs` flag in group or device provision. Additionally `explicitAttrs` can be used
+    to define which meassures defined in JSON/JEXL array will be propagated to NGSI interface.
 -   **defaultEntityNameConjunction**: the default conjunction string used to compose a default `entity_name` when is not
-    provided at device provisioning time; in that case `entity_name` is composed by `type` + `:` + `device_id`.
-    Default value is `:`. This value is overwritten by `defaultEntityNameConjunction` in group provision.
+    provided at device provisioning time; in that case `entity_name` is composed by `type` + `:` + `device_id`. Default
+    value is `:`. This value is overwritten by `defaultEntityNameConjunction` in group provision.
 -   **relaxTemplateValidation**: if this flag is activated, `objectId` attributes for incoming devices are not
     validated, and may exceptionally include characters (such as semi-colons) which are
     [forbidden](https://fiware-orion.readthedocs.io/en/master/user/forbidden_characters/index.html) according to the
@@ -291,61 +293,61 @@ with container-based technologies, like Docker, Heroku, etc...
 The following table shows the accepted environment variables, as well as the configuration parameter the variable
 overrides.
 
-| Environment variable             | Configuration attribute         |
-| :------------------------------- | :------------------------------ |
-| IOTA_CB_URL                      | `contextBroker.url`             |
-| IOTA_CB_HOST                     | `contextBroker.host`            |
-| IOTA_CB_PORT                     | `contextBroker.port`            |
-| IOTA_CB_NGSI_VERSION             | `contextBroker.ngsiVersion`     |
-| IOTA_NORTH_HOST                  | `server.host`                   |
-| IOTA_NORTH_PORT                  | `server.port`                   |
-| IOTA_PROVIDER_URL                | `providerUrl`                   |
-| IOTA_AUTH_ENABLED                | `authentication.enabled`        |
-| IOTA_AUTH_TYPE                   | `authentication.type`           |
-| IOTA_AUTH_HEADER                 | `authentication.header`         |
-| IOTA_AUTH_URL                    | `authentication.url`            |
-| IOTA_AUTH_HOST                   | `authentication.host`           |
-| IOTA_AUTH_PORT                   | `authentication.port`           |
-| IOTA_AUTH_USER                   | `authentication.user`           |
-| IOTA_AUTH_PASSWORD               | `authentication.password`       |
-| IOTA_AUTH_CLIENT_ID              | `authentication.clientId`       |
-| IOTA_AUTH_CLIENT_SECRET          | `authentication.clientSecret`   |
-| IOTA_AUTH_TOKEN_PATH             | `authentication.tokenPath`      |
-| IOTA_AUTH_PERMANENT_TOKEN        | `authentication.permanentToken` |
-| IOTA_REGISTRY_TYPE               | `deviceRegistry.type`           |
-| IOTA_LOG_LEVEL                   | `logLevel`                      |
-| IOTA_TIMESTAMP                   | `timestamp`                     |
-| IOTA_IOTAM_URL                   | `iotManager.url`                |
-| IOTA_IOTAM_HOST                  | `iotManager.host`               |
-| IOTA_IOTAM_PORT                  | `iotManager.port`               |
-| IOTA_IOTAM_PATH                  | `iotManager.path`               |
-| IOTA_IOTAM_AGENTPATH             | `iotManager.agentPath`          |
-| IOTA_IOTAM_PROTOCOL              | `iotManager.protocol`           |
-| IOTA_IOTAM_DESCRIPTION           | `iotManager.description`        |
-| IOTA_MONGO_HOST                  | `mongodb.host`                  |
-| IOTA_MONGO_PORT                  | `mongodb.port`                  |
-| IOTA_MONGO_DB                    | `mongodb.db`                    |
-| IOTA_MONGO_REPLICASET            | `mongodb.replicaSet`            |
-| IOTA_MONGO_USER                  | `mongodb.user`                  |
-| IOTA_MONGO_PASSWORD              | `mongodb.password`              |
-| IOTA_MONGO_AUTH_SOURCE           | `mongodb.authSource`            |
-| IOTA_MONGO_RETRIES               | `mongodb.retries`               |
-| IOTA_MONGO_RETRY_TIME            | `mongodb.retryTime`             |
-| IOTA_MONGO_SSL                   | `mongodb.ssl`                   |
-| IOTA_MONGO_EXTRAARGS             | `mongodb.extraArgs`             |
-| IOTA_SINGLE_MODE                 | `singleConfigurationMode`       |
-| IOTA_APPEND_MODE                 | `appendMode`                    |
-| IOTA_POLLING_EXPIRATION          | `pollingExpiration`             |
-| IOTA_POLLING_DAEMON_FREQ         | `pollingDaemonFrequency`        |
-| IOTA_AUTOCAST                    | `autocast`                      |
-| IOTA_MULTI_CORE                  | `multiCore`                     |
-| IOTA_JSON_LD_CONTEXT             | `jsonLdContext`                 |
-| IOTA_FALLBACK_TENANT             | `fallbackTenant`                |
-| IOTA_FALLBACK_PATH               | `fallbackPath`                  |
-| IOTA_DEFAULT_EXPRESSION_LANGUAGE | `defaultExpressionLanguage`     |
-| IOTA_EXPLICIT_ATTRS              | `explicitAttrs`                 |
-| IOTA_DEFAULT_ENTITY_NAME_CONJUNCTION | `defaultEntityNameConjunction` |
-| IOTA_RELAX_TEMPLATE_VALIDATION   | `relaxTemplateValidation`       |
+| Environment variable                 | Configuration attribute         |
+| :----------------------------------- | :------------------------------ |
+| IOTA_CB_URL                          | `contextBroker.url`             |
+| IOTA_CB_HOST                         | `contextBroker.host`            |
+| IOTA_CB_PORT                         | `contextBroker.port`            |
+| IOTA_CB_NGSI_VERSION                 | `contextBroker.ngsiVersion`     |
+| IOTA_NORTH_HOST                      | `server.host`                   |
+| IOTA_NORTH_PORT                      | `server.port`                   |
+| IOTA_PROVIDER_URL                    | `providerUrl`                   |
+| IOTA_AUTH_ENABLED                    | `authentication.enabled`        |
+| IOTA_AUTH_TYPE                       | `authentication.type`           |
+| IOTA_AUTH_HEADER                     | `authentication.header`         |
+| IOTA_AUTH_URL                        | `authentication.url`            |
+| IOTA_AUTH_HOST                       | `authentication.host`           |
+| IOTA_AUTH_PORT                       | `authentication.port`           |
+| IOTA_AUTH_USER                       | `authentication.user`           |
+| IOTA_AUTH_PASSWORD                   | `authentication.password`       |
+| IOTA_AUTH_CLIENT_ID                  | `authentication.clientId`       |
+| IOTA_AUTH_CLIENT_SECRET              | `authentication.clientSecret`   |
+| IOTA_AUTH_TOKEN_PATH                 | `authentication.tokenPath`      |
+| IOTA_AUTH_PERMANENT_TOKEN            | `authentication.permanentToken` |
+| IOTA_REGISTRY_TYPE                   | `deviceRegistry.type`           |
+| IOTA_LOG_LEVEL                       | `logLevel`                      |
+| IOTA_TIMESTAMP                       | `timestamp`                     |
+| IOTA_IOTAM_URL                       | `iotManager.url`                |
+| IOTA_IOTAM_HOST                      | `iotManager.host`               |
+| IOTA_IOTAM_PORT                      | `iotManager.port`               |
+| IOTA_IOTAM_PATH                      | `iotManager.path`               |
+| IOTA_IOTAM_AGENTPATH                 | `iotManager.agentPath`          |
+| IOTA_IOTAM_PROTOCOL                  | `iotManager.protocol`           |
+| IOTA_IOTAM_DESCRIPTION               | `iotManager.description`        |
+| IOTA_MONGO_HOST                      | `mongodb.host`                  |
+| IOTA_MONGO_PORT                      | `mongodb.port`                  |
+| IOTA_MONGO_DB                        | `mongodb.db`                    |
+| IOTA_MONGO_REPLICASET                | `mongodb.replicaSet`            |
+| IOTA_MONGO_USER                      | `mongodb.user`                  |
+| IOTA_MONGO_PASSWORD                  | `mongodb.password`              |
+| IOTA_MONGO_AUTH_SOURCE               | `mongodb.authSource`            |
+| IOTA_MONGO_RETRIES                   | `mongodb.retries`               |
+| IOTA_MONGO_RETRY_TIME                | `mongodb.retryTime`             |
+| IOTA_MONGO_SSL                       | `mongodb.ssl`                   |
+| IOTA_MONGO_EXTRAARGS                 | `mongodb.extraArgs`             |
+| IOTA_SINGLE_MODE                     | `singleConfigurationMode`       |
+| IOTA_APPEND_MODE                     | `appendMode`                    |
+| IOTA_POLLING_EXPIRATION              | `pollingExpiration`             |
+| IOTA_POLLING_DAEMON_FREQ             | `pollingDaemonFrequency`        |
+| IOTA_AUTOCAST                        | `autocast`                      |
+| IOTA_MULTI_CORE                      | `multiCore`                     |
+| IOTA_JSON_LD_CONTEXT                 | `jsonLdContext`                 |
+| IOTA_FALLBACK_TENANT                 | `fallbackTenant`                |
+| IOTA_FALLBACK_PATH                   | `fallbackPath`                  |
+| IOTA_DEFAULT_EXPRESSION_LANGUAGE     | `defaultExpressionLanguage`     |
+| IOTA_EXPLICIT_ATTRS                  | `explicitAttrs`                 |
+| IOTA_DEFAULT_ENTITY_NAME_CONJUNCTION | `defaultEntityNameConjunction`  |
+| IOTA_RELAX_TEMPLATE_VALIDATION       | `relaxTemplateValidation`       |
 
 Note:
 

package/doc/usermanual.md

@@ -25,7 +25,7 @@ More values will be added in the future to the library. The applications using t
 Registry just by using the following function:
 
 ```javascript
-iotagentLib.statsRegistry.add("statName", statIncrementalValue, callback);
+iotagentLib.statsRegistry.add('statName', statIncrementalValue, callback);
 ```
 
 The first time this function is invoked, it will add the new stat to the registry. Subsequent calls will add the value
@@ -80,7 +80,7 @@ In order to use the library, add the following dependency to your package.json f
 In order to use this library, first you must require it:
 
 ```javascript
-var iotagentLib = require("iotagent-node-lib");
+var iotagentLib = require('iotagent-node-lib');
 ```
 
 The library supports four groups of features, one for each direction of the communication: client-to-server and
@@ -265,16 +265,16 @@ Once all the updates have taken place, the callback must be invoked with the upd
 
 ```javascript
 callback(null, {
-    type: "TheType",
+    type: 'TheType',
     isPattern: false,
-    id: "EntityID",
+    id: 'EntityID',
     attributes: [
         {
-            name: "lumniscence",
-            type: "Lumens",
-            value: "432",
-        },
-    ],
+            name: 'lumniscence',
+            type: 'Lumens',
+            value: '432'
+        }
+    ]
 });
 ```
 
@@ -303,16 +303,16 @@ The callback must be invoked with the updated Context Element, using the informa
 
 ```javascript
 callback(null, {
-    type: "TheType",
+    type: 'TheType',
     isPattern: false,
-    id: "EntityID",
+    id: 'EntityID',
     attributes: [
         {
-            name: "lumniscence",
-            type: "Lumens",
-            value: "432",
-        },
-    ],
+            name: 'lumniscence',
+            type: 'Lumens',
+            value: '432'
+        }
+    ]
 });
 ```
 
@@ -686,6 +686,38 @@ unexpectedly dead, a new process is created automatically to keep always the max
 -   iotAgent: The IoT Agent Objects, used to start the agent.
 -   callback: The callback function.
 
+##### iotagentLib.request()
+
+###### Signature
+
+```javascript
+function request(options, callback)
+```
+
+###### Description
+
+Make a direct HTTP request using the underlying request library (currently [got](https://github.com/sindresorhus/got)),
+this is useful when creating agents which use an HTTP transport for their southbound commands, and removes the need for
+the custom IoT Agent to import its own additional request library
+
+###### Params
+
+-   options: definition of the request (see
+    [got options](https://github.com/sindresorhus/got/blob/main/documentation/2-options.md) for more details). The
+    following attributes are currently exposed.
+    -   `method` - HTTP Method
+    -   `searchParams` - query string params
+    -   `qs` - alias for query string params
+    -   `headers`
+    -   `responseType` - either `text` or `json`. `json` is the default
+    -   `json` - a supplied JSON object as the request body
+    -   `body` - any ASCII text as the request body. It takes precedence over `json` if both are provided at the same
+        time (not recommended).
+    -   `url` - the request URL
+    -   `uri` - alternative alias for the request URL.
+-   callback: The callback currently returns an `error` Object, the `response` and `body`. The `body` is parsed to a
+    JSON object if the `responseType` is JSON.
+
 #### Generic middlewares
 
 This collection of utility middlewares is aimed to be used to north of the IoT Agent Library, as well as in other

package/docker/Mosquitto/Dockerfile

@@ -9,6 +9,7 @@ RUN yum update -y && yum install -y wget \
   && yum install -y epel-release \
   && yum update -y epel-release \
   && yum install -y mosquitto \
+  && cp /etc/mosquitto/mosquitto.conf /etc/mosquitto/mosquitto.conf.orig \
   && chmod 755 /bin/startMosquitto.sh \
   && mkdir /var/log/mosquitto \
   && chown mosquitto:mosquitto /var/log/mosquitto \

package/docker/Mosquitto/README.md

@@ -2,6 +2,7 @@ Thi directory containts the Dockerfile (and associated files) for a container of
 This container is provide as a help for users to test with MQTT, but it is just an auxiliary material in this repository.
 
 The following releases matches with eclipse-mosquitto version:
+- 1.6.0 uses mosquitto-1.6.10-1.el7.x86_64
 - 1.5.0 uses mosquitto-1.6.10-1.el7.x86_64
 - 1.4.0 uses mosquitto-1.6.10-1.el7.x86_64
 - 1.3.0 uses mosquitto-1.6.8-1.el7.x86_64

package/docker/Mosquitto/startMosquitto.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
 
-if [ "${CONGIF_FROM_ENV}" = true ] ; then    
+if [ "${CONGIF_FROM_ENV}" = true ] ; then
+    cp /etc/mosquitto/mosquitto.conf.orig /etc/mosquitto/mosquitto.conf
     echo "log_timestamp true" >> /etc/mosquitto/mosquitto.conf
     echo "log_timestamp_format %Y-%m-%dT%H:%M:%S" >> /etc/mosquitto/mosquitto.conf
     echo 'listener 9001' >> /etc/mosquitto/mosquitto.conf
     echo 'protocol websockets' >> /etc/mosquitto/mosquitto.conf
     echo 'listener 1883' >> /etc/mosquitto/mosquitto.conf
-    echo 'protocol mqtt' >> /etc/mosquitto/mosquitto.conf    
+    echo 'protocol mqtt' >> /etc/mosquitto/mosquitto.conf
     if ! [ -z "${IOTA_PASS}" ] ; then
       # Only if IOTA_PASS is set and not empty MQTT user/pass authentication is used
       touch /etc/mosquitto/pwfile
       sed -i '$ i acl_file /etc/mosquitto/aclfile\npassword_file /etc/mosquitto/pwfile' /etc/mosquitto/mosquitto.conf
-      mv /root/aclfile /etc/mosquitto/aclfile
-      mosquitto_passwd -b /etc/mosquitto/pwfile iota ${IOTA_PASS}
+      cp -f /root/aclfile /etc/mosquitto/aclfile
+      sed -i 's/user iota/user '${IOTA_USER}'/g' /etc/mosquitto/aclfile
+      mosquitto_passwd -b /etc/mosquitto/pwfile ${IOTA_USER} ${IOTA_PASS}
     fi
 fi
 

package/lib/command/commandLine.js

@@ -25,7 +25,7 @@ const fs = require('fs');
 const clUtils = require('command-shell-lib');
 const migrationLib = require('./migration');
 const constants = require('../constants');
-const request = require('request');
+const request = require('../request-shim');
 const async = require('async');
 const mu = require('mu2');
 let config;

package/lib/fiware-iotagent-lib.js

@@ -37,6 +37,7 @@ const iotManager = require('./services/common/iotManagerService');
 const contextServer = require('./services/northBound/northboundServer');
 const errors = require('./errors');
 const constants = require('./constants');
+const request = require('./request-shim');
 const logger = require('logops');
 const config = require('./commonConfig');
 const cluster = require('cluster');
@@ -325,6 +326,7 @@ exports.setDataQueryHandler = contextServer.setQueryHandler;
 exports.setConfigurationHandler = contextServer.setConfigurationHandler;
 exports.setRemoveConfigurationHandler = contextServer.setRemoveConfigurationHandler;
 exports.setProvisioningHandler = contextServer.setProvisioningHandler;
+exports.setUpdatingHandler = contextServer.setUpdatingHandler;
 exports.setRemoveDeviceHandler = contextServer.setRemoveDeviceHandler;
 exports.setNotificationHandler = contextServer.setNotificationHandler;
 exports.addUpdateMiddleware = ngsi.addUpdateMiddleware;
@@ -372,3 +374,4 @@ exports.constants = constants;
 exports.logModule = logger;
 exports.configModule = config;
 exports.startServer = startServer;
+exports.request = request;

package/lib/jexlTranformsMap.js

@@ -57,7 +57,15 @@ const map = {
     bitwisemask: (i, mask, op, shf) =>
         (op === '&' ? parseInt(i) & mask : op === '|' ? parseInt(i) | mask : op === '^' ? parseInt(i) ^ mask : i) >>
         shf,
-    slice: (arr, init, end) => arr.slice(init, end)
+    slice: (arr, init, end) => arr.slice(init, end),
+    addset: (arr, x) => {
+        return Array.from(new Set(arr).add(x));
+    },
+    removeset: (arr, x) => {
+        let s = new Set(arr);
+        s.delete(x);
+        return Array.from(s);
+    }
 };
 
 exports.map = map;

package/lib/model/Device.js

@@ -23,6 +23,9 @@
 
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
+const Group = require('./Group');
+
+mongoose.Schema.Types.ExplicitAttrsType = Group.ExplicitAttrsType;
 
 const Device = new Schema({
     id: String,
@@ -49,7 +52,7 @@ const Device = new Schema({
     internalAttributes: Object,
     autoprovision: Boolean,
     expressionLanguage: String,
-    explicitAttrs: Boolean,
+    explicitAttrs: Group.ExplicitAttrsType,
     ngsiVersion: String
 });
 

package/lib/model/Group.js

@@ -24,6 +24,23 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
+class ExplicitAttrsType extends mongoose.SchemaType {
+    constructor(key, options) {
+        super(key, options, 'ExplicitAttrsType');
+    }
+    // `cast()` takes a parameter that can be anything. You need to
+    // validate the provided `val` and throw a `CastError` if you
+    // can't convert it.
+    cast(val) {
+        if (!(typeof val === 'boolean' || typeof val === 'string')) {
+            throw new Error('ExplicitAttrsType: ' + val + ' is not Boolean or String');
+        }
+        return val;
+    }
+}
+
+mongoose.Schema.Types.ExplicitAttrsType = ExplicitAttrsType;
+
 const Group = new Schema({
     url: String,
     resource: String,
@@ -43,7 +60,7 @@ const Group = new Schema({
     internalAttributes: Array,
     autoprovision: Boolean,
     expressionLanguage: String,
-    explicitAttrs: Boolean,
+    explicitAttrs: ExplicitAttrsType,
     defaultEntityNameConjunction: String,
     ngsiVersion: String
 });
@@ -55,3 +72,4 @@ function load(db) {
 }
 
 module.exports.load = load;
+module.exports.ExplicitAttrsType = ExplicitAttrsType;

package/lib/plugins/expressionParser.js

@@ -28,15 +28,16 @@
 const Parser = require('jison').Parser;
 const errors = require('../errors');
 const logger = require('logops');
+const fillService = require('../services/common/domain').fillService;
 const _ = require('underscore');
-const logContext = {
+let logContext = {
     op: 'IoTAgentNGSI.Expression'
 };
 const grammar = {
     lex: {
         rules: [
             ['\\s+', '/* skip whitespace */'],
-            ['@[a-zA-Z0-9]+\\b', 'return "VARIABLE";'],
+            ['@[a-zA-Z0-9_]+\\b', 'return "VARIABLE";'],
             ['[0-9]+(?:\\.[0-9]+)?\\b', 'return "NUMBER";'],
             ['\\*', 'return "*";'],
             ['\\/', 'return "/";'],
@@ -156,6 +157,7 @@ function processExpression(context) {
 
 /* eslint-disable-next-line no-unused-vars */
 function applyExpression(expression, context, typeInformation) {
+    logContext = fillService(logContext, typeInformation);
     const expressionList = expression.match(/\$\{.*?\}/g) || [];
     const substitutions = expressionList.map(processExpression(context));
     let expressionResult = expression;
@@ -214,14 +216,14 @@ function expressionApplier(context, typeInformation) {
 function contextAvailable(expression, context) {
     let error;
     try {
-        const variablesList = expression.match(/@[a-zA-Z0-9]+/g) || [];
+        const variablesList = expression.match(/@[a-zA-Z0-9_]+/g) || [];
         const variables = variablesList.map(function (item) {
             return item.substr(1);
         });
         const keys = Object.keys(context);
         let validContext = _.difference(variables, keys).length === 0;
         if (!validContext) {
-            logger.warn(
+            logger.info(
                 logContext,
                 'For expression "[%s]" context "[%j]" does not have element to match',
                 expression,

package/lib/plugins/expressionPlugin.js

@@ -96,7 +96,13 @@ function update(entity, typeInformation, callback) {
             parser = jexlParser;
         }
         let expressionAttributes = [];
-        const ctx = parser.extractContext(attributes);
+        let attributesCtxt = [...attributes]; // just copy
+        if (typeInformation.static) {
+            typeInformation.static.forEach(function (att) {
+                attributesCtxt.push(att);
+            });
+        }
+        const ctx = parser.extractContext(attributesCtxt);
 
         if (typeInformation.active) {
             expressionAttributes = parser.processExpressionAttributes(typeInformation, typeInformation.active, ctx);
@@ -107,6 +113,7 @@ function update(entity, typeInformation, callback) {
     }
 
     try {
+        logger.debug(context, 'expressionPlugin entity %j', entity);
         let attsArray = utils.extractAttributesArrayFromNgsi2Entity(entity);
         attsArray = processEntityUpdateNgsi2(attsArray);
         entity = utils.createNgsi2Entity(entity.id, entity.type, attsArray, true);

package/lib/plugins/jexlParser.js

@@ -30,9 +30,10 @@
 const jexl = require('jexl');
 const errors = require('../errors');
 const logger = require('logops');
+const fillService = require('../services/common/domain').fillService;
 const config = require('../commonConfig');
 const baseTranformsMap = require('../jexlTranformsMap.js').map;
-const logContext = {
+let logContext = {
     op: 'IoTAgentNGSI.JEXL'
 };
 
@@ -96,6 +97,7 @@ function extractContext(attributeList) {
 }
 
 function applyExpression(expression, context, typeInformation) {
+    logContext = fillService(logContext, typeInformation);
     const result = parse(expression, context);
     logger.debug(logContext, 'applyExpression "[%j]" over "[%j]" result "[%j]" ', expression, context, result);
     const expressionResult = result !== undefined ? result : expression;

package/lib/request-shim.js

@@ -0,0 +1,111 @@
+/*
+ * Copyright 2014 Telefonica Investigación y Desarrollo, S.A.U
+ *
+ * This file is part of fiware-iotagent-lib
+ *
+ * fiware-iotagent-lib is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * fiware-iotagent-lib is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with fiware-iotagent-lib.
+ * If not, see http://www.gnu.org/licenses/.
+ *
+ * For those usages not covered by the GNU Affero General Public License
+ * please contact with::daniel.moranjimenez@telefonica.com
+ */
+
+const got = require('got');
+const logger = require('logops');
+const context = {
+    op: 'IoTAgentNGSI.Request'
+};
+
+/**
+ *  Transform the "request" options into "got" options and add additional "got" defaults
+ *
+ *  The following options are currently exposed:
+ *   - `method` - HTTP Method
+ *   - `searchParams` - query string params
+ *   - `qs` - alias for query string params
+ *   - `headers`
+ *   - `responseType` - either `text` or `json`. `json` is the default
+ *   - `json` - a supplied JSON object as the request body
+ *   - `body` - any ASCII text as  the request body
+ *   - `url` - the request URL
+ *   - `uri` - alternative alias for the request URL.
+ *
+ * @param {Object} options          Original definition of the request using the request library
+ * @return {Object}                 Updated definition of the request using the got library
+ *
+ */
+function getOptions(options) {
+    const httpOptions = {
+        method: options.method,
+        searchParams: options.searchParams || options.qs,
+        headers: options.headers,
+        throwHttpErrors: options.throwHttpErrors || false,
+        retry: options.retry || 0,
+        responseType: options.responseType || 'json'
+    };
+
+    // got library is not properly documented, so it is not clear which takes precedence
+    // among body, json and form (see https://stackoverflow.com/q/70754880/1485926).
+    // Thus, we are enforcing our own precedence with the "else if" chain below.
+    // Behaviour is consistent with the one described at usermanual.md#iotagentlibrequest
+
+    if (options.method === 'GET' || options.method === 'HEAD' || options.method === 'OPTIONS') {
+        // Do nothing - Never add a body
+    } else if (options.body) {
+        // body takes precedence over json or form
+        httpOptions.body = options.body;
+    } else if (options.json) {
+        // json takes precedence over form
+        httpOptions.json = options.json;
+    } else if (options.form) {
+        // Note that we don't consider 'form' part of the function API (check usermanual.md#iotagentlibrequest)
+        // but we are preparing the code anyway as a safe measure
+        httpOptions.form = options.form;
+    }
+
+    return httpOptions;
+}
+
+/*
+ *
+ *  Make a direct HTTP request using the underlying request library
+ *  (currently [got](https://github.com/sindresorhus/got)),
+ *
+ *  This function mimics the interface of the obsolete request library and switches
+ *  back from promises to callbacks to avoid re-writing large chunks of code.
+ *  This centralizes all HTTP requests in a single location and is useful
+ *  when creating agents which use an HTTP transport for their southbound
+ *  commands, and removes the need for the custom IoT Agent to import its own
+ *  additonal request library.
+ *
+ * @param {Object} options            Definition of the request .
+ * @param {Function} callback         The callback function.
+ *
+ */
+
+function request(options, callback) {
+    const httpOptions = getOptions(options);
+    logger.debug(context, 'Options: %s', JSON.stringify(options, null, 4));
+    got(options.url || options.uri, httpOptions)
+        .then((response) => {
+            logger.debug(context, 'Response %s', JSON.stringify(response.body, null, 4));
+            return callback(null, response, response.body);
+        })
+        .catch((error) => {
+            logger.debug(context, 'Error: %s', JSON.stringify(error, null, 4));
+            return callback(error);
+        });
+}
+
+module.exports = request;

package/lib/services/common/genericMiddleware.js

@@ -71,7 +71,7 @@ function traceRequest(req, res, next) {
 
 /* eslint-disable-next-line  no-unused-vars */
 function changeLogLevel(req, res, next) {
-    const levels = ['INFO', 'ERROR', 'FATAL', 'DEBUG', 'WARNING'];
+    const levels = ['INFO', 'ERROR', 'FATAL', 'DEBUG', 'WARN', 'WARNING'];
 
     if (!req.query.level) {
         res.status(400).json({
@@ -82,7 +82,11 @@ function changeLogLevel(req, res, next) {
             error: 'invalid log level'
         });
     } else {
-        logger.setLevel(req.query.level.toUpperCase());
+        let newLevel = req.query.level.toUpperCase();
+        if (newLevel === 'WARNING') {
+            newLevel = 'WARN';
+        }
+        logger.setLevel(newLevel);
         res.status(200).send('');
     }
 }