@matter/protocol 0.16.8-alpha.0-20260125-38e62bc3e → 0.16.8-alpha.0-20260127-de48449ad
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/dcl/DclCertificateService.d.ts.map +1 -1
- package/dist/cjs/dcl/DclCertificateService.js +3 -0
- package/dist/cjs/dcl/DclCertificateService.js.map +1 -1
- package/dist/cjs/dcl/DclOtaUpdateService.d.ts.map +1 -1
- package/dist/cjs/dcl/DclOtaUpdateService.js +6 -4
- package/dist/cjs/dcl/DclOtaUpdateService.js.map +1 -1
- package/dist/cjs/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/cjs/mdns/MdnsClient.js +6 -2
- package/dist/cjs/mdns/MdnsClient.js.map +1 -1
- package/dist/cjs/peer/Peer.d.ts +2 -1
- package/dist/cjs/peer/Peer.d.ts.map +1 -1
- package/dist/cjs/peer/Peer.js +27 -3
- package/dist/cjs/peer/Peer.js.map +1 -1
- package/dist/cjs/peer/PeerAddressStore.d.ts +1 -11
- package/dist/cjs/peer/PeerAddressStore.d.ts.map +1 -1
- package/dist/cjs/peer/PeerAddressStore.js +1 -4
- package/dist/cjs/peer/PeerAddressStore.js.map +1 -1
- package/dist/cjs/peer/PeerDescriptor.d.ts +1 -9
- package/dist/cjs/peer/PeerDescriptor.d.ts.map +1 -1
- package/dist/cjs/peer/PeerDescriptor.js +1 -6
- package/dist/cjs/peer/PeerDescriptor.js.map +1 -1
- package/dist/cjs/peer/PeerSet.d.ts +1 -1
- package/dist/cjs/peer/PeerSet.d.ts.map +1 -1
- package/dist/cjs/peer/PeerSet.js +55 -22
- package/dist/cjs/peer/PeerSet.js.map +2 -2
- package/dist/cjs/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.js +5 -2
- package/dist/cjs/protocol/ExchangeManager.js.map +1 -1
- package/dist/cjs/protocol/ExchangeProvider.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeProvider.js +3 -3
- package/dist/cjs/protocol/ExchangeProvider.js.map +1 -1
- package/dist/cjs/protocol/MRP.d.ts +54 -0
- package/dist/cjs/protocol/MRP.d.ts.map +1 -0
- package/dist/cjs/protocol/MRP.js +96 -0
- package/dist/cjs/protocol/MRP.js.map +6 -0
- package/dist/cjs/protocol/MessageChannel.d.ts +11 -26
- package/dist/cjs/protocol/MessageChannel.d.ts.map +1 -1
- package/dist/cjs/protocol/MessageChannel.js +52 -55
- package/dist/cjs/protocol/MessageChannel.js.map +2 -2
- package/dist/cjs/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/cjs/protocol/MessageExchange.js +7 -7
- package/dist/cjs/protocol/MessageExchange.js.map +1 -1
- package/dist/cjs/protocol/ProtocolMocks.d.ts +2 -1
- package/dist/cjs/protocol/ProtocolMocks.d.ts.map +1 -1
- package/dist/cjs/protocol/ProtocolMocks.js +1 -0
- package/dist/cjs/protocol/ProtocolMocks.js.map +1 -1
- package/dist/cjs/protocol/index.d.ts +1 -0
- package/dist/cjs/protocol/index.d.ts.map +1 -1
- package/dist/cjs/protocol/index.js +1 -0
- package/dist/cjs/protocol/index.js.map +1 -1
- package/dist/cjs/session/NodeSession.js +2 -2
- package/dist/cjs/session/NodeSession.js.map +1 -1
- package/dist/cjs/session/Session.d.ts +2 -4
- package/dist/cjs/session/Session.d.ts.map +1 -1
- package/dist/cjs/session/Session.js +1 -4
- package/dist/cjs/session/Session.js.map +1 -1
- package/dist/cjs/session/case/CaseClient.d.ts.map +1 -1
- package/dist/cjs/session/case/CaseClient.js +1 -1
- package/dist/cjs/session/case/CaseClient.js.map +1 -1
- package/dist/cjs/session/case/CaseServer.d.ts.map +1 -1
- package/dist/cjs/session/case/CaseServer.js +4 -1
- package/dist/cjs/session/case/CaseServer.js.map +1 -1
- package/dist/esm/dcl/DclCertificateService.d.ts.map +1 -1
- package/dist/esm/dcl/DclCertificateService.js +3 -0
- package/dist/esm/dcl/DclCertificateService.js.map +1 -1
- package/dist/esm/dcl/DclOtaUpdateService.d.ts.map +1 -1
- package/dist/esm/dcl/DclOtaUpdateService.js +6 -4
- package/dist/esm/dcl/DclOtaUpdateService.js.map +1 -1
- package/dist/esm/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/esm/mdns/MdnsClient.js +6 -2
- package/dist/esm/mdns/MdnsClient.js.map +1 -1
- package/dist/esm/peer/Peer.d.ts +2 -1
- package/dist/esm/peer/Peer.d.ts.map +1 -1
- package/dist/esm/peer/Peer.js +27 -3
- package/dist/esm/peer/Peer.js.map +1 -1
- package/dist/esm/peer/PeerAddressStore.d.ts +1 -11
- package/dist/esm/peer/PeerAddressStore.d.ts.map +1 -1
- package/dist/esm/peer/PeerAddressStore.js +1 -4
- package/dist/esm/peer/PeerAddressStore.js.map +1 -1
- package/dist/esm/peer/PeerDescriptor.d.ts +1 -9
- package/dist/esm/peer/PeerDescriptor.d.ts.map +1 -1
- package/dist/esm/peer/PeerDescriptor.js +1 -6
- package/dist/esm/peer/PeerDescriptor.js.map +1 -1
- package/dist/esm/peer/PeerSet.d.ts +1 -1
- package/dist/esm/peer/PeerSet.d.ts.map +1 -1
- package/dist/esm/peer/PeerSet.js +60 -24
- package/dist/esm/peer/PeerSet.js.map +2 -2
- package/dist/esm/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeManager.js +6 -3
- package/dist/esm/protocol/ExchangeManager.js.map +1 -1
- package/dist/esm/protocol/ExchangeProvider.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeProvider.js +3 -3
- package/dist/esm/protocol/ExchangeProvider.js.map +1 -1
- package/dist/esm/protocol/MRP.d.ts +54 -0
- package/dist/esm/protocol/MRP.d.ts.map +1 -0
- package/dist/esm/protocol/MRP.js +76 -0
- package/dist/esm/protocol/MRP.js.map +6 -0
- package/dist/esm/protocol/MessageChannel.d.ts +11 -26
- package/dist/esm/protocol/MessageChannel.d.ts.map +1 -1
- package/dist/esm/protocol/MessageChannel.js +55 -58
- package/dist/esm/protocol/MessageChannel.js.map +2 -2
- package/dist/esm/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/esm/protocol/MessageExchange.js +3 -3
- package/dist/esm/protocol/MessageExchange.js.map +1 -1
- package/dist/esm/protocol/ProtocolMocks.d.ts +2 -1
- package/dist/esm/protocol/ProtocolMocks.d.ts.map +1 -1
- package/dist/esm/protocol/ProtocolMocks.js +1 -0
- package/dist/esm/protocol/ProtocolMocks.js.map +1 -1
- package/dist/esm/protocol/index.d.ts +1 -0
- package/dist/esm/protocol/index.d.ts.map +1 -1
- package/dist/esm/protocol/index.js +1 -0
- package/dist/esm/protocol/index.js.map +1 -1
- package/dist/esm/session/NodeSession.js +2 -2
- package/dist/esm/session/NodeSession.js.map +1 -1
- package/dist/esm/session/Session.d.ts +2 -4
- package/dist/esm/session/Session.d.ts.map +1 -1
- package/dist/esm/session/Session.js +1 -4
- package/dist/esm/session/Session.js.map +1 -1
- package/dist/esm/session/case/CaseClient.d.ts.map +1 -1
- package/dist/esm/session/case/CaseClient.js +2 -2
- package/dist/esm/session/case/CaseClient.js.map +1 -1
- package/dist/esm/session/case/CaseServer.d.ts.map +1 -1
- package/dist/esm/session/case/CaseServer.js +4 -1
- package/dist/esm/session/case/CaseServer.js.map +1 -1
- package/package.json +6 -6
- package/src/dcl/DclCertificateService.ts +3 -0
- package/src/dcl/DclOtaUpdateService.ts +11 -5
- package/src/mdns/MdnsClient.ts +9 -2
- package/src/peer/Peer.ts +37 -5
- package/src/peer/PeerAddressStore.ts +1 -19
- package/src/peer/PeerDescriptor.ts +1 -15
- package/src/peer/PeerSet.ts +82 -35
- package/src/protocol/ExchangeManager.ts +15 -3
- package/src/protocol/ExchangeProvider.ts +3 -3
- package/src/protocol/MRP.ts +146 -0
- package/src/protocol/MessageChannel.ts +66 -100
- package/src/protocol/MessageExchange.ts +4 -3
- package/src/protocol/ProtocolMocks.ts +1 -0
- package/src/protocol/index.ts +1 -0
- package/src/session/NodeSession.ts +3 -3
- package/src/session/Session.ts +2 -4
- package/src/session/case/CaseClient.ts +8 -2
- package/src/session/case/CaseServer.ts +4 -0
|
@@ -103,13 +103,10 @@ export declare abstract class Session {
|
|
|
103
103
|
detachChannel(): MessageChannel | undefined;
|
|
104
104
|
protected close(): Promise<void>;
|
|
105
105
|
protected get manager(): SessionManager | undefined;
|
|
106
|
-
/**
|
|
107
|
-
* This is primarily intended for testing.
|
|
108
|
-
*/
|
|
109
106
|
protected set channel(channel: MessageChannel);
|
|
110
107
|
join(...name: unknown[]): Lifetime;
|
|
111
108
|
/**
|
|
112
|
-
* Invoked by manager when the session is "live".
|
|
109
|
+
* Invoked by the manager when the session is "live".
|
|
113
110
|
*
|
|
114
111
|
* This is separate from construction because we sometimes discard sessions without installing in a manager or
|
|
115
112
|
* closing.
|
|
@@ -120,6 +117,7 @@ export declare abstract class Session {
|
|
|
120
117
|
export declare namespace Session {
|
|
121
118
|
interface CommonConfig {
|
|
122
119
|
manager?: SessionManager;
|
|
120
|
+
delayManagerRegistration?: true;
|
|
123
121
|
channel?: Channel<Bytes>;
|
|
124
122
|
}
|
|
125
123
|
interface Configuration extends CommonConfig {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"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"}
|
|
@@ -314,9 +314,6 @@ class Session {
|
|
|
314
314
|
get manager() {
|
|
315
315
|
return this.#manager;
|
|
316
316
|
}
|
|
317
|
-
/**
|
|
318
|
-
* This is primarily intended for testing.
|
|
319
|
-
*/
|
|
320
317
|
set channel(channel) {
|
|
321
318
|
if (this.#channel !== void 0) {
|
|
322
319
|
throw new ImplementationError("Cannot replace active channel");
|
|
@@ -327,7 +324,7 @@ class Session {
|
|
|
327
324
|
return this.activate().join(...name);
|
|
328
325
|
}
|
|
329
326
|
/**
|
|
330
|
-
* Invoked by manager when the session is "live".
|
|
327
|
+
* Invoked by the manager when the session is "live".
|
|
331
328
|
*
|
|
332
329
|
* This is separate from construction because we sometimes discard sessions without installing in a manager or
|
|
333
330
|
* closing.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/session/Session.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaseClient.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"CaseClient.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAuB,QAAQ,EAA0D,MAAM,UAAU,CAAC;AACjH,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAkB/E,qBAAa,UAAU;;gBAGP,QAAQ,EAAE,cAAc;IAI9B,IAAI,CAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,CAAC,WAAW;;;;CA8O7G;AAED,yBAAiB,UAAU,CAAC;IACxB,UAAiB,WAAW;QACxB,sBAAsB,CAAC,EAAE,QAAQ,CAAC;QAClC,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;KAClD;CACJ"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Icac } from "#certificate/kinds/Icac.js";
|
|
7
7
|
import { Noc } from "#certificate/kinds/Noc.js";
|
|
8
|
-
import { Bytes, EcdsaSignature, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
8
|
+
import { AbortedError, Bytes, EcdsaSignature, Logger, PublicKey, UnexpectedDataError } from "#general";
|
|
9
9
|
import { RetransmissionLimitReachedError } from "#protocol/errors.js";
|
|
10
10
|
import { ChannelStatusResponseError } from "#securechannel/SecureChannelMessenger.js";
|
|
11
11
|
import { NodeSession } from "#session/NodeSession.js";
|
|
@@ -36,7 +36,7 @@ class CaseClient {
|
|
|
36
36
|
try {
|
|
37
37
|
return await this.#doPair(messenger, exchange, fabric, peerNodeId, caseAuthenticatedTags);
|
|
38
38
|
} catch (error) {
|
|
39
|
-
if (!(error instanceof ChannelStatusResponseError || error instanceof RetransmissionLimitReachedError)) {
|
|
39
|
+
if (!(error instanceof ChannelStatusResponseError || error instanceof RetransmissionLimitReachedError || error instanceof AbortedError)) {
|
|
40
40
|
await messenger.sendError(SecureChannelStatusCode.InvalidParam);
|
|
41
41
|
}
|
|
42
42
|
throw error;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/session/case/CaseClient.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY;AACrB,SAAS,WAAW;AAEpB,SAAS,OAAiB,gBAAgB,QAAQ,WAAW,2BAA2B;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fabric", "caseAuthenticatedTags"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiBH,OAAO,EAAoB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAoBpE,qBAAa,UAAW,YAAW,eAAe;;IAC9C,QAAQ,CAAC,EAAE,KAA8B;IACzC,QAAQ,CAAC,qBAAqB,SAAS;gBAK3B,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;IAKtD,aAAa,CAAC,QAAQ,EAAE,eAAe;
|
|
1
|
+
{"version":3,"file":"CaseServer.d.ts","sourceRoot":"","sources":["../../../../src/session/case/CaseServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiBH,OAAO,EAAoB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAuB,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAoBpE,qBAAa,UAAW,YAAW,eAAe;;IAC9C,QAAQ,CAAC,EAAE,KAA8B;IACzC,QAAQ,CAAC,qBAAqB,SAAS;gBAK3B,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa;IAKtD,aAAa,CAAC,QAAQ,EAAE,eAAe;IAoQvC,KAAK;CAGd"}
|
|
@@ -113,7 +113,9 @@ class CaseServer {
|
|
|
113
113
|
isInitiator: false,
|
|
114
114
|
isResumption: true,
|
|
115
115
|
peerSessionParameters: cx.peerSessionParams,
|
|
116
|
-
caseAuthenticatedTags
|
|
116
|
+
caseAuthenticatedTags,
|
|
117
|
+
delayManagerRegistration: true
|
|
118
|
+
// Session establishment could still fail, so add session ourselves to the manager
|
|
117
119
|
});
|
|
118
120
|
const resumeSalt = Bytes.concat(cx.peerRandom, cx.localResumptionId);
|
|
119
121
|
const resumeKey = await crypto.createHkdfKey(sharedSecret, resumeSalt, KDFSR2_KEY_INFO);
|
|
@@ -131,6 +133,7 @@ class CaseServer {
|
|
|
131
133
|
throw error;
|
|
132
134
|
}
|
|
133
135
|
NodeSession.logNew(logger, "Resumed", secureSession, cx.messenger, fabric, peerNodeId);
|
|
136
|
+
this.#sessions.sessions.add(secureSession);
|
|
134
137
|
cx.resumptionRecord.resumptionId = cx.localResumptionId;
|
|
135
138
|
await cx.messenger.waitForSuccess("Sigma2Resume-Success");
|
|
136
139
|
await cx.messenger.close();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/session/case/CaseServer.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/protocol",
|
|
3
|
-
"version": "0.16.8-alpha.0-
|
|
3
|
+
"version": "0.16.8-alpha.0-20260127-de48449ad",
|
|
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.8-alpha.0-
|
|
44
|
-
"@matter/model": "0.16.8-alpha.0-
|
|
45
|
-
"@matter/types": "0.16.8-alpha.0-
|
|
43
|
+
"@matter/general": "0.16.8-alpha.0-20260127-de48449ad",
|
|
44
|
+
"@matter/model": "0.16.8-alpha.0-20260127-de48449ad",
|
|
45
|
+
"@matter/types": "0.16.8-alpha.0-20260127-de48449ad"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@matter/tools": "0.16.8-alpha.0-
|
|
49
|
-
"@matter/testing": "0.16.8-alpha.0-
|
|
48
|
+
"@matter/tools": "0.16.8-alpha.0-20260127-de48449ad",
|
|
49
|
+
"@matter/testing": "0.16.8-alpha.0-20260127-de48449ad"
|
|
50
50
|
},
|
|
51
51
|
"files": [
|
|
52
52
|
"dist/**/*",
|
|
@@ -227,11 +227,17 @@ export class DclOtaUpdateService {
|
|
|
227
227
|
localUpdates[0].maxApplicableSoftwareVersion ?? localUpdates[0].softwareVersion - 1,
|
|
228
228
|
source: localUpdates[0].mode === "prod" ? "dcl-prod" : "local",
|
|
229
229
|
};
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
230
|
+
if (
|
|
231
|
+
localUpdate.softwareVersion > currentSoftwareVersion &&
|
|
232
|
+
currentSoftwareVersion >= localUpdate.minApplicableSoftwareVersion &&
|
|
233
|
+
currentSoftwareVersion <= localUpdate.maxApplicableSoftwareVersion
|
|
234
|
+
) {
|
|
235
|
+
logger.debug(`Found applicable local update`, Diagnostic.dict(localUpdate));
|
|
236
|
+
if (targetSoftwareVersion !== undefined && localUpdate.softwareVersion === targetSoftwareVersion) {
|
|
237
|
+
return localUpdate;
|
|
238
|
+
}
|
|
239
|
+
foundUpdates.push(localUpdate);
|
|
233
240
|
}
|
|
234
|
-
foundUpdates.push(localUpdate);
|
|
235
241
|
}
|
|
236
242
|
}
|
|
237
243
|
|
|
@@ -508,7 +514,7 @@ export class DclOtaUpdateService {
|
|
|
508
514
|
return false;
|
|
509
515
|
}
|
|
510
516
|
|
|
511
|
-
//
|
|
517
|
+
// The current version must be within the applicable range if specified
|
|
512
518
|
if (
|
|
513
519
|
versionInfo.minApplicableSoftwareVersion !== undefined &&
|
|
514
520
|
currentVersion < versionInfo.minApplicableSoftwareVersion
|
package/src/mdns/MdnsClient.ts
CHANGED
|
@@ -550,12 +550,19 @@ export class MdnsClient implements Scanner {
|
|
|
550
550
|
}
|
|
551
551
|
const deviceMatterQname = getOperationalDeviceQname(fabric.globalId, nodeId);
|
|
552
552
|
|
|
553
|
-
let storedDevice =
|
|
554
|
-
if (storedDevice === undefined) {
|
|
553
|
+
let storedDevice = this.#getOperationalDeviceRecords(deviceMatterQname);
|
|
554
|
+
if (storedDevice === undefined || ignoreExistingRecords) {
|
|
555
555
|
using _finding = this.#lifetime.join(
|
|
556
556
|
"finding peer",
|
|
557
557
|
PeerAddress({ fabricIndex: fabric.fabricIndex, nodeId }),
|
|
558
558
|
);
|
|
559
|
+
|
|
560
|
+
if (storedDevice) {
|
|
561
|
+
// We know the device including IPs but want to query anew, so forget the addresses to ensure they get updated
|
|
562
|
+
const device = this.#operationalDeviceRecords.get(deviceMatterQname);
|
|
563
|
+
device?.addresses.clear();
|
|
564
|
+
}
|
|
565
|
+
|
|
559
566
|
const promise = this.#registerWaiterPromise(deviceMatterQname, false, timeout, () =>
|
|
560
567
|
this.#getOperationalDeviceRecords(deviceMatterQname),
|
|
561
568
|
);
|
package/src/peer/Peer.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
Lifetime,
|
|
15
15
|
Logger,
|
|
16
16
|
MaybePromise,
|
|
17
|
+
ServerAddressUdp,
|
|
17
18
|
} from "#general";
|
|
18
19
|
import type { MdnsClient } from "#mdns/MdnsClient.js";
|
|
19
20
|
import type { NodeSession } from "#session/NodeSession.js";
|
|
@@ -58,15 +59,45 @@ export class Peer {
|
|
|
58
59
|
this.#context = context;
|
|
59
60
|
|
|
60
61
|
this.#sessions.added.on(session => {
|
|
62
|
+
const updateNetworkAddress = (networkAddress: ServerAddressUdp) => {
|
|
63
|
+
this.#descriptor.operationalAddress = networkAddress;
|
|
64
|
+
};
|
|
65
|
+
|
|
61
66
|
// Remove channel when destroyed
|
|
62
67
|
session.closing.on(() => {
|
|
63
68
|
this.#sessions.delete(session);
|
|
69
|
+
if (!session.isClosed) {
|
|
70
|
+
session.channel.networkAddressChanged.on(updateNetworkAddress);
|
|
71
|
+
}
|
|
64
72
|
});
|
|
65
73
|
|
|
66
|
-
// Ensure operational address is always the most recent IP
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
74
|
+
// Ensure the operational address is always set to the most recent IP
|
|
75
|
+
if (!session.isClosed) {
|
|
76
|
+
const { channel } = session.channel;
|
|
77
|
+
if (isIpNetworkChannel(channel)) {
|
|
78
|
+
updateNetworkAddress(channel.networkAddress);
|
|
79
|
+
channel.networkAddressChanged.on(updateNetworkAddress);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
// Cancel any active discovery since we have a secure session now
|
|
84
|
+
if (this.activeDiscovery) {
|
|
85
|
+
logger.debug(`Cancelling discovery for ${this.address.toString()} - secure session established`);
|
|
86
|
+
const { mdnsClient, stopTimerFunc } = this.activeDiscovery;
|
|
87
|
+
stopTimerFunc?.();
|
|
88
|
+
mdnsClient?.cancelOperationalDeviceDiscovery(this.fabric, this.address.nodeId, true);
|
|
89
|
+
this.activeDiscovery = undefined;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
// Resolve any pending reconnection since we have a session now
|
|
93
|
+
if (this.activeReconnection) {
|
|
94
|
+
logger.debug(
|
|
95
|
+
`Resolving reconnection for ${this.address.toString()} - session established via alternate path`,
|
|
96
|
+
);
|
|
97
|
+
const { resolver } = this.activeReconnection;
|
|
98
|
+
// TODO When we have the pairing process abortable then abort it
|
|
99
|
+
this.activeReconnection = undefined;
|
|
100
|
+
resolver(session as SecureSession);
|
|
70
101
|
}
|
|
71
102
|
});
|
|
72
103
|
}
|
|
@@ -170,7 +201,8 @@ export namespace Peer {
|
|
|
170
201
|
|
|
171
202
|
// TODO - factor away
|
|
172
203
|
export interface ActiveReconnection {
|
|
173
|
-
promise: Promise<SecureSession>;
|
|
204
|
+
promise: Promise<SecureSession | undefined>;
|
|
205
|
+
resolver: (session: SecureSession | undefined) => void;
|
|
174
206
|
rejecter: (reason?: any) => void;
|
|
175
207
|
}
|
|
176
208
|
}
|
|
@@ -4,9 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
8
|
-
import { DecodedAttributeReportValue } from "#interaction/AttributeDataDecoder.js";
|
|
9
|
-
import { AttributeId, ClusterId, EndpointNumber, EventNumber } from "#types";
|
|
7
|
+
import { MaybePromise } from "#general";
|
|
10
8
|
import { PeerAddress } from "./PeerAddress.js";
|
|
11
9
|
import { PeerDescriptor } from "./PeerDescriptor.js";
|
|
12
10
|
import type { PeerSet } from "./PeerSet.js";
|
|
@@ -18,20 +16,4 @@ export abstract class PeerAddressStore {
|
|
|
18
16
|
abstract loadPeers(): MaybePromise<Iterable<PeerDescriptor>>;
|
|
19
17
|
abstract updatePeer(peer: PeerDescriptor): MaybePromise<void>;
|
|
20
18
|
abstract deletePeer(address: PeerAddress): MaybePromise<void>;
|
|
21
|
-
abstract createNodeStore(address: PeerAddress): MaybePromise<PeerDataStore | undefined>;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
export abstract class PeerDataStore {
|
|
25
|
-
abstract construction: Construction<PeerDataStore>;
|
|
26
|
-
|
|
27
|
-
abstract maxEventNumber: EventNumber;
|
|
28
|
-
abstract updateLastEventNumber(eventNumber: EventNumber): MaybePromise<void>;
|
|
29
|
-
|
|
30
|
-
// TODO: Find a maybe better way to achieve this without functions
|
|
31
|
-
abstract retrieveAttribute(
|
|
32
|
-
endpointId: EndpointNumber,
|
|
33
|
-
clusterId: ClusterId,
|
|
34
|
-
attributeId: AttributeId,
|
|
35
|
-
): DecodedAttributeReportValue<any> | undefined;
|
|
36
|
-
abstract retrieveAttributes(endpointId: EndpointNumber, clusterId: ClusterId): DecodedAttributeReportValue<any>[];
|
|
37
19
|
}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
|
|
7
7
|
import { DiscoveryData } from "#common/Scanner.js";
|
|
8
8
|
import { isDeepEqual, ServerAddressUdp } from "#general";
|
|
9
|
-
import type { PeerDataStore } from "#peer/PeerAddressStore.js";
|
|
10
9
|
import { PeerAddress } from "./PeerAddress.js";
|
|
11
10
|
|
|
12
11
|
/**
|
|
@@ -29,27 +28,18 @@ export interface PeerDescriptor {
|
|
|
29
28
|
* Additional information collected while locating the peer.
|
|
30
29
|
*/
|
|
31
30
|
discoveryData?: DiscoveryData;
|
|
32
|
-
|
|
33
|
-
/**
|
|
34
|
-
* The data store for the peer.
|
|
35
|
-
*
|
|
36
|
-
* @deprecated
|
|
37
|
-
*/
|
|
38
|
-
dataStore?: PeerDataStore;
|
|
39
31
|
}
|
|
40
32
|
|
|
41
33
|
export class ObservablePeerDescriptor implements PeerDescriptor {
|
|
42
34
|
#address: PeerAddress;
|
|
43
35
|
#operationalAddress?: ServerAddressUdp;
|
|
44
36
|
#discoveryData?: DiscoveryData;
|
|
45
|
-
#dataStore?: PeerDataStore;
|
|
46
37
|
#onChange: () => void;
|
|
47
38
|
|
|
48
|
-
constructor({ address, operationalAddress, discoveryData
|
|
39
|
+
constructor({ address, operationalAddress, discoveryData }: PeerDescriptor, onChange: () => void) {
|
|
49
40
|
this.#address = PeerAddress(address);
|
|
50
41
|
this.#operationalAddress = operationalAddress;
|
|
51
42
|
this.#discoveryData = discoveryData;
|
|
52
|
-
this.#dataStore = dataStore;
|
|
53
43
|
this.#onChange = onChange;
|
|
54
44
|
}
|
|
55
45
|
|
|
@@ -82,8 +72,4 @@ export class ObservablePeerDescriptor implements PeerDescriptor {
|
|
|
82
72
|
this.#discoveryData = { ...this.#discoveryData, ...value };
|
|
83
73
|
this.#onChange();
|
|
84
74
|
}
|
|
85
|
-
|
|
86
|
-
get dataStore() {
|
|
87
|
-
return this.#dataStore;
|
|
88
|
-
}
|
|
89
75
|
}
|