@matter/nodejs-shell 0.13.0-alpha.0-20250304-d4a7592a4 → 0.13.0-alpha.0-20250311-3eb0af5f2
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/README.md +1 -1
- package/dist/cjs/MatterNode.js +10 -28
- package/dist/cjs/MatterNode.js.map +1 -1
- package/dist/cjs/app.js +2 -7
- package/dist/cjs/app.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-attributes.js +12 -13
- package/dist/cjs/shell/cmd_cluster-attributes.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-commands.js +3 -4
- package/dist/cjs/shell/cmd_cluster-commands.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-events.js +2 -2
- package/dist/cjs/shell/cmd_cluster-events.js.map +1 -1
- package/dist/cjs/shell/cmd_commission.js +10 -11
- package/dist/cjs/shell/cmd_commission.js.map +1 -1
- package/dist/cjs/shell/cmd_discover.js +3 -4
- package/dist/cjs/shell/cmd_discover.js.map +1 -1
- package/dist/cjs/shell/cmd_identify.js +2 -2
- package/dist/cjs/shell/cmd_identify.js.map +1 -1
- package/dist/cjs/shell/cmd_nodes.js +4 -4
- package/dist/cjs/shell/cmd_nodes.js.map +1 -1
- package/dist/cjs/util/Json.js +3 -3
- package/dist/cjs/util/Json.js.map +1 -1
- package/package.json +6 -6
- package/src/MatterNode.ts +11 -31
- package/src/app.ts +2 -7
- package/src/shell/cmd_cluster-attributes.ts +2 -3
- package/src/shell/cmd_cluster-commands.ts +1 -2
- package/src/shell/cmd_cluster-events.ts +1 -1
- package/src/shell/cmd_commission.ts +2 -3
- package/src/shell/cmd_discover.ts +2 -3
- package/src/shell/cmd_identify.ts +1 -1
- package/src/shell/cmd_nodes.ts +1 -1
- package/src/util/Json.ts +1 -1
package/README.md
CHANGED
|
@@ -35,7 +35,7 @@ Please note the extra `--` to separate the npm parameters from the shell paramet
|
|
|
35
35
|
## matter.js v0.11 Storage adjustment!
|
|
36
36
|
In matter.js 0.11 we adjusted the storage to the new environment based one. This means that by default the storage is in the user directory in .matter/shell-XX where XX is the nodeNum you provided as parameter. You can adjust the storage base location with "--storage-path=..." as parameter.
|
|
37
37
|
|
|
38
|
-
|
|
38
|
+
Before matter.js 0.13 it was possible to use a former storage with "--legacyStorage" and the storage will be in the .matter-shell-XX directory in the local directory as before. This option was removed in matter,js 0.13.
|
|
39
39
|
To manually convert a storage you can follow the following steps. The described steps assume ./.matter-shell-XX is the old storage and ~/.matter/shell-XX is the new storage location.
|
|
40
40
|
|
|
41
41
|
* Stop the shell
|
package/dist/cjs/MatterNode.js
CHANGED
|
@@ -23,9 +23,8 @@ __export(MatterNode_exports, {
|
|
|
23
23
|
module.exports = __toCommonJS(MatterNode_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
25
|
var import_node = require("@matter/node");
|
|
26
|
-
var
|
|
26
|
+
var import_types = require("@matter/types");
|
|
27
27
|
var import_matter = require("@project-chip/matter.js");
|
|
28
|
-
var import_datatype = require("@project-chip/matter.js/datatype");
|
|
29
28
|
var import_node_path = require("node:path");
|
|
30
29
|
/**
|
|
31
30
|
* @license
|
|
@@ -34,20 +33,16 @@ var import_node_path = require("node:path");
|
|
|
34
33
|
*/
|
|
35
34
|
const logger = import_general.Logger.get("Node");
|
|
36
35
|
class MatterNode {
|
|
37
|
-
constructor(nodeNum, netInterface
|
|
36
|
+
constructor(nodeNum, netInterface) {
|
|
38
37
|
this.nodeNum = nodeNum;
|
|
39
38
|
this.netInterface = netInterface;
|
|
40
|
-
|
|
41
|
-
this.#environment = import_general.Environment.default;
|
|
42
|
-
}
|
|
39
|
+
this.#environment = import_general.Environment.default;
|
|
43
40
|
}
|
|
44
41
|
#storageLocation;
|
|
45
42
|
storage;
|
|
46
|
-
storageManager;
|
|
47
43
|
storageContext;
|
|
48
44
|
#environment;
|
|
49
45
|
commissioningController;
|
|
50
|
-
matterController;
|
|
51
46
|
started = false;
|
|
52
47
|
get storageLocation() {
|
|
53
48
|
return this.#storageLocation;
|
|
@@ -83,21 +78,10 @@ class MatterNode {
|
|
|
83
78
|
this.#storageLocation = (0, import_node_path.join)(baseLocation, id);
|
|
84
79
|
}
|
|
85
80
|
} else {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
await this.storageManager.initialize();
|
|
91
|
-
this.storageContext = this.storageManager.createContext("Node");
|
|
92
|
-
if (resetStorage) {
|
|
93
|
-
await this.storage.clearAll([]);
|
|
94
|
-
}
|
|
95
|
-
this.matterController = new import_matter.MatterServer(this.storageManager, { mdnsInterface: this.netInterface });
|
|
96
|
-
this.commissioningController = new import_matter.CommissioningController({
|
|
97
|
-
autoConnect: false,
|
|
98
|
-
adminFabricLabel: await this.Store.get("ControllerFabricLabel", "matter.js Shell")
|
|
99
|
-
});
|
|
100
|
-
await this.matterController.addCommissioningController(this.commissioningController);
|
|
81
|
+
console.log(
|
|
82
|
+
"Legacy support was removed in Matter.js 0.13. Please downgrade or migrate the storage manually"
|
|
83
|
+
);
|
|
84
|
+
process.exit(1);
|
|
101
85
|
}
|
|
102
86
|
}
|
|
103
87
|
get Store() {
|
|
@@ -107,7 +91,7 @@ class MatterNode {
|
|
|
107
91
|
return this.storageContext;
|
|
108
92
|
}
|
|
109
93
|
async close() {
|
|
110
|
-
await this.
|
|
94
|
+
await this.commissioningController?.close();
|
|
111
95
|
await this.closeStorage();
|
|
112
96
|
}
|
|
113
97
|
async closeStorage() {
|
|
@@ -123,9 +107,7 @@ class MatterNode {
|
|
|
123
107
|
return;
|
|
124
108
|
}
|
|
125
109
|
logger.info(`matter.js shell controller started for node ${this.nodeNum}`);
|
|
126
|
-
if (this.
|
|
127
|
-
await this.matterController.start();
|
|
128
|
-
} else if (this.commissioningController !== void 0) {
|
|
110
|
+
if (this.commissioningController !== void 0) {
|
|
129
111
|
await this.commissioningController.start();
|
|
130
112
|
} else {
|
|
131
113
|
throw new Error("No controller initialized");
|
|
@@ -134,7 +116,7 @@ class MatterNode {
|
|
|
134
116
|
}
|
|
135
117
|
async connectAndGetNodes(nodeIdStr, connectOptions) {
|
|
136
118
|
await this.start();
|
|
137
|
-
const nodeId = nodeIdStr !== void 0 ? (0,
|
|
119
|
+
const nodeId = nodeIdStr !== void 0 ? (0, import_types.NodeId)(BigInt(nodeIdStr)) : void 0;
|
|
138
120
|
if (this.commissioningController === void 0) {
|
|
139
121
|
throw new Error("CommissioningController not initialized");
|
|
140
122
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/MatterNode.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/cjs/app.js
CHANGED
|
@@ -105,18 +105,13 @@ async function main() {
|
|
|
105
105
|
description: "Logfile to use to log to. By Default debug loglevel is logged to the file. The provided value will be persisted for future runs.",
|
|
106
106
|
type: "string",
|
|
107
107
|
default: void 0
|
|
108
|
-
},
|
|
109
|
-
legacyStorage: {
|
|
110
|
-
description: "Use legacy storage structure (pre 0.11)",
|
|
111
|
-
type: "boolean",
|
|
112
|
-
default: false
|
|
113
108
|
}
|
|
114
109
|
});
|
|
115
110
|
},
|
|
116
111
|
async (argv) => {
|
|
117
112
|
if (argv.help) return;
|
|
118
|
-
const { nodeNum, ble, bleHciId, nodeType, factoryReset, netInterface, logfile
|
|
119
|
-
theNode = new import_MatterNode.MatterNode(nodeNum, netInterface
|
|
113
|
+
const { nodeNum, ble, bleHciId, nodeType, factoryReset, netInterface, logfile } = argv;
|
|
114
|
+
theNode = new import_MatterNode.MatterNode(nodeNum, netInterface);
|
|
120
115
|
await theNode.initialize(factoryReset);
|
|
121
116
|
if (logfile !== void 0) {
|
|
122
117
|
await theNode.Store.set("LogFile", logfile);
|
package/dist/cjs/app.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/app.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,qBAAuD;AACvD,oBAAiC;AACjC,wBAA0B;AAC1B,sBAAoB;AACpB,mBAAkB;AAClB,wBAA2B;AAC3B,mBAAsB;AAZtB;AAAA;AAAA;AAAA;AAAA;AAcA,MAAM,SAAS;AACf,MAAM,SAAS,sBAAO,IAAI,OAAO;AACjC,IAAI,QAAQ,OAAO,MAAO,uBAAO,SAAS,yBAAU;AAEpD,IAAI;AAEG,SAAS,YAAY,YAAoB,OAAqB;AACjE,MAAI,WAAW,wBAAS;AACxB,UAAQ,OAAO;AAAA,IACX,KAAK;AACD,iBAAW,wBAAS;AACpB;AAAA,IACJ,KAAK;AACD,iBAAW,wBAAS;AACpB;AAAA,IACJ,KAAK;AACD,iBAAW,wBAAS;AACpB;AAAA,IACJ,KAAK;AACD,iBAAW,wBAAS;AACpB;AAAA,EACR;AACA,wBAAO,4BAA4B,YAAY,QAAQ;AAC3D;AAKA,eAAe,OAAO;AAClB,QAAM,oBAAgB,aAAAA,SAAM,QAAQ,KAAK,MAAM,CAAC,CAAC,EAC5C;AAAA,IACG;AAAA,IACA;AAAA,IACA,CAAAA,WAAS;AACL,aAAOA,OACF,WAAW,YAAY;AAAA,QACpB,UAAU;AAAA,QACV,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC,EACA,WAAW,aAAa;AAAA,QACrB,UAAU;AAAA,QACV,SAAS,CAAC,YAAY;AAAA,QACtB,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC,EACA,QAAQ;AAAA,QACL,KAAK;AAAA,UACD,aAAa;AAAA,UACb,MAAM;AAAA,QACV;AAAA,QACA,UAAU;AAAA,UACN,aACI;AAAA,UACJ,MAAM;AAAA,UACN,SAAS;AAAA,QACb;AAAA,QACA,cAAc;AAAA,UACV,aAAa;AAAA,UACb,SAAS;AAAA,UACT,MAAM;AAAA,QACV;AAAA,QACA,cAAc;AAAA,UACV,aAAa;AAAA,UACb,MAAM;AAAA,UACN,SAAS;AAAA,QACb;AAAA,QACA,SAAS;AAAA,UACL,aACI;AAAA,UACJ,MAAM;AAAA,UACN,SAAS;AAAA,QACb;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -23,9 +23,8 @@ __export(cmd_cluster_attributes_exports, {
|
|
|
23
23
|
module.exports = __toCommonJS(cmd_cluster_attributes_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
25
|
var import_model = require("@matter/model");
|
|
26
|
-
var
|
|
27
|
-
var
|
|
28
|
-
var import_datatype = require("@project-chip/matter.js/datatype");
|
|
26
|
+
var import_protocol = require("@matter/protocol");
|
|
27
|
+
var import_types = require("@matter/types");
|
|
29
28
|
var import_Json = require("../util/Json");
|
|
30
29
|
var import_String = require("../util/String");
|
|
31
30
|
/**
|
|
@@ -66,9 +65,9 @@ function generateAllAttributeHandlersForCluster(yargs, theNode) {
|
|
|
66
65
|
const result = await interactionClient.getMultipleAttributes({
|
|
67
66
|
attributes: [
|
|
68
67
|
{
|
|
69
|
-
endpointId: (0,
|
|
70
|
-
clusterId: (0,
|
|
71
|
-
attributeId: attributeId !== void 0 ? (0,
|
|
68
|
+
endpointId: (0, import_types.EndpointNumber)(endpointId),
|
|
69
|
+
clusterId: (0, import_types.ClusterId)(clusterId),
|
|
70
|
+
attributeId: attributeId !== void 0 ? (0, import_types.AttributeId)(attributeId) : void 0
|
|
72
71
|
}
|
|
73
72
|
]
|
|
74
73
|
});
|
|
@@ -129,7 +128,7 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
129
128
|
const { nodeId, endpointId, remote } = argv;
|
|
130
129
|
const requestRemote = remote ? true : void 0;
|
|
131
130
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
132
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0,
|
|
131
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId));
|
|
133
132
|
if (clusterClient === void 0) {
|
|
134
133
|
console.log(
|
|
135
134
|
`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`
|
|
@@ -142,7 +141,7 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
142
141
|
for (const attribute of cluster.attributes) {
|
|
143
142
|
const attributeName = (0, import_String.camelize)(attribute.name);
|
|
144
143
|
const attributeClient = clusterClient.attributes[attributeName];
|
|
145
|
-
if (!(attributeClient instanceof
|
|
144
|
+
if (!(attributeClient instanceof import_protocol.SupportedAttributeClient)) {
|
|
146
145
|
continue;
|
|
147
146
|
}
|
|
148
147
|
console.log(
|
|
@@ -210,13 +209,13 @@ function generateAttributeReadHandler(yargs, clusterId, clusterName, attribute,
|
|
|
210
209
|
const { nodeId, endpointId, remote } = argv;
|
|
211
210
|
const requestRemote = remote ? true : void 0;
|
|
212
211
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
213
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0,
|
|
212
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId));
|
|
214
213
|
if (clusterClient === void 0) {
|
|
215
214
|
console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
|
|
216
215
|
return;
|
|
217
216
|
}
|
|
218
217
|
const attributeClient = clusterClient.attributes[attributeName];
|
|
219
|
-
if (!(attributeClient instanceof
|
|
218
|
+
if (!(attributeClient instanceof import_protocol.SupportedAttributeClient)) {
|
|
220
219
|
console.log(
|
|
221
220
|
`ERROR: Attribute ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} not supported.`
|
|
222
221
|
);
|
|
@@ -265,13 +264,13 @@ function generateAttributeWriteHandler(yargs, clusterId, clusterName, attribute,
|
|
|
265
264
|
}
|
|
266
265
|
}
|
|
267
266
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
268
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0,
|
|
267
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId));
|
|
269
268
|
if (clusterClient === void 0) {
|
|
270
269
|
console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
|
|
271
270
|
return;
|
|
272
271
|
}
|
|
273
272
|
const attributeClient = clusterClient.attributes[attributeName];
|
|
274
|
-
if (!(attributeClient instanceof
|
|
273
|
+
if (!(attributeClient instanceof import_protocol.SupportedAttributeClient)) {
|
|
275
274
|
console.log(
|
|
276
275
|
`ERROR: Attribute ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} not supported.`
|
|
277
276
|
);
|
|
@@ -284,7 +283,7 @@ function generateAttributeWriteHandler(yargs, clusterId, clusterName, attribute,
|
|
|
284
283
|
`Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${import_general.Logger.toJSON(value)}`
|
|
285
284
|
);
|
|
286
285
|
} catch (error) {
|
|
287
|
-
if (error instanceof
|
|
286
|
+
if (error instanceof import_types.ValidationError) {
|
|
288
287
|
console.log(
|
|
289
288
|
`ERROR: Could not validate data for attribute ${attribute.name} to ${import_general.Logger.toJSON(parsedValue)}: ${error}${error.fieldName !== void 0 ? ` in field ${error.fieldName}` : ""}`
|
|
290
289
|
);
|
|
@@ -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,qBAAmC;AACnC,mBAA0D;AAC1D,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs", "attributeId"]
|
|
6
6
|
}
|
|
@@ -23,8 +23,7 @@ __export(cmd_cluster_commands_exports, {
|
|
|
23
23
|
module.exports = __toCommonJS(cmd_cluster_commands_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
25
|
var import_model = require("@matter/model");
|
|
26
|
-
var
|
|
27
|
-
var import_datatype = require("@project-chip/matter.js/datatype");
|
|
26
|
+
var import_types = require("@matter/types");
|
|
28
27
|
var import_Json = require("../util/Json");
|
|
29
28
|
var import_String = require("../util/String");
|
|
30
29
|
/**
|
|
@@ -113,7 +112,7 @@ function generateCommandHandler(yargs, clusterId, clusterName, command, theNode)
|
|
|
113
112
|
async function executeCommand(theNode, nodeId, endpointId, clusterId, command, requestData) {
|
|
114
113
|
const commandName = (0, import_String.camelize)(command.name);
|
|
115
114
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
116
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0,
|
|
115
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId));
|
|
117
116
|
if (clusterClient === void 0) {
|
|
118
117
|
console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
|
|
119
118
|
return;
|
|
@@ -134,7 +133,7 @@ async function executeCommand(theNode, nodeId, endpointId, clusterId, command, r
|
|
|
134
133
|
console.log(`Result: ${import_general.Logger.toJSON(result)}`);
|
|
135
134
|
}
|
|
136
135
|
} catch (error) {
|
|
137
|
-
if (error instanceof
|
|
136
|
+
if (error instanceof import_types.ValidationError) {
|
|
138
137
|
console.log(
|
|
139
138
|
`ERROR: Could not validate data for command ${command.name} with ${import_general.Logger.toJSON(requestData)}: ${error}${error.fieldName !== void 0 ? ` in field ${error.fieldName}` : ""}`
|
|
140
139
|
);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_cluster-commands.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AACvB,mBAAwD;AACxD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -23,7 +23,7 @@ __export(cmd_cluster_events_exports, {
|
|
|
23
23
|
module.exports = __toCommonJS(cmd_cluster_events_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
25
|
var import_model = require("@matter/model");
|
|
26
|
-
var
|
|
26
|
+
var import_types = require("@matter/types");
|
|
27
27
|
var import_String = require("../util/String");
|
|
28
28
|
/**
|
|
29
29
|
* @license
|
|
@@ -72,7 +72,7 @@ function generateEventHandler(yargs, clusterId, clusterName, event, theNode) {
|
|
|
72
72
|
async (argv) => {
|
|
73
73
|
const { nodeId, endpointId } = argv;
|
|
74
74
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
75
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0,
|
|
75
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId));
|
|
76
76
|
if (clusterClient === void 0) {
|
|
77
77
|
console.log(`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`);
|
|
78
78
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_cluster-events.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AACvB,mBAAsD;AACtD,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AACvB,mBAAsD;AACtD,mBAA0B;AAG1B,oBAAyB;AAXzB;AAAA;AAAA;AAAA;AAAA;AAaA,SAAS,mCAAmC,OAAa,SAAqB;AAC1E,2BAAY,SAAS,SAAS,QAAQ,aAAW;AAC7C,YAAQ,6BAA6B,OAAO,SAAS,OAAO;AAAA,EAChE,CAAC;AACD,SAAO;AACX;AAEA,SAAS,6BAA6B,OAAa,SAAuB,SAAqB;AAC3F,MAAI,QAAQ,OAAO,QAAW;AAC1B,WAAO;AAAA,EACX;AACA,UAAQ,MAAM;AAAA,IACV,CAAC,QAAQ,KAAK,YAAY,GAAG,KAAK,QAAQ,GAAG,SAAS,EAAE,CAAC,EAAE;AAAA,IAC3D,QAAQ,QAAQ,IAAI;AAAA,IACpB,CAAAA,WAAS;AACL,cAAQ,OAAO,QAAQ,WAAS;AAC5B,QAAAA,SAAQ,qBAAqBA,QAAO,QAAQ,IAAI,QAAQ,MAAM,OAAO,OAAO;AAAA,MAChF,CAAC;AACD,aAAOA;AAAA,IACX;AAAA,IACA,OAAO,SAAc;AACjB,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AAEA,SAAO;AACX;AAEA,SAAS,qBACL,OACA,WACA,aACA,OACA,SACF;AAEE,QAAM,gBAAY,wBAAS,MAAM,IAAI;AACrC,SAAO,MAAM;AAAA,IACT,CAAC,GAAG,MAAM,KAAK,YAAY,CAAC,4BAA4B,KAAK,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE;AAAA,IACpF,QAAQ,WAAW,IAAI,MAAM,IAAI;AAAA,IACjC,CAAAA,WACIA,OACK,WAAW,eAAe;AAAA,MACvB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC,EACA,WAAW,WAAW;AAAA,MACnB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC;AAAA,IACT,OAAM,SAAQ;AACV,YAAM,EAAE,QAAQ,WAAW,IAAI;AAC/B,YAAM,QAAQ,MAAM,QAAQ,mBAAmB,MAAM,GAAG,CAAC;AAEzD,YAAM,gBAAgB,KAAK,cAAc,UAAU,GAAG,yBAAqB,wBAAU,SAAS,CAAC;AAC/F,UAAI,kBAAkB,QAAW;AAC7B,gBAAQ,IAAI,kBAAkB,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,aAAa;AAC5F;AAAA,MACJ;AACA,YAAM,cAAc,cAAc,OAAO,SAAS;AAClD,cAAQ;AAAA,QACJ,mBAAmB,SAAS,IAAI,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,IAAI,MAAM,EAAE,KAAK,sBAAO,OAAO,MAAM,YAAY,IAAI,CAAC,CAAC;AAAA,MAC5I;AAAA,IACJ;AAAA,EACJ;AACJ;AAEe,SAAR,UAA2B,SAAqB;AACnD,SAAO;AAAA,IACH,SAAS,CAAC,UAAU,GAAG;AAAA,IACvB,UAAU;AAAA,IACV,SAAS,CAAC,UAAgB,mCAAmC,OAAO,OAAO;AAAA,IAC3E,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -22,9 +22,8 @@ __export(cmd_commission_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(cmd_commission_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
|
-
var
|
|
26
|
-
var
|
|
27
|
-
var import_schema = require("@project-chip/matter.js/schema");
|
|
25
|
+
var import_types = require("@matter/types");
|
|
26
|
+
var import_clusters = require("@matter/types/clusters");
|
|
28
27
|
var import_cmd_nodes = require("./cmd_nodes");
|
|
29
28
|
/**
|
|
30
29
|
* @license
|
|
@@ -65,14 +64,14 @@ function commands(theNode) {
|
|
|
65
64
|
} = argv;
|
|
66
65
|
let { setupPinCode, discriminator, shortDiscriminator } = argv;
|
|
67
66
|
if (typeof pairingCode === "string") {
|
|
68
|
-
const { shortDiscriminator: pairingCodeShortDiscriminator, passcode } =
|
|
67
|
+
const { shortDiscriminator: pairingCodeShortDiscriminator, passcode } = import_types.ManualPairingCodeCodec.decode(pairingCode);
|
|
69
68
|
shortDiscriminator = pairingCodeShortDiscriminator;
|
|
70
69
|
setupPinCode = passcode;
|
|
71
70
|
discriminator = void 0;
|
|
72
71
|
} else if (discriminator === void 0 && shortDiscriminator === void 0) {
|
|
73
72
|
discriminator = 3840;
|
|
74
73
|
}
|
|
75
|
-
const nodeId = nodeIdStr !== void 0 ? (0,
|
|
74
|
+
const nodeId = nodeIdStr !== void 0 ? (0, import_types.NodeId)(BigInt(nodeIdStr)) : void 0;
|
|
76
75
|
await theNode.start();
|
|
77
76
|
if (theNode.commissioningController === void 0) {
|
|
78
77
|
throw new Error("CommissioningController not initialized");
|
|
@@ -90,8 +89,8 @@ function commands(theNode) {
|
|
|
90
89
|
...(0, import_cmd_nodes.createDiagnosticCallbacks)()
|
|
91
90
|
};
|
|
92
91
|
options.commissioning = {
|
|
93
|
-
nodeId: nodeId !== void 0 ? (0,
|
|
94
|
-
regulatoryLocation:
|
|
92
|
+
nodeId: nodeId !== void 0 ? (0, import_types.NodeId)(nodeId) : void 0,
|
|
93
|
+
regulatoryLocation: import_clusters.GeneralCommissioning.RegulatoryLocationType.Outdoor,
|
|
95
94
|
// Set to the most restrictive if relevant
|
|
96
95
|
regulatoryCountryCode: "XX"
|
|
97
96
|
};
|
|
@@ -117,14 +116,14 @@ function commands(theNode) {
|
|
|
117
116
|
if (node === void 0) {
|
|
118
117
|
throw new import_general.MatterError("Node not found after commissioning.");
|
|
119
118
|
}
|
|
120
|
-
const descriptor = node.getRootClusterClient(
|
|
119
|
+
const descriptor = node.getRootClusterClient(import_clusters.DescriptorCluster);
|
|
121
120
|
if (descriptor !== void 0) {
|
|
122
121
|
console.log(await descriptor.attributes.deviceTypeList.get());
|
|
123
122
|
console.log(await descriptor.getServerListAttribute());
|
|
124
123
|
} else {
|
|
125
124
|
console.log("No Descriptor Cluster found. This should never happen!");
|
|
126
125
|
}
|
|
127
|
-
const info = node.getRootClusterClient(
|
|
126
|
+
const info = node.getRootClusterClient(import_clusters.BasicInformationCluster);
|
|
128
127
|
if (info !== void 0) {
|
|
129
128
|
console.log(await info.getProductNameAttribute());
|
|
130
129
|
} else {
|
|
@@ -206,7 +205,7 @@ function commands(theNode) {
|
|
|
206
205
|
const data = await node.openEnhancedCommissioningWindow(timeout);
|
|
207
206
|
console.log(`Enhanced Commissioning Window for node ${nodeId} opened`);
|
|
208
207
|
const { qrPairingCode, manualPairingCode } = data;
|
|
209
|
-
console.log(
|
|
208
|
+
console.log(import_types.QrCode.get(qrPairingCode));
|
|
210
209
|
console.log(
|
|
211
210
|
`QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`
|
|
212
211
|
);
|
|
@@ -232,7 +231,7 @@ function commands(theNode) {
|
|
|
232
231
|
await theNode.start();
|
|
233
232
|
const { nodeId, force } = argv;
|
|
234
233
|
if (force) {
|
|
235
|
-
await theNode.controller.removeNode((0,
|
|
234
|
+
await theNode.controller.removeNode((0, import_types.NodeId)(BigInt(nodeId)), !force);
|
|
236
235
|
} else {
|
|
237
236
|
const node = (await theNode.connectAndGetNodes(nodeId, { autoSubscribe: false }))[0];
|
|
238
237
|
await node.decommission();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_commission.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAoC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -22,8 +22,7 @@ __export(cmd_discover_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(cmd_discover_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
|
-
var
|
|
26
|
-
var import_schema = require("@project-chip/matter.js/schema");
|
|
25
|
+
var import_types = require("@matter/types");
|
|
27
26
|
/**
|
|
28
27
|
* @license
|
|
29
28
|
* Copyright 2022-2025 Matter.js Authors
|
|
@@ -89,7 +88,7 @@ function commands(theNode) {
|
|
|
89
88
|
const { ble = false, pairingCode, vendorId, productId, deviceType, timeoutSeconds } = argv;
|
|
90
89
|
let { discriminator, shortDiscriminator } = argv;
|
|
91
90
|
if (typeof pairingCode === "string") {
|
|
92
|
-
const { shortDiscriminator: pairingCodeShortDiscriminator } =
|
|
91
|
+
const { shortDiscriminator: pairingCodeShortDiscriminator } = import_types.ManualPairingCodeCodec.decode(pairingCode);
|
|
93
92
|
shortDiscriminator = pairingCodeShortDiscriminator;
|
|
94
93
|
discriminator = void 0;
|
|
95
94
|
}
|
|
@@ -97,7 +96,7 @@ function commands(theNode) {
|
|
|
97
96
|
if (theNode.commissioningController === void 0) {
|
|
98
97
|
throw new Error("CommissioningController not initialized");
|
|
99
98
|
}
|
|
100
|
-
const identifierData = discriminator !== void 0 ? { longDiscriminator: discriminator } : shortDiscriminator !== void 0 ? { shortDiscriminator } : vendorId !== void 0 ? { vendorId: (0,
|
|
99
|
+
const identifierData = discriminator !== void 0 ? { longDiscriminator: discriminator } : shortDiscriminator !== void 0 ? { shortDiscriminator } : vendorId !== void 0 ? { vendorId: (0, import_types.VendorId)(vendorId) } : productId !== void 0 ? { productId } : deviceType !== void 0 ? { deviceType } : {};
|
|
101
100
|
console.log(
|
|
102
101
|
`Discover devices with identifier ${import_general.Logger.toJSON(
|
|
103
102
|
identifierData
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_discover.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AAEvB,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAuB;AAEvB,mBAAiD;AARjD;AAAA;AAAA;AAAA;AAAA;AAYe,SAAR,SAA0B,SAAqB;AAClD,SAAO;AAAA,IACH,SAAS;AAAA,IACT,UAAU;AAAA,IACV,SAAS,CAAC,UACN,MAEK;AAAA,MACG;AAAA,MACA;AAAA,MACA,MAAM;AACF,eAAO,MACF,WAAW,mBAAmB;AAAA,UAC3B,UAAU;AAAA,UACV,SAAS;AAAA,UACT,MAAM;AAAA,QACV,CAAC,EACA,QAAQ;AAAA,UACL,aAAa;AAAA,YACT,UAAU;AAAA,YACV,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,eAAe;AAAA,YACX,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,oBAAoB;AAAA,YAChB,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,UAAU;AAAA,YACN,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,WAAW;AAAA,YACP,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,YAAY;AAAA,YACR,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,KAAK;AAAA,YACD,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,QACJ,CAAC;AAAA,MACT;AAAA,MACA,OAAM,SAAQ;AACV,cAAM,EAAE,MAAM,OAAO,aAAa,UAAU,WAAW,YAAY,eAAe,IAAI;AACtF,YAAI,EAAE,eAAe,mBAAmB,IAAI;AAE5C,YAAI,OAAO,gBAAgB,UAAU;AACjC,gBAAM,EAAE,oBAAoB,8BAA8B,IACtD,oCAAuB,OAAO,WAAW;AAC7C,+BAAqB;AACrB,0BAAgB;AAAA,QACpB;AAEA,cAAM,QAAQ,MAAM;AACpB,YAAI,QAAQ,4BAA4B,QAAW;AAC/C,gBAAM,IAAI,MAAM,yCAAyC;AAAA,QAC7D;AAEA,cAAM,iBACF,kBAAkB,SACZ,EAAE,mBAAmB,cAAc,IACnC,uBAAuB,SACrB,EAAE,mBAAmB,IACrB,aAAa,SACX,EAAE,cAAU,uBAAS,QAAQ,EAAE,IAC/B,cAAc,SACZ,EAAE,UAAU,IACZ,eAAe,SACb,EAAE,WAAW,IACb,CAAC;AAEnB,gBAAQ;AAAA,UACJ,oCAAoC,sBAAO;AAAA,YACvC;AAAA,UACJ,CAAC,QAAQ,cAAc;AAAA,QAC3B;AAEA,cAAM,UAAU,MAAM,QAAQ,wBAAwB;AAAA,UAClD;AAAA,UACA;AAAA,YACI;AAAA,YACA,aAAa;AAAA,UACjB;AAAA,UACA,YAAU,QAAQ,IAAI,qBAAqB,sBAAO,OAAO,MAAM,CAAC,EAAE;AAAA,UAClE;AAAA,QACJ;AAEA,gBAAQ,IAAI,cAAc,QAAQ,MAAM,YAAY,OAAO;AAAA,MAC/D;AAAA,IACJ;AAAA,IACR,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -21,7 +21,7 @@ __export(cmd_identify_exports, {
|
|
|
21
21
|
default: () => commands
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(cmd_identify_exports);
|
|
24
|
-
var
|
|
24
|
+
var import_clusters = require("@matter/types/clusters");
|
|
25
25
|
/**
|
|
26
26
|
* @license
|
|
27
27
|
* Copyright 2022-2025 Matter.js Authors
|
|
@@ -51,7 +51,7 @@ function commands(theNode) {
|
|
|
51
51
|
await theNode.iterateNodeDevices(
|
|
52
52
|
await theNode.connectAndGetNodes(nodeId),
|
|
53
53
|
async (device, node) => {
|
|
54
|
-
const identifyCluster = device.getClusterClient(
|
|
54
|
+
const identifyCluster = device.getClusterClient(import_clusters.IdentifyCluster);
|
|
55
55
|
if (identifyCluster === void 0) {
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_identify.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAAgC;AANhC;AAAA;AAAA;AAAA;AAAA;AAUe,SAAR,SAA0B,SAAqB;AAClD,SAAO;AAAA,IACH,SAAS;AAAA,IACT,UACI;AAAA,IACJ,SAAS,CAAC,UAAgB;AACtB,aAAO,MACF,WAAW,QAAQ;AAAA,QAChB,UAAU;AAAA,QACV,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC,EACA,WAAW,WAAW;AAAA,QACnB,UAAU;AAAA,QACV,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC,EACA,WAAW,eAAe;AAAA,QACvB,UAAU;AAAA,QACV,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC;AAAA,IACT;AAAA,IAEA,SAAS,OAAO,SAAc;AAC1B,YAAM,EAAE,QAAQ,OAAO,IAAI,WAAW,IAAI;AAC1C,YAAM,QAAQ;AAAA,QACV,MAAM,QAAQ,mBAAmB,MAAM;AAAA,QACvC,OAAO,QAAQ,SAAS;AACpB,gBAAM,kBAAkB,OAAO,iBAAiB,+BAAe;AAC/D,cAAI,oBAAoB,QAAW;AAC/B;AAAA,UACJ;AACA,kBAAQ,IAAI,uBAAuB,KAAK,OAAO,SAAS,CAAC;AACzD,gBAAM,gBAAgB,SAAS,EAAE,cAAc,KAAK,CAAC;AAAA,QACzD;AAAA,QACA;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -23,7 +23,7 @@ __export(cmd_nodes_exports, {
|
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(cmd_nodes_exports);
|
|
25
25
|
var import_general = require("@matter/general");
|
|
26
|
-
var
|
|
26
|
+
var import_types = require("@matter/types");
|
|
27
27
|
var import_device = require("@project-chip/matter.js/device");
|
|
28
28
|
/**
|
|
29
29
|
* @license
|
|
@@ -148,7 +148,7 @@ function commands(theNode) {
|
|
|
148
148
|
}
|
|
149
149
|
let nodeIds = theNode.commissioningController.getCommissionedNodes();
|
|
150
150
|
if (nodeIdStr !== "all") {
|
|
151
|
-
const cmdNodeId = (0,
|
|
151
|
+
const cmdNodeId = (0, import_types.NodeId)(BigInt(nodeIdStr));
|
|
152
152
|
nodeIds = nodeIds.filter((nodeId) => nodeId === cmdNodeId);
|
|
153
153
|
if (!nodeIds.length) {
|
|
154
154
|
throw new Error(`Node ${nodeIdStr} not commissioned`);
|
|
@@ -183,7 +183,7 @@ function commands(theNode) {
|
|
|
183
183
|
}
|
|
184
184
|
let nodeIds = theNode.commissioningController.getCommissionedNodes();
|
|
185
185
|
if (nodeIdStr !== "all") {
|
|
186
|
-
const cmdNodeId = (0,
|
|
186
|
+
const cmdNodeId = (0, import_types.NodeId)(BigInt(nodeIdStr));
|
|
187
187
|
nodeIds = nodeIds.filter((nodeId) => nodeId === cmdNodeId);
|
|
188
188
|
if (!nodeIds.length) {
|
|
189
189
|
throw new Error(`Node ${nodeIdStr} not commissioned`);
|
|
@@ -216,7 +216,7 @@ function commands(theNode) {
|
|
|
216
216
|
}
|
|
217
217
|
let nodeIds = theNode.commissioningController.getCommissionedNodes();
|
|
218
218
|
if (nodeIdStr !== "all") {
|
|
219
|
-
const nodeIdList = nodeIdStr.split(",").map((nodeId) => (0,
|
|
219
|
+
const nodeIdList = nodeIdStr.split(",").map((nodeId) => (0, import_types.NodeId)(BigInt(nodeId)));
|
|
220
220
|
nodeIds = nodeIds.filter((nodeId) => nodeIdList.includes(nodeId));
|
|
221
221
|
if (!nodeIds.length) {
|
|
222
222
|
throw new Error(`Node ${nodeIdStr} not commissioned`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_nodes.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA+C;AAC/C,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
package/dist/cjs/util/Json.js
CHANGED
|
@@ -22,7 +22,7 @@ __export(Json_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(Json_exports);
|
|
24
24
|
var import_general = require("@matter/general");
|
|
25
|
-
var
|
|
25
|
+
var import_types = require("@matter/types");
|
|
26
26
|
var import_String = require("./String");
|
|
27
27
|
/**
|
|
28
28
|
* @license
|
|
@@ -34,12 +34,12 @@ function convertJsonDataWithModel(model, data) {
|
|
|
34
34
|
switch (definingModel.effectiveMetatype) {
|
|
35
35
|
case "array":
|
|
36
36
|
if (!Array.isArray(data)) {
|
|
37
|
-
throw new
|
|
37
|
+
throw new import_types.ValidationDatatypeMismatchError(`Expected array, got ${typeof data}`);
|
|
38
38
|
}
|
|
39
39
|
return data.map((item) => convertJsonDataWithModel(definingModel.children[0], item));
|
|
40
40
|
case "object":
|
|
41
41
|
if (typeof data !== "object") {
|
|
42
|
-
throw new
|
|
42
|
+
throw new import_types.ValidationDatatypeMismatchError(`Expected object, got ${typeof data}`);
|
|
43
43
|
}
|
|
44
44
|
for (const child of definingModel.children) {
|
|
45
45
|
const childKeyName = (0, import_String.camelize)(child.name);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/util/Json.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAsB;AAEtB,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAsB;AAEtB,mBAAgD;AAChD,oBAAyB;AATzB;AAAA;AAAA;AAAA;AAAA;AAWO,SAAS,yBAAyB,OAAmB,MAAgB;AACxE,QAAM,gBAAgB,MAAM,iBAAiB;AAC7C,UAAQ,cAAc,mBAAmB;AAAA,IACrC,KAAK;AACD,UAAI,CAAC,MAAM,QAAQ,IAAI,GAAG;AACtB,cAAM,IAAI,6CAAgC,uBAAuB,OAAO,IAAI,EAAE;AAAA,MAClF;AACA,aAAO,KAAK,IAAI,UAAQ,yBAAyB,cAAc,SAAS,CAAC,GAAG,IAAI,CAAC;AAAA,IACrF,KAAK;AACD,UAAI,OAAO,SAAS,UAAU;AAC1B,cAAM,IAAI,6CAAgC,wBAAwB,OAAO,IAAI,EAAE;AAAA,MACnF;AACA,iBAAW,SAAS,cAAc,UAAU;AACxC,cAAM,mBAAe,wBAAS,MAAM,IAAI;AACxC,aAAK,YAAY,IAAI,yBAAyB,OAAO,KAAK,YAAY,CAAC;AAAA,MAC3E;AACA,aAAO;AAAA,IACX,KAAK;AACD,UAAI,OAAO,SAAS,UAAU;AAC1B,YAAI,cAAc,UAAU,aAAa,UAAa,cAAc,SAAS,WAAW,GAAG;AAGvF,iBAAO,OAAO,IAAI;AAAA,QACtB,WAAW,KAAK,WAAW,IAAI,GAAG;AAE9B,iBAAO,SAAS,KAAK,UAAU,CAAC,GAAG,EAAE;AAAA,QACzC;AAAA,MACJ;AACA;AAAA,IACJ,KAAK;AACD,UAAI,OAAO,SAAS,UAAU;AAE1B,eAAO,qBAAM,QAAQ,IAAI;AAAA,MAC7B;AACA;AAAA,EACR;AAEA,SAAO;AACX;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/nodejs-shell",
|
|
3
|
-
"version": "0.13.0-alpha.0-
|
|
3
|
+
"version": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
4
4
|
"description": "Shell app for Matter controller",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
"#types": "@matter/types"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@matter/general": "0.13.0-alpha.0-
|
|
40
|
-
"@matter/nodejs": "0.13.0-alpha.0-
|
|
41
|
-
"@matter/nodejs-ble": "0.13.0-alpha.0-
|
|
42
|
-
"@matter/tools": "0.13.0-alpha.0-
|
|
43
|
-
"@project-chip/matter.js": "0.13.0-alpha.0-
|
|
39
|
+
"@matter/general": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
40
|
+
"@matter/nodejs": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
41
|
+
"@matter/nodejs-ble": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
42
|
+
"@matter/tools": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
43
|
+
"@project-chip/matter.js": "0.13.0-alpha.0-20250311-3eb0af5f2",
|
|
44
44
|
"yargs": "^17.7.2"
|
|
45
45
|
},
|
|
46
46
|
"engines": {
|
package/src/MatterNode.ts
CHANGED
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
// Include this first to auto-register Crypto, Network and Time Node.js implementations
|
|
8
|
-
import { Environment, Logger, StorageContext,
|
|
8
|
+
import { Environment, Logger, StorageContext, StorageService } from "@matter/general";
|
|
9
9
|
import { ControllerStore } from "@matter/node";
|
|
10
10
|
import { StorageBackendDiskAsync } from "@matter/nodejs";
|
|
11
|
-
import {
|
|
12
|
-
import { NodeId } from "@
|
|
11
|
+
import { EndpointInterface } from "@matter/protocol";
|
|
12
|
+
import { NodeId } from "@matter/types";
|
|
13
|
+
import { CommissioningController } from "@project-chip/matter.js";
|
|
13
14
|
import { CommissioningControllerNodeOptions, PairedNode } from "@project-chip/matter.js/device";
|
|
14
|
-
import { EndpointInterface } from "@project-chip/matter.js/endpoint";
|
|
15
15
|
import { join } from "node:path";
|
|
16
16
|
|
|
17
17
|
const logger = Logger.get("Node");
|
|
@@ -19,22 +19,17 @@ const logger = Logger.get("Node");
|
|
|
19
19
|
export class MatterNode {
|
|
20
20
|
#storageLocation?: string;
|
|
21
21
|
private storage?: StorageBackendDiskAsync;
|
|
22
|
-
private storageManager?: StorageManager;
|
|
23
22
|
private storageContext?: StorageContext;
|
|
24
23
|
|
|
25
24
|
#environment?: Environment;
|
|
26
25
|
commissioningController?: CommissioningController;
|
|
27
|
-
private matterController?: MatterServer;
|
|
28
26
|
private started = false;
|
|
29
27
|
|
|
30
28
|
constructor(
|
|
31
29
|
private readonly nodeNum: number,
|
|
32
30
|
private readonly netInterface?: string,
|
|
33
|
-
useLegacyStorage = true,
|
|
34
31
|
) {
|
|
35
|
-
|
|
36
|
-
this.#environment = Environment.default;
|
|
37
|
-
}
|
|
32
|
+
this.#environment = Environment.default;
|
|
38
33
|
}
|
|
39
34
|
|
|
40
35
|
get storageLocation() {
|
|
@@ -83,23 +78,10 @@ export class MatterNode {
|
|
|
83
78
|
this.#storageLocation = join(baseLocation, id);
|
|
84
79
|
}
|
|
85
80
|
} else {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
await this.storageManager.initialize();
|
|
91
|
-
this.storageContext = this.storageManager.createContext("Node");
|
|
92
|
-
if (resetStorage) {
|
|
93
|
-
await this.storage.clearAll([]);
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
// Build up the legacy Controller
|
|
97
|
-
this.matterController = new MatterServer(this.storageManager, { mdnsInterface: this.netInterface });
|
|
98
|
-
this.commissioningController = new CommissioningController({
|
|
99
|
-
autoConnect: false,
|
|
100
|
-
adminFabricLabel: await this.Store.get<string>("ControllerFabricLabel", "matter.js Shell"),
|
|
101
|
-
});
|
|
102
|
-
await this.matterController.addCommissioningController(this.commissioningController);
|
|
81
|
+
console.log(
|
|
82
|
+
"Legacy support was removed in Matter.js 0.13. Please downgrade or migrate the storage manually",
|
|
83
|
+
);
|
|
84
|
+
process.exit(1);
|
|
103
85
|
}
|
|
104
86
|
}
|
|
105
87
|
|
|
@@ -111,7 +93,7 @@ export class MatterNode {
|
|
|
111
93
|
}
|
|
112
94
|
|
|
113
95
|
async close() {
|
|
114
|
-
await this.
|
|
96
|
+
await this.commissioningController?.close();
|
|
115
97
|
await this.closeStorage();
|
|
116
98
|
}
|
|
117
99
|
|
|
@@ -130,9 +112,7 @@ export class MatterNode {
|
|
|
130
112
|
}
|
|
131
113
|
logger.info(`matter.js shell controller started for node ${this.nodeNum}`);
|
|
132
114
|
|
|
133
|
-
if (this.
|
|
134
|
-
await this.matterController.start();
|
|
135
|
-
} else if (this.commissioningController !== undefined) {
|
|
115
|
+
if (this.commissioningController !== undefined) {
|
|
136
116
|
await this.commissioningController.start();
|
|
137
117
|
} else {
|
|
138
118
|
throw new Error("No controller initialized");
|
package/src/app.ts
CHANGED
|
@@ -86,19 +86,14 @@ async function main() {
|
|
|
86
86
|
type: "string",
|
|
87
87
|
default: undefined,
|
|
88
88
|
},
|
|
89
|
-
legacyStorage: {
|
|
90
|
-
description: "Use legacy storage structure (pre 0.11)",
|
|
91
|
-
type: "boolean",
|
|
92
|
-
default: false,
|
|
93
|
-
},
|
|
94
89
|
});
|
|
95
90
|
},
|
|
96
91
|
async argv => {
|
|
97
92
|
if (argv.help) return;
|
|
98
93
|
|
|
99
|
-
const { nodeNum, ble, bleHciId, nodeType, factoryReset, netInterface, logfile
|
|
94
|
+
const { nodeNum, ble, bleHciId, nodeType, factoryReset, netInterface, logfile } = argv;
|
|
100
95
|
|
|
101
|
-
theNode = new MatterNode(nodeNum, netInterface
|
|
96
|
+
theNode = new MatterNode(nodeNum, netInterface);
|
|
102
97
|
await theNode.initialize(factoryReset);
|
|
103
98
|
|
|
104
99
|
if (logfile !== undefined) {
|
|
@@ -6,9 +6,8 @@
|
|
|
6
6
|
|
|
7
7
|
import { Diagnostic, Logger } from "@matter/general";
|
|
8
8
|
import { AttributeModel, ClusterModel, MatterModel } from "@matter/model";
|
|
9
|
-
import { SupportedAttributeClient } from "@
|
|
10
|
-
import { ValidationError } from "@
|
|
11
|
-
import { AttributeId, ClusterId, EndpointNumber } from "@project-chip/matter.js/datatype";
|
|
9
|
+
import { SupportedAttributeClient } from "@matter/protocol";
|
|
10
|
+
import { AttributeId, ClusterId, EndpointNumber, ValidationError } from "@matter/types";
|
|
12
11
|
import type { Argv } from "yargs";
|
|
13
12
|
import { MatterNode } from "../MatterNode";
|
|
14
13
|
import { convertJsonDataWithModel } from "../util/Json";
|
|
@@ -6,8 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import { Logger } from "@matter/general";
|
|
8
8
|
import { ClusterModel, CommandModel, MatterModel } from "@matter/model";
|
|
9
|
-
import { ValidationError } from "@
|
|
10
|
-
import { ClusterId } from "@project-chip/matter.js/datatype";
|
|
9
|
+
import { ClusterId, ValidationError } from "@matter/types";
|
|
11
10
|
import type { Argv } from "yargs";
|
|
12
11
|
import { MatterNode } from "../MatterNode";
|
|
13
12
|
import { convertJsonDataWithModel } from "../util/Json";
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import { Logger } from "@matter/general";
|
|
8
8
|
import { ClusterModel, EventModel, MatterModel } from "@matter/model";
|
|
9
|
-
import { ClusterId } from "@
|
|
9
|
+
import { ClusterId } from "@matter/types";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
11
11
|
import { MatterNode } from "../MatterNode";
|
|
12
12
|
import { camelize } from "../util/String";
|
|
@@ -5,10 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { Logger, MatterError } from "@matter/general";
|
|
8
|
+
import { ManualPairingCodeCodec, NodeId, QrCode } from "@matter/types";
|
|
9
|
+
import { BasicInformationCluster, DescriptorCluster, GeneralCommissioning } from "@matter/types/clusters";
|
|
8
10
|
import { NodeCommissioningOptions } from "@project-chip/matter.js";
|
|
9
|
-
import { BasicInformationCluster, DescriptorCluster, GeneralCommissioning } from "@project-chip/matter.js/cluster";
|
|
10
|
-
import { NodeId } from "@project-chip/matter.js/datatype";
|
|
11
|
-
import { ManualPairingCodeCodec, QrCode } from "@project-chip/matter.js/schema";
|
|
12
11
|
import type { Argv } from "yargs";
|
|
13
12
|
import { MatterNode } from "../MatterNode";
|
|
14
13
|
import { createDiagnosticCallbacks } from "./cmd_nodes";
|
|
@@ -5,9 +5,8 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { Logger } from "@matter/general";
|
|
8
|
-
import { CommissionableDeviceIdentifiers } from "@
|
|
9
|
-
import { VendorId } from "@
|
|
10
|
-
import { ManualPairingCodeCodec } from "@project-chip/matter.js/schema";
|
|
8
|
+
import { CommissionableDeviceIdentifiers } from "@matter/protocol";
|
|
9
|
+
import { ManualPairingCodeCodec, VendorId } from "@matter/types";
|
|
11
10
|
import type { Argv } from "yargs";
|
|
12
11
|
import { MatterNode } from "../MatterNode";
|
|
13
12
|
|
package/src/shell/cmd_nodes.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { capitalize, decamelize, Logger } from "@matter/general";
|
|
8
|
-
import { NodeId } from "@
|
|
8
|
+
import { NodeId } from "@matter/types";
|
|
9
9
|
import { CommissioningControllerNodeOptions, NodeStateInformation } from "@project-chip/matter.js/device";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
11
11
|
import { MatterNode } from "../MatterNode";
|
package/src/util/Json.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import { Bytes } from "@matter/general";
|
|
8
8
|
import { ValueModel } from "@matter/model";
|
|
9
|
-
import { ValidationDatatypeMismatchError } from "@
|
|
9
|
+
import { ValidationDatatypeMismatchError } from "@matter/types";
|
|
10
10
|
import { camelize } from "./String";
|
|
11
11
|
|
|
12
12
|
export function convertJsonDataWithModel(model: ValueModel, data: any): any {
|