@matter/nodejs-shell 0.13.1-alpha.0-20250515-a4c61c546 → 0.13.1-alpha.0-20250517-99a1e848a
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/dist/cjs/shell/cmd_cluster-attributes.js +9 -8
- package/dist/cjs/shell/cmd_cluster-attributes.js.map +2 -2
- package/dist/cjs/shell/cmd_cluster-commands.js +4 -3
- package/dist/cjs/shell/cmd_cluster-commands.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-events.js +4 -3
- package/dist/cjs/shell/cmd_cluster-events.js.map +1 -1
- package/package.json +6 -6
- package/src/shell/cmd_cluster-attributes.ts +7 -5
- package/src/shell/cmd_cluster-commands.ts +5 -3
- package/src/shell/cmd_cluster-events.ts +5 -3
|
@@ -92,11 +92,12 @@ function generateAllAttributeHandlersForCluster(yargs, theNode) {
|
|
|
92
92
|
return yargs;
|
|
93
93
|
}
|
|
94
94
|
function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
95
|
-
|
|
95
|
+
const clusterId = cluster.id;
|
|
96
|
+
if (clusterId === void 0) {
|
|
96
97
|
return yargs;
|
|
97
98
|
}
|
|
98
99
|
yargs = yargs.command(
|
|
99
|
-
[cluster.name.toLowerCase(), `0x${
|
|
100
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
100
101
|
`Read/Write ${cluster.name} attributes`,
|
|
101
102
|
(yargs2) => {
|
|
102
103
|
yargs2 = yargs2.command(
|
|
@@ -124,19 +125,19 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
124
125
|
});
|
|
125
126
|
},
|
|
126
127
|
async (argv) => {
|
|
127
|
-
const
|
|
128
|
+
const clusterId2 = cluster.id;
|
|
128
129
|
const { nodeId, endpointId, remote } = argv;
|
|
129
130
|
const requestRemote = remote ? true : void 0;
|
|
130
131
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
131
|
-
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(
|
|
132
|
+
const clusterClient = node.getDeviceById(endpointId)?.getClusterClientById((0, import_types.ClusterId)(clusterId2));
|
|
132
133
|
if (clusterClient === void 0) {
|
|
133
134
|
console.log(
|
|
134
|
-
`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${
|
|
135
|
+
`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId2} not found.`
|
|
135
136
|
);
|
|
136
137
|
return;
|
|
137
138
|
}
|
|
138
139
|
console.log(
|
|
139
|
-
`Attribute values for cluster ${cluster.name} (${node.nodeId.toString()}/${endpointId}/${
|
|
140
|
+
`Attribute values for cluster ${cluster.name} (${node.nodeId.toString()}/${endpointId}/${clusterId2}):`
|
|
140
141
|
);
|
|
141
142
|
for (const attribute of cluster.attributes) {
|
|
142
143
|
const attributeName = (0, import_String.camelize)(attribute.name);
|
|
@@ -151,7 +152,7 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
151
152
|
}
|
|
152
153
|
);
|
|
153
154
|
cluster.attributes.forEach((attribute) => {
|
|
154
|
-
yargs3 = generateAttributeReadHandler(yargs3,
|
|
155
|
+
yargs3 = generateAttributeReadHandler(yargs3, clusterId, cluster.name, attribute, theNode);
|
|
155
156
|
});
|
|
156
157
|
return yargs3;
|
|
157
158
|
},
|
|
@@ -168,7 +169,7 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
168
169
|
if (!attribute.writable) {
|
|
169
170
|
return;
|
|
170
171
|
}
|
|
171
|
-
yargs3 = generateAttributeWriteHandler(yargs3,
|
|
172
|
+
yargs3 = generateAttributeWriteHandler(yargs3, clusterId, cluster.name, attribute, theNode);
|
|
172
173
|
});
|
|
173
174
|
return yargs3;
|
|
174
175
|
},
|
|
@@ -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,qBAA2B;AAC3B,mBAA0D;AAC1D,sBAAyC;AACzC,mBAAwE;AAGxE,kBAAyC;AACzC,oBAAyB;AAbzB;AAAA;AAAA;AAAA;AAAA;AAeA,SAAS,uCAAuC,OAAa,SAAqB;AAC9E,2BAAY,SAAS,SAAS,QAAQ,aAAW;AAC7C,YAAQ,iCAAiC,OAAO,SAAS,OAAO;AAAA,EACpE,CAAC;AAED,UAAQ,MAAM;AAAA,IACV;AAAA,IACA;AAAA,IACA,CAAAA,WACIA,OACK,WAAW,cAAc;AAAA,MACtB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC,EACA,WAAW,gBAAgB;AAAA,MACxB,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,EACA,WAAW,eAAe;AAAA,MACvB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC;AAAA,IACT,OAAM,SAAQ;AACV,YAAM,EAAE,QAAQ,YAAY,WAAW,aAAa,eAAe,IAAI;AACvE,YAAM,cAAc,mBAAmB,MAAM,SAAY,SAAS,cAAc;AAChF,YAAM,QAAQ,MAAM,QAAQ,mBAAmB,MAAM,GAAG,CAAC;AAEzD,UAAI;AACA,cAAM,oBAAoB,MAAM,KAAK,qBAAqB;AAC1D,cAAM,SAAS,MAAM,kBAAkB,sBAAsB;AAAA,UACzD,YAAY;AAAA,YACR;AAAA,cACI,gBAAY,6BAAe,UAAU;AAAA,cACrC,eAAW,wBAAU,SAAS;AAAA,cAC9B,aAAa,gBAAgB,aAAY,0BAAY,WAAW,IAAI;AAAA,YACxE;AAAA,UACJ;AAAA,QACJ,CAAC;AACD,gBAAQ;AAAA,UACJ,gCAAgC,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,IAAI,WAAW;AAAA,QACpG;AACA,mBAAW;AAAA,UACP,MAAM,EAAE,aAAAC,cAAa,cAAc;AAAA,UACnC;AAAA,QACJ,KAAK,QAAQ;AACT,kBAAQ;AAAA,YACJ,OAAO,0BAAW,IAAIA,YAAW,CAAC,GAAG,kBAAkB,SAAY,KAAK,aAAa,MAAM,EAAE,KAAK,0BAAW,KAAK,KAAK,CAAC;AAAA,UAC5H;AAAA,QACJ;AAAA,MACJ,SAAS,OAAO;AACZ,gBAAQ;AAAA,UACJ,kCAAkC,KAAK,OAAO,SAAS,CAAC,IAAI,UAAU,IAAI,SAAS,IAAI,WAAW,KAAK,KAAK;AAAA,QAChH;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACA,SAAO;AACX;AAEA,SAAS,iCAAiC,OAAa,SAAuB,SAAqB;AAC/F,
|
|
5
|
-
"names": ["yargs", "attributeId"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["yargs", "attributeId", "clusterId"]
|
|
6
6
|
}
|
|
@@ -38,15 +38,16 @@ function generateAllCommandHandlersForCluster(yargs, theNode) {
|
|
|
38
38
|
return yargs;
|
|
39
39
|
}
|
|
40
40
|
function generateClusterCommandHandlers(yargs, cluster, theNode) {
|
|
41
|
-
|
|
41
|
+
const clusterId = cluster.id;
|
|
42
|
+
if (clusterId === void 0) {
|
|
42
43
|
return yargs;
|
|
43
44
|
}
|
|
44
45
|
yargs = yargs.command(
|
|
45
|
-
[cluster.name.toLowerCase(), `0x${
|
|
46
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
46
47
|
`Invoke ${cluster.name} commands`,
|
|
47
48
|
(yargs2) => {
|
|
48
49
|
cluster.commands.forEach((command) => {
|
|
49
|
-
yargs2 = generateCommandHandler(yargs2,
|
|
50
|
+
yargs2 = generateCommandHandler(yargs2, clusterId, cluster.name, command, theNode);
|
|
50
51
|
});
|
|
51
52
|
return yargs2;
|
|
52
53
|
},
|
|
@@ -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,qBAA2B;AAC3B,mBAAwD;AACxD,mBAA2C;AAG3C,kBAAyC;AACzC,oBAAyB;AAZzB;AAAA;AAAA;AAAA;AAAA;AAcA,SAAS,qCAAqC,OAAa,SAAqB;AAC5E,2BAAY,SAAS,SAAS,QAAQ,aAAW;AAC7C,YAAQ,+BAA+B,OAAO,SAAS,OAAO;AAAA,EAClE,CAAC;AACD,SAAO;AACX;AAEA,SAAS,+BAA+B,OAAa,SAAuB,SAAqB;AAC7F,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -37,15 +37,16 @@ function generateAllEventHandlersForCluster(yargs, theNode) {
|
|
|
37
37
|
return yargs;
|
|
38
38
|
}
|
|
39
39
|
function generateClusterEventHandlers(yargs, cluster, theNode) {
|
|
40
|
-
|
|
40
|
+
const clusterId = cluster.id;
|
|
41
|
+
if (clusterId === void 0) {
|
|
41
42
|
return yargs;
|
|
42
43
|
}
|
|
43
44
|
yargs = yargs.command(
|
|
44
|
-
[cluster.name.toLowerCase(), `0x${
|
|
45
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
45
46
|
`Read ${cluster.name} events`,
|
|
46
47
|
(yargs2) => {
|
|
47
48
|
cluster.events.forEach((event) => {
|
|
48
|
-
yargs2 = generateEventHandler(yargs2,
|
|
49
|
+
yargs2 = generateEventHandler(yargs2, clusterId, cluster.name, event, theNode);
|
|
49
50
|
});
|
|
50
51
|
return yargs2;
|
|
51
52
|
},
|
|
@@ -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,qBAA2B;AAC3B,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,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2B;AAC3B,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,QAAM,YAAY,QAAQ;AAC1B,MAAI,cAAc,QAAW;AACzB,WAAO;AAAA,EACX;AAEA,UAAQ,MAAM;AAAA,IACV,CAAC,QAAQ,KAAK,YAAY,GAAG,KAAK,UAAU,SAAS,EAAE,CAAC,EAAE;AAAA,IAC1D,QAAQ,QAAQ,IAAI;AAAA,IACpB,CAAAA,WAAS;AACL,cAAQ,OAAO,QAAQ,WAAS;AAC5B,QAAAA,SAAQ,qBAAqBA,QAAO,WAAW,QAAQ,MAAM,OAAO,OAAO;AAAA,MAC/E,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,WAAW;AAAA,MACnB,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc;AAAA,IAClB,CAAC,EACA,WAAW,eAAe;AAAA,MACvB,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,0BAAW,KAAK,MAAM,YAAY,IAAI,CAAC,CAAC;AAAA,MAC9I;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
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/nodejs-shell",
|
|
3
|
-
"version": "0.13.1-alpha.0-
|
|
3
|
+
"version": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
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.1-alpha.0-
|
|
40
|
-
"@matter/nodejs": "0.13.1-alpha.0-
|
|
41
|
-
"@matter/nodejs-ble": "0.13.1-alpha.0-
|
|
42
|
-
"@matter/tools": "0.13.1-alpha.0-
|
|
43
|
-
"@project-chip/matter.js": "0.13.1-alpha.0-
|
|
39
|
+
"@matter/general": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
40
|
+
"@matter/nodejs": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
41
|
+
"@matter/nodejs-ble": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
42
|
+
"@matter/tools": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
43
|
+
"@project-chip/matter.js": "0.13.1-alpha.0-20250517-99a1e848a",
|
|
44
44
|
"yargs": "^17.7.2"
|
|
45
45
|
},
|
|
46
46
|
"engines": {
|
|
@@ -81,11 +81,13 @@ function generateAllAttributeHandlersForCluster(yargs: Argv, theNode: MatterNode
|
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
function generateClusterAttributeHandlers(yargs: Argv, cluster: ClusterModel, theNode: MatterNode) {
|
|
84
|
-
|
|
84
|
+
const clusterId = cluster.id;
|
|
85
|
+
if (clusterId === undefined) {
|
|
85
86
|
return yargs;
|
|
86
87
|
}
|
|
88
|
+
|
|
87
89
|
yargs = yargs.command(
|
|
88
|
-
[cluster.name.toLowerCase(), `0x${
|
|
90
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
89
91
|
`Read/Write ${cluster.name} attributes`,
|
|
90
92
|
yargs => {
|
|
91
93
|
yargs = yargs.command(
|
|
@@ -123,7 +125,7 @@ function generateClusterAttributeHandlers(yargs: Argv, cluster: ClusterModel, th
|
|
|
123
125
|
|
|
124
126
|
const clusterClient = node
|
|
125
127
|
.getDeviceById(endpointId)
|
|
126
|
-
?.getClusterClientById(ClusterId(clusterId));
|
|
128
|
+
?.getClusterClientById(ClusterId(clusterId!));
|
|
127
129
|
if (clusterClient === undefined) {
|
|
128
130
|
console.log(
|
|
129
131
|
`ERROR: Cluster ${node.nodeId.toString()}/${endpointId}/${clusterId} not found.`,
|
|
@@ -147,7 +149,7 @@ function generateClusterAttributeHandlers(yargs: Argv, cluster: ClusterModel, th
|
|
|
147
149
|
);
|
|
148
150
|
|
|
149
151
|
cluster.attributes.forEach(attribute => {
|
|
150
|
-
yargs = generateAttributeReadHandler(yargs,
|
|
152
|
+
yargs = generateAttributeReadHandler(yargs, clusterId, cluster.name, attribute, theNode);
|
|
151
153
|
});
|
|
152
154
|
return yargs;
|
|
153
155
|
},
|
|
@@ -165,7 +167,7 @@ function generateClusterAttributeHandlers(yargs: Argv, cluster: ClusterModel, th
|
|
|
165
167
|
if (!attribute.writable) {
|
|
166
168
|
return;
|
|
167
169
|
}
|
|
168
|
-
yargs = generateAttributeWriteHandler(yargs,
|
|
170
|
+
yargs = generateAttributeWriteHandler(yargs, clusterId, cluster.name, attribute, theNode);
|
|
169
171
|
});
|
|
170
172
|
return yargs;
|
|
171
173
|
},
|
|
@@ -20,15 +20,17 @@ function generateAllCommandHandlersForCluster(yargs: Argv, theNode: MatterNode)
|
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
function generateClusterCommandHandlers(yargs: Argv, cluster: ClusterModel, theNode: MatterNode) {
|
|
23
|
-
|
|
23
|
+
const clusterId = cluster.id;
|
|
24
|
+
if (clusterId === undefined) {
|
|
24
25
|
return yargs;
|
|
25
26
|
}
|
|
27
|
+
|
|
26
28
|
yargs = yargs.command(
|
|
27
|
-
[cluster.name.toLowerCase(), `0x${
|
|
29
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
28
30
|
`Invoke ${cluster.name} commands`,
|
|
29
31
|
yargs => {
|
|
30
32
|
cluster.commands.forEach(command => {
|
|
31
|
-
yargs = generateCommandHandler(yargs,
|
|
33
|
+
yargs = generateCommandHandler(yargs, clusterId, cluster.name, command, theNode);
|
|
32
34
|
});
|
|
33
35
|
return yargs;
|
|
34
36
|
},
|
|
@@ -19,15 +19,17 @@ function generateAllEventHandlersForCluster(yargs: Argv, theNode: MatterNode) {
|
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
function generateClusterEventHandlers(yargs: Argv, cluster: ClusterModel, theNode: MatterNode) {
|
|
22
|
-
|
|
22
|
+
const clusterId = cluster.id;
|
|
23
|
+
if (clusterId === undefined) {
|
|
23
24
|
return yargs;
|
|
24
25
|
}
|
|
26
|
+
|
|
25
27
|
yargs = yargs.command(
|
|
26
|
-
[cluster.name.toLowerCase(), `0x${
|
|
28
|
+
[cluster.name.toLowerCase(), `0x${clusterId.toString(16)}`],
|
|
27
29
|
`Read ${cluster.name} events`,
|
|
28
30
|
yargs => {
|
|
29
31
|
cluster.events.forEach(event => {
|
|
30
|
-
yargs = generateEventHandler(yargs,
|
|
32
|
+
yargs = generateEventHandler(yargs, clusterId, cluster.name, event, theNode);
|
|
31
33
|
});
|
|
32
34
|
return yargs;
|
|
33
35
|
},
|