Fixes211224 (#246)

* dep updates * Discovery fixes * README.md
ioBroker · Dec 21, 2024 · 51237c2 · 51237c2
1 parent 6562bc7
commit 51237c2
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -220,6 +220,10 @@ TBD
 -->
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (@Apollon77) Fixes several discovery issues
+
 ### 0.3.1 (2024-12-20)
 * (@Apollon77) Fixes bridge/device icon display in UI
 * (@Apollon77) Prevents displaying warning dialogs when nothing is wrong

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-20241220-2c53108aa"
+    "@matter/nodejs-ble": "0.12.0-alpha.0-20241220-755393a73"
   },
   "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-20241220-2c53108aa",
-    "@matter/nodejs": "0.12.0-alpha.0-20241220-2c53108aa",
-    "@project-chip/matter.js": "0.12.0-alpha.0-20241220-2c53108aa",
+    "@matter/main": "0.12.0-alpha.0-20241220-755393a73",
+    "@matter/nodejs": "0.12.0-alpha.0-20241220-755393a73",
+    "@project-chip/matter.js": "0.12.0-alpha.0-20241220-755393a73",
     "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/Controller.tsx b/src-admin/src/Tabs/Controller.tsx
@@ -909,16 +909,16 @@ class Controller extends Component<ComponentProps, ComponentState> {
                                 this.setState({ discovered: [] }, async () => {
                                     const result: {
                                         error?: string;
-                                        result: CommissionableDevice[];
+                                        result?: CommissionableDevice[];
                                     } = await this.props.socket.sendTo(
                                         `matter.${this.props.instance}`,
                                         'controllerDiscovery',
                                         {},
                                     );
 
                                     if (result.error) {
-                                        window.alert(`Cannot discover: ${result.error}`);
-                                    } else {
+                                        window.alert(`Error on discovery: ${result.error}`);
+                                    } else if (result.result) {
                                         this.setState({
                                             discovered: result.result,
                                             discoveryDone: true,

diff --git a/src/matter/ControllerNode.ts b/src/matter/ControllerNode.ts
@@ -493,7 +493,7 @@ class Controller implements GeneralNode {
                         .catch(error => this.#adapter.log.info(`Error setting state: ${error}`));
                     this.#discovering = false;
                     if (obj.callback) {
-                        this.#adapter.sendTo(obj.from, obj.command, result, obj.callback);
+                        this.#adapter.sendTo(obj.from, obj.command, { result }, obj.callback);
                     }
                 }
             })