Update 20.12.24 (#238)

* Fix rounding of battery state in second place * Adjust matter,js Env handling * Fix ending Discovery * matter.js Environment exposing * upgrades matter.js * stop and cleanup on upgrade * BREAKING!! Correct encrypted field * Readme * Address two Sentry UI issues .. they can happen for bridges/devices that do not have been started. * another update
ioBroker · Dec 20, 2024 · 8c2aaff · 8c2aaff
1 parent 108df78
commit 8c2aaff
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 81 deletions.
diff --git a/README.md b/README.md
@@ -220,6 +220,12 @@ TBD
 -->
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* BREAKING: Please re-enter your ioBroker Pro Cloud Password!
+* (@Apollon77) Makes sure the adapter is stopped before being updated
+* (@Apollon77) Optimizes device discovery and allows to stop it again
+
 ### 0.2.10 (2024-12-19)
 * (@bluefox) Makes the Adapter UI also available as standalone tab
 * (@bluefox) Added error details when adding the same state twice to a bridge or device

diff --git a/io-package.json b/io-package.json
@@ -146,7 +146,9 @@
     "keywords": [
       "matter"
     ],
+    "eraseOnUpload": true,
     "stopTimeout": 30000,
+    "stopBeforeUpdate": true,
     "enabled": true,
     "compact": false,
     "singletonHost": true,
@@ -167,11 +169,11 @@
     }
   },
   "protectedNative": [
-    "password",
+    "pass",
     "login"
   ],
   "encryptedNative": [
-    "password"
+    "pass"
   ],
   "native": {
     "interface": "",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,16 +23,16 @@
     "url": "https://github.com/ioBroker/ioBroker.matter"
   },
   "optionalDependencies": {
-    "@matter/nodejs-ble": "0.12.0-alpha.0-20241219-af74a6a14"
+    "@matter/nodejs-ble": "0.12.0-alpha.0-20241220-2c53108aa"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
     "@iobroker/i18n": "^0.3.1",
     "@iobroker/dm-utils": "^0.6.11",
     "@iobroker/type-detector": "^4.1.1",
-    "@matter/main": "0.12.0-alpha.0-20241219-af74a6a14",
-    "@matter/nodejs": "0.12.0-alpha.0-20241219-af74a6a14",
-    "@project-chip/matter.js": "0.12.0-alpha.0-20241219-af74a6a14",
+    "@matter/main": "0.12.0-alpha.0-20241220-2c53108aa",
+    "@matter/nodejs": "0.12.0-alpha.0-20241220-2c53108aa",
+    "@project-chip/matter.js": "0.12.0-alpha.0-20241220-2c53108aa",
     "axios": "^1.7.9",
     "jsonwebtoken": "^9.0.2"
   },

diff --git a/src-admin/package-lock.json b/src-admin/package-lock.json
diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
@@ -956,9 +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'
-                        ? MAX_UN_COMMISSIONED_DEVICES
-                        : 0
+                        ?.status !== 'waitingForCommissioning'
+                        ? 0
+                        : MAX_UN_COMMISSIONED_DEVICES
                 }
                 matter={this.props.matter}
                 socket={this.props.socket}

diff --git a/src-admin/src/Tabs/BridgesAndDevices.tsx b/src-admin/src/Tabs/BridgesAndDevices.tsx
@@ -713,8 +713,9 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
                             'All information of this device or bridge will be deleted and you must reconnect (with PIN or QR code) again.',
                         )}
                     </p>
-                    {this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid].status !==
-                    'waitingForCommissioning' ? (
+                    {this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid] &&
+                    this.props.nodeStates[this.state.showResetDialog.bridgeOrDevice.uuid].status !==
+                        'waitingForCommissioning' ? (
                         <p style={{ color: this.props.themeType === 'dark' ? '#9c0a0a' : '#910000' }}>
                             {I18n.t(
                                 'This device/bridge is linked to some ecosystem. If it is deleted here, you must manually remove it from your ecosystem!',

diff --git a/src/main.ts b/src/main.ts
@@ -162,6 +162,10 @@ export class MatterAdapter extends utils.Adapter {
         };
     }
 
+    get matterEnvironment(): Environment {
+        return this.#matterEnvironment;
+    }
+
     async shutDownMatterNodes(): Promise<void> {
         for (const { device } of this.#devices.values()) {
             await device?.destroy();
@@ -1085,7 +1089,6 @@ export class MatterAdapter extends utils.Adapter {
         const matterController = new MatterController({
             adapter: this,
             controllerOptions,
-            matterEnvironment: this.#matterEnvironment,
             updateCallback: () => this.#refreshControllerDevices(),
         });
         matterController.init(); // add bridge to server

diff --git a/src/matter/BridgedDevicesNode.ts b/src/matter/BridgedDevicesNode.ts
@@ -201,6 +201,7 @@ class BridgedDevices extends BaseServerNode {
                 NetworkCommissioningServer.withFeatures(NetworkCommissioning.Feature.EthernetNetworkInterface),
             ),
             {
+                environment: this.adapter.matterEnvironment,
                 id: this.#parameters.uuid,
                 network: {
                     port: this.#parameters.port,

diff --git a/src/matter/ControllerNode.ts b/src/matter/ControllerNode.ts
@@ -1,4 +1,4 @@
-import { type Environment, Logger, NodeId, singleton, VendorId, type ServerAddressIp } from '@matter/main';
+import { Logger, NodeId, singleton, VendorId, type ServerAddressIp } from '@matter/main';
 import { GeneralCommissioning } from '@matter/main/clusters';
 import {
     Ble,
@@ -19,7 +19,6 @@ import { inspect } from 'util';
 export interface ControllerCreateOptions {
     adapter: MatterAdapter;
     controllerOptions: MatterControllerConfig;
-    matterEnvironment: Environment;
     updateCallback: () => void;
 }
 
@@ -39,7 +38,6 @@ type EndUserCommissioningOptions = (
 class Controller implements GeneralNode {
     #parameters: MatterControllerConfig;
     readonly #adapter: MatterAdapter;
-    readonly #matterEnvironment: Environment;
     readonly #updateCallback: () => void;
     #commissioningController?: CommissioningController;
     #nodes = new Map<string, GeneralMatterNode>();
@@ -51,7 +49,6 @@ class Controller implements GeneralNode {
     constructor(options: ControllerCreateOptions) {
         this.#adapter = options.adapter;
         this.#parameters = options.controllerOptions;
-        this.#matterEnvironment = options.matterEnvironment;
         this.#updateCallback = options.updateCallback;
     }
 
@@ -244,7 +241,7 @@ class Controller implements GeneralNode {
         this.#commissioningController = new CommissioningController({
             autoConnect: false,
             environment: {
-                environment: this.#matterEnvironment,
+                environment: this.#adapter.matterEnvironment,
                 id: 'controller',
             },
         });
@@ -510,9 +507,9 @@ class Controller implements GeneralNode {
     }
 
     async #discoveryStop(): Promise<void> {
-        this.#discovering = false;
-        await this.#adapter.setState('controller.info.discovering', false, true);
         if (this.#commissioningController && this.#discovering) {
+            this.#discovering = false;
+            await this.#adapter.setState('controller.info.discovering', false, true);
             this.#adapter.log.info(`Stop the discovering...`);
             this.#commissioningController.cancelCommissionableDeviceDiscovery(
                 {},

diff --git a/src/matter/DeviceNode.ts b/src/matter/DeviceNode.ts
@@ -100,6 +100,7 @@ class Device extends BaseServerNode {
                     NetworkCommissioningServer.withFeatures(NetworkCommissioning.Feature.EthernetNetworkInterface),
                 ),
                 {
+                    environment: this.adapter.matterEnvironment,
                     id: this.#parameters.uuid,
                     network: {
                         port: this.#parameters.port,

diff --git a/src/matter/to-iobroker/GenericDeviceToIoBroker.ts b/src/matter/to-iobroker/GenericDeviceToIoBroker.ts
@@ -612,7 +612,7 @@ export abstract class GenericDeviceToIoBroker {
                 const voltage = await powerSource.getBatVoltageAttribute();
                 const percentRemaining = await powerSource.getBatPercentRemainingAttribute();
                 if (typeof voltage === 'number') {
-                    states.batteryVoltage = `${(voltage / 1_000).toFixed(2)} V${typeof percentRemaining === 'number' ? ` (${percentRemaining}%)` : ''}`;
+                    states.batteryVoltage = `${(voltage / 1_000).toFixed(2)} V${typeof percentRemaining === 'number' ? ` (${Math.round(percentRemaining / 2)}%)` : ''}`;
                 } else if (typeof percentRemaining === 'number') {
                     states.batteryVoltage = `${Math.round(percentRemaining / 2)}%`;
                 }