iobroker.iot 3.4.4 → 3.5.0

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "iot",
-    "version": "3.4.4",
+    "version": "3.5.0",
     "news": {
+      "3.5.0": {
+        "en": "added notification manager support (notifications will be sent as push notifications to the Visu App)",
+        "de": "unterstützung von Benachrichtigungsmanagern (Anmerkungen werden als Push-Benachrichtigungen an die Visu App gesendet)",
+        "ru": "добавлена поддержка менеджера уведомлений (уведомления будут отправляться в виде push-уведомлений в приложение Visu)",
+        "pt": "suporte adicional do gerenciador de notificações (as notificações serão enviadas como notificações push para o Visu App)",
+        "nl": "toegevoegde notificatiemanager ondersteuning (meldingen worden verzonden als push notificaties naar de Visu App)",
+        "fr": "support du gestionnaire de notification ajouté (les notifications seront envoyées sous forme de notifications poussées à l'application Visu)",
+        "it": "supporto del gestore di notifiche aggiunto (le notifiche verranno inviate come notifiche push all'App Visu)",
+        "es": "apoyo añadido al administrador de notificaciones (las notificaciones se enviarán como notificaciones push a la aplicación Visu)",
+        "pl": "dodane wsparcie menedżera powiadomień (powiadomienia będą wysyłane jako powiadomienia do aplikacji Visu)",
+        "uk": "додана підтримка менеджера повідомлень (повідомлення буде відправлено як поштові повідомлення до додатку Visu)",
+        "zh-cn": "新增通知管理器支持( 通知将作为推送通知发送给 Visu App)"
+      },
+      "3.4.5": {
+        "en": "Checked the max length of discovered devices for Alexa",
+        "de": "Überprüfte die maximale Länge der entdeckten Geräte für Alexa",
+        "ru": "Проверка максимальной длины обнаруженных устройств для Alexa",
+        "pt": "Verificado o comprimento máximo de dispositivos descobertos para Alexa",
+        "nl": "De maximale lengte van ontdekte apparaten voor Alexa gecontroleerd",
+        "fr": "Vérification de la longueur maximale des appareils découverts pour Alexa",
+        "it": "Controllata la lunghezza massima di dispositivi scoperti per Alexa",
+        "es": "Compruebe la longitud máxima de los dispositivos descubiertos para Alexa",
+        "pl": "Sprawdziliśmy maksymalną długość odkrytych urządzeń dla Alexa",
+        "uk": "Перевірити максимальну довжину відкритих пристроїв для Alexa",
+        "zh-cn": "为 Alexa 检查了已发现设备的最大长度"
+      },
       "3.4.4": {
         "en": "Corrected the name editing of the devices for Alexa 3",
         "de": "Korrektur der Namensbearbeitung der Geräte für Alexa 3",
@@ -67,32 +93,6 @@
         "pl": "Popraw błąd przy ponownym połączeniu\nprzygotowany adapter do nowego jOBrokera Stan aplikacji Visu",
         "uk": "Виправлення помилки на відключенні\nготовий адаптер для нового ioBroker Вису застосунки",
         "zh-cn": "重新连接时修正错误\n为新 ioBroker 准备适配器 Visu 应用程序状态"
-      },
-      "3.2.2": {
-        "en": "remove some warnings which should only be debug log",
-        "de": "einige warnungen entfernen, die nur debug log sein sollten",
-        "ru": "удалить некоторые предупреждения, которые должны быть только отладочным журналом",
-        "pt": "remover alguns avisos que só devem ser debug log",
-        "nl": "sommige waarschuwingen verwijderen die alleen debuglog mogen zijn",
-        "fr": "supprimer quelques avertissements qui ne devraient être que debug log",
-        "it": "rimuovere alcuni avvisi che dovrebbero essere solo debug log",
-        "es": "eliminar algunas advertencias que sólo deben ser debug log",
-        "pl": "usunąć niektóre ostrzeżenia, które powinny być tylko logi debugowania",
-        "uk": "видалення деяких попереджень, які повинні бути вилучені",
-        "zh-cn": "删除一些只应该为调试日志的警告"
-      },
-      "3.2.1": {
-        "en": "fixed issue that only valid JSON could be sent to app via message state",
-        "de": "festes Problem, dass nur gültig JSON per Nachrichtenzustand an die App gesendet werden konnte",
-        "ru": "фиксированный вопрос, который может быть отправлен только действительным JSON через состояние сообщения",
-        "pt": "problema fixo que só JSON válido poderia ser enviado para aplicativo via estado de mensagem",
-        "nl": "vast probleem dat alleen geldige JSON via berichtstatus naar de app kan worden verzonden",
-        "fr": "problème corrigé que seul JSON valide pourrait être envoyé à l'application via l'état du message",
-        "it": "problema fisso che solo valido JSON potrebbe essere inviato all'app tramite lo stato del messaggio",
-        "es": "emisión fija que sólo válida JSON podría ser enviado a la aplicación a través del estado del mensaje",
-        "pl": "stałe wydanie, że tylko poprawny JSON może być wysłany do aplikacji przez stan wiadomości",
-        "uk": "виправлено проблему, що тільки дійсний JSON може бути відправлений на додаток через стан повідомлень",
-        "zh-cn": "只能通过消息状态发送到应用程序的 JSON 的固定问题"
       }
     },
     "titleLang": {
@@ -142,6 +142,10 @@
     "extIcon": "https://raw.githubusercontent.com/ioBroker/ioBroker.iot/master/admin/iot.png",
     "type": "communication",
     "messagebox": true,
+    "supportedMessages": {
+      "custom": true,
+      "notifications": true
+    },
     "stopBeforeUpdate": true,
     "materialize": true,
     "logTransporter": true,

package/lib/alexaSmartHomeV2.js

@@ -410,13 +410,13 @@ function AlexaSH2(adapter) {
                     } else {
                         // convert a single device into a group, because at least two devices found with the same name
                         groups[friendlyNames[n]] = {
-                            applianceId: friendlyNames[n].replace(/[^a-zA-Zа-яА-Я0-9_=#;:?@&-]+/g, '_'),
+                            applianceId: friendlyNames[n].replace(/[^a-zA-Zа-яА-Я0-9_=#;:?@&-]+/g, '_').substring(0, 128),
                             applianceTypes: JSON.parse(JSON.stringify(names[friendlyNames[n]].applianceTypes)),
                             manufacturerName: 'ioBroker group',
                             modelName: (name || words['No name'][lang]).substring(0, 128),
                             version: '1',
-                            friendlyName: friendlyNames[n],
-                            friendlyDescription: `${words['Group'][lang]} ${friendlyNames[n]}`,
+                            friendlyName: friendlyNames[n].substring(0, 128),
+                            friendlyDescription: `${words['Group'][lang]} ${friendlyNames[n]}`.substring(0, 128),
                             isReachable: true,
                             actions: JSON.parse(JSON.stringify(actions)),
                             additionalApplianceDetails: {
@@ -477,18 +477,23 @@ function AlexaSH2(adapter) {
                             }
                         }
 
+                        if (JSON.stringify(groups[friendlyNames[n]].additionalApplianceDetails).length > 5000) {
+                            adapter.log.warn(`[ALEXA] "${groups[friendlyNames[n]].friendlyName}" has too long additionalApplianceDetails`);
+                            return;
+                        }
+
                         result.push(groups[friendlyNames[n]]);
                         names[friendlyNames[n]].disabled = true;
                     }
                 } else {
                     const obj = {
-                        applianceId: friendlyNames[n].replace(/[^a-zA-Zа-яА-Я0-9_=#;:?@&-]+/g, '_'),
+                        applianceId: friendlyNames[n].replace(/[^a-zA-Zа-яА-Я0-9_=#;:?@&-]+/g, '_').substring(0, 128),
                         applianceTypes: [],
                         manufacturerName: 'ioBroker',
                         modelName: (name || words['No name'][lang]).substring(0, 128),
                         version: '1',
-                        friendlyName: friendlyNames[n],
-                        friendlyDescription: friendlyDescription,
+                        friendlyName: friendlyNames[n].substring(0, 128),
+                        friendlyDescription: friendlyDescription.substring(0, 128),
                         isReachable: true,
                         actions: JSON.parse(JSON.stringify(actions)),
                         additionalApplianceDetails: {
@@ -503,6 +508,11 @@ function AlexaSH2(adapter) {
                             func,
                         },
                     };
+                    if (JSON.stringify(obj.additionalApplianceDetails).length > 5000) {
+                        adapter.log.warn(`[ALEXA] "${id}" has too long additionalApplianceDetails`);
+                        return;
+                    }
+
                     names[friendlyNames[n]] = obj;
                     smartType && names[friendlyNames[n]].applianceTypes.push(smartType);
                     result.push(obj);
@@ -2544,7 +2554,7 @@ function AlexaSH2(adapter) {
             let names = {};
             enums = [];
 
-            if (_states && _states.rows) {
+            if (_states?.rows) {
                 for (let i = 0; i < _states.rows.length; i++) {
                     if (_states.rows[i].value) {
                         states[_states.rows[i].id] = _states.rows[i].value;
@@ -2552,18 +2562,14 @@ function AlexaSH2(adapter) {
 
                         if (adapter.config.noCommon) {
                             if (
-                                _states.rows[i].value.common &&
-                                _states.rows[i].value.common.custom &&
-                                _states.rows[i].value.common.custom[adapter.namespace] &&
-                                _states.rows[i].value.common.custom[adapter.namespace].smartName &&
+                                _states.rows[i].value.common?.custom?.[adapter.namespace]?.smartName &&
                                 _states.rows[i].value.common.custom[adapter.namespace].smartName !== 'ignore'
                             ) {
                                 alexaIds.push(_states.rows[i].id);
                             }
                         } else {
                             if (
-                                _states.rows[i].value.common &&
-                                _states.rows[i].value.common.smartName &&
+                                _states.rows[i].value.common?.smartName &&
                                 _states.rows[i].value.common.smartName !== 'ignore'
                             ) {
                                 alexaIds.push(_states.rows[i].id);
@@ -2578,7 +2584,7 @@ function AlexaSH2(adapter) {
                 let rooms = [];
                 let funcs = [];
                 let smartName;
-                if (doc && doc.rows) {
+                if (doc?.rows) {
                     for (let i = 0, l = doc.rows.length; i < l; i++) {
                         if (doc.rows[i].value) {
                             let _id = doc.rows[i].id;
@@ -2644,8 +2650,7 @@ function AlexaSH2(adapter) {
                         let room = '';
                         for (let r = 0; r < rooms.length; r++) {
                             if (
-                                !rooms[r].common ||
-                                !rooms[r].common.members ||
+                                !rooms[r].common?.members ||
                                 typeof rooms[r].common.members !== 'object' ||
                                 !rooms[r].common.members.length
                             ) {
@@ -2735,11 +2740,11 @@ function AlexaSH2(adapter) {
                     }
                     if (fnA > fnB) {
                         return 1;
-                    } else if (fnA < fnB) {
+                    }
+                    if (fnA < fnB) {
                         return -1;
-                    } else {
-                        return 0;
                     }
+                    return 0;
                 });
 
                 for (let k = result.length - 1; k >= 0; k--) {
@@ -2754,6 +2759,50 @@ function AlexaSH2(adapter) {
                     }
                 }
 
+                // Check that all applianceId are unique: https://developer.amazon.com/en-US/blogs/alexa/post/Tx480XF5QCA6IN/managing-device-discovery-for-your-alexa-smart-home-skil
+                const uniqueIds = [];
+                for (let i = result.length - 1; i >= 0; i--) {
+                    if (uniqueIds.includes(result[i].applianceId)) {
+                        adapter.log.error(`[ALEXA] Duplicate applianceId: ${result[i].applianceId}`);
+                        result.splice(i, 1);
+                        continue;
+                    }
+
+                    uniqueIds.push(result[i].applianceId);
+
+                    // check the maximum length of capabilities
+                    if (result[i].actions.length > 100) {
+                        adapter.log.error(`[ALEXA] Too many actions by "${result[i].applianceId}": ${result[i].actions.length}`);
+                        result.splice(i, 1);
+                    }
+                }
+
+                // Check the maximum number of devices
+                if (result.length > 300) {
+                    adapter.log.error(`[ALEXA] Too many devices: ${result.length}`);
+                    result.splice(300);
+                }
+
+                while (JSON.stringify(result).length > 255 * 1024) {
+                    // Find the biggest one
+                    let i = -1;
+                    let size = 0;
+                    for (let j = 0; j < result.length; j++) {
+                        const s = JSON.stringify(result[j]).length;
+                        if (s > size) {
+                            size = s;
+                            i = j;
+                        }
+                    }
+
+                    if (i === -1) {
+                        break;
+                    }
+                    adapter.log.warn(`[ALEXA] Too big response. Device "${result[i].applianceId}" will be removed`);
+                    // Check the maximum size of the response
+                    result.splice(i, 1);
+                }
+
                 callback(err, result, analyseAddedId);
             });
         });

package/lib/notifications.js

@@ -0,0 +1,37 @@
+/**
+ * Build up a mail object from the notification message
+ *
+ * @param message received message from notification manager
+ * @returns message to send to app
+ */
+function buildMessageFromNotification(message) {
+    const subject = message.category.name;
+    const { instances } = message.category;
+
+    const readableInstances = Object.entries(instances).map(
+        ([instance, entry]) => `${instance.substring('system.adapter.'.length)}: ${getNewestMessage(entry.messages)}`,
+    );
+
+    const text = `${message.category.description}
+${message.host}:
+${readableInstances.join('\n')}
+    `;
+
+    return { title: subject, message: text };
+}
+
+/**
+ * Extract the newest message out of a notification messages together with the localized date
+ *
+ * @param messages all messages in current notification
+ * @returns string
+ */
+function getNewestMessage(messages) {
+    const newestMessage = messages.sort((a, b) => (a.ts < b.ts ? 1 : -1))[0];
+
+    return `${new Date(newestMessage.ts).toLocaleString()} ${newestMessage.message}`;
+}
+
+module.exports = {
+    buildMessageFromNotification,
+};

package/main.js

@@ -11,6 +11,7 @@ const GoogleHome = require('./lib/googleHome');
 const YandexAlisa = require('./lib/alisa');
 const Remote = require('./lib/remote');
 const { handleGeofenceData, handleDevicesData, handleSendToAdapter, handleGetInstances } = require('./lib/visuApp.js');
+const { buildMessageFromNotification } = require('./lib/notifications');
 
 const packageJSON = JSON.parse(readFileSync(`${__dirname}/package.json`, 'utf8'));
 
@@ -27,11 +28,9 @@ let alexaCustom = null;
 let yandexAlisa = null;
 let remote = null;
 let device = null;
-let defaultHistory = null;
 let urlKey = '';
 
 let connected = false;
-let uuid = null;
 let secret;
 let adapter;
 let connectStarted;
@@ -312,7 +311,19 @@ function startAdapter(options) {
                             obj.callback && adapter.sendTo(obj.from, obj.command, result, obj.callback);
                         }
                         break;
-
+                    case 'sendNotification':
+                        try {
+                            const { message, title } = buildMessageFromNotification(obj.message);
+                            await sendMessageToApp(JSON.stringify({ message, title }));
+                            if (obj.callback) {
+                                adapter.sendTo(obj.from, 'sendNotification', { sent: true }, obj.callback);
+                            }
+                        } catch {
+                            if (obj.callback) {
+                                adapter.sendTo(obj.from, 'sendNotification', { sent: false }, obj.callback);
+                            }
+                        }
+                        break;
                     default:
                         adapter.log.warn(`Unknown command: ${obj.command}`);
                         break;
@@ -432,8 +443,8 @@ async function sendMessageToApp(message) {
 
     json.ttlSeconds = parseInt(json.ttlSeconds, 0) || undefined;
 
-    if (json.ttlSeconds && json.ttlSeconds > 3600 * 48) {
-        json.ttlSeconds = 3600 * 48;
+    if (json.ttlSeconds && json.ttlSeconds > 3_600 * 48) {
+        json.ttlSeconds = 3_600 * 48;
     }
 
     if (!json.message) {
@@ -467,7 +478,9 @@ async function controlState(id, data) {
             if (!obj || !obj.common) {
                 throw new Error(`Unknown ID: ${data.id}`);
             } else {
-                if (typeof data.val === 'string') data.val = data.val.replace(/^@ifttt\s?/, '');
+                if (typeof data.val === 'string') {
+                    data.val = data.val.replace(/^@ifttt\s?/, '');
+                }
                 if (obj.common.type === 'boolean') {
                     data.val =
                         data.val === true ||
@@ -573,7 +586,7 @@ function onDisconnect(event) {
             adapter.log.error(
                 `Two devices are trying to connect with the same iot account. This is not allowed. Stopping`,
             );
-            adapter.getForeignObjectAsync('system.adapter.' + adapter.namespace).then(obj => {
+            adapter.getForeignObjectAsync(`system.adapter.${adapter.namespace}`).then(obj => {
                 obj.common.enabled = false;
                 return adapter.setForeignObjectAsync(obj._id, obj);
             });
@@ -688,7 +701,7 @@ async function readCertificates() {
         throw new Error('Not exists');
     }
 
-    if (!certificate || !certificate.val || !privateKey || !privateKey.val) {
+    if (!certificate?.val || !privateKey?.val) {
         throw new Error('Not exists');
     } else {
         return {
@@ -746,10 +759,9 @@ async function fetchCertificates(login, pass, _forceUserCreation) {
             private: response.data.certificates.keyPair.PrivateKey,
             certificate: response.data.certificates.certificatePem,
         };
-    } else {
-        adapter.log.error(`Cannot fetch connection certificates: ${JSON.stringify(response.data)}`);
-        throw new Error(response.data);
     }
+    adapter.log.error(`Cannot fetch connection certificates: ${JSON.stringify(response.data)}`);
+    throw new Error(response.data);
 }
 
 function sendToAsync(instance, command, request) {
@@ -792,9 +804,8 @@ async function processMessage(type, request) {
                     return response;
                 })
                 .catch(err => adapter.log.error(`Error in processing of remote request: ${err.toString()}`));
-        } else {
-            adapter.log.error(`Received command, but remote already closed.`);
         }
+        adapter.log.error(`Received command, but remote already closed.`);
     } else if (type.startsWith('nightscout')) {
         if (adapter.config.nightscout) {
             let state = await adapter.getForeignStateAsync(
@@ -899,7 +910,6 @@ async function processMessage(type, request) {
             }
 
             try {
-                /** @type {{ command?: string; presence?: Record<string, boolean>, devices?: Record<string, any> }} */
                 const visuData = JSON.parse(request);
 
                 if (visuData.presence) {
@@ -951,10 +961,9 @@ async function processMessage(type, request) {
                         return { result: err };
                     }
                     return { result: 'Ok' };
-                } else {
-                    adapter.log.warn('Received service text2command, but instance is not defined');
-                    return { result: 'but instance is not defined' };
                 }
+                adapter.log.warn('Received service text2command, but instance is not defined');
+                return { result: 'but instance is not defined' };
             } else if (type.startsWith('simpleApi')) {
                 return { result: 'not implemented' };
             } else if (isCustom) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.iot",
-  "version": "3.4.4",
+  "version": "3.5.0",
   "description": "This adapter allows to communicate Amazon Alexa and Google Home with ioBroker.",
   "author": {
     "name": "bluefox",
@@ -23,25 +23,25 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "@iobroker/types": "^7.0.5",
     "aws-iot-device-sdk": "^2.2.15",
+    "axios": "^1.7.9",
     "iobroker.type-detector": "^3.0.5",
     "mime": "^3.0.0",
-    "axios": "^1.7.9",
-    "uuid": "^11.0.3"
+    "uuid": "^11.0.5"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@iobroker/build-tools": "^2.0.11",
+    "@iobroker/build-tools": "^2.0.13",
     "@iobroker/eslint-config": "^1.0.0",
-    "@iobroker/legacy-testing": "^2.0.1",
-    "@types/node": "^22.10.1",
+    "@iobroker/legacy-testing": "^2.0.2",
+    "@iobroker/types": "^7.0.6",
+    "@types/node": "^22.13.0",
     "chai": "^4.5.0",
     "colorette": "^2.0.20",
-    "mocha": "^11.0.1",
-    "puppeteer": "^23.10.1"
+    "mocha": "^11.1.0",
+    "puppeteer": "^23.11.1"
   },
   "bugs": {
     "url": "https://github.com/ioBroker/ioBroker.iot/issues"