Merge branch 'main' into matterserver-enhance

project-chip · Oct 19, 2023 · 09da187 · 09da187
2 parents 23ee451 + cd4ed84
commit 09da187
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 105 deletions.
diff --git a/.github/workflows/build-test.js.yml b/.github/workflows/build-test.js.yml
@@ -6,6 +6,7 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  merge_group:
 
 # Cancel previous PR/branch runs when a new commit is pushed
 concurrency:

diff --git a/.github/workflows/chip-tool-tests.yml b/.github/workflows/chip-tool-tests.yml
@@ -6,11 +6,10 @@ on:
     - cron: 0 2 * * * # Every day at 02:00
   workflow_dispatch: # Manually on demand
   push:
-    branches:
-      - "*"
+    branches: [ "main" ]
   pull_request:
-    branches:
-      - "*"
+    branches: [ "main" ]
+  merge_group:
 
 # Cancel previous PR/branch runs when a new commit is pushed
 concurrency:

diff --git a/chip-testing/package.json b/chip-testing/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js-chip-testing",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Testing of matter.js with CHIP tool",
     "private": true,
     "license": "Apache-2.0",
@@ -20,8 +20,8 @@
         "test-chip": "matter-test --force-exit"
     },
     "dependencies": {
-        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1"
+        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9"
     }
 }
diff --git a/codegen/package.json b/codegen/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js-codegen",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Matter.js tooling",
     "private": true,
     "type": "module",
@@ -27,11 +27,11 @@
     },
     "homepage": "https://github.com/project-chip/matter.js#readme",
     "dependencies": {
-        "@project-chip/matter.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter.js-intermediate-models": "0.6.1-alpha.0-20231015-0e2c4e1"
+        "@project-chip/matter.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter.js-intermediate-models": "0.6.1-alpha.0-20231019-ee0fce9"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "@types/jsdom": "^21.1.3",
         "jsdom": "^22.1.0",
         "typescript": "^5.2.2",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "command": {
         "run": {
             "stream": true

diff --git a/models/package.json b/models/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js-intermediate-models",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Matter.js intermediate models",
     "private": true,
     "type": "module",
@@ -22,7 +22,7 @@
     },
     "homepage": "https://github.com/project-chip/matter.js#readme",
     "devDependencies": {
-        "@project-chip/matter.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1"
+        "@project-chip/matter.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9"
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/matter-node-ble.js/package.json b/packages/matter-node-ble.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter-node-ble.js",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Matter BLE support for node.js",
     "keywords": [
         "iot",
@@ -29,12 +29,12 @@
         "build-doc": "typedoc --excludeExternals --plugin typedoc-plugin-missing-exports --plugin typedoc-plugin-markdown --tsconfig src/tsconfig.json"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "ts-node": "^10.9.1",
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@project-chip/matter.js": "0.6.1-alpha.0-20231015-0e2c4e1"
+        "@project-chip/matter.js": "0.6.1-alpha.0-20231019-ee0fce9"
     },
     "optionalDependencies": {
         "@abandonware/bleno": "^0.6.1",

diff --git a/packages/matter-node-shell.js/package.json b/packages/matter-node-shell.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter-node-shell.js",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Shell app for Matter controller",
     "keywords": [
         "iot",
@@ -32,12 +32,12 @@
         "shell": "./dist/cjs/app.js"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@project-chip/matter-node-ble.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter-node-ble.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231019-ee0fce9",
         "child_process": "^1.0.2",
         "readline": "^1.3.0",
         "yargs": "^17.7.2"

diff --git a/packages/matter-node.js-examples/package.json b/packages/matter-node.js-examples/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter-node.js-examples",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "CLI/Reference implementation scripts for Matter protocol for node.js",
     "keywords": [
         "iot",
@@ -43,12 +43,12 @@
         "matter-controller": "./dist/cjs/examples/ControllerNode.js"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@project-chip/matter-node-ble.js": "0.6.1-alpha.0-20231015-0e2c4e1",
-        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231015-0e2c4e1"
+        "@project-chip/matter-node-ble.js": "0.6.1-alpha.0-20231019-ee0fce9",
+        "@project-chip/matter-node.js": "0.6.1-alpha.0-20231019-ee0fce9"
     },
     "engines": {
         "_comment": "For Crypto.hkdf support",

diff --git a/packages/matter-node.js/package.json b/packages/matter-node.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter-node.js",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Matter protocol for node.js",
     "keywords": [
         "iot",
@@ -31,7 +31,7 @@
         "test": "matter-test"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "@types/bn.js": "^5.1.2",
         "@types/bytebuffer": "^5.0.45",
         "@types/node-localstorage": "^1.3.1",
@@ -40,7 +40,7 @@
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "@project-chip/matter.js": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js": "0.6.1-alpha.0-20231019-ee0fce9",
         "node-localstorage": "^3.0.5"
     },
     "engines": {

diff --git a/packages/matter.js/package.json b/packages/matter.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js",
-    "version": "0.6.1-alpha.0-20231015-0e2c4e1",
+    "version": "0.6.1-alpha.0-20231019-ee0fce9",
     "description": "Matter protocol in pure js",
     "keywords": [
         "iot",
@@ -36,7 +36,7 @@
         "elliptic": "^6.5.4"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231015-0e2c4e1",
+        "@project-chip/matter.js-tools": "0.6.1-alpha.0-20231019-ee0fce9",
         "@types/bn.js": "^5.1.2",
         "@types/chai": "^4.3.6",
         "@types/elliptic": "^6.4.15",

diff --git a/packages/matter.js/src/CommissioningServer.ts b/packages/matter.js/src/CommissioningServer.ts
@@ -530,6 +530,12 @@ export class CommissioningServer extends MatterNode {
             throw new ImplementationError("Add the node to the Matter instance before!");
         }
 
+        if (this.interactionServer !== undefined && this.deviceInstance !== undefined) {
+            logger.debug("Device already initialized, just advertise the instance again ...");
+            await this.deviceInstance.announce();
+            return;
+        }
+
         const basicInformation = this.getRootClusterServer(BasicInformationCluster);
         if (basicInformation == undefined) {
             throw new ImplementationError("BasicInformationCluster needs to be set!");