@matter/nodejs-shell 0.13.0-alpha.0-20250322-f085fa576 → 0.13.0-alpha.0-20250324-d7b7d9731
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/app.js +4 -3
- package/dist/cjs/app.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-attributes.js +6 -6
- package/dist/cjs/shell/cmd_cluster-attributes.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-commands.js +4 -4
- package/dist/cjs/shell/cmd_cluster-commands.js.map +1 -1
- package/dist/cjs/shell/cmd_cluster-events.js +1 -1
- package/dist/cjs/shell/cmd_cluster-events.js.map +1 -1
- package/dist/cjs/shell/cmd_commission.js +1 -1
- package/dist/cjs/shell/cmd_commission.js.map +1 -1
- package/dist/cjs/shell/cmd_discover.js +2 -2
- package/dist/cjs/shell/cmd_discover.js.map +1 -1
- package/dist/cjs/shell/cmd_nodes.js +2 -2
- package/dist/cjs/shell/cmd_nodes.js.map +1 -1
- package/dist/cjs/shell/cmd_subscribe.js +2 -2
- package/dist/cjs/shell/cmd_subscribe.js.map +1 -1
- package/dist/cjs/shell/cmd_tlv.js +4 -4
- package/dist/cjs/shell/cmd_tlv.js.map +1 -1
- package/package.json +6 -6
- package/src/app.ts +5 -4
- package/src/shell/cmd_cluster-attributes.ts +7 -7
- package/src/shell/cmd_cluster-commands.ts +5 -5
- package/src/shell/cmd_cluster-events.ts +2 -2
- package/src/shell/cmd_commission.ts +2 -2
- package/src/shell/cmd_discover.ts +3 -3
- package/src/shell/cmd_nodes.ts +3 -3
- package/src/shell/cmd_subscribe.ts +3 -3
- package/src/shell/cmd_tlv.ts +5 -5
package/dist/cjs/app.js
CHANGED
|
@@ -119,9 +119,10 @@ async function main() {
|
|
|
119
119
|
if (await theNode.Store.has("LogFile")) {
|
|
120
120
|
const storedLogFileName = await theNode.Store.get("LogFile");
|
|
121
121
|
if (storedLogFileName !== void 0) {
|
|
122
|
-
import_general.Logger.
|
|
123
|
-
|
|
124
|
-
|
|
122
|
+
import_general.Logger.destinations.file = (0, import_general.LogDestination)({
|
|
123
|
+
write: await (0, import_nodejs.createFileLogger)(storedLogFileName),
|
|
124
|
+
level: (0, import_general.LogLevel)(await theNode.Store.get("LoglevelFile", import_general.LogLevel.DEBUG)),
|
|
125
|
+
format: (0, import_general.LogFormat)("plain")
|
|
125
126
|
});
|
|
126
127
|
}
|
|
127
128
|
}
|
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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -79,7 +79,7 @@ function generateAllAttributeHandlersForCluster(yargs, theNode) {
|
|
|
79
79
|
value
|
|
80
80
|
} of result) {
|
|
81
81
|
console.log(
|
|
82
|
-
` ${import_general.Diagnostic.hex(attributeId2)}${attributeName !== void 0 ? ` (${attributeName})` : ""}: ${import_general.
|
|
82
|
+
` ${import_general.Diagnostic.hex(attributeId2)}${attributeName !== void 0 ? ` (${attributeName})` : ""}: ${import_general.Diagnostic.json(value)}`
|
|
83
83
|
);
|
|
84
84
|
}
|
|
85
85
|
} catch (error) {
|
|
@@ -145,7 +145,7 @@ function generateClusterAttributeHandlers(yargs, cluster, theNode) {
|
|
|
145
145
|
continue;
|
|
146
146
|
}
|
|
147
147
|
console.log(
|
|
148
|
-
` ${attributeName} (${attribute.id}): ${import_general.
|
|
148
|
+
` ${attributeName} (${attribute.id}): ${import_general.Diagnostic.json(await attributeClient.get(requestRemote))}`
|
|
149
149
|
);
|
|
150
150
|
}
|
|
151
151
|
}
|
|
@@ -223,7 +223,7 @@ function generateAttributeReadHandler(yargs, clusterId, clusterName, attribute,
|
|
|
223
223
|
}
|
|
224
224
|
try {
|
|
225
225
|
console.log(
|
|
226
|
-
`Attribute value for ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id}: ${import_general.
|
|
226
|
+
`Attribute value for ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id}: ${import_general.Diagnostic.json(await attributeClient.get(requestRemote))}`
|
|
227
227
|
);
|
|
228
228
|
} catch (error) {
|
|
229
229
|
console.log(`ERROR: Could not get attribute ${attribute.name}: ${error}`);
|
|
@@ -280,16 +280,16 @@ function generateAttributeWriteHandler(yargs, clusterId, clusterName, attribute,
|
|
|
280
280
|
parsedValue = (0, import_Json.convertJsonDataWithModel)(attribute, parsedValue);
|
|
281
281
|
await attributeClient.set(parsedValue);
|
|
282
282
|
console.log(
|
|
283
|
-
`Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${import_general.
|
|
283
|
+
`Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${import_general.Diagnostic.json(value)}`
|
|
284
284
|
);
|
|
285
285
|
} catch (error) {
|
|
286
286
|
if (error instanceof import_types.ValidationError) {
|
|
287
287
|
console.log(
|
|
288
|
-
`ERROR: Could not validate data for attribute ${attribute.name} to ${import_general.
|
|
288
|
+
`ERROR: Could not validate data for attribute ${attribute.name} to ${import_general.Diagnostic.json(parsedValue)}: ${error}${error.fieldName !== void 0 ? ` in field ${error.fieldName}` : ""}`
|
|
289
289
|
);
|
|
290
290
|
} else {
|
|
291
291
|
console.log(
|
|
292
|
-
`ERROR: Could not set attribute ${attribute.name} to ${import_general.
|
|
292
|
+
`ERROR: Could not set attribute ${attribute.name} to ${import_general.Diagnostic.json(parsedValue)}: ${error}`
|
|
293
293
|
);
|
|
294
294
|
}
|
|
295
295
|
}
|
|
@@ -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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs", "attributeId"]
|
|
6
6
|
}
|
|
@@ -127,19 +127,19 @@ async function executeCommand(theNode, nodeId, endpointId, clusterId, command, r
|
|
|
127
127
|
}
|
|
128
128
|
const result = await clusterClient.commands[commandName](requestData);
|
|
129
129
|
console.log(
|
|
130
|
-
`Command ${command.name} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${import_general.
|
|
130
|
+
`Command ${command.name} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${import_general.Diagnostic.json(requestData)}` : ""}`
|
|
131
131
|
);
|
|
132
132
|
if (result !== void 0) {
|
|
133
|
-
console.log(`Result: ${import_general.
|
|
133
|
+
console.log(`Result: ${import_general.Diagnostic.json(result)}`);
|
|
134
134
|
}
|
|
135
135
|
} catch (error) {
|
|
136
136
|
if (error instanceof import_types.ValidationError) {
|
|
137
137
|
console.log(
|
|
138
|
-
`ERROR: Could not validate data for command ${command.name} with ${import_general.
|
|
138
|
+
`ERROR: Could not validate data for command ${command.name} with ${import_general.Diagnostic.json(requestData)}: ${error}${error.fieldName !== void 0 ? ` in field ${error.fieldName}` : ""}`
|
|
139
139
|
);
|
|
140
140
|
} else {
|
|
141
141
|
console.log(
|
|
142
|
-
`ERROR: Could not invoke command ${command.name} ${requestData ? `with ${import_general.
|
|
142
|
+
`ERROR: Could not invoke command ${command.name} ${requestData ? `with ${import_general.Diagnostic.json(requestData)}` : ""}: ${error}`
|
|
143
143
|
);
|
|
144
144
|
}
|
|
145
145
|
}
|
|
@@ -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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -79,7 +79,7 @@ function generateEventHandler(yargs, clusterId, clusterName, event, theNode) {
|
|
|
79
79
|
}
|
|
80
80
|
const eventClient = clusterClient.events[eventName];
|
|
81
81
|
console.log(
|
|
82
|
-
`Event value for ${eventName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${event.id}: ${import_general.
|
|
82
|
+
`Event value for ${eventName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${event.id}: ${import_general.Diagnostic.json(await eventClient.get())}`
|
|
83
83
|
);
|
|
84
84
|
}
|
|
85
85
|
);
|
|
@@ -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,
|
|
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,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,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
|
}
|
|
@@ -127,7 +127,7 @@ function commands(theNode) {
|
|
|
127
127
|
// Set to the most restrictive if relevant
|
|
128
128
|
regulatoryCountryCode: "XX"
|
|
129
129
|
};
|
|
130
|
-
console.log(import_general.
|
|
130
|
+
console.log(import_general.Diagnostic.json(options));
|
|
131
131
|
if (theNode.Store.has("WiFiSsid") && theNode.Store.has("WiFiPassword")) {
|
|
132
132
|
options.commissioning.wifiNetwork = {
|
|
133
133
|
wifiSsid: await theNode.Store.get("WiFiSsid", ""),
|
|
@@ -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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -98,7 +98,7 @@ function commands(theNode) {
|
|
|
98
98
|
}
|
|
99
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 } : {};
|
|
100
100
|
console.log(
|
|
101
|
-
`Discover devices with identifier ${import_general.
|
|
101
|
+
`Discover devices with identifier ${import_general.Diagnostic.json(
|
|
102
102
|
identifierData
|
|
103
103
|
)} for ${timeoutSeconds} seconds.`
|
|
104
104
|
);
|
|
@@ -108,7 +108,7 @@ function commands(theNode) {
|
|
|
108
108
|
ble,
|
|
109
109
|
onIpNetwork: true
|
|
110
110
|
},
|
|
111
|
-
(device) => console.log(`Discovered device ${import_general.
|
|
111
|
+
(device) => console.log(`Discovered device ${import_general.Diagnostic.json(device)}`),
|
|
112
112
|
timeoutSeconds
|
|
113
113
|
);
|
|
114
114
|
console.log(`Discovered ${results.length} devices`, results);
|
|
@@ -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,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2B;AAE3B,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,0BAAW;AAAA,YAC3C;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,0BAAW,KAAK,MAAM,CAAC,EAAE;AAAA,UACpE;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
|
}
|
|
@@ -33,12 +33,12 @@ var import_device = require("@project-chip/matter.js/device");
|
|
|
33
33
|
function createDiagnosticCallbacks() {
|
|
34
34
|
return {
|
|
35
35
|
attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) => console.log(
|
|
36
|
-
`attributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${import_general.
|
|
36
|
+
`attributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${import_general.Diagnostic.json(
|
|
37
37
|
value
|
|
38
38
|
)}`
|
|
39
39
|
),
|
|
40
40
|
eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) => console.log(
|
|
41
|
-
`eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${import_general.
|
|
41
|
+
`eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${import_general.Diagnostic.json(
|
|
42
42
|
events
|
|
43
43
|
)}`
|
|
44
44
|
),
|
|
@@ -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,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["yargs"]
|
|
6
6
|
}
|
|
@@ -43,12 +43,12 @@ function commands(theNode) {
|
|
|
43
43
|
const node = (await theNode.connectAndGetNodes(nodeId))[0];
|
|
44
44
|
await node.subscribeAllAttributesAndEvents({
|
|
45
45
|
attributeChangedCallback: ({ path: { nodeId: nodeId2, clusterId, endpointId, attributeName }, value }) => console.log(
|
|
46
|
-
`${nodeId2}: Attribute ${nodeId2}/${endpointId}/${clusterId}/${attributeName} changed to ${import_general.
|
|
46
|
+
`${nodeId2}: Attribute ${nodeId2}/${endpointId}/${clusterId}/${attributeName} changed to ${import_general.Diagnostic.json(
|
|
47
47
|
value
|
|
48
48
|
)}`
|
|
49
49
|
),
|
|
50
50
|
eventTriggeredCallback: ({ path: { nodeId: nodeId2, clusterId, endpointId, eventName }, events }) => console.log(
|
|
51
|
-
`${nodeId2} Event ${nodeId2}/${endpointId}/${clusterId}/${eventName} triggered with ${import_general.
|
|
51
|
+
`${nodeId2} Event ${nodeId2}/${endpointId}/${clusterId}/${eventName} triggered with ${import_general.Diagnostic.json(
|
|
52
52
|
events
|
|
53
53
|
)}`
|
|
54
54
|
)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_subscribe.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2B;AAN3B;AAAA;AAAA;AAAA;AAAA;AAUe,SAAR,SAA0B,SAAqB;AAClD,SAAO;AAAA,IACH,SAAS;AAAA,IACT,UAAU;AAAA,IACV,SAAS,CAAC,UAAgB;AACtB,aAAO,MAAM,WAAW,WAAW;AAAA,QAC/B,UAAU;AAAA,QACV,SAAS;AAAA,QACT,MAAM;AAAA,MACV,CAAC;AAAA,IACL;AAAA,IAEA,SAAS,OAAO,SAAc;AAC1B,YAAM,EAAE,OAAO,IAAI;AACnB,YAAM,QAAQ,MAAM,QAAQ,mBAAmB,MAAM,GAAG,CAAC;AAEzD,YAAM,KAAK,gCAAgC;AAAA,QACvC,0BAA0B,CAAC,EAAE,MAAM,EAAE,QAAAA,SAAQ,WAAW,YAAY,cAAc,GAAG,MAAM,MACvF,QAAQ;AAAA,UACJ,GAAGA,OAAM,eAAeA,OAAM,IAAI,UAAU,IAAI,SAAS,IAAI,aAAa,eAAe,0BAAW;AAAA,YAChG;AAAA,UACJ,CAAC;AAAA,QACL;AAAA,QACJ,wBAAwB,CAAC,EAAE,MAAM,EAAE,QAAAA,SAAQ,WAAW,YAAY,UAAU,GAAG,OAAO,MAClF,QAAQ;AAAA,UACJ,GAAGA,OAAM,UAAUA,OAAM,IAAI,UAAU,IAAI,SAAS,IAAI,SAAS,mBAAmB,0BAAW;AAAA,YAC3F;AAAA,UACJ,CAAC;AAAA,QACL;AAAA,MACR,CAAC;AAAA,IACL;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": ["nodeId"]
|
|
6
6
|
}
|
|
@@ -50,7 +50,7 @@ function logAnyTlvStream(encoded) {
|
|
|
50
50
|
logGenericElement(reader);
|
|
51
51
|
const nextElement = reader.readTagType();
|
|
52
52
|
if (nextElement !== void 0) {
|
|
53
|
-
throw new import_general.UnexpectedDataError(`Unexpected data left after parsing all data: ${import_general.
|
|
53
|
+
throw new import_general.UnexpectedDataError(`Unexpected data left after parsing all data: ${import_general.Diagnostic.json(nextElement)}`);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
function logGenericElement(reader, preReadElement, allowTag = false) {
|
|
@@ -68,7 +68,7 @@ function logGenericElement(reader, preReadElement, allowTag = false) {
|
|
|
68
68
|
case import_types.TlvType.Utf8String:
|
|
69
69
|
case import_types.TlvType.ByteString:
|
|
70
70
|
if (tag !== void 0 && !allowTag) {
|
|
71
|
-
throw new import_general.UnexpectedDataError(`Tag detected for a native type: ${import_general.
|
|
71
|
+
throw new import_general.UnexpectedDataError(`Tag detected for a native type: ${import_general.Diagnostic.json(element)}`);
|
|
72
72
|
}
|
|
73
73
|
const value = reader.readPrimitive(element.typeLength);
|
|
74
74
|
const logValue = value instanceof Uint8Array ? import_general.Bytes.toHex(value) : value;
|
|
@@ -113,7 +113,7 @@ function logGenericArrayOrList(reader, allowTag = false) {
|
|
|
113
113
|
} = element;
|
|
114
114
|
if (type === import_types.TlvType.EndOfContainer) break;
|
|
115
115
|
if (tag !== void 0 && !allowTag) {
|
|
116
|
-
throw new import_general.UnexpectedDataError(`Tag detected : ${import_general.
|
|
116
|
+
throw new import_general.UnexpectedDataError(`Tag detected : ${import_general.Diagnostic.json(element)}`);
|
|
117
117
|
}
|
|
118
118
|
logGenericElement(reader, element, allowTag);
|
|
119
119
|
}
|
|
@@ -129,7 +129,7 @@ function logGenericStructure(reader) {
|
|
|
129
129
|
} = element;
|
|
130
130
|
if (type === import_types.TlvType.EndOfContainer) break;
|
|
131
131
|
if (tag === void 0 || tag.id === void 0) {
|
|
132
|
-
throw new import_general.UnexpectedDataError(`Tag missing for a structure: ${import_general.
|
|
132
|
+
throw new import_general.UnexpectedDataError(`Tag missing for a structure: ${import_general.Diagnostic.json(element)}`);
|
|
133
133
|
}
|
|
134
134
|
logGenericElement(reader, element, true);
|
|
135
135
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/shell/cmd_tlv.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": "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",
|
|
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.0-alpha.0-
|
|
3
|
+
"version": "0.13.0-alpha.0-20250324-d7b7d9731",
|
|
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-20250324-d7b7d9731",
|
|
40
|
+
"@matter/nodejs": "0.13.0-alpha.0-20250324-d7b7d9731",
|
|
41
|
+
"@matter/nodejs-ble": "0.13.0-alpha.0-20250324-d7b7d9731",
|
|
42
|
+
"@matter/tools": "0.13.0-alpha.0-20250324-d7b7d9731",
|
|
43
|
+
"@project-chip/matter.js": "0.13.0-alpha.0-20250324-d7b7d9731",
|
|
44
44
|
"yargs": "^17.7.2"
|
|
45
45
|
},
|
|
46
46
|
"engines": {
|
package/src/app.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
|
-
import { LogFormat, LogLevel, Logger, singleton } from "@matter/general";
|
|
8
|
+
import { LogDestination, LogFormat, LogLevel, Logger, singleton } from "@matter/general";
|
|
9
9
|
import { createFileLogger } from "@matter/nodejs";
|
|
10
10
|
import { NodeJsBle } from "@matter/nodejs-ble";
|
|
11
11
|
import { Ble } from "@matter/protocol";
|
|
@@ -102,9 +102,10 @@ async function main() {
|
|
|
102
102
|
if (await theNode.Store.has("LogFile")) {
|
|
103
103
|
const storedLogFileName = await theNode.Store.get<string>("LogFile");
|
|
104
104
|
if (storedLogFileName !== undefined) {
|
|
105
|
-
Logger.
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
Logger.destinations.file = LogDestination({
|
|
106
|
+
write: await createFileLogger(storedLogFileName),
|
|
107
|
+
level: LogLevel(await theNode.Store.get<LogLevel>("LoglevelFile", LogLevel.DEBUG)),
|
|
108
|
+
format: LogFormat("plain"),
|
|
108
109
|
});
|
|
109
110
|
}
|
|
110
111
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { Diagnostic
|
|
7
|
+
import { Diagnostic } from "@matter/general";
|
|
8
8
|
import { AttributeModel, ClusterModel, MatterModel } from "@matter/model";
|
|
9
9
|
import { SupportedAttributeClient } from "@matter/protocol";
|
|
10
10
|
import { AttributeId, ClusterId, EndpointNumber, ValidationError } from "@matter/types";
|
|
@@ -67,7 +67,7 @@ function generateAllAttributeHandlersForCluster(yargs: Argv, theNode: MatterNode
|
|
|
67
67
|
value,
|
|
68
68
|
} of result) {
|
|
69
69
|
console.log(
|
|
70
|
-
` ${Diagnostic.hex(attributeId)}${attributeName !== undefined ? ` (${attributeName})` : ""}: ${
|
|
70
|
+
` ${Diagnostic.hex(attributeId)}${attributeName !== undefined ? ` (${attributeName})` : ""}: ${Diagnostic.json(value)}`,
|
|
71
71
|
);
|
|
72
72
|
}
|
|
73
73
|
} catch (error) {
|
|
@@ -140,7 +140,7 @@ function generateClusterAttributeHandlers(yargs: Argv, cluster: ClusterModel, th
|
|
|
140
140
|
continue;
|
|
141
141
|
}
|
|
142
142
|
console.log(
|
|
143
|
-
` ${attributeName} (${attribute.id}): ${
|
|
143
|
+
` ${attributeName} (${attribute.id}): ${Diagnostic.json(await attributeClient.get(requestRemote))}`,
|
|
144
144
|
);
|
|
145
145
|
}
|
|
146
146
|
},
|
|
@@ -234,7 +234,7 @@ function generateAttributeReadHandler(
|
|
|
234
234
|
}
|
|
235
235
|
try {
|
|
236
236
|
console.log(
|
|
237
|
-
`Attribute value for ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id}: ${
|
|
237
|
+
`Attribute value for ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id}: ${Diagnostic.json(await attributeClient.get(requestRemote))}`,
|
|
238
238
|
);
|
|
239
239
|
} catch (error) {
|
|
240
240
|
console.log(`ERROR: Could not get attribute ${attribute.name}: ${error}`);
|
|
@@ -310,16 +310,16 @@ function generateAttributeWriteHandler(
|
|
|
310
310
|
|
|
311
311
|
await attributeClient.set(parsedValue);
|
|
312
312
|
console.log(
|
|
313
|
-
`Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${
|
|
313
|
+
`Attribute ${attributeName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${attribute.id} set to ${Diagnostic.json(value)}`,
|
|
314
314
|
);
|
|
315
315
|
} catch (error) {
|
|
316
316
|
if (error instanceof ValidationError) {
|
|
317
317
|
console.log(
|
|
318
|
-
`ERROR: Could not validate data for attribute ${attribute.name} to ${
|
|
318
|
+
`ERROR: Could not validate data for attribute ${attribute.name} to ${Diagnostic.json(parsedValue)}: ${error}${error.fieldName !== undefined ? ` in field ${error.fieldName}` : ""}`,
|
|
319
319
|
);
|
|
320
320
|
} else {
|
|
321
321
|
console.log(
|
|
322
|
-
`ERROR: Could not set attribute ${attribute.name} to ${
|
|
322
|
+
`ERROR: Could not set attribute ${attribute.name} to ${Diagnostic.json(parsedValue)}: ${error}`,
|
|
323
323
|
);
|
|
324
324
|
}
|
|
325
325
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Diagnostic } from "@matter/general";
|
|
8
8
|
import { ClusterModel, CommandModel, MatterModel } from "@matter/model";
|
|
9
9
|
import { ClusterId, ValidationError } from "@matter/types";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
@@ -143,19 +143,19 @@ async function executeCommand(
|
|
|
143
143
|
|
|
144
144
|
const result = await clusterClient.commands[commandName](requestData);
|
|
145
145
|
console.log(
|
|
146
|
-
`Command ${command.name} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${
|
|
146
|
+
`Command ${command.name} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${command.id} invoked ${requestData ? `with ${Diagnostic.json(requestData)}` : ""}`,
|
|
147
147
|
);
|
|
148
148
|
if (result !== undefined) {
|
|
149
|
-
console.log(`Result: ${
|
|
149
|
+
console.log(`Result: ${Diagnostic.json(result)}`);
|
|
150
150
|
}
|
|
151
151
|
} catch (error) {
|
|
152
152
|
if (error instanceof ValidationError) {
|
|
153
153
|
console.log(
|
|
154
|
-
`ERROR: Could not validate data for command ${command.name} with ${
|
|
154
|
+
`ERROR: Could not validate data for command ${command.name} with ${Diagnostic.json(requestData)}: ${error}${error.fieldName !== undefined ? ` in field ${error.fieldName}` : ""}`,
|
|
155
155
|
);
|
|
156
156
|
} else {
|
|
157
157
|
console.log(
|
|
158
|
-
`ERROR: Could not invoke command ${command.name} ${requestData ? `with ${
|
|
158
|
+
`ERROR: Could not invoke command ${command.name} ${requestData ? `with ${Diagnostic.json(requestData)}` : ""}: ${error}`,
|
|
159
159
|
);
|
|
160
160
|
}
|
|
161
161
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Diagnostic } from "@matter/general";
|
|
8
8
|
import { ClusterModel, EventModel, MatterModel } from "@matter/model";
|
|
9
9
|
import { ClusterId } from "@matter/types";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
@@ -74,7 +74,7 @@ function generateEventHandler(
|
|
|
74
74
|
}
|
|
75
75
|
const eventClient = clusterClient.events[eventName];
|
|
76
76
|
console.log(
|
|
77
|
-
`Event value for ${eventName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${event.id}: ${
|
|
77
|
+
`Event value for ${eventName} ${node.nodeId.toString()}/${endpointId}/${clusterId}/${event.id}: ${Diagnostic.json(await eventClient.get())}`,
|
|
78
78
|
);
|
|
79
79
|
},
|
|
80
80
|
);
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Diagnostic, MatterError } from "@matter/general";
|
|
8
8
|
import { DiscoveryCapabilitiesSchema, ManualPairingCodeCodec, NodeId, QrCode, QrPairingCodeCodec } from "@matter/types";
|
|
9
9
|
import { BasicInformationCluster, DescriptorCluster, GeneralCommissioning } from "@matter/types/clusters";
|
|
10
10
|
import { NodeCommissioningOptions } from "@project-chip/matter.js";
|
|
@@ -136,7 +136,7 @@ export default function commands(theNode: MatterNode) {
|
|
|
136
136
|
regulatoryCountryCode: "XX",
|
|
137
137
|
};
|
|
138
138
|
|
|
139
|
-
console.log(
|
|
139
|
+
console.log(Diagnostic.json(options));
|
|
140
140
|
|
|
141
141
|
if (theNode.Store.has("WiFiSsid") && theNode.Store.has("WiFiPassword")) {
|
|
142
142
|
options.commissioning.wifiNetwork = {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Diagnostic } from "@matter/general";
|
|
8
8
|
import { CommissionableDeviceIdentifiers } from "@matter/protocol";
|
|
9
9
|
import { ManualPairingCodeCodec, VendorId } from "@matter/types";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
@@ -101,7 +101,7 @@ export default function commands(theNode: MatterNode) {
|
|
|
101
101
|
: {};
|
|
102
102
|
|
|
103
103
|
console.log(
|
|
104
|
-
`Discover devices with identifier ${
|
|
104
|
+
`Discover devices with identifier ${Diagnostic.json(
|
|
105
105
|
identifierData,
|
|
106
106
|
)} for ${timeoutSeconds} seconds.`,
|
|
107
107
|
);
|
|
@@ -112,7 +112,7 @@ export default function commands(theNode: MatterNode) {
|
|
|
112
112
|
ble,
|
|
113
113
|
onIpNetwork: true,
|
|
114
114
|
},
|
|
115
|
-
device => console.log(`Discovered device ${
|
|
115
|
+
device => console.log(`Discovered device ${Diagnostic.json(device)}`),
|
|
116
116
|
timeoutSeconds,
|
|
117
117
|
);
|
|
118
118
|
|
package/src/shell/cmd_nodes.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { capitalize, decamelize,
|
|
7
|
+
import { capitalize, decamelize, Diagnostic } from "@matter/general";
|
|
8
8
|
import { NodeId } from "@matter/types";
|
|
9
9
|
import { CommissioningControllerNodeOptions, NodeStateInformation } from "@project-chip/matter.js/device";
|
|
10
10
|
import type { Argv } from "yargs";
|
|
@@ -14,13 +14,13 @@ export function createDiagnosticCallbacks(): Partial<CommissioningControllerNode
|
|
|
14
14
|
return {
|
|
15
15
|
attributeChangedCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, attributeName }, value }) =>
|
|
16
16
|
console.log(
|
|
17
|
-
`attributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${
|
|
17
|
+
`attributeChangedCallback ${peerNodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Diagnostic.json(
|
|
18
18
|
value,
|
|
19
19
|
)}`,
|
|
20
20
|
),
|
|
21
21
|
eventTriggeredCallback: (peerNodeId, { path: { nodeId, clusterId, endpointId, eventName }, events }) =>
|
|
22
22
|
console.log(
|
|
23
|
-
`eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${
|
|
23
|
+
`eventTriggeredCallback ${peerNodeId}: Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Diagnostic.json(
|
|
24
24
|
events,
|
|
25
25
|
)}`,
|
|
26
26
|
),
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Diagnostic } from "@matter/general";
|
|
8
8
|
import type { Argv } from "yargs";
|
|
9
9
|
import { MatterNode } from "../MatterNode.js";
|
|
10
10
|
|
|
@@ -27,13 +27,13 @@ export default function commands(theNode: MatterNode) {
|
|
|
27
27
|
await node.subscribeAllAttributesAndEvents({
|
|
28
28
|
attributeChangedCallback: ({ path: { nodeId, clusterId, endpointId, attributeName }, value }) =>
|
|
29
29
|
console.log(
|
|
30
|
-
`${nodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${
|
|
30
|
+
`${nodeId}: Attribute ${nodeId}/${endpointId}/${clusterId}/${attributeName} changed to ${Diagnostic.json(
|
|
31
31
|
value,
|
|
32
32
|
)}`,
|
|
33
33
|
),
|
|
34
34
|
eventTriggeredCallback: ({ path: { nodeId, clusterId, endpointId, eventName }, events }) =>
|
|
35
35
|
console.log(
|
|
36
|
-
`${nodeId} Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${
|
|
36
|
+
`${nodeId} Event ${nodeId}/${endpointId}/${clusterId}/${eventName} triggered with ${Diagnostic.json(
|
|
37
37
|
events,
|
|
38
38
|
)}`,
|
|
39
39
|
),
|
package/src/shell/cmd_tlv.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { Bytes, Logger, serialize, UnexpectedDataError } from "#general";
|
|
7
|
+
import { Bytes, Diagnostic, Logger, serialize, UnexpectedDataError } from "#general";
|
|
8
8
|
import { TlvAny, TlvArrayReader, TlvElement, TlvStream, TlvType } from "#types";
|
|
9
9
|
import type { Argv } from "yargs";
|
|
10
10
|
|
|
@@ -32,7 +32,7 @@ function logAnyTlvStream(encoded: TlvStream) {
|
|
|
32
32
|
logGenericElement(reader);
|
|
33
33
|
const nextElement = reader.readTagType();
|
|
34
34
|
if (nextElement !== undefined) {
|
|
35
|
-
throw new UnexpectedDataError(`Unexpected data left after parsing all data: ${
|
|
35
|
+
throw new UnexpectedDataError(`Unexpected data left after parsing all data: ${Diagnostic.json(nextElement)}`);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
|
|
@@ -52,7 +52,7 @@ function logGenericElement(reader: TlvArrayReader, preReadElement?: TlvElement<a
|
|
|
52
52
|
case TlvType.Utf8String:
|
|
53
53
|
case TlvType.ByteString:
|
|
54
54
|
if (tag !== undefined && !allowTag) {
|
|
55
|
-
throw new UnexpectedDataError(`Tag detected for a native type: ${
|
|
55
|
+
throw new UnexpectedDataError(`Tag detected for a native type: ${Diagnostic.json(element)}`);
|
|
56
56
|
}
|
|
57
57
|
const value = reader.readPrimitive(element.typeLength);
|
|
58
58
|
const logValue = value instanceof Uint8Array ? Bytes.toHex(value) : value;
|
|
@@ -99,7 +99,7 @@ function logGenericArrayOrList(reader: TlvArrayReader, allowTag = false) {
|
|
|
99
99
|
} = element;
|
|
100
100
|
if (type === TlvType.EndOfContainer) break;
|
|
101
101
|
if (tag !== undefined && !allowTag) {
|
|
102
|
-
throw new UnexpectedDataError(`Tag detected : ${
|
|
102
|
+
throw new UnexpectedDataError(`Tag detected : ${Diagnostic.json(element)}`);
|
|
103
103
|
}
|
|
104
104
|
logGenericElement(reader, element, allowTag);
|
|
105
105
|
}
|
|
@@ -116,7 +116,7 @@ function logGenericStructure(reader: TlvArrayReader) {
|
|
|
116
116
|
} = element;
|
|
117
117
|
if (type === TlvType.EndOfContainer) break;
|
|
118
118
|
if (tag === undefined || tag.id === undefined) {
|
|
119
|
-
throw new UnexpectedDataError(`Tag missing for a structure: ${
|
|
119
|
+
throw new UnexpectedDataError(`Tag missing for a structure: ${Diagnostic.json(element)}`);
|
|
120
120
|
}
|
|
121
121
|
logGenericElement(reader, element, true);
|
|
122
122
|
}
|