@matter/node 0.16.0-alpha.0-20251030-e9ca79f93 → 0.16.0-alpha.0-20251101-70c8d51d7
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/state/managed/Datasource.js +13 -13
- package/dist/cjs/behavior/state/managed/Datasource.js.map +2 -2
- package/dist/cjs/behavior/state/managed/values/ListManager.js +2 -2
- package/dist/cjs/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.js +10 -3
- package/dist/cjs/behavior/state/managed/values/ValuePatcher.js.map +1 -1
- package/dist/cjs/behavior/state/validation/ValueValidator.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/ValueValidator.js +18 -4
- package/dist/cjs/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/cjs/behavior/state/validation/assertions.d.ts +13 -0
- package/dist/cjs/behavior/state/validation/assertions.d.ts.map +1 -1
- package/dist/cjs/behavior/state/validation/assertions.js +44 -0
- package/dist/cjs/behavior/state/validation/assertions.js.map +2 -2
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts +4 -0
- package/dist/cjs/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts +3 -3
- package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.d.ts +0 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js +3 -4
- package/dist/cjs/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkClient.d.ts +8 -13
- package/dist/cjs/behavior/system/network/NetworkClient.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkClient.js +20 -35
- package/dist/cjs/behavior/system/network/NetworkClient.js.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.d.ts +1 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.js +5 -1
- package/dist/cjs/behavior/system/network/NetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts +0 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js +4 -4
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/cjs/behavior/system/remote/RemoteInterface.d.ts.map +1 -1
- package/dist/cjs/behavior/system/remote/RemoteInterface.js +3 -3
- package/dist/cjs/behavior/system/remote/RemoteInterface.js.map +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js +1 -1
- package/dist/cjs/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/cjs/behaviors/color-control/ColorConversionUtils.js +2 -2
- package/dist/cjs/behaviors/color-control/ColorConversionUtils.js.map +1 -1
- package/dist/cjs/behaviors/thermostat/AtomicWriteHandler.js +1 -1
- package/dist/cjs/behaviors/thermostat/AtomicWriteHandler.js.map +1 -1
- package/dist/cjs/behaviors/thermostat/ThermostatServer.js +1 -1
- package/dist/cjs/behaviors/thermostat/ThermostatServer.js.map +1 -1
- package/dist/cjs/endpoint/properties/EndpointContainer.d.ts +1 -1
- package/dist/cjs/endpoint/properties/EndpointContainer.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientEventEmitter.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientEventEmitter.js +11 -10
- package/dist/cjs/node/client/ClientEventEmitter.js.map +2 -2
- package/dist/cjs/node/client/ClientNodeInteraction.d.ts +8 -5
- package/dist/cjs/node/client/ClientNodeInteraction.d.ts.map +1 -1
- package/dist/cjs/node/client/ClientNodeInteraction.js +9 -13
- package/dist/cjs/node/client/ClientNodeInteraction.js.map +1 -1
- package/dist/cjs/node/integration/ChangeNotificationService.js +1 -1
- package/dist/cjs/node/integration/ChangeNotificationService.js.map +1 -1
- package/dist/cjs/node/server/InteractionServer.js +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts +0 -1
- package/dist/cjs/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/cjs/node/server/OnlineServerInteraction.js +0 -3
- package/dist/cjs/node/server/OnlineServerInteraction.js.map +1 -1
- package/dist/esm/behavior/state/managed/Datasource.js +13 -13
- package/dist/esm/behavior/state/managed/Datasource.js.map +2 -2
- package/dist/esm/behavior/state/managed/values/ListManager.js +2 -2
- package/dist/esm/behavior/state/managed/values/ListManager.js.map +1 -1
- package/dist/esm/behavior/state/managed/values/ValuePatcher.js +10 -3
- package/dist/esm/behavior/state/managed/values/ValuePatcher.js.map +1 -1
- package/dist/esm/behavior/state/validation/ValueValidator.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/ValueValidator.js +21 -6
- package/dist/esm/behavior/state/validation/ValueValidator.js.map +1 -1
- package/dist/esm/behavior/state/validation/assertions.d.ts +13 -0
- package/dist/esm/behavior/state/validation/assertions.d.ts.map +1 -1
- package/dist/esm/behavior/state/validation/assertions.js +45 -1
- package/dist/esm/behavior/state/validation/assertions.js.map +2 -2
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts +4 -0
- package/dist/esm/behavior/supervision/ValueSupervisor.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts +3 -3
- package/dist/esm/behavior/system/commissioning/CommissioningClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.d.ts +0 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js +3 -4
- package/dist/esm/behavior/system/network/ClientNetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/network/NetworkClient.d.ts +8 -13
- package/dist/esm/behavior/system/network/NetworkClient.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/NetworkClient.js +21 -36
- package/dist/esm/behavior/system/network/NetworkClient.js.map +1 -1
- package/dist/esm/behavior/system/network/NetworkRuntime.d.ts +1 -1
- package/dist/esm/behavior/system/network/NetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/NetworkRuntime.js +6 -2
- package/dist/esm/behavior/system/network/NetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts +0 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js +4 -4
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/esm/behavior/system/remote/RemoteInterface.d.ts.map +1 -1
- package/dist/esm/behavior/system/remote/RemoteInterface.js +4 -4
- package/dist/esm/behavior/system/remote/RemoteInterface.js.map +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js +1 -1
- package/dist/esm/behavior/system/subscriptions/SubscriptionsServer.js.map +1 -1
- package/dist/esm/behaviors/color-control/ColorConversionUtils.js +2 -2
- package/dist/esm/behaviors/color-control/ColorConversionUtils.js.map +1 -1
- package/dist/esm/behaviors/thermostat/AtomicWriteHandler.js +1 -1
- package/dist/esm/behaviors/thermostat/AtomicWriteHandler.js.map +1 -1
- package/dist/esm/behaviors/thermostat/ThermostatServer.js +1 -1
- package/dist/esm/behaviors/thermostat/ThermostatServer.js.map +1 -1
- package/dist/esm/endpoint/properties/EndpointContainer.d.ts +1 -1
- package/dist/esm/endpoint/properties/EndpointContainer.d.ts.map +1 -1
- package/dist/esm/node/client/ClientEventEmitter.d.ts.map +1 -1
- package/dist/esm/node/client/ClientEventEmitter.js +12 -11
- package/dist/esm/node/client/ClientEventEmitter.js.map +2 -2
- package/dist/esm/node/client/ClientNodeInteraction.d.ts +8 -5
- package/dist/esm/node/client/ClientNodeInteraction.d.ts.map +1 -1
- package/dist/esm/node/client/ClientNodeInteraction.js +9 -13
- package/dist/esm/node/client/ClientNodeInteraction.js.map +1 -1
- package/dist/esm/node/integration/ChangeNotificationService.js +1 -1
- package/dist/esm/node/integration/ChangeNotificationService.js.map +1 -1
- package/dist/esm/node/server/InteractionServer.js +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.d.ts +0 -1
- package/dist/esm/node/server/OnlineServerInteraction.d.ts.map +1 -1
- package/dist/esm/node/server/OnlineServerInteraction.js +0 -3
- package/dist/esm/node/server/OnlineServerInteraction.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/Transitions.ts +1 -1
- package/src/behavior/state/managed/Datasource.ts +17 -14
- package/src/behavior/state/managed/values/ListManager.ts +2 -2
- package/src/behavior/state/managed/values/ValuePatcher.ts +15 -6
- package/src/behavior/state/validation/ValueValidator.ts +25 -6
- package/src/behavior/state/validation/assertions.ts +54 -1
- package/src/behavior/supervision/ValueSupervisor.ts +5 -0
- package/src/behavior/system/commissioning/CommissioningClient.ts +3 -3
- package/src/behavior/system/network/ClientNetworkRuntime.ts +5 -5
- package/src/behavior/system/network/NetworkClient.ts +25 -43
- package/src/behavior/system/network/NetworkRuntime.ts +7 -4
- package/src/behavior/system/network/ServerNetworkRuntime.ts +5 -6
- package/src/behavior/system/remote/RemoteInterface.ts +4 -4
- package/src/behavior/system/subscriptions/SubscriptionsServer.ts +1 -1
- package/src/behaviors/color-control/ColorConversionUtils.ts +2 -2
- package/src/behaviors/thermostat/AtomicWriteHandler.ts +1 -1
- package/src/behaviors/thermostat/ThermostatServer.ts +1 -1
- package/src/node/client/ClientEventEmitter.ts +12 -11
- package/src/node/client/ClientNodeInteraction.ts +13 -17
- package/src/node/integration/ChangeNotificationService.ts +1 -1
- package/src/node/server/InteractionServer.ts +1 -1
- package/src/node/server/OnlineServerInteraction.ts +0 -4
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Bytes, isObject } from "#general";
|
|
7
|
-
import { DatatypeError } from "#protocol";
|
|
7
|
+
import { DatatypeError, IntegerRangeError } from "#protocol";
|
|
8
8
|
function assertNumber(value, path) {
|
|
9
9
|
if (Number.isFinite(value)) {
|
|
10
10
|
return;
|
|
@@ -52,10 +52,54 @@ function assertArray(value, path) {
|
|
|
52
52
|
throw new DatatypeError(path, "an array", value);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
+
const assertInt = {
|
|
56
|
+
/**
|
|
57
|
+
* Assertions for each integer type that is not nullable.
|
|
58
|
+
*/
|
|
59
|
+
notNullable: {},
|
|
60
|
+
/**
|
|
61
|
+
* Assertions for nullable integer types.
|
|
62
|
+
*
|
|
63
|
+
* These are separate from the "not nullable" assertions because Matter reserves a high or low value (for unsigned
|
|
64
|
+
* and signed, respectively) to indicate the field is null.
|
|
65
|
+
*/
|
|
66
|
+
nullable: {}
|
|
67
|
+
};
|
|
68
|
+
for (let i = 1n; i < 9n; i++) {
|
|
69
|
+
const intName = `int${i * 8n}`;
|
|
70
|
+
const uintName = `u${intName}`;
|
|
71
|
+
const numValues = 2n ** (i * 8n);
|
|
72
|
+
const unsignedMax = numValues - 1n;
|
|
73
|
+
assertInt.notNullable[uintName] = createIntAssertion(uintName, 0n, unsignedMax);
|
|
74
|
+
assertInt.nullable[uintName] = createIntAssertion(`nullable ${uintName}`, 0n, unsignedMax - 1n);
|
|
75
|
+
const halfNumValues = numValues / 2n;
|
|
76
|
+
const signedMax = halfNumValues - 1n;
|
|
77
|
+
const signedMin = -halfNumValues;
|
|
78
|
+
assertInt.notNullable[intName] = createIntAssertion(intName, signedMin, signedMax);
|
|
79
|
+
assertInt.nullable[intName] = createIntAssertion(`nullable ${intName}`, signedMin + 1n, signedMax);
|
|
80
|
+
}
|
|
81
|
+
function createIntAssertion(name, lowerBoundInclusive, upperBoundExclusive) {
|
|
82
|
+
if (lowerBoundInclusive < Number.MIN_SAFE_INTEGER || upperBoundExclusive > Number.MAX_SAFE_INTEGER) {
|
|
83
|
+
return createVarIntAssertion(name, lowerBoundInclusive, upperBoundExclusive);
|
|
84
|
+
}
|
|
85
|
+
return createVarIntAssertion(name, Number(lowerBoundInclusive), Number(upperBoundExclusive));
|
|
86
|
+
}
|
|
87
|
+
function createVarIntAssertion(name, min, max) {
|
|
88
|
+
return function assertInt2(value, path) {
|
|
89
|
+
assertNumeric(value, path);
|
|
90
|
+
if (value < min) {
|
|
91
|
+
throw new IntegerRangeError(path, `Value ${value} is below the ${name} minimum of ${min}`);
|
|
92
|
+
}
|
|
93
|
+
if (value > max) {
|
|
94
|
+
throw new IntegerRangeError(path, `Value ${value} is above the ${name} maximum of ${max}`);
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
}
|
|
55
98
|
export {
|
|
56
99
|
assertArray,
|
|
57
100
|
assertBoolean,
|
|
58
101
|
assertBytes,
|
|
102
|
+
assertInt,
|
|
59
103
|
assertNumber,
|
|
60
104
|
assertNumeric,
|
|
61
105
|
assertObject,
|
|
@@ -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,gBAAgB;AAEhC,SAAS,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["assertInt"]
|
|
6
6
|
}
|
|
@@ -64,6 +64,10 @@ export declare namespace ValueSupervisor {
|
|
|
64
64
|
* The transaction used for isolating state changes associated with this session.
|
|
65
65
|
*/
|
|
66
66
|
transaction: Transaction;
|
|
67
|
+
/**
|
|
68
|
+
* Signal for terminating asynchronous processes.
|
|
69
|
+
*/
|
|
70
|
+
abort?: AbortSignal;
|
|
67
71
|
/**
|
|
68
72
|
* If this is true, data validation is disabled. This should only be used in contexts where data validation is
|
|
69
73
|
* deferred.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueSupervisor.d.ts","sourceRoot":"","sources":["../../../../src/behavior/supervision/ValueSupervisor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC;IAExD;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;IAEtC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC;CACvC;AAED,yBAAiB,eAAe,CAAC;IAC7B;;OAEG;IACH,UAAiB,mBAAmB;QAChC;;WAEG;QACH,WAAW,EAAE,WAAW,CAAC;QAEzB;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QAExB;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB;IAED;;OAEG;IACH,UAAiB,kBAAmB,SAAQ,aAAa,CAAC,kBAAkB,EAAE,mBAAmB;QAC7F;;WAEG;QACH,mBAAmB,CAAC,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEtE;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAChC;IAED,UAAiB,iBAAkB,SAAQ,aAAa,CAAC,iBAAiB,EAAE,mBAAmB;KAAG;IAElG,KAAY,OAAO,GAAG,iBAAiB,GAAG,kBAAkB,CAAC;IAE7D,KAAY,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE5F,KAAY,MAAM,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,KAAK,GAAG,CAAC;IAEzE,KAAY,KAAK,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,aAAa,KAAK,GAAG,CAAC;IAE1G,KAAY,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;CAC1C"}
|
|
1
|
+
{"version":3,"file":"ValueSupervisor.d.ts","sourceRoot":"","sources":["../../../../src/behavior/supervision/ValueSupervisor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC;IAExD;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;IAEtC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC;CACvC;AAED,yBAAiB,eAAe,CAAC;IAC7B;;OAEG;IACH,UAAiB,mBAAmB;QAChC;;WAEG;QACH,WAAW,EAAE,WAAW,CAAC;QAEzB;;WAEG;QACH,KAAK,CAAC,EAAE,WAAW,CAAC;QAEpB;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QAExB;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;KACtB;IAED;;OAEG;IACH,UAAiB,kBAAmB,SAAQ,aAAa,CAAC,kBAAkB,EAAE,mBAAmB;QAC7F;;WAEG;QACH,mBAAmB,CAAC,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAEtE;;WAEG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAChC;IAED,UAAiB,iBAAkB,SAAQ,aAAa,CAAC,iBAAiB,EAAE,mBAAmB;KAAG;IAElG,KAAY,OAAO,GAAG,iBAAiB,GAAG,kBAAkB,CAAC;IAE7D,KAAY,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE5F,KAAY,MAAM,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,KAAK,GAAG,CAAC;IAEzE,KAAY,KAAK,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,aAAa,KAAK,GAAG,CAAC;IAE1G,KAAY,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;CAC1C"}
|
|
@@ -200,14 +200,14 @@ export declare namespace CommissioningClient {
|
|
|
200
200
|
* ```
|
|
201
201
|
*
|
|
202
202
|
* Note that certain clusters like Descriptor and Basic Information contain critical operational data. If your
|
|
203
|
-
* read omits them then the node will only be partially functional once initialized
|
|
204
|
-
* endpoints need to be enabled manually.
|
|
203
|
+
* read omits them then the node will only be partially functional once initialized.
|
|
205
204
|
*/
|
|
206
205
|
defaultSubscription?: Subscribe;
|
|
207
206
|
/**
|
|
208
207
|
* By default, nodes we commission are automatically subscribed to using the {@link defaultSubscription} (or a
|
|
209
208
|
* full wildcard subscription if that is undefined).
|
|
210
|
-
*
|
|
209
|
+
*
|
|
210
|
+
* Matter.js will not subscribe automatically if set to false.
|
|
211
211
|
*/
|
|
212
212
|
autoSubscribe?: boolean;
|
|
213
213
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAyB,WAAW,EAAiB,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,qBAAa,YAAa,SAAQ,WAAW;CAAG;AAIhD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;gBAIxC,KAAK,EAAE,UAAU;IAI7B,IAAa,KAAK,IACQ,UAAU,CACnC;cAEe,KAAK;
|
|
1
|
+
{"version":3,"file":"ClientNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAyB,WAAW,EAAiB,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAItD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AACvD,qBAAa,YAAa,SAAQ,WAAW;CAAG;AAIhD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;gBAIxC,KAAK,EAAE,UAAU;IAI7B,IAAa,KAAK,IACQ,UAAU,CACnC;cAEe,KAAK;cAyEL,IAAI;CAavB"}
|
|
@@ -42,7 +42,8 @@ class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
42
42
|
caseAuthenticatedTags: networkState.caseAuthenticatedTags ? [...networkState.caseAuthenticatedTags] : void 0
|
|
43
43
|
});
|
|
44
44
|
env.set(ExchangeProvider, exchangeProvider);
|
|
45
|
-
this.#client = env.
|
|
45
|
+
this.#client = new ClientInteraction({ environment: env, abort: this.abortSignal });
|
|
46
|
+
env.set(ClientInteraction, this.#client);
|
|
46
47
|
const { sessions } = env.get(SessionManager);
|
|
47
48
|
if (sessions.find((session) => session.peerIs(address))) {
|
|
48
49
|
this.owner.act(({ context }) => lifecycle.online.emit(context));
|
|
@@ -73,6 +74,7 @@ class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
73
74
|
}
|
|
74
75
|
async stop() {
|
|
75
76
|
await this.construction;
|
|
77
|
+
this.owner.env.delete(ClientInteraction, this.#client);
|
|
76
78
|
try {
|
|
77
79
|
await this.#client?.close();
|
|
78
80
|
} catch (e) {
|
|
@@ -80,9 +82,6 @@ class ClientNetworkRuntime extends NetworkRuntime {
|
|
|
80
82
|
}
|
|
81
83
|
this.#observers.close();
|
|
82
84
|
}
|
|
83
|
-
blockNewActivity() {
|
|
84
|
-
this.owner.env.delete(ClientInteraction, this.#client);
|
|
85
|
-
}
|
|
86
85
|
}
|
|
87
86
|
export {
|
|
88
87
|
ClientNetworkRuntime,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/ClientNetworkRuntime.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,eAAe,QAAQ,aAAa,qBAAqB;AAElE,SAAS,mBAAmB,kBAAkB,aAAa,SAAS,sBAAsB;AAC1F,SAAS,2BAA2B;AACpC,SAAS,wBAAwB;AACjC,SAAS,sBAAsB;AAExB,MAAM,4BAA4B,YAAY;AAAC;AAC/C,MAAM,qBAAqB,YAAY;AAAC;AAE/C,MAAM,SAAS,OAAO,IAAI,sBAAsB;AAKzC,MAAM,6BAA6B,eAAe;AAAA,EACrD;AAAA,EACA,aAAa,IAAI,cAAc;AAAA,EAE/B,YAAY,OAAmB;AAC3B,UAAM,KAAK;AAAA,EACf;AAAA,EAEA,IAAa,QAAQ;AACjB,WAAO,MAAM;AAAA,EACjB;AAAA,EAEA,MAAgB,QAAQ;AAEpB,QAAI,CAAC,KAAK,MAAM,UAAU,gBAAgB;AACtC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,+BAA+B;AAAA,IACnG;AAEA,QAAI,KAAK,MAAM,MAAM,QAAQ,YAAY;AACrC,YAAM,IAAI,oBAAoB,wBAAwB,KAAK,KAAK,yBAAyB;AAAA,IAC7F;AAEA,UAAM,UAAU,KAAK,MAAM,QAAQ,mBAAmB,EAAE;AAExD,QAAI,YAAY,QAAW;AACvB,YAAM,IAAI,cAAc,qBAAqB,KAAK,KAAK,sBAAsB;AAAA,IACjF;AAGA,UAAM,EAAE,KAAK,UAAU,IAAI,KAAK;AAChC,UAAM,QAAQ,IAAI,IAAI,OAAO;AAC7B,UAAM,qBAAqB,KAAK,MAAM,QAAQ,mBAAmB;AACjE,UAAM,eAAe,KAAK,MAAM,MAAM;AAEtC,UAAM,mBAAmB,MAAM,MAAM,oBAAoB,SAAS;AAAA,MAC9D,kBAAkB,EAAE,eAAe,iBAAiB,aAAa,kBAAkB,EAAE;AAAA,MACrF,uBAAuB,aAAa,wBAC9B,CAAC,GAAG,aAAa,qBAAqB,IACtC;AAAA,IACV,CAAC;AACD,QAAI,IAAI,kBAAkB,gBAAgB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["address"]
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Observable } from "#general";
|
|
7
7
|
import { DatatypeModel } from "#model";
|
|
8
|
-
import { Subscribe } from "#protocol";
|
|
8
|
+
import { ActiveSubscription, Subscribe } from "#protocol";
|
|
9
9
|
import { CaseAuthenticatedTag } from "#types";
|
|
10
10
|
import { ClientNetworkRuntime } from "./ClientNetworkRuntime.js";
|
|
11
11
|
import { NetworkBehavior } from "./NetworkBehavior.js";
|
|
@@ -16,12 +16,6 @@ export declare class NetworkClient extends NetworkBehavior {
|
|
|
16
16
|
events: NetworkClient.Events;
|
|
17
17
|
initialize(): void;
|
|
18
18
|
startup(): Promise<void>;
|
|
19
|
-
/**
|
|
20
|
-
* Manually activate the subscription for the node, if not already active. This will fail if the node is disabled.
|
|
21
|
-
*
|
|
22
|
-
* If you want to disable subscription, set the isDisabled state to true or set autoSubscribe to false.
|
|
23
|
-
*/
|
|
24
|
-
subscribe(): Promise<void>;
|
|
25
19
|
/**
|
|
26
20
|
* Define logical schema for fields that should persist.
|
|
27
21
|
*/
|
|
@@ -31,12 +25,9 @@ export declare namespace NetworkClient {
|
|
|
31
25
|
class Internal extends NetworkBehavior.Internal {
|
|
32
26
|
runtime?: ClientNetworkRuntime;
|
|
33
27
|
/**
|
|
34
|
-
*
|
|
35
|
-
* established, or we wait for the node to be rediscovered.
|
|
28
|
+
* The active default subscription.
|
|
36
29
|
*/
|
|
37
|
-
|
|
38
|
-
/** The ID of the current active default subscription, if any */
|
|
39
|
-
defaultSubscriptionId?: number;
|
|
30
|
+
activeSubscription?: ActiveSubscription;
|
|
40
31
|
}
|
|
41
32
|
class State extends NetworkBehavior.State {
|
|
42
33
|
/**
|
|
@@ -46,7 +37,7 @@ export declare namespace NetworkClient {
|
|
|
46
37
|
* The default subscription is a wildcard for all attributes of the node. You can set to undefined or filter
|
|
47
38
|
* the fields and values but only values selected by this subscription will update automatically.
|
|
48
39
|
*
|
|
49
|
-
*
|
|
40
|
+
* The default subscription updates automatically if you change this property.
|
|
50
41
|
*/
|
|
51
42
|
defaultSubscription?: Subscribe;
|
|
52
43
|
/**
|
|
@@ -59,6 +50,10 @@ export declare namespace NetworkClient {
|
|
|
59
50
|
/**
|
|
60
51
|
* If true, automatically subscribe to the provided default subscription (or all attributes and events) when
|
|
61
52
|
* the node is started. If false, do not automatically subscribe.
|
|
53
|
+
*
|
|
54
|
+
* The subscription will activate or deactivate automatically if you change this property.
|
|
55
|
+
*
|
|
56
|
+
* Newly commissioned nodes default to true.
|
|
62
57
|
*/
|
|
63
58
|
autoSubscribe: boolean;
|
|
64
59
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,
|
|
1
|
+
{"version":3,"file":"NetworkClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,UAAU,EAAmC,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAuC,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,qBAAa,aAAc,SAAQ,eAAe;;IACtC,QAAQ,EAAE,aAAa,CAAC,QAAQ,CAAC;IACjC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;IAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC;IAE5B,UAAU;IAWJ,OAAO;IAoEtB;;OAEG;IACH,gBAAyB,MAAM,gBAwC5B;CACN;AAED,yBAAiB,aAAa,CAAC;IAC3B,MAAa,QAAS,SAAQ,eAAe,CAAC,QAAQ;QAC1C,OAAO,CAAC,EAAE,oBAAoB,CAAC;QAEvC;;WAEG;QACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;KAC3C;IAED,MAAa,KAAM,SAAQ,eAAe,CAAC,KAAK;QAC5C;;;;;;;;WAQG;QACH,mBAAmB,CAAC,EAAE,SAAS,CAAC;QAEhC;;;;;WAKG;QACH,UAAU,UAAS;QAEnB;;;;;;;WAOG;QACH,aAAa,UAAS;QAEtB;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;KAClD;IAED,MAAa,MAAO,SAAQ,eAAe,CAAC,MAAM;QAC9C,qBAAqB,wDAAyD;QAC9E,2BAA2B,oFAAqF;KACnH;CACJ"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { RemoteDescriptor } from "#behavior/system/commissioning/RemoteDescriptor.js";
|
|
7
|
-
import {
|
|
7
|
+
import { Observable, ServerAddress } from "#general";
|
|
8
8
|
import { DatatypeModel, FieldElement } from "#model";
|
|
9
9
|
import { Node } from "#node/Node.js";
|
|
10
10
|
import { DEFAULT_MIN_INTERVAL_FLOOR, PeerSet, Subscribe } from "#protocol";
|
|
@@ -15,8 +15,8 @@ class NetworkClient extends NetworkBehavior {
|
|
|
15
15
|
this.state.autoSubscribe = false;
|
|
16
16
|
this.state.defaultSubscription = void 0;
|
|
17
17
|
} else {
|
|
18
|
-
this.reactTo(this.events.autoSubscribe$Changed, this.#
|
|
19
|
-
this.reactTo(this.events.defaultSubscription$Changed, this.#
|
|
18
|
+
this.reactTo(this.events.autoSubscribe$Changed, this.#handleAutoSubscribeChanged, { offline: true });
|
|
19
|
+
this.reactTo(this.events.defaultSubscription$Changed, this.#handleDefaultSubscriptionChange);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
async startup() {
|
|
@@ -35,30 +35,18 @@ class NetworkClient extends NetworkBehavior {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
await this.#
|
|
38
|
+
await this.#handleAutoSubscribeChanged();
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
*/
|
|
45
|
-
subscribe() {
|
|
46
|
-
if (this.state.isDisabled) {
|
|
47
|
-
throw new ImplementationError("Cannot subscribe when node is disabled");
|
|
48
|
-
}
|
|
49
|
-
return this.#handleSubscription(true);
|
|
50
|
-
}
|
|
51
|
-
async #handleChangedDefaultSubscription() {
|
|
52
|
-
if (!this.internal.subscriptionActivated) {
|
|
53
|
-
return;
|
|
40
|
+
async #handleDefaultSubscriptionChange() {
|
|
41
|
+
await this.#handleAutoSubscribeChanged(false);
|
|
42
|
+
if (this.state.autoSubscribe && !this.state.isDisabled) {
|
|
43
|
+
await this.#handleAutoSubscribeChanged(true);
|
|
54
44
|
}
|
|
55
|
-
await this.#handleSubscription(false);
|
|
56
|
-
await this.#handleSubscription(true);
|
|
57
45
|
}
|
|
58
|
-
async #
|
|
46
|
+
async #handleAutoSubscribeChanged(desiredState = this.state.autoSubscribe) {
|
|
59
47
|
const { isDisabled } = this.state;
|
|
60
48
|
const subscriptionDesired = desiredState && !isDisabled;
|
|
61
|
-
if (subscriptionDesired === this.internal.
|
|
49
|
+
if (subscriptionDesired === !!this.internal.activeSubscription) {
|
|
62
50
|
return;
|
|
63
51
|
}
|
|
64
52
|
if (subscriptionDesired) {
|
|
@@ -71,15 +59,11 @@ class NetworkClient extends NetworkBehavior {
|
|
|
71
59
|
...this.state.defaultSubscription
|
|
72
60
|
});
|
|
73
61
|
for await (const _chunk of this.#node.interaction.read(subscribe)) ;
|
|
74
|
-
const
|
|
75
|
-
this.internal.
|
|
76
|
-
this.internal.defaultSubscriptionId = subscriptionId;
|
|
62
|
+
const subscription = await this.#node.interaction.subscribe(subscribe);
|
|
63
|
+
this.internal.activeSubscription = subscription;
|
|
77
64
|
} else {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
this.internal.defaultSubscriptionId = void 0;
|
|
81
|
-
}
|
|
82
|
-
this.internal.subscriptionActivated = false;
|
|
65
|
+
this.internal.activeSubscription?.close();
|
|
66
|
+
this.internal.activeSubscription = void 0;
|
|
83
67
|
}
|
|
84
68
|
}
|
|
85
69
|
get #node() {
|
|
@@ -129,12 +113,9 @@ class NetworkClient extends NetworkBehavior {
|
|
|
129
113
|
((NetworkClient2) => {
|
|
130
114
|
class Internal extends NetworkBehavior.Internal {
|
|
131
115
|
/**
|
|
132
|
-
*
|
|
133
|
-
* established, or we wait for the node to be rediscovered.
|
|
116
|
+
* The active default subscription.
|
|
134
117
|
*/
|
|
135
|
-
|
|
136
|
-
/** The ID of the current active default subscription, if any */
|
|
137
|
-
defaultSubscriptionId;
|
|
118
|
+
activeSubscription;
|
|
138
119
|
}
|
|
139
120
|
NetworkClient2.Internal = Internal;
|
|
140
121
|
class State extends NetworkBehavior.State {
|
|
@@ -145,7 +126,7 @@ class NetworkClient extends NetworkBehavior {
|
|
|
145
126
|
* The default subscription is a wildcard for all attributes of the node. You can set to undefined or filter
|
|
146
127
|
* the fields and values but only values selected by this subscription will update automatically.
|
|
147
128
|
*
|
|
148
|
-
*
|
|
129
|
+
* The default subscription updates automatically if you change this property.
|
|
149
130
|
*/
|
|
150
131
|
defaultSubscription;
|
|
151
132
|
/**
|
|
@@ -158,6 +139,10 @@ class NetworkClient extends NetworkBehavior {
|
|
|
158
139
|
/**
|
|
159
140
|
* If true, automatically subscribe to the provided default subscription (or all attributes and events) when
|
|
160
141
|
* the node is started. If false, do not automatically subscribe.
|
|
142
|
+
*
|
|
143
|
+
* The subscription will activate or deactivate automatically if you change this property.
|
|
144
|
+
*
|
|
145
|
+
* Newly commissioned nodes default to true.
|
|
161
146
|
*/
|
|
162
147
|
autoSubscribe = false;
|
|
163
148
|
/**
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/NetworkClient.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAAwB;AACjC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["NetworkClient"]
|
|
6
6
|
}
|
|
@@ -10,6 +10,7 @@ import type { Node } from "#node/Node.js";
|
|
|
10
10
|
*/
|
|
11
11
|
export declare abstract class NetworkRuntime {
|
|
12
12
|
#private;
|
|
13
|
+
get abortSignal(): AbortSignal;
|
|
13
14
|
get construction(): Construction<NetworkRuntime>;
|
|
14
15
|
constructor(owner: Node);
|
|
15
16
|
[Construction.construct](): Promise<void>;
|
|
@@ -17,7 +18,6 @@ export declare abstract class NetworkRuntime {
|
|
|
17
18
|
close(): Promise<void>;
|
|
18
19
|
protected abstract start(): Promise<void>;
|
|
19
20
|
protected abstract stop(): Promise<void>;
|
|
20
|
-
protected abstract blockNewActivity(): void;
|
|
21
21
|
protected get owner(): Node<Node.CommonRootEndpoint>;
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=NetworkRuntime.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"NetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/NetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,YAAY,EAAuB,MAAM,UAAU,CAAC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAI1C;;GAEG;AACH,8BAAsB,cAAc;;IAKhC,IAAI,WAAW,gBAEd;IAED,IAAI,YAAY,iCAEf;gBAEW,KAAK,EAAE,IAAI;IAYjB,CAAC,YAAY,CAAC,SAAS,CAAC;IAIxB,CAAC,YAAY,CAAC,QAAQ,CAAC;IAevB,KAAK;IAIX,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEzC,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,SAAS,KAAK,KAAK,kCAElB;CACJ"}
|
|
@@ -3,12 +3,16 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Construction, ImplementationError } from "#general";
|
|
6
|
+
import { Abort, Construction, ImplementationError } from "#general";
|
|
7
7
|
import { NodeActivity } from "../../context/NodeActivity.js";
|
|
8
8
|
import { NetworkBehavior } from "./NetworkBehavior.js";
|
|
9
9
|
class NetworkRuntime {
|
|
10
10
|
#construction;
|
|
11
11
|
#owner;
|
|
12
|
+
#abort = new Abort();
|
|
13
|
+
get abortSignal() {
|
|
14
|
+
return this.#abort.signal;
|
|
15
|
+
}
|
|
12
16
|
get construction() {
|
|
13
17
|
return this.#construction;
|
|
14
18
|
}
|
|
@@ -25,7 +29,7 @@ class NetworkRuntime {
|
|
|
25
29
|
await this.start();
|
|
26
30
|
}
|
|
27
31
|
async [Construction.destruct]() {
|
|
28
|
-
this
|
|
32
|
+
this.#abort();
|
|
29
33
|
const activity = this.#owner.env.get(NodeActivity);
|
|
30
34
|
if (activity.isActive) {
|
|
31
35
|
await activity.inactive;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/NetworkRuntime.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,cAAc,2BAA2B;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAO,cAAc,2BAA2B;AAEzD,SAAS,oBAAoB;AAC7B,SAAS,uBAAuB;AAKzB,MAAe,eAAe;AAAA,EACjC;AAAA,EACA;AAAA,EACA,SAAS,IAAI,MAAM;AAAA,EAEnB,IAAI,cAAc;AACd,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,IAAI,eAAe;AACf,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,YAAY,OAAa;AACrB,SAAK,SAAS;AAEd,UAAM,YAAY,MAAM,UAAU,YAAY,eAAe;AAC7D,QAAI,UAAU,SAAS;AACnB,YAAM,IAAI,oBAAoB,2BAA2B;AAAA,IAC7D;AACA,cAAU,UAAU;AAEpB,SAAK,gBAAgB,aAAa,IAAI;AAAA,EAC1C;AAAA,EAEA,OAAO,aAAa,SAAS,IAAI;AAC7B,UAAM,KAAK,MAAM;AAAA,EACrB;AAAA,EAEA,OAAO,aAAa,QAAQ,IAAI;AAC5B,SAAK,OAAO;AACZ,UAAM,WAAW,KAAK,OAAO,IAAI,IAAI,YAAY;AACjD,QAAI,SAAS,UAAU;AACnB,YAAM,SAAS;AAAA,IACnB;AAEA,QAAI;AACA,YAAM,KAAK,KAAK;AAAA,IACpB,UAAE;AACE,WAAK,OAAO,UAAU,YAAY,eAAe,EAAE,UAAU;AAAA,IACjE;AACA,UAAM,KAAK,OAAO,IAAI,WAAS,KAAK,MAAM,UAAU,QAAQ,KAAK,MAAM,OAAO,CAAC;AAAA,EACnF;AAAA,EAEA,MAAM,QAAQ;AACV,UAAM,KAAK,aAAa,MAAM;AAAA,EAClC;AAAA,EAMA,IAAc,QAAQ;AAClB,WAAO,KAAK;AAAA,EAChB;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -47,6 +47,5 @@ export declare class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
47
47
|
endUncommissionedMode(): void;
|
|
48
48
|
protected start(): Promise<void>;
|
|
49
49
|
protected stop(): Promise<void>;
|
|
50
|
-
protected blockNewActivity(): void;
|
|
51
50
|
}
|
|
52
51
|
//# sourceMappingURL=ServerNetworkRuntime.d.ts.map
|
|
@@ -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,EAI3B,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;;IAQpD,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;
|
|
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,EAI3B,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;;IAQpD,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;CAyChC"}
|
|
@@ -227,10 +227,13 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
227
227
|
}
|
|
228
228
|
this.owner.env.get(ScannerSet).add(mdns.client);
|
|
229
229
|
await env.load(PeerSet);
|
|
230
|
+
this.abortSignal.addEventListener(
|
|
231
|
+
"abort",
|
|
232
|
+
() => this.owner.env.maybeGet(InteractionServer)?.blockNewActivity()
|
|
233
|
+
);
|
|
230
234
|
await this.owner.act((agent) => this.owner.lifecycle.online.emit(agent.context));
|
|
231
235
|
}
|
|
232
236
|
async stop() {
|
|
233
|
-
this.blockNewActivity();
|
|
234
237
|
this.#observers.close();
|
|
235
238
|
const { env } = this.owner;
|
|
236
239
|
await env.close(DeviceCommissioner);
|
|
@@ -246,9 +249,6 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
246
249
|
await env.close(InteractionServer);
|
|
247
250
|
await env.close(PeerSet);
|
|
248
251
|
}
|
|
249
|
-
blockNewActivity() {
|
|
250
|
-
this.owner.env.maybeGet(InteractionServer)?.blockNewActivity();
|
|
251
|
-
}
|
|
252
252
|
async #initializeGroupNetworking() {
|
|
253
253
|
if (this.#groupNetworking) {
|
|
254
254
|
logger.warn("Group networking already initialized, skipping.");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteInterface.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/remote/RemoteInterface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"RemoteInterface.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/remote/RemoteInterface.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAS,UAAU,EAA+C,MAAM,UAAU,CAAC;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAI3C;;GAEG;AACH,8BAAsB,eAAe;;gBAOrB,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU;IAWjD,IAAI,IAAI,YAEP;IAED,IAAI,GAAG,mCAEN;IAED,IAAI,IAAI,wCAEP;IAED,IAAI,OAAO,eAEV;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,KAAK,gBAER;WAEY,MAAM,CAAC,IAAI,SAAS,KAAK,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,KAAK,eAAe,EAC3F,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,UAAU;IAYjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAc5B,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM;IAQ5C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,MAAM;IAI9D,MAAM,CAAC,QAAQ,SAAM;IAErB;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEzC;;OAEG;cACa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;KAC3E;CACJ"}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { BasicMultiplex, ImplementationError, Logger } from "#general";
|
|
6
|
+
import { Abort, BasicMultiplex, ImplementationError, Logger } from "#general";
|
|
7
7
|
import { ApiPath } from "./api/ApiPath.js";
|
|
8
8
|
const logger = Logger.get("RemoteAdapter");
|
|
9
9
|
class RemoteInterface {
|
|
10
10
|
#node;
|
|
11
11
|
#address;
|
|
12
|
-
#abort = new
|
|
12
|
+
#abort = new Abort();
|
|
13
13
|
#root;
|
|
14
14
|
#workers = new BasicMultiplex();
|
|
15
15
|
constructor(node, address) {
|
|
@@ -35,7 +35,7 @@ class RemoteInterface {
|
|
|
35
35
|
return this.#address;
|
|
36
36
|
}
|
|
37
37
|
get isAborted() {
|
|
38
|
-
return this.#abort.
|
|
38
|
+
return this.#abort.aborted;
|
|
39
39
|
}
|
|
40
40
|
get abort() {
|
|
41
41
|
return this.#abort.signal;
|
|
@@ -54,7 +54,7 @@ class RemoteInterface {
|
|
|
54
54
|
if (this.isAborted) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
this.#abort
|
|
57
|
+
this.#abort();
|
|
58
58
|
try {
|
|
59
59
|
await this.stop();
|
|
60
60
|
} catch (e) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/remote/RemoteInterface.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,OAAmB,gBAAgB,qBAAqB,cAAc;AAE/E,SAAS,eAAe;AAExB,MAAM,SAAS,OAAO,IAAI,eAAe;AAKlC,MAAe,gBAAgB;AAAA,EAClC;AAAA,EACA;AAAA,EACA,SAAS,IAAI,MAAM;AAAA,EACnB;AAAA,EACA,WAAW,IAAI,eAAe;AAAA,EAE9B,YAAY,MAAkB,SAAqB;AAC/C,QAAI,QAAQ,gBAAiB,KAAK,YAAgD,UAAU;AACxF,YAAM,IAAI;AAAA,QACN,qBAAqB,KAAK,YAAY,IAAI,6BAA6B,OAAO;AAAA,MAClF;AAAA,IACJ;AACA,SAAK,QAAQ;AACb,SAAK,WAAW;AAChB,SAAK,QAAQ,IAAI,QAAQ,OAAO;AAAA,EACpC;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,MAAM;AACN,WAAO,KAAK,MAAM;AAAA,EACtB;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK,OAAO;AAAA,EACvB;AAAA,EAEA,aAAa,OAET,MACA,SACF;AACE,UAAM,WAAW,IAAI,KAAK,MAAM,OAAO;AACvC,QAAI;AACA,YAAM,SAAS,MAAM;AAAA,IACzB,SAAS,GAAG;AACR,YAAM,SAAS,MAAM;AACrB,YAAM;AAAA,IACV;AACA,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAuB;AACzB,QAAI,KAAK,WAAW;AAChB;AAAA,IACJ;AAEA,SAAK,OAAO;AAEZ,QAAI;AACA,YAAM,KAAK,KAAK;AAAA,IACpB,SAAS,GAAG;AACR,aAAO,MAAM,kCAAkC,KAAK,OAAO,EAAE;AAAA,IACjE;AAAA,EACJ;AAAA,EAEU,eAAe,aAAqB;AAC1C,QAAI,KAAK,QAAQ,gBAAgB,aAAa;AAC1C,YAAM,IAAI;AAAA,QACN,oBAAoB,KAAK,OAAO,yBAAyB,KAAK,YAAY,IAAI;AAAA,MAClF;AAAA,IACJ;AAAA,EACJ;AAAA,EAEU,UAAU,QAAuB,aAAqB;AAC5D,SAAK,SAAS,IAAI,QAAQ,WAAW;AAAA,EACzC;AAAA,EAEA,OAAO,WAAW;AAAA;AAAA;AAAA;AAAA,EAUlB,MAAgB,OAAsB;AAClC,UAAM,KAAK,SAAS,MAAM;AAAA,EAC9B;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -175,7 +175,7 @@ class SubscriptionsBehavior extends Behavior {
|
|
|
175
175
|
if (this.state.persistenceEnabled === false) return;
|
|
176
176
|
const { formerSubscriptions } = this.internal;
|
|
177
177
|
if (!formerSubscriptions.length) {
|
|
178
|
-
logger.
|
|
178
|
+
logger.debug("No former subscriptions to re-establish");
|
|
179
179
|
return;
|
|
180
180
|
} else {
|
|
181
181
|
this.internal.formerSubscriptions = [];
|