iotagent-node-lib 4.2.0 → 4.4.0

package/lib/services/commands/commandRegistryMongoDB.js

@@ -39,7 +39,7 @@ function findCommand(service, subservice, deviceId, name, callback) {
         name
     };
 
-    logger.debug(context, 'Looking for command [%s] for device [%s]', name, deviceId);
+    logger.debug(context, 'Looking for command [%s] for device [%s] with [%j]', name, deviceId, queryObj);
 
     const query = Command.model.findOne(queryObj);
 
@@ -53,8 +53,14 @@ function findCommand(service, subservice, deviceId, name, callback) {
         } else if (data) {
             callback(null, data);
         } else {
-            logger.debug(context, 'Command for DeviceID [%j] with name [%j] not found', deviceId, name);
-            callback(new errors.CommandNotFound(name));
+            logger.debug(
+                context,
+                'Command for DeviceID [%j] with name [%j] not found with [%j]',
+                deviceId,
+                name,
+                queryObj
+            );
+            callback(new errors.CommandNotFound(name, queryObj));
         }
     });
 }
@@ -124,15 +130,15 @@ function listCommands(service, subservice, deviceId, callback) {
 
     const query = Command.model.find(condition).sort();
 
-    async.series([query.exec.bind(query), Command.model.countDocuments.bind(Command.model, condition)], function (
-        error,
-        results
-    ) {
-        callback(error, {
-            count: results[1],
-            commands: results[0].map(toObjectFn)
-        });
-    });
+    async.series(
+        [query.exec.bind(query), Command.model.countDocuments.bind(Command.model, condition)],
+        function (error, results) {
+            callback(error, {
+                count: results[1],
+                commands: results[0].map(toObjectFn)
+            });
+        }
+    );
 }
 
 function remove(service, subservice, deviceId, name, callback) {
@@ -159,9 +165,14 @@ function remove(service, subservice, deviceId, name, callback) {
 
                     callback(null, commandResult);
                 } else {
-                    logger.debug(context, 'Command [%s] not found for removal.', name);
-
-                    callback(new errors.CommandNotFound(name));
+                    const deviceInfo = {
+                        service,
+                        subservice,
+                        deviceId,
+                        name
+                    };
+                    logger.debug(context, 'Command [%s] not found for removal with %j', name, deviceInfo);
+                    callback(new errors.CommandNotFound(name, deviceInfo));
                 }
             });
         }

package/lib/services/devices/deviceRegistryMemory.js

@@ -54,7 +54,7 @@ function storeDevice(newDevice, callback) {
     }
 
     if (registeredDevices[newDevice.service][newDevice.id]) {
-        callback(new errors.DuplicateDeviceId(newDevice.id));
+        callback(new errors.DuplicateDeviceId(newDevice));
     } else {
         registeredDevices[newDevice.service][newDevice.id] = deepClone(newDevice);
         registeredDevices[newDevice.service][newDevice.id].creationDate = Date.now();

package/lib/services/devices/deviceRegistryMongoDB.js

@@ -56,6 +56,7 @@ const attributeList = [
     'timestamp',
     'explicitAttrs',
     'ngsiVersion',
+    'subscriptions',
     'payloadType'
 ];
 
@@ -101,7 +102,7 @@ function storeDevice(newDevice, callback) {
             if (error.code === 11000) {
                 logger.debug(context, 'Tried to insert a device with duplicate ID in the database: %s', error);
 
-                callback(new errors.DuplicateDeviceId(newDevice.id));
+                callback(new errors.DuplicateDeviceId(newDevice));
             } else {
                 logger.debug(context, 'Error storing device information: %s', error);
 
@@ -205,7 +206,7 @@ function findOneInMongoDB(queryParams, id, callback) {
         } else {
             logger.debug(context, 'Device [%s] not found.', id);
 
-            callback(new errors.DeviceNotFound(id));
+            callback(new errors.DeviceNotFound(id, queryParams));
         }
     });
 }
@@ -242,14 +243,7 @@ function getDeviceById(id, apikey, service, subservice, callback) {
 function getDevice(id, apikey, service, subservice, callback) {
     getDeviceById(id, apikey, service, subservice, function (error, data) {
         if (error) {
-            // Try without apikey: apikey will be added to device later
-            getDeviceById(id, null, service, subservice, function (error, data) {
-                if (error) {
-                    callback(error);
-                } else {
-                    callback(null, data);
-                }
-            });
+            callback(error);
         } else {
             callback(null, data);
         }
@@ -281,7 +275,7 @@ function getByNameAndType(name, type, service, servicepath, callback) {
         } else {
             logger.debug(context, 'Device [%s] not found.', name);
 
-            callback(new errors.DeviceNotFound(name));
+            callback(new errors.DeviceNotFound(name, optionsQuery));
         }
     });
 }
@@ -318,6 +312,7 @@ function update(device, callback) {
             data.explicitAttrs = device.explicitAttrs;
             data.ngsiVersion = device.ngsiVersion;
             data.timestamp = device.timestamp;
+            data.subscriptions = device.subscriptions;
             data.payloadType = device.payloadType;
 
             /* eslint-disable-next-line  new-cap */
@@ -371,7 +366,7 @@ function getDevicesByAttribute(name, value, service, subservice, callback) {
         } else {
             logger.debug(context, 'Device [%s] not found.', name);
 
-            callback(new errors.DeviceNotFound(name));
+            callback(new errors.DeviceNotFound(name, filter));
         }
     });
 }

package/lib/services/devices/deviceService.js

@@ -244,7 +244,7 @@ function registerDevice(deviceObj, callback) {
             /* eslint-disable-next-line no-unused-vars */
             function (error, device) {
                 if (!error) {
-                    innerCb(new errors.DuplicateDeviceId(deviceObj.id));
+                    innerCb(new errors.DuplicateDeviceId(deviceObj));
                 } else {
                     innerCb();
                 }
@@ -615,6 +615,7 @@ function findOrCreate(deviceId, apikey, group, callback) {
         } else if (error.name === 'DEVICE_NOT_FOUND') {
             const newDevice = {
                 id: deviceId,
+                apikey: apikey,
                 service: group.service,
                 subservice: group.subservice,
                 type: group.type
@@ -646,7 +647,7 @@ function findOrCreate(deviceId, apikey, group, callback) {
                     newDevice,
                     group
                 );
-                callback(new errors.DeviceNotFound(deviceId));
+                callback(new errors.DeviceNotFound(deviceId, newDevice));
             }
         } else {
             callback(error);
@@ -671,7 +672,7 @@ function retrieveDevice(deviceId, apiKey, callback) {
             } else {
                 logger.error(context, "Couldn't find device data for APIKey [%s] and DeviceId[%s]", deviceId, apiKey);
 
-                callback(new errors.DeviceNotFound(deviceId));
+                callback(new errors.DeviceNotFound(deviceId, { apikey: apiKey }));
             }
         });
     } else {

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

@@ -93,7 +93,7 @@ function updateEntityHandlerNgsiLD(deviceData, updatedDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body);
+            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, deviceData, body);
 
             callback(errorObj);
         }
@@ -184,7 +184,7 @@ function updateEntityNgsiLD(deviceData, updatedDevice, callback) {
  */
 function updateRegisterDeviceNgsiLD(deviceObj, entityInfoUpdated, callback) {
     if (!deviceObj.id || !deviceObj.type) {
-        callback(new errors.MissingAttributes('Id or device missing'));
+        callback(new errors.MissingAttributes('Id or device missing', deviceObj));
         return;
     }
 
@@ -216,7 +216,7 @@ function updateRegisterDeviceNgsiLD(deviceObj, entityInfoUpdated, callback) {
 
             callback(null, oldDevice);
         } else {
-            callback(new errors.DeviceNotFound(newDevice.id));
+            callback(new errors.DeviceNotFound(newDevice.id, newDevice));
         }
     }
 

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

@@ -89,7 +89,13 @@ function updateEntityHandlerNgsi2(deviceData, updatedDevice, callback) {
                 body
             );
 
-            const errorObj = new errors.EntityGenericError(deviceData.id, deviceData.type, body, response.statusCode);
+            const errorObj = new errors.EntityGenericError(
+                deviceData.id,
+                deviceData.type,
+                deviceData,
+                body,
+                response.statusCode
+            );
 
             callback(errorObj);
         }
@@ -204,7 +210,7 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
             // Format any GeoJSON attrs properly
             options.json[att] = NGSIv2.formatGeoAttrs(options.json[att]);
         } catch (error) {
-            return callback(new errors.BadGeocoordinates(JSON.stringify(options.json)));
+            return callback(new errors.BadGeocoordinates(JSON.stringify(options.json), deviceData));
         }
     }
 
@@ -243,7 +249,7 @@ function updateEntityNgsi2(deviceData, updatedDevice, callback) {
  */
 function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
     if (!deviceObj.id || !deviceObj.type) {
-        callback(new errors.MissingAttributes('Id or device missing'));
+        callback(new errors.MissingAttributes('Id or device missing', deviceObj));
         return;
     }
 
@@ -282,7 +288,7 @@ function updateRegisterDeviceNgsi2(deviceObj, entityInfoUpdated, callback) {
 
             callback(null, oldDevice);
         } else {
-            callback(new errors.DeviceNotFound(newDevice.id));
+            callback(new errors.DeviceNotFound(newDevice.id, newDevice));
         }
     }
 

package/lib/services/groups/groupRegistryMemory.js

@@ -50,7 +50,7 @@ function exists(group) {
 
 function createGroup(group, callback) {
     if (exists(group)) {
-        callback(new errors.DuplicateGroup(group.resource, group.apikey));
+        callback(new errors.DuplicateGroup(group));
     } else {
         const storeGroup = _.clone(group);
 

package/lib/services/groups/groupRegistryMongoDB.js

@@ -110,7 +110,7 @@ function createGroup(group, callback) {
                     group.apikey
                 );
 
-                callback(new errors.DuplicateGroup(group.resource, group.apikey));
+                callback(new errors.DuplicateGroup(group));
             } else {
                 logger.debug(context, 'Error storing device group information: %s', error);
 

package/lib/services/groups/groupService.js

@@ -48,7 +48,7 @@ function validateGroup(group, callback) {
         return function (error, foundGroup) {
             logger.debug(context, 'generateDuplicateHander error %j and foundGroup %j', error, foundGroup);
             if (!error || (foundGroup && foundGroup.count > 0)) {
-                innerCb(new errors.DuplicateGroup(group.resource, group.apikey));
+                innerCb(new errors.DuplicateGroup(group));
             } else {
                 innerCb();
             }
@@ -291,8 +291,14 @@ function getEffectiveApiKey(service, subservice, type, callback) {
             logger.debug(context, 'Using default API Key: %s', config.getConfig().defaultKey);
             callback(null, config.getConfig().defaultKey);
         } else {
-            logger.error(context, 'Could not find any API Key information for device.');
-            callback(new errors.GroupNotFound(service, subservice));
+            logger.error(
+                context,
+                'Could not find any APIKey information for device in service %s subservice %s and type %s',
+                service,
+                subservice,
+                type
+            );
+            callback(new errors.GroupNotFound(service, subservice, type));
         }
     }
 

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

@@ -381,9 +381,9 @@ function generateNGSILDOperationHandler(operationName, entityName, typeInformati
             }
 
             if (errorField !== undefined) {
-                callback(new errors.DeviceNotFound(entityName));
+                callback(new errors.DeviceNotFound(entityName, typeInformation));
             } else {
-                callback(new errors.EntityGenericError(entityName, typeInformation.type, body));
+                callback(new errors.EntityGenericError(entityName, typeInformation.type, typeInformation, body));
             }
         } else {
             logger.debug(context, 'Unknown error executing ' + operationName + ' operation');
@@ -391,7 +391,15 @@ function generateNGSILDOperationHandler(operationName, entityName, typeInformati
                 body = JSON.parse(body);
             }
 
-            callback(new errors.EntityGenericError(entityName, typeInformation.type, body, response.statusCode));
+            callback(
+                new errors.EntityGenericError(
+                    entityName,
+                    typeInformation.type,
+                    typeInformation,
+                    body,
+                    response.statusCode
+                )
+            );
         }
     };
 }
@@ -416,7 +424,7 @@ function sendQueryValueNgsiLD(entityName, attributes, typeInformation, token, ca
     options.method = 'GET';
 
     if (!typeInformation || !typeInformation.type) {
-        callback(new errors.TypeNotFound(null, entityName));
+        callback(new errors.TypeNotFound(null, entityName, typeInformation));
         return;
     }
 
@@ -529,7 +537,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
     }
 
     if (!typeInformation || !typeInformation.type) {
-        callback(new errors.TypeNotFound(null, entityName));
+        callback(new errors.TypeNotFound(null, entityName, typeInformation));
         return;
     }
     const idTypeSSSList = pluginUtils.getIdTypeServSubServiceFromDevice(typeInformation);
@@ -1015,7 +1023,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
                 } else if (!utils.IsValidTimestampedNgsi2(payload[n])) {
                     // legacy check needed?
                     logger.error(context, 'Invalid timestamp:%s', JSON.stringify(payload[0]));
-                    callback(new errors.BadTimestamp(payload, entityName));
+                    callback(new errors.BadTimestamp(payload, entityName, typeInformation));
                     return;
                 }
             }
@@ -1044,7 +1052,7 @@ function sendUpdateValueNgsiLD(entityName, attributes, typeInformation, token, c
             options.json = [formatAsNGSILD(options.json)];
         }
     } catch (error) {
-        return callback(new errors.BadGeocoordinates(JSON.stringify(payload)));
+        return callback(new errors.BadGeocoordinates(JSON.stringify(payload), typeInformation));
     }
 
     if (typeInformation.active) {

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

@@ -31,7 +31,6 @@ const request = require('../../request-shim');
 const alarms = require('../common/alarmManagement');
 const errors = require('../../errors');
 const pluginUtils = require('../../plugins/pluginUtils');
-const config = require('../../commonConfig');
 const constants = require('../../constants');
 const jexlParser = require('../../plugins/jexlParser');
 const expressionPlugin = require('../../plugins/expressionPlugin');
@@ -173,9 +172,9 @@ function generateNGSI2OperationHandler(operationName, entityName, typeInformatio
             }
 
             if (errorField !== undefined) {
-                callback(new errors.DeviceNotFound(entityName));
+                callback(new errors.DeviceNotFound(entityName, typeInformation));
             } else {
-                callback(new errors.EntityGenericError(entityName, typeInformation.type, body));
+                callback(new errors.EntityGenericError(entityName, typeInformation.type, typeInformation, body));
             }
         } else {
             logger.debug(context, 'Unknown error executing ' + operationName + ' operation');
@@ -183,7 +182,15 @@ function generateNGSI2OperationHandler(operationName, entityName, typeInformatio
                 body = JSON.parse(body);
             }
 
-            callback(new errors.EntityGenericError(entityName, typeInformation.type, body, response.statusCode));
+            callback(
+                new errors.EntityGenericError(
+                    entityName,
+                    typeInformation.type,
+                    typeInformation,
+                    body,
+                    response.statusCode
+                )
+            );
         }
     };
 }
@@ -225,7 +232,7 @@ function sendQueryValueNgsi2(entityName, attributes, typeInformation, token, cal
     options.method = 'GET';
 
     if (!typeInformation || !typeInformation.type) {
-        callback(new errors.TypeNotFound(null, entityName));
+        callback(new errors.TypeNotFound(null, entityName, typeInformation));
         return;
     }
 
@@ -270,7 +277,6 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
     let entities = {}; //{entityName:{entityType:[attrs]}}  //SubGoal Populate entoties data striucture
     let jexlctxt = {}; //will store the whole context (not just for JEXL)
     let payload = {}; //will store the final payload
-    let timestamp = { type: constants.TIMESTAMP_TYPE_NGSI2 }; //timestamp scafold-attr for insertions.
     let plainMeasures = null; //will contain measures POJO
     let idTypeSSSList = pluginUtils.getIdTypeServSubServiceFromDevice(typeInformation);
 
@@ -279,7 +285,7 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
 
     //Check mandatory information: type
     if (!typeInformation || !typeInformation.type) {
-        callback(new errors.TypeNotFound(null, entityName));
+        callback(new errors.TypeNotFound(null, entityName, typeInformation));
         return;
     }
     //Rename all measures with matches with id and type to measure_id and measure_type
@@ -301,42 +307,16 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
     jexlctxt = reduceAttrToPlainObject(idTypeSSSList, jexlctxt);
 
     //Managing timestamp (mustInsertTimeInstant flag to decide if we should insert Timestamp later on)
-    const mustInsertTimeInstant =
-        typeInformation.timestamp !== undefined
-            ? typeInformation.timestamp
-            : config.getConfig().timestamp !== undefined
-            ? config.getConfig().timestamp
-            : false;
-
-    if (mustInsertTimeInstant) {
-        //remove TimeInstant from measures
-        measures = measures.filter((item) => item.name !== constants.TIMESTAMP_ATTRIBUTE);
-
-        if (plainMeasures[constants.TIMESTAMP_ATTRIBUTE]) {
-            //if it comes from a measure
-            if (moment(plainMeasures[constants.TIMESTAMP_ATTRIBUTE], moment.ISO_8601, true).isValid()) {
-                timestamp.value = plainMeasures[constants.TIMESTAMP_ATTRIBUTE];
-            } else {
-                callback(new errors.BadTimestamp(plainMeasures[constants.TIMESTAMP_ATTRIBUTE], entityName));
-            }
-        } else if (!typeInformation.timezone) {
-            timestamp.value = new Date().toISOString();
-            jexlctxt[constants.TIMESTAMP_ATTRIBUTE] = timestamp.value;
-        } else {
-            timestamp.value = moment().tz(typeInformation.timezone).format('YYYY-MM-DD[T]HH:mm:ss.SSSZ');
-            jexlctxt[constants.TIMESTAMP_ATTRIBUTE] = timestamp.value;
-        }
-    }
+    const mustInsertTimeInstant = typeInformation.timestamp !== undefined ? typeInformation.timestamp : false;
 
     logger.debug(
         context,
-        'sendUpdateValueNgsi2 called with: entityName=%s,  measures=%j,  typeInformation=%j, initial jexlContext=%j, timestamp=%j with value=%j',
+        'sendUpdateValueNgsi2 called with: entityName=%s,  measures=%j,  typeInformation=%j, initial jexlContext=%j, timestamp=%j',
         entityName,
         plainMeasures,
         typeInformation,
         jexlctxt,
-        mustInsertTimeInstant,
-        timestamp.value
+        mustInsertTimeInstant
     );
 
     //Now we can calculate the EntityName of primary entity
@@ -471,14 +451,6 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
         currentAttr.hitted = hitted;
         currentAttr.value = valueExpression;
 
-        //add TimeInstant to attr metadata
-        if (mustInsertTimeInstant) {
-            if (!currentAttr.metadata) {
-                currentAttr.metadata = {};
-            }
-            currentAttr.metadata[constants.TIMESTAMP_ATTRIBUTE] = timestamp;
-        }
-
         //store de New Attributte in entity data structure
         if (hitted === true) {
             if (entities[attrEntityName] === undefined) {
@@ -493,6 +465,38 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
 
         //RE-Populate de JEXLcontext (except for null or NaN we preffer undefined)
         jexlctxt[currentAttr.name] = valueExpression;
+
+        // Expand metadata value expression
+        if (currentAttr.metadata) {
+            for (var metaKey in currentAttr.metadata) {
+                if (currentAttr.metadata[metaKey].expression && metaKey !== constants.TIMESTAMP_ATTRIBUTE) {
+                    let newAttrMeta = {};
+                    if (currentAttr.metadata[metaKey].type) {
+                        newAttrMeta['type'] = currentAttr.metadata[metaKey].type;
+                    }
+                    let metaValueExpression;
+                    try {
+                        metaValueExpression = jexlParser.applyExpression(
+                            currentAttr.metadata[metaKey].expression,
+                            jexlctxt,
+                            typeInformation
+                        );
+                        //we fallback to null if anything unexpecte happend
+                        if (
+                            metaValueExpression === null ||
+                            metaValueExpression === undefined ||
+                            Number.isNaN(metaValueExpression)
+                        ) {
+                            metaValueExpression = null;
+                        }
+                    } catch (e) {
+                        metaValueExpression = null;
+                    }
+                    newAttrMeta['value'] = metaValueExpression;
+                    currentAttr.metadata[metaKey] = newAttrMeta;
+                }
+            }
+        }
     }
 
     //now we can compute explicit (Bool or Array) with the complete JexlContext
@@ -519,16 +523,6 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
 
     //more mesures may be added to the attribute list (unnhandled/left mesaures) l
     if (explicit === false && Object.keys(measures).length > 0) {
-        //add Timestamp to measures if needed
-        if (mustInsertTimeInstant) {
-            for (let currentMeasure of measures) {
-                if (!currentMeasure.metadata) {
-                    currentMeasure.metadata = {};
-                }
-                currentMeasure.metadata[constants.TIMESTAMP_ATTRIBUTE] = timestamp;
-            }
-            //If just measures in the principal entity we missed the Timestamp.
-        }
         entities[entityName][typeInformation.type] = entities[entityName][typeInformation.type].concat(measures);
     }
 
@@ -539,11 +533,40 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
     payload.actionType = 'append';
 
     payload.entities = [];
+    const currentIsoDate = new Date().toISOString();
+    const currentMoment = moment(currentIsoDate);
     for (let ename in entities) {
         for (let etype in entities[ename]) {
             let e = {};
             e.id = String(ename);
             e.type = String(etype);
+            let timestamp = { type: constants.TIMESTAMP_TYPE_NGSI2 }; //timestamp scafold-attr for insertions.
+            let timestampAttrs = null;
+            if (mustInsertTimeInstant) {
+                // get timestamp for current entity
+
+                timestampAttrs = entities[ename][etype].filter((item) => item.name === constants.TIMESTAMP_ATTRIBUTE);
+                if (timestampAttrs && timestampAttrs.length > 0) {
+                    timestamp.value = timestampAttrs[0]['value'];
+                }
+
+                if (timestamp.value) {
+                    if (!moment(timestamp.value, moment.ISO_8601, true).isValid()) {
+                        callback(new errors.BadTimestamp(timestamp.value, entityName, typeInformation));
+                        return;
+                    }
+                } else {
+                    if (!typeInformation.timezone) {
+                        timestamp.value = currentIsoDate;
+                        jexlctxt[constants.TIMESTAMP_ATTRIBUTE] = timestamp.value;
+                    } else {
+                        timestamp.value = currentMoment
+                            .tz(typeInformation.timezone)
+                            .format('YYYY-MM-DD[T]HH:mm:ss.SSSZ');
+                        jexlctxt[constants.TIMESTAMP_ATTRIBUTE] = timestamp.value;
+                    }
+                }
+            }
             //extract attributes
             let isEmpty = true;
             for (let attr of entities[ename][etype]) {
@@ -560,6 +583,15 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
                                 ))))
                 ) {
                     isEmpty = false;
+                    if (mustInsertTimeInstant) {
+                        // Add TimeInstant to all attribute metadata of all entities
+                        if (attr.name !== constants.TIMESTAMP_ATTRIBUTE) {
+                            if (!attr.metadata) {
+                                attr.metadata = {};
+                            }
+                            attr.metadata[constants.TIMESTAMP_ATTRIBUTE] = timestamp;
+                        }
+                    }
                     e[attr.name] = { type: attr.type, value: attr.value, metadata: attr.metadata };
                 }
             }

package/lib/services/ngsi/ngsiService.js

@@ -144,9 +144,9 @@ function executeWithDeviceInformation(operationFunction) {
             // For preregistered devices, augment the existing deviceInformation with selected attributes.
             if (!callback) {
                 callback = deviceInformation;
-                typeInformation = deviceGroup || configDeviceInfo;
+                typeInformation = deviceGroup || { ...config.getConfigForTypeInformation(), ...configDeviceInfo };
             } else {
-                typeInformation = deviceInformation;
+                typeInformation = { ...config.getConfigForTypeInformation(), ...deviceInformation };
                 attributeList.forEach((key) => {
                     typeInformation[key] =
                         typeInformation[key] || (deviceGroup || {})[key] || (configDeviceInfo || {})[key];
@@ -236,7 +236,7 @@ function setCommandResult(
         if (commandInfo.length === 1) {
             exports.update(entityName, typeInformation.type, apikey, attributes, typeInformation, callback);
         } else {
-            callback(new errors.CommandNotFound(commandName));
+            callback(new errors.CommandNotFound(commandName, typeInformation));
         }
     });
 }

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

@@ -62,6 +62,7 @@ function createSubscriptionHandlerNgsiLD(device, triggers, store, callback) {
                 new errors.EntityGenericError(
                     device.name,
                     device.type,
+                    device,
                     {
                         details: body
                     },
@@ -183,6 +184,7 @@ function createUnsubscribeHandlerNgsiLD(device, id, callback) {
                 new errors.EntityGenericError(
                     device.name,
                     device.type,
+                    device,
                     {
                         details: body
                     },

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

@@ -64,6 +64,7 @@ function createSubscriptionHandlerNgsi2(device, triggers, store, callback) {
                 new errors.EntityGenericError(
                     device.name,
                     device.type,
+                    device,
                     {
                         details: body
                     },
@@ -183,6 +184,7 @@ function createUnsubscribeHandlerNgsi2(device, id, callback) {
                 new errors.EntityGenericError(
                     device.name,
                     device.type,
+                    device,
                     {
                         details: body
                     },