@project-chip/matter.js 0.12.4-alpha.0-20250217-b0bba5179 → 0.12.4-alpha.0-20250224-e0964a795
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/MatterController.d.ts +1 -0
- package/dist/cjs/MatterController.d.ts.map +1 -1
- package/dist/cjs/MatterController.js +8 -4
- package/dist/cjs/MatterController.js.map +1 -1
- package/dist/cjs/device/DeviceInformation.d.ts +2 -9
- package/dist/cjs/device/DeviceInformation.d.ts.map +1 -1
- package/dist/cjs/device/DeviceInformation.js +5 -32
- package/dist/cjs/device/DeviceInformation.js.map +1 -1
- package/dist/cjs/device/LegacyInteractionServer.d.ts.map +1 -1
- package/dist/esm/MatterController.d.ts +1 -0
- package/dist/esm/MatterController.d.ts.map +1 -1
- package/dist/esm/MatterController.js +9 -4
- package/dist/esm/MatterController.js.map +1 -1
- package/dist/esm/device/DeviceInformation.d.ts +2 -9
- package/dist/esm/device/DeviceInformation.d.ts.map +1 -1
- package/dist/esm/device/DeviceInformation.js +6 -33
- package/dist/esm/device/DeviceInformation.js.map +1 -1
- package/dist/esm/device/LegacyInteractionServer.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/MatterController.ts +11 -4
- package/src/device/DeviceInformation.ts +7 -53
|
@@ -44,6 +44,7 @@ export declare class MatterController {
|
|
|
44
44
|
private readonly channelManager;
|
|
45
45
|
private readonly exchangeManager;
|
|
46
46
|
private readonly peers;
|
|
47
|
+
private readonly clients;
|
|
47
48
|
private readonly commissioner;
|
|
48
49
|
readonly nodesStore: CommissionedNodeStore;
|
|
49
50
|
private readonly scanners;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAGH,YAAY,EAKZ,eAAe,EACf,eAAe,EAIlB,MAAM,UAAU,CAAC;AAElB,OAAO,EACH,oBAAoB,EAKpB,2BAA2B,EAK3B,aAAa,EACb,gBAAgB,EAEhB,MAAM,EAGN,mBAAmB,
|
|
1
|
+
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"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"}
|
|
@@ -134,6 +134,7 @@ class MatterController {
|
|
|
134
134
|
channelManager = new import_protocol.ChannelManager(CONTROLLER_CONNECTIONS_PER_FABRIC_AND_NODE);
|
|
135
135
|
exchangeManager;
|
|
136
136
|
peers;
|
|
137
|
+
clients;
|
|
137
138
|
commissioner;
|
|
138
139
|
#construction;
|
|
139
140
|
#store;
|
|
@@ -177,24 +178,27 @@ class MatterController {
|
|
|
177
178
|
this.sessionManager.sessions.deleted.on(async (session) => {
|
|
178
179
|
this.sessionClosedCallback?.(session.peerNodeId);
|
|
179
180
|
});
|
|
181
|
+
const subscriptionClient = new import_protocol.SubscriptionClient();
|
|
180
182
|
this.exchangeManager = new import_protocol.ExchangeManager({
|
|
181
183
|
sessionManager: this.sessionManager,
|
|
182
184
|
channelManager: this.channelManager,
|
|
183
185
|
transportInterfaces: this.netInterfaces
|
|
184
186
|
});
|
|
185
187
|
this.exchangeManager.addProtocolHandler(new import_protocol.SecureChannelProtocol(this.sessionManager, fabricManager));
|
|
186
|
-
this.exchangeManager.addProtocolHandler(
|
|
188
|
+
this.exchangeManager.addProtocolHandler(subscriptionClient);
|
|
187
189
|
this.nodesStore = new CommissionedNodeStore(controllerStore, fabric);
|
|
188
190
|
this.nodesStore.peers = this.peers = new import_protocol.PeerSet({
|
|
189
191
|
sessions: this.sessionManager,
|
|
190
192
|
channels: this.channelManager,
|
|
191
193
|
exchanges: this.exchangeManager,
|
|
194
|
+
subscriptionClient,
|
|
192
195
|
scanners: this.scanners,
|
|
193
196
|
netInterfaces: this.netInterfaces,
|
|
194
197
|
store: this.nodesStore
|
|
195
198
|
});
|
|
199
|
+
this.clients = new import_protocol.InteractionClientProvider(this.peers);
|
|
196
200
|
this.commissioner = new import_protocol.ControllerCommissioner({
|
|
197
|
-
|
|
201
|
+
clients: this.clients,
|
|
198
202
|
scanners: this.scanners,
|
|
199
203
|
netInterfaces: this.netInterfaces,
|
|
200
204
|
exchanges: this.exchangeManager,
|
|
@@ -350,10 +354,10 @@ class MatterController {
|
|
|
350
354
|
* Returns a InteractionClient on success.
|
|
351
355
|
*/
|
|
352
356
|
async connect(peerNodeId, discoveryOptions, allowUnknownPeer) {
|
|
353
|
-
return this.
|
|
357
|
+
return this.clients.connect(this.fabric.addressOf(peerNodeId), discoveryOptions, allowUnknownPeer);
|
|
354
358
|
}
|
|
355
359
|
createInteractionClient(peerNodeId, discoveryOptions) {
|
|
356
|
-
return this.
|
|
360
|
+
return this.clients.getInteractionClient(this.fabric.addressOf(peerNodeId), discoveryOptions);
|
|
357
361
|
}
|
|
358
362
|
async getNextAvailableSessionId() {
|
|
359
363
|
return this.sessionManager.getNextAvailableSessionId();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/MatterController.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAYA,sBAAqC;AAErC,mCAAsC;AAEtC,qBAaO;AACP,mCAAsC;AACtC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,17 +4,10 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { SupportedStorageTypes } from "@matter/general";
|
|
7
|
-
import { InteractionClient } from "@matter/protocol";
|
|
7
|
+
import { InteractionClient, PhysicalDeviceProperties } from "@matter/protocol";
|
|
8
8
|
import { NodeId } from "@matter/types";
|
|
9
9
|
import { Endpoint } from "./Endpoint.js";
|
|
10
|
-
export type DeviceMetaInformation = {
|
|
11
|
-
threadConnected: boolean;
|
|
12
|
-
wifiConnected: boolean;
|
|
13
|
-
ethernetConnected: boolean;
|
|
14
|
-
rootEndpointServerList: number[];
|
|
15
|
-
isBatteryPowered: boolean;
|
|
16
|
-
isIntermittentlyConnected: boolean;
|
|
17
|
-
isThreadSleepyEndDevice: boolean;
|
|
10
|
+
export type DeviceMetaInformation = PhysicalDeviceProperties & {
|
|
18
11
|
dataRevision: number;
|
|
19
12
|
};
|
|
20
13
|
export type DeviceBasicInformation = Record<string, SupportedStorageTypes>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceInformation.d.ts","sourceRoot":"","sources":["../../../src/device/DeviceInformation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,OAAO,EAAU,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAA4B,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"DeviceInformation.d.ts","sourceRoot":"","sources":["../../../src/device/DeviceInformation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,OAAO,EAAU,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAA4B,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAoC,MAAM,EAA4C,MAAM,eAAe,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAAG;IAC3D,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAE3E,MAAM,MAAM,qBAAqB,GAAG;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAItC,qBAAa,iBAAiB;;IAKtB,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM,EACvB,IAAI,EAAE,qBAAqB;IAM/B,IAAI,IAAI,sCAEP;IAED,IAAI,gBAAgB,uCAEnB;IAED,IAAI,KAAK,YAMR;IAEK,6BAA6B,CAAC,YAAY,EAAE,QAAQ;IAsGpD,8BAA8B,CAAC,iBAAiB,EAAE,iBAAiB;IAqIzE,+BAA+B,CAAC,OAAO,EAAE;QACrC,gCAAgC,CAAC,EAAE,MAAM,CAAC;QAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;KAC/C;;;;IAQD,aAAa,IAAI,qBAAqB;CAMzC"}
|
|
@@ -33,12 +33,6 @@ var import_types = require("@matter/types");
|
|
|
33
33
|
*/
|
|
34
34
|
const logger = import_general.Logger.get("DeviceInformation");
|
|
35
35
|
const DEVICE_DATA_REVISION = 1;
|
|
36
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S = 1;
|
|
37
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_ICD_S = 0;
|
|
38
|
-
const DEFAULT_SUBSCRIPTION_CEILING_WIFI_S = 60;
|
|
39
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_S = 60;
|
|
40
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S = 180;
|
|
41
|
-
const DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S = 600;
|
|
42
36
|
const GlobalAttributeKeys = Object.keys((0, import_types.GlobalAttributes)({}));
|
|
43
37
|
class DeviceInformation {
|
|
44
38
|
constructor(nodeId, data) {
|
|
@@ -262,32 +256,11 @@ class DeviceInformation {
|
|
|
262
256
|
this.#deviceMeta = deviceData;
|
|
263
257
|
}
|
|
264
258
|
determineSubscriptionParameters(options) {
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
if (isIntermittentlyConnected) {
|
|
271
|
-
if (minIntervalFloorSeconds !== void 0 && minIntervalFloorSeconds !== DEFAULT_SUBSCRIPTION_FLOOR_ICD_S) {
|
|
272
|
-
logger.info(
|
|
273
|
-
`Node ${this.nodeId}: Overwriting minIntervalFloorSeconds for intermittently connected device to 0`
|
|
274
|
-
);
|
|
275
|
-
minIntervalFloorSeconds = DEFAULT_SUBSCRIPTION_FLOOR_ICD_S;
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
const defaultCeiling = isBatteryPowered ? DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S : isThreadSleepyEndDevice ? DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S : threadConnected ? DEFAULT_SUBSCRIPTION_CEILING_THREAD_S : DEFAULT_SUBSCRIPTION_CEILING_WIFI_S;
|
|
279
|
-
if (maxIntervalCeilingSeconds === void 0) {
|
|
280
|
-
maxIntervalCeilingSeconds = defaultCeiling;
|
|
281
|
-
}
|
|
282
|
-
if (maxIntervalCeilingSeconds < defaultCeiling) {
|
|
283
|
-
logger.debug(
|
|
284
|
-
`Node ${this.nodeId}: maxIntervalCeilingSeconds should idealy be set to ${defaultCeiling}s instead of ${maxIntervalCeilingSeconds}s because of device type`
|
|
285
|
-
);
|
|
286
|
-
}
|
|
287
|
-
return {
|
|
288
|
-
minIntervalFloorSeconds: minIntervalFloorSeconds ?? DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S,
|
|
289
|
-
maxIntervalCeilingSeconds
|
|
290
|
-
};
|
|
259
|
+
return import_protocol.PhysicalDeviceProperties.determineSubscriptionParameters({
|
|
260
|
+
properties: this.#deviceMeta,
|
|
261
|
+
description: `Node ${this.nodeId}`,
|
|
262
|
+
...options
|
|
263
|
+
});
|
|
291
264
|
}
|
|
292
265
|
toStorageData() {
|
|
293
266
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device/DeviceInformation.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,sBAOO;AACP,qBAA8C;AAC9C,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LegacyInteractionServer.d.ts","sourceRoot":"","sources":["../../../src/device/LegacyInteractionServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,SAAS,EAET,kBAAkB,EAElB,iBAAiB,EACjB,OAAO,EACP,eAAe,EACf,kBAAkB,EAGrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAkB,cAAc,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAKxE;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,iBAAiB;;gBAI9C,OAAO,EAAE,kBAAkB;cAmDpB,aAAa,CAC5B,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,OAAO,UAAQ;;;;cAiBM,SAAS,CAC9B,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,GAAG,SAAS,EACjE,KAAK,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC;cAKP,cAAc,CACnC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,CAAC,EAAE,OAAO,EACxC,WAAW,CAAC,EAAE,OAAO;cAeA,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,QAAQ,EAAE,eAAe,EACzB,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,UAAQ;;;;
|
|
1
|
+
{"version":3,"file":"LegacyInteractionServer.d.ts","sourceRoot":"","sources":["../../../src/device/LegacyInteractionServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,SAAS,EAET,kBAAkB,EAElB,iBAAiB,EACjB,OAAO,EACP,eAAe,EACf,kBAAkB,EAGrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAkB,cAAc,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAKxE;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,iBAAiB;;gBAI9C,OAAO,EAAE,kBAAkB;cAmDpB,aAAa,CAC5B,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,OAAO,UAAQ;;;;cAiBM,SAAS,CAC9B,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,GAAG,SAAS,EACjE,KAAK,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC;cAKP,cAAc,CACnC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,CAAC,EAAE,OAAO,EACxC,WAAW,CAAC,EAAE,OAAO;cAeA,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,QAAQ,EAAE,eAAe,EACzB,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,UAAQ;;;;yBAcmjB,QAAQ;;CADxmB"}
|
|
@@ -44,6 +44,7 @@ export declare class MatterController {
|
|
|
44
44
|
private readonly channelManager;
|
|
45
45
|
private readonly exchangeManager;
|
|
46
46
|
private readonly peers;
|
|
47
|
+
private readonly clients;
|
|
47
48
|
private readonly commissioner;
|
|
48
49
|
readonly nodesStore: CommissionedNodeStore;
|
|
49
50
|
private readonly scanners;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAGH,YAAY,EAKZ,eAAe,EACf,eAAe,EAIlB,MAAM,UAAU,CAAC;AAElB,OAAO,EACH,oBAAoB,EAKpB,2BAA2B,EAK3B,aAAa,EACb,gBAAgB,EAEhB,MAAM,EAGN,mBAAmB,
|
|
1
|
+
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../src/MatterController.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ import {
|
|
|
32
32
|
Fabric,
|
|
33
33
|
FabricBuilder,
|
|
34
34
|
FabricManager,
|
|
35
|
+
InteractionClientProvider,
|
|
35
36
|
NodeDiscoveryType,
|
|
36
37
|
PeerAddressStore,
|
|
37
38
|
PeerSet,
|
|
@@ -149,6 +150,7 @@ class MatterController {
|
|
|
149
150
|
channelManager = new ChannelManager(CONTROLLER_CONNECTIONS_PER_FABRIC_AND_NODE);
|
|
150
151
|
exchangeManager;
|
|
151
152
|
peers;
|
|
153
|
+
clients;
|
|
152
154
|
commissioner;
|
|
153
155
|
#construction;
|
|
154
156
|
#store;
|
|
@@ -192,24 +194,27 @@ class MatterController {
|
|
|
192
194
|
this.sessionManager.sessions.deleted.on(async (session) => {
|
|
193
195
|
this.sessionClosedCallback?.(session.peerNodeId);
|
|
194
196
|
});
|
|
197
|
+
const subscriptionClient = new SubscriptionClient();
|
|
195
198
|
this.exchangeManager = new ExchangeManager({
|
|
196
199
|
sessionManager: this.sessionManager,
|
|
197
200
|
channelManager: this.channelManager,
|
|
198
201
|
transportInterfaces: this.netInterfaces
|
|
199
202
|
});
|
|
200
203
|
this.exchangeManager.addProtocolHandler(new SecureChannelProtocol(this.sessionManager, fabricManager));
|
|
201
|
-
this.exchangeManager.addProtocolHandler(
|
|
204
|
+
this.exchangeManager.addProtocolHandler(subscriptionClient);
|
|
202
205
|
this.nodesStore = new CommissionedNodeStore(controllerStore, fabric);
|
|
203
206
|
this.nodesStore.peers = this.peers = new PeerSet({
|
|
204
207
|
sessions: this.sessionManager,
|
|
205
208
|
channels: this.channelManager,
|
|
206
209
|
exchanges: this.exchangeManager,
|
|
210
|
+
subscriptionClient,
|
|
207
211
|
scanners: this.scanners,
|
|
208
212
|
netInterfaces: this.netInterfaces,
|
|
209
213
|
store: this.nodesStore
|
|
210
214
|
});
|
|
215
|
+
this.clients = new InteractionClientProvider(this.peers);
|
|
211
216
|
this.commissioner = new ControllerCommissioner({
|
|
212
|
-
|
|
217
|
+
clients: this.clients,
|
|
213
218
|
scanners: this.scanners,
|
|
214
219
|
netInterfaces: this.netInterfaces,
|
|
215
220
|
exchanges: this.exchangeManager,
|
|
@@ -365,10 +370,10 @@ class MatterController {
|
|
|
365
370
|
* Returns a InteractionClient on success.
|
|
366
371
|
*/
|
|
367
372
|
async connect(peerNodeId, discoveryOptions, allowUnknownPeer) {
|
|
368
|
-
return this.
|
|
373
|
+
return this.clients.connect(this.fabric.addressOf(peerNodeId), discoveryOptions, allowUnknownPeer);
|
|
369
374
|
}
|
|
370
375
|
createInteractionClient(peerNodeId, discoveryOptions) {
|
|
371
|
-
return this.
|
|
376
|
+
return this.clients.getInteractionClient(this.fabric.addressOf(peerNodeId), discoveryOptions);
|
|
372
377
|
}
|
|
373
378
|
async getNextAvailableSessionId() {
|
|
374
379
|
return this.sessionManager.getNextAvailableSessionId();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/MatterController.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,17 +4,10 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { SupportedStorageTypes } from "@matter/general";
|
|
7
|
-
import { InteractionClient } from "@matter/protocol";
|
|
7
|
+
import { InteractionClient, PhysicalDeviceProperties } from "@matter/protocol";
|
|
8
8
|
import { NodeId } from "@matter/types";
|
|
9
9
|
import { Endpoint } from "./Endpoint.js";
|
|
10
|
-
export type DeviceMetaInformation = {
|
|
11
|
-
threadConnected: boolean;
|
|
12
|
-
wifiConnected: boolean;
|
|
13
|
-
ethernetConnected: boolean;
|
|
14
|
-
rootEndpointServerList: number[];
|
|
15
|
-
isBatteryPowered: boolean;
|
|
16
|
-
isIntermittentlyConnected: boolean;
|
|
17
|
-
isThreadSleepyEndDevice: boolean;
|
|
10
|
+
export type DeviceMetaInformation = PhysicalDeviceProperties & {
|
|
18
11
|
dataRevision: number;
|
|
19
12
|
};
|
|
20
13
|
export type DeviceBasicInformation = Record<string, SupportedStorageTypes>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceInformation.d.ts","sourceRoot":"","sources":["../../../src/device/DeviceInformation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,OAAO,EAAU,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAA4B,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"DeviceInformation.d.ts","sourceRoot":"","sources":["../../../src/device/DeviceInformation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,OAAO,EAAU,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAA4B,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAoC,MAAM,EAA4C,MAAM,eAAe,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAAG;IAC3D,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAE3E,MAAM,MAAM,qBAAqB,GAAG;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAItC,qBAAa,iBAAiB;;IAKtB,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM,EACvB,IAAI,EAAE,qBAAqB;IAM/B,IAAI,IAAI,sCAEP;IAED,IAAI,gBAAgB,uCAEnB;IAED,IAAI,KAAK,YAMR;IAEK,6BAA6B,CAAC,YAAY,EAAE,QAAQ;IAsGpD,8BAA8B,CAAC,iBAAiB,EAAE,iBAAiB;IAqIzE,+BAA+B,CAAC,OAAO,EAAE;QACrC,gCAAgC,CAAC,EAAE,MAAM,CAAC;QAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;KAC/C;;;;IAQD,aAAa,IAAI,qBAAqB;CAMzC"}
|
|
@@ -12,16 +12,10 @@ import {
|
|
|
12
12
|
ThreadNetworkDiagnostics
|
|
13
13
|
} from "#clusters";
|
|
14
14
|
import { Logger } from "@matter/general";
|
|
15
|
-
import { SupportedAttributeClient } from "@matter/protocol";
|
|
15
|
+
import { PhysicalDeviceProperties, SupportedAttributeClient } from "@matter/protocol";
|
|
16
16
|
import { EndpointNumber, GlobalAttributes } from "@matter/types";
|
|
17
17
|
const logger = Logger.get("DeviceInformation");
|
|
18
18
|
const DEVICE_DATA_REVISION = 1;
|
|
19
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S = 1;
|
|
20
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_ICD_S = 0;
|
|
21
|
-
const DEFAULT_SUBSCRIPTION_CEILING_WIFI_S = 60;
|
|
22
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_S = 60;
|
|
23
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S = 180;
|
|
24
|
-
const DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S = 600;
|
|
25
19
|
const GlobalAttributeKeys = Object.keys(GlobalAttributes({}));
|
|
26
20
|
class DeviceInformation {
|
|
27
21
|
constructor(nodeId, data) {
|
|
@@ -245,32 +239,11 @@ class DeviceInformation {
|
|
|
245
239
|
this.#deviceMeta = deviceData;
|
|
246
240
|
}
|
|
247
241
|
determineSubscriptionParameters(options) {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
if (isIntermittentlyConnected) {
|
|
254
|
-
if (minIntervalFloorSeconds !== void 0 && minIntervalFloorSeconds !== DEFAULT_SUBSCRIPTION_FLOOR_ICD_S) {
|
|
255
|
-
logger.info(
|
|
256
|
-
`Node ${this.nodeId}: Overwriting minIntervalFloorSeconds for intermittently connected device to 0`
|
|
257
|
-
);
|
|
258
|
-
minIntervalFloorSeconds = DEFAULT_SUBSCRIPTION_FLOOR_ICD_S;
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
const defaultCeiling = isBatteryPowered ? DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S : isThreadSleepyEndDevice ? DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S : threadConnected ? DEFAULT_SUBSCRIPTION_CEILING_THREAD_S : DEFAULT_SUBSCRIPTION_CEILING_WIFI_S;
|
|
262
|
-
if (maxIntervalCeilingSeconds === void 0) {
|
|
263
|
-
maxIntervalCeilingSeconds = defaultCeiling;
|
|
264
|
-
}
|
|
265
|
-
if (maxIntervalCeilingSeconds < defaultCeiling) {
|
|
266
|
-
logger.debug(
|
|
267
|
-
`Node ${this.nodeId}: maxIntervalCeilingSeconds should idealy be set to ${defaultCeiling}s instead of ${maxIntervalCeilingSeconds}s because of device type`
|
|
268
|
-
);
|
|
269
|
-
}
|
|
270
|
-
return {
|
|
271
|
-
minIntervalFloorSeconds: minIntervalFloorSeconds ?? DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S,
|
|
272
|
-
maxIntervalCeilingSeconds
|
|
273
|
-
};
|
|
242
|
+
return PhysicalDeviceProperties.determineSubscriptionParameters({
|
|
243
|
+
properties: this.#deviceMeta,
|
|
244
|
+
description: `Node ${this.nodeId}`,
|
|
245
|
+
...options
|
|
246
|
+
});
|
|
274
247
|
}
|
|
275
248
|
toStorageData() {
|
|
276
249
|
return {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device/DeviceInformation.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,cAAqC;AAC9C,SAA4B,gCAAgC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LegacyInteractionServer.d.ts","sourceRoot":"","sources":["../../../src/device/LegacyInteractionServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,SAAS,EAET,kBAAkB,EAElB,iBAAiB,EACjB,OAAO,EACP,eAAe,EACf,kBAAkB,EAGrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAkB,cAAc,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAKxE;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,iBAAiB;;gBAI9C,OAAO,EAAE,kBAAkB;cAmDpB,aAAa,CAC5B,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,OAAO,UAAQ;;;;cAiBM,SAAS,CAC9B,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,GAAG,SAAS,EACjE,KAAK,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC;cAKP,cAAc,CACnC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,CAAC,EAAE,OAAO,EACxC,WAAW,CAAC,EAAE,OAAO;cAeA,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,QAAQ,EAAE,eAAe,EACzB,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,UAAQ;;;;
|
|
1
|
+
{"version":3,"file":"LegacyInteractionServer.d.ts","sourceRoot":"","sources":["../../../src/device/LegacyInteractionServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,SAAS,EAET,kBAAkB,EAElB,iBAAiB,EACjB,OAAO,EACP,eAAe,EACf,kBAAkB,EAGrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAkB,cAAc,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAKxE;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,iBAAiB;;gBAI9C,OAAO,EAAE,kBAAkB;cAmDpB,aAAa,CAC5B,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAClC,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,EAChB,OAAO,UAAQ;;;;cAiBM,SAAS,CAC9B,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,cAAc,CAAC,OAAO,cAAc,CAAC,EAAE,GAAG,SAAS,EACjE,KAAK,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,QAAQ,EAAE,eAAe,EACzB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC;cAKP,cAAc,CACnC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,EAC/B,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,CAAC,EAAE,OAAO,EACxC,WAAW,CAAC,EAAE,OAAO;cAeA,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAChC,QAAQ,EAAE,eAAe,EACzB,aAAa,EAAE,GAAG,EAClB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,iBAAiB,EAC3B,8BAA8B,UAAQ;;;;yBAcmjB,QAAQ;;CADxmB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@project-chip/matter.js",
|
|
3
|
-
"version": "0.12.4-alpha.0-
|
|
3
|
+
"version": "0.12.4-alpha.0-20250224-e0964a795",
|
|
4
4
|
"description": "Matter protocol in pure js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -44,16 +44,16 @@
|
|
|
44
44
|
"#*": "./src/*"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@matter/general": "0.12.4-alpha.0-
|
|
48
|
-
"@matter/model": "0.12.4-alpha.0-
|
|
49
|
-
"@matter/node": "0.12.4-alpha.0-
|
|
50
|
-
"@matter/protocol": "0.12.4-alpha.0-
|
|
51
|
-
"@matter/types": "0.12.4-alpha.0-
|
|
47
|
+
"@matter/general": "0.12.4-alpha.0-20250224-e0964a795",
|
|
48
|
+
"@matter/model": "0.12.4-alpha.0-20250224-e0964a795",
|
|
49
|
+
"@matter/node": "0.12.4-alpha.0-20250224-e0964a795",
|
|
50
|
+
"@matter/protocol": "0.12.4-alpha.0-20250224-e0964a795",
|
|
51
|
+
"@matter/types": "0.12.4-alpha.0-20250224-e0964a795",
|
|
52
52
|
"@noble/curves": "^1.8.1"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@matter/tools": "0.12.4-alpha.0-
|
|
56
|
-
"@matter/testing": "0.12.4-alpha.0-
|
|
55
|
+
"@matter/tools": "0.12.4-alpha.0-20250224-e0964a795",
|
|
56
|
+
"@matter/testing": "0.12.4-alpha.0-20250224-e0964a795"
|
|
57
57
|
},
|
|
58
58
|
"files": [
|
|
59
59
|
"dist/**/*",
|
package/src/MatterController.ts
CHANGED
|
@@ -47,6 +47,7 @@ import {
|
|
|
47
47
|
FabricBuilder,
|
|
48
48
|
FabricManager,
|
|
49
49
|
InstanceBroadcaster,
|
|
50
|
+
InteractionClientProvider,
|
|
50
51
|
NodeDiscoveryType,
|
|
51
52
|
OperationalPeer,
|
|
52
53
|
PeerAddress,
|
|
@@ -225,6 +226,7 @@ export class MatterController {
|
|
|
225
226
|
private readonly channelManager = new ChannelManager(CONTROLLER_CONNECTIONS_PER_FABRIC_AND_NODE);
|
|
226
227
|
private readonly exchangeManager: ExchangeManager;
|
|
227
228
|
private readonly peers: PeerSet;
|
|
229
|
+
private readonly clients: InteractionClientProvider;
|
|
228
230
|
private readonly commissioner: ControllerCommissioner;
|
|
229
231
|
#construction: Construction<MatterController>;
|
|
230
232
|
|
|
@@ -283,13 +285,15 @@ export class MatterController {
|
|
|
283
285
|
this.sessionClosedCallback?.(session.peerNodeId);
|
|
284
286
|
});
|
|
285
287
|
|
|
288
|
+
const subscriptionClient = new SubscriptionClient();
|
|
289
|
+
|
|
286
290
|
this.exchangeManager = new ExchangeManager({
|
|
287
291
|
sessionManager: this.sessionManager,
|
|
288
292
|
channelManager: this.channelManager,
|
|
289
293
|
transportInterfaces: this.netInterfaces,
|
|
290
294
|
});
|
|
291
295
|
this.exchangeManager.addProtocolHandler(new SecureChannelProtocol(this.sessionManager, fabricManager));
|
|
292
|
-
this.exchangeManager.addProtocolHandler(
|
|
296
|
+
this.exchangeManager.addProtocolHandler(subscriptionClient);
|
|
293
297
|
|
|
294
298
|
// Adapts the historical storage format for MatterController to OperationalPeer objects
|
|
295
299
|
this.nodesStore = new CommissionedNodeStore(controllerStore, fabric);
|
|
@@ -298,13 +302,16 @@ export class MatterController {
|
|
|
298
302
|
sessions: this.sessionManager,
|
|
299
303
|
channels: this.channelManager,
|
|
300
304
|
exchanges: this.exchangeManager,
|
|
305
|
+
subscriptionClient,
|
|
301
306
|
scanners: this.scanners,
|
|
302
307
|
netInterfaces: this.netInterfaces,
|
|
303
308
|
store: this.nodesStore,
|
|
304
309
|
});
|
|
305
310
|
|
|
311
|
+
this.clients = new InteractionClientProvider(this.peers);
|
|
312
|
+
|
|
306
313
|
this.commissioner = new ControllerCommissioner({
|
|
307
|
-
|
|
314
|
+
clients: this.clients,
|
|
308
315
|
scanners: this.scanners,
|
|
309
316
|
netInterfaces: this.netInterfaces,
|
|
310
317
|
exchanges: this.exchangeManager,
|
|
@@ -494,11 +501,11 @@ export class MatterController {
|
|
|
494
501
|
* Returns a InteractionClient on success.
|
|
495
502
|
*/
|
|
496
503
|
async connect(peerNodeId: NodeId, discoveryOptions: DiscoveryOptions, allowUnknownPeer?: boolean) {
|
|
497
|
-
return this.
|
|
504
|
+
return this.clients.connect(this.fabric.addressOf(peerNodeId), discoveryOptions, allowUnknownPeer);
|
|
498
505
|
}
|
|
499
506
|
|
|
500
507
|
createInteractionClient(peerNodeId: NodeId, discoveryOptions: DiscoveryOptions) {
|
|
501
|
-
return this.
|
|
508
|
+
return this.clients.getInteractionClient(this.fabric.addressOf(peerNodeId), discoveryOptions);
|
|
502
509
|
}
|
|
503
510
|
|
|
504
511
|
async getNextAvailableSessionId() {
|
|
@@ -13,20 +13,13 @@ import {
|
|
|
13
13
|
ThreadNetworkDiagnostics,
|
|
14
14
|
} from "#clusters";
|
|
15
15
|
import { Logger, SupportedStorageTypes } from "@matter/general";
|
|
16
|
-
import { InteractionClient, SupportedAttributeClient } from "@matter/protocol";
|
|
16
|
+
import { InteractionClient, PhysicalDeviceProperties, SupportedAttributeClient } from "@matter/protocol";
|
|
17
17
|
import { EndpointNumber, GlobalAttributes, NodeId, TypeFromPartialBitSchema, TypeFromSchema } from "@matter/types";
|
|
18
18
|
import { Endpoint } from "./Endpoint.js";
|
|
19
19
|
|
|
20
20
|
const logger = Logger.get("DeviceInformation");
|
|
21
21
|
|
|
22
|
-
export type DeviceMetaInformation = {
|
|
23
|
-
threadConnected: boolean;
|
|
24
|
-
wifiConnected: boolean;
|
|
25
|
-
ethernetConnected: boolean;
|
|
26
|
-
rootEndpointServerList: number[];
|
|
27
|
-
isBatteryPowered: boolean;
|
|
28
|
-
isIntermittentlyConnected: boolean;
|
|
29
|
-
isThreadSleepyEndDevice: boolean;
|
|
22
|
+
export type DeviceMetaInformation = PhysicalDeviceProperties & {
|
|
30
23
|
dataRevision: number;
|
|
31
24
|
};
|
|
32
25
|
|
|
@@ -39,13 +32,6 @@ export type DeviceInformationData = {
|
|
|
39
32
|
|
|
40
33
|
export const DEVICE_DATA_REVISION = 1;
|
|
41
34
|
|
|
42
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S = 1;
|
|
43
|
-
const DEFAULT_SUBSCRIPTION_FLOOR_ICD_S = 0;
|
|
44
|
-
const DEFAULT_SUBSCRIPTION_CEILING_WIFI_S = 60;
|
|
45
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_S = 60;
|
|
46
|
-
const DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S = 180;
|
|
47
|
-
const DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S = 600;
|
|
48
|
-
|
|
49
35
|
const GlobalAttributeKeys = Object.keys(GlobalAttributes({}));
|
|
50
36
|
|
|
51
37
|
export class DeviceInformation {
|
|
@@ -315,43 +301,11 @@ export class DeviceInformation {
|
|
|
315
301
|
subscribeMinIntervalFloorSeconds?: number;
|
|
316
302
|
subscribeMaxIntervalCeilingSeconds?: number;
|
|
317
303
|
}) {
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
const { isBatteryPowered, isIntermittentlyConnected, threadConnected, isThreadSleepyEndDevice } =
|
|
324
|
-
this.#deviceMeta ?? {};
|
|
325
|
-
|
|
326
|
-
if (isIntermittentlyConnected) {
|
|
327
|
-
if (minIntervalFloorSeconds !== undefined && minIntervalFloorSeconds !== DEFAULT_SUBSCRIPTION_FLOOR_ICD_S) {
|
|
328
|
-
logger.info(
|
|
329
|
-
`Node ${this.nodeId}: Overwriting minIntervalFloorSeconds for intermittently connected device to 0`,
|
|
330
|
-
);
|
|
331
|
-
minIntervalFloorSeconds = DEFAULT_SUBSCRIPTION_FLOOR_ICD_S;
|
|
332
|
-
}
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
const defaultCeiling = isBatteryPowered
|
|
336
|
-
? DEFAULT_SUBSCRIPTION_CEILING_BATTERY_POWERED_S
|
|
337
|
-
: isThreadSleepyEndDevice
|
|
338
|
-
? DEFAULT_SUBSCRIPTION_CEILING_THREAD_SLEEPY_S
|
|
339
|
-
: threadConnected
|
|
340
|
-
? DEFAULT_SUBSCRIPTION_CEILING_THREAD_S
|
|
341
|
-
: DEFAULT_SUBSCRIPTION_CEILING_WIFI_S;
|
|
342
|
-
if (maxIntervalCeilingSeconds === undefined) {
|
|
343
|
-
maxIntervalCeilingSeconds = defaultCeiling;
|
|
344
|
-
}
|
|
345
|
-
if (maxIntervalCeilingSeconds < defaultCeiling) {
|
|
346
|
-
logger.debug(
|
|
347
|
-
`Node ${this.nodeId}: maxIntervalCeilingSeconds should idealy be set to ${defaultCeiling}s instead of ${maxIntervalCeilingSeconds}s because of device type`,
|
|
348
|
-
);
|
|
349
|
-
}
|
|
350
|
-
|
|
351
|
-
return {
|
|
352
|
-
minIntervalFloorSeconds: minIntervalFloorSeconds ?? DEFAULT_SUBSCRIPTION_FLOOR_DEFAULT_S,
|
|
353
|
-
maxIntervalCeilingSeconds,
|
|
354
|
-
};
|
|
304
|
+
return PhysicalDeviceProperties.determineSubscriptionParameters({
|
|
305
|
+
properties: this.#deviceMeta,
|
|
306
|
+
description: `Node ${this.nodeId}`,
|
|
307
|
+
...options,
|
|
308
|
+
});
|
|
355
309
|
}
|
|
356
310
|
|
|
357
311
|
toStorageData(): DeviceInformationData {
|