iotagent-node-lib 2.17.0 → 2.20.0

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('');
     }
 }

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

@@ -286,8 +286,10 @@ function update(device, callback) {
             data.active = device.active;
             data.internalId = device.internalId;
             data.staticAttributes = device.staticAttributes;
+            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/deviceService.js

@@ -54,14 +54,11 @@ function init() {
         case 'ld':
             deviceHandler = require('./devices-NGSI-LD');
             break;
-        case 'v2':
-            deviceHandler = require('./devices-NGSI-v2');
-            break;
         case 'mixed':
             deviceHandler = require('./devices-NGSI-mixed');
             break;
         default:
-            deviceHandler = require('./devices-NGSI-v1');
+            deviceHandler = require('./devices-NGSI-v2');
     }
 }
 
@@ -277,7 +274,7 @@ function registerDevice(deviceObj, callback) {
         }
 
         if (!deviceData.name) {
-            var conjunction;
+            let conjunction;
             if (configuration && configuration.defaultEntityNameConjunction !== undefined) {
                 conjunction = configuration.defaultEntityNameConjunction;
             } else {

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');
@@ -94,7 +94,7 @@ function createInitialEntityHandlerNgsi2(deviceData, newDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body);
+            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
 
             callback(errorObj);
         }
@@ -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 creating inital 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);
 
@@ -133,7 +129,7 @@ function updateEntityHandlerNgsi2(deviceData, updatedDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body);
+            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
 
             callback(errorObj);
         }

package/lib/services/devices/registrationUtils.js

@@ -31,7 +31,6 @@ const logger = require('logops');
 const _ = require('underscore');
 const intoTrans = require('../common/domain').intoTrans;
 const config = require('../../commonConfig');
-const ngsiUtils = require('./../ngsi/ngsiUtils');
 const context = {
     op: 'IoTAgentNGSI.Registration'
 };
@@ -40,45 +39,6 @@ const utils = require('../northBound/restUtils');
 
 const NGSI_LD_URN = 'urn:ngsi-ld:';
 
-/**
- * Generates a handler for the registration requests that checks all the possible errors derived from the registration.
- * The parameter information is needed in order to fulfill error information.
- *
- * @param {Boolen} unregister       Indicates whether this registration is an unregistration or register.
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- * @return {Function}              The generated handler.
- */
-function createRegistrationHandler(unregister, deviceData, callback) {
-    return function handleRegistrationResponse(error, response, body) {
-        if (error) {
-            logger.error(context, 'ORION-002: Connection error sending registrations to the Context Broker: %s', error);
-            callback(error);
-        } else if (response && body && response.statusCode === 200) {
-            const errorField = ngsiUtils.getErrorField(body);
-
-            if (errorField) {
-                logger.error(context, 'Registration error connecting to the Context Broker: %j', errorField);
-                callback(new errors.BadRequest(JSON.stringify(errorField)));
-            } else {
-                logger.debug(context, 'Registration success.');
-                callback(null, body);
-            }
-        } else {
-            let errorObj;
-
-            logger.error(context, 'ORION-003: Protocol error connecting to the Context Broker: %j', errorObj);
-
-            if (unregister) {
-                errorObj = new errors.UnregistrationError(deviceData.id, deviceData.type);
-            } else {
-                errorObj = new errors.RegistrationError(deviceData.id, deviceData.type);
-            }
-
-            callback(errorObj);
-        }
-    };
-}
-
 /**
  * Generates a handler for the registration requests that checks all the possible errors derived from the registration.
  * The parameter information is needed in order to fulfill error information.
@@ -161,93 +121,6 @@ function createRegistrationHandlerNgsi2(unregister, deviceData, callback) {
     };
 }
 
-/**
- * Sends a Context Provider registration or unregistration request to the Context Broker using NGSIv1.
- * As registrations cannot be removed, an unregistration consists of an update of the existent registration
- * to make reduce its duration to 1 second.
- *
- * The entity type, entity name and lazy attributes list are needed in order to send the registration:
- *
- * @param {Boolen} unregister       Indicates whether this registration is an unregistration or register.
- * @param {Object} deviceData       Object containing all the deviceData needed to send the registration.
- */
-function sendRegistrationsNgsi1(unregister, deviceData, callback) {
-    let cbHost = config.getConfig().contextBroker.url;
-    if (deviceData.cbHost && deviceData.cbHost.indexOf('://') !== -1) {
-        cbHost = deviceData.cbHost;
-    } else if (deviceData.cbHost && deviceData.cbHost.indexOf('://') === -1) {
-        cbHost = 'http://' + deviceData.cbHost;
-    }
-
-    const options = {
-        url: cbHost + '/NGSI9/registerContext',
-        method: 'POST',
-        json: {
-            contextRegistrations: [
-                {
-                    entities: [
-                        {
-                            type: deviceData.type,
-                            isPattern: 'false',
-                            id: String(deviceData.name)
-                        }
-                    ],
-                    attributes: [],
-                    providingApplication: config.getConfig().providerUrl
-                }
-            ],
-            duration: unregister ? 'PT1S' : config.getConfig().deviceRegistrationDuration
-        },
-        headers: {
-            'fiware-service': deviceData.service,
-            'fiware-servicepath': deviceData.subservice
-        }
-    };
-
-    function formatAttributes(originalVector) {
-        const attributeList = [];
-
-        if (originalVector && originalVector.length) {
-            for (let i = 0; i < originalVector.length; i++) {
-                attributeList.push({
-                    name: originalVector[i].name,
-                    type: originalVector[i].type
-                });
-            }
-        }
-
-        return attributeList;
-    }
-
-    function mergeWithSameName(old, current) {
-        const keys = _.pluck(old, 'name');
-
-        if (keys.indexOf(current.name) < 0) {
-            old.push(current);
-        }
-
-        return old;
-    }
-
-    if (deviceData.registrationId) {
-        options.json.registrationId = deviceData.registrationId;
-    }
-
-    options.json.contextRegistrations[0].attributes = options.json.contextRegistrations[0].attributes
-        .concat(formatAttributes(deviceData.lazy), formatAttributes(deviceData.commands))
-        .reduce(mergeWithSameName, []);
-
-    if (options.json.contextRegistrations[0].attributes.length === 0) {
-        logger.debug(context, 'No Context Provider registrations found for unregister');
-        callback(null, deviceData);
-    } else {
-        logger.debug(context, 'Sending v1 device registrations to Context Broker at [%s]', options.url);
-        logger.debug(context, 'Using the following request:\n\n%s\n\n', JSON.stringify(options, null, 4));
-
-        utils.executeWithSecurity(options, deviceData, createRegistrationHandler(unregister, deviceData, callback));
-    }
-}
-
 /**
  * Sends a Context Provider unregistration request to the Context Broker using NGSIv2.
  *
@@ -263,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
@@ -304,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,
@@ -469,7 +340,6 @@ function sendRegistrationsNgsiLD(unregister, deviceData, callback) {
         logger.debug(context, 'Amending id to a valid URN: %s', id);
     }
 
-
     const options = {
         url: cbHost + '/ngsi-ld/v1/csourceRegistrations/',
         method: 'POST',
@@ -514,11 +384,9 @@ function sendRegistrations(unregister, deviceData, callback) {
         case 'ld':
             sendRegistrationsNgsiLD(unregister, deviceData, callback);
             break;
-        case 'v2':
+        default:
             sendRegistrationsNgsi2(unregister, deviceData, callback);
             break;
-        default:
-            sendRegistrationsNgsi1(unregister, deviceData, callback);
     }
 }
 
@@ -540,5 +408,4 @@ function processContextRegistration(deviceData, body, callback) {
 }
 
 exports.sendRegistrations = intoTrans(context, sendRegistrations);
-exports.createRegistrationHandler = intoTrans(context, createRegistrationHandler);
 exports.processContextRegistration = processContextRegistration;