iotagent-node-lib 2.26.0 → 3.0.0

package/lib/fiware-iotagent-lib.js

@@ -358,12 +358,7 @@ exports.fillService = domainUtils.fillService;
 exports.middlewares = middlewares;
 
 exports.dataPlugins = {
-    compressTimestamp: require('./plugins/compressTimestamp'),
-    attributeAlias: require('./plugins/attributeAlias'),
-    addEvents: require('./plugins/addEvent'),
-    timestampProcess: require('./plugins/timestampProcessPlugin'),
     expressionTransformation: require('./plugins/expressionPlugin'),
-    multiEntity: require('./plugins/multiEntity'),
     bidirectionalData: require('./plugins/bidirectionalData'),
     utils: require('./plugins/pluginUtils')
 };

package/lib/plugins/compressTimestamp.js

@@ -23,9 +23,6 @@
  * Modified by: Daniel Calvo - ATOS Research & Innovation
  */
 
-const pluginUtils = require('./pluginUtils');
-const constants = require('../constants');
-
 /**
  * Takes a string representation of a date in ISO8601 basic calendar format and transforms it into
  * the extended format (with separators).
@@ -58,7 +55,5 @@ function fromExtendedToBasic(date) {
     return null;
 }
 
-exports.update = pluginUtils.createUpdateFilter(fromBasicToExtended, constants.TIMESTAMP_TYPE);
-exports.query = pluginUtils.createQueryFilter(fromExtendedToBasic, constants.TIMESTAMP_TYPE);
-exports.updateNgsi2 = pluginUtils.createUpdateFilter(fromBasicToExtended, constants.TIMESTAMP_TYPE_NGSI2);
-exports.queryNgsi2 = pluginUtils.createQueryFilter(fromExtendedToBasic, constants.TIMESTAMP_TYPE_NGSI2);
+exports.fromBasicToExtended = fromBasicToExtended;
+exports.fromExtendedToBasic = fromExtendedToBasic;

package/lib/plugins/expressionParser.js

@@ -175,44 +175,6 @@ function applyExpression(expression, context, typeInformation) {
     return expressionResult;
 }
 
-function expressionApplier(context, typeInformation) {
-    return function (attribute) {
-        /**
-         * Determines if a value is of type float
-         *
-         * @param      {String}   value       Value to be analyzed
-         * @return     {boolean}              True if float, False otherwise.
-         */
-        function isFloat(value) {
-            return !isNaN(value) && value.toString().indexOf('.') !== -1;
-        }
-
-        const newAttribute = {
-            name: attribute.name,
-            type: attribute.type
-        };
-
-        /*jshint camelcase: false */
-        if (attribute.object_id) {
-            newAttribute.object_id = attribute.object_id;
-        }
-
-        newAttribute.value = applyExpression(attribute.expression, context, typeInformation);
-
-        if (attribute.type === 'Number' && isFloat(newAttribute.value)) {
-            newAttribute.value = Number.parseFloat(newAttribute.value);
-        } else if (attribute.type === 'Number' && !Number.isNaN(Number.parseInt(newAttribute.value))) {
-            newAttribute.value = Number.parseInt(newAttribute.value);
-        } else if (attribute.type === 'Boolean') {
-            newAttribute.value = newAttribute.value === 'true' || newAttribute.value === '1';
-        } else if (attribute.type === 'None') {
-            newAttribute.value = null;
-        }
-
-        return newAttribute;
-    };
-}
-
 function contextAvailable(expression, context) {
     let error;
     try {
@@ -237,16 +199,7 @@ function contextAvailable(expression, context) {
     }
 }
 
-function processExpressionAttributes(typeInformation, list, context) {
-    return list
-        .filter(function (item) {
-            return item.expression && contextAvailable(item.expression, context);
-        })
-        .map(expressionApplier(context, typeInformation));
-}
-
 exports.parse = parse;
 exports.extractContext = extractContext;
-exports.processExpressionAttributes = processExpressionAttributes;
 exports.contextAvailable = contextAvailable;
 exports.applyExpression = applyExpression;

package/lib/plugins/expressionPlugin.js

@@ -24,7 +24,6 @@
  * Modified by: Federico M. Facca - Martel Innovate
  */
 
-const _ = require('underscore');
 const legacyParser = require('./expressionParser');
 const jexlParser = require('./jexlParser');
 const config = require('../commonConfig');
@@ -67,32 +66,12 @@ function parse(expression, context, type, typeInformation) {
     return jexlParser.parse(expression, context);
 }
 
-function mergeAttributes(attrList1, attrList2) {
-    const finalCollection = _.clone(attrList1);
-    const additionalItems = [];
-    let found;
-
-    for (let i = 0; i < attrList2.length; i++) {
-        found = false;
-
-        for (let j = 0; j < finalCollection.length; j++) {
-            if (finalCollection[j].name === attrList2[i].name && attrList2[i].object_id) {
-                if (finalCollection[j].object_id === attrList2[i].object_id) {
-                    finalCollection[j].value = attrList2[i].value;
-                    found = true;
-                }
-            } else if (finalCollection[j].name === attrList2[i].name && !attrList2[i].object_id) {
-                finalCollection[j].value = attrList2[i].value;
-                found = true;
-            }
-        }
-
-        if (!found) {
-            additionalItems.push(attrList2[i]);
-        }
+function contextAvailable(expression, context, typeInformation) {
+    let parser = jexlParser;
+    if (!checkJexl(typeInformation)) {
+        parser = legacyParser;
     }
-
-    return finalCollection.concat(additionalItems);
+    return parser.contextAvailable(expression, context);
 }
 
 function checkJexl(typeInformation) {
@@ -114,60 +93,9 @@ function checkJexl(typeInformation) {
     return false;
 }
 
-function update(entity, typeInformation, callback) {
-    function processEntityUpdateNgsi2(attributes) {
-        let parser = legacyParser;
-        if (checkJexl(typeInformation)) {
-            parser = jexlParser;
-        }
-        let expressionAttributes = [];
-        let attributesCtxt = [...attributes]; // just copy
-        if (typeInformation.static) {
-            typeInformation.static.forEach(function (att) {
-                attributesCtxt.push(att);
-            });
-        }
-        let idTypeSSSList = utils.getIdTypeServSubServiceFromDevice(typeInformation);
-        attributesCtxt = attributesCtxt.concat(idTypeSSSList);
-        const ctx = parser.extractContext(attributesCtxt);
-
-        if (typeInformation.active) {
-            expressionAttributes = parser.processExpressionAttributes(typeInformation, typeInformation.active, ctx);
-        }
-
-        attributes = mergeAttributes(attributes, expressionAttributes);
-        return attributes;
-    }
-
-    try {
-        logger.debug(context, 'expressionPlugin entity %j', entity);
-        const attsArray = utils.extractAttributesArrayFromNgsi2Entity(entity);
-        // Exclude processing all attr expressions when current attr is of type 'commandStatus' or 'commandResult'
-        const attsArrayFiltered = attsArray.filter((obj) => {
-            return ![constants.COMMAND_STATUS, constants.COMMAND_RESULT].includes(obj.type);
-        });
-        const attsArrayCmd = attsArray.filter((obj) => {
-            // just attr of type 'commandStatus' or 'commandResult'
-            return [constants.COMMAND_STATUS, constants.COMMAND_RESULT].includes(obj.type);
-        });
-        let attsArrayFinal = [];
-        if (attsArrayFiltered.length > 0) {
-            attsArrayFinal = processEntityUpdateNgsi2(attsArrayFiltered);
-        }
-        attsArrayFinal = attsArrayFinal.concat(attsArrayCmd);
-        entity = utils.createNgsi2Entity(entity.id, entity.type, attsArrayFinal, true);
-
-        callback(null, entity, typeInformation);
-    } catch (e) {
-        logger.info(context, 'expressionPlugin error %j procesing entity %j', e, entity);
-        callback(e);
-        return;
-    }
-}
-
 exports.parse = parse;
-exports.update = update;
 exports.setJEXLTransforms = setJEXLTransforms;
 exports.applyExpression = applyExpression;
 exports.extractContext = extractContext;
+exports.contextAvailable = contextAvailable;
 exports.checkJexl = checkJexl;

package/lib/plugins/jexlParser.js

@@ -104,33 +104,6 @@ function applyExpression(expression, context, typeInformation) {
     return expressionResult;
 }
 
-function expressionApplier(context, typeInformation) {
-    return function (attribute) {
-        /**
-         * Determines if a value is of type float
-         *
-         * @param      {String}   value       Value to be analyzed
-         * @return     {boolean}              True if float, False otherwise.
-         */
-        function isFloat(value) {
-            return !isNaN(value) && value.toString().indexOf('.') !== -1;
-        }
-
-        const newAttribute = {
-            name: attribute.name,
-            type: attribute.type
-        };
-
-        /*jshint camelcase: false */
-        if (attribute.object_id) {
-            newAttribute.object_id = attribute.object_id;
-        }
-
-        newAttribute.value = applyExpression(attribute.expression, context, typeInformation);
-        return newAttribute;
-    };
-}
-
 function isTransform(identifier) {
     return jexl.getTransform(identifier) !== (null || undefined);
 }
@@ -146,14 +119,6 @@ function contextAvailable(expression, context) {
     }
 }
 
-function processExpressionAttributes(typeInformation, list, context) {
-    return list
-        .filter(function (item) {
-            return item.expression && contextAvailable(item.expression, context);
-        })
-        .map(expressionApplier(context, typeInformation));
-}
-
 function checkTransformationMap(tranformsMap) {
     let error = null;
     let message = 'No trasformations were added to JEXL Parser';
@@ -198,7 +163,6 @@ function setTransforms(configMap) {
 }
 
 exports.extractContext = extractContext;
-exports.processExpressionAttributes = processExpressionAttributes;
 exports.contextAvailable = contextAvailable;
 exports.applyExpression = applyExpression;
 exports.parse = parse;

package/lib/plugins/pluginUtils.js

@@ -53,120 +53,6 @@ function extractAttributesArrayFromNgsi2Entity(entity) {
     return attsArray;
 }
 
-/**
- * Creates a NGSIv2 entity.
- *
- * @param      {String}  id         The identifier
- * @param      {String}  type       The type
- * @param      {Object}  attsArray  The atts array
- * @param      {Object}  withObjectId  The flag to keep object_id
- * @return     {Object}  A NGSIv2 entity
- */
-function createNgsi2Entity(id, type, attsArray, withObjectId) {
-    const entity = {};
-    for (let i = 0; i < attsArray.length; i++) {
-        /*jshint camelcase: false */
-        if (entity[attsArray[i].name] && withObjectId && attsArray[i].object_id) {
-            // Check if multiple measures with multientity attributes with same name(#635)
-            if (!entity[attsArray[i].name].multi) {
-                entity[attsArray[i].name].multi = [];
-            }
-            entity[attsArray[i].name].multi.push({
-                type: attsArray[i].type,
-                value: attsArray[i].value,
-                /*jshint camelcase: false */
-                object_id: attsArray[i].object_id,
-                metadata: attsArray[i].metadata
-            });
-        } else {
-            entity[attsArray[i].name] = {
-                type: attsArray[i].type,
-                value: attsArray[i].value,
-                metadata: attsArray[i].metadata
-            };
-            if (withObjectId && attsArray[i].object_id) {
-                entity[attsArray[i].name].object_id = attsArray[i].object_id;
-            }
-        }
-    }
-    entity.id = id;
-    entity.type = type;
-    return entity;
-}
-
-function createProcessAttribute(fn, attributeType) {
-    return function (attribute) {
-        if (attribute.type && attribute.type === attributeType) {
-            attribute.value = fn(attribute.value);
-        }
-
-        if (attribute.metadata) {
-            Object.keys(attribute.metadata).forEach(function (key) {
-                const entry = attribute.metadata[key];
-                if (entry.type === 'DateTime') {
-                    entry.value = fn(entry.value);
-                }
-            });
-        }
-        return attribute;
-    };
-}
-
-/**
- * Create a new filter for update requests. The filter will apply the given function to the value
- * of every attribute of the given type.
- *
- * @param {Function} fn             Function to apply. Should take one value and return one value.
- * @param {String} attributeType    Name of the type of attributes to modify
- * @return {query}                  Filter ready to be used in data filter plugins.
- */
-
-function createUpdateFilter(fn, attributeType) {
-    return function update(entity, typeInformation, callback) {
-        function processEntityUpdateNgsi2(entity) {
-            let attsArray = extractAttributesArrayFromNgsi2Entity(entity);
-            attsArray = attsArray.map(createProcessAttribute(fn, attributeType));
-            entity = createNgsi2Entity(entity.id, entity.type, attsArray, true);
-            return entity;
-        }
-
-        entity = processEntityUpdateNgsi2(entity);
-        callback(null, entity, typeInformation);
-    };
-}
-
-/**
- * Create a new filter for query responses. The filter will apply the given function to the value
- * of every attribute of the given type.
- *
- * @param {Function} fn             Function to apply. Should take one value and return one value.
- * @param {String} attributeType    Name of the type of attributes to modify
- * @return {query}                  Filter ready to be used in data filter plugins.
- */
-function createQueryFilter(fn, attributeType) {
-    return function query(entity, typeInformation, callback) {
-        function processEntityQueryNgsi2(entity) {
-            let attsArray = extractAttributesArrayFromNgsi2Entity(entity);
-            attsArray = attsArray.map(createProcessAttribute(fn, attributeType));
-            entity = createNgsi2Entity(entity.id, entity.type, attsArray);
-            return entity;
-        }
-
-        entity = processEntityQueryNgsi2(entity);
-        callback(null, entity, typeInformation);
-    };
-}
-
-/**
- * Creates an empty filter that does not change anything.
- *
- * @param {Object} entity               Data identifiying the requesting entity.
- * @param {Object} typeInformation      Information about the device corresponding to that entity.
- */
-function identityFilter(entity, typeInformation, callback) {
-    callback(null, entity, typeInformation);
-}
-
 /**
  * Creates an array of attributes from an device including id, type, service and subservice
  * @param       {Object}             device
@@ -183,10 +69,5 @@ function getIdTypeServSubServiceFromDevice(typeInformation) {
     return attrList;
 }
 
-exports.createProcessAttribute = createProcessAttribute;
-exports.createUpdateFilter = createUpdateFilter;
-exports.createQueryFilter = createQueryFilter;
-exports.identityFilter = identityFilter;
-exports.createNgsi2Entity = createNgsi2Entity;
 exports.extractAttributesArrayFromNgsi2Entity = extractAttributesArrayFromNgsi2Entity;
 exports.getIdTypeServSubServiceFromDevice = getIdTypeServSubServiceFromDevice;