@matter/node 0.16.0-alpha.0-20250809-ee8375bcb → 0.16.0-alpha.0-20250810-5c91a95d2
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/system/commissioning/CommissioningServer.d.ts +4 -7
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js +11 -16
- package/dist/cjs/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js +4 -4
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/cjs/behavior/system/controller/discovery/ActiveDiscoveries.js +2 -2
- package/dist/cjs/behavior/system/controller/discovery/ActiveDiscoveries.js.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts +6 -6
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js +46 -39
- package/dist/cjs/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts +2 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +6 -5
- package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js +7 -1
- package/dist/cjs/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.d.ts +4 -7
- package/dist/esm/behavior/system/commissioning/CommissioningServer.d.ts.map +1 -1
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js +11 -16
- package/dist/esm/behavior/system/commissioning/CommissioningServer.js.map +1 -1
- package/dist/esm/behavior/system/controller/ControllerBehavior.js +5 -5
- package/dist/esm/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.js +3 -3
- package/dist/esm/behavior/system/controller/discovery/ActiveDiscoveries.js.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts +6 -6
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.d.ts.map +1 -1
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js +49 -39
- package/dist/esm/behavior/system/network/ServerNetworkRuntime.js.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts +2 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js +8 -7
- package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.d.ts.map +1 -1
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js +8 -2
- package/dist/esm/behaviors/general-commissioning/GeneralCommissioningServer.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/system/commissioning/CommissioningServer.ts +15 -26
- package/src/behavior/system/controller/ControllerBehavior.ts +5 -5
- package/src/behavior/system/controller/discovery/ActiveDiscoveries.ts +3 -3
- package/src/behavior/system/network/ServerNetworkRuntime.ts +53 -44
- package/src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts +8 -7
- package/src/behaviors/general-commissioning/GeneralCommissioningServer.ts +8 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,yCAAiD;AACjD,+BAAuC;AACvC,IAAAA,sCAA2C;AAC3C,mCAAqC;AACrC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["import_administrator_commissioning", "GeneralCommissioningServer"]
|
|
6
6
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { Endpoint } from "#endpoint/Endpoint.js";
|
|
7
7
|
import { AsyncObservable, EventEmitter, Mutex, Observable } from "#general";
|
|
8
8
|
import { DatatypeModel } from "#model";
|
|
9
|
-
import { ExposedFabricInformation, FabricAction, Val } from "#protocol";
|
|
9
|
+
import { BleAdvertiser, ExposedFabricInformation, FabricAction, MdnsAdvertiser, Val } from "#protocol";
|
|
10
10
|
import { CommissioningFlowType, FabricIndex } from "#types";
|
|
11
11
|
import { Behavior } from "../../Behavior.js";
|
|
12
12
|
import { ActionContext } from "../../context/ActionContext.js";
|
|
@@ -31,7 +31,7 @@ export declare class CommissioningServer extends Behavior {
|
|
|
31
31
|
* The server normally invokes this method when the node starts and is not yet commissioned. You can disable by
|
|
32
32
|
* setting {@link CommissioningServer.State#enabled} to false. Then you must invoke yourself.
|
|
33
33
|
*/
|
|
34
|
-
enterCommissionableMode(): void
|
|
34
|
+
enterCommissionableMode(): Promise<void>;
|
|
35
35
|
/**
|
|
36
36
|
* The server invokes this method when the node starts and is already commissioned, or immediately after
|
|
37
37
|
* commissioning.
|
|
@@ -54,11 +54,6 @@ export declare class CommissioningServer extends Behavior {
|
|
|
54
54
|
* Define logical schema to make passcode and discriminator persistent.
|
|
55
55
|
*/
|
|
56
56
|
static readonly schema: DatatypeModel;
|
|
57
|
-
/**
|
|
58
|
-
* Advertise and continue advertising at regular intervals until timeout per Matter specification. If already
|
|
59
|
-
* advertising, the advertisement timeout resets.
|
|
60
|
-
*/
|
|
61
|
-
beginAdvertising(): void;
|
|
62
57
|
}
|
|
63
58
|
export declare namespace CommissioningServer {
|
|
64
59
|
interface PairingCodes {
|
|
@@ -86,6 +81,8 @@ export declare namespace CommissioningServer {
|
|
|
86
81
|
flowType: CommissioningFlowType;
|
|
87
82
|
additionalBleAdvertisementData?: Uint8Array;
|
|
88
83
|
pairingCodes: PairingCodes;
|
|
84
|
+
mdns?: MdnsAdvertiser.Options;
|
|
85
|
+
ble?: BleAdvertiser.Options;
|
|
89
86
|
[Val.properties](endpoint: Endpoint): {
|
|
90
87
|
readonly pairingCodes: {
|
|
91
88
|
manualPairingCode: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommissioningServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACH,eAAe,EAGf,YAAY,EAKZ,KAAK,EACL,UAAU,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAIrD,OAAO,
|
|
1
|
+
{"version":3,"file":"CommissioningServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACH,eAAe,EAGf,YAAY,EAKZ,KAAK,EACL,UAAU,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAIrD,OAAO,EACH,aAAa,EAIb,wBAAwB,EACxB,YAAY,EAGZ,cAAc,EAEd,GAAG,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,qBAAqB,EAGrB,WAAW,EAId,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO/D;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IAC7C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IACnC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,CAAC;IAE/C,OAAgB,KAAK,UAAQ;IAEpB,UAAU;IAgCJ,CAAC,MAAM,CAAC,YAAY,CAAC;IAQpC,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY;IAgIvE;;;;;OAKG;IACG,uBAAuB;IAY7B;;;OAGG;IACH,SAAS,CAAC,oBAAoB;IAQ9B;;;;OAIG;IACH,SAAS,CAAC,qBAAqB;IAoB/B;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ;;;;IA0BrC;;OAEG;IACH,gBAAyB,MAAM,gBAQ5B;CAYN;AAED,yBAAiB,mBAAmB,CAAC;IACjC,UAAiB,YAAY;QACzB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;KACzB;IAED,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAa;QAEpD;;;WAGG;QACH,KAAK,QAEF;QAEH;;WAEG;QACH,IAAI,SAAO;KACd;IAED,MAAa,KAAK;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,UAAS;QACrB,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAM;QAC5D,QAAQ,SAAM;QACd,aAAa,SAAM;QACnB,QAAQ,wBAAkC;QAC1C,8BAA8B,CAAC,EAAE,UAAU,CAAa;QACxD,YAAY,EAAS,YAAY,CAAC;QAClC,IAAI,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC;QAC9B,GAAG,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC;QAE5B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,QAAQ;;;;;;;KAkBtC;IAED,MAAa,MAAO,SAAQ,YAAY;QACpC,YAAY,6CAA0C;QACtD,cAAc,6CAA0C;QACxD,cAAc,qEAAkE;QAChF,eAAe,kDAA+C;KACjE;CACJ"}
|
|
@@ -63,6 +63,7 @@ class CommissioningServer extends Behavior {
|
|
|
63
63
|
}
|
|
64
64
|
this.reactTo(this.endpoint.lifecycle.online, this.#enterOnlineMode);
|
|
65
65
|
this.reactTo(this.endpoint.lifecycle.goingOffline, this.#enterOfflineMode);
|
|
66
|
+
this.reactTo(this.env.get(FabricManager).events.added, this.enterOperationalMode);
|
|
66
67
|
}
|
|
67
68
|
async [Symbol.asyncDispose]() {
|
|
68
69
|
this.#enterOfflineMode();
|
|
@@ -141,7 +142,7 @@ class CommissioningServer extends Behavior {
|
|
|
141
142
|
});
|
|
142
143
|
failsafe.construction.change.on(listener);
|
|
143
144
|
}
|
|
144
|
-
#enterOnlineMode() {
|
|
145
|
+
async #enterOnlineMode() {
|
|
145
146
|
if (this.endpoint.lifecycle.isCommissioned) {
|
|
146
147
|
this.enterOperationalMode();
|
|
147
148
|
return;
|
|
@@ -155,7 +156,7 @@ class CommissioningServer extends Behavior {
|
|
|
155
156
|
if (!this.#hasAdvertisableDeviceType) {
|
|
156
157
|
return;
|
|
157
158
|
}
|
|
158
|
-
this.enterCommissionableMode();
|
|
159
|
+
await this.enterCommissionableMode();
|
|
159
160
|
}
|
|
160
161
|
#enterOfflineMode() {
|
|
161
162
|
this.internal.mutex.run(async () => {
|
|
@@ -171,14 +172,13 @@ class CommissioningServer extends Behavior {
|
|
|
171
172
|
* The server normally invokes this method when the node starts and is not yet commissioned. You can disable by
|
|
172
173
|
* setting {@link CommissioningServer.State#enabled} to false. Then you must invoke yourself.
|
|
173
174
|
*/
|
|
174
|
-
enterCommissionableMode() {
|
|
175
|
+
async enterCommissionableMode() {
|
|
175
176
|
if (!this.#hasAdvertisableDeviceType) {
|
|
176
177
|
throw new ImplementationError(
|
|
177
178
|
`Node ${this.endpoint} has no endpoints with advertisable device types; you must add an endpoint or set the device type`
|
|
178
179
|
);
|
|
179
180
|
}
|
|
180
|
-
this.env.get(DeviceCommissioner);
|
|
181
|
-
this.beginAdvertising();
|
|
181
|
+
await this.env.get(DeviceCommissioner).allowBasicCommissioning();
|
|
182
182
|
this.initiateCommissioning();
|
|
183
183
|
}
|
|
184
184
|
/**
|
|
@@ -186,7 +186,10 @@ class CommissioningServer extends Behavior {
|
|
|
186
186
|
* commissioning.
|
|
187
187
|
*/
|
|
188
188
|
enterOperationalMode() {
|
|
189
|
-
this.
|
|
189
|
+
if (!this.endpoint.lifecycle.isOnline) {
|
|
190
|
+
throw new ImplementationError("Cannot advertise offline server");
|
|
191
|
+
}
|
|
192
|
+
this.env.get(DeviceAdvertiser).enterOperationalMode();
|
|
190
193
|
}
|
|
191
194
|
/**
|
|
192
195
|
* Display instructions on commissioning the device.
|
|
@@ -248,16 +251,6 @@ class CommissioningServer extends Behavior {
|
|
|
248
251
|
FieldElement({ name: "discriminator", type: "uint16", quality: "N" })
|
|
249
252
|
]
|
|
250
253
|
});
|
|
251
|
-
/**
|
|
252
|
-
* Advertise and continue advertising at regular intervals until timeout per Matter specification. If already
|
|
253
|
-
* advertising, the advertisement timeout resets.
|
|
254
|
-
*/
|
|
255
|
-
beginAdvertising() {
|
|
256
|
-
if (!this.endpoint.lifecycle.isOnline) {
|
|
257
|
-
throw new ImplementationError("Cannot advertise offline server");
|
|
258
|
-
}
|
|
259
|
-
this.env.get(DeviceAdvertiser).startAdvertising().catch((error) => logger.error("Failed to open advertisement window", error));
|
|
260
|
-
}
|
|
261
254
|
#initializeNode() {
|
|
262
255
|
this.state.commissioned = !!this.agent.get(OperationalCredentialsBehavior).state.commissionedFabrics;
|
|
263
256
|
this.endpoint.lifecycle.initialized.emit(this.state.commissioned);
|
|
@@ -291,6 +284,8 @@ class CommissioningServer extends Behavior {
|
|
|
291
284
|
flowType = CommissioningFlowType.Standard;
|
|
292
285
|
additionalBleAdvertisementData = void 0;
|
|
293
286
|
pairingCodes = {};
|
|
287
|
+
mdns;
|
|
288
|
+
ble;
|
|
294
289
|
[Val.properties](endpoint) {
|
|
295
290
|
return {
|
|
296
291
|
get pairingCodes() {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/behavior/system/commissioning/CommissioningServer.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,eAAe,oBAAoB;AAI5C;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["CommissioningServer"]
|
|
6
6
|
}
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
FabricAuthority,
|
|
16
16
|
FabricAuthorityConfigurationProvider,
|
|
17
17
|
FabricManager,
|
|
18
|
-
|
|
18
|
+
MdnsClient,
|
|
19
19
|
MdnsService,
|
|
20
20
|
ScannerSet
|
|
21
21
|
} from "#protocol";
|
|
@@ -33,13 +33,13 @@ class ControllerBehavior extends Behavior {
|
|
|
33
33
|
this.state.ip = true;
|
|
34
34
|
}
|
|
35
35
|
if (this.state.ip !== false) {
|
|
36
|
-
this.env.get(ScannerSet).add((await this.env.load(MdnsService)).
|
|
36
|
+
this.env.get(ScannerSet).add((await this.env.load(MdnsService)).client);
|
|
37
37
|
}
|
|
38
38
|
if (this.state.ble === void 0) {
|
|
39
39
|
this.state.ble = (await this.agent.load(NetworkServer)).state.ble;
|
|
40
40
|
}
|
|
41
41
|
if (this.state.ble !== false) {
|
|
42
|
-
this.env.get(ScannerSet).add(Ble.get().
|
|
42
|
+
this.env.get(ScannerSet).add(Ble.get().scanner);
|
|
43
43
|
}
|
|
44
44
|
if (!this.env.has(FabricAuthorityConfigurationProvider)) {
|
|
45
45
|
const biState = this.endpoint.stateOf(BasicInformationBehavior);
|
|
@@ -84,7 +84,7 @@ class ControllerBehavior extends Behavior {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
if (this.state.ble) {
|
|
87
|
-
netInterfaces.add(Ble.get().
|
|
87
|
+
netInterfaces.add(Ble.get().centralInterface);
|
|
88
88
|
}
|
|
89
89
|
const subscriptions = this.env.get(ClientSubscriptions);
|
|
90
90
|
const interactionServer = this.env.get(InteractionServer);
|
|
@@ -117,7 +117,7 @@ class ControllerBehavior extends Behavior {
|
|
|
117
117
|
this.internal.mdnsTargetCriteria.operationalTargets.push({ operationalId: fabric.operationalId });
|
|
118
118
|
}
|
|
119
119
|
#enableScanningForScanner(scanner) {
|
|
120
|
-
if (!(scanner instanceof
|
|
120
|
+
if (!(scanner instanceof MdnsClient)) {
|
|
121
121
|
return;
|
|
122
122
|
}
|
|
123
123
|
scanner.targetCriteriaProviders.add(this.internal.mdnsTargetCriteria);
|
|
@@ -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,qBAAqB,oBAAoB,iBAAiB,6BAA6B;AAChG,SAAS,YAAY;AACrB,SAAS,yBAAyB;AAClC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAEA;AAAA,OACG;AAEP,SAAS,2BAA2B;AACpC,SAAS,qBAAqB;AAC9B,SAAS,yBAAyB;AAW3B,MAAM,2BAA2B,SAAS;AAAA,EAC7C,OAAyB,KAAK;AAAA,EAK9B,MAAe,aAAa;AACxB,QAAI,KAAK,MAAM,qBAAqB,UAAa,KAAK,MAAM,qBAAqB,IAAI;AACjF,YAAM,IAAI,oBAAoB,sDAAsD;AAAA,IACxF;AACA,UAAM,mBAAmB,KAAK,MAAM;AAGpC,QAAI,KAAK,MAAM,OAAO,QAAW;AAC7B,WAAK,MAAM,KAAK;AAAA,IACpB;AACA,QAAI,KAAK,MAAM,OAAO,OAAO;AACzB,WAAK,IAAI,IAAI,UAAU,EAAE,KAAK,MAAM,KAAK,IAAI,KAAK,WAAW,GAAG,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ControllerBehavior"]
|
|
6
6
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Environmental } from "#general";
|
|
7
|
-
import {
|
|
7
|
+
import { MdnsClient, ScannerSet } from "#protocol";
|
|
8
8
|
class ActiveDiscoveries extends Set {
|
|
9
9
|
#env;
|
|
10
10
|
#mdnsTargetCriteria;
|
|
@@ -30,7 +30,7 @@ class ActiveDiscoveries extends Set {
|
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
#activateCommissionableScanningFor(scanner) {
|
|
33
|
-
if (!(scanner instanceof
|
|
33
|
+
if (!(scanner instanceof MdnsClient)) {
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
if (this.#mdnsTargetCriteria === void 0) {
|
|
@@ -44,7 +44,7 @@ class ActiveDiscoveries extends Set {
|
|
|
44
44
|
}
|
|
45
45
|
const scanners = this.#env.get(ScannerSet);
|
|
46
46
|
for (const scanner of scanners) {
|
|
47
|
-
if (scanner instanceof
|
|
47
|
+
if (scanner instanceof MdnsClient) {
|
|
48
48
|
scanner.targetCriteriaProviders.delete(this.#mdnsTargetCriteria);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/behavior/system/controller/discovery/ActiveDiscoveries.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAsB,qBAAqB;AAC3C,SAAS,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAsB,qBAAqB;AAC3C,SAAS,YAAgD,kBAAkB;AAMpE,MAAM,0BAA0B,IAAoB;AAAA,EACvD;AAAA,EACA;AAAA,EAEA,YAAY,KAAkB;AAC1B,UAAM;AAEN,SAAK,OAAO;AAEZ,SAAK,gCAAgC;AACrC,QAAI,IAAI,UAAU,EAAE,MAAM,GAAG,KAAK,mCAAmC,KAAK,IAAI,CAAC;AAAA,EACnF;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,kBAAkB,GAAG;AAC1C,QAAI,IAAI,mBAAmB,QAAQ;AACnC,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,QAAQ;AACV,SAAK,KAAK,OAAO,mBAAmB,IAAI;AAExC,SAAK,kCAAkC;AAAA,EAC3C;AAAA,EAEA,kCAAkC;AAC9B,UAAM,WAAW,KAAK,KAAK,IAAI,UAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,WAAK,mCAAmC,OAAO;AAAA,IACnD;AAAA,EACJ;AAAA,EAEA,mCAAmC,SAAkB;AACjD,QAAI,EAAE,mBAAmB,aAAa;AAClC;AAAA,IACJ;AAEA,QAAI,KAAK,wBAAwB,QAAW;AACxC,WAAK,sBAAsB,EAAE,gBAAgB,MAAM,oBAAoB,CAAC,EAAE;AAAA,IAC9E;AACA,YAAQ,wBAAwB,IAAI,KAAK,mBAAmB;AAAA,EAChE;AAAA,EAEA,oCAAoC;AAChC,QAAI,CAAC,KAAK,qBAAqB;AAC3B;AAAA,IACJ;AACA,UAAM,WAAW,KAAK,KAAK,IAAI,UAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,UAAI,mBAAmB,YAAY;AAC/B,gBAAQ,wBAAwB,OAAO,KAAK,mBAAmB;AAAA,MACnE;AAAA,IACJ;AAAA,EACJ;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Construction, NetworkInterface, NetworkInterfaceDetailed, TransportInterface, TransportInterfaceSet } from "#general";
|
|
7
7
|
import type { ServerNode } from "#node/ServerNode.js";
|
|
8
|
-
import {
|
|
8
|
+
import { BleAdvertiser, DeviceAdvertiser, MdnsAdvertiser } from "#protocol";
|
|
9
9
|
import { NetworkRuntime } from "./NetworkRuntime.js";
|
|
10
10
|
/**
|
|
11
11
|
* Handles network functionality for {@link NodeServer}.
|
|
@@ -14,15 +14,15 @@ export declare class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
14
14
|
#private;
|
|
15
15
|
get owner(): ServerNode;
|
|
16
16
|
/**
|
|
17
|
-
* Access the MDNS
|
|
17
|
+
* Access the MDNS advertiser for the node.
|
|
18
18
|
*/
|
|
19
|
-
get
|
|
19
|
+
get mdnsAdvertiser(): MdnsAdvertiser;
|
|
20
20
|
get networkInterfaceConfiguration(): NetworkInterface[];
|
|
21
21
|
getNetworkInterfaces(): Promise<NetworkInterfaceDetailed[]>;
|
|
22
22
|
/**
|
|
23
|
-
* A BLE
|
|
23
|
+
* A BLE advertiser.
|
|
24
24
|
*/
|
|
25
|
-
protected get
|
|
25
|
+
protected get bleAdvertiser(): BleAdvertiser;
|
|
26
26
|
/**
|
|
27
27
|
* A BLE transport.
|
|
28
28
|
*/
|
|
@@ -38,7 +38,7 @@ export declare class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
38
38
|
/**
|
|
39
39
|
* When the first Fabric gets added we need to enable MDNS broadcasting.
|
|
40
40
|
*/
|
|
41
|
-
|
|
41
|
+
enableMdnsAdvertising(): void;
|
|
42
42
|
/**
|
|
43
43
|
* On commission we turn off bluetooth and join the IP network if we haven't already.
|
|
44
44
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACH,YAAY,
|
|
1
|
+
{"version":3,"file":"ServerNetworkRuntime.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/network/ServerNetworkRuntime.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACH,YAAY,EAMZ,gBAAgB,EAChB,wBAAwB,EAGxB,kBAAkB,EAClB,qBAAqB,EAExB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAGH,aAAa,EAEb,gBAAgB,EAGhB,cAAc,EAOjB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAcrD;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;;IASpD,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,uBAKzB;IAED;;OAEG;cACa,aAAa,CAAC,UAAU,EAAE,qBAAqB;IAyC/D;;OAEG;cACa,eAAe,CAAC,UAAU,EAAE,gBAAgB;IAqB5D;;OAEG;IACH,qBAAqB;IASrB;;;;OAIG;IACH,qBAAqB;cA+BI,KAAK;IA6Cf,CAAC,YAAY,CAAC,SAAS,CAAC;cAmBd,IAAI;cA6BV,gBAAgB;CA6BtC"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import { SubscriptionBehavior } from "#behavior/system/subscription/SubscriptionBehavior.js";
|
|
7
7
|
import {
|
|
8
8
|
Construction,
|
|
9
|
+
Crypto,
|
|
9
10
|
InterfaceType,
|
|
10
11
|
Logger,
|
|
11
12
|
NetInterfaceSet,
|
|
@@ -19,10 +20,12 @@ import { NodePeerAddressStore } from "#node/client/NodePeerAddressStore.js";
|
|
|
19
20
|
import { InteractionServer } from "#node/server/InteractionServer.js";
|
|
20
21
|
import {
|
|
21
22
|
Ble,
|
|
23
|
+
BleAdvertiser,
|
|
22
24
|
ChannelManager,
|
|
23
25
|
DeviceAdvertiser,
|
|
24
26
|
DeviceCommissioner,
|
|
25
27
|
ExchangeManager,
|
|
28
|
+
MdnsAdvertiser,
|
|
26
29
|
MdnsService,
|
|
27
30
|
PeerAddressStore,
|
|
28
31
|
PeerSet,
|
|
@@ -44,8 +47,8 @@ function convertNetworkEnvironmentType(type) {
|
|
|
44
47
|
return convertedType;
|
|
45
48
|
}
|
|
46
49
|
class ServerNetworkRuntime extends NetworkRuntime {
|
|
47
|
-
#
|
|
48
|
-
#
|
|
50
|
+
#mdnsAdvertiser;
|
|
51
|
+
#bleAdvertiser;
|
|
49
52
|
#bleTransport;
|
|
50
53
|
#ipv6UdpInterface;
|
|
51
54
|
#observers = new ObserverGroup(this);
|
|
@@ -55,13 +58,17 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
55
58
|
return super.owner;
|
|
56
59
|
}
|
|
57
60
|
/**
|
|
58
|
-
* Access the MDNS
|
|
61
|
+
* Access the MDNS advertiser for the node.
|
|
59
62
|
*/
|
|
60
|
-
get
|
|
61
|
-
if (!this.#
|
|
62
|
-
|
|
63
|
+
get mdnsAdvertiser() {
|
|
64
|
+
if (!this.#mdnsAdvertiser) {
|
|
65
|
+
const port = this.owner.state.network.operationalPort;
|
|
66
|
+
const options = this.owner.state.commissioning.mdns;
|
|
67
|
+
const crypto = this.owner.env.get(Crypto);
|
|
68
|
+
const { server } = this.owner.env.get(MdnsService);
|
|
69
|
+
this.#mdnsAdvertiser = new MdnsAdvertiser(crypto, server, { ...options, port });
|
|
63
70
|
}
|
|
64
|
-
return this.#
|
|
71
|
+
return this.#mdnsAdvertiser;
|
|
65
72
|
}
|
|
66
73
|
get networkInterfaceConfiguration() {
|
|
67
74
|
const interfaceConfig = this.owner.env.vars.get(
|
|
@@ -86,21 +93,22 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
86
93
|
return interfaceDetails;
|
|
87
94
|
}
|
|
88
95
|
/**
|
|
89
|
-
* A BLE
|
|
96
|
+
* A BLE advertiser.
|
|
90
97
|
*/
|
|
91
|
-
get
|
|
92
|
-
if (this.#
|
|
93
|
-
const
|
|
94
|
-
|
|
98
|
+
get bleAdvertiser() {
|
|
99
|
+
if (this.#bleAdvertiser === void 0) {
|
|
100
|
+
const { peripheralInterface } = Ble.get();
|
|
101
|
+
const options = this.owner.state.commissioning.ble;
|
|
102
|
+
this.#bleAdvertiser = new BleAdvertiser(peripheralInterface, options);
|
|
95
103
|
}
|
|
96
|
-
return this.#
|
|
104
|
+
return this.#bleAdvertiser;
|
|
97
105
|
}
|
|
98
106
|
/**
|
|
99
107
|
* A BLE transport.
|
|
100
108
|
*/
|
|
101
109
|
get bleTransport() {
|
|
102
110
|
if (this.#bleTransport === void 0) {
|
|
103
|
-
this.#bleTransport = Ble.get().
|
|
111
|
+
this.#bleTransport = Ble.get().peripheralInterface;
|
|
104
112
|
}
|
|
105
113
|
return this.#bleTransport;
|
|
106
114
|
}
|
|
@@ -147,28 +155,28 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
147
155
|
* Add broadcasters to the {@link DeviceAdvertiser}.
|
|
148
156
|
*/
|
|
149
157
|
async addBroadcasters(advertiser) {
|
|
150
|
-
await advertiser.
|
|
158
|
+
await advertiser.clearAdvertisers();
|
|
151
159
|
const isCommissioned = !!this.#commissionedFabrics;
|
|
152
160
|
let discoveryCapabilities = this.owner.state.network.discoveryCapabilities;
|
|
153
161
|
if (isCommissioned) {
|
|
154
162
|
discoveryCapabilities = { onIpNetwork: true };
|
|
155
163
|
}
|
|
156
164
|
if (discoveryCapabilities.onIpNetwork) {
|
|
157
|
-
advertiser.
|
|
165
|
+
advertiser.addAdvertiser(this.mdnsAdvertiser);
|
|
158
166
|
}
|
|
159
167
|
if (discoveryCapabilities.ble) {
|
|
160
|
-
advertiser.
|
|
168
|
+
advertiser.addAdvertiser(this.bleAdvertiser);
|
|
161
169
|
}
|
|
162
170
|
}
|
|
163
171
|
/**
|
|
164
172
|
* When the first Fabric gets added we need to enable MDNS broadcasting.
|
|
165
173
|
*/
|
|
166
|
-
|
|
167
|
-
const
|
|
168
|
-
const
|
|
169
|
-
if (!
|
|
170
|
-
logger.debug("Enabling MDNS
|
|
171
|
-
|
|
174
|
+
enableMdnsAdvertising() {
|
|
175
|
+
const device = this.owner.env.get(DeviceAdvertiser);
|
|
176
|
+
const mdnsAdvertiser = this.mdnsAdvertiser;
|
|
177
|
+
if (!device.hasAdvertiser(mdnsAdvertiser)) {
|
|
178
|
+
logger.debug("Enabling MDNS advertising");
|
|
179
|
+
device.addAdvertiser(mdnsAdvertiser);
|
|
172
180
|
}
|
|
173
181
|
}
|
|
174
182
|
/**
|
|
@@ -177,25 +185,24 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
177
185
|
* On decommission we're destroyed so don't need to handle that case.
|
|
178
186
|
*/
|
|
179
187
|
endUncommissionedMode() {
|
|
180
|
-
this.
|
|
181
|
-
if (this.#
|
|
182
|
-
this.owner.env.runtime.add(this.#
|
|
183
|
-
this.#
|
|
188
|
+
this.enableMdnsAdvertising();
|
|
189
|
+
if (this.#bleAdvertiser) {
|
|
190
|
+
this.owner.env.runtime.add(this.#deleteAdvertiser(this.#bleAdvertiser));
|
|
191
|
+
this.#bleAdvertiser = void 0;
|
|
184
192
|
}
|
|
185
193
|
if (this.#bleTransport) {
|
|
186
|
-
this.owner.env.runtime.add(this.#
|
|
194
|
+
this.owner.env.runtime.add(this.#deleteTransport(this.#bleTransport));
|
|
187
195
|
this.#bleTransport = void 0;
|
|
188
196
|
}
|
|
189
197
|
}
|
|
190
|
-
async #
|
|
191
|
-
const
|
|
192
|
-
await
|
|
193
|
-
await bleBroadcaster.close();
|
|
198
|
+
async #deleteAdvertiser(advertiser) {
|
|
199
|
+
const device = this.owner.env.get(DeviceAdvertiser);
|
|
200
|
+
await device.deleteAdvertiser(advertiser);
|
|
194
201
|
}
|
|
195
|
-
async #
|
|
202
|
+
async #deleteTransport(transport) {
|
|
196
203
|
const transportInterfaces = this.owner.env.get(TransportInterfaceSet);
|
|
197
|
-
transportInterfaces.delete(
|
|
198
|
-
await
|
|
204
|
+
transportInterfaces.delete(transport);
|
|
205
|
+
await transport.close();
|
|
199
206
|
}
|
|
200
207
|
get #commissionedFabrics() {
|
|
201
208
|
return this.owner.state.operationalCredentials.commissionedFabrics;
|
|
@@ -222,11 +229,14 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
222
229
|
env.get(SecureChannelProtocol);
|
|
223
230
|
await this.owner.act("load-sessions", (agent) => agent.load(SessionsBehavior));
|
|
224
231
|
this.#observers.on(this.owner.eventsOf(CommissioningServer).commissioned, this.endUncommissionedMode);
|
|
225
|
-
this
|
|
232
|
+
if (this.owner.stateOf(CommissioningServer).commissioned) {
|
|
233
|
+
this.enableMdnsAdvertising();
|
|
234
|
+
}
|
|
226
235
|
}
|
|
227
236
|
async [Construction.construct]() {
|
|
228
237
|
await super[Construction.construct]();
|
|
229
|
-
|
|
238
|
+
const mdns = await this.owner.env.load(MdnsService);
|
|
239
|
+
this.owner.env.get(ScannerSet).add(mdns.client);
|
|
230
240
|
this.owner.env.set(PeerAddressStore, new NodePeerAddressStore(this.owner));
|
|
231
241
|
await this.owner.env.load(PeerSet);
|
|
232
242
|
if (!this.#formerSubscriptionsHandled) {
|
|
@@ -238,8 +248,8 @@ class ServerNetworkRuntime extends NetworkRuntime {
|
|
|
238
248
|
this.#observers.close();
|
|
239
249
|
const { env } = this.owner;
|
|
240
250
|
await env.close(DeviceCommissioner);
|
|
241
|
-
const advertisementShutdown = this.owner.env.has(DeviceAdvertiser) ? this.owner.env.close(DeviceAdvertiser) : this.#
|
|
242
|
-
this.#
|
|
251
|
+
const advertisementShutdown = this.owner.env.has(DeviceAdvertiser) ? this.owner.env.close(DeviceAdvertiser) : this.#mdnsAdvertiser?.close();
|
|
252
|
+
this.#mdnsAdvertiser = void 0;
|
|
243
253
|
await this.owner.prepareRuntimeShutdown();
|
|
244
254
|
this.#groupNetworking?.close();
|
|
245
255
|
this.#groupNetworking = void 0;
|
|
@@ -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,SAAS,4BAA4B;AACrC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,OACG;AAEP,SAAS,4BAA4B;AACrC,SAAS,yBAAyB;AAClC;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts
CHANGED
|
@@ -39,7 +39,8 @@ export declare namespace AdministratorCommissioningServer {
|
|
|
39
39
|
*/
|
|
40
40
|
minimumCommissioningTimeoutS: number;
|
|
41
41
|
/**
|
|
42
|
-
*
|
|
42
|
+
* Commissioning beyond the standard 15-minute window is "extended commissioning" and has limitations on
|
|
43
|
+
* advertisement. We default to the standard window.
|
|
43
44
|
*/
|
|
44
45
|
maximumCommissioningTimeoutS: number;
|
|
45
46
|
}
|
package/dist/esm/behaviors/administrator-commissioning/AdministratorCommissioningServer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdministratorCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAA+B,KAAK,EAAE,MAAM,UAAU,CAAC;AAiB9D,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AA6B7F;;;;;GAKG;AACH,qBAAa,gCAAiC,SAAQ,kCAAkC;;IAC5E,QAAQ,EAAE,gCAAgC,CAAC,QAAQ,CAAC;IACpD,KAAK,EAAE,gCAAgC,CAAC,KAAK,CAAC;IAEtD,OAAgB,YAAY,UAAS;IAErC;;OAEG;IACY,uBAAuB,CAAC,EACnC,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,IAAI,EACJ,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,8BAA8B;IA+B5D,oFAAoF;IAC9E,4BAA4B,CAAC,EAC/B,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,mCAAmC;IAajE,4DAA4D;IAC7C,mBAAmB;IA0HlC;;OAEG;IACM,CAAC,MAAM,CAAC,YAAY,CAAC;CAMjC;AAED,yBAAiB,gCAAgC,CAAC;IAC9C,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,KAAK,CAAC;QACnC,8BAA8B,CAAC,EAAE,MAAM,IAAI,CAAC;QAE5C;;WAEG;QACH,4BAA4B,SAAmC;QAE/D
|
|
1
|
+
{"version":3,"file":"AdministratorCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAA+B,KAAK,EAAE,MAAM,UAAU,CAAC;AAiB9D,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AA6B7F;;;;;GAKG;AACH,qBAAa,gCAAiC,SAAQ,kCAAkC;;IAC5E,QAAQ,EAAE,gCAAgC,CAAC,QAAQ,CAAC;IACpD,KAAK,EAAE,gCAAgC,CAAC,KAAK,CAAC;IAEtD,OAAgB,YAAY,UAAS;IAErC;;OAEG;IACY,uBAAuB,CAAC,EACnC,oBAAoB,EACpB,aAAa,EACb,UAAU,EACV,IAAI,EACJ,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,8BAA8B;IA+B5D,oFAAoF;IAC9E,4BAA4B,CAAC,EAC/B,oBAAoB,GACvB,EAAE,0BAA0B,CAAC,mCAAmC;IAajE,4DAA4D;IAC7C,mBAAmB;IA0HlC;;OAEG;IACM,CAAC,MAAM,CAAC,YAAY,CAAC;CAMjC;AAED,yBAAiB,gCAAgC,CAAC;IAC9C,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,KAAK,CAAC;QACnC,8BAA8B,CAAC,EAAE,MAAM,IAAI,CAAC;QAE5C;;WAEG;QACH,4BAA4B,SAAmC;QAE/D;;;WAGG;QACH,4BAA4B,SAAoC;KACnE;IAED,MAAa,KAAM,SAAQ,kCAAkC,CAAC,KAAK;QAEtD,YAAY,uDAAsE;KAC9F;CACJ"}
|