@matter/protocol 0.14.0 → 0.14.1-alpha.0-20250606-a9bcd03f9
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/action/server/AccessControl.d.ts +5 -7
- package/dist/cjs/action/server/AccessControl.d.ts.map +1 -1
- package/dist/cjs/action/server/AccessControl.js.map +1 -1
- package/dist/cjs/action/server/AttributeWriteResponse.d.ts.map +1 -1
- package/dist/cjs/action/server/AttributeWriteResponse.js +23 -0
- package/dist/cjs/action/server/AttributeWriteResponse.js.map +1 -1
- package/dist/cjs/action/server/CommandInvokeResponse.d.ts.map +1 -1
- package/dist/cjs/action/server/CommandInvokeResponse.js +24 -1
- package/dist/cjs/action/server/CommandInvokeResponse.js.map +1 -1
- package/dist/cjs/action/server/DataResponse.d.ts +1 -1
- package/dist/cjs/action/server/DataResponse.d.ts.map +1 -1
- package/dist/cjs/action/server/Subject.d.ts +25 -0
- package/dist/cjs/action/server/Subject.d.ts.map +1 -0
- package/dist/cjs/action/server/Subject.js +54 -0
- package/dist/cjs/action/server/Subject.js.map +6 -0
- package/dist/cjs/action/server/index.d.ts +1 -0
- package/dist/cjs/action/server/index.d.ts.map +1 -1
- package/dist/cjs/action/server/index.js +1 -0
- package/dist/cjs/action/server/index.js.map +1 -1
- package/dist/cjs/certificate/DeviceCertification.d.ts +2 -2
- package/dist/cjs/certificate/DeviceCertification.d.ts.map +1 -1
- package/dist/cjs/certificate/DeviceCertification.js.map +1 -1
- package/dist/cjs/cluster/client/AttributeClient.d.ts +3 -3
- package/dist/cjs/cluster/client/AttributeClient.d.ts.map +1 -1
- package/dist/cjs/cluster/client/AttributeClient.js +14 -2
- package/dist/cjs/cluster/client/AttributeClient.js.map +1 -1
- package/dist/cjs/cluster/client/ClusterClient.d.ts +3 -2
- package/dist/cjs/cluster/client/ClusterClient.d.ts.map +1 -1
- package/dist/cjs/cluster/client/ClusterClient.js +60 -1
- package/dist/cjs/cluster/client/ClusterClient.js.map +1 -1
- package/dist/cjs/cluster/client/ClusterClientTypes.d.ts +33 -8
- package/dist/cjs/cluster/client/ClusterClientTypes.d.ts.map +1 -1
- package/dist/cjs/cluster/client/EventClient.d.ts +3 -3
- package/dist/cjs/cluster/client/EventClient.d.ts.map +1 -1
- package/dist/cjs/cluster/client/EventClient.js +7 -0
- package/dist/cjs/cluster/client/EventClient.js.map +1 -1
- package/dist/cjs/codec/MessageCodec.d.ts.map +1 -1
- package/dist/cjs/codec/MessageCodec.js +31 -6
- package/dist/cjs/codec/MessageCodec.js.map +1 -1
- package/dist/cjs/fabric/Fabric.d.ts +20 -30
- package/dist/cjs/fabric/Fabric.d.ts.map +1 -1
- package/dist/cjs/fabric/Fabric.js +38 -62
- package/dist/cjs/fabric/Fabric.js.map +2 -2
- package/dist/cjs/fabric/FabricManager.d.ts.map +1 -1
- package/dist/cjs/fabric/FabricManager.js +10 -4
- package/dist/cjs/fabric/FabricManager.js.map +1 -1
- package/dist/cjs/groups/FabricGroupsManager.d.ts +46 -0
- package/dist/cjs/groups/FabricGroupsManager.d.ts.map +1 -0
- package/dist/cjs/groups/FabricGroupsManager.js +155 -0
- package/dist/cjs/groups/FabricGroupsManager.js.map +6 -0
- package/dist/cjs/groups/Groups.d.ts +34 -0
- package/dist/cjs/groups/Groups.d.ts.map +1 -0
- package/dist/cjs/groups/Groups.js +89 -0
- package/dist/cjs/groups/Groups.js.map +6 -0
- package/dist/cjs/groups/KeySets.d.ts +64 -0
- package/dist/cjs/groups/KeySets.d.ts.map +1 -0
- package/dist/cjs/groups/KeySets.js +179 -0
- package/dist/cjs/groups/KeySets.js.map +6 -0
- package/dist/cjs/groups/MessagingState.d.ts +24 -0
- package/dist/cjs/groups/MessagingState.d.ts.map +1 -0
- package/dist/cjs/groups/MessagingState.js +91 -0
- package/dist/cjs/groups/MessagingState.js.map +6 -0
- package/dist/cjs/groups/index.d.ts +8 -0
- package/dist/cjs/groups/index.d.ts.map +1 -0
- package/dist/cjs/groups/index.js +25 -0
- package/dist/cjs/groups/index.js.map +6 -0
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/interaction/AccessControlManager.d.ts +4 -13
- package/dist/cjs/interaction/AccessControlManager.d.ts.map +1 -1
- package/dist/cjs/interaction/AccessControlManager.js +38 -47
- package/dist/cjs/interaction/AccessControlManager.js.map +1 -1
- package/dist/cjs/interaction/InteractionClient.d.ts +5 -4
- package/dist/cjs/interaction/InteractionClient.d.ts.map +1 -1
- package/dist/cjs/interaction/InteractionClient.js +53 -3
- package/dist/cjs/interaction/InteractionClient.js.map +1 -1
- package/dist/cjs/interaction/InteractionMessenger.d.ts.map +1 -1
- package/dist/cjs/interaction/InteractionMessenger.js +15 -0
- package/dist/cjs/interaction/InteractionMessenger.js.map +1 -1
- package/dist/cjs/interaction/Subscription.d.ts +3 -3
- package/dist/cjs/interaction/Subscription.d.ts.map +1 -1
- package/dist/cjs/interaction/Subscription.js.map +1 -1
- package/dist/cjs/peer/PeerAddress.d.ts +1 -0
- package/dist/cjs/peer/PeerAddress.d.ts.map +1 -1
- package/dist/cjs/peer/PeerAddress.js +5 -0
- package/dist/cjs/peer/PeerAddress.js.map +1 -1
- package/dist/cjs/peer/PeerSet.d.ts.map +1 -1
- package/dist/cjs/peer/PeerSet.js +31 -2
- package/dist/cjs/peer/PeerSet.js.map +1 -1
- package/dist/cjs/protocol/ChannelManager.d.ts.map +1 -1
- package/dist/cjs/protocol/ChannelManager.js +7 -8
- package/dist/cjs/protocol/ChannelManager.js.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/cjs/protocol/ExchangeManager.js +39 -25
- package/dist/cjs/protocol/ExchangeManager.js.map +1 -1
- package/dist/cjs/protocol/MessageExchange.d.ts +1 -1
- package/dist/cjs/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/cjs/protocol/MessageExchange.js +32 -4
- package/dist/cjs/protocol/MessageExchange.js.map +1 -1
- package/dist/cjs/protocol/MessageReceptionState.d.ts +1 -1
- package/dist/cjs/securechannel/SecureChannelProtocol.js +1 -1
- package/dist/cjs/securechannel/SecureChannelProtocol.js.map +1 -1
- package/dist/cjs/session/GroupSession.d.ts +56 -0
- package/dist/cjs/session/GroupSession.d.ts.map +1 -0
- package/dist/cjs/session/GroupSession.js +188 -0
- package/dist/cjs/session/GroupSession.js.map +6 -0
- package/dist/cjs/session/InsecureSession.d.ts +2 -1
- package/dist/cjs/session/InsecureSession.d.ts.map +1 -1
- package/dist/cjs/session/InsecureSession.js +3 -2
- package/dist/cjs/session/InsecureSession.js.map +1 -1
- package/dist/cjs/session/NodeSession.d.ts +88 -0
- package/dist/cjs/session/NodeSession.d.ts.map +1 -0
- package/dist/cjs/session/NodeSession.js +318 -0
- package/dist/cjs/session/NodeSession.js.map +6 -0
- package/dist/cjs/session/SecureSession.d.ts +10 -75
- package/dist/cjs/session/SecureSession.d.ts.map +1 -1
- package/dist/cjs/session/SecureSession.js +9 -280
- package/dist/cjs/session/SecureSession.js.map +2 -2
- package/dist/cjs/session/Session.d.ts +6 -5
- package/dist/cjs/session/Session.d.ts.map +1 -1
- package/dist/cjs/session/Session.js +11 -1
- package/dist/cjs/session/Session.js.map +1 -1
- package/dist/cjs/session/SessionManager.d.ts +27 -9
- package/dist/cjs/session/SessionManager.d.ts.map +1 -1
- package/dist/cjs/session/SessionManager.js +83 -5
- package/dist/cjs/session/SessionManager.js.map +2 -2
- package/dist/cjs/session/case/CaseClient.d.ts +1 -1
- package/dist/cjs/session/case/CaseClient.js +2 -2
- package/dist/cjs/session/case/CaseClient.js.map +1 -1
- package/dist/cjs/session/index.d.ts +2 -0
- package/dist/cjs/session/index.d.ts.map +1 -1
- package/dist/cjs/session/index.js +2 -0
- package/dist/cjs/session/index.js.map +1 -1
- package/dist/cjs/session/pase/PaseClient.d.ts +1 -1
- package/dist/esm/action/server/AccessControl.d.ts +5 -7
- package/dist/esm/action/server/AccessControl.d.ts.map +1 -1
- package/dist/esm/action/server/AccessControl.js.map +1 -1
- package/dist/esm/action/server/AttributeWriteResponse.d.ts.map +1 -1
- package/dist/esm/action/server/AttributeWriteResponse.js +23 -0
- package/dist/esm/action/server/AttributeWriteResponse.js.map +1 -1
- package/dist/esm/action/server/CommandInvokeResponse.d.ts.map +1 -1
- package/dist/esm/action/server/CommandInvokeResponse.js +24 -1
- package/dist/esm/action/server/CommandInvokeResponse.js.map +1 -1
- package/dist/esm/action/server/DataResponse.d.ts +1 -1
- package/dist/esm/action/server/DataResponse.d.ts.map +1 -1
- package/dist/esm/action/server/Subject.d.ts +25 -0
- package/dist/esm/action/server/Subject.d.ts.map +1 -0
- package/dist/esm/action/server/Subject.js +34 -0
- package/dist/esm/action/server/Subject.js.map +6 -0
- package/dist/esm/action/server/index.d.ts +1 -0
- package/dist/esm/action/server/index.d.ts.map +1 -1
- package/dist/esm/action/server/index.js +1 -0
- package/dist/esm/action/server/index.js.map +1 -1
- package/dist/esm/certificate/DeviceCertification.d.ts +2 -2
- package/dist/esm/certificate/DeviceCertification.d.ts.map +1 -1
- package/dist/esm/certificate/DeviceCertification.js.map +1 -1
- package/dist/esm/cluster/client/AttributeClient.d.ts +3 -3
- package/dist/esm/cluster/client/AttributeClient.d.ts.map +1 -1
- package/dist/esm/cluster/client/AttributeClient.js +13 -1
- package/dist/esm/cluster/client/AttributeClient.js.map +1 -1
- package/dist/esm/cluster/client/ClusterClient.d.ts +3 -2
- package/dist/esm/cluster/client/ClusterClient.d.ts.map +1 -1
- package/dist/esm/cluster/client/ClusterClient.js +61 -2
- package/dist/esm/cluster/client/ClusterClient.js.map +1 -1
- package/dist/esm/cluster/client/ClusterClientTypes.d.ts +33 -8
- package/dist/esm/cluster/client/ClusterClientTypes.d.ts.map +1 -1
- package/dist/esm/cluster/client/EventClient.d.ts +3 -3
- package/dist/esm/cluster/client/EventClient.d.ts.map +1 -1
- package/dist/esm/cluster/client/EventClient.js +7 -0
- package/dist/esm/cluster/client/EventClient.js.map +1 -1
- package/dist/esm/codec/MessageCodec.d.ts.map +1 -1
- package/dist/esm/codec/MessageCodec.js +41 -7
- package/dist/esm/codec/MessageCodec.js.map +1 -1
- package/dist/esm/fabric/Fabric.d.ts +20 -30
- package/dist/esm/fabric/Fabric.d.ts.map +1 -1
- package/dist/esm/fabric/Fabric.js +38 -62
- package/dist/esm/fabric/Fabric.js.map +2 -2
- package/dist/esm/fabric/FabricManager.d.ts.map +1 -1
- package/dist/esm/fabric/FabricManager.js +10 -4
- package/dist/esm/fabric/FabricManager.js.map +1 -1
- package/dist/esm/groups/FabricGroupsManager.d.ts +46 -0
- package/dist/esm/groups/FabricGroupsManager.d.ts.map +1 -0
- package/dist/esm/groups/FabricGroupsManager.js +135 -0
- package/dist/esm/groups/FabricGroupsManager.js.map +6 -0
- package/dist/esm/groups/Groups.d.ts +34 -0
- package/dist/esm/groups/Groups.d.ts.map +1 -0
- package/dist/esm/groups/Groups.js +69 -0
- package/dist/esm/groups/Groups.js.map +6 -0
- package/dist/esm/groups/KeySets.d.ts +64 -0
- package/dist/esm/groups/KeySets.d.ts.map +1 -0
- package/dist/esm/groups/KeySets.js +159 -0
- package/dist/esm/groups/KeySets.js.map +6 -0
- package/dist/esm/groups/MessagingState.d.ts +24 -0
- package/dist/esm/groups/MessagingState.d.ts.map +1 -0
- package/dist/esm/groups/MessagingState.js +71 -0
- package/dist/esm/groups/MessagingState.js.map +6 -0
- package/dist/esm/groups/index.d.ts +8 -0
- package/dist/esm/groups/index.d.ts.map +1 -0
- package/dist/esm/groups/index.js +8 -0
- package/dist/esm/groups/index.js.map +6 -0
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/interaction/AccessControlManager.d.ts +4 -13
- package/dist/esm/interaction/AccessControlManager.d.ts.map +1 -1
- package/dist/esm/interaction/AccessControlManager.js +39 -48
- package/dist/esm/interaction/AccessControlManager.js.map +1 -1
- package/dist/esm/interaction/InteractionClient.d.ts +5 -4
- package/dist/esm/interaction/InteractionClient.d.ts.map +1 -1
- package/dist/esm/interaction/InteractionClient.js +54 -4
- package/dist/esm/interaction/InteractionClient.js.map +1 -1
- package/dist/esm/interaction/InteractionMessenger.d.ts.map +1 -1
- package/dist/esm/interaction/InteractionMessenger.js +15 -0
- package/dist/esm/interaction/InteractionMessenger.js.map +1 -1
- package/dist/esm/interaction/Subscription.d.ts +3 -3
- package/dist/esm/interaction/Subscription.d.ts.map +1 -1
- package/dist/esm/interaction/Subscription.js.map +1 -1
- package/dist/esm/peer/PeerAddress.d.ts +1 -0
- package/dist/esm/peer/PeerAddress.d.ts.map +1 -1
- package/dist/esm/peer/PeerAddress.js +5 -0
- package/dist/esm/peer/PeerAddress.js.map +1 -1
- package/dist/esm/peer/PeerSet.d.ts.map +1 -1
- package/dist/esm/peer/PeerSet.js +33 -3
- package/dist/esm/peer/PeerSet.js.map +1 -1
- package/dist/esm/protocol/ChannelManager.d.ts.map +1 -1
- package/dist/esm/protocol/ChannelManager.js +7 -8
- package/dist/esm/protocol/ChannelManager.js.map +1 -1
- package/dist/esm/protocol/ExchangeManager.d.ts.map +1 -1
- package/dist/esm/protocol/ExchangeManager.js +41 -27
- package/dist/esm/protocol/ExchangeManager.js.map +1 -1
- package/dist/esm/protocol/MessageExchange.d.ts +1 -1
- package/dist/esm/protocol/MessageExchange.d.ts.map +1 -1
- package/dist/esm/protocol/MessageExchange.js +39 -5
- package/dist/esm/protocol/MessageExchange.js.map +1 -1
- package/dist/esm/protocol/MessageReceptionState.d.ts +1 -1
- package/dist/esm/securechannel/SecureChannelProtocol.js +2 -2
- package/dist/esm/securechannel/SecureChannelProtocol.js.map +1 -1
- package/dist/esm/session/GroupSession.d.ts +56 -0
- package/dist/esm/session/GroupSession.d.ts.map +1 -0
- package/dist/esm/session/GroupSession.js +177 -0
- package/dist/esm/session/GroupSession.js.map +6 -0
- package/dist/esm/session/InsecureSession.d.ts +2 -1
- package/dist/esm/session/InsecureSession.d.ts.map +1 -1
- package/dist/esm/session/InsecureSession.js +3 -2
- package/dist/esm/session/InsecureSession.js.map +1 -1
- package/dist/esm/session/NodeSession.d.ts +88 -0
- package/dist/esm/session/NodeSession.d.ts.map +1 -0
- package/dist/esm/session/NodeSession.js +298 -0
- package/dist/esm/session/NodeSession.js.map +6 -0
- package/dist/esm/session/SecureSession.d.ts +10 -75
- package/dist/esm/session/SecureSession.d.ts.map +1 -1
- package/dist/esm/session/SecureSession.js +10 -291
- package/dist/esm/session/SecureSession.js.map +2 -2
- package/dist/esm/session/Session.d.ts +6 -5
- package/dist/esm/session/Session.d.ts.map +1 -1
- package/dist/esm/session/Session.js +12 -2
- package/dist/esm/session/Session.js.map +1 -1
- package/dist/esm/session/SessionManager.d.ts +27 -9
- package/dist/esm/session/SessionManager.d.ts.map +1 -1
- package/dist/esm/session/SessionManager.js +84 -6
- package/dist/esm/session/SessionManager.js.map +1 -1
- package/dist/esm/session/case/CaseClient.d.ts +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/index.d.ts +2 -0
- package/dist/esm/session/index.d.ts.map +1 -1
- package/dist/esm/session/index.js +2 -0
- package/dist/esm/session/index.js.map +1 -1
- package/dist/esm/session/pase/PaseClient.d.ts +1 -1
- package/package.json +6 -6
- package/src/action/server/AccessControl.ts +4 -7
- package/src/action/server/AttributeWriteResponse.ts +29 -7
- package/src/action/server/CommandInvokeResponse.ts +28 -7
- package/src/action/server/DataResponse.ts +1 -1
- package/src/action/server/Subject.ts +45 -0
- package/src/action/server/index.ts +1 -0
- package/src/certificate/DeviceCertification.ts +2 -2
- package/src/cluster/client/AttributeClient.ts +15 -3
- package/src/cluster/client/ClusterClient.ts +90 -4
- package/src/cluster/client/ClusterClientTypes.ts +38 -9
- package/src/cluster/client/EventClient.ts +9 -2
- package/src/codec/MessageCodec.ts +49 -8
- package/src/fabric/Fabric.ts +51 -85
- package/src/fabric/FabricManager.ts +11 -4
- package/src/groups/FabricGroupsManager.ts +164 -0
- package/src/groups/Groups.ts +81 -0
- package/src/groups/KeySets.ts +194 -0
- package/src/groups/MessagingState.ts +76 -0
- package/src/groups/index.ts +8 -0
- package/src/index.ts +1 -0
- package/src/interaction/AccessControlManager.ts +49 -81
- package/src/interaction/InteractionClient.ts +66 -6
- package/src/interaction/InteractionMessenger.ts +15 -0
- package/src/interaction/Subscription.ts +3 -3
- package/src/peer/PeerAddress.ts +4 -0
- package/src/peer/PeerSet.ts +39 -4
- package/src/protocol/ChannelManager.ts +7 -9
- package/src/protocol/ExchangeManager.ts +51 -35
- package/src/protocol/MessageExchange.ts +42 -7
- package/src/protocol/MessageReceptionState.ts +2 -2
- package/src/securechannel/SecureChannelProtocol.ts +2 -2
- package/src/session/GroupSession.ts +223 -0
- package/src/session/InsecureSession.ts +3 -2
- package/src/session/NodeSession.ts +367 -0
- package/src/session/SecureSession.ts +14 -363
- package/src/session/Session.ts +17 -6
- package/src/session/SessionManager.ts +94 -14
- package/src/session/case/CaseClient.ts +2 -2
- package/src/session/index.ts +2 -3
|
@@ -3,301 +3,20 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import {
|
|
7
|
-
BasicSet,
|
|
8
|
-
Bytes,
|
|
9
|
-
CRYPTO_SYMMETRIC_KEY_LENGTH,
|
|
10
|
-
Crypto,
|
|
11
|
-
DataWriter,
|
|
12
|
-
Diagnostic,
|
|
13
|
-
Endian,
|
|
14
|
-
Logger,
|
|
15
|
-
MatterFlowError
|
|
16
|
-
} from "#general";
|
|
17
|
-
import { PeerAddress } from "#peer/PeerAddress.js";
|
|
18
|
-
import { FabricIndex, NodeId, StatusCode, StatusResponseError } from "#types";
|
|
19
|
-
import { MessageCodec } from "../codec/MessageCodec.js";
|
|
20
|
-
import { NoChannelError } from "../protocol/ChannelManager.js";
|
|
21
|
-
import { MessageCounter } from "../protocol/MessageCounter.js";
|
|
22
|
-
import { MessageReceptionStateEncryptedWithoutRollover } from "../protocol/MessageReceptionState.js";
|
|
6
|
+
import { MatterFlowError } from "#general";
|
|
23
7
|
import { Session } from "./Session.js";
|
|
24
|
-
const logger = Logger.get("SecureSession");
|
|
25
|
-
const SESSION_KEYS_INFO = Bytes.fromString("SessionKeys");
|
|
26
|
-
const SESSION_RESUMPTION_KEYS_INFO = Bytes.fromString("SessionResumptionKeys");
|
|
27
|
-
class NoAssociatedFabricError extends StatusResponseError {
|
|
28
|
-
constructor(message) {
|
|
29
|
-
super(message, StatusCode.UnsupportedAccess);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
8
|
class SecureSession extends Session {
|
|
33
|
-
|
|
34
|
-
#closingAfterExchangeFinished = false;
|
|
35
|
-
#sendCloseMessageWhenClosing = true;
|
|
36
|
-
#id;
|
|
37
|
-
#isInitiator;
|
|
38
|
-
#fabric;
|
|
39
|
-
#peerNodeId;
|
|
40
|
-
#peerSessionId;
|
|
41
|
-
#decryptKey;
|
|
42
|
-
#encryptKey;
|
|
43
|
-
#attestationKey;
|
|
44
|
-
#caseAuthenticatedTags;
|
|
45
|
-
#isClosing = false;
|
|
46
|
-
supportsMRP = true;
|
|
47
|
-
static async create(args) {
|
|
48
|
-
const {
|
|
49
|
-
manager,
|
|
50
|
-
id,
|
|
51
|
-
fabric,
|
|
52
|
-
peerNodeId,
|
|
53
|
-
peerSessionId,
|
|
54
|
-
sharedSecret,
|
|
55
|
-
salt,
|
|
56
|
-
isInitiator,
|
|
57
|
-
isResumption,
|
|
58
|
-
peerSessionParameters,
|
|
59
|
-
caseAuthenticatedTags
|
|
60
|
-
} = args;
|
|
61
|
-
const keys = await Crypto.hkdf(
|
|
62
|
-
sharedSecret,
|
|
63
|
-
salt,
|
|
64
|
-
isResumption ? SESSION_RESUMPTION_KEYS_INFO : SESSION_KEYS_INFO,
|
|
65
|
-
CRYPTO_SYMMETRIC_KEY_LENGTH * 3
|
|
66
|
-
);
|
|
67
|
-
const decryptKey = isInitiator ? keys.slice(16, 32) : keys.slice(0, 16);
|
|
68
|
-
const encryptKey = isInitiator ? keys.slice(0, 16) : keys.slice(16, 32);
|
|
69
|
-
const attestationKey = keys.slice(32, 48);
|
|
70
|
-
return new SecureSession({
|
|
71
|
-
manager,
|
|
72
|
-
id,
|
|
73
|
-
fabric,
|
|
74
|
-
peerNodeId,
|
|
75
|
-
peerSessionId,
|
|
76
|
-
decryptKey,
|
|
77
|
-
encryptKey,
|
|
78
|
-
attestationKey,
|
|
79
|
-
sessionParameters: peerSessionParameters,
|
|
80
|
-
isInitiator,
|
|
81
|
-
caseAuthenticatedTags
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
constructor(args) {
|
|
85
|
-
super({
|
|
86
|
-
...args,
|
|
87
|
-
setActiveTimestamp: true,
|
|
88
|
-
// We always set the active timestamp for Secure sessions
|
|
89
|
-
// Can be changed to a PersistedMessageCounter if we implement session storage
|
|
90
|
-
messageCounter: new MessageCounter(() => {
|
|
91
|
-
this.end(true, true).catch((error) => logger.error(`Error while closing session: ${error}`));
|
|
92
|
-
}),
|
|
93
|
-
messageReceptionState: new MessageReceptionStateEncryptedWithoutRollover()
|
|
94
|
-
});
|
|
95
|
-
const {
|
|
96
|
-
manager,
|
|
97
|
-
id,
|
|
98
|
-
fabric,
|
|
99
|
-
peerNodeId,
|
|
100
|
-
peerSessionId,
|
|
101
|
-
decryptKey,
|
|
102
|
-
encryptKey,
|
|
103
|
-
attestationKey,
|
|
104
|
-
caseAuthenticatedTags,
|
|
105
|
-
isInitiator
|
|
106
|
-
} = args;
|
|
107
|
-
this.#id = id;
|
|
108
|
-
this.#fabric = fabric;
|
|
109
|
-
this.#peerNodeId = peerNodeId;
|
|
110
|
-
this.#peerSessionId = peerSessionId;
|
|
111
|
-
this.#decryptKey = decryptKey;
|
|
112
|
-
this.#encryptKey = encryptKey;
|
|
113
|
-
this.#attestationKey = attestationKey;
|
|
114
|
-
this.#caseAuthenticatedTags = caseAuthenticatedTags ?? [];
|
|
115
|
-
this.#isInitiator = isInitiator;
|
|
116
|
-
manager?.sessions.add(this);
|
|
117
|
-
fabric?.addSession(this);
|
|
118
|
-
logger.debug(
|
|
119
|
-
`Created secure ${this.isPase ? "PASE" : "CASE"} session for fabric index ${fabric?.fabricIndex}`,
|
|
120
|
-
this.name,
|
|
121
|
-
this.parameterDiagnostics()
|
|
122
|
-
);
|
|
123
|
-
}
|
|
124
|
-
parameterDiagnostics() {
|
|
125
|
-
return Diagnostic.dict(
|
|
126
|
-
{
|
|
127
|
-
SII: this.idleIntervalMs,
|
|
128
|
-
SAI: this.activeIntervalMs,
|
|
129
|
-
SAT: this.activeThresholdMs,
|
|
130
|
-
DMRev: this.dataModelRevision,
|
|
131
|
-
IMRev: this.interactionModelRevision,
|
|
132
|
-
spec: Diagnostic.hex(this.specificationVersion),
|
|
133
|
-
maxPaths: this.maxPathsPerInvoke,
|
|
134
|
-
CATs: this.#caseAuthenticatedTags
|
|
135
|
-
},
|
|
136
|
-
true
|
|
137
|
-
);
|
|
138
|
-
}
|
|
139
|
-
get caseAuthenticatedTags() {
|
|
140
|
-
return this.#caseAuthenticatedTags;
|
|
141
|
-
}
|
|
142
|
-
get closingAfterExchangeFinished() {
|
|
143
|
-
return this.#closingAfterExchangeFinished;
|
|
144
|
-
}
|
|
145
|
-
get sendCloseMessageWhenClosing() {
|
|
146
|
-
return this.#sendCloseMessageWhenClosing;
|
|
147
|
-
}
|
|
148
|
-
get isSecure() {
|
|
149
|
-
return true;
|
|
150
|
-
}
|
|
151
|
-
get isPase() {
|
|
152
|
-
return this.#peerNodeId === NodeId.UNSPECIFIED_NODE_ID;
|
|
153
|
-
}
|
|
154
|
-
get subscriptions() {
|
|
155
|
-
return this.#subscriptions;
|
|
156
|
-
}
|
|
157
|
-
get isInitiator() {
|
|
158
|
-
return this.#isInitiator;
|
|
159
|
-
}
|
|
160
|
-
get isClosing() {
|
|
161
|
-
return this.#isClosing;
|
|
162
|
-
}
|
|
163
|
-
async close(closeAfterExchangeFinished) {
|
|
164
|
-
if (closeAfterExchangeFinished === void 0) {
|
|
165
|
-
closeAfterExchangeFinished = this.isPeerActive();
|
|
166
|
-
}
|
|
167
|
-
await this.end(true, closeAfterExchangeFinished);
|
|
168
|
-
}
|
|
169
|
-
decode({ header, applicationPayload, messageExtension }, aad) {
|
|
170
|
-
if (header.hasMessageExtensions) {
|
|
171
|
-
logger.info(
|
|
172
|
-
`Message extensions are not supported. Ignoring ${messageExtension ? Bytes.toHex(messageExtension) : void 0}`
|
|
173
|
-
);
|
|
174
|
-
}
|
|
175
|
-
const nonce = this.generateNonce(header.securityFlags, header.messageId, this.#peerNodeId);
|
|
176
|
-
const message = MessageCodec.decodePayload({
|
|
177
|
-
header,
|
|
178
|
-
applicationPayload: Crypto.decrypt(this.#decryptKey, applicationPayload, nonce, aad)
|
|
179
|
-
});
|
|
180
|
-
if (message.payloadHeader.hasSecuredExtension) {
|
|
181
|
-
logger.info(
|
|
182
|
-
`Secured extensions are not supported. Ignoring ${message.securityExtension ? Bytes.toHex(message.securityExtension) : void 0}`
|
|
183
|
-
);
|
|
184
|
-
}
|
|
185
|
-
return message;
|
|
186
|
-
}
|
|
187
|
-
encode(message) {
|
|
188
|
-
message.packetHeader.sessionId = this.#peerSessionId;
|
|
189
|
-
const { header, applicationPayload } = MessageCodec.encodePayload(message);
|
|
190
|
-
const headerBytes = MessageCodec.encodePacketHeader(message.packetHeader);
|
|
191
|
-
const securityFlags = headerBytes[3];
|
|
192
|
-
const sessionNodeId = this.isPase ? NodeId.UNSPECIFIED_NODE_ID : this.#fabric?.nodeId ?? NodeId.UNSPECIFIED_NODE_ID;
|
|
193
|
-
const nonce = this.generateNonce(securityFlags, header.messageId, sessionNodeId);
|
|
194
|
-
return { header, applicationPayload: Crypto.encrypt(this.#encryptKey, applicationPayload, nonce, headerBytes) };
|
|
195
|
-
}
|
|
196
|
-
get attestationChallengeKey() {
|
|
197
|
-
return this.#attestationKey;
|
|
198
|
-
}
|
|
199
|
-
get fabric() {
|
|
200
|
-
return this.#fabric;
|
|
201
|
-
}
|
|
202
|
-
addAssociatedFabric(fabric) {
|
|
203
|
-
if (this.#fabric !== void 0) {
|
|
204
|
-
throw new MatterFlowError("Session already has an associated Fabric. Cannot change this.");
|
|
205
|
-
}
|
|
206
|
-
this.#fabric = fabric;
|
|
207
|
-
}
|
|
208
|
-
get id() {
|
|
209
|
-
return this.#id;
|
|
210
|
-
}
|
|
211
|
-
get name() {
|
|
212
|
-
return `secure/${this.#id}`;
|
|
213
|
-
}
|
|
214
|
-
get peerSessionId() {
|
|
215
|
-
return this.#peerSessionId;
|
|
216
|
-
}
|
|
217
|
-
get nodeId() {
|
|
218
|
-
return this.#fabric?.nodeId ?? NodeId.UNSPECIFIED_NODE_ID;
|
|
219
|
-
}
|
|
220
|
-
get peerNodeId() {
|
|
221
|
-
return this.#peerNodeId;
|
|
222
|
-
}
|
|
223
|
-
get associatedFabric() {
|
|
224
|
-
if (this.#fabric === void 0) {
|
|
225
|
-
throw new NoAssociatedFabricError(
|
|
226
|
-
`${this.isPase ? "PASE " : ""}Session needs to have an associated Fabric for fabric sensitive data handling.`
|
|
227
|
-
);
|
|
228
|
-
}
|
|
229
|
-
return this.#fabric;
|
|
230
|
-
}
|
|
231
|
-
async clearSubscriptions(flushSubscriptions = false, cancelledByPeer = false) {
|
|
232
|
-
const subscriptions = [...this.#subscriptions];
|
|
233
|
-
for (const subscription of subscriptions) {
|
|
234
|
-
await subscription.close(flushSubscriptions, cancelledByPeer);
|
|
235
|
-
}
|
|
236
|
-
return subscriptions.length;
|
|
237
|
-
}
|
|
238
|
-
/** Ends a session. Outstanding subscription data will be flushed before the session is destroyed. */
|
|
239
|
-
async end(sendClose, closeAfterExchangeFinished = false) {
|
|
240
|
-
await this.clearSubscriptions(true);
|
|
241
|
-
await this.destroy(sendClose, closeAfterExchangeFinished);
|
|
242
|
-
}
|
|
243
|
-
/** Destroys a session. Outstanding subscription data will be discarded. */
|
|
244
|
-
async destroy(sendClose = false, closeAfterExchangeFinished = true) {
|
|
245
|
-
await this.clearSubscriptions(false);
|
|
246
|
-
this.#fabric?.removeSession(this);
|
|
247
|
-
if (!sendClose) {
|
|
248
|
-
this.#sendCloseMessageWhenClosing = false;
|
|
249
|
-
}
|
|
250
|
-
if (closeAfterExchangeFinished) {
|
|
251
|
-
logger.info(`Register Session ${this.name} to close when exchange is ended.`);
|
|
252
|
-
this.#closingAfterExchangeFinished = true;
|
|
253
|
-
} else {
|
|
254
|
-
this.#isClosing = true;
|
|
255
|
-
logger.info(`End ${this.isPase ? "PASE" : "CASE"} session ${this.name}`);
|
|
256
|
-
this.manager?.sessions.delete(this);
|
|
257
|
-
if (this.closer) {
|
|
258
|
-
try {
|
|
259
|
-
await this.closer;
|
|
260
|
-
} catch (error) {
|
|
261
|
-
NoChannelError.accept(error);
|
|
262
|
-
} finally {
|
|
263
|
-
await this.destroyed.emit();
|
|
264
|
-
}
|
|
265
|
-
return;
|
|
266
|
-
}
|
|
267
|
-
await this.destroyed.emit();
|
|
268
|
-
}
|
|
269
|
-
}
|
|
270
|
-
/**
|
|
271
|
-
* The peer node's address.
|
|
272
|
-
*/
|
|
273
|
-
get peerAddress() {
|
|
274
|
-
return PeerAddress({
|
|
275
|
-
fabricIndex: this.#fabric?.fabricIndex ?? FabricIndex.NO_FABRIC,
|
|
276
|
-
nodeId: this.#peerNodeId
|
|
277
|
-
});
|
|
278
|
-
}
|
|
279
|
-
/**
|
|
280
|
-
* Indicates whether a peer matches a specific address.
|
|
281
|
-
*/
|
|
282
|
-
peerIs(address) {
|
|
283
|
-
return (this.#fabric?.fabricIndex ?? FabricIndex.NO_FABRIC) === address.fabricIndex && this.#peerNodeId === address.nodeId;
|
|
284
|
-
}
|
|
285
|
-
generateNonce(securityFlags, messageId, nodeId) {
|
|
286
|
-
const writer = new DataWriter(Endian.Little);
|
|
287
|
-
writer.writeUInt8(securityFlags);
|
|
288
|
-
writer.writeUInt32(messageId);
|
|
289
|
-
writer.writeUInt64(nodeId);
|
|
290
|
-
return writer.toByteArray();
|
|
291
|
-
}
|
|
9
|
+
isSecure = true;
|
|
292
10
|
}
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
11
|
+
((SecureSession2) => {
|
|
12
|
+
function assert(session, errorText) {
|
|
13
|
+
if (!session?.isSecure) {
|
|
14
|
+
throw new MatterFlowError(errorText ?? "Insecure session in secure context");
|
|
15
|
+
}
|
|
296
16
|
}
|
|
297
|
-
|
|
17
|
+
SecureSession2.assert = assert;
|
|
18
|
+
})(SecureSession || (SecureSession = {}));
|
|
298
19
|
export {
|
|
299
|
-
|
|
300
|
-
SecureSession,
|
|
301
|
-
assertSecureSession
|
|
20
|
+
SecureSession
|
|
302
21
|
};
|
|
303
22
|
//# sourceMappingURL=SecureSession.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/session/SecureSession.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,uBAAuB;AAChC,SAAS,eAAe;AAEjB,MAAe,sBAAsB,QAAQ;AAAA,EACvC,WAAW;AAGxB;AAAA,CAEO,CAAUA,mBAAV;AACI,WAAS,OAAO,SAAmB,WAAsD;AAC5F,QAAI,CAAC,SAAS,UAAU;AACpB,YAAM,IAAI,gBAAgB,aAAa,oCAAoC;AAAA,IAC/E;AAAA,EACJ;AAJO,EAAAA,eAAS;AAAA,GADH;",
|
|
5
|
+
"names": ["SecureSession"]
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { AsyncObservable } from "#general";
|
|
7
7
|
import { NodeId, TypeFromPartialBitSchema } from "#types";
|
|
8
|
-
import { DecodedMessage, DecodedPacket, Message, Packet } from "../codec/MessageCodec.js";
|
|
8
|
+
import { DecodedMessage, DecodedPacket, Message, Packet, SessionType } from "../codec/MessageCodec.js";
|
|
9
9
|
import { SupportedTransportsBitmap } from "../common/Scanner.js";
|
|
10
10
|
import { Fabric } from "../fabric/Fabric.js";
|
|
11
11
|
import { MessageCounter } from "../protocol/MessageCounter.js";
|
|
@@ -83,6 +83,7 @@ export declare abstract class Session {
|
|
|
83
83
|
timestamp: number;
|
|
84
84
|
readonly createdAt: number;
|
|
85
85
|
activeTimestamp: number;
|
|
86
|
+
abstract type: SessionType;
|
|
86
87
|
protected readonly idleIntervalMs: number;
|
|
87
88
|
protected readonly activeIntervalMs: number;
|
|
88
89
|
protected readonly activeThresholdMs: number;
|
|
@@ -91,7 +92,7 @@ export declare abstract class Session {
|
|
|
91
92
|
protected readonly specificationVersion: number;
|
|
92
93
|
protected readonly maxPathsPerInvoke: number;
|
|
93
94
|
protected readonly messageCounter: MessageCounter;
|
|
94
|
-
protected readonly messageReceptionState
|
|
95
|
+
protected readonly messageReceptionState?: MessageReceptionState;
|
|
95
96
|
protected readonly supportedTransports: TypeFromPartialBitSchema<typeof SupportedTransportsBitmap>;
|
|
96
97
|
protected readonly maxTcpMessageSize: number;
|
|
97
98
|
/**
|
|
@@ -103,7 +104,7 @@ export declare abstract class Session {
|
|
|
103
104
|
constructor(args: {
|
|
104
105
|
manager?: SessionManager;
|
|
105
106
|
messageCounter: MessageCounter;
|
|
106
|
-
messageReceptionState
|
|
107
|
+
messageReceptionState?: MessageReceptionState;
|
|
107
108
|
sessionParameters?: SessionParameterOptions;
|
|
108
109
|
setActiveTimestamp: boolean;
|
|
109
110
|
});
|
|
@@ -111,13 +112,13 @@ export declare abstract class Session {
|
|
|
111
112
|
notifyActivity(messageReceived: boolean): void;
|
|
112
113
|
isPeerActive(): boolean;
|
|
113
114
|
getIncrementedMessageCounter(): Promise<number>;
|
|
114
|
-
updateMessageCounter(messageCounter: number, _sourceNodeId?: NodeId): void;
|
|
115
|
+
updateMessageCounter(messageCounter: number, _sourceNodeId?: NodeId, _operationalKey?: Uint8Array): void;
|
|
116
|
+
protected static generateNonce(securityFlags: number, messageId: number, nodeId: NodeId): Uint8Array<ArrayBufferLike>;
|
|
115
117
|
/**
|
|
116
118
|
* The peer's session parameters.
|
|
117
119
|
*/
|
|
118
120
|
get parameters(): SessionParameters;
|
|
119
121
|
abstract isSecure: boolean;
|
|
120
|
-
abstract isPase: boolean;
|
|
121
122
|
abstract id: number;
|
|
122
123
|
abstract peerSessionId: number;
|
|
123
124
|
abstract nodeId: NodeId | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"Session.d.ts","sourceRoot":"","sources":["../../../src/session/Session.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { AsyncObservable, Time } from "#general";
|
|
6
|
+
import { AsyncObservable, DataWriter, Endian, InternalError, Time } from "#general";
|
|
7
7
|
const SESSION_ACTIVE_INTERVAL_MS = 300;
|
|
8
8
|
const SESSION_IDLE_INTERVAL_MS = 500;
|
|
9
9
|
const SESSION_ACTIVE_THRESHOLD_MS = 4e3;
|
|
@@ -85,9 +85,19 @@ class Session {
|
|
|
85
85
|
getIncrementedMessageCounter() {
|
|
86
86
|
return this.messageCounter.getIncrementedCounter();
|
|
87
87
|
}
|
|
88
|
-
updateMessageCounter(messageCounter, _sourceNodeId) {
|
|
88
|
+
updateMessageCounter(messageCounter, _sourceNodeId, _operationalKey) {
|
|
89
|
+
if (this.messageReceptionState === void 0) {
|
|
90
|
+
throw new InternalError("MessageReceptionState is not defined for this session");
|
|
91
|
+
}
|
|
89
92
|
this.messageReceptionState.updateMessageCounter(messageCounter);
|
|
90
93
|
}
|
|
94
|
+
static generateNonce(securityFlags, messageId, nodeId) {
|
|
95
|
+
const writer = new DataWriter(Endian.Little);
|
|
96
|
+
writer.writeUInt8(securityFlags);
|
|
97
|
+
writer.writeUInt32(messageId);
|
|
98
|
+
writer.writeUInt64(nodeId);
|
|
99
|
+
return writer.toByteArray();
|
|
100
|
+
}
|
|
91
101
|
/**
|
|
92
102
|
* The peer's session parameters.
|
|
93
103
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/session/Session.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,iBAAiB,YAAY;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,14 +3,16 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { DecodedPacket } from "#codec/index.js";
|
|
6
7
|
import { FabricManager } from "#fabric/FabricManager.js";
|
|
7
8
|
import { BasicSet, Construction, Environment, Environmental, Observable, StorageContext } from "#general";
|
|
8
9
|
import { Subscription } from "#interaction/Subscription.js";
|
|
9
10
|
import { PeerAddress } from "#peer/PeerAddress.js";
|
|
11
|
+
import { GroupSession } from "#session/GroupSession.js";
|
|
10
12
|
import { CaseAuthenticatedTag, FabricIndex, NodeId } from "#types";
|
|
11
13
|
import { Fabric } from "../fabric/Fabric.js";
|
|
12
14
|
import { InsecureSession } from "./InsecureSession.js";
|
|
13
|
-
import {
|
|
15
|
+
import { NodeSession } from "./NodeSession.js";
|
|
14
16
|
import { Session, SessionParameterOptions, SessionParameters } from "./Session.js";
|
|
15
17
|
export declare const UNICAST_UNSECURE_SESSION_ID = 0;
|
|
16
18
|
export interface ResumptionRecord {
|
|
@@ -50,7 +52,7 @@ export declare class SessionManager {
|
|
|
50
52
|
/**
|
|
51
53
|
* Active secure sessions.
|
|
52
54
|
*/
|
|
53
|
-
get sessions(): BasicSet<
|
|
55
|
+
get sessions(): BasicSet<NodeSession, NodeSession>;
|
|
54
56
|
/**
|
|
55
57
|
* Active insecure sessions.
|
|
56
58
|
*/
|
|
@@ -70,7 +72,7 @@ export declare class SessionManager {
|
|
|
70
72
|
/**
|
|
71
73
|
* Emits when there is a change to the subscription set.
|
|
72
74
|
*/
|
|
73
|
-
get subscriptionsChanged(): Observable<[session:
|
|
75
|
+
get subscriptionsChanged(): Observable<[session: NodeSession, subscription: Subscription], void>;
|
|
74
76
|
/**
|
|
75
77
|
* Emits when resubmission is necessary due to timeout or network error.
|
|
76
78
|
*/
|
|
@@ -99,7 +101,7 @@ export declare class SessionManager {
|
|
|
99
101
|
isResumption: boolean;
|
|
100
102
|
peerSessionParameters?: SessionParameterOptions;
|
|
101
103
|
caseAuthenticatedTags?: CaseAuthenticatedTag[];
|
|
102
|
-
}): Promise<
|
|
104
|
+
}): Promise<NodeSession>;
|
|
103
105
|
/**
|
|
104
106
|
* Deletes a resumption record for a given address. Returns true if the record was deleted, false if it did not
|
|
105
107
|
* exist.
|
|
@@ -110,14 +112,30 @@ export declare class SessionManager {
|
|
|
110
112
|
* existed.
|
|
111
113
|
*/
|
|
112
114
|
deleteResumptionRecordsForFabric(fabric: Fabric): Promise<boolean>;
|
|
113
|
-
findOldestInactiveSession():
|
|
115
|
+
findOldestInactiveSession(): NodeSession;
|
|
114
116
|
getNextAvailableSessionId(): Promise<number>;
|
|
115
|
-
getSession(sessionId: number):
|
|
116
|
-
getPaseSession():
|
|
117
|
-
getSessionForNode(address: PeerAddress):
|
|
117
|
+
getSession(sessionId: number): NodeSession | undefined;
|
|
118
|
+
getPaseSession(): NodeSession;
|
|
119
|
+
getSessionForNode(address: PeerAddress): NodeSession | undefined;
|
|
118
120
|
removeAllSessionsForNode(address: PeerAddress, sendClose?: boolean, closeBeforeCreatedTimestamp?: number): Promise<void>;
|
|
119
121
|
getUnsecureSession(sourceNodeId?: NodeId): InsecureSession | undefined;
|
|
120
|
-
|
|
122
|
+
/**
|
|
123
|
+
* Creates or Returns a Group Session for a Group Peer Address.
|
|
124
|
+
* This is used for sending group messages because it returns the session for the current
|
|
125
|
+
* Group Epoch key. The Source Node Id is the own Node.
|
|
126
|
+
*/
|
|
127
|
+
groupSessionForAddress(address: PeerAddress): GroupSession;
|
|
128
|
+
/**
|
|
129
|
+
* Creates or Returns the Group session based on an incoming packet.
|
|
130
|
+
* The Session ID is determined by trying to decrypt te packet with possible keys.
|
|
131
|
+
*/
|
|
132
|
+
groupSessionFromPacket(packet: DecodedPacket, aad: Uint8Array): {
|
|
133
|
+
session: GroupSession;
|
|
134
|
+
message: import("#codec/index.js").DecodedMessage;
|
|
135
|
+
key: Uint8Array<ArrayBufferLike>;
|
|
136
|
+
};
|
|
137
|
+
registerGroupSession(session: GroupSession): void;
|
|
138
|
+
removeGroupSession(session: GroupSession): void;
|
|
121
139
|
findResumptionRecordById(resumptionId: Uint8Array): ResumptionRecord | undefined;
|
|
122
140
|
findResumptionRecordByAddress(address: PeerAddress): ResumptionRecord | undefined;
|
|
123
141
|
saveResumptionRecord(resumptionRecord: ResumptionRecord): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../../src/session/SessionManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACH,QAAQ,EAER,YAAY,EAEZ,WAAW,EACX,aAAa,EAMb,UAAU,EAEV,cAAc,EAEjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAA0C,WAAW,
|
|
1
|
+
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../../src/session/SessionManager.ts"],"names":[],"mappings":"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"}
|