From e53c18180633400bb43b3f16a79af7aa4f944adf Mon Sep 17 00:00:00 2001
From: Bluefox <dogafox@gmail.com>
Date: Tue, 31 Dec 2024 12:14:53 +0000
Subject: [PATCH] Updated packages (#270)

* Updated packages

* Show warning if more than 15 devices will be added to bridge at the beginning: https://github.com/ioBroker/ioBroker.matter/issues/197

* Show message about 15 minutes for announcement: https://github.com/ioBroker/ioBroker.matter/issues/206

---------

Co-authored-by: Ingo Fischer <github@fischer-ka.de>
---
 package-lock.json                             |  16 +--
 package.json                                  |   2 +-
 src-admin/package-lock.json                   |  32 +++---
 src-admin/package.json                        |   6 +-
 src-admin/src/Tabs/Bridges.tsx                |  12 +-
 src-admin/src/Tabs/BridgesAndDevices.tsx      |   3 +
 src-admin/src/Tabs/Devices.tsx                |   5 +-
 src-admin/src/components/DeviceDialog.tsx     |  26 ++++-
 src-admin/src/i18n/de.json                    |   3 +-
 src-admin/src/i18n/en.json                    |   1 +
 src-admin/src/i18n/es.json                    |   1 +
 src-admin/src/i18n/fr.json                    |   1 +
 src-admin/src/i18n/it.json                    |   1 +
 src-admin/src/i18n/nl.json                    |   1 +
 src-admin/src/i18n/pl.json                    |   1 +
 src-admin/src/i18n/pt.json                    |   1 +
 src-admin/src/i18n/ru.json                    |   1 +
 src-admin/src/i18n/uk.json                    |   1 +
 src-admin/src/i18n/zh-cn.json                 |   1 +
 .../{serviceWorker.js => serviceWorker.tsx}   | 104 ++++++++++--------
 20 files changed, 130 insertions(+), 89 deletions(-)
 rename src-admin/src/{serviceWorker.js => serviceWorker.tsx} (76%)

diff --git a/package-lock.json b/package-lock.json
index 2271c6a0..71ac4fb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
         "chai": "^4.5.0",
         "colorette": "^2.0.20",
         "mocha": "^11.0.1",
-        "puppeteer": "^23.11.0",
+        "puppeteer": "^23.11.1",
         "typescript": "~5.7.2"
       },
       "engines": {
@@ -9550,9 +9550,9 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "23.11.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.11.0.tgz",
-      "integrity": "sha512-UaHfTIcg02bTahmZjrjrpU8efyjNeItrNvANu+DdnYMEcQ24X8LOkBWv2Z4bqDzkOzFymqJkADS0bdSDMUNi1A==",
+      "version": "23.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.11.1.tgz",
+      "integrity": "sha512-53uIX3KR5en8l7Vd8n5DUv90Ae9QDQsyIthaUFVzwV6yU750RjqRznEtNMBT20VthqAdemnJN+hxVdmMHKt7Zw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -9561,7 +9561,7 @@
         "chromium-bidi": "0.11.0",
         "cosmiconfig": "^9.0.0",
         "devtools-protocol": "0.0.1367902",
-        "puppeteer-core": "23.11.0",
+        "puppeteer-core": "23.11.1",
         "typed-query-selector": "^2.12.0"
       },
       "bin": {
@@ -9572,9 +9572,9 @@
       }
     },
     "node_modules/puppeteer-core": {
-      "version": "23.11.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.11.0.tgz",
-      "integrity": "sha512-fr5Xp8KeZGRiLrYmosAxPAObi1vmb09vmwak9lqS7KvKMbcN+mk+bDpnDKXPd7QN9b7b/mb9Fgp0A6+024XbVA==",
+      "version": "23.11.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.11.1.tgz",
+      "integrity": "sha512-3HZ2/7hdDKZvZQ7dhhITOUg4/wOrDRjyK2ZBllRB0ZCOi9u0cwq1ACHDjBB+nX+7+kltHjQvBRdeY7+W0T+7Gg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 5257bf83..1a9f3790 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "chai": "^4.5.0",
     "colorette": "^2.0.20",
     "mocha": "^11.0.1",
-    "puppeteer": "^23.11.0",
+    "puppeteer": "^23.11.1",
     "typescript": "~5.7.2"
   },
   "bugs": {
diff --git a/src-admin/package-lock.json b/src-admin/package-lock.json
index ea2cfe8d..506a478d 100644
--- a/src-admin/package-lock.json
+++ b/src-admin/package-lock.json
@@ -1,16 +1,16 @@
 {
     "name": "iobroker.matter",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "iobroker.matter",
-            "version": "0.3.2",
+            "version": "0.3.3",
             "dependencies": {
                 "@foxriver76/iob-component-lib": "^0.2.0",
-                "@iobroker/adapter-react-v5": "^7.4.8",
-                "@iobroker/dm-gui-components": "~7.4.8",
+                "@iobroker/adapter-react-v5": "^7.4.10",
+                "@iobroker/dm-gui-components": "~7.4.10",
                 "@iobroker/type-detector": "^4.1.1",
                 "@types/react-dom": "^18.3.5",
                 "@types/uuid": "^10.0.0",
@@ -988,9 +988,9 @@
             }
         },
         "node_modules/@iobroker/adapter-react-v5": {
-            "version": "7.4.8",
-            "resolved": "https://registry.npmjs.org/@iobroker/adapter-react-v5/-/adapter-react-v5-7.4.8.tgz",
-            "integrity": "sha512-FDB5Lnu3toMiOYAEslMm8AOrppsgjUrM1UGTV6GWmvkB1+5OefIHaypj4bD88CJPAMNbyLLOVfBwnsM/GvfHtA==",
+            "version": "7.4.10",
+            "resolved": "https://registry.npmjs.org/@iobroker/adapter-react-v5/-/adapter-react-v5-7.4.10.tgz",
+            "integrity": "sha512-HPoszLsnZDzrmvPkqG8yoGwIwDLL7RDU9g10EeDSSHpnhxWP3qNTKXFxFfjOoif8ZsebQ+dCiegdN0Gsf6Cq9w==",
             "license": "MIT",
             "dependencies": {
                 "@emotion/react": "^11.13.5",
@@ -1119,13 +1119,13 @@
             }
         },
         "node_modules/@iobroker/dm-gui-components": {
-            "version": "7.4.8",
-            "resolved": "https://registry.npmjs.org/@iobroker/dm-gui-components/-/dm-gui-components-7.4.8.tgz",
-            "integrity": "sha512-Kg777EARl+8VyM2FMuqTVw/Zi4KADk9DN6MIx4NGAVWgopKePe96nR7MzU1KIfN5KRf8+dryqskxvnLt+0ipzg==",
+            "version": "7.4.10",
+            "resolved": "https://registry.npmjs.org/@iobroker/dm-gui-components/-/dm-gui-components-7.4.10.tgz",
+            "integrity": "sha512-uBu/czepLH/vaLLXZPwy3wyHIHXnFEHy0ytWNDw6OErktEk28YdTtFYjVvyRIBzoQvN77KfLY0UlK/WJmeGbww==",
             "license": "MIT",
             "dependencies": {
-                "@iobroker/adapter-react-v5": "7.4.8",
-                "@iobroker/json-config": "7.4.8"
+                "@iobroker/adapter-react-v5": "7.4.10",
+                "@iobroker/json-config": "7.4.10"
             }
         },
         "node_modules/@iobroker/js-controller-common": {
@@ -1185,11 +1185,11 @@
             }
         },
         "node_modules/@iobroker/json-config": {
-            "version": "7.4.8",
-            "resolved": "https://registry.npmjs.org/@iobroker/json-config/-/json-config-7.4.8.tgz",
-            "integrity": "sha512-1uRvHr6qiA3ngbKrJFlfCF+wFMDGkBpnYzecwjhghFvpfKSTA/1gRW1qKgIfy4Oi4r9ZGe7YM20oXFlQG08haA==",
+            "version": "7.4.10",
+            "resolved": "https://registry.npmjs.org/@iobroker/json-config/-/json-config-7.4.10.tgz",
+            "integrity": "sha512-CJe6T/51LRehJJJTVlGxxTuU3Cr2NUCGu1vDeyjVgkCQZhv3kg3wXOQV5+C5E89E6liBriArTquoclEEh4GfJA==",
             "dependencies": {
-                "@iobroker/adapter-react-v5": "7.4.8",
+                "@iobroker/adapter-react-v5": "7.4.10",
                 "@mui/x-date-pickers": "^7.23.0",
                 "crypto-js": "^4.2.0",
                 "react-ace": "^13.0.0",
diff --git a/src-admin/package.json b/src-admin/package.json
index 49a364b1..68a6e50c 100644
--- a/src-admin/package.json
+++ b/src-admin/package.json
@@ -7,8 +7,8 @@
     },
     "dependencies": {
         "@foxriver76/iob-component-lib": "^0.2.0",
-        "@iobroker/adapter-react-v5": "^7.4.8",
-        "@iobroker/dm-gui-components": "~7.4.8",
+        "@iobroker/adapter-react-v5": "^7.4.10",
+        "@iobroker/dm-gui-components": "~7.4.10",
         "@iobroker/type-detector": "^4.1.1",
         "@types/react-dom": "^18.3.5",
         "@types/uuid": "^10.0.0",
@@ -51,4 +51,4 @@
             }
         ]
     ]
-}
\ No newline at end of file
+}
diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
index d78b76fa..f3661e6e 100644
--- a/src-admin/src/Tabs/Bridges.tsx
+++ b/src-admin/src/Tabs/Bridges.tsx
@@ -912,7 +912,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                     addDeviceDialog: null,
                                     addCustomDeviceDialog: {
                                         oid,
-                                        name,
+                                        name: name || '',
                                         deviceType: '',
                                         bridgeIndex: this.bridgeIndex as number,
                                         noComposed: false,
@@ -930,7 +930,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                 addDeviceDialog: null,
                                 addCustomDeviceDialog: {
                                     oid,
-                                    name,
+                                    name: name || '',
                                     deviceType,
                                     bridgeIndex: this.bridgeIndex as number,
                                     hasOnState: controls[0].devices[0].hasOnState,
@@ -945,6 +945,8 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
             );
         }
 
+        const nodeState = this.props.nodeStates[this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].uuid];
+
         return (
             <DeviceDialog
                 onClose={() => this.setState({ addDeviceDialog: null })}
@@ -954,11 +956,9 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                 }
                 devicesInBridge={this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].list.length}
                 checkAddedDevices={
-                    this.props.nodeStates[this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].uuid]
-                        ?.status !== 'waitingForCommissioning'
-                        ? 0
-                        : MAX_UN_COMMISSIONED_DEVICES
+                    nodeState && nodeState?.status !== 'waitingForCommissioning' ? 0 : MAX_UN_COMMISSIONED_DEVICES
                 }
+                themeType={this.props.themeType}
                 matter={this.props.matter}
                 socket={this.props.socket}
                 detectedDevices={this.props.detectedDevices}
diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
index 80cd0fde..cae57623 100644
--- a/src-admin/src/Tabs/BridgesAndDevices.tsx
+++ b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -677,6 +677,9 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
                         variant="standard"
                         sx={{ marginTop: 1 }}
                     />
+                    <div style={{ fontStyle: 'italic', fontSize: 14, width: '100%' }}>
+                        {I18n.t('Announcement will stop automatically after 15 minutes')}
+                    </div>
                 </DialogContent>
                 <DialogActions>
                     <Button
diff --git a/src-admin/src/Tabs/Devices.tsx b/src-admin/src/Tabs/Devices.tsx
index 6920b278..f8394649 100644
--- a/src-admin/src/Tabs/Devices.tsx
+++ b/src-admin/src/Tabs/Devices.tsx
@@ -871,7 +871,7 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                                     addDeviceDialog: null,
                                     addCustomDeviceDialog: {
                                         oid,
-                                        name,
+                                        name: name || '',
                                         deviceType: '',
                                         noComposed: false,
                                         vendorID: '0xFFF1',
@@ -890,7 +890,7 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                                 addDeviceDialog: null,
                                 addCustomDeviceDialog: {
                                     oid,
-                                    name,
+                                    name: name || '',
                                     deviceType,
                                     hasOnState: controls[0].devices[0].hasOnState,
                                     vendorID: '0xFFF1',
@@ -911,6 +911,7 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                 addDevices={(devices: DetectedDevice[]) => this.addDevices(devices, true)}
                 matter={this.props.matter}
                 socket={this.props.socket}
+                themeType={this.props.themeType}
                 detectedDevices={this.props.detectedDevices}
                 setDetectedDevices={detectedDevices => this.props.setDetectedDevices(detectedDevices)}
                 type="device"
diff --git a/src-admin/src/components/DeviceDialog.tsx b/src-admin/src/components/DeviceDialog.tsx
index 2f813ba9..a3a7b522 100644
--- a/src-admin/src/components/DeviceDialog.tsx
+++ b/src-admin/src/components/DeviceDialog.tsx
@@ -18,7 +18,14 @@ import {
 
 import { Add, Close, ExpandMore } from '@mui/icons-material';
 
-import { type AdminConnection, I18n, Icon, IconDeviceType, type IobTheme } from '@iobroker/adapter-react-v5';
+import {
+    type AdminConnection,
+    I18n,
+    Icon,
+    IconDeviceType,
+    type IobTheme,
+    type ThemeType,
+} from '@iobroker/adapter-react-v5';
 import { Types } from '@iobroker/type-detector';
 
 import { clone, detectDevices, getText } from '../Utils';
@@ -124,6 +131,7 @@ interface DeviceDialogProps {
     devicesInBridge?: number;
     /** If dialog should check the number of devices */
     checkAddedDevices?: number;
+    themeType: ThemeType;
 }
 
 interface DeviceDialogState {
@@ -458,7 +466,11 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
             devices.length &&
             (this.props.devicesInBridge || 0) + devices.length > this.props.checkAddedDevices
         ) {
-            showHint = <div style={{ color: '#FF0000', fontSize: 10 }}>{I18n.t('Warning about 15 devices')}</div>;
+            showHint = (
+                <div style={{ color: this.props.themeType === 'dark' ? '#ff5555' : '#980000', fontSize: 14 }}>
+                    {I18n.t('Warning about 15 devices')}
+                </div>
+            );
         }
 
         return (
@@ -612,15 +624,15 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                                                         <Checkbox
                                                             title={I18n.t('Select/Unselect all devices in room')}
                                                             indeterminate={
-                                                                counters[roomIndex] !== room.devices.length &&
+                                                                counters[roomIndex] !== lengths[roomIndex] &&
                                                                 !!counters[roomIndex]
                                                             }
-                                                            checked={counters[roomIndex] === room.devices.length}
+                                                            checked={counters[roomIndex] === lengths[roomIndex]}
                                                             onClick={e => {
                                                                 e.stopPropagation();
                                                                 e.preventDefault();
                                                                 const devicesChecked = clone(this.state.devicesChecked);
-                                                                if (counters[roomIndex] === room.devices.length) {
+                                                                if (counters[roomIndex] === lengths[roomIndex]) {
                                                                     room.devices.forEach(
                                                                         device => (devicesChecked[device._id] = false),
                                                                     );
@@ -629,7 +641,9 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                                                                         if (
                                                                             SUPPORTED_DEVICES.includes(
                                                                                 device.deviceType,
-                                                                            )
+                                                                            ) &&
+                                                                            (!this.state.ignoreUsedDevices ||
+                                                                                !this.state.usedDevices[device._id])
                                                                         ) {
                                                                             devicesChecked[device._id] = true;
                                                                         }
diff --git a/src-admin/src/i18n/de.json b/src-admin/src/i18n/de.json
index fa93f8be..6257aab4 100644
--- a/src-admin/src/i18n/de.json
+++ b/src-admin/src/i18n/de.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Alle Informationen dieses Geräts oder dieser Bridge werden gelöscht und Sie müssen die Verbindung (mit PIN oder QR-Code) erneut herstellen.",
     "All interfaces": "Alle Schnittstellen",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Der Controller und alle Geräte und Bridges werden auf die Werkseinstellungen zurückgesetzt. \nDadurch werden die Pairing- und aktuellen Werte für alle Geräte, Bridges und auch gepaarten Geräte im Controller gelöscht. Sie können dies nicht rückgängig machen.\nDie allgemeine Konfiguration des Controllers und die zugewiesenen ioBroker-Zustände für die Bridges und Geräte bleiben unverändert.",
+    "Announcement will stop automatically after 15 minutes": "Die Durchsage wird nach 15 Minuten automatisch beendet",
     "Apply": "Anwenden",
     "Are you sure?": "Bist du sicher?",
     "At least one bridge must be enabled": "Mindestens eine Bridge muss aktiviert sein",
@@ -113,7 +114,7 @@
     "Provide your Thread or WiFi information or both!": "Geben Sie Ihre Thread- oder WiFi-Informationen oder beides an!",
     "QR Code": "QR-Code",
     "QR Code to connect": "QR-Code zum Verbinden",
-    "Re-Announce": "Re-announce",
+    "Re-Announce": "Pairing neu starten",
     "Reconnect to backend": "Erneute Verbindung zum Backend herstellen",
     "Required": "Erforderlich",
     "Requirements: add via QR Code": "Voraussetzung: Das Matter-Gerät muss bereits mit einem anderen Matter-System (z. B. Google, Apple, Alexa, …) verbunden sein. Hier musst du den QR-Code-Pairing-Code eingeben oder den QR-Code scannen, der vom Matter-Ökosystem (z. B. Google Home) für dieses Matter-Gerät in der App bereitgestellt wird.",
diff --git a/src-admin/src/i18n/en.json b/src-admin/src/i18n/en.json
index 954bec0a..83abcf75 100644
--- a/src-admin/src/i18n/en.json
+++ b/src-admin/src/i18n/en.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.",
     "All interfaces": "All interfaces",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "The Controller and all devices and bridges will be rest to factory defaults. \nThis deletes the pairing and current values for all devices, bridges and also paired devices in the controller. You cannot undo it.\nThe general configuration of the controller, and the assigned ioBroker states for the bridges and devices will stay unchanged.",
+    "Announcement will stop automatically after 15 minutes": "Announcement will stop automatically after 15 minutes",
     "Apply": "Apply",
     "Are you sure?": "Are you sure?",
     "At least one bridge must be enabled": "At least one bridge must be enabled",
diff --git a/src-admin/src/i18n/es.json b/src-admin/src/i18n/es.json
index 3d8dad3a..b9758126 100644
--- a/src-admin/src/i18n/es.json
+++ b/src-admin/src/i18n/es.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Se eliminará toda la información de este dispositivo o puente y deberás volver a conectarte (con PIN o código QR) nuevamente.",
     "All interfaces": "Todas las interfaces",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "El controlador y todos los dispositivos y puentes volverán a los valores predeterminados de fábrica. \nEsto elimina el emparejamiento y los valores actuales de todos los dispositivos, puentes y también los dispositivos emparejados en el controlador. No puedes deshacerlo.\nLa configuración general del controlador y los estados de ioBroker asignados para los puentes y dispositivos permanecerán sin cambios.",
+    "Announcement will stop automatically after 15 minutes": "El anuncio se detendrá automáticamente después de 15 minutos.",
     "Apply": "Aplicar",
     "Are you sure?": "¿Está seguro?",
     "At least one bridge must be enabled": "Al menos un puente debe estar habilitado.",
diff --git a/src-admin/src/i18n/fr.json b/src-admin/src/i18n/fr.json
index f7004568..8aebc421 100644
--- a/src-admin/src/i18n/fr.json
+++ b/src-admin/src/i18n/fr.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Toutes les informations de cet appareil ou pont seront supprimées et vous devrez vous reconnecter (avec code PIN ou QR) à nouveau.",
     "All interfaces": "Toutes les interfaces",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Le contrôleur et tous les appareils et ponts seront restaurés aux paramètres d'usine par défaut. \nCela supprime les valeurs d'appariement et de courant pour tous les appareils, ponts ainsi que les appareils appairés dans le contrôleur. Vous ne pouvez pas l'annuler.\nLa configuration générale du contrôleur et les états ioBroker attribués aux ponts et aux appareils resteront inchangés.",
+    "Announcement will stop automatically after 15 minutes": "L'annonce s'arrêtera automatiquement après 15 minutes",
     "Apply": "Appliquer",
     "Are you sure?": "Es-tu sûr?",
     "At least one bridge must be enabled": "Au moins un pont doit être activé",
diff --git a/src-admin/src/i18n/it.json b/src-admin/src/i18n/it.json
index 37dd9518..26011c2a 100644
--- a/src-admin/src/i18n/it.json
+++ b/src-admin/src/i18n/it.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Tutte le informazioni di questo dispositivo o bridge verranno eliminate e sarà necessario riconnettersi nuovamente (tramite PIN o codice QR).",
     "All interfaces": "Tutte le interfacce",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Il Controller, tutti i dispositivi e i bridge verranno ripristinati alle impostazioni di fabbrica. \nIn questo modo vengono cancellati l'accoppiamento e i valori attuali per tutti i dispositivi, i bridge e anche i dispositivi accoppiati nel controller. Non puoi annullarlo.\nLa configurazione generale del controller e gli stati ioBroker assegnati ai bridge e ai dispositivi rimarranno invariati.",
+    "Announcement will stop automatically after 15 minutes": "L'annuncio si interromperà automaticamente dopo 15 minuti",
     "Apply": "Fare domanda a",
     "Are you sure?": "Sei sicuro?",
     "At least one bridge must be enabled": "Almeno un bridge deve essere abilitato",
diff --git a/src-admin/src/i18n/nl.json b/src-admin/src/i18n/nl.json
index 3217e85d..374cde7a 100644
--- a/src-admin/src/i18n/nl.json
+++ b/src-admin/src/i18n/nl.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Alle gegevens van dit apparaat of deze brug worden verwijderd en u moet opnieuw verbinding maken (met pincode of QR-code).",
     "All interfaces": "Alle interfaces",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "De controller en alle apparaten en bruggen worden teruggezet naar de fabrieksinstellingen. \nHierdoor worden de koppelings- en huidige waarden voor alle apparaten, bruggen en ook gekoppelde apparaten in de controller verwijderd. Je kunt het niet ongedaan maken.\nDe algemene configuratie van de controller en de toegewezen ioBroker-statussen voor de bruggen en apparaten blijven ongewijzigd.",
+    "Announcement will stop automatically after 15 minutes": "De aankondiging stopt automatisch na 15 minuten",
     "Apply": "Toepassen",
     "Are you sure?": "Weet je het zeker?",
     "At least one bridge must be enabled": "Er moet minimaal één brug zijn ingeschakeld",
diff --git a/src-admin/src/i18n/pl.json b/src-admin/src/i18n/pl.json
index 70a592dc..64fcc5cd 100644
--- a/src-admin/src/i18n/pl.json
+++ b/src-admin/src/i18n/pl.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Wszystkie informacje dotyczące tego urządzenia lub mostu zostaną usunięte i konieczne będzie ponowne nawiązanie połączenia (za pomocą kodu PIN lub QR).",
     "All interfaces": "Wszystkie interfejsy",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Kontroler oraz wszystkie urządzenia i mosty zostaną przywrócone do ustawień fabrycznych. \nSpowoduje to usunięcie parowania i bieżących wartości wszystkich urządzeń, mostów, a także sparowanych urządzeń w kontrolerze. Nie możesz tego cofnąć.\nOgólna konfiguracja kontrolera oraz przypisane stany ioBroker dla mostów i urządzeń pozostaną niezmienione.",
+    "Announcement will stop automatically after 15 minutes": "Ogłoszenie zostanie automatycznie zakończone po 15 minutach",
     "Apply": "Stosować",
     "Are you sure?": "Jesteś pewny?",
     "At least one bridge must be enabled": "Przynajmniej jeden most musi być włączony",
diff --git a/src-admin/src/i18n/pt.json b/src-admin/src/i18n/pt.json
index 392fb636..28b80245 100644
--- a/src-admin/src/i18n/pt.json
+++ b/src-admin/src/i18n/pt.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Todas as informações deste dispositivo ou ponte serão excluídas e você deverá se reconectar (com PIN ou código QR) novamente.",
     "All interfaces": "Todas as interfaces",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "O controlador e todos os dispositivos e pontes retornarão aos padrões de fábrica. \nIsso exclui os valores atuais e de emparelhamento de todos os dispositivos, pontes e também dos dispositivos emparelhados no controlador. Você não pode desfazer isso.\nA configuração geral do controlador e os estados atribuídos do ioBroker para as pontes e dispositivos permanecerão inalterados.",
+    "Announcement will stop automatically after 15 minutes": "O anúncio será interrompido automaticamente após 15 minutos",
     "Apply": "Aplicar",
     "Are you sure?": "Tem certeza?",
     "At least one bridge must be enabled": "Pelo menos uma ponte deve estar habilitada",
diff --git a/src-admin/src/i18n/ru.json b/src-admin/src/i18n/ru.json
index 551c2623..3d36fce8 100644
--- a/src-admin/src/i18n/ru.json
+++ b/src-admin/src/i18n/ru.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Вся информация об этом устройстве или мосте будет удалена, и вам придется заново подключиться (с помощью PIN-кода или QR-кода).",
     "All interfaces": "Все интерфейсы",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Для контроллера, всех устройств и мостов будут восстановлены заводские настройки по умолчанию. \nПри этом удаляются сопряженные и текущие значения для всех устройств, мостов, а также сопряженных устройств в контроллере. Вы не можете отменить это.\nОбщая конфигурация контроллера и назначенные состояния ioBroker для мостов и устройств останутся неизменными.",
+    "Announcement will stop automatically after 15 minutes": "Объявление автоматически прекратится через 15 минут.",
     "Apply": "Применять",
     "Are you sure?": "Вы уверены?",
     "At least one bridge must be enabled": "Хотя бы один мост должен быть включен",
diff --git a/src-admin/src/i18n/uk.json b/src-admin/src/i18n/uk.json
index bf3ede89..26cea1eb 100644
--- a/src-admin/src/i18n/uk.json
+++ b/src-admin/src/i18n/uk.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "Усю інформацію про цей пристрій або міст буде видалено, і вам доведеться знову підключитися (за допомогою PIN-коду або QR-коду).",
     "All interfaces": "Всі інтерфейси",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "Контролер, усі пристрої та мости будуть відновлені до заводських налаштувань. \nЦе видаляє сполучення та поточні значення для всіх пристроїв, мостів, а також сполучених пристроїв у контролері. Ви не можете скасувати це.\nЗагальна конфігурація контролера та призначені стани ioBroker для мостів і пристроїв залишаться незмінними.",
+    "Announcement will stop automatically after 15 minutes": "Оголошення автоматично припиниться через 15 хвилин",
     "Apply": "Застосувати",
     "Are you sure?": "Ти впевнений?",
     "At least one bridge must be enabled": "Принаймні один міст має бути ввімкнено",
diff --git a/src-admin/src/i18n/zh-cn.json b/src-admin/src/i18n/zh-cn.json
index 7b860a6e..78c0bc74 100644
--- a/src-admin/src/i18n/zh-cn.json
+++ b/src-admin/src/i18n/zh-cn.json
@@ -18,6 +18,7 @@
     "All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.": "此设备或网桥的所有信息将被删除，您必须重新连接（使用 PIN 或二维码）。",
     "All interfaces": "所有接口",
     "All state information of matter controller and devices will be deleted. You cannot undo it.": "控制器和所有设备和桥接器将恢复为出厂默认设置。\n这将删除控制器中所有设备、桥接器和配对设备的配对和当前值。您无法撤消此操作。\n控制器的一般配置以及桥接器和设备的指定 ioBroker 状态将保持不变。",
+    "Announcement will stop automatically after 15 minutes": "15分钟后播报自动停止",
     "Apply": "申请",
     "Are you sure?": "你确定吗？",
     "At least one bridge must be enabled": "必须至少启用一个桥",
diff --git a/src-admin/src/serviceWorker.js b/src-admin/src/serviceWorker.tsx
similarity index 76%
rename from src-admin/src/serviceWorker.js
rename to src-admin/src/serviceWorker.tsx
index d9f7777e..aa824a5d 100644
--- a/src-admin/src/serviceWorker.js
+++ b/src-admin/src/serviceWorker.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable */
 // This optional code is used to register a service worker.
 // register() is not called by default.
 
@@ -12,13 +13,53 @@
 
 const isLocalhost = Boolean(
     window.location.hostname === 'localhost' ||
-        // [::1] is the IPv6 localhost address.
-        window.location.hostname === '[::1]' ||
-        // 127.0.0.1/8 is considered localhost for IPv4.
-        window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/),
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/),
 );
 
-function registerValidSW(swUrl, config) {
+export function register(config?: {
+    onUpdate: (r: ServiceWorkerRegistration) => void;
+    onSuccess: (r: ServiceWorkerRegistration) => void;
+}): void {
+    if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+        // The URL constructor is available in all browsers that support SW.
+        const publicUrl = new URL('./', window.location.href);
+        if (publicUrl.origin !== window.location.origin) {
+            // Our service worker won't work if PUBLIC_URL is on a different origin
+            // from what our page is served on. This might happen if a CDN is used to
+            // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+            return;
+        }
+
+        window.addEventListener('load', () => {
+            const swUrl = `./service-worker.js`;
+
+            if (isLocalhost) {
+                // This is running on localhost. Let's check if a service worker still exists or not.
+                checkValidServiceWorker(swUrl, config);
+
+                // Add some additional logging to localhost, pointing developers to the
+                // service worker/PWA documentation.
+                navigator.serviceWorker.ready.then(() => {
+                    console.log(
+                        'This web app is being served cache-first by a service ' +
+                        'worker. To learn more, visit http://bit.ly/CRA-PWA',
+                    );
+                });
+            } else {
+                // Is not localhost. Just register service worker
+                registerValidSW(swUrl, config);
+            }
+        });
+    }
+}
+
+function registerValidSW(
+    swUrl: string | URL,
+    config?: { onUpdate: (r: ServiceWorkerRegistration) => void; onSuccess: (r: ServiceWorkerRegistration) => void },
+): void {
     navigator.serviceWorker
         .register(swUrl)
         .then(registration => {
@@ -35,11 +76,11 @@ function registerValidSW(swUrl, config) {
                             // content until all client tabs are closed.
                             console.log(
                                 'New content is available and will be used when all ' +
-                                    'tabs for this page are closed. See http://bit.ly/CRA-PWA.',
+                                'tabs for this page are closed. See http://bit.ly/CRA-PWA.',
                             );
 
                             // Execute callback
-                            if (config && config.onUpdate) {
+                            if (config?.onUpdate) {
                                 config.onUpdate(registration);
                             }
                         } else {
@@ -49,7 +90,7 @@ function registerValidSW(swUrl, config) {
                             console.log('Content is cached for offline use.');
 
                             // Execute callback
-                            if (config && config.onSuccess) {
+                            if (config?.onSuccess) {
                                 config.onSuccess(registration);
                             }
                         }
@@ -62,13 +103,16 @@ function registerValidSW(swUrl, config) {
         });
 }
 
-function checkValidServiceWorker(swUrl, config) {
+function checkValidServiceWorker(
+    swUrl: string | URL,
+    config?: { onUpdate: (r: ServiceWorkerRegistration) => void; onSuccess: (r: ServiceWorkerRegistration) => void },
+): void {
     // Check if the service worker can be found. If it can't reload the page.
     fetch(swUrl)
         .then(response => {
             // Ensure service worker exists, and that we really are getting a JS file.
             const contentType = response.headers.get('content-type');
-            if (response.status === 404 || (contentType !== null && !contentType.includes('javascript'))) {
+            if (response.status === 404 || (contentType !== null && contentType.indexOf('javascript') === -1)) {
                 // No service worker found. Probably a different app. Reload the page.
                 navigator.serviceWorker.ready.then(registration => {
                     registration.unregister().then(() => {
@@ -80,47 +124,15 @@ function checkValidServiceWorker(swUrl, config) {
                 registerValidSW(swUrl, config);
             }
         })
-        .catch(() => console.log('No internet connection found. App is running in offline mode.'));
-}
-
-export function register(config) {
-    if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-        // The URL constructor is available in all browsers that support SW.
-        const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-        if (publicUrl.origin !== window.location.origin) {
-            // Our service worker won't work if PUBLIC_URL is on a different origin
-            // from what our page is served on. This might happen if a CDN is used to
-            // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-            return;
-        }
-
-        window.addEventListener('load', () => {
-            const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-            if (isLocalhost) {
-                // This is running on localhost. Let's check if a service worker still exists or not.
-                checkValidServiceWorker(swUrl, config);
-
-                // Add some additional logging to localhost, pointing developers to the
-                // service worker/PWA documentation.
-                navigator.serviceWorker.ready.then(() => {
-                    console.log(
-                        'This web app is being served cache-first by a service ' +
-                            'worker. To learn more, visit http://bit.ly/CRA-PWA',
-                    );
-                });
-            } else {
-                // Is not localhost. Just register service worker
-                registerValidSW(swUrl, config);
-            }
+        .catch(() => {
+            console.log('No internet connection found. App is running in offline mode.');
         });
-    }
 }
 
-export function unregister() {
+export function unregister(): void {
     if ('serviceWorker' in navigator) {
         navigator.serviceWorker.ready.then(registration => {
-            registration.unregister();
+            return registration.unregister();
         });
     }
 }