@project-chip/matter.js 0.16.0-alpha.0-20251205-dfb1e1556 → 0.16.0-alpha.0-20251207-37e501b18
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/CommissioningController.d.ts +6 -5
- package/dist/cjs/CommissioningController.d.ts.map +1 -1
- package/dist/cjs/CommissioningController.js +11 -7
- package/dist/cjs/CommissioningController.js.map +1 -1
- package/dist/cjs/MatterController.d.ts +6 -6
- package/dist/cjs/MatterController.d.ts.map +1 -1
- package/dist/cjs/MatterController.js +22 -22
- package/dist/cjs/MatterController.js.map +1 -1
- package/dist/cjs/device/PairedNode.d.ts +4 -4
- package/dist/cjs/device/PairedNode.d.ts.map +1 -1
- package/dist/cjs/device/PairedNode.js +3 -3
- package/dist/cjs/device/PairedNode.js.map +1 -1
- package/dist/esm/CommissioningController.d.ts +6 -5
- package/dist/esm/CommissioningController.d.ts.map +1 -1
- package/dist/esm/CommissioningController.js +13 -9
- package/dist/esm/CommissioningController.js.map +1 -1
- package/dist/esm/MatterController.d.ts +6 -6
- package/dist/esm/MatterController.d.ts.map +1 -1
- package/dist/esm/MatterController.js +23 -23
- package/dist/esm/MatterController.js.map +1 -1
- package/dist/esm/device/PairedNode.d.ts +4 -4
- package/dist/esm/device/PairedNode.d.ts.map +1 -1
- package/dist/esm/device/PairedNode.js +3 -3
- package/dist/esm/device/PairedNode.js.map +1 -1
- package/package.json +8 -8
- package/src/CommissioningController.ts +17 -9
- package/src/MatterController.ts +25 -25
- package/src/device/PairedNode.ts +7 -8
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { ClassExtends, Crypto, Environment } from "#general";
|
|
7
|
-
import { ActiveSessionInformation, CertificateAuthority, CommissionableDevice, CommissionableDeviceIdentifiers, ControllerCommissioningFlow, DiscoveryAndCommissioningOptions, DiscoveryData, Fabric, FabricGroups, InteractionClient,
|
|
6
|
+
import { ClassExtends, Crypto, Duration, Environment } from "#general";
|
|
7
|
+
import { ActiveSessionInformation, CertificateAuthority, CommissionableDevice, CommissionableDeviceIdentifiers, ControllerCommissioningFlow, DiscoveryAndCommissioningOptions, DiscoveryData, Fabric, FabricGroups, InteractionClient, NodeDiscoveryType, NodeSession, SecureSession } from "#protocol";
|
|
8
8
|
import { CaseAuthenticatedTag, DiscoveryCapabilitiesBitmap, FabricId, FabricIndex, NodeId, TypeFromPartialBitSchema, VendorId } from "#types";
|
|
9
9
|
import { CommissioningControllerNodeOptions, PairedNode } from "./device/PairedNode.js";
|
|
10
10
|
export type ControllerEnvironmentOptions = {
|
|
@@ -110,7 +110,7 @@ export declare class CommissioningController {
|
|
|
110
110
|
connectNodeAfterCommissioning?: boolean;
|
|
111
111
|
commissioningFlowImpl?: ClassExtends<ControllerCommissioningFlow>;
|
|
112
112
|
}): Promise<NodeId>;
|
|
113
|
-
connectPaseChannel(nodeOptions: NodeCommissioningOptions): Promise<
|
|
113
|
+
connectPaseChannel(nodeOptions: NodeCommissioningOptions): Promise<NodeSession>;
|
|
114
114
|
/**
|
|
115
115
|
* Completes the commissioning process for a node when the initial commissioning process was done by a PASE
|
|
116
116
|
* commissioner. This method should be called to discover the device operational and complete the commissioning
|
|
@@ -157,7 +157,8 @@ export declare class CommissioningController {
|
|
|
157
157
|
* Creates and Return a new InteractionClient to communicate with a node. This is mainly used internally and should
|
|
158
158
|
* not be used directly. See the PairedNode class for the public API.
|
|
159
159
|
*/
|
|
160
|
-
createInteractionClient(
|
|
160
|
+
createInteractionClient(nodeIdOrSession: NodeId | SecureSession, discoveryType?: NodeDiscoveryType, options?: {
|
|
161
|
+
discoveryTimeout?: Duration;
|
|
161
162
|
forcedConnection?: boolean;
|
|
162
163
|
caseAuthenticatedTags?: CaseAuthenticatedTag[];
|
|
163
164
|
}): Promise<InteractionClient>;
|
|
@@ -201,7 +202,7 @@ export declare class CommissioningController {
|
|
|
201
202
|
* The promise will be fulfilled after the provided timeout or when the discovery is stopped via
|
|
202
203
|
* cancelCommissionableDeviceDiscovery(). The discoveredCallback will be called for each discovered device.
|
|
203
204
|
*/
|
|
204
|
-
discoverCommissionableDevices(identifierData: CommissionableDeviceIdentifiers, discoveryCapabilities?: TypeFromPartialBitSchema<typeof DiscoveryCapabilitiesBitmap>, discoveredCallback?: (device: CommissionableDevice) => void, timeout?:
|
|
205
|
+
discoverCommissionableDevices(identifierData: CommissionableDeviceIdentifiers, discoveryCapabilities?: TypeFromPartialBitSchema<typeof DiscoveryCapabilitiesBitmap>, discoveredCallback?: (device: CommissionableDevice) => void, timeout?: Duration): Promise<CommissionableDevice[]>;
|
|
205
206
|
/**
|
|
206
207
|
* Use this method to reset the Controller storage. The method can only be called if the controller is stopped and
|
|
207
208
|
* will remove all commissioning data and paired nodes from the controller.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningController.d.ts","sourceRoot":"","sources":["../../src/CommissioningController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EACH,YAAY,EACZ,MAAM,EACN,WAAW,EAOd,MAAM,UAAU,CAAC;AAElB,OAAO,EACH,wBAAwB,EAExB,oBAAoB,EACpB,oBAAoB,EACpB,+BAA+B,EAC/B,2BAA2B,EAG3B,gCAAgC,EAChC,aAAa,EACb,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"CommissioningController.d.ts","sourceRoot":"","sources":["../../src/CommissioningController.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,8 @@ import { LegacyControllerStore } from "#LegacyControllerStore.js";
|
|
|
18
18
|
import {
|
|
19
19
|
Ble,
|
|
20
20
|
ControllerDiscovery,
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
NodeDiscoveryType,
|
|
22
|
+
Session
|
|
23
23
|
} from "#protocol";
|
|
24
24
|
import { NodeStates, PairedNode } from "./device/PairedNode.js";
|
|
25
25
|
import { MatterController } from "./MatterController.js";
|
|
@@ -307,17 +307,21 @@ class CommissioningController {
|
|
|
307
307
|
* Creates and Return a new InteractionClient to communicate with a node. This is mainly used internally and should
|
|
308
308
|
* not be used directly. See the PairedNode class for the public API.
|
|
309
309
|
*/
|
|
310
|
-
async createInteractionClient(
|
|
310
|
+
async createInteractionClient(nodeIdOrSession, discoveryType, options) {
|
|
311
311
|
const controller = this.#assertControllerIsStarted();
|
|
312
|
-
const {
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
312
|
+
const {
|
|
313
|
+
forcedConnection,
|
|
314
|
+
caseAuthenticatedTags = this.#options.caseAuthenticatedTags,
|
|
315
|
+
discoveryTimeout
|
|
316
|
+
} = options ?? {};
|
|
317
|
+
if (nodeIdOrSession instanceof Session || !forcedConnection) {
|
|
318
|
+
return controller.createInteractionClient(nodeIdOrSession, {
|
|
319
|
+
discoveryOptions: { discoveryType, timeout: discoveryTimeout },
|
|
316
320
|
caseAuthenticatedTags
|
|
317
321
|
});
|
|
318
322
|
}
|
|
319
|
-
return controller.connect(
|
|
320
|
-
discoveryOptions: { discoveryType },
|
|
323
|
+
return controller.connect(nodeIdOrSession, {
|
|
324
|
+
discoveryOptions: { discoveryType, timeout: discoveryTimeout },
|
|
321
325
|
allowUnknownPeer: forcedConnection,
|
|
322
326
|
caseAuthenticatedTags
|
|
323
327
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/CommissioningController.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,8BAA8B;AACvC,SAAS,uBAAuB;AAChC;AAAA,EAEI;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -7,7 +7,7 @@ import type { NodeCommissioningOptions } from "#CommissioningController.js";
|
|
|
7
7
|
import { ControllerStoreInterface } from "#ControllerStore.js";
|
|
8
8
|
import { DeviceInformationData } from "#device/DeviceInformation.js";
|
|
9
9
|
import { ClassExtends, Construction, Environment, ServerAddressUdp } from "#general";
|
|
10
|
-
import { CertificateAuthority, ControllerCommissioningFlow, DecodedAttributeReportValue, DiscoveryData, Fabric,
|
|
10
|
+
import { CertificateAuthority, ControllerCommissioningFlow, DecodedAttributeReportValue, DiscoveryData, Fabric, PeerConnectionOptions, SecureSession, SessionManager } from "#protocol";
|
|
11
11
|
import { CaseAuthenticatedTag, ClusterId, DiscoveryCapabilitiesBitmap, EndpointNumber, FabricId, FabricIndex, NodeId, TypeFromPartialBitSchema, VendorId } from "#types";
|
|
12
12
|
export type CommissionedNodeDetails = {
|
|
13
13
|
operationalServerAddress?: ServerAddressUdp;
|
|
@@ -72,7 +72,7 @@ export declare class MatterController {
|
|
|
72
72
|
get nodeId(): NodeId;
|
|
73
73
|
get caConfig(): CertificateAuthority.Configuration;
|
|
74
74
|
get fabricConfig(): Fabric.Config;
|
|
75
|
-
get sessions():
|
|
75
|
+
get sessions(): SessionManager;
|
|
76
76
|
getFabrics(): Fabric[];
|
|
77
77
|
collectScanners(discoveryCapabilities?: TypeFromPartialBitSchema<typeof DiscoveryCapabilitiesBitmap>): import("#protocol").Scanner[];
|
|
78
78
|
/**
|
|
@@ -90,9 +90,9 @@ export declare class MatterController {
|
|
|
90
90
|
completeCommissioningCallback?: (peerNodeId: NodeId, discoveryData?: DiscoveryData) => Promise<boolean>;
|
|
91
91
|
commissioningFlowImpl?: ClassExtends<ControllerCommissioningFlow>;
|
|
92
92
|
}): Promise<NodeId>;
|
|
93
|
-
disconnect(nodeId: NodeId): Promise<void>;
|
|
94
|
-
connectPaseChannel(options: NodeCommissioningOptions): Promise<
|
|
95
|
-
removeNode(nodeId: NodeId): Promise<void>;
|
|
93
|
+
disconnect(nodeId: NodeId): Promise<void | undefined>;
|
|
94
|
+
connectPaseChannel(options: NodeCommissioningOptions): Promise<import("#protocol").NodeSession>;
|
|
95
|
+
removeNode(nodeId: NodeId): Promise<void | undefined>;
|
|
96
96
|
/**
|
|
97
97
|
* Method to complete the commissioning process to a node which was initialized with a PASE secure channel.
|
|
98
98
|
*/
|
|
@@ -119,7 +119,7 @@ export declare class MatterController {
|
|
|
119
119
|
* Returns a InteractionClient on success.
|
|
120
120
|
*/
|
|
121
121
|
connect(peerNodeId: NodeId, options: MatterController.ConnectOptions): Promise<import("#protocol").InteractionClient>;
|
|
122
|
-
createInteractionClient(
|
|
122
|
+
createInteractionClient(peerNodeIdOrSession: NodeId | SecureSession, options?: PeerConnectionOptions): Promise<import("#protocol").InteractionClient>;
|
|
123
123
|
start(): Promise<void>;
|
|
124
124
|
close(): Promise<void>;
|
|
125
125
|
getActiveSessionInformation(): import("#protocol").ActiveSessionInformation[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAGH,YAAY,EAEZ,YAAY,EAEZ,WAAW,EAMX,gBAAgB,EAGnB,MAAM,UAAU,CAAC;AAGlB,OAAO,EACH,oBAAoB,EAIpB,2BAA2B,EAC3B,2BAA2B,EAE3B,aAAa,EACb,MAAM,
|
|
1
|
+
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,12 @@ import {
|
|
|
30
30
|
FabricAuthority,
|
|
31
31
|
FabricManager,
|
|
32
32
|
InteractionClientProvider,
|
|
33
|
-
MessageChannel,
|
|
34
33
|
NodeDiscoveryType,
|
|
35
34
|
PeerAddressStore,
|
|
36
35
|
PeerSet,
|
|
37
36
|
RetransmissionLimitReachedError,
|
|
38
37
|
ScannerSet,
|
|
38
|
+
SecureSession,
|
|
39
39
|
SessionManager
|
|
40
40
|
} from "#protocol";
|
|
41
41
|
import {
|
|
@@ -196,7 +196,7 @@ class MatterController {
|
|
|
196
196
|
// We do not want to reestablish subscriptions on restart
|
|
197
197
|
}
|
|
198
198
|
});
|
|
199
|
-
this.#node.env.get(SessionManager).sessions.deleted.on(
|
|
199
|
+
this.#node.env.get(SessionManager).sessions.deleted.on((session) => sessionClosedCallback?.(session.peerNodeId));
|
|
200
200
|
this.#peers = this.#node.env.get(PeerSet);
|
|
201
201
|
nodesStore.peers = this.#peers;
|
|
202
202
|
if (this.#fabric.label !== adminFabricLabel) {
|
|
@@ -222,7 +222,7 @@ class MatterController {
|
|
|
222
222
|
}
|
|
223
223
|
get sessions() {
|
|
224
224
|
this.#construction.assert();
|
|
225
|
-
return this.#node.env.get(SessionManager)
|
|
225
|
+
return this.#node.env.get(SessionManager);
|
|
226
226
|
}
|
|
227
227
|
getFabrics() {
|
|
228
228
|
this.#construction.assert();
|
|
@@ -269,22 +269,22 @@ class MatterController {
|
|
|
269
269
|
}
|
|
270
270
|
async disconnect(nodeId) {
|
|
271
271
|
this.#construction.assert();
|
|
272
|
-
return this.#peers
|
|
272
|
+
return this.#peers?.get(this.#fabric.addressOf(nodeId))?.close();
|
|
273
273
|
}
|
|
274
274
|
async connectPaseChannel(options) {
|
|
275
275
|
this.#construction.assert();
|
|
276
|
-
const {
|
|
276
|
+
const { paseSession } = await this.#node.env.get(ControllerCommissioner).discoverAndEstablishPase({
|
|
277
277
|
...options.commissioning,
|
|
278
278
|
fabric: this.#fabric,
|
|
279
279
|
discovery: options.discovery,
|
|
280
280
|
passcode: options.passcode
|
|
281
281
|
});
|
|
282
|
-
logger.warn("PASE channel established",
|
|
283
|
-
return
|
|
282
|
+
logger.warn("PASE channel established", paseSession.via, paseSession.isSecure);
|
|
283
|
+
return paseSession;
|
|
284
284
|
}
|
|
285
285
|
async removeNode(nodeId) {
|
|
286
286
|
this.#construction.assert();
|
|
287
|
-
return this.#peers
|
|
287
|
+
return this.#peers?.get(this.#fabric.addressOf(nodeId))?.delete();
|
|
288
288
|
}
|
|
289
289
|
/**
|
|
290
290
|
* Method to complete the commissioning process to a node which was initialized with a PASE secure channel.
|
|
@@ -308,7 +308,7 @@ class MatterController {
|
|
|
308
308
|
useExtendedFailSafeMessageResponseTimeout: true
|
|
309
309
|
});
|
|
310
310
|
if (errorCode !== GeneralCommissioning.CommissioningError.Ok) {
|
|
311
|
-
await this.#peers
|
|
311
|
+
await this.#peers?.get(this.#fabric.addressOf(peerNodeId))?.delete();
|
|
312
312
|
throw new CommissioningError(`Commission error on commissioningComplete: ${errorCode}, ${debugText}`);
|
|
313
313
|
}
|
|
314
314
|
await this.#fabric.persist();
|
|
@@ -324,7 +324,7 @@ class MatterController {
|
|
|
324
324
|
getCommissionedNodesDetails() {
|
|
325
325
|
this.#construction.assert();
|
|
326
326
|
return this.#peers.map((peer) => {
|
|
327
|
-
const { address, operationalAddress, discoveryData, deviceData } = peer;
|
|
327
|
+
const { address, operationalAddress, discoveryData, deviceData } = peer.descriptor;
|
|
328
328
|
return {
|
|
329
329
|
nodeId: address.nodeId,
|
|
330
330
|
operationalAddress: operationalAddress ? ServerAddress.urlFor(operationalAddress) : void 0,
|
|
@@ -336,7 +336,7 @@ class MatterController {
|
|
|
336
336
|
}
|
|
337
337
|
getCommissionedNodeDetails(nodeId) {
|
|
338
338
|
this.#construction.assert();
|
|
339
|
-
const nodeDetails = this.#peers.get(this.#fabric.addressOf(nodeId));
|
|
339
|
+
const nodeDetails = this.#peers.get(this.#fabric.addressOf(nodeId))?.descriptor;
|
|
340
340
|
if (nodeDetails === void 0) {
|
|
341
341
|
throw new Error(`Node ${nodeId} is not commissioned.`);
|
|
342
342
|
}
|
|
@@ -351,7 +351,7 @@ class MatterController {
|
|
|
351
351
|
}
|
|
352
352
|
async enhanceCommissionedNodeDetails(nodeId, deviceData) {
|
|
353
353
|
this.#construction.assert();
|
|
354
|
-
const nodeDetails = this.#peers.get(this.#fabric.addressOf(nodeId));
|
|
354
|
+
const nodeDetails = this.#peers.get(this.#fabric.addressOf(nodeId))?.descriptor;
|
|
355
355
|
if (nodeDetails === void 0) {
|
|
356
356
|
throw new Error(`Node ${nodeId} is not commissioned.`);
|
|
357
357
|
}
|
|
@@ -366,12 +366,12 @@ class MatterController {
|
|
|
366
366
|
this.#construction.assert();
|
|
367
367
|
return this.#node.env.get(InteractionClientProvider).connect(this.#fabric.addressOf(peerNodeId), options);
|
|
368
368
|
}
|
|
369
|
-
createInteractionClient(
|
|
370
|
-
if (
|
|
371
|
-
return this.#node.env.get(InteractionClientProvider).
|
|
369
|
+
createInteractionClient(peerNodeIdOrSession, options = {}) {
|
|
370
|
+
if (peerNodeIdOrSession instanceof SecureSession) {
|
|
371
|
+
return this.#node.env.get(InteractionClientProvider).interactionClientFor(peerNodeIdOrSession);
|
|
372
372
|
}
|
|
373
373
|
return this.#node.env.get(InteractionClientProvider).getInteractionClient(
|
|
374
|
-
this.#fabric.addressOf(
|
|
374
|
+
this.#fabric.addressOf(peerNodeIdOrSession),
|
|
375
375
|
options
|
|
376
376
|
);
|
|
377
377
|
}
|
|
@@ -390,20 +390,20 @@ class MatterController {
|
|
|
390
390
|
async getStoredClusterDataVersions(nodeId, filterEndpointId, filterClusterId) {
|
|
391
391
|
this.#construction.assert();
|
|
392
392
|
const peer = this.#peers.get(this.#fabric.addressOf(nodeId));
|
|
393
|
-
if (peer === void 0 || peer.dataStore === void 0) {
|
|
393
|
+
if (peer === void 0 || peer.descriptor.dataStore === void 0) {
|
|
394
394
|
return [];
|
|
395
395
|
}
|
|
396
|
-
await peer.dataStore.construction;
|
|
397
|
-
return peer.dataStore.getClusterDataVersions(filterEndpointId, filterClusterId);
|
|
396
|
+
await peer.descriptor.dataStore.construction;
|
|
397
|
+
return peer.descriptor.dataStore.getClusterDataVersions(filterEndpointId, filterClusterId);
|
|
398
398
|
}
|
|
399
399
|
async retrieveStoredAttributes(nodeId, endpointId, clusterId) {
|
|
400
400
|
this.#construction.assert();
|
|
401
401
|
const peer = this.#peers.get(this.#fabric.addressOf(nodeId));
|
|
402
|
-
if (peer === void 0 || peer.dataStore === void 0) {
|
|
402
|
+
if (peer === void 0 || peer.descriptor.dataStore === void 0) {
|
|
403
403
|
return [];
|
|
404
404
|
}
|
|
405
|
-
await peer.dataStore.construction;
|
|
406
|
-
return peer.dataStore.retrieveAttributes(endpointId, clusterId);
|
|
405
|
+
await peer.descriptor.dataStore.construction;
|
|
406
|
+
return peer.descriptor.dataStore.retrieveAttributes(endpointId, clusterId);
|
|
407
407
|
}
|
|
408
408
|
async updateFabricLabel(label) {
|
|
409
409
|
this.#construction.assert();
|
|
@@ -455,7 +455,7 @@ class CommissionedNodeStore extends PeerAddressStore {
|
|
|
455
455
|
operationalAddress: operationalServerAddress,
|
|
456
456
|
discoveryData,
|
|
457
457
|
deviceData
|
|
458
|
-
} = peer;
|
|
458
|
+
} = peer.descriptor;
|
|
459
459
|
return [
|
|
460
460
|
address.nodeId,
|
|
461
461
|
{ operationalServerAddress, discoveryData, deviceData }
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/MatterController.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAYA,SAAS,4BAA4B;AAGrC,SAAS,6BAA6B;AAEtC;AAAA,EACI;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,OACG;AACP,SAAS,6BAA6B;AACtC,SAAS,mBAAmB,kBAAkB;AAC9C;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAKA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["fabric"]
|
|
6
6
|
}
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Descriptor } from "#clusters";
|
|
7
|
-
import { AsyncObservable,
|
|
7
|
+
import { AsyncObservable, Construction, Crypto, Diagnostic, MatterError, Observable } from "#general";
|
|
8
8
|
import { Behavior, Commands } from "#node";
|
|
9
|
-
import { AttributeClientValues, ClusterClientObj, DecodedAttributeReportValue, DecodedEventReportValue, InteractionClient, NodeDiscoveryType,
|
|
9
|
+
import { AttributeClientValues, ClusterClientObj, DecodedAttributeReportValue, DecodedEventReportValue, InteractionClient, NodeDiscoveryType, SessionManager, StructuredReadAttributeData } from "#protocol";
|
|
10
10
|
import { CaseAuthenticatedTag, ClusterId, ClusterType, EndpointNumber, NodeId } from "#types";
|
|
11
11
|
import { ClusterServerObj } from "../cluster/server/ClusterServerTypes.js";
|
|
12
12
|
import { CommissioningController } from "../CommissioningController.js";
|
|
@@ -131,8 +131,8 @@ export declare class PairedNode {
|
|
|
131
131
|
[Diagnostic.value]: unknown;
|
|
132
132
|
readonly nodeId: NodeId;
|
|
133
133
|
readonly events: PairedNode.Events;
|
|
134
|
-
static create(nodeId: NodeId, commissioningController: CommissioningController, options: CommissioningControllerNodeOptions | undefined, knownNodeDetails: DeviceInformationData, interactionClient: InteractionClient, reconnectFunc: ReconnectionCallback, assignDisconnectedHandler: (handler: () => Promise<void>) => void, sessions:
|
|
135
|
-
constructor(nodeId: NodeId, commissioningController: CommissioningController, options: CommissioningControllerNodeOptions | undefined, knownNodeDetails: DeviceInformationData, interactionClient: InteractionClient, reconnectFunc: ReconnectionCallback, assignDisconnectedHandler: (handler: () => Promise<void>) => void, sessions:
|
|
134
|
+
static create(nodeId: NodeId, commissioningController: CommissioningController, options: CommissioningControllerNodeOptions | undefined, knownNodeDetails: DeviceInformationData, interactionClient: InteractionClient, reconnectFunc: ReconnectionCallback, assignDisconnectedHandler: (handler: () => Promise<void>) => void, sessions: SessionManager, crypto: Crypto, storedAttributeData?: DecodedAttributeReportValue<any>[]): Promise<PairedNode>;
|
|
135
|
+
constructor(nodeId: NodeId, commissioningController: CommissioningController, options: CommissioningControllerNodeOptions | undefined, knownNodeDetails: DeviceInformationData, interactionClient: InteractionClient, reconnectFunc: ReconnectionCallback, assignDisconnectedHandler: (handler: () => Promise<void>) => void, sessions: SessionManager, crypto: Crypto, storedAttributeData?: DecodedAttributeReportValue<any>[]);
|
|
136
136
|
get construction(): Construction<PairedNode>;
|
|
137
137
|
get isConnected(): boolean;
|
|
138
138
|
/** Returns the Node connection state. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PairedNode.d.ts","sourceRoot":"","sources":["../../../src/device/PairedNode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAgD,UAAU,EAA0B,MAAM,WAAW,CAAC;AAC7G,OAAO,EACH,eAAe,EAEf,
|
|
1
|
+
{"version":3,"file":"PairedNode.d.ts","sourceRoot":"","sources":["../../../src/device/PairedNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,7 @@ class PairedNode {
|
|
|
88
88
|
this.nodeId = nodeId;
|
|
89
89
|
assignDisconnectedHandler(async () => {
|
|
90
90
|
logger.info(
|
|
91
|
-
`Node ${this.nodeId}: Session disconnected${this.#connectionState
|
|
91
|
+
`Node ${this.nodeId}: Session disconnected while Node is ${NodeStates[this.#connectionState]}${this.#connectionState === 0 /* Connected */ ? ", trying to reconnect ..." : ""}`
|
|
92
92
|
);
|
|
93
93
|
if (this.#connectionState === 0 /* Connected */) {
|
|
94
94
|
this.#scheduleReconnect();
|
|
@@ -115,7 +115,7 @@ class PairedNode {
|
|
|
115
115
|
}
|
|
116
116
|
this.#nodeDetails = new DeviceInformation(nodeId, knownNodeDetails);
|
|
117
117
|
logger.info(`Node ${this.nodeId}: Created paired node with device data`, this.#nodeDetails.meta);
|
|
118
|
-
sessions.added.on((session) => {
|
|
118
|
+
sessions.sessions.added.on((session) => {
|
|
119
119
|
if (session.isInitiator || // If we initiated the session we do not need to react on it
|
|
120
120
|
session.peerNodeId !== this.nodeId || // no session for this node
|
|
121
121
|
this.connectionState !== 3 /* WaitingForDeviceDiscovery */) {
|
|
@@ -641,7 +641,7 @@ class PairedNode {
|
|
|
641
641
|
// We queue subscriptions for thread devices
|
|
642
642
|
attributeListener: subscriptionHandler.attributeListener,
|
|
643
643
|
eventListener: (data) => subscriptionHandler.eventListener(data),
|
|
644
|
-
updateTimeoutHandler: () => subscriptionHandler.updateTimeoutHandler(),
|
|
644
|
+
updateTimeoutHandler: (lifetime) => subscriptionHandler.updateTimeoutHandler(lifetime),
|
|
645
645
|
updateReceived: () => subscriptionHandler.subscriptionAlive()
|
|
646
646
|
});
|
|
647
647
|
ignoreInitialTriggers = false;
|