From 51237c2d8e68f941f615fd83bf41dc8a0533b3d1 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sat, 21 Dec 2024 09:19:03 +0100 Subject: [PATCH] Fixes211224 (#246) * dep updates * Discovery fixes * README.md --- README.md | 4 + package-lock.json | 118 +++++++++++++++--------------- package.json | 8 +- src-admin/package-lock.json | 4 +- src-admin/src/Tabs/Controller.tsx | 6 +- src/matter/ControllerNode.ts | 2 +- 6 files changed, 73 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index a1a62b7e..2940cb1a 100644 --- 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 index 72236178..7efa91c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,9 @@ "@iobroker/dm-utils": "^0.6.11", "@iobroker/i18n": "^0.3.1", "@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" }, @@ -40,7 +40,7 @@ "node": ">=18" }, "optionalDependencies": { - "@matter/nodejs-ble": "0.12.0-alpha.0-20241220-2c53108aa" + "@matter/nodejs-ble": "0.12.0-alpha.0-20241220-755393a73" } }, "node_modules/@alcalzone/pak": { @@ -1001,64 +1001,64 @@ } }, "node_modules/@matter/general": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-XqdQZ/uuN/HP0qZJ8FADeAKvqMnops1eYyggH05/dZ2du5kMykKsqKNbPU/bWXPts0qll5UR3tM7RMv5g5bifQ==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-7UEIrrAaTxS+YFwvq62c42w6O8qsHt5Ktftb4OwV3jADVO0pMdUUTM79wegu/tQp9mCpHiq54dTvWCyV26FwYg==", "license": "Apache-2.0", "dependencies": { "@noble/curves": "^1.7.0" } }, "node_modules/@matter/main": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-6xTYl1JHaTi7O81/3mh37yHV79pgjjQfw51r5ummWfLKvHKKLCmU7b+L2Vjrhln3q1RhHvBX5P+E5DhudFA1Hg==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-IubpLp1wAl61LB3VBfzGyJD8B3/FXlDMY9JkoirWXmpvnyIq3J+GiKywqSE6HcGACIy66dRP/6dIVL4BBCilWg==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/model": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/node": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/protocol": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/model": "0.12.0-alpha.0-20241220-755393a73", + "@matter/node": "0.12.0-alpha.0-20241220-755393a73", + "@matter/protocol": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" }, "optionalDependencies": { - "@matter/nodejs": "0.12.0-alpha.0-20241220-2c53108aa" + "@matter/nodejs": "0.12.0-alpha.0-20241220-755393a73" } }, "node_modules/@matter/model": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-fB98xRQQW6SSXWkiZbfpD2fskelmVLdIzAZYcSywFi33tyYGk+tK3G48uBvIxWktr4CEF5dkfUBJa4/Hd3EDYA==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-5ueRMmQbF+/Q1olp0Wg3gFceGfCQYORdHD540FQydxlxtGUsEBteDkhx5jzh/EuOObiXOxyPSF4HPh6jVY2QCg==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" } }, "node_modules/@matter/node": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-Jk50HXpKNW2Ncx148D1OhHo7Ap/hvGhyZIhNkvc3LR/nVxHsNPSF8gIXA8d8ISE3kEiw616cJ6V8a00JvDb41w==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-SvUOMPuo/53tCQDSI/Qb4yvG0pxM7rLpbHVPkRU05HyFwVj3aGj3OKD80k8zEngrQk2Dhs6RjlYTA+tO2GJZBA==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/model": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/protocol": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/model": "0.12.0-alpha.0-20241220-755393a73", + "@matter/protocol": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" } }, "node_modules/@matter/nodejs": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-u7j5K8JB01pASgzNFGBndJQsk/QSANihV0LR/ledUKhZUN/yh3nI81UWn1TAg3voliog2a7aTd0S8MuLQC6EOA==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-jZc2LwMDr+8F1iWTU1x0TuTYoEnNh15pL+4b7UeLXcdLW2AJEWIJBBw8E8X4Fet6bjPZCI+YsQOU+AxO3PIZ/w==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/node": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/protocol": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/node": "0.12.0-alpha.0-20241220-755393a73", + "@matter/protocol": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73", "node-localstorage": "^3.0.5" }, "engines": { @@ -1066,15 +1066,15 @@ } }, "node_modules/@matter/nodejs-ble": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/nodejs-ble/-/nodejs-ble-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-v+MIuEDcZH+mFb1EU8Rz6yVFYWenl0P8mzBvvsd0BRyTYy5g1rPIGxlOmAW8LtmoBw6vqQIZ0jy/1ztUUP5ghQ==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/nodejs-ble/-/nodejs-ble-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-j/C4tDesrZN2jQ6BfPMIUwiLSdhq5CZu75ljz5N9Ao15Dqi3m2V6rpbZsRUQ5GLJTeiUNE647HcLRkcyCfavCw==", "license": "Apache-2.0", "optional": true, "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/protocol": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa" + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/protocol": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73" }, "engines": { "node": ">=18.0.0" @@ -1085,25 +1085,25 @@ } }, "node_modules/@matter/protocol": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-lgs/uDNjrPXP7I5S64Wv5s8+YzimWsDWdWd6NdGgfGnoDkGsBs5RAZ2a8cYPwcJI8ARrAFZ5o4eFFNIwrEk6hw==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-m2a6klsillM7YL1NVL/3CYDjnBNbnJ6B88cNz4NXJqKURBmkym19lg0h+au093ittG85yKXN3E4/nvCbVXWo2A==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/model": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/model": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" } }, "node_modules/@matter/types": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-yNKLXVtqpJVwAFU1M1JxX9kgTq5QHUH3jy2A8FdyMxr6MIYd0iw3cKfvZcEcr1cGutRvF1wSH13BLLGQaIcweA==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-JhmMBXd/bdPleufYb9EZCWhvGEkv9VbBFsutefp5eiRQAyzwzlY5oN2onjNoMd4Cp9HoyCKSPrnjgbo9Njayww==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/model": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/model": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" } }, @@ -1266,16 +1266,16 @@ } }, "node_modules/@project-chip/matter.js": { - "version": "0.12.0-alpha.0-20241220-2c53108aa", - "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.12.0-alpha.0-20241220-2c53108aa.tgz", - "integrity": "sha512-eKPH8e3M2ABBXCGxeIIollViic+Tta4AAQEvfao/7wahp3tO/dDOaUHrkCE/WXyL20o+PT8AL8LDo1ps31u05g==", + "version": "0.12.0-alpha.0-20241220-755393a73", + "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.12.0-alpha.0-20241220-755393a73.tgz", + "integrity": "sha512-DMLOqcNkRKl8p9SrVGDohTmg8vuoZrTUq7n9Tr2ZnR0HmDkv5XsVwpZJVymcVwQYxcWgLBpC1LWpOGFjMf/i5A==", "license": "Apache-2.0", "dependencies": { - "@matter/general": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/model": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/node": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/protocol": "0.12.0-alpha.0-20241220-2c53108aa", - "@matter/types": "0.12.0-alpha.0-20241220-2c53108aa", + "@matter/general": "0.12.0-alpha.0-20241220-755393a73", + "@matter/model": "0.12.0-alpha.0-20241220-755393a73", + "@matter/node": "0.12.0-alpha.0-20241220-755393a73", + "@matter/protocol": "0.12.0-alpha.0-20241220-755393a73", + "@matter/types": "0.12.0-alpha.0-20241220-755393a73", "@noble/curves": "^1.7.0" } }, diff --git a/package.json b/package.json index 3a4163c0..7bbb0d41 100644 --- 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 index fa821476..ffd9b03f 100644 --- a/src-admin/package-lock.json +++ b/src-admin/package-lock.json @@ -1,12 +1,12 @@ { "name": "iobroker.matter", - "version": "0.3.0", + "version": "0.3.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "iobroker.matter", - "version": "0.3.0", + "version": "0.3.1", "dependencies": { "@foxriver76/iob-component-lib": "^0.2.0", "@iobroker/adapter-react-v5": "^7.4.7", diff --git a/src-admin/src/Tabs/Controller.tsx b/src-admin/src/Tabs/Controller.tsx index 1781ecf9..e69e9c3c 100644 --- a/src-admin/src/Tabs/Controller.tsx +++ b/src-admin/src/Tabs/Controller.tsx @@ -909,7 +909,7 @@ class Controller extends Component { this.setState({ discovered: [] }, async () => { const result: { error?: string; - result: CommissionableDevice[]; + result?: CommissionableDevice[]; } = await this.props.socket.sendTo( `matter.${this.props.instance}`, 'controllerDiscovery', @@ -917,8 +917,8 @@ class Controller extends Component { ); 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 index c101da8d..6fffb00e 100644 --- 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); } } })