@matter/node 0.16.0-alpha.0-20251115-d89e62680 → 0.16.0-alpha.0-20251129-96ad07c6e
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/behavior/Events.js +1 -1
- package/dist/cjs/behavior/cluster/ClientBehavior.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehavior.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.d.ts +1 -1
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.js +3 -3
- package/dist/cjs/behavior/cluster/ClusterBehaviorType.js.map +1 -1
- package/dist/cjs/behavior/state/validation/ValueValidator.js +14 -4
- package/dist/cjs/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/cjs/behavior/state/validation/assertions.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/assertions.js +21 -0
- package/dist/cjs/behavior/state/validation/assertions.js.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js +1 -3
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/cjs/behavior/system/controller/ControllerBehavior.d.ts +2 -0
- package/dist/cjs/behavior/system/controller/ControllerBehavior.d.ts.map +1 -1
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js +5 -2
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts +1 -0
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js +8 -2
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +88 -34
- package/dist/cjs/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js +15 -2
- package/dist/cjs/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/cjs/behaviors/identify/IdentifyServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/identify/IdentifyServer.js +5 -0
- package/dist/cjs/behaviors/identify/IdentifyServer.js.map +1 -1
- package/dist/cjs/behaviors/service-area/ServiceAreaServer.js +1 -1
- package/dist/cjs/behaviors/switch/SwitchServer.js +2 -2
- package/dist/cjs/behaviors/thermostat/ThermostatServer.d.ts +10 -0
- package/dist/cjs/behaviors/thermostat/ThermostatServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/thermostat/ThermostatServer.js +59 -22
- package/dist/cjs/behaviors/thermostat/ThermostatServer.js.map +1 -1
- package/dist/cjs/endpoint/Endpoint.d.ts +2 -2
- package/dist/cjs/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/Endpoints.d.ts +2 -2
- package/dist/cjs/endpoint/properties/Endpoints.d.ts.map +1 -1
- package/dist/cjs/endpoint/properties/Endpoints.js +12 -1
- package/dist/cjs/endpoint/properties/Endpoints.js.map +1 -1
- package/dist/cjs/node/ClientNode.d.ts +7 -2
- package/dist/cjs/node/ClientNode.d.ts.map +1 -1
- package/dist/cjs/node/ClientNode.js +10 -3
- package/dist/cjs/node/ClientNode.js.map +1 -1
- package/dist/cjs/node/Node.d.ts.map +1 -1
- package/dist/cjs/node/Node.js +9 -3
- package/dist/cjs/node/Node.js.map +1 -1
- package/dist/cjs/node/NodeLifecycle.d.ts +1 -1
- package/dist/cjs/node/NodeLifecycle.js +1 -1
- package/dist/cjs/node/ServerNode.d.ts.map +1 -1
- package/dist/cjs/node/ServerNode.js +11 -4
- package/dist/cjs/node/ServerNode.js.map +1 -1
- package/dist/cjs/node/client/ClientEndpointInitializer.js +1 -1
- package/dist/cjs/node/client/ClientEndpointInitializer.js.map +1 -1
- package/dist/cjs/node/client/ClientEventEmitter.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientEventEmitter.js +8 -3
- package/dist/cjs/node/client/ClientEventEmitter.js.map +1 -1
- package/dist/cjs/node/client/ClientStructure.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientStructure.js +80 -96
- package/dist/cjs/node/client/ClientStructure.js.map +1 -1
- package/dist/cjs/node/client/Peers.d.ts.map +1 -1
- package/dist/cjs/node/client/Peers.js +22 -4
- package/dist/cjs/node/client/Peers.js.map +1 -1
- package/dist/cjs/node/server/ServerEnvironment.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerEnvironment.js +0 -3
- package/dist/cjs/node/server/ServerEnvironment.js.map +1 -1
- package/dist/esm/behavior/Events.js +1 -1
- package/dist/esm/behavior/cluster/ClientBehavior.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterBehavior.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorType.d.ts +1 -1
- package/dist/esm/behavior/cluster/ClusterBehaviorType.js +3 -3
- package/dist/esm/behavior/cluster/ClusterBehaviorType.js.map +1 -1
- package/dist/esm/behavior/state/validation/ValueValidator.js +14 -4
- package/dist/esm/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/esm/behavior/state/validation/assertions.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/assertions.js +22 -1
- package/dist/esm/behavior/state/validation/assertions.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js +1 -3
- package/dist/esm/behavior/system/commissioning/CommissioningClient.js.map +1 -1
- package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts +2 -0
- package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts.map +1 -1
- package/dist/esm/behavior/system/controller/ControllerBehavior.js +5 -2
- package/dist/esm/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts +1 -0
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js +8 -2
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js +88 -34
- package/dist/esm/behaviors/general-diagnostics/GeneralDiagnosticsServer.js.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.d.ts.map +1 -1
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js +16 -3
- package/dist/esm/behaviors/group-key-management/GroupKeyManagementServer.js.map +1 -1
- package/dist/esm/behaviors/identify/IdentifyServer.d.ts.map +1 -1
- package/dist/esm/behaviors/identify/IdentifyServer.js +5 -0
- package/dist/esm/behaviors/identify/IdentifyServer.js.map +1 -1
- package/dist/esm/behaviors/service-area/ServiceAreaServer.js +1 -1
- package/dist/esm/behaviors/switch/SwitchServer.js +2 -2
- package/dist/esm/behaviors/thermostat/ThermostatServer.d.ts +10 -0
- package/dist/esm/behaviors/thermostat/ThermostatServer.d.ts.map +1 -1
- package/dist/esm/behaviors/thermostat/ThermostatServer.js +59 -22
- package/dist/esm/behaviors/thermostat/ThermostatServer.js.map +1 -1
- package/dist/esm/endpoint/Endpoint.d.ts +2 -2
- package/dist/esm/endpoint/Endpoint.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/Endpoints.d.ts +2 -2
- package/dist/esm/endpoint/properties/Endpoints.d.ts.map +1 -1
- package/dist/esm/endpoint/properties/Endpoints.js +12 -1
- package/dist/esm/endpoint/properties/Endpoints.js.map +1 -1
- package/dist/esm/node/ClientNode.d.ts +7 -2
- package/dist/esm/node/ClientNode.d.ts.map +1 -1
- package/dist/esm/node/ClientNode.js +10 -3
- package/dist/esm/node/ClientNode.js.map +1 -1
- package/dist/esm/node/Node.d.ts.map +1 -1
- package/dist/esm/node/Node.js +9 -3
- package/dist/esm/node/Node.js.map +1 -1
- package/dist/esm/node/NodeLifecycle.d.ts +1 -1
- package/dist/esm/node/NodeLifecycle.js +1 -1
- package/dist/esm/node/ServerNode.d.ts.map +1 -1
- package/dist/esm/node/ServerNode.js +11 -4
- package/dist/esm/node/ServerNode.js.map +1 -1
- package/dist/esm/node/client/ClientEndpointInitializer.js +1 -1
- package/dist/esm/node/client/ClientEndpointInitializer.js.map +1 -1
- package/dist/esm/node/client/ClientEventEmitter.d.ts.map +1 -1
- package/dist/esm/node/client/ClientEventEmitter.js +9 -4
- package/dist/esm/node/client/ClientEventEmitter.js.map +1 -1
- package/dist/esm/node/client/ClientStructure.d.ts.map +1 -1
- package/dist/esm/node/client/ClientStructure.js +80 -96
- package/dist/esm/node/client/ClientStructure.js.map +1 -1
- package/dist/esm/node/client/Peers.d.ts.map +1 -1
- package/dist/esm/node/client/Peers.js +24 -5
- package/dist/esm/node/client/Peers.js.map +1 -1
- package/dist/esm/node/server/ServerEnvironment.d.ts.map +1 -1
- package/dist/esm/node/server/ServerEnvironment.js +1 -4
- package/dist/esm/node/server/ServerEnvironment.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/Events.ts +1 -1
- package/src/behavior/cluster/ClientBehavior.ts +1 -1
- package/src/behavior/cluster/ClusterBehavior.ts +1 -1
- package/src/behavior/cluster/ClusterBehaviorType.ts +4 -5
- package/src/behavior/cluster/ValidatedElements.ts +1 -1
- package/src/behavior/state/validation/ValueValidator.ts +16 -4
- package/src/behavior/state/validation/assertions.ts +27 -1
- package/src/behavior/system/commissioning/CommissioningClient.ts +2 -4
- package/src/behavior/system/controller/ControllerBehavior.ts +8 -3
- package/src/behavior/system/network/ServerNetworkRuntime.ts +11 -2
- package/src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts +2 -1
- package/src/behaviors/group-key-management/GroupKeyManagementServer.ts +19 -3
- package/src/behaviors/identify/IdentifyServer.ts +9 -0
- package/src/behaviors/service-area/ServiceAreaServer.ts +1 -1
- package/src/behaviors/switch/SwitchServer.ts +2 -2
- package/src/behaviors/thermostat/ThermostatServer.ts +65 -22
- package/src/endpoint/Endpoint.ts +2 -2
- package/src/endpoint/properties/Endpoints.ts +16 -3
- package/src/node/ClientNode.ts +11 -4
- package/src/node/Node.ts +10 -3
- package/src/node/NodeLifecycle.ts +1 -1
- package/src/node/ServerNode.ts +12 -4
- package/src/node/client/ClientEndpointInitializer.ts +1 -1
- package/src/node/client/ClientEventEmitter.ts +9 -4
- package/src/node/client/ClientStructure.ts +67 -22
- package/src/node/client/Peers.ts +31 -4
- package/src/node/server/ServerEnvironment.ts +1 -6
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/state/validation/ValueValidator.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/assertions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"assertions.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/state/validation/assertions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAoC,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAoC,GAAG,EAAE,MAAM,WAAW,CAAC;AAGlE,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAKvF;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAKxF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,CAK3F;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,GAAG,MAAM,CAKjG;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,CAKvF;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAKrF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,MAAM,GAAG,KAAK,CAKjG;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,IAAI,GAAG,EAAE,CAIrF;AAED,eAAO,MAAM,SAAS;IAClB;;OAEG;iBACgB,MAAM,CAAC,MAAM,EAAE,OAAO,aAAa,GAAG,SAAS,CAAC;IAEnE;;;;;OAKG;cACa,MAAM,CAAC,MAAM,EAAE,OAAO,aAAa,GAAG,SAAS,CAAC;CACnE,CAAC"}
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Bytes, isObject } from "#general";
|
|
6
|
+
import { Bytes, isObject, UINT32_MAX, UINT64_MAX } from "#general";
|
|
7
7
|
import { DatatypeError, IntegerRangeError } from "#protocol";
|
|
8
|
+
import { MATTER_EPOCH_OFFSET_S, MATTER_EPOCH_OFFSET_US } from "@matter/types";
|
|
8
9
|
function assertNumber(value, path) {
|
|
9
10
|
if (Number.isFinite(value)) {
|
|
10
11
|
return;
|
|
@@ -78,6 +79,26 @@ for (let i = 1n; i < 9n; i++) {
|
|
|
78
79
|
assertInt.notNullable[intName] = createIntAssertion(intName, signedMin, signedMax);
|
|
79
80
|
assertInt.nullable[intName] = createIntAssertion(`nullable ${intName}`, signedMin + 1n, signedMax);
|
|
80
81
|
}
|
|
82
|
+
assertInt.notNullable["epoch-s"] = createIntAssertion(
|
|
83
|
+
"epoch-s",
|
|
84
|
+
BigInt(MATTER_EPOCH_OFFSET_S),
|
|
85
|
+
BigInt(UINT32_MAX + MATTER_EPOCH_OFFSET_S)
|
|
86
|
+
);
|
|
87
|
+
assertInt.nullable["epoch-s"] = createIntAssertion(
|
|
88
|
+
`nullable epoch-s`,
|
|
89
|
+
BigInt(MATTER_EPOCH_OFFSET_S),
|
|
90
|
+
BigInt(UINT32_MAX + MATTER_EPOCH_OFFSET_S) - 1n
|
|
91
|
+
);
|
|
92
|
+
assertInt.notNullable["epoch-us"] = createIntAssertion(
|
|
93
|
+
"epoch-us",
|
|
94
|
+
MATTER_EPOCH_OFFSET_US,
|
|
95
|
+
UINT64_MAX + MATTER_EPOCH_OFFSET_US
|
|
96
|
+
);
|
|
97
|
+
assertInt.nullable["epoch-us"] = createIntAssertion(
|
|
98
|
+
`nullable epoch-us`,
|
|
99
|
+
MATTER_EPOCH_OFFSET_US,
|
|
100
|
+
UINT64_MAX + MATTER_EPOCH_OFFSET_US - 1n
|
|
101
|
+
);
|
|
81
102
|
function createIntAssertion(name, lowerBoundInclusive, upperBoundExclusive) {
|
|
82
103
|
if (lowerBoundInclusive < Number.MIN_SAFE_INTEGER || upperBoundExclusive > Number.MAX_SAFE_INTEGER) {
|
|
83
104
|
return createVarIntAssertion(name, lowerBoundInclusive, upperBoundExclusive);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/state/validation/assertions.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAO,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["assertInt"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAEH,QAAQ,EAKR,UAAU,EACV,aAAa,EAEb,SAAS,EACZ,MAAM,UAAU,CAAC;AAiBlB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAEH,iBAAiB,EAEjB,aAAa,EACb,MAAM,EACN,eAAe,EAGf,WAAW,IAAI,mBAAmB,EAClC,gBAAgB,IAAI,wBAAwB,EAC5C,SAAS,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,oBAAoB,EACpB,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EAEX,MAAM,EACN,wBAAwB,EACxB,QAAQ,EACX,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IACrC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IAE3C,gBAAyB,KAAK,QAAQ;IAEtC,gBAAyB,EAAE,mBAAmB;IAErC,UAAU,CAAC,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,gBAAgB,CAAA;KAAE;IAc9D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAEjD,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -175,9 +175,7 @@ class CommissioningClient extends Behavior {
|
|
|
175
175
|
await this.context.transaction.commit();
|
|
176
176
|
const network = this.agent.get(NetworkClient);
|
|
177
177
|
network.state.defaultSubscription = opts.defaultSubscription;
|
|
178
|
-
|
|
179
|
-
network.state.autoSubscribe = opts.autoSubscribe ?? true;
|
|
180
|
-
}
|
|
178
|
+
network.state.autoSubscribe = opts.autoSubscribe !== false;
|
|
181
179
|
network.state.caseAuthenticatedTags = opts.caseAuthenticatedTags;
|
|
182
180
|
logger.notice(
|
|
183
181
|
"Commissioned",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["CommissioningClient", "_init", "_ttl_dec", "_discoveredAt_dec", "nodeId"]
|
|
6
6
|
}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Behavior } from "#behavior/Behavior.js";
|
|
7
|
+
import { SharedEnvironmentServices } from "#general";
|
|
7
8
|
import { FabricAuthorityConfiguration, MdnsScannerTargetCriteria } from "#protocol";
|
|
8
9
|
import { CaseAuthenticatedTag, FabricId, NodeId } from "#types";
|
|
9
10
|
/**
|
|
@@ -29,6 +30,7 @@ export declare namespace ControllerBehavior {
|
|
|
29
30
|
* MDNS scanner criteria for each controlled fabric (keyed by operational ID).
|
|
30
31
|
*/
|
|
31
32
|
mdnsTargetCriteria: MdnsScannerTargetCriteria;
|
|
33
|
+
services?: SharedEnvironmentServices;
|
|
32
34
|
}
|
|
33
35
|
class State {
|
|
34
36
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAA2D,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE9G,OAAO,EAKH,4BAA4B,EAG5B,yBAAyB,EAI5B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAShE;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,QAAQ;;IAC5C,gBAAyB,EAAE,gBAAgB;IAEnC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAEzB,UAAU;IAiDV,CAAC,MAAM,CAAC,YAAY,CAAC;IAOpC,IAAI,qBAAqB,IAAI,4BAA4B,CAMxD;CAsDJ;AAED,yBAAiB,kBAAkB,CAAC;IAChC,MAAa,QAAQ;QACjB;;WAEG;QACH,kBAAkB,EAAE,yBAAyB,CAG3C;QAEF,QAAQ,CAAC,EAAE,yBAAyB,CAAC;KACxC;IAED,MAAa,KAAK;QACd;;;;WAIG;QACH,GAAG,CAAC,EAAE,OAAO,CAAa;QAE1B;;;;WAIG;QACH,EAAE,CAAC,EAAE,OAAO,CAAa;QAEzB;;WAEG;QACH,gBAAgB,SAAe;QAE/B;;;;WAIG;QACH,aAAa,CAAC,EAAE,QAAQ,CAAa;QAErC;;;;WAIG;QACH,WAAW,CAAC,EAAE,MAAM,CAAa;QAEjC;;WAEG;QACH,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAa;KAC9D;CACJ"}
|
|
@@ -26,11 +26,13 @@ class ControllerBehavior extends Behavior {
|
|
|
26
26
|
if (this.state.adminFabricLabel === void 0 || this.state.adminFabricLabel === "") {
|
|
27
27
|
throw new ImplementationError("adminFabricLabel must be set for ControllerBehavior");
|
|
28
28
|
}
|
|
29
|
+
const node = Node.forEndpoint(this.endpoint);
|
|
29
30
|
if (this.state.ip === void 0) {
|
|
30
31
|
this.state.ip = true;
|
|
31
32
|
}
|
|
32
33
|
if (this.state.ip !== false) {
|
|
33
|
-
this.
|
|
34
|
+
this.internal.services = this.env.asDependent();
|
|
35
|
+
this.env.get(ScannerSet).add((await this.internal.services.load(MdnsService)).client);
|
|
34
36
|
}
|
|
35
37
|
if (this.state.ble === void 0) {
|
|
36
38
|
this.state.ble = (await this.agent.load(NetworkServer)).state.ble;
|
|
@@ -52,7 +54,6 @@ class ControllerBehavior extends Behavior {
|
|
|
52
54
|
commissioning.state.enabled = false;
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
|
-
const node = Node.forEndpoint(this.endpoint);
|
|
56
57
|
this.reactTo(node.lifecycle.online, this.#nodeOnline);
|
|
57
58
|
if (node.lifecycle.isOnline) {
|
|
58
59
|
this.#nodeOnline();
|
|
@@ -63,6 +64,7 @@ class ControllerBehavior extends Behavior {
|
|
|
63
64
|
await this.env.close(ActiveDiscoveries);
|
|
64
65
|
this.env.delete(FabricAuthority);
|
|
65
66
|
this.env.delete(ScannerSet);
|
|
67
|
+
await this.internal.services?.close();
|
|
66
68
|
}
|
|
67
69
|
get fabricAuthorityConfig() {
|
|
68
70
|
const biState = this.endpoint.stateOf(BasicInformationBehavior);
|
|
@@ -120,6 +122,7 @@ class ControllerBehavior extends Behavior {
|
|
|
120
122
|
commissionable: true,
|
|
121
123
|
operationalTargets: []
|
|
122
124
|
};
|
|
125
|
+
services;
|
|
123
126
|
}
|
|
124
127
|
ControllerBehavior2.Internal = Internal;
|
|
125
128
|
class State {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,gBAAgB;AACzB,SAAS,gCAAgC;AACzC,SAAS,4BAA4B,qBAAqB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ControllerBehavior"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,uBAAuB,EACvB,0BAA0B,EAK1B,gBAAgB,EAChB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"ServerNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,uBAAuB,EACvB,0BAA0B,EAK1B,gBAAgB,EAChB,wBAAwB,EAK3B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAGH,aAAa,EAEb,gBAAgB,EAGhB,cAAc,EAMjB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAcrD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;gBASxC,KAAK,EAAE,UAAU;IAK7B,IAAa,KAAK,IACQ,UAAU,CACnC;IAED;;OAEG;IACH,IAAI,cAAc,mBASjB;IAED,IAAI,6BAA6B,IAAI,gBAAgB,EAAE,CAUtD;IAEK,oBAAoB,IAAI,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAcjE;;OAEG;IACH,SAAS,KAAK,aAAa,kBAO1B;IAED;;OAEG;IACH,SAAS,KAAK,YAAY,4BAKzB;IAED;;OAEG;cACa,aAAa,CAAC,UAAU,EAAE,0BAA0B;IAyCpE;;OAEG;cACa,eAAe,CAAC,UAAU,EAAE,gBAAgB;IAqB5D;;OAEG;IACH,oBAAoB;IASpB;;;;OAIG;IACH,qBAAqB;cA+BI,KAAK;cA0DL,IAAI;CA2ChC"}
|
|
@@ -48,6 +48,11 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
48
48
|
#ipv6UdpInterface;
|
|
49
49
|
#observers = new ObserverGroup(this);
|
|
50
50
|
#groupNetworking;
|
|
51
|
+
#services;
|
|
52
|
+
constructor(owner) {
|
|
53
|
+
super(owner);
|
|
54
|
+
this.#services = owner.env.asDependent();
|
|
55
|
+
}
|
|
51
56
|
get owner() {
|
|
52
57
|
return super.owner;
|
|
53
58
|
}
|
|
@@ -59,7 +64,7 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
59
64
|
const port = this.owner.state.network.operationalPort;
|
|
60
65
|
const options = this.owner.state.commissioning.mdns;
|
|
61
66
|
const crypto = this.owner.env.get(Crypto);
|
|
62
|
-
const { server } = this.
|
|
67
|
+
const { server } = this.#services.get(MdnsService);
|
|
63
68
|
this.#mdnsAdvertiser = new MdnsAdvertiser(crypto, server, { ...options, port });
|
|
64
69
|
}
|
|
65
70
|
return this.#mdnsAdvertiser;
|
|
@@ -206,7 +211,7 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
206
211
|
const { env } = owner;
|
|
207
212
|
const interfaces = env.get(ConnectionlessTransportSet);
|
|
208
213
|
await this.addTransports(interfaces);
|
|
209
|
-
const mdns = await
|
|
214
|
+
const mdns = await this.#services.load(MdnsService);
|
|
210
215
|
const advertiser = env.get(DeviceAdvertiser);
|
|
211
216
|
await this.addBroadcasters(advertiser);
|
|
212
217
|
await owner.act("start-network", (agent) => agent.load(ProductDescriptionServer));
|
|
@@ -243,6 +248,7 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
243
248
|
this.#groupNetworking?.close();
|
|
244
249
|
this.#groupNetworking = void 0;
|
|
245
250
|
await advertisementShutdown;
|
|
251
|
+
await this.#services.close();
|
|
246
252
|
await env.close(ExchangeManager);
|
|
247
253
|
await env.close(SecureChannelProtocol);
|
|
248
254
|
await env.close(ConnectionlessTransportSet);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EAEI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneralDiagnosticsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAKhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EACH,KAAK,EACL,QAAQ,EAKR,YAAY,EAKZ,KAAK,EAER,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAkC,GAAG,EAAE,MAAM,WAAW,CAAC;AAOhE,QAAA,MAAM,IAAI,0TAA4E,CAAC;AAQvF;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,wBAAyB,SAAQ,IAAI;;IAC9C,UAAkB,QAAQ,EAAE,wBAAwB,CAAC,QAAQ,CAAC;IACtD,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC;IAC9C,gBAAyB,MAAM,gCAAU;IAEhC,UAAU,IAAI,YAAY;IAyC1B,gBAAgB,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,kBAAkB,CAAC,uBAAuB,GAAG,YAAY;IAMhH,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI/C,YAAY,IAAI,YAAY,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;IAkBrE,kBAAkB,CAAC,EACxB,SAAS,EACT,KAAK,EACL,KAAK,GACR,EAAE,kBAAkB,CAAC,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;IA6C/F;;;;;;OAMG;IACH,qBAAqB,CAAC,SAAS,EAAE,kBAAkB,CAAC,aAAa;IAOjE;;;;;OAKG;IACH,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC,aAAa;IAkB9D;;;;;;OAMG;IACH,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC,UAAU;IAO3D;;;;;OAKG;IACH,eAAe,CAAC,SAAS,EAAE,kBAAkB,CAAC,UAAU;IAkBxD;;;;;;OAMG;IACH,oBAAoB,CAAC,SAAS,EAAE,kBAAkB,CAAC,YAAY;IAO/D;;;;;OAKG;IACH,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"GeneralDiagnosticsServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,48 @@
|
|
|
1
|
+
var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
|
|
2
|
+
var __typeError = (msg) => {
|
|
3
|
+
throw TypeError(msg);
|
|
4
|
+
};
|
|
5
|
+
var __using = (stack, value, async) => {
|
|
6
|
+
if (value != null) {
|
|
7
|
+
if (typeof value !== "object" && typeof value !== "function") __typeError("Object expected");
|
|
8
|
+
var dispose, inner;
|
|
9
|
+
if (async) dispose = value[__knownSymbol("asyncDispose")];
|
|
10
|
+
if (dispose === void 0) {
|
|
11
|
+
dispose = value[__knownSymbol("dispose")];
|
|
12
|
+
if (async) inner = dispose;
|
|
13
|
+
}
|
|
14
|
+
if (typeof dispose !== "function") __typeError("Object not disposable");
|
|
15
|
+
if (inner) dispose = function() {
|
|
16
|
+
try {
|
|
17
|
+
inner.call(this);
|
|
18
|
+
} catch (e) {
|
|
19
|
+
return Promise.reject(e);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
stack.push([async, dispose, value]);
|
|
23
|
+
} else if (async) {
|
|
24
|
+
stack.push([async]);
|
|
25
|
+
}
|
|
26
|
+
return value;
|
|
27
|
+
};
|
|
28
|
+
var __callDispose = (stack, error, hasError) => {
|
|
29
|
+
var E = typeof SuppressedError === "function" ? SuppressedError : function(e, s, m, _) {
|
|
30
|
+
return _ = Error(m), _.name = "SuppressedError", _.error = e, _.suppressed = s, _;
|
|
31
|
+
};
|
|
32
|
+
var fail = (e) => error = hasError ? new E(e, error, "An error was suppressed during disposal") : (hasError = true, e);
|
|
33
|
+
var next = (it) => {
|
|
34
|
+
while (it = stack.pop()) {
|
|
35
|
+
try {
|
|
36
|
+
var result = it[1] && it[1].call(it[2]);
|
|
37
|
+
if (it[0]) return Promise.resolve(result).then(next, (e) => (fail(e), next()));
|
|
38
|
+
} catch (e) {
|
|
39
|
+
fail(e);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (hasError) throw error;
|
|
43
|
+
};
|
|
44
|
+
return next();
|
|
45
|
+
};
|
|
1
46
|
/**
|
|
2
47
|
* @license
|
|
3
48
|
* Copyright 2022-2025 Matter.js Authors
|
|
@@ -240,42 +285,51 @@ class GeneralDiagnosticsServer extends Base {
|
|
|
240
285
|
this.internal.lastTotalOperationalHoursCounterUpdateTime = now;
|
|
241
286
|
}
|
|
242
287
|
async #updateNetworkList() {
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
const
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
288
|
+
var _stack = [];
|
|
289
|
+
try {
|
|
290
|
+
const services = __using(_stack, this.env.asDependent(), true);
|
|
291
|
+
const mdnsService = services.get(MdnsService);
|
|
292
|
+
const mdnsLimitedToNetworkInterfaces = mdnsService.limitedToNetInterface;
|
|
293
|
+
const networkRuntime = this.env.get(NetworkRuntime);
|
|
294
|
+
const systemNetworkInterfaces = await networkRuntime.getNetworkInterfaces();
|
|
295
|
+
let networkType = GeneralDiagnostics.InterfaceType.Ethernet;
|
|
296
|
+
if (this.endpoint.behaviors.has(NetworkCommissioningServer)) {
|
|
297
|
+
const networkCommissioning = this.agent.get(NetworkCommissioningServer);
|
|
298
|
+
if ("wiFiNetworkInterface" in networkCommissioning.features && networkCommissioning.features.wiFiNetworkInterface) {
|
|
299
|
+
networkType = GeneralDiagnostics.InterfaceType.WiFi;
|
|
300
|
+
} else if ("threadNetworkInterface" in networkCommissioning.features && networkCommissioning.features.threadNetworkInterface) {
|
|
301
|
+
networkType = GeneralDiagnostics.InterfaceType.Thread;
|
|
302
|
+
}
|
|
254
303
|
}
|
|
304
|
+
const isOperationalReachable = mdnsLimitedToNetworkInterfaces === void 0 ? () => true : (name) => {
|
|
305
|
+
return name === mdnsLimitedToNetworkInterfaces;
|
|
306
|
+
};
|
|
307
|
+
this.state.networkInterfaces = systemNetworkInterfaces.filter(({ mac }) => mac !== "00:00:00:00:00:00").sort(({ name: nameA }, { name: nameB }) => {
|
|
308
|
+
if (isOperationalReachable(nameA) && !isOperationalReachable(nameB)) {
|
|
309
|
+
return -1;
|
|
310
|
+
}
|
|
311
|
+
if (!isOperationalReachable(nameA) && isOperationalReachable(nameB)) {
|
|
312
|
+
return 1;
|
|
313
|
+
}
|
|
314
|
+
return 0;
|
|
315
|
+
}).slice(0, 8).map(({ name, mac, ipV4, ipV6, type }) => ({
|
|
316
|
+
name: name.substring(0, 32),
|
|
317
|
+
isOperational: isOperationalReachable(name),
|
|
318
|
+
offPremiseServicesReachableIPv4: null,
|
|
319
|
+
// null means unknown or not supported
|
|
320
|
+
offPremiseServicesReachableIPv6: null,
|
|
321
|
+
// null means unknown or not supported
|
|
322
|
+
hardwareAddress: Bytes.fromHex(mac.replace(/[^\da-f]/gi, "")),
|
|
323
|
+
iPv4Addresses: ipV4.slice(0, 4).map((ip) => ipv4ToBytes(ip)),
|
|
324
|
+
iPv6Addresses: ipV6.slice(0, 8).map((ip) => ipv4ToBytes(ip)),
|
|
325
|
+
type: type ?? networkType
|
|
326
|
+
}));
|
|
327
|
+
} catch (_) {
|
|
328
|
+
var _error = _, _hasError = true;
|
|
329
|
+
} finally {
|
|
330
|
+
var _promise = __callDispose(_stack, _error, _hasError);
|
|
331
|
+
_promise && await _promise;
|
|
255
332
|
}
|
|
256
|
-
const isOperationalReachable = mdnsLimitedToNetworkInterfaces === void 0 ? () => true : (name) => {
|
|
257
|
-
return name === mdnsLimitedToNetworkInterfaces;
|
|
258
|
-
};
|
|
259
|
-
this.state.networkInterfaces = systemNetworkInterfaces.filter(({ mac }) => mac !== "00:00:00:00:00:00").sort(({ name: nameA }, { name: nameB }) => {
|
|
260
|
-
if (isOperationalReachable(nameA) && !isOperationalReachable(nameB)) {
|
|
261
|
-
return -1;
|
|
262
|
-
}
|
|
263
|
-
if (!isOperationalReachable(nameA) && isOperationalReachable(nameB)) {
|
|
264
|
-
return 1;
|
|
265
|
-
}
|
|
266
|
-
return 0;
|
|
267
|
-
}).slice(0, 8).map(({ name, mac, ipV4, ipV6, type }) => ({
|
|
268
|
-
name: name.substring(0, 32),
|
|
269
|
-
isOperational: isOperationalReachable(name),
|
|
270
|
-
offPremiseServicesReachableIPv4: null,
|
|
271
|
-
// null means unknown or not supported
|
|
272
|
-
offPremiseServicesReachableIPv6: null,
|
|
273
|
-
// null means unknown or not supported
|
|
274
|
-
hardwareAddress: Bytes.fromHex(mac.replace(/[^\da-f]/gi, "")),
|
|
275
|
-
iPv4Addresses: ipV4.slice(0, 4).map((ip) => ipv4ToBytes(ip)),
|
|
276
|
-
iPv6Addresses: ipV6.slice(0, 8).map((ip) => ipv4ToBytes(ip)),
|
|
277
|
-
type: type ?? networkType
|
|
278
|
-
}));
|
|
279
333
|
}
|
|
280
334
|
}
|
|
281
335
|
((GeneralDiagnosticsServer2) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/general-diagnostics/GeneralDiagnosticsServer.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["GeneralDiagnosticsServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAqB,MAAM,
|
|
1
|
+
{"version":3,"file":"GroupKeyManagementServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/group-key-management/GroupKeyManagementServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAyC,YAAY,EAAE,MAAM,UAAU,CAAC;AAG/E,OAAO,EAAqB,MAAM,EAA+D,MAAM,WAAW,CAAC;AACnH,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAmC,MAAM,QAAQ,CAAC;AAC/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AA6B7E;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,0BAA0B;;IAC5D,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC;IAC9C,gBAAyB,MAAM,gCAAU;IAEhC,UAAU,IAAI,YAAY;IAgOpB,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,kBAAkB,CAAC,kBAAkB;IAuGxE,UAAU,CAAC,EAChB,aAAa,GAChB,EAAE,kBAAkB,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,kBAAkB;IAqBhE,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,kBAAkB,CAAC,mBAAmB;IA6B5E,oBAAoB,IAAI,kBAAkB,CAAC,4BAA4B;IAgBhF,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAsC1G;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO;CA4BzF;AAED,yBAAiB,wBAAwB,CAAC;IACtC,MAAa,KAAM,SAAQ,0BAA0B,CAAC,KAAK;QACvD;;;WAGG;QACH,YAAY,EAAE,CAAC,kBAAkB,CAAC,WAAW,GAAG;YAAE,WAAW,EAAE,WAAW,CAAA;SAAE,CAAC,EAAE,CAAM;QAG5E,qBAAqB,SAAM;QAC3B,kBAAkB,SAAM;KACpC;CACJ"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { GroupKeyManagement } from "#clusters/group-key-management";
|
|
7
7
|
import { deepCopy, ImplementationError, Logger } from "#general";
|
|
8
8
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
|
-
import { assertRemoteActor, FabricManager, hasRemoteActor } from "#protocol";
|
|
9
|
+
import { assertRemoteActor, FabricManager, hasRemoteActor, IPK_DEFAULT_EPOCH_START_TIME } from "#protocol";
|
|
10
10
|
import { GroupId, StatusCode, StatusResponseError } from "#types";
|
|
11
11
|
import { GroupKeyManagementBehavior } from "./GroupKeyManagementBehavior.js";
|
|
12
12
|
const logger = Logger.get("GroupKeyManagementServer");
|
|
@@ -62,12 +62,25 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
62
62
|
this.reactTo(fabrics.events.updated, this.#handleFabricUpdate);
|
|
63
63
|
if (this.state.groupKeySets.length) {
|
|
64
64
|
const groupKeysForFabric = /* @__PURE__ */ new Map();
|
|
65
|
-
|
|
65
|
+
const groupKeySets = deepCopy(this.state.groupKeySets);
|
|
66
|
+
for (let i = 0; i < groupKeySets.length; i++) {
|
|
67
|
+
const groupKeySet = groupKeySets[i];
|
|
66
68
|
const fabricIndex = groupKeySet.fabricIndex;
|
|
67
69
|
const keys = groupKeysForFabric.get(fabricIndex) ?? [];
|
|
70
|
+
if (keys.length === 0 && !fabrics.has(fabricIndex)) {
|
|
71
|
+
logger.warn(
|
|
72
|
+
`Stored GroupKeySets for FabricIndex ${fabricIndex}, but no such fabric exists anymore. Cleaning up stale entries.`
|
|
73
|
+
);
|
|
74
|
+
groupKeySets.splice(i, 1);
|
|
75
|
+
i--;
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
68
78
|
keys.push(groupKeySet);
|
|
69
79
|
groupKeysForFabric.set(fabricIndex, keys);
|
|
70
80
|
}
|
|
81
|
+
if (groupKeySets.length !== this.state.groupKeySets.length) {
|
|
82
|
+
this.state.groupKeySets = groupKeySets;
|
|
83
|
+
}
|
|
71
84
|
for (const [fabricIndex, keys] of groupKeysForFabric.entries()) {
|
|
72
85
|
const fabric = fabrics.for(fabricIndex);
|
|
73
86
|
for (const groupKeySet of keys) {
|
|
@@ -223,7 +236,7 @@ class GroupKeyManagementServer extends GroupKeyManagementBehavior {
|
|
|
223
236
|
if (epochKey0 === null || epochStartTime0 === null) {
|
|
224
237
|
throw new StatusResponseError("EpochKey0 and EpochStartTime0 must be set", StatusCode.InvalidCommand);
|
|
225
238
|
}
|
|
226
|
-
if (epochStartTime0
|
|
239
|
+
if (epochStartTime0 <= IPK_DEFAULT_EPOCH_START_TIME) {
|
|
227
240
|
throw new StatusResponseError("EpochStartTime0 must not be 0", StatusCode.InvalidCommand);
|
|
228
241
|
}
|
|
229
242
|
if (epochKey1 !== null && (epochStartTime1 === null || epochStartTime1 <= epochStartTime0)) {
|