propagate error on correct level

ioBroker · Aug 25, 2024 · 9c440e0 · 9c440e0
1 parent 2c17dd1
commit 9c440e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/visuApp.js b/lib/visuApp.js
@@ -4,13 +4,13 @@
  * Handles `sendToAdapter` command
  * @param {SendToAdapterCommand} visuData the data sent by the app
  * @param {ioBroker.Adapter} adapter the adapter instance
- * @returns {Promise<{ message: ioBroker.Message }>}
+ * @returns {Promise<Record<string, any>>}
  */
 async function handleSendToAdapter(visuData, adapter) {
     const { instance, message, data } = visuData;
 
     const resp = await adapter.sendToAsync(instance, message, data,{ timeout: 20_000 });
-    return { message: resp };
+    return { ...resp };
 }
 
 /** @typedef {{ command: 'getInstances', adapterName: string }} GetInstancesCommand */

diff --git a/main.js b/main.js
@@ -894,7 +894,12 @@ async function processMessage(type, request) {
 
                 if (visuData.command === 'sendToAdapter') {
                     const res = await handleSendToAdapter(visuData, adapter);
-                    return { result: 'Ok', ...res }
+
+                    if (!res.error) {
+                        res.result = 'Ok';
+                    }
+
+                    return res;
                 }
             } catch (e) {
                 adapter.log.error(`Could not handle data "${request}" by Visu App: ${e.message}`)