From 5dae6a371f86f5e55351196e37444bad6d8043f7 Mon Sep 17 00:00:00 2001 From: Gordon Stein <7331488+gsteinLTU@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:40:51 -0500 Subject: [PATCH] Fix to function info --- src/procedures/iotscape/iotscape-devices.js | 1 - src/procedures/iotscape/iotscape-services.js | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/procedures/iotscape/iotscape-devices.js b/src/procedures/iotscape/iotscape-devices.js index 622faa5e..c60b4f0a 100644 --- a/src/procedures/iotscape/iotscape-devices.js +++ b/src/procedures/iotscape/iotscape-devices.js @@ -133,7 +133,6 @@ IoTScapeDevices.accepts = function (service, id, clientId, seqNum = -1) { state.clientCounts[clientId] = client; IoTScapeDevices._encryptionStates[service][id] = state; - logger.log(JSON.stringify(IoTScapeDevices._encryptionStates[service][id])); return true; }; diff --git a/src/procedures/iotscape/iotscape-services.js b/src/procedures/iotscape/iotscape-services.js index b955407b..cad63f00 100644 --- a/src/procedures/iotscape/iotscape-services.js +++ b/src/procedures/iotscape/iotscape-services.js @@ -185,7 +185,8 @@ IoTScapeServices.getFunctionInfo = function (service, func) { return IoTScapeServices._specialMethods[func]; } - return IoTScapeServices._serviceDefinitions[service].methods[func]; + let method = (IoTScapeServices._serviceDefinitions[service] ?? {methods: []}).methods.filter(m => m.name === func); + return method.length > 0 ? method[0] : undefined; }; IoTScapeServices._lastRequestID = 0; @@ -250,6 +251,13 @@ IoTScapeServices.call = async function (service, func, id, clientId, ...args) { !IoTScapeDevices.deviceExists(service, id) || !IoTScapeServices.functionExists(service, func) ) { + if (!IoTScapeDevices.deviceExists(service, id)) { + logger.log("Device does not exist"); + } + if (!IoTScapeServices.functionExists(service, func)) { + logger.log("Function does not exist"); + } + return false; }