@matter/protocol 0.16.6-alpha.0-20260122-b5154bcb4 → 0.16.7
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/interaction/AttributeDataDecoder.d.ts.map +1 -1
- package/dist/cjs/interaction/AttributeDataDecoder.js +0 -3
- package/dist/cjs/interaction/AttributeDataDecoder.js.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.js +42 -27
- package/dist/cjs/protocol/ExchangeManager.js.map +1 -1
- package/dist/esm/interaction/AttributeDataDecoder.d.ts.map +1 -1
- package/dist/esm/interaction/AttributeDataDecoder.js +0 -3
- package/dist/esm/interaction/AttributeDataDecoder.js.map +1 -1
- package/dist/esm/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeManager.js +44 -28
- package/dist/esm/protocol/ExchangeManager.js.map +1 -1
- package/package.json +6 -6
- package/src/interaction/AttributeDataDecoder.ts +0 -4
- package/src/protocol/ExchangeManager.ts +49 -32
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeDataDecoder.d.ts","sourceRoot":"","sources":["../../../src/interaction/AttributeDataDecoder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACH,WAAW,EAGX,WAAW,EAEX,SAAS,EACT,cAAc,EAGd,MAAM,EACN,MAAM,EAEN,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,SAAS,EAET,cAAc,EACjB,MAAM,QAAQ,CAAC;AAIhB,MAAM,MAAM,2BAA2B,GAAG;IACtC,IAAI,EAAE;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,cAAc,CAAC;QAC3B,SAAS,EAAE,SAAS,CAAC;QACrB,WAAW,EAAE,WAAW,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACzB,CAAC;CACL,CAAC;AAEF,0FAA0F;AAC1F,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,2BAA2B,GAAG;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,2FAA2F;AAC3F,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,GAAG;IACrE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,4GAA4G;AAC5G,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG;IACrF,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qGAAqG;AACrG,MAAM,MAAM,2BAA2B,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,CAAC;AAEvG;;;;GAIG;AACH,wBAAgB,qCAAqC,CACjD,IAAI,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,EACjD,wBAAwB,CAAC,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,GACvE;IACC,aAAa,EAAE,2BAA2B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,eAAe,EAAE,4BAA4B,EAAE,CAAC;CACnD,CAoCA;AAED,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAC/C,mBAAmB,UAAQ,GAC5B,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,CAmC3C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAC/C,mBAAmB,UAAQ,GAC5B,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAAE,CAgB7C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,GAClD,4BAA4B,EAAE,CAmChC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC3C,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,GAChD,qBAAqB,CAAC,GAAG,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"AttributeDataDecoder.d.ts","sourceRoot":"","sources":["../../../src/interaction/AttributeDataDecoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,9 +159,6 @@ function normalizeAndDecodeAttributeData(data) {
|
|
|
159
159
|
const cluster = (0, import_types.getClusterById)(clusterId);
|
|
160
160
|
const attributeDetail = (0, import_types.getClusterAttributeById)(cluster, attributeId);
|
|
161
161
|
if (attributeDetail === void 0) {
|
|
162
|
-
logger.debug(
|
|
163
|
-
`Decode unknown attribute ${import_general.Diagnostic.hex(clusterId)}/${import_general.Diagnostic.hex(attributeId)} via the AnySchema.`
|
|
164
|
-
);
|
|
165
162
|
const attributeName = `Unknown (${import_general.Diagnostic.hex(attributeId)})`;
|
|
166
163
|
const value2 = decodeUnknownAttributeValue(values);
|
|
167
164
|
result.push({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/interaction/AttributeDataDecoder.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExchangeManager.d.ts","sourceRoot":"","sources":["../../../src/protocol/ExchangeManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,0BAA0B,EAE1B,OAAO,EACP,WAAW,EACX,aAAa,EAGb,QAAQ,
|
|
1
|
+
{"version":3,"file":"ExchangeManager.d.ts","sourceRoot":"","sources":["../../../src/protocol/ExchangeManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,0BAA0B,EAE1B,OAAO,EACP,WAAW,EACX,aAAa,EAGb,QAAQ,EAOX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,eAAe,EAA0B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAYvD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,0BAA0B,CAAC;IACzC,QAAQ,EAAE,cAAc,CAAC;CAC5B;AAED,qBAAa,eAAe;;gBAaZ,OAAO,EAAE,sBAAsB;IAiB3C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAW9C,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAIrC,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAIrC,kBAAkB,CAAC,QAAQ,EAAE,eAAe;IAO5C,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM;IAIzD,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM;IAQzD,KAAK;IAkPL,cAAc,CAAC,aAAa,EAAE,MAAM;IAoC1C,qCAAqC,CAAC,OAAO,EAAE,OAAO,EAAE,sBAAsB,8BAAmC;CA6EpH;AAED,qBAAa,eAAe;;gBAGZ,OAAO,EAAE,OAAO;IAI5B,qBAAqB;CAOxB"}
|
|
@@ -261,27 +261,32 @@ class ExchangeManager {
|
|
|
261
261
|
via: channel.name
|
|
262
262
|
});
|
|
263
263
|
if (exchange !== void 0) {
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
264
|
+
try {
|
|
265
|
+
this.#lifetime.details.exchange = exchange.idStr;
|
|
266
|
+
if (exchange.session.id !== packet.header.sessionId || exchange.considerClosed && !isStandaloneAck) {
|
|
267
|
+
logger.debug(
|
|
268
|
+
exchange.via,
|
|
269
|
+
"Ignore",
|
|
270
|
+
import_Mark.Mark.INBOUND,
|
|
271
|
+
"message because",
|
|
272
|
+
exchange.considerClosed ? "exchange is closing" : `session ID mismatch (header session is ${import_Session.Session.idStrOf(packet)}`,
|
|
273
|
+
messageDiagnostics
|
|
274
|
+
);
|
|
275
|
+
try {
|
|
276
|
+
await exchange.send(import_types.SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
277
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
278
|
+
protocolId: import_types.SECURE_CHANNEL_PROTOCOL_ID
|
|
279
|
+
});
|
|
280
|
+
} finally {
|
|
281
|
+
await exchange.close();
|
|
282
|
+
}
|
|
283
|
+
return;
|
|
281
284
|
}
|
|
282
|
-
|
|
285
|
+
await exchange.onMessageReceived(message, isDuplicate);
|
|
286
|
+
} catch (error) {
|
|
287
|
+
import_general.MatterError.accept(error);
|
|
288
|
+
logger.error(`${import_MessageCodec.Message.via(exchange, message)} Error:`, error);
|
|
283
289
|
}
|
|
284
|
-
await exchange.onMessageReceived(message, isDuplicate);
|
|
285
290
|
} else {
|
|
286
291
|
if (this.#isClosing) return;
|
|
287
292
|
if (session.isClosing) {
|
|
@@ -306,18 +311,28 @@ class ExchangeManager {
|
|
|
306
311
|
const exchange2 = import_MessageExchange.MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
307
312
|
this.#lifetime.details.exchange = exchange2.idStr;
|
|
308
313
|
this.#addExchange(exchangeIndex, exchange2);
|
|
309
|
-
|
|
310
|
-
|
|
314
|
+
try {
|
|
315
|
+
await exchange2.onMessageReceived(message);
|
|
316
|
+
await protocolHandler.onNewExchange(exchange2, message);
|
|
317
|
+
} catch (error) {
|
|
318
|
+
import_general.MatterError.accept(error);
|
|
319
|
+
logger.error(`${import_MessageCodec.Message.via(exchange2, message)} Error:`, error);
|
|
320
|
+
}
|
|
311
321
|
} else if (message.payloadHeader.requiresAck) {
|
|
312
322
|
const exchange2 = import_MessageExchange.MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
313
323
|
this.#lifetime.details.exchange = exchange2.idStr;
|
|
314
324
|
this.#addExchange(exchangeIndex, exchange2);
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
325
|
+
try {
|
|
326
|
+
await exchange2.send(import_types.SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
327
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
328
|
+
protocolId: import_types.SECURE_CHANNEL_PROTOCOL_ID
|
|
329
|
+
});
|
|
330
|
+
await exchange2.close();
|
|
331
|
+
logger.debug("Ignore", import_Mark.Mark.INBOUND, "unsolicited message", messageDiagnostics);
|
|
332
|
+
} catch (error) {
|
|
333
|
+
import_general.MatterError.accept(error);
|
|
334
|
+
logger.error(`${import_MessageCodec.Message.via(exchange2, message)} Error:`, error);
|
|
335
|
+
}
|
|
321
336
|
} else {
|
|
322
337
|
if (protocolHandler === void 0) {
|
|
323
338
|
throw new import_general.MatterFlowError(`Unsupported protocol ${message.payloadHeader.protocolId}`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/protocol/ExchangeManager.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_stack", "_", "_error", "_hasError", "exchange"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeDataDecoder.d.ts","sourceRoot":"","sources":["../../../src/interaction/AttributeDataDecoder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACH,WAAW,EAGX,WAAW,EAEX,SAAS,EACT,cAAc,EAGd,MAAM,EACN,MAAM,EAEN,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,SAAS,EAET,cAAc,EACjB,MAAM,QAAQ,CAAC;AAIhB,MAAM,MAAM,2BAA2B,GAAG;IACtC,IAAI,EAAE;QACF,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,cAAc,CAAC;QAC3B,SAAS,EAAE,SAAS,CAAC;QACrB,WAAW,EAAE,WAAW,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACzB,CAAC;CACL,CAAC;AAEF,0FAA0F;AAC1F,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,2BAA2B,GAAG;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,2FAA2F;AAC3F,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,GAAG;IACrE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,4GAA4G;AAC5G,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG;IACrF,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qGAAqG;AACrG,MAAM,MAAM,2BAA2B,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAA;CAAE,CAAC;AAEvG;;;;GAIG;AACH,wBAAgB,qCAAqC,CACjD,IAAI,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,EACjD,wBAAwB,CAAC,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,GACvE;IACC,aAAa,EAAE,2BAA2B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,eAAe,EAAE,4BAA4B,EAAE,CAAC;CACnD,CAoCA;AAED,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAC/C,mBAAmB,UAAQ,GAC5B,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,CAmC3C;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAC/C,mBAAmB,UAAQ,GAC5B,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,EAAE,CAgB7C;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,cAAc,CAAC,OAAO,kBAAkB,CAAC,EAAE,GAClD,4BAA4B,EAAE,CAmChC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC3C,IAAI,EAAE,cAAc,CAAC,OAAO,gBAAgB,CAAC,EAAE,GAChD,qBAAqB,CAAC,GAAG,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"AttributeDataDecoder.d.ts","sourceRoot":"","sources":["../../../src/interaction/AttributeDataDecoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,9 +135,6 @@ function normalizeAndDecodeAttributeData(data) {
|
|
|
135
135
|
const cluster = getClusterById(clusterId);
|
|
136
136
|
const attributeDetail = getClusterAttributeById(cluster, attributeId);
|
|
137
137
|
if (attributeDetail === void 0) {
|
|
138
|
-
logger.debug(
|
|
139
|
-
`Decode unknown attribute ${Diagnostic.hex(clusterId)}/${Diagnostic.hex(attributeId)} via the AnySchema.`
|
|
140
|
-
);
|
|
141
138
|
const attributeName = `Unknown (${Diagnostic.hex(attributeId)})`;
|
|
142
139
|
const value2 = decodeUnknownAttributeValue(values);
|
|
143
140
|
result.push({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/interaction/AttributeDataDecoder.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["value"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExchangeManager.d.ts","sourceRoot":"","sources":["../../../src/protocol/ExchangeManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,0BAA0B,EAE1B,OAAO,EACP,WAAW,EACX,aAAa,EAGb,QAAQ,
|
|
1
|
+
{"version":3,"file":"ExchangeManager.d.ts","sourceRoot":"","sources":["../../../src/protocol/ExchangeManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,0BAA0B,EAE1B,OAAO,EACP,WAAW,EACX,aAAa,EAGb,QAAQ,EAOX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,eAAe,EAA0B,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAYvD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,0BAA0B,CAAC;IACzC,QAAQ,EAAE,cAAc,CAAC;CAC5B;AAED,qBAAa,eAAe;;gBAaZ,OAAO,EAAE,sBAAsB;IAiB3C,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAW9C,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAIrC,kBAAkB,CAAC,UAAU,EAAE,MAAM;IAIrC,kBAAkB,CAAC,QAAQ,EAAE,eAAe;IAO5C,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM;IAIzD,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM;IAQzD,KAAK;IAkPL,cAAc,CAAC,aAAa,EAAE,MAAM;IAoC1C,qCAAqC,CAAC,OAAO,EAAE,OAAO,EAAE,sBAAsB,8BAAmC;CA6EpH;AAED,qBAAa,eAAe;;gBAGZ,OAAO,EAAE,OAAO;IAI5B,qBAAqB;CAOxB"}
|
|
@@ -48,7 +48,7 @@ var __callDispose = (stack, error, hasError) => {
|
|
|
48
48
|
* Copyright 2022-2026 Matter.js Authors
|
|
49
49
|
* SPDX-License-Identifier: Apache-2.0
|
|
50
50
|
*/
|
|
51
|
-
import { MessageCodec, SessionType } from "#codec/MessageCodec.js";
|
|
51
|
+
import { Message, MessageCodec, SessionType } from "#codec/MessageCodec.js";
|
|
52
52
|
import { Mark } from "#common/Mark.js";
|
|
53
53
|
import {
|
|
54
54
|
BasicMultiplex,
|
|
@@ -60,6 +60,7 @@ import {
|
|
|
60
60
|
hex,
|
|
61
61
|
ImplementationError,
|
|
62
62
|
Logger,
|
|
63
|
+
MatterError,
|
|
63
64
|
MatterFlowError,
|
|
64
65
|
ObserverGroup,
|
|
65
66
|
UdpInterface,
|
|
@@ -251,27 +252,32 @@ class ExchangeManager {
|
|
|
251
252
|
via: channel.name
|
|
252
253
|
});
|
|
253
254
|
if (exchange !== void 0) {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
255
|
+
try {
|
|
256
|
+
this.#lifetime.details.exchange = exchange.idStr;
|
|
257
|
+
if (exchange.session.id !== packet.header.sessionId || exchange.considerClosed && !isStandaloneAck) {
|
|
258
|
+
logger.debug(
|
|
259
|
+
exchange.via,
|
|
260
|
+
"Ignore",
|
|
261
|
+
Mark.INBOUND,
|
|
262
|
+
"message because",
|
|
263
|
+
exchange.considerClosed ? "exchange is closing" : `session ID mismatch (header session is ${Session.idStrOf(packet)}`,
|
|
264
|
+
messageDiagnostics
|
|
265
|
+
);
|
|
266
|
+
try {
|
|
267
|
+
await exchange.send(SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
268
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
269
|
+
protocolId: SECURE_CHANNEL_PROTOCOL_ID
|
|
270
|
+
});
|
|
271
|
+
} finally {
|
|
272
|
+
await exchange.close();
|
|
273
|
+
}
|
|
274
|
+
return;
|
|
271
275
|
}
|
|
272
|
-
|
|
276
|
+
await exchange.onMessageReceived(message, isDuplicate);
|
|
277
|
+
} catch (error) {
|
|
278
|
+
MatterError.accept(error);
|
|
279
|
+
logger.error(`${Message.via(exchange, message)} Error:`, error);
|
|
273
280
|
}
|
|
274
|
-
await exchange.onMessageReceived(message, isDuplicate);
|
|
275
281
|
} else {
|
|
276
282
|
if (this.#isClosing) return;
|
|
277
283
|
if (session.isClosing) {
|
|
@@ -296,18 +302,28 @@ class ExchangeManager {
|
|
|
296
302
|
const exchange2 = MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
297
303
|
this.#lifetime.details.exchange = exchange2.idStr;
|
|
298
304
|
this.#addExchange(exchangeIndex, exchange2);
|
|
299
|
-
|
|
300
|
-
|
|
305
|
+
try {
|
|
306
|
+
await exchange2.onMessageReceived(message);
|
|
307
|
+
await protocolHandler.onNewExchange(exchange2, message);
|
|
308
|
+
} catch (error) {
|
|
309
|
+
MatterError.accept(error);
|
|
310
|
+
logger.error(`${Message.via(exchange2, message)} Error:`, error);
|
|
311
|
+
}
|
|
301
312
|
} else if (message.payloadHeader.requiresAck) {
|
|
302
313
|
const exchange2 = MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
303
314
|
this.#lifetime.details.exchange = exchange2.idStr;
|
|
304
315
|
this.#addExchange(exchangeIndex, exchange2);
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
316
|
+
try {
|
|
317
|
+
await exchange2.send(SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
318
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
319
|
+
protocolId: SECURE_CHANNEL_PROTOCOL_ID
|
|
320
|
+
});
|
|
321
|
+
await exchange2.close();
|
|
322
|
+
logger.debug("Ignore", Mark.INBOUND, "unsolicited message", messageDiagnostics);
|
|
323
|
+
} catch (error) {
|
|
324
|
+
MatterError.accept(error);
|
|
325
|
+
logger.error(`${Message.via(exchange2, message)} Error:`, error);
|
|
326
|
+
}
|
|
311
327
|
} else {
|
|
312
328
|
if (protocolHandler === void 0) {
|
|
313
329
|
throw new MatterFlowError(`Unsupported protocol ${message.payloadHeader.protocolId}`);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/protocol/ExchangeManager.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAyB,cAAc,mBAAmB;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAyB,SAAS,cAAc,mBAAmB;AACnE,SAAS,YAAY;AACrB;AAAA,EACI;AAAA,EACA;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAEP,SAAS,wCAAwC;AACjD,SAAS,8BAA8B;AACvC,SAAS,mBAAmB;AAC5B,SAAS,eAAe;AACxB,SAAS,sBAAsB;AAC/B,SAAS,mCAAmC;AAC5C,SAAS,QAAQ,4BAA4B,yBAAyB;AACtE,SAAS,uBAA+C;AACxD,SAAS,6BAA6B;AAGtC,MAAM,SAAS,OAAO,IAAI,iBAAiB;AAQ3C,MAAM,oDAAoD;AAYnD,MAAM,gBAAgB;AAAA,EAChB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa,oBAAI,IAA6B;AAAA,EAC9C,aAAa,oBAAI,IAA6B;AAAA,EAC9C,aAAa,oBAAI,IAA+D;AAAA,EAChF;AAAA,EACA,aAAa,IAAI,cAAc,IAAI;AAAA,EACnC,oBAAoB,oBAAI,IAA4B;AAAA,EAC7D,aAAa;AAAA,EAEb,YAAY,SAAiC;AACzC,SAAK,YAAY,QAAQ,SAAS,KAAK,WAAW;AAClD,SAAK,WAAW,IAAI,eAAe;AACnC,SAAK,cAAc,QAAQ;AAC3B,SAAK,YAAY,QAAQ;AACzB,SAAK,mBAAmB,IAAI,gBAAgB,QAAQ,OAAO;AAE3D,eAAW,gBAAgB,KAAK,aAAa;AACzC,WAAK,cAAc,YAAY;AAAA,IACnC;AAEA,SAAK,WAAW,GAAG,KAAK,YAAY,OAAO,KAAK,aAAa;AAC7D,SAAK,WAAW,GAAG,KAAK,YAAY,SAAS,KAAK,gBAAgB;AAClE,SAAK,WAAW,GAAG,KAAK,UAAU,SAAS,OAAO,KAAK,WAAW;AAClE,SAAK,WAAW,GAAG,KAAK,UAAU,SAAS,SAAS,KAAK,cAAc;AAAA,EAC3E;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,gBAAgB;AAAA,MACjC,UAAU;AAAA,MACV,SAAS,IAAI,IAAI,OAAO;AAAA,MACxB,cAAc,IAAI,IAAI,0BAA0B;AAAA,MAChD,UAAU,IAAI,IAAI,cAAc;AAAA,IACpC,CAAC;AACD,QAAI,IAAI,iBAAiB,QAAQ;AACjC,WAAO;AAAA,EACX;AAAA,EAEA,mBAAmB,YAAoB;AACnC,WAAO,KAAK,WAAW,IAAI,UAAU;AAAA,EACzC;AAAA,EAEA,mBAAmB,YAAoB;AACnC,WAAO,KAAK,WAAW,IAAI,UAAU;AAAA,EACzC;AAAA,EAEA,mBAAmB,UAA2B;AAC1C,QAAI,KAAK,mBAAmB,SAAS,EAAE,GAAG;AACtC,YAAM,IAAI,oBAAoB,wBAAwB,SAAS,EAAE,sBAAsB;AAAA,IAC3F;AACA,SAAK,WAAW,IAAI,SAAS,IAAI,QAAQ;AAAA,EAC7C;AAAA,EAEA,iBAAiB,SAAsB,YAAoB;AACvD,WAAO,KAAK,2BAA2B,KAAK,UAAU,WAAW,OAAO,GAAG,UAAU;AAAA,EACzF;AAAA,EAEA,2BAA2B,SAAkB,YAAoB;AAC7D,UAAM,aAAa,KAAK,iBAAiB,sBAAsB;AAC/D,UAAM,gBAAgB,aAAa;AACnC,UAAM,WAAW,gBAAgB,SAAS,KAAK,2BAA2B,OAAO,GAAG,YAAY,UAAU;AAC1G,SAAK,aAAa,eAAe,QAAQ;AACzC,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAQ;AAKV,QAAAA,UAAA;AAAA;AAJA,UAAI,KAAK,YAAY;AACjB;AAAA,MACJ;AAEA,YAAM,UAAU,QAAAA,SAAA,KAAK,UAAU,QAAQ;AAEvC,WAAK,aAAa;AAElB,YAAM,kBAAkB,IAAI,eAAe;AAE3C,iBAAW,YAAY,KAAK,WAAW,OAAO,GAAG;AAC7C,wBAAgB,IAAI,SAAS,MAAM,IAAI,CAAC;AAAA,MAC5C;AAEA;AACI;AAAA;AAAA,gBAAM,WAAW,wBAAQ,KAAK,WAAW;AACzC,gBAAM;AAAA,iBADN;AAAA;AAAA;AAAA;AAAA;AAAA,MAEJ;AAEA,iBAAW,YAAY,KAAK,WAAW,KAAK,GAAG;AAC3C,aAAK,iBAAiB,QAAQ;AAAA,MAClC;AAEA,iBAAW,YAAY,KAAK,WAAW,OAAO,GAAG;AAC7C,aAAK,SAAS,IAAI,SAAS,MAAM,CAAC;AAAA,MACtC;AAEA;AACI,YAAAA,UAAA;AAAA;AAAA,gBAAM,WAAW,QAAAA,SAAA,QAAQ,KAAK,SAAS;AACvC,gBAAM,KAAK;AAAA,iBADXC,IAAA;AAAA,cAAAC,UAAAD,IAAAE,aAAA;AAAA;AAAA,wBAAAH,SAAAE,SAAAC;AAAA;AAAA,MAEJ;AAEA,WAAK,WAAW,MAAM;AACtB,WAAK,WAAW,MAAM;AAAA,aA7BtBF,IAAA;AAAA,UAAAC,UAAAD,IAAAE,aAAA;AAAA;AAAA,oBAAAH,SAAAE,SAAAC;AAAA;AAAA,EA8BJ;AAAA,EAEA,MAAM,WAAW,SAAyB,cAAqB;AAC3D;AAAA;AAAA,YAAM,YAAY,qBAAK,UAAU,KAAK,kBAAkB,WAAW,OAAO,QAAQ,IAAI,CAAC;AAEvF,YAAM,SAAS,aAAa,aAAa,YAAY;AACrD,YAAM,QAAQ,MAAM,GAAG,YAAY;AACnC,YAAM,MAAM,MAAM,MAAM,GAAG,MAAM,SAAS,OAAO,mBAAmB,UAAU;AAE9E,YAAM,YAAY,OAAO,OAAO;AAEhC,UAAI;AACJ,UAAI;AACJ,UAAI;AACJ,UAAI,OAAO,OAAO,gBAAgB,YAAY,SAAS;AACnD,YAAI,OAAO,OAAO,cAAc,6BAA6B;AACzD,cAAI,KAAK,WAAY;AACrB,gBAAM,kBAAkB,OAAO,OAAO,gBAAgB,OAAO;AAC7D,oBACI,KAAK,UAAU,oBAAoB,eAAe,KAClD,KAAK,UAAU,uBAAuB;AAAA,YAClC;AAAA,YACA;AAAA,UACJ,CAAC;AAAA,QACT,OAAO;AACH,oBAAU,KAAK,UAAU,WAAW,OAAO,OAAO,SAAS;AAAA,QAC/D;AAEA,YAAI,YAAY,QAAW;AACvB,iBAAO;AAAA,YACH,wCAAwC,QAAQ,QAAQ,MAAM,CAAC,GAC3D,OAAO,OAAO,iBAAiB,SACzB,cAAc,IAAI,MAAM,OAAO,OAAO,cAAc,EAAE,CAAC,KACvD,EACV;AAAA,UACJ;AACA;AAAA,QACJ;AAEA,kBAAU,QAAQ,OAAO,QAAQ,GAAG;AAEpC,YAAI;AACA,kBAAQ,qBAAqB,SAAS;AACtC,wBAAc;AAAA,QAClB,SAAS,GAAG;AACR,gCAAsB,OAAO,CAAC;AAC9B,wBAAc;AAAA,QAClB;AAAA,MACJ,WAAW,OAAO,OAAO,gBAAgB,YAAY,OAAO;AACxD,YAAI,KAAK,WAAY;AACrB,YAAI,OAAO,OAAO,iBAAiB,QAAW;AAC1C,gBAAM,IAAI,oBAAoB,oDAAoD;AAAA,QACtF;AAEA,YAAI;AACJ,SAAC,EAAE,SAAS,SAAS,IAAI,IAAI,KAAK,UAAU,uBAAuB,QAAQ,GAAG;AAE9E,YAAI;AACA,kBAAQ,qBAAqB,WAAW,OAAO,OAAO,cAAc,GAAG;AACvE,wBAAc;AAAA,QAClB,SAAS,GAAG;AACR,gCAAsB,OAAO,CAAC;AAC9B,wBAAc;AAAA,QAClB;AAAA,MACJ,OAAO;AACH,cAAM,IAAI,gBAAgB,6BAA6B,OAAO,OAAO,WAAW,EAAE;AAAA,MACtF;AAEA,YAAM,gBAAgB,QAAQ,cAAc,qBACtC,QAAQ,cAAc,aACtB,QAAQ,cAAc,aAAa;AACzC,UAAI,WAAW,KAAK,WAAW,IAAI,aAAa;AAEhD,UACI,aAAa,WACZ,SAAS,QAAQ,OAAO,QAAQ,MAAM,SAAS,gBAAgB,QAAQ,cAAc,qBACxF;AACE,mBAAW;AAAA,MACf;AAEA,YAAM,kBAAkB,kBAAkB;AAAA,QACtC,QAAQ,cAAc;AAAA,QACtB,QAAQ,cAAc;AAAA,MAC1B;AACA,YAAM,qBAAqB,WAAW,KAAK;AAAA,QACvC,SAAS,IAAI,MAAM,WAAW,CAAC;AAAA,QAC/B,UAAU,QAAQ,cAAc;AAAA,QAChC,MAAM,IAAI,KAAK,QAAQ,cAAc,UAAU;AAAA,QAC/C,KAAK,QAAQ;AAAA,MACjB,CAAC;AAED,UAAI,aAAa,QAAW;AACxB,YAAI;AACA,eAAK,UAAU,QAAQ,WAAW,SAAS;AAC3C,cAAI,SAAS,QAAQ,OAAO,OAAO,OAAO,aAAc,SAAS,kBAAkB,CAAC,iBAAkB;AAClG,mBAAO;AAAA,cACH,SAAS;AAAA,cACT;AAAA,cACA,KAAK;AAAA,cACL;AAAA,cACA,SAAS,iBACH,wBACA,0CAA0C,QAAQ,QAAQ,MAAM,CAAC;AAAA,cACvE;AAAA,YACJ;AAEA,gBAAI;AACA,oBAAM,SAAS,KAAK,kBAAkB,eAAe,IAAI,WAAW,CAAC,GAAG;AAAA,gBACpE,6BAA6B,QAAQ,aAAa;AAAA,gBAClD,YAAY;AAAA,cAChB,CAAC;AAAA,YACL,UAAE;AAEE,oBAAM,SAAS,MAAM;AAAA,YACzB;AACA;AAAA,UACJ;AAEA,gBAAM,SAAS,kBAAkB,SAAS,WAAW;AAAA,QACzD,SAAS,OAAO;AACZ,sBAAY,OAAO,KAAK;AACxB,iBAAO,MAAM,GAAG,QAAQ,IAAI,UAAU,OAAO,CAAC,WAAW,KAAK;AAAA,QAClE;AAAA,MACJ,OAAO;AACH,YAAI,KAAK,WAAY;AACrB,YAAI,QAAQ,WAAW;AACnB,iBAAO,MAAM,0CAA0C,QAAQ,QAAQ,MAAM,CAAC,aAAa;AAC3F;AAAA,QACJ;AAEA,cAAM,kBAAkB,KAAK,WAAW,IAAI,QAAQ,cAAc,UAAU;AAE5E,cAAM,0BACF,iBAAiB,0BAA0B,UAC3C,gBAAgB,0BAA0B,QAAQ;AAGtD,YAAI,yBAAyB;AACzB,iBAAO;AAAA,YACH;AAAA,YACA,KAAK;AAAA,YACL,2DAA2D,gBAAgB,qBAAqB,QAAQ,QAAQ,QAAQ;AAAA,YACxH;AAAA,UACJ;AAAA,QACJ;AAEA,YACI,oBAAoB,UACpB,QAAQ,cAAc,sBACtB,CAAC,eACD,CAAC,yBACH;AACE,cAAI,mBAAmB,CAAC,QAAQ,cAAc,aAAa;AACvD,mBAAO,MAAM,UAAU,KAAK,SAAS,sCAAsC,kBAAkB;AAC7F;AAAA,UACJ;AAEA,gBAAMC,YAAW,gBAAgB,mBAAmB,KAAK,2BAA2B,OAAO,GAAG,OAAO;AACrG,eAAK,UAAU,QAAQ,WAAWA,UAAS;AAC3C,eAAK,aAAa,eAAeA,SAAQ;AACzC,cAAI;AACA,kBAAMA,UAAS,kBAAkB,OAAO;AACxC,kBAAM,gBAAgB,cAAcA,WAAU,OAAO;AAAA,UACzD,SAAS,OAAO;AACZ,wBAAY,OAAO,KAAK;AACxB,mBAAO,MAAM,GAAG,QAAQ,IAAIA,WAAU,OAAO,CAAC,WAAW,KAAK;AAAA,UAClE;AAAA,QACJ,WAAW,QAAQ,cAAc,aAAa;AAC1C,gBAAMA,YAAW,gBAAgB,mBAAmB,KAAK,2BAA2B,OAAO,GAAG,OAAO;AACrG,eAAK,UAAU,QAAQ,WAAWA,UAAS;AAC3C,eAAK,aAAa,eAAeA,SAAQ;AAEzC,cAAI;AACA,kBAAMA,UAAS,KAAK,kBAAkB,eAAe,IAAI,WAAW,CAAC,GAAG;AAAA,cACpE,6BAA6B,QAAQ,aAAa;AAAA,cAClD,YAAY;AAAA,YAChB,CAAC;AACD,kBAAMA,UAAS,MAAM;AACrB,mBAAO,MAAM,UAAU,KAAK,SAAS,uBAAuB,kBAAkB;AAAA,UAClF,SAAS,OAAO;AACZ,wBAAY,OAAO,KAAK;AACxB,mBAAO,MAAM,GAAG,QAAQ,IAAIA,WAAU,OAAO,CAAC,WAAW,KAAK;AAAA,UAClE;AAAA,QACJ,OAAO;AACH,cAAI,oBAAoB,QAAW;AAC/B,kBAAM,IAAI,gBAAgB,wBAAwB,QAAQ,cAAc,UAAU,EAAE;AAAA,UACxF;AACA,cAAI,aAAa;AACb,gBAAI,QAAQ,aAAa,gBAAgB,QAAW;AAEhD,qBAAO,MAAM,UAAU,KAAK,SAAS,qBAAqB,kBAAkB;AAAA,YAChF;AACA;AAAA,UACJ;AACA,cAAI,CAAC,iBAAiB;AAClB,mBAAO;AAAA,cACH;AAAA,cACA,KAAK;AAAA,cACL;AAAA,cACA;AAAA,cACA,WAAW,KAAK,OAAO;AAAA,YAC3B;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAAA,aAzMA;AAAA;AAAA;AAAA;AAAA;AAAA,EA0MJ;AAAA,EAEA,MAAM,eAAe,eAAuB;AACxC,SAAK,WAAW,OAAO,aAAa;AAAA,EACxC;AAAA,EAEA,aAAa,eAAuB,UAA2B;AAC3D,aAAS,OAAO,GAAG,MAAM,KAAK,eAAe,aAAa,CAAC;AAC3D,SAAK,WAAW,IAAI,eAAe,QAAQ;AAK3C,SAAK,yBAAyB,SAAS,QAAQ,EAAE;AAAA,EACrD;AAAA,EAEA,yBAAyB,WAAmB;AACxC,QAAI,cAAc,6BAA6B;AAE3C;AAAA,IACJ;AACA,UAAM,mBAAmB,MAAM,KAAK,KAAK,WAAW,OAAO,CAAC,EAAE;AAAA,MAC1D,cAAY,SAAS,QAAQ,OAAO,aAAa,CAAC,SAAS;AAAA,IAC/D;AACA,QAAI,iBAAiB,UAAU,mDAAmD;AAC9E;AAAA,IACJ;AAGA,UAAM,kBAAkB,iBAAiB,CAAC;AAC1C,WAAO;AAAA,MACH,gBAAgB;AAAA,MAChB;AAAA,IACJ;AACA,WAAO,MAAM,gBAAgB,KAAK,yBAAyB;AAC3D,SAAK,SAAS,IAAI,gBAAgB,MAAM,CAAC;AAAA,EAC7C;AAAA,EAEA,sCAAsC,SAAkB,yBAAyB,kCAAkC;AAC/G,WAAO,QAAQ,QAAQ;AAAA,MACnB,QAAQ;AAAA,MACR,KAAK,UAAU;AAAA,MACf;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,2BAA2B,SAA0C;AACjE,WAAO;AAAA,MACH;AAAA,MACA,wBAAwB,KAAK,UAAU;AAAA,MACvC,OAAO,YAAU,KAAK,UAAU,MAAM,KAAK,SAAS,MAAM;AAAA,IAC9D;AAAA,EACJ;AAAA,EAEA,cAAc,cAAuC;AACjD,UAAM,eAAe,wBAAwB;AAC7C,SAAK,WAAW;AAAA,MACZ;AAAA,MACA,aAAa,OAAO,CAAC,QAAQ,SAAS;AAClC,YAAI,gBAAgB,KAAK,aAAa,OAAO,gBAAgB;AACzD,iBAAO;AAAA,YACH,mCAAmC,OAAO,IAAI,cAAc,KAAK,UAAU,SAAS,OAAO,IAAI,sDAAsD,OAAO,cAAc;AAAA,UAC9K;AACA;AAAA,QACJ;AAEA,aAAK,SAAS,IAAI,KAAK,WAAW,QAAQ,IAAI,CAAC;AAAA,MACnD,CAAC;AAAA,IACL;AAAA,EACJ;AAAA,EAEA,iBAAiB,cAAuC;AACpD,UAAM,WAAW,KAAK,WAAW,IAAI,YAAY;AACjD,QAAI,aAAa,QAAW;AACxB;AAAA,IACJ;AACA,SAAK,WAAW,OAAO,YAAY;AAEnC,SAAK,SAAS,IAAI,SAAS,MAAM,CAAC;AAAA,EACtC;AAAA,EAEA,YAAY,SAAkB;AAC1B,QAAI,EAAE,mBAAmB,cAAc;AACnC;AAAA,IACJ;AAEA,QAAI,YAAY,KAAK,kBAAkB,IAAI,OAAO;AAClD,QAAI,CAAC,WAAW;AACZ,WAAK,kBAAkB,IAAI,SAAU,YAAY,IAAI,cAAc,CAAE;AAAA,IACzE;AAEA,cAAU,GAAG,QAAQ,eAAe,MAAM,KAAK,kBAAkB,OAAO,CAAC;AAAA,EAC7E;AAAA,EAEA,eAAe,SAAkB;AAC7B,UAAM,YAAY,KAAK,kBAAkB,IAAI,OAAO;AACpD,QAAI,CAAC,WAAW;AACZ;AAAA,IACJ;AAEA,cAAU,MAAM;AAChB,SAAK,kBAAkB,OAAO,OAAO;AAAA,EACzC;AAAA,EAEA,MAAM,kBAAkB,SAAsB;AAC1C;AAAA;AAAA,YAAY,WAAW,qBAAK,2BAA2B,SAAS,0BAA0B,GAAnE;AACvB,aAAO,MAAM,SAAS,KAAK,iBAAiB;AAC5C,UAAI;AACA,cAAM,YAAY,IAAI,uBAAuB,QAAQ;AACrD,cAAM,UAAU,iBAAiB;AACjC,cAAM,UAAU,MAAM;AAAA,MAC1B,SAAS,OAAO;AACZ,eAAO,MAAM,SAAS,KAAK,0BAA0B,KAAK;AAAA,MAC9D;AAAA,aARA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASJ;AACJ;AAEO,MAAM,gBAAgB;AAAA,EACzB;AAAA,EAEA,YAAY,SAAkB;AAC1B,SAAK,mBAAmB,QAAQ;AAAA,EACpC;AAAA,EAEA,wBAAwB;AACpB,SAAK;AACL,QAAI,KAAK,mBAAmB,OAAQ;AAChC,WAAK,mBAAmB;AAAA,IAC5B;AACA,WAAO,KAAK;AAAA,EAChB;AACJ;",
|
|
5
5
|
"names": ["_stack", "_", "_error", "_hasError", "exchange"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/protocol",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.7",
|
|
4
4
|
"description": "Low-level APIs for Matter interaction",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -40,13 +40,13 @@
|
|
|
40
40
|
"#*": "./src/*"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@matter/general": "0.16.
|
|
44
|
-
"@matter/model": "0.16.
|
|
45
|
-
"@matter/types": "0.16.
|
|
43
|
+
"@matter/general": "0.16.7",
|
|
44
|
+
"@matter/model": "0.16.7",
|
|
45
|
+
"@matter/types": "0.16.7"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@matter/tools": "0.16.
|
|
49
|
-
"@matter/testing": "0.16.
|
|
48
|
+
"@matter/tools": "0.16.7",
|
|
49
|
+
"@matter/testing": "0.16.7"
|
|
50
50
|
},
|
|
51
51
|
"files": [
|
|
52
52
|
"dist/**/*",
|
|
@@ -237,10 +237,6 @@ export function normalizeAndDecodeAttributeData(
|
|
|
237
237
|
const cluster = getClusterById(clusterId);
|
|
238
238
|
const attributeDetail = getClusterAttributeById(cluster, attributeId);
|
|
239
239
|
if (attributeDetail === undefined) {
|
|
240
|
-
logger.debug(
|
|
241
|
-
`Decode unknown attribute ${Diagnostic.hex(clusterId)}/${Diagnostic.hex(attributeId)} via the AnySchema.`,
|
|
242
|
-
);
|
|
243
|
-
|
|
244
240
|
const attributeName = `Unknown (${Diagnostic.hex(attributeId)})`;
|
|
245
241
|
const value = decodeUnknownAttributeValue(values);
|
|
246
242
|
result.push({
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { DecodedMessage, MessageCodec, SessionType } from "#codec/MessageCodec.js";
|
|
7
|
+
import { DecodedMessage, Message, MessageCodec, SessionType } from "#codec/MessageCodec.js";
|
|
8
8
|
import { Mark } from "#common/Mark.js";
|
|
9
9
|
import {
|
|
10
10
|
BasicMultiplex,
|
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
ImplementationError,
|
|
21
21
|
Lifetime,
|
|
22
22
|
Logger,
|
|
23
|
+
MatterError,
|
|
23
24
|
MatterFlowError,
|
|
24
25
|
ObserverGroup,
|
|
25
26
|
UdpInterface,
|
|
@@ -252,32 +253,37 @@ export class ExchangeManager {
|
|
|
252
253
|
});
|
|
253
254
|
|
|
254
255
|
if (exchange !== undefined) {
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
256
|
+
try {
|
|
257
|
+
this.#lifetime.details.exchange = exchange.idStr;
|
|
258
|
+
if (exchange.session.id !== packet.header.sessionId || (exchange.considerClosed && !isStandaloneAck)) {
|
|
259
|
+
logger.debug(
|
|
260
|
+
exchange.via,
|
|
261
|
+
"Ignore",
|
|
262
|
+
Mark.INBOUND,
|
|
263
|
+
"message because",
|
|
264
|
+
exchange.considerClosed
|
|
265
|
+
? "exchange is closing"
|
|
266
|
+
: `session ID mismatch (header session is ${Session.idStrOf(packet)}`,
|
|
267
|
+
messageDiagnostics,
|
|
268
|
+
);
|
|
267
269
|
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
270
|
+
try {
|
|
271
|
+
await exchange.send(SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
272
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
273
|
+
protocolId: SECURE_CHANNEL_PROTOCOL_ID,
|
|
274
|
+
});
|
|
275
|
+
} finally {
|
|
276
|
+
// Ensure we close the exchange even if sending the ack failed
|
|
277
|
+
await exchange.close();
|
|
278
|
+
}
|
|
279
|
+
return;
|
|
276
280
|
}
|
|
277
|
-
return;
|
|
278
|
-
}
|
|
279
281
|
|
|
280
|
-
|
|
282
|
+
await exchange.onMessageReceived(message, isDuplicate);
|
|
283
|
+
} catch (error) {
|
|
284
|
+
MatterError.accept(error);
|
|
285
|
+
logger.error(`${Message.via(exchange, message)} Error:`, error);
|
|
286
|
+
}
|
|
281
287
|
} else {
|
|
282
288
|
if (this.#isClosing) return;
|
|
283
289
|
if (session.isClosing) {
|
|
@@ -315,18 +321,29 @@ export class ExchangeManager {
|
|
|
315
321
|
const exchange = MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
316
322
|
this.#lifetime.details.exchange = exchange.idStr;
|
|
317
323
|
this.#addExchange(exchangeIndex, exchange);
|
|
318
|
-
|
|
319
|
-
|
|
324
|
+
try {
|
|
325
|
+
await exchange.onMessageReceived(message);
|
|
326
|
+
await protocolHandler.onNewExchange(exchange, message);
|
|
327
|
+
} catch (error) {
|
|
328
|
+
MatterError.accept(error);
|
|
329
|
+
logger.error(`${Message.via(exchange, message)} Error:`, error);
|
|
330
|
+
}
|
|
320
331
|
} else if (message.payloadHeader.requiresAck) {
|
|
321
332
|
const exchange = MessageExchange.fromInitialMessage(this.#messageExchangeContextFor(session), message);
|
|
322
333
|
this.#lifetime.details.exchange = exchange.idStr;
|
|
323
334
|
this.#addExchange(exchangeIndex, exchange);
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
335
|
+
|
|
336
|
+
try {
|
|
337
|
+
await exchange.send(SecureMessageType.StandaloneAck, new Uint8Array(0), {
|
|
338
|
+
includeAcknowledgeMessageId: message.packetHeader.messageId,
|
|
339
|
+
protocolId: SECURE_CHANNEL_PROTOCOL_ID,
|
|
340
|
+
});
|
|
341
|
+
await exchange.close();
|
|
342
|
+
logger.debug("Ignore", Mark.INBOUND, "unsolicited message", messageDiagnostics);
|
|
343
|
+
} catch (error) {
|
|
344
|
+
MatterError.accept(error);
|
|
345
|
+
logger.error(`${Message.via(exchange, message)} Error:`, error);
|
|
346
|
+
}
|
|
330
347
|
} else {
|
|
331
348
|
if (protocolHandler === undefined) {
|
|
332
349
|
throw new MatterFlowError(`Unsupported protocol ${message.payloadHeader.protocolId}`);
|