iobroker.iot 3.5.2 → 3.6.0

package/admin/rules/customRuleBlocks.js

@@ -1,2 +1,2 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-BwcOGyWI.js","./assets/ActionVisu__loadShare__react__loadShare__-Cg21Ef1U.js","./assets/_commonjsHelpers-Cpj98o6Y.js","./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js","./assets/ActionVisu__loadShare__react_mf_2_dom__loadShare__-B1zRWn0u.js","./assets/index-Do-nCdWy.js","./assets/index-CAAeiKCc.js"])))=>i.map(i=>d[i]);
-import{i as m,A as p}from"./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js";import s from"./assets/virtualExposes-BqVak7rX.js";import{_ as n}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await n(()=>import("./assets/index-BwcOGyWI.js"),__vite__mapDeps([0,1,2,3,4]),import.meta.url),react:async()=>await n(()=>import("./assets/index-Do-nCdWy.js").then(t=>t.i),__vite__mapDeps([5,2]),import.meta.url),"react-dom":async()=>await n(()=>import("./assets/index-CAAeiKCc.js").then(t=>t.i),__vite__mapDeps([6,2,1,3]),import.meta.url)},a={"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.6.18",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a.react.loaded=!0;const{react:e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["react-dom"].loaded=!0;const{"react-dom":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},f=[],u={},c="default",d="ActionVisu";async function k(e={},t=[]){const r=m.init({name:d,remotes:f,shared:a,plugins:[],shareStrategy:"version-first"});var o=u[c];if(o||(o=u[c]={from:d}),!(t.indexOf(o)>=0)){t.push(o),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(l){console.error(l)}return p.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./assets/index-BRdNnGcA.js","./assets/ActionVisu__loadShare__react__loadShare__-Cg21Ef1U.js","./assets/_commonjsHelpers-Cpj98o6Y.js","./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js","./assets/ActionVisu__loadShare__react_mf_2_dom__loadShare__-B1zRWn0u.js","./assets/index-Do-nCdWy.js","./assets/index-CAAeiKCc.js"])))=>i.map(i=>d[i]);
+import{i as m,A as p}from"./assets/ActionVisu__mf_v__runtimeInit__mf_v__-Cz053nO7.js";import s from"./assets/virtualExposes-BqVak7rX.js";import{_ as n}from"./assets/preload-helper-Dp1pzeXC.js";const i={"@iobroker/adapter-react-v5":async()=>await n(()=>import("./assets/index-BRdNnGcA.js"),__vite__mapDeps([0,1,2,3,4]),import.meta.url),react:async()=>await n(()=>import("./assets/index-Do-nCdWy.js").then(t=>t.i),__vite__mapDeps([5,2]),import.meta.url),"react-dom":async()=>await n(()=>import("./assets/index-CAAeiKCc.js").then(t=>t.i),__vite__mapDeps([6,2,1,3]),import.meta.url)},a={"@iobroker/adapter-react-v5":{name:"@iobroker/adapter-react-v5",version:"7.7.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["@iobroker/adapter-react-v5"].loaded=!0;const{"@iobroker/adapter-react-v5":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},react:{name:"react",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a.react.loaded=!0;const{react:e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}},"react-dom":{name:"react-dom",version:"18.3.1",scope:["default"],loaded:!1,from:"ActionVisu",async get(){a["react-dom"].loaded=!0;const{"react-dom":e}=i,r={...await e()};return Object.defineProperty(r,"__esModule",{value:!0,enumerable:!1}),function(){return r}},shareConfig:{singleton:!0,requiredVersion:"*"}}},f=[],u={},c="default",d="ActionVisu";async function k(e={},t=[]){const r=m.init({name:d,remotes:f,shared:a,plugins:[],shareStrategy:"version-first"});var o=u[c];if(o||(o=u[c]={from:d}),!(t.indexOf(o)>=0)){t.push(o),r.initShareScopeMap("default",e);try{await Promise.all(await r.initializeSharing("default",{strategy:"version-first",from:"build",initScope:t}))}catch(l){console.error(l)}return p.initResolve(r),r}}function y(e){if(!(e in s))throw new Error(`Module ${e} does not exist in container.`);return s[e]().then(t=>()=>t)}export{y as get,k as init};

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "iot",
-    "version": "3.5.2",
+    "version": "3.6.0",
     "news": {
+      "3.6.0": {
+        "en": "new features for upcoming Visu App 1.4.0",
+        "de": "neue Features für die kommende Visu App 1.4.0",
+        "ru": "новые возможности для Visu App 1.4.0",
+        "pt": "novas funcionalidades para a próxima aplicação Visu 1.4.0",
+        "nl": "nieuwe functies voor Visu App 1.4.0",
+        "fr": "nouvelles fonctionnalités pour Visu App à venir 1.4.0",
+        "it": "nuove funzionalità per il prossimo Visu App 1.4.0",
+        "es": "nuevas características para la próxima aplicación Visu 1.4.0",
+        "pl": "nowe funkcje dla nadchodzącej aplikacji Visu 1.4.0",
+        "uk": "нові можливості для майбутнього додатка Visu 1.4.0",
+        "zh-cn": "即将到来的 Visu App 1.4.0 的新功能"
+      },
       "3.5.2": {
         "en": "Corrected error in back-end",
         "de": "Fehler im Back-End behoben",
@@ -80,19 +93,6 @@
         "pl": "poprawiła dodanie urządzeń dla Alexa\nzmiana kompilacji GUI w celu usunięcia zdeprecjonowanych pakietów",
         "uk": "виправлено додавання пристроїв для Alexa\nзмінена компіляція GUI для видалення депресованих пакетів",
         "zh-cn": "修正了为Alexa添加的设备\n更改 GUI 的编译以删除已贬值的软件包"
-      },
-      "3.4.2": {
-        "en": "Updated GUI packages and removed `gulp`\ndo not override custom `result` attribute on `sendToAdapter` response (Visu App - only relevant for developers)",
-        "de": "Aktualisierte GUI-Pakete und entfernt `gulp`\nnicht überschreiben benutzerdefinierte `result` Attribut auf `sendToAdapter` Antwort (Visu App - nur für Entwickler relevant)",
-        "ru": "Обновленные пакеты GUI и удаленные `gulp'\nне переопределять пользовательский атрибут `result' на ответе `sendToAdapter' (Visu App - только соответствующий для разработчиков)",
-        "pt": "Pacotes de GUI atualizados e removidos `gulp`\nnão substituir o atributo `result` personalizado na resposta `sendToAdapter` (Visu App - apenas relevante para desenvolvedores)",
-        "nl": "Bijgewerkt GUI-pakketten en verwijderde GUI-pakketten\ngeen attribuut overschrijven op aangepaste ",
-        "fr": "Mise à jour des paquets GUI et suppression de 'gulp'\nne pas surcharger l'attribut `result` personnalisé sur la réponse `sendToAdapter` (Visu App - uniquement pertinent pour les développeurs)",
-        "it": "Pacchetti GUI aggiornati e rimossi `gulp`\nnon sovrascrivere l'attributo `risultato` personalizzato sulla risposta `sendToAdapter` (Visu App - solo pertinente per gli sviluppatori)",
-        "es": "Paquetes GUI actualizados y eliminados\nno invalidar el atributo personalizado `result` en la respuesta `sendToAdapter` (Visu App - sólo relevante para desarrolladores)",
-        "pl": "Aktualizacja pakietów GUI i usunięcie 'gulp'\nnie nadpisywać atrybutu 'result' w odpowiedzi 'sendToAdapter' (aplikacja Visu - dotyczy tylko deweloperów)",
-        "uk": "Оновлено пакети GUI та видалено `gulp`\nне перевизначте користувацький атрибут `result` на відповідь `sendToAdapter` (Visu App - тільки відповідний розробникам)",
-        "zh-cn": "更新了 GUI 软件包并删除了“ gulp ”\n不在“ sendToAdapter” 响应上覆盖自定义的“ 结果”属性( Visu App - 仅与开发者相关)"
       }
     },
     "titleLang": {

package/lib/visuApp.js

@@ -2,6 +2,7 @@
 
 /**
  * Handles `sendToAdapter` command
+ *
  * @param {SendToAdapterCommand} visuData the data sent by the app
  * @param {ioBroker.Adapter} adapter the adapter instance
  * @returns {Promise<Record<string, any>>}
@@ -17,6 +18,7 @@ async function handleSendToAdapter(visuData, adapter) {
 
 /**
  * Handles `sendToAdapter` command
+ *
  * @param {GetInstancesCommand} visuData the data sent by the app
  * @param {ioBroker.Adapter} adapter the adapter instance
  * @returns {Promise<{ instances: string[] }>}
@@ -65,7 +67,7 @@ async function handleGeofenceData(visuData, adapter) {
             native: {},
         });
 
-        await adapter.setStateAsync(id, presenceStatus, true);
+        await adapter.setState(id, presenceStatus, true);
     }
 }
 
@@ -82,8 +84,8 @@ async function handleDevicesData(visuData, adapter) {
         await adapter.setObjectNotExistsAsync(deviceId, {
             type: 'folder',
             common: {
-                name: 'Geofence',
-                desc: 'Collection of all the Geofence-locations managed by ioBroker Visu App',
+                name: deviceName,
+                desc: 'All states related to this device',
             },
             native: {},
         });
@@ -108,6 +110,14 @@ async function handleDevicesData(visuData, adapter) {
 
 /** Map data name to state common */
 const commonMapping = {
+    actionResponse: {
+        name: 'Action response for a notification',
+        desc: 'User clicked on a notification and this is the response from the app',
+        type: 'string',
+        read: true,
+        write: false,
+        role: 'text',
+    },
     ssid: {
         name: 'Current connected WiFi',
         desc: 'Current connected WiFi network',

package/main.js

@@ -77,9 +77,13 @@ function startAdapter(options) {
 
             id && remote && remote.updateObject(id, obj);
         },
-        stateChange: (id, state) => {
+        stateChange: async (id, state) => {
             if (id === `${adapter.namespace}.app.message` && state && !state.ack) {
-                sendMessageToApp(state.val).catch(e => adapter.log.error(`Cannot send message to app: ${e}`));
+                try {
+                    await sendMessageToApp(state.val);
+                } catch (e) {
+                    adapter.log.error(`Cannot send message to app: ${e}`);
+                }
             }
 
             state && adapter.config.googleHome && googleHome && googleHome.updateState(id, state);
@@ -401,6 +405,12 @@ function sendDataToIFTTT(obj) {
     }
 }
 
+/**
+ * Send a message to the ioBroker Visu App by using the app-message endpoint (which then forwards it to the app via FCM)
+ *
+ * @param message either a json string or the message itself, if the message itself the other props will be taken from the adapter states
+ * @returns {Promise<void>}
+ */
 async function sendMessageToApp(message) {
     if (!message) {
         throw new Error('Empty message');
@@ -409,7 +419,7 @@ async function sendMessageToApp(message) {
     if (json.startsWith('{') && json.endsWith('}')) {
         try {
             json = JSON.parse(json);
-        } catch (e) {
+        } catch {
             adapter.log.warn(`Cannot parse message: ${json}`);
             json = null;
         }
@@ -456,7 +466,7 @@ async function sendMessageToApp(message) {
             'Content-Type': 'application/json',
             Authorization: `Bearer ${Buffer.from(`${adapter.config.login}:${adapter.config.pass}`).toString('base64')}`,
         },
-        timeout: 5000,
+        timeout: 5_000,
         validateStatus: status => status < 400,
     });
     await adapter.setState('app.message', message, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.iot",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "description": "This adapter allows to communicate Amazon Alexa and Google Home with ioBroker.",
   "author": {
     "name": "bluefox",