Skip to content

Commit

Permalink
Merge branch 'main' into announcechange
Browse files Browse the repository at this point in the history
  • Loading branch information
Apollon77 authored Nov 6, 2023
2 parents 007a35c + fb9719b commit 42ca3cd
Show file tree
Hide file tree
Showing 42 changed files with 1,536 additions and 585 deletions.
9 changes: 1 addition & 8 deletions .github/actions/prepare-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,10 @@ runs:
with:
node-version: ${{ inputs.node-version }}

- name: patch node gyp on windows to support Visual Studio 2019
if: ${{ inputs.os == 'windows-latest' || inputs.os == 'windows-2019' }}
shell: powershell
run: |
npm install --global node-gyp@latest
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name: Install dependencies (Non-Windows)
if: ${{ inputs.os != 'windows-latest' && inputs.os != 'windows-2019' }}
shell: bash
run: npm ci
run: npm ci --foreground-scripts

- name: Install dependencies (Windows)
if: ${{ inputs.os == 'windows-latest' || inputs.os == 'windows-2019' }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-test.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
src:
- "package.json"
- "packages/**/package.json"
- ".github/workflows/build-test.js.yml"
- name: Prepare testing environment
uses: ./.github/actions/prepare-env
- run: npm run format-verify
Expand All @@ -38,7 +39,8 @@ jobs:
strategy:
matrix:
node-version: [ 16.x, 18.x, 20.x ]
os: [ macos-latest, windows-2019 ]
# os: [ macos-latest, windows-2019 ]
os: [ windows-2019 ]
steps:
- uses: actions/checkout@v4
if: ${{ needs.check-and-lint.outputs.package-changes == 'true' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
strategy:
matrix:
node-version: [ 16.x, 18.x, 20.x ]
os: [ macos-latest, windows-2019 ]
# os: [ macos-latest, windows-2019 ]
os: [ windows-2019 ]
steps:
- uses: actions/checkout@v4
- name: Build on ${{ matrix.os }}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,18 @@ The main work (all changes without a GitHub username in brackets in the below li
* Feature: Added generation method for random passcodes to PaseClient
* Feature: Generalized Discovery logic and allow discoveries via different methods (BLE+IP) in parallel
* Feature: Added functionality to clear session contexts including data in sub-contexts or not
* Feature: Enhance discovery methods to allow continuous discovery for operational devices
* matter.js API:
* Breaking: Rename resetStorage() on CommissioningServer to factoryReset() and add logic to restart the device if currently running
* Breaking: Restructure the CommissioningController to allow pairing with multiple nodes
* Adjusts some property and structure namings to be more consistent
* Introducing class PairedNode with the High level API for a paired Node
* Restructured CommissioningController to handle multiple nodes and offer new high level API
* Changed name of the unique storage id for servers or controllers added to MatterServer to "uniqueStorageKey"
* Adjusted subscription callbacks to also provide the nodeId of the affected device reporting the changes to allow callbacks to be used generically when connecting to all nodes
* Introduces a node state information callback to inform about the connection status but also when the node structure changed (for bridges) or such.
* Breaking: option "mdnsAnnounceInterface" was deprecated and replaced by "mdnsInterface" and now used to limit announcements and scanning to a specific interface
* Feature: Enhanced CommissioningServer API and CommissioningController for improved practical usage
* Feature: Makes Port for CommissioningServer optional and add automatic port handling in MatterServer
* Feature: Allows removal of Controller or Server instances from Matter server, optionally with deleting the storage
* Enhance: Makes passcode and discriminator for CommissioningServer optional and randomly generate them if not provided
Expand Down
104 changes: 64 additions & 40 deletions README.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions chip-testing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-chip/matter.js-chip-testing",
"version": "0.6.1-alpha.0-20231102-e09231e",
"version": "0.6.1-alpha.0-20231106-8322fa6",
"description": "Testing of matter.js with CHIP tool",
"private": true,
"license": "Apache-2.0",
Expand All @@ -20,8 +20,8 @@
"test-chip": "matter-test --force-exit"
},
"dependencies": {
"@project-chip/matter-node.js": "0.6.1-alpha.0-20231102-e09231e",
"@project-chip/matter.js": "0.6.1-alpha.0-20231102-e09231e",
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231102-e09231e"
"@project-chip/matter-node.js": "0.6.1-alpha.0-20231106-8322fa6",
"@project-chip/matter.js": "0.6.1-alpha.0-20231106-8322fa6",
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231106-8322fa6"
}
}
10 changes: 5 additions & 5 deletions codegen/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-chip/matter.js-codegen",
"version": "0.6.1-alpha.0-20231102-e09231e",
"version": "0.6.1-alpha.0-20231106-8322fa6",
"description": "Matter.js tooling",
"private": true,
"type": "module",
Expand All @@ -27,12 +27,12 @@
},
"homepage": "https://github.com/project-chip/matter.js#readme",
"dependencies": {
"@project-chip/matter.js": "0.6.1-alpha.0-20231102-e09231e",
"@project-chip/matter.js-intermediate-models": "0.6.1-alpha.0-20231102-e09231e"
"@project-chip/matter.js": "0.6.1-alpha.0-20231106-8322fa6",
"@project-chip/matter.js-intermediate-models": "0.6.1-alpha.0-20231106-8322fa6"
},
"devDependencies": {
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231102-e09231e",
"@types/jsdom": "^21.1.3",
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231106-8322fa6",
"@types/jsdom": "^21.1.4",
"jsdom": "^22.1.0",
"typescript": "^5.2.2",
"word-list": "^3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.6.1-alpha.0-20231102-e09231e",
"version": "0.6.1-alpha.0-20231106-8322fa6",
"command": {
"run": {
"stream": true
Expand Down
6 changes: 3 additions & 3 deletions models/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@project-chip/matter.js-intermediate-models",
"version": "0.6.1-alpha.0-20231102-e09231e",
"version": "0.6.1-alpha.0-20231106-8322fa6",
"description": "Matter.js intermediate models",
"private": true,
"type": "module",
Expand All @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/project-chip/matter.js#readme",
"devDependencies": {
"@project-chip/matter.js": "0.6.1-alpha.0-20231102-e09231e",
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231102-e09231e"
"@project-chip/matter.js": "0.6.1-alpha.0-20231106-8322fa6",
"@project-chip/matter.js-tools": "0.6.1-alpha.0-20231106-8322fa6"
}
}
Loading

0 comments on commit 42ca3cd

Please sign in to comment.