@matter/nodejs-shell 0.16.0-alpha.0-20251213-e83db3732 → 0.16.0-alpha.0-20251217-038f88085
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/dist/esm/MatterNode.js +15 -9
- package/dist/esm/MatterNode.js.map +1 -1
- package/dist/esm/shell/cmd_cluster-attributes.js +1 -1
- package/dist/esm/shell/cmd_cluster-attributes.js.map +1 -1
- package/package.json +10 -10
- package/src/MatterNode.ts +19 -12
- package/src/shell/cmd_cluster-attributes.ts +1 -1
package/LICENSE
CHANGED
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
same "printed page" as the copyright notice for easier
|
|
187
187
|
identification within third-party archives.
|
|
188
188
|
|
|
189
|
-
Copyright
|
|
189
|
+
Copyright 2022-2025 Matter.js Authors
|
|
190
190
|
|
|
191
191
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
192
|
you may not use this file except in compliance with the License.
|
package/dist/esm/MatterNode.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Environment, Logger, StorageService } from "#general";
|
|
7
7
|
import { DclCertificateService, DclOtaUpdateService, DclVendorInfoService } from "#protocol";
|
|
8
8
|
import { NodeId } from "#types";
|
|
9
|
-
import { CommissioningController
|
|
9
|
+
import { CommissioningController } from "@project-chip/matter.js";
|
|
10
10
|
import { join } from "node:path";
|
|
11
11
|
const logger = Logger.get("Node");
|
|
12
12
|
class MatterNode {
|
|
@@ -37,6 +37,12 @@ class MatterNode {
|
|
|
37
37
|
}
|
|
38
38
|
return this.#services;
|
|
39
39
|
}
|
|
40
|
+
get node() {
|
|
41
|
+
if (this.commissioningController === void 0) {
|
|
42
|
+
throw new Error("CommissioningController not initialized. Start first");
|
|
43
|
+
}
|
|
44
|
+
return this.commissioningController.node;
|
|
45
|
+
}
|
|
40
46
|
get otaService() {
|
|
41
47
|
if (!this.environment.has(DclOtaUpdateService)) {
|
|
42
48
|
new DclOtaUpdateService(this.environment);
|
|
@@ -69,18 +75,16 @@ class MatterNode {
|
|
|
69
75
|
autoConnect: false,
|
|
70
76
|
adminFabricLabel: "matter.js Shell"
|
|
71
77
|
});
|
|
72
|
-
await this.commissioningController.initializeControllerStore();
|
|
73
|
-
const controllerStore = this.commissioningController.env.get(ControllerStore);
|
|
74
|
-
if (resetStorage) {
|
|
75
|
-
await controllerStore.erase();
|
|
76
|
-
}
|
|
77
|
-
this.#storageContext = controllerStore.storage.createContext("Node");
|
|
78
|
-
this.#dclFetchTestCertificates = await this.#storageContext.get("DclFetchTestCertificates", false);
|
|
79
78
|
const storageService = this.commissioningController.env.get(StorageService);
|
|
80
79
|
const baseLocation = storageService.location;
|
|
81
80
|
if (baseLocation !== void 0) {
|
|
82
81
|
this.#storageLocation = join(baseLocation, id);
|
|
83
82
|
}
|
|
83
|
+
if (resetStorage) {
|
|
84
|
+
await this.commissioningController.node.erase();
|
|
85
|
+
}
|
|
86
|
+
this.#storageContext = (await storageService.open(id)).createContext("Node");
|
|
87
|
+
this.#dclFetchTestCertificates = await this.#storageContext.get("DclFetchTestCertificates", false);
|
|
84
88
|
} else {
|
|
85
89
|
console.log(
|
|
86
90
|
"Legacy support was removed in Matter.js 0.13. Please downgrade or migrate the storage manually"
|
|
@@ -124,7 +128,9 @@ class MatterNode {
|
|
|
124
128
|
if (nodeId === void 0) {
|
|
125
129
|
return await this.commissioningController.connect(connectOptions);
|
|
126
130
|
}
|
|
127
|
-
const node = await this.commissioningController.connectNode(nodeId,
|
|
131
|
+
const node = await this.commissioningController.connectNode(nodeId, {
|
|
132
|
+
...connectOptions
|
|
133
|
+
});
|
|
128
134
|
if (!node.initialized) {
|
|
129
135
|
await node.events.initialized;
|
|
130
136
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/MatterNode.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,SAAS,aAAa,QAAmD,sBAAsB;AAC/F,SAAS,uBAAuB,qBAAqB,4BAA4B;AACjF,SAAS,cAAc;AACvB,SAAS
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { camelize, Diagnostic } from "#general";
|
|
7
7
|
import { MatterModel } from "#model";
|
|
8
|
-
import { SupportedAttributeClient } from "#protocol";
|
|
9
8
|
import { AttributeId, ClusterId, EndpointNumber, ValidationError } from "#types";
|
|
9
|
+
import { SupportedAttributeClient } from "@project-chip/matter.js/cluster";
|
|
10
10
|
import { convertJsonDataWithModel } from "../util/Json.js";
|
|
11
11
|
function generateAllAttributeHandlersForCluster(yargs, theNode) {
|
|
12
12
|
MatterModel.standard.clusters.forEach((cluster) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_cluster-attributes.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,UAAU,kBAAkB;AACrC,SAAuC,mBAAmB;AAC1D,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs", "attributeId", "clusterId"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/nodejs-shell",
|
|
3
|
-
"version": "0.16.0-alpha.0-
|
|
3
|
+
"version": "0.16.0-alpha.0-20251217-038f88085",
|
|
4
4
|
"description": "Shell app for Matter controller",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -43,15 +43,15 @@
|
|
|
43
43
|
"#types": "@matter/types"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@matter/general": "0.16.0-alpha.0-
|
|
47
|
-
"@matter/model": "0.16.0-alpha.0-
|
|
48
|
-
"@matter/node": "0.16.0-alpha.0-
|
|
49
|
-
"@matter/nodejs": "0.16.0-alpha.0-
|
|
50
|
-
"@matter/nodejs-ble": "0.16.0-alpha.0-
|
|
51
|
-
"@matter/protocol": "0.16.0-alpha.0-
|
|
52
|
-
"@matter/tools": "0.16.0-alpha.0-
|
|
53
|
-
"@matter/types": "0.16.0-alpha.0-
|
|
54
|
-
"@project-chip/matter.js": "0.16.0-alpha.0-
|
|
46
|
+
"@matter/general": "0.16.0-alpha.0-20251217-038f88085",
|
|
47
|
+
"@matter/model": "0.16.0-alpha.0-20251217-038f88085",
|
|
48
|
+
"@matter/node": "0.16.0-alpha.0-20251217-038f88085",
|
|
49
|
+
"@matter/nodejs": "0.16.0-alpha.0-20251217-038f88085",
|
|
50
|
+
"@matter/nodejs-ble": "0.16.0-alpha.0-20251217-038f88085",
|
|
51
|
+
"@matter/protocol": "0.16.0-alpha.0-20251217-038f88085",
|
|
52
|
+
"@matter/tools": "0.16.0-alpha.0-20251217-038f88085",
|
|
53
|
+
"@matter/types": "0.16.0-alpha.0-20251217-038f88085",
|
|
54
|
+
"@project-chip/matter.js": "0.16.0-alpha.0-20251217-038f88085",
|
|
55
55
|
"ws": "^8.18.3",
|
|
56
56
|
"yargs": "^18.0.0"
|
|
57
57
|
},
|
package/src/MatterNode.ts
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
import { Environment, Logger, SharedEnvironmentServices, StorageContext, StorageService } from "#general";
|
|
9
9
|
import { DclCertificateService, DclOtaUpdateService, DclVendorInfoService } from "#protocol";
|
|
10
10
|
import { NodeId } from "#types";
|
|
11
|
-
import { CommissioningController
|
|
11
|
+
import { CommissioningController } from "@project-chip/matter.js";
|
|
12
12
|
import { CommissioningControllerNodeOptions, Endpoint, PairedNode } from "@project-chip/matter.js/device";
|
|
13
13
|
import { join } from "node:path";
|
|
14
14
|
|
|
@@ -47,6 +47,13 @@ export class MatterNode {
|
|
|
47
47
|
return this.#services;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
+
get node() {
|
|
51
|
+
if (this.commissioningController === undefined) {
|
|
52
|
+
throw new Error("CommissioningController not initialized. Start first");
|
|
53
|
+
}
|
|
54
|
+
return this.commissioningController.node;
|
|
55
|
+
}
|
|
56
|
+
|
|
50
57
|
get otaService() {
|
|
51
58
|
if (!this.environment.has(DclOtaUpdateService)) {
|
|
52
59
|
new DclOtaUpdateService(this.environment); // Adds itself to the environment
|
|
@@ -90,22 +97,20 @@ export class MatterNode {
|
|
|
90
97
|
autoConnect: false,
|
|
91
98
|
adminFabricLabel: "matter.js Shell",
|
|
92
99
|
});
|
|
93
|
-
await this.commissioningController.initializeControllerStore();
|
|
94
|
-
|
|
95
|
-
const controllerStore = this.commissioningController.env.get(ControllerStore);
|
|
96
|
-
if (resetStorage) {
|
|
97
|
-
await controllerStore.erase();
|
|
98
|
-
}
|
|
99
|
-
this.#storageContext = controllerStore.storage.createContext("Node");
|
|
100
|
-
|
|
101
|
-
// Read DCL test certificates setting
|
|
102
|
-
this.#dclFetchTestCertificates = await this.#storageContext.get<boolean>("DclFetchTestCertificates", false);
|
|
103
100
|
|
|
104
101
|
const storageService = this.commissioningController.env.get(StorageService);
|
|
105
102
|
const baseLocation = storageService.location;
|
|
106
103
|
if (baseLocation !== undefined) {
|
|
107
104
|
this.#storageLocation = join(baseLocation, id);
|
|
108
105
|
}
|
|
106
|
+
|
|
107
|
+
if (resetStorage) {
|
|
108
|
+
await this.commissioningController.node.erase();
|
|
109
|
+
}
|
|
110
|
+
this.#storageContext = (await storageService.open(id)).createContext("Node");
|
|
111
|
+
|
|
112
|
+
// Read DCL test certificates setting
|
|
113
|
+
this.#dclFetchTestCertificates = await this.#storageContext.get<boolean>("DclFetchTestCertificates", false);
|
|
109
114
|
} else {
|
|
110
115
|
console.log(
|
|
111
116
|
"Legacy support was removed in Matter.js 0.13. Please downgrade or migrate the storage manually",
|
|
@@ -158,7 +163,9 @@ export class MatterNode {
|
|
|
158
163
|
return await this.commissioningController.connect(connectOptions);
|
|
159
164
|
}
|
|
160
165
|
|
|
161
|
-
const node = await this.commissioningController.connectNode(nodeId,
|
|
166
|
+
const node = await this.commissioningController.connectNode(nodeId, {
|
|
167
|
+
...connectOptions /*autoConnect: false*/,
|
|
168
|
+
});
|
|
162
169
|
if (!node.initialized) {
|
|
163
170
|
await node.events.initialized;
|
|
164
171
|
}
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
|
|
7
7
|
import { camelize, Diagnostic } from "#general";
|
|
8
8
|
import { AttributeModel, ClusterModel, MatterModel } from "#model";
|
|
9
|
-
import { SupportedAttributeClient } from "#protocol";
|
|
10
9
|
import { AttributeId, ClusterId, EndpointNumber, ValidationError } from "#types";
|
|
10
|
+
import { SupportedAttributeClient } from "@project-chip/matter.js/cluster";
|
|
11
11
|
import type { Argv } from "yargs";
|
|
12
12
|
import { MatterNode } from "../MatterNode.js";
|
|
13
13
|
import { convertJsonDataWithModel } from "../util/Json.js";
|