iotagent-node-lib 2.18.0 → 2.19.0

package/lib/services/common/iotManagerService.js

@@ -23,7 +23,7 @@
  * Modified by: Federico M. Facca - Martel Innovate
  */
 
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const errors = require('../../errors');
 const constants = require('../../constants');

package/lib/services/common/securityServiceKeystone.js

@@ -21,7 +21,7 @@
  * please contact with::daniel.moranjimenez@telefonica.com
  */
 
-const request = require('request');
+const request = require('../../request-shim');
 const errors = require('../../errors');
 const config = require('../../commonConfig');
 const intoTrans = require('../common/domain').intoTrans;

package/lib/services/common/securityServiceOAuth2.js

@@ -26,7 +26,7 @@
 
 /* eslint-disable consistent-return */
 
-const request = require('request');
+const request = require('../../request-shim');
 const queryString = require('query-string');
 const errors = require('../../errors');
 const config = require('../../commonConfig');
@@ -64,7 +64,8 @@ function auth(trust, callback) {
             'Content-Length': formData.length,
             'Content-Type': 'application/x-www-form-urlencoded'
         },
-        body: formData
+        body: formData,
+        responseType: 'text'
     };
 
     logger.debug(context, 'Authentication on the OAuth2 provider [%s]', url);

package/lib/services/devices/deviceRegistryMongoDB.js

@@ -289,6 +289,7 @@ function update(device, callback) {
             data.internalAttributes = device.internalAttributes;
             data.commands = device.commands;
             data.endpoint = device.endpoint;
+            data.polling = device.polling;
             data.name = device.name;
             data.type = device.type;
             data.apikey = device.apikey;

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

@@ -23,7 +23,7 @@
  * Modified by: Jason Fox - FIWARE Foundation
  */
 
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const constants = require('../../constants');

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

@@ -27,7 +27,7 @@
 
 /* eslint-disable consistent-return */
 
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const uuid = require('uuid');
@@ -112,11 +112,7 @@ function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
 function updateEntityHandlerNgsi2(deviceData, updatedDevice, callback) {
     return function handleEntityResponse(error, response, body) {
         if (error) {
-            logger.error(
-                context,
-                'ORION-001: Connection error updating entity in the Context Broker: %s',
-                error
-            );
+            logger.error(context, 'ORION-001: Connection error updating entity in the Context Broker: %s', error);
 
             alarms.raise(constants.ORION_ALARM, error);
 

package/lib/services/devices/registrationUtils.js

@@ -136,7 +136,6 @@ function sendUnregistrationsNgsi2(deviceData, callback) {
     const options = {
         url: cbHost + '/v2/registrations/' + deviceData.registrationId,
         method: 'DELETE',
-        json: true,
         headers: {
             'fiware-service': deviceData.service,
             'fiware-servicepath': deviceData.subservice
@@ -177,7 +176,6 @@ function sendUnregistrationsNgsiLD(deviceData, callback) {
     const options = {
         url: cbHost + '/ngsi-ld/v1/csourceRegistrations/' + deviceData.registrationId,
         method: 'DELETE',
-        json: true,
         headers: {
             'fiware-service': deviceData.service,
             'fiware-servicepath': deviceData.subservice,

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

@@ -25,7 +25,7 @@
 
 /* eslint-disable consistent-return */
 
-const request = require('request');
+const request = require('../../request-shim');
 const statsService = require('./../stats/statsRegistry');
 const async = require('async');
 const apply = async.apply;
@@ -34,6 +34,7 @@ const errors = require('../../errors');
 const utils = require('../northBound/restUtils');
 const config = require('../../commonConfig');
 const constants = require('../../constants');
+const jexlParser = require('../../plugins/jexlParser');
 const moment = require('moment-timezone');
 const logger = require('logops');
 const _ = require('underscore');
@@ -55,8 +56,9 @@ const NGSI_LD_URN = 'urn:ngsi-ld:';
  *                                   format
  */
 
-function convertNGSIv2ToLD(attr) {
-    if (attr.value === null) {
+function convertAttrNGSILD(attr) {
+    // eslint eqeqeq - deliberate double equals to include undefined.
+    if (attr.value == null || Number.isNaN(attr.value)) {
         return undefined;
     }
     let obj = { type: 'Property', value: attr.value };
@@ -178,7 +180,7 @@ function convertNGSIv2ToLD(attr) {
                     obj.unitCode = attr.metadata[key].value;
                     break;
                 default:
-                    obj[key] = convertNGSIv2ToLD(attr.metadata[key]);
+                    obj[key] = convertAttrNGSILD(attr.metadata[key]);
             }
         });
         delete obj.TimeInstant;
@@ -214,7 +216,7 @@ function formatAsNGSILD(json) {
                 // element for NSGI-LD.
                 break;
             default:
-                obj[key] = convertNGSIv2ToLD(json[key]);
+                obj[key] = convertAttrNGSILD(json[key]);
         }
     });
 
@@ -329,7 +331,6 @@ function sendQueryValueNgsiLD(entityName, attributes, typeInformation, token, ca
 
     const options = NGSIUtils.createRequestObject(url, typeInformation, token);
     options.method = 'GET';
-    options.json = true;
 
     if (!typeInformation || !typeInformation.type) {
         callback(new errors.TypeNotFound(null, entityName));
@@ -402,6 +403,90 @@ function addLinkedEntities(typeInformation, json) {
     });
 }
 
+/**
+ * Remove id, type and any hidden attrs after processing
+ *
+ * @param {Object} enities           Unprocessed entities
+ * @param {Object} typeInformation  Configuration information for the device.
+ */
+function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
+    var explicitAttrsList = [];
+    if (typeInformation.explicitAttrs) {
+        explicitAttrsList.push('type');
+        explicitAttrsList.push('id');
+        if (typeof typeInformation.explicitAttrs === 'boolean') {
+            if (typeInformation.timestamp) {
+                explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
+            }
+            if (typeInformation.active) {
+                typeInformation.active.forEach((attr) => {
+                    explicitAttrsList.push(attr.name);
+                });
+            }
+            if (typeInformation.staticAttributes) {
+                typeInformation.staticAttributes.forEach((attr) => {
+                    explicitAttrsList.push(attr.name);
+                });
+            }
+        } else if (typeof typeInformation.explicitAttrs === 'string') {
+            entities.forEach((entity) => {
+                const attsArray = utils.extractAttributesArrayFromNgsi2Entity(entity);
+                const ctx = jexlParser.extractContext(attsArray);
+                const res = jexlParser.parse(typeInformation.explicitAttrs, ctx);
+                explicitAttrsList = explicitAttrsList.concat(res);
+            });
+        }
+    }
+    if (explicitAttrsList.length > 0) {
+        entities.forEach((entity) => {
+            const hidden = _.difference(_.keys(entity), explicitAttrsList);
+            hidden.forEach((attr) => {
+                delete entity[attr];
+            });
+        });
+    }
+    return entities;
+}
+
+/**
+ * Remove id, type and any hidden attrs after processing
+ *
+ * @param {Object} result           Unprocessed entity
+ * @param {Object} typeInformation  Configuration information for the device.
+ */
+function removeHiddenAttrs(result, typeInformation) {
+    delete result.id;
+    delete result.type;
+    var explicitAttrsList = [];
+    if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'boolean') {
+        if (typeInformation.timestamp) {
+            explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
+        }
+        if (typeInformation.active) {
+            typeInformation.active.forEach((attr) => {
+                explicitAttrsList.push(attr.name);
+            });
+        }
+        if (typeInformation.staticAttributes) {
+            typeInformation.staticAttributes.forEach((attr) => {
+                explicitAttrsList.push(attr.name);
+            });
+        }
+    } else if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'string') {
+        const attsArray = utils.extractAttributesArrayFromNgsi2Entity(result);
+        const ctx = jexlParser.extractContext(attsArray);
+        const res = jexlParser.parse(typeInformation.explicitAttrs, ctx);
+        explicitAttrsList = res;
+    }
+    if (explicitAttrsList.length > 0) {
+        const hidden = _.difference(_.keys(result), explicitAttrsList);
+        hidden.forEach((attr) => {
+            delete result[attr];
+        });
+    }
+    return result;
+}
+
 /**
  * Makes an update in the Device's entity in the context broker, with the values given in the 'attributes' array.
  * This array should comply to the NGSI-LD's attribute format.
@@ -413,7 +498,6 @@ function addLinkedEntities(typeInformation, json) {
  */
 function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, callback) {
     let payload = {};
-
     const url = '/ngsi-ld/v1/entityOperations/upsert/?options=update';
 
     const options = NGSIUtils.createRequestObject(url, typeInformation, token);
@@ -474,11 +558,10 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                             }
                         }
 
-                        options.json = result;
+                        options.json = removeHiddenAttrsFromMultiEntity(result, typeInformation);
                     } else {
-                        delete result.id;
-                        delete result.type;
-                        options.json = result;
+                        // Remove id, type and any hidden attrs after processing
+                        options.json = removeHiddenAttrs(result, typeInformation);
                         logger.debug(context, 'typeInformation: %j', typeInformation);
                         if (
                             'timestamp' in typeInformation && typeInformation.timestamp !== undefined
@@ -567,6 +650,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
     );
 }
 
+exports.convertAttrNGSILD = convertAttrNGSILD;
 exports.formatAsNGSILD = formatAsNGSILD;
 exports.sendUpdateValue = sendUpdateValueNgsiLD;
 exports.sendQueryValue = sendQueryValueNgsiLD;

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

@@ -27,21 +27,24 @@
 
 /* eslint-disable consistent-return */
 
-const request = require('request');
+const request = require('../../request-shim');
 const statsService = require('./../stats/statsRegistry');
 const async = require('async');
 const apply = async.apply;
 const alarms = require('../common/alarmManagement');
 const errors = require('../../errors');
 const utils = require('../northBound/restUtils');
+const pluginUtils = require('../../plugins/pluginUtils');
 const config = require('../../commonConfig');
 const constants = require('../../constants');
+const jexlParser = require('../../plugins/jexlParser');
 const moment = require('moment-timezone');
 const NGSIUtils = require('./ngsiUtils');
 const logger = require('logops');
 const context = {
     op: 'IoTAgentNGSI.Entities-v2'
 };
+const _ = require('underscore');
 
 /**
  * Amends an NGSIv2 Geoattribute from String to GeoJSON format
@@ -290,7 +293,6 @@ function sendQueryValueNgsi2(entityName, attributes, typeInformation, token, cal
 
     const options = NGSIUtils.createRequestObject(url, typeInformation, token);
     options.method = 'GET';
-    options.json = true;
 
     if (!typeInformation || !typeInformation.type) {
         callback(new errors.TypeNotFound(null, entityName));
@@ -312,6 +314,92 @@ function sendQueryValueNgsi2(entityName, attributes, typeInformation, token, cal
     );
 }
 
+/**
+ * Remove id, type and any hidden attrs after processing
+ *
+ * @param {Object} enities           Unprocessed entities
+ * @param {Object} typeInformation  Configuration information for the device.
+ */
+function removeHiddenAttrsFromMultiEntity(entities, typeInformation) {
+    var explicitAttrsList = [];
+    if (typeInformation.explicitAttrs) {
+        explicitAttrsList.push('type');
+        explicitAttrsList.push('id');
+        if (typeof typeInformation.explicitAttrs === 'boolean') {
+            if (typeInformation.timestamp) {
+                explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
+            }
+
+            if (typeInformation.active) {
+                typeInformation.active.forEach((attr) => {
+                    explicitAttrsList.push(attr.name);
+                });
+            }
+            if (typeInformation.staticAttributes) {
+                typeInformation.staticAttributes.forEach((attr) => {
+                    explicitAttrsList.push(attr.name);
+                });
+            }
+        } else if (typeof typeInformation.explicitAttrs === 'string') {
+            entities.forEach((entity) => {
+                const attsArray = pluginUtils.extractAttributesArrayFromNgsi2Entity(entity);
+                const ctx = jexlParser.extractContext(attsArray);
+                const res = jexlParser.applyExpression(typeInformation.explicitAttrs, ctx, typeInformation);
+                explicitAttrsList = explicitAttrsList.concat(res);
+            });
+        }
+    }
+    if (explicitAttrsList.length > 0) {
+        logger.debug(context, 'removeHiddenAttrsFromMultiEntity %s', explicitAttrsList);
+        entities.forEach((entity) => {
+            const hidden = _.difference(_.keys(entity), explicitAttrsList);
+            hidden.forEach((attr) => {
+                delete entity[attr];
+            });
+        });
+    }
+    return entities;
+}
+/**
+ * Remove id, type and any hidden attrs after processing
+ *
+ * @param {Object} result           An Unprocessed entity
+ * @param {Object} typeInformation  Configuration information for the device.
+ */
+function removeHiddenAttrs(result, typeInformation) {
+    delete result.id;
+    delete result.type;
+    var explicitAttrsList = [];
+    if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'boolean') {
+        if (typeInformation.timestamp) {
+            explicitAttrsList.push(constants.TIMESTAMP_ATTRIBUTE);
+        }
+        if (typeInformation.active) {
+            typeInformation.active.forEach((attr) => {
+                explicitAttrsList.push(attr.name);
+            });
+        }
+        if (typeInformation.staticAttributes) {
+            typeInformation.staticAttributes.forEach((attr) => {
+                explicitAttrsList.push(attr.name);
+            });
+        }
+    } else if (typeInformation.explicitAttrs && typeof typeInformation.explicitAttrs === 'string') {
+        const attsArray = pluginUtils.extractAttributesArrayFromNgsi2Entity(result);
+        const ctx = jexlParser.extractContext(attsArray);
+        const res = jexlParser.applyExpression(typeInformation.explicitAttrs, ctx, typeInformation);
+        explicitAttrsList = res;
+    }
+    if (explicitAttrsList.length > 0) {
+        logger.debug(context, 'removeHiddenAttrs %s', explicitAttrsList);
+        const hidden = _.difference(_.keys(result), explicitAttrsList);
+        hidden.forEach((attr) => {
+            delete result[attr];
+        });
+    }
+    return result;
+}
+
 /**
  * Makes an update in the Device's entity in the context broker, with the values given in the 'attributes' array. This
  * array should comply to the NGSIv2's attribute format.
@@ -326,7 +414,7 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
 
     let url = '/v2/entities/' + entityName + '/attrs';
 
-    if (typeInformation.type) {
+    if (typeInformation && typeInformation.type) {
         url += '?type=' + typeInformation.type;
     }
 
@@ -359,7 +447,6 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
     //overwritte if id or type missnamed atributes reach this point
     payload.id = entityName;
     payload.type = typeInformation.type;
-
     payload = NGSIUtils.castJsonNativeAttributes(payload);
     async.waterfall(
         [
@@ -392,7 +479,7 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
                         }
                         options.json = {
                             actionType: 'append',
-                            entities: result
+                            entities: removeHiddenAttrsFromMultiEntity(result, typeInformation)
                         };
                         if (config.getConfig().appendMode === true) {
                             options.json.actionType = 'append';
@@ -400,9 +487,7 @@ function sendUpdateValueNgsi2(entityName, attributes, typeInformation, token, ca
                             options.json.actionType = 'update';
                         }
                     } else {
-                        delete result.id;
-                        delete result.type;
-                        options.json = result;
+                        options.json = removeHiddenAttrs(result, typeInformation);
                         logger.debug(context, 'typeInformation: %j', typeInformation);
                         if (
                             'timestamp' in typeInformation && typeInformation.timestamp !== undefined

package/lib/services/ngsi/ngsiService.js

@@ -132,9 +132,10 @@ function executeWithDeviceInformation(operationFunction) {
             attributes,
             deviceInformation
         );
-        config.getGroupRegistry().getType(type, function (error, deviceGroup) {
+        const currentType = type ? type : deviceInformation.type;
+        config.getGroupRegistry().getType(currentType, function (error, deviceGroup) {
             let typeInformation;
-            const configDeviceInfo = config.getConfig().types[type];
+            const configDeviceInfo = config.getConfig().types[currentType];
             if (error) {
                 logger.debug(context, 'error %j in get group device', error);
             }

package/lib/services/northBound/contextServer-NGSI-LD.js

@@ -40,6 +40,7 @@ const context = {
 const updateContextTemplateNgsiLD = require('../../templates/updateContextNgsiLD.json');
 const notificationTemplateNgsiLD = require('../../templates/notificationTemplateNgsiLD.json');
 const contextServerUtils = require('./contextServerUtils');
+const ngsiLD = require('../ngsi/entities-NGSI-LD');
 
 const updatePaths = ['/ngsi-ld/v1/entities/:entity/attrs/:attr'];
 const queryPaths = ['/ngsi-ld/v1/entities/:entity'];
@@ -250,10 +251,10 @@ function defaultQueryHandlerNgsiLD(id, type, service, subservice, attributes, ca
                     attributeType = lazyAttribute.type;
                 }
 
-                contextElement[attributes[i]] = {
+                contextElement[attributes[i]] = ngsiLD.convertAttrNGSILD({
                     type: attributeType,
                     value: ''
-                };
+                });
             }
 
             callback(null, contextElement);

package/lib/services/northBound/deviceProvisioningServer.js

@@ -34,6 +34,7 @@ const context = {
 };
 const apply = async.apply;
 let provisioningHandler;
+let updatingHandler;
 let removeDeviceHandler;
 let updateDeviceTemplate;
 let createDeviceTemplate;
@@ -53,6 +54,7 @@ const provisioningAPITranslation = {
     protocol: 'protocol',
     transport: 'transport',
     endpoint: 'endpoint',
+    polling: 'polling',
     attributes: 'active',
     commands: 'commands',
     lazy: 'lazy',
@@ -204,6 +206,7 @@ function toProvisioningAPIFormat(device) {
         timezone: device.timezone,
         timestamp: device.timestamp,
         endpoint: device.endpoint,
+        polling: device.polling,
         transport: device.transport,
         attributes: device.active ? device.active.map(attributeToProvisioningAPIFormat) : undefined,
         lazy: device.lazy ? device.lazy.map(attributeToProvisioningAPIFormat) : undefined,
@@ -317,6 +320,14 @@ function handleRemoveDevice(req, res, next) {
  * This middleware handles updates in the provisioning devices. The only attribute
  */
 function handleUpdateDevice(req, res, next) {
+    function applyUpdatingHandler(device, callback) {
+        if (updatingHandler) {
+            updatingHandler(device, callback);
+        } else {
+            callback(null, device);
+        }
+    }
+
     if (req.body.device_id) {
         next(new errors.BadRequest("Can't change the ID of a preprovisioned device"));
     } else {
@@ -338,12 +349,19 @@ function handleUpdateDevice(req, res, next) {
                     if (req.body.entity_name || req.body.entity_type) {
                         isTypeOrNameUpdated = true;
                     }
-                    deviceService.updateRegister(newDevice, isTypeOrNameUpdated, function handleDeviceUpdate(error) {
-                        if (error) {
-                            next(error);
-                        } else {
-                            res.status(204).json({});
-                        }
+                    async.waterfall([apply(applyUpdatingHandler, newDevice)], function handleUpdating(
+                        error,
+                        newDeviceUpdated
+                    ) {
+                        deviceService.updateRegister(newDeviceUpdated, isTypeOrNameUpdated, function handleDeviceUpdate(
+                            error
+                        ) {
+                            if (error) {
+                                next(error);
+                            } else {
+                                res.status(204).json({});
+                            }
+                        });
                     });
                 } else {
                     next(new errors.DeviceNotFound(req.params.deviceId));
@@ -392,6 +410,10 @@ function setProvisioningHandler(newHandler) {
     provisioningHandler = newHandler;
 }
 
+function setUpdatingHandler(newHandler) {
+    updatingHandler = newHandler;
+}
+
 function setRemoveDeviceHandler(newHandler) {
     removeDeviceHandler = newHandler;
 }
@@ -409,6 +431,7 @@ function clear(callback) {
 exports.setConfiguration = setConfiguration;
 exports.loadContextRoutes = intoTrans(context, loadContextRoutes);
 exports.setProvisioningHandler = intoTrans(context, setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = addDeviceProvisionMiddleware;
 exports.clear = clear;

package/lib/services/northBound/northboundServer.js

@@ -31,6 +31,7 @@ const domainUtils = require('../common/domain');
 const middlewares = require('../common/genericMiddleware');
 const intoTrans = domainUtils.intoTrans;
 const deviceProvisioning = require('./deviceProvisioningServer');
+const deviceUpdating = require('./deviceProvisioningServer');
 const groupProvisioning = require('./deviceGroupAdministrationServer');
 const logger = require('logops');
 const context = {
@@ -116,6 +117,7 @@ exports.setNotificationHandler = intoTrans(context, contextServer.setNotificatio
 exports.setConfigurationHandler = intoTrans(context, groupProvisioning.setConfigurationHandler);
 exports.setRemoveConfigurationHandler = intoTrans(context, groupProvisioning.setRemoveConfigurationHandler);
 exports.setProvisioningHandler = intoTrans(context, deviceProvisioning.setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, deviceUpdating.setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, deviceProvisioning.setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = deviceProvisioning.addDeviceProvisionMiddleware;
 exports.addConfigurationProvisionMiddleware = groupProvisioning.addConfigurationProvisionMiddleware;

package/lib/services/northBound/restUtils.js

@@ -35,7 +35,7 @@ const context = {
     op: 'IoTAgentNGSI.RestUtils'
 };
 const _ = require('underscore');
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const ngsiService = require('../ngsi/ngsiService');

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.18.0",
+  "version": "2.19.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",
@@ -36,7 +36,7 @@
     "lint:text": "textlint '*.md' 'doc/*.md'",
     "prettier": "prettier --config .prettierrc.json --write '**/**/**/**/*.js' '**/**/**/*.js' '**/**/*.js' '**/*.js' '*.js'",
     "prettier:text": "prettier 'README.md' 'doc/*.md' 'doc/**/*.md' --no-config --tab-width 4 --print-width 120 --write --prose-wrap always",
-    "test": "nyc --reporter=text mocha --recursive 'test/**/*.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
+    "test": "nyc --reporter=text mocha --recursive 'test/**/*.js' --reporter spec --timeout 8000 --ui bdd --exit --color true",
     "test:expression": "nyc --reporter=text mocha --recursive 'test/unit/expressions/*.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
     "test:multientity": "nyc --reporter=text mocha --recursive 'test/unit/ngsiv2/plugins/multientity-plugin_test.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
     "test:debug": "mocha --recursive 'test/**/*.js' --reporter spec --inspect-brk --timeout 30000 --ui bdd --exit",
@@ -50,16 +50,16 @@
     "body-parser": "~1.19.0",
     "command-shell-lib": "1.0.0",
     "express": "~4.16.4",
+    "got": "~11.8.2",
     "jexl": "2.3.0",
     "jison": "0.4.18",
-    "logops": "2.1.0",
+    "logops": "2.1.2",
     "moment": "~2.24.0",
     "moment-timezone": "~0.5.25",
     "mongodb": "3.6.8",
     "mongoose": "5.7.7",
     "mu2": "~0.5.20",
     "query-string": "6.5.0",
-    "request": "2.88.0",
     "revalidator": "~0.3.1",
     "underscore": "~1.12.1",
     "uuid": "~3.3.2"

package/test/tools/utils.js

@@ -22,6 +22,7 @@
  */
 
 const fs = require('fs');
+const request = require('../../lib/fiware-iotagent-lib').request;
 
 function readExampleFile(name, raw) {
     let text = null;
@@ -36,3 +37,4 @@ function readExampleFile(name, raw) {
 }
 
 exports.readExampleFile = readExampleFile;
+exports.request = request;