Merge remote-tracking branch 'origin/master'

Author: walterwootz

LICENSE

@@ -328,10 +328,9 @@ function prepareInputArguments(attribute) {
     const inputs = [];
     let parsedValue;
     try {
-        parsedValue = JSON.parse(attribute.value);
-        if (Array.isArray(parsedValue)) {
+        if (Array.isArray(attribute.value)) {
             config.getLogger().info(context, 'Found an Array as command input');
-            for (const singleValue of parsedValue) {
+            for (const singleValue of attribute.value) {
                 inputs.push(singleValue);
             }
         } else {
@@ -392,7 +391,7 @@ async function executeCommand(apiKey, device, attribute, serialized, contentType
         return {
             attributeName: attribute.name,
             statusCode: thisCommand.statusCode.value,
-            resultValue: thisCommand.outputArguments[0].value[0]
+            resultValue: thisCommand.outputArguments[0].dataType < 12 ? thisCommand.outputArguments[0].value : thisCommand.outputArguments[0].value[0]
         };
     } else {
         config.getLogger().fatal(context, 'COMMAND-001: Error during command execution: commandResults.length is null');

lib/bindings/OPCUABinding.js

@@ -100,7 +100,11 @@ function queryHandler(id, type, service, subservice, attributes, callback) {
                     const lazyAttributes = filterLazy(device, attributes);
                     const funcList = lazyAttributes.map(generateQueryExecution.bind(null, apiKey, device)).reduce(concat, []);
                     async.series(funcList, function (err, results) {
-                        callback(err, results[0]);
+                        var json_object = {};
+                        results.forEach(function (result) {
+                            json_object = { ...json_object, ...result };
+                        });
+                        callback(err, json_object);
                     });
                 }
             });

lib/handlers/queryHandler.js

@@ -62,11 +62,11 @@ async function objectFolder(data, configJson, crawler, configJS) {
         var contextSubscription = {};
 
         if (!ignoreNodeId) {
-            if (!browseSubLev.hasOwnProperty('dataValue') && !browseSubLev.hasOwnProperty('hasComponent')) {
-                //console.log("Method " + browseSubLev.browseName)
+            if (!browseSubLev.hasOwnProperty('dataValue') && !browseSubLev.hasOwnProperty('hasComponent') && !browseSubLev.hasOwnProperty('organizes') && !browseSubLev.hasOwnProperty('hasTypeDefinition')) {
                 const forbiddenCharacters = [...config.getConfig().iota.extendedForbiddenCharacters, ...constants.FORBIDDEN_NGSI_CHARS];
                 config.getLogger().info(logContext, 'Using forbidden characters set: ' + JSON.stringify(forbiddenCharacters));
                 var ocb_id = [...(name + browseSubLev.browseName)].map((char) => (forbiddenCharacters.includes(char) ? '' : char)).join('');
+
                 command = {
                     name: ocb_id,
                     type: 'command'

lib/mappingTool/objectFolder.js

@@ -200,7 +200,7 @@ describe('OPCUABinding handling', () => {
                 const device = mockDevice;
                 const attribute = {
                     name: 'Accelerate',
-                    value: '10'
+                    value: 10
                 };
                 opcuaBinding.executeCommand(apiKey, device, attribute);
                 done();
@@ -210,7 +210,7 @@ describe('OPCUABinding handling', () => {
                 const device = mockDevice;
                 const attribute = {
                     name: 'Accelerate',
-                    value: '[10,10]'
+                    value: [10, 10]
                 };
                 opcuaBinding.executeCommand(apiKey, device, attribute);
                 done();