@matter/node 0.16.0-alpha.0-20250809-ee8375bcb → 0.16.0-alpha.0-20250812-285b75d83
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
|
@@ -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"}
|
|
@@ -59,6 +59,7 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
59
59
|
}
|
|
60
60
|
this.reactTo(this.endpoint.lifecycle.online, this.#enterOnlineMode);
|
|
61
61
|
this.reactTo(this.endpoint.lifecycle.goingOffline, this.#enterOfflineMode);
|
|
62
|
+
this.reactTo(this.env.get(import_protocol.FabricManager).events.added, this.enterOperationalMode);
|
|
62
63
|
}
|
|
63
64
|
async [Symbol.asyncDispose]() {
|
|
64
65
|
this.#enterOfflineMode();
|
|
@@ -137,7 +138,7 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
137
138
|
});
|
|
138
139
|
failsafe.construction.change.on(listener);
|
|
139
140
|
}
|
|
140
|
-
#enterOnlineMode() {
|
|
141
|
+
async #enterOnlineMode() {
|
|
141
142
|
if (this.endpoint.lifecycle.isCommissioned) {
|
|
142
143
|
this.enterOperationalMode();
|
|
143
144
|
return;
|
|
@@ -151,7 +152,7 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
151
152
|
if (!this.#hasAdvertisableDeviceType) {
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
154
|
-
this.enterCommissionableMode();
|
|
155
|
+
await this.enterCommissionableMode();
|
|
155
156
|
}
|
|
156
157
|
#enterOfflineMode() {
|
|
157
158
|
this.internal.mutex.run(async () => {
|
|
@@ -167,14 +168,13 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
167
168
|
* The server normally invokes this method when the node starts and is not yet commissioned. You can disable by
|
|
168
169
|
* setting {@link CommissioningServer.State#enabled} to false. Then you must invoke yourself.
|
|
169
170
|
*/
|
|
170
|
-
enterCommissionableMode() {
|
|
171
|
+
async enterCommissionableMode() {
|
|
171
172
|
if (!this.#hasAdvertisableDeviceType) {
|
|
172
173
|
throw new import_general.ImplementationError(
|
|
173
174
|
`Node ${this.endpoint} has no endpoints with advertisable device types; you must add an endpoint or set the device type`
|
|
174
175
|
);
|
|
175
176
|
}
|
|
176
|
-
this.env.get(import_protocol.DeviceCommissioner);
|
|
177
|
-
this.beginAdvertising();
|
|
177
|
+
await this.env.get(import_protocol.DeviceCommissioner).allowBasicCommissioning();
|
|
178
178
|
this.initiateCommissioning();
|
|
179
179
|
}
|
|
180
180
|
/**
|
|
@@ -182,7 +182,10 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
182
182
|
* commissioning.
|
|
183
183
|
*/
|
|
184
184
|
enterOperationalMode() {
|
|
185
|
-
this.
|
|
185
|
+
if (!this.endpoint.lifecycle.isOnline) {
|
|
186
|
+
throw new import_general.ImplementationError("Cannot advertise offline server");
|
|
187
|
+
}
|
|
188
|
+
this.env.get(import_protocol.DeviceAdvertiser).enterOperationalMode();
|
|
186
189
|
}
|
|
187
190
|
/**
|
|
188
191
|
* Display instructions on commissioning the device.
|
|
@@ -244,16 +247,6 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
244
247
|
(0, import_model.FieldElement)({ name: "discriminator", type: "uint16", quality: "N" })
|
|
245
248
|
]
|
|
246
249
|
});
|
|
247
|
-
/**
|
|
248
|
-
* Advertise and continue advertising at regular intervals until timeout per Matter specification. If already
|
|
249
|
-
* advertising, the advertisement timeout resets.
|
|
250
|
-
*/
|
|
251
|
-
beginAdvertising() {
|
|
252
|
-
if (!this.endpoint.lifecycle.isOnline) {
|
|
253
|
-
throw new import_general.ImplementationError("Cannot advertise offline server");
|
|
254
|
-
}
|
|
255
|
-
this.env.get(import_protocol.DeviceAdvertiser).startAdvertising().catch((error) => logger.error("Failed to open advertisement window", error));
|
|
256
|
-
}
|
|
257
250
|
#initializeNode() {
|
|
258
251
|
this.state.commissioned = !!this.agent.get(import_OperationalCredentialsBehavior.OperationalCredentialsBehavior).state.commissionedFabrics;
|
|
259
252
|
this.endpoint.lifecycle.initialized.emit(this.state.commissioned);
|
|
@@ -287,6 +280,8 @@ class CommissioningServer extends import_Behavior.Behavior {
|
|
|
287
280
|
flowType = import_types.CommissioningFlowType.Standard;
|
|
288
281
|
additionalBleAdvertisementData = void 0;
|
|
289
282
|
pairingCodes = {};
|
|
283
|
+
mdns;
|
|
284
|
+
ble;
|
|
290
285
|
[import_protocol.Val.properties](endpoint) {
|
|
291
286
|
return {
|
|
292
287
|
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,qBAWO;AACP,mBAA4C;AAI5C,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["CommissioningServer"]
|
|
6
6
|
}
|
|
@@ -46,13 +46,13 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
46
46
|
this.state.ip = true;
|
|
47
47
|
}
|
|
48
48
|
if (this.state.ip !== false) {
|
|
49
|
-
this.env.get(import_protocol.ScannerSet).add((await this.env.load(import_protocol.MdnsService)).
|
|
49
|
+
this.env.get(import_protocol.ScannerSet).add((await this.env.load(import_protocol.MdnsService)).client);
|
|
50
50
|
}
|
|
51
51
|
if (this.state.ble === void 0) {
|
|
52
52
|
this.state.ble = (await this.agent.load(import_NetworkServer.NetworkServer)).state.ble;
|
|
53
53
|
}
|
|
54
54
|
if (this.state.ble !== false) {
|
|
55
|
-
this.env.get(import_protocol.ScannerSet).add(import_protocol.Ble.get().
|
|
55
|
+
this.env.get(import_protocol.ScannerSet).add(import_protocol.Ble.get().scanner);
|
|
56
56
|
}
|
|
57
57
|
if (!this.env.has(import_protocol.FabricAuthorityConfigurationProvider)) {
|
|
58
58
|
const biState = this.endpoint.stateOf(import_basic_information.BasicInformationBehavior);
|
|
@@ -97,7 +97,7 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
if (this.state.ble) {
|
|
100
|
-
netInterfaces.add(import_protocol.Ble.get().
|
|
100
|
+
netInterfaces.add(import_protocol.Ble.get().centralInterface);
|
|
101
101
|
}
|
|
102
102
|
const subscriptions = this.env.get(import_protocol.ClientSubscriptions);
|
|
103
103
|
const interactionServer = this.env.get(import_InteractionServer.InteractionServer);
|
|
@@ -130,7 +130,7 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
130
130
|
this.internal.mdnsTargetCriteria.operationalTargets.push({ operationalId: fabric.operationalId });
|
|
131
131
|
}
|
|
132
132
|
#enableScanningForScanner(scanner) {
|
|
133
|
-
if (!(scanner instanceof import_protocol.
|
|
133
|
+
if (!(scanner instanceof import_protocol.MdnsClient)) {
|
|
134
134
|
return;
|
|
135
135
|
}
|
|
136
136
|
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,sBAAyB;AACzB,+BAAyC;AACzC,qBAAgG;AAChG,kBAAqB;AACrB,+BAAkC;AAClC,sBAaO;AAEP,iCAAoC;AACpC,2BAA8B;AAC9B,+BAAkC;AA5BlC;AAAA;AAAA;AAAA;AAAA;AAuCO,MAAM,2BAA2B,yBAAS;AAAA,EAC7C,OAAyB,KAAK;AAAA,EAK9B,MAAe,aAAa;AACxB,QAAI,KAAK,MAAM,qBAAqB,UAAa,KAAK,MAAM,qBAAqB,IAAI;AACjF,YAAM,IAAI,mCAAoB,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,0BAAU,EAAE,KAAK,MAAM,KAAK,IAAI,KAAK,2BAAW,GAAG,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ControllerBehavior"]
|
|
6
6
|
}
|
|
@@ -53,7 +53,7 @@ class ActiveDiscoveries extends Set {
|
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
#activateCommissionableScanningFor(scanner) {
|
|
56
|
-
if (!(scanner instanceof import_protocol.
|
|
56
|
+
if (!(scanner instanceof import_protocol.MdnsClient)) {
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
59
59
|
if (this.#mdnsTargetCriteria === void 0) {
|
|
@@ -67,7 +67,7 @@ class ActiveDiscoveries extends Set {
|
|
|
67
67
|
}
|
|
68
68
|
const scanners = this.#env.get(import_protocol.ScannerSet);
|
|
69
69
|
for (const scanner of scanners) {
|
|
70
|
-
if (scanner instanceof import_protocol.
|
|
70
|
+
if (scanner instanceof import_protocol.MdnsClient) {
|
|
71
71
|
scanner.targetCriteriaProviders.delete(this.#mdnsTargetCriteria);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
@@ -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,qBAA2C;AAC3C,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA2C;AAC3C,sBAA2E;AAP3E;AAAA;AAAA;AAAA;AAAA;AAaO,MAAM,0BAA0B,IAAoB;AAAA,EACvD;AAAA,EACA;AAAA,EAEA,YAAY,KAAkB;AAC1B,UAAM;AAEN,SAAK,OAAO;AAEZ,SAAK,gCAAgC;AACrC,QAAI,IAAI,0BAAU,EAAE,MAAM,GAAG,KAAK,mCAAmC,KAAK,IAAI,CAAC;AAAA,EACnF;AAAA,EAEA,QAAQ,6BAAc,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,0BAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,WAAK,mCAAmC,OAAO;AAAA,IACnD;AAAA,EACJ;AAAA,EAEA,mCAAmC,SAAkB;AACjD,QAAI,EAAE,mBAAmB,6BAAa;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,0BAAU;AACzC,eAAW,WAAW,UAAU;AAC5B,UAAI,mBAAmB,4BAAY;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"}
|
|
@@ -45,8 +45,8 @@ function convertNetworkEnvironmentType(type) {
|
|
|
45
45
|
return convertedType;
|
|
46
46
|
}
|
|
47
47
|
class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
48
|
-
#
|
|
49
|
-
#
|
|
48
|
+
#mdnsAdvertiser;
|
|
49
|
+
#bleAdvertiser;
|
|
50
50
|
#bleTransport;
|
|
51
51
|
#ipv6UdpInterface;
|
|
52
52
|
#observers = new import_general.ObserverGroup(this);
|
|
@@ -56,13 +56,17 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
56
56
|
return super.owner;
|
|
57
57
|
}
|
|
58
58
|
/**
|
|
59
|
-
* Access the MDNS
|
|
59
|
+
* Access the MDNS advertiser for the node.
|
|
60
60
|
*/
|
|
61
|
-
get
|
|
62
|
-
if (!this.#
|
|
63
|
-
|
|
61
|
+
get mdnsAdvertiser() {
|
|
62
|
+
if (!this.#mdnsAdvertiser) {
|
|
63
|
+
const port = this.owner.state.network.operationalPort;
|
|
64
|
+
const options = this.owner.state.commissioning.mdns;
|
|
65
|
+
const crypto = this.owner.env.get(import_general.Crypto);
|
|
66
|
+
const { server } = this.owner.env.get(import_protocol.MdnsService);
|
|
67
|
+
this.#mdnsAdvertiser = new import_protocol.MdnsAdvertiser(crypto, server, { ...options, port });
|
|
64
68
|
}
|
|
65
|
-
return this.#
|
|
69
|
+
return this.#mdnsAdvertiser;
|
|
66
70
|
}
|
|
67
71
|
get networkInterfaceConfiguration() {
|
|
68
72
|
const interfaceConfig = this.owner.env.vars.get(
|
|
@@ -87,21 +91,22 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
87
91
|
return interfaceDetails;
|
|
88
92
|
}
|
|
89
93
|
/**
|
|
90
|
-
* A BLE
|
|
94
|
+
* A BLE advertiser.
|
|
91
95
|
*/
|
|
92
|
-
get
|
|
93
|
-
if (this.#
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
+
get bleAdvertiser() {
|
|
97
|
+
if (this.#bleAdvertiser === void 0) {
|
|
98
|
+
const { peripheralInterface } = import_protocol.Ble.get();
|
|
99
|
+
const options = this.owner.state.commissioning.ble;
|
|
100
|
+
this.#bleAdvertiser = new import_protocol.BleAdvertiser(peripheralInterface, options);
|
|
96
101
|
}
|
|
97
|
-
return this.#
|
|
102
|
+
return this.#bleAdvertiser;
|
|
98
103
|
}
|
|
99
104
|
/**
|
|
100
105
|
* A BLE transport.
|
|
101
106
|
*/
|
|
102
107
|
get bleTransport() {
|
|
103
108
|
if (this.#bleTransport === void 0) {
|
|
104
|
-
this.#bleTransport = import_protocol.Ble.get().
|
|
109
|
+
this.#bleTransport = import_protocol.Ble.get().peripheralInterface;
|
|
105
110
|
}
|
|
106
111
|
return this.#bleTransport;
|
|
107
112
|
}
|
|
@@ -148,28 +153,28 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
148
153
|
* Add broadcasters to the {@link DeviceAdvertiser}.
|
|
149
154
|
*/
|
|
150
155
|
async addBroadcasters(advertiser) {
|
|
151
|
-
await advertiser.
|
|
156
|
+
await advertiser.clearAdvertisers();
|
|
152
157
|
const isCommissioned = !!this.#commissionedFabrics;
|
|
153
158
|
let discoveryCapabilities = this.owner.state.network.discoveryCapabilities;
|
|
154
159
|
if (isCommissioned) {
|
|
155
160
|
discoveryCapabilities = { onIpNetwork: true };
|
|
156
161
|
}
|
|
157
162
|
if (discoveryCapabilities.onIpNetwork) {
|
|
158
|
-
advertiser.
|
|
163
|
+
advertiser.addAdvertiser(this.mdnsAdvertiser);
|
|
159
164
|
}
|
|
160
165
|
if (discoveryCapabilities.ble) {
|
|
161
|
-
advertiser.
|
|
166
|
+
advertiser.addAdvertiser(this.bleAdvertiser);
|
|
162
167
|
}
|
|
163
168
|
}
|
|
164
169
|
/**
|
|
165
170
|
* When the first Fabric gets added we need to enable MDNS broadcasting.
|
|
166
171
|
*/
|
|
167
|
-
|
|
168
|
-
const
|
|
169
|
-
const
|
|
170
|
-
if (!
|
|
171
|
-
logger.debug("Enabling MDNS
|
|
172
|
-
|
|
172
|
+
enableMdnsAdvertising() {
|
|
173
|
+
const device = this.owner.env.get(import_protocol.DeviceAdvertiser);
|
|
174
|
+
const mdnsAdvertiser = this.mdnsAdvertiser;
|
|
175
|
+
if (!device.hasAdvertiser(mdnsAdvertiser)) {
|
|
176
|
+
logger.debug("Enabling MDNS advertising");
|
|
177
|
+
device.addAdvertiser(mdnsAdvertiser);
|
|
173
178
|
}
|
|
174
179
|
}
|
|
175
180
|
/**
|
|
@@ -178,25 +183,24 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
178
183
|
* On decommission we're destroyed so don't need to handle that case.
|
|
179
184
|
*/
|
|
180
185
|
endUncommissionedMode() {
|
|
181
|
-
this.
|
|
182
|
-
if (this.#
|
|
183
|
-
this.owner.env.runtime.add(this.#
|
|
184
|
-
this.#
|
|
186
|
+
this.enableMdnsAdvertising();
|
|
187
|
+
if (this.#bleAdvertiser) {
|
|
188
|
+
this.owner.env.runtime.add(this.#deleteAdvertiser(this.#bleAdvertiser));
|
|
189
|
+
this.#bleAdvertiser = void 0;
|
|
185
190
|
}
|
|
186
191
|
if (this.#bleTransport) {
|
|
187
|
-
this.owner.env.runtime.add(this.#
|
|
192
|
+
this.owner.env.runtime.add(this.#deleteTransport(this.#bleTransport));
|
|
188
193
|
this.#bleTransport = void 0;
|
|
189
194
|
}
|
|
190
195
|
}
|
|
191
|
-
async #
|
|
192
|
-
const
|
|
193
|
-
await
|
|
194
|
-
await bleBroadcaster.close();
|
|
196
|
+
async #deleteAdvertiser(advertiser) {
|
|
197
|
+
const device = this.owner.env.get(import_protocol.DeviceAdvertiser);
|
|
198
|
+
await device.deleteAdvertiser(advertiser);
|
|
195
199
|
}
|
|
196
|
-
async #
|
|
200
|
+
async #deleteTransport(transport) {
|
|
197
201
|
const transportInterfaces = this.owner.env.get(import_general.TransportInterfaceSet);
|
|
198
|
-
transportInterfaces.delete(
|
|
199
|
-
await
|
|
202
|
+
transportInterfaces.delete(transport);
|
|
203
|
+
await transport.close();
|
|
200
204
|
}
|
|
201
205
|
get #commissionedFabrics() {
|
|
202
206
|
return this.owner.state.operationalCredentials.commissionedFabrics;
|
|
@@ -223,11 +227,14 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
223
227
|
env.get(import_protocol.SecureChannelProtocol);
|
|
224
228
|
await this.owner.act("load-sessions", (agent) => agent.load(import_SessionsBehavior.SessionsBehavior));
|
|
225
229
|
this.#observers.on(this.owner.eventsOf(import_CommissioningServer.CommissioningServer).commissioned, this.endUncommissionedMode);
|
|
226
|
-
this
|
|
230
|
+
if (this.owner.stateOf(import_CommissioningServer.CommissioningServer).commissioned) {
|
|
231
|
+
this.enableMdnsAdvertising();
|
|
232
|
+
}
|
|
227
233
|
}
|
|
228
234
|
async [import_general.Construction.construct]() {
|
|
229
235
|
await super[import_general.Construction.construct]();
|
|
230
|
-
|
|
236
|
+
const mdns = await this.owner.env.load(import_protocol.MdnsService);
|
|
237
|
+
this.owner.env.get(import_protocol.ScannerSet).add(mdns.client);
|
|
231
238
|
this.owner.env.set(import_protocol.PeerAddressStore, new import_NodePeerAddressStore.NodePeerAddressStore(this.owner));
|
|
232
239
|
await this.owner.env.load(import_protocol.PeerSet);
|
|
233
240
|
if (!this.#formerSubscriptionsHandled) {
|
|
@@ -239,8 +246,8 @@ class ServerNetworkRuntime extends import_NetworkRuntime.NetworkRuntime {
|
|
|
239
246
|
this.#observers.close();
|
|
240
247
|
const { env } = this.owner;
|
|
241
248
|
await env.close(import_protocol.DeviceCommissioner);
|
|
242
|
-
const advertisementShutdown = this.owner.env.has(import_protocol.DeviceAdvertiser) ? this.owner.env.close(import_protocol.DeviceAdvertiser) : this.#
|
|
243
|
-
this.#
|
|
249
|
+
const advertisementShutdown = this.owner.env.has(import_protocol.DeviceAdvertiser) ? this.owner.env.close(import_protocol.DeviceAdvertiser) : this.#mdnsAdvertiser?.close();
|
|
250
|
+
this.#mdnsAdvertiser = void 0;
|
|
244
251
|
await this.owner.prepareRuntimeShutdown();
|
|
245
252
|
this.#groupNetworking?.close();
|
|
246
253
|
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,kCAAqC;AACrC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/cjs/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/cjs/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"}
|
|
@@ -152,13 +152,13 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
152
152
|
if (commissioningTimeout > this.internal.maximumCommissioningTimeoutS) {
|
|
153
153
|
throw new import_types.StatusResponseError(
|
|
154
154
|
`Commissioning timeout must not exceed ${this.internal.maximumCommissioningTimeoutS} seconds.`,
|
|
155
|
-
import_types.
|
|
155
|
+
import_types.Status.InvalidCommand
|
|
156
156
|
);
|
|
157
157
|
}
|
|
158
158
|
if (commissioningTimeout < this.internal.minimumCommissioningTimeoutS) {
|
|
159
159
|
throw new import_types.StatusResponseError(
|
|
160
160
|
`Commissioning timeout must not be lower then ${this.internal.minimumCommissioningTimeoutS} seconds.`,
|
|
161
|
-
import_types.
|
|
161
|
+
import_types.Status.InvalidCommand
|
|
162
162
|
);
|
|
163
163
|
}
|
|
164
164
|
if (commissioner.isFailsafeArmed) {
|
|
@@ -169,7 +169,7 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
169
169
|
* This method is used internally when the commissioning window timer expires or the commissioning was completed.
|
|
170
170
|
*/
|
|
171
171
|
#endCommissioning() {
|
|
172
|
-
logger.debug("
|
|
172
|
+
logger.debug("Ending commissioning");
|
|
173
173
|
if (this.internal.commissioningWindowTimeout !== void 0) {
|
|
174
174
|
this.internal.commissioningWindowTimeout.stop();
|
|
175
175
|
this.internal.commissioningWindowTimeout = void 0;
|
|
@@ -218,9 +218,10 @@ class AdministratorCommissioningServer extends import_AdministratorCommissioning
|
|
|
218
218
|
*/
|
|
219
219
|
minimumCommissioningTimeoutS = import_types.MINIMUM_COMMISSIONING_TIMEOUT_S;
|
|
220
220
|
/**
|
|
221
|
-
*
|
|
221
|
+
* Commissioning beyond the standard 15-minute window is "extended commissioning" and has limitations on
|
|
222
|
+
* advertisement. We default to the standard window.
|
|
222
223
|
*/
|
|
223
|
-
maximumCommissioningTimeoutS = import_types.
|
|
224
|
+
maximumCommissioningTimeoutS = import_types.STANDARD_COMMISSIONING_TIMEOUT_S;
|
|
224
225
|
}
|
|
225
226
|
AdministratorCommissioningServer2.Internal = Internal;
|
|
226
227
|
class State extends import_AdministratorCommissioningBehavior.AdministratorCommissioningBehavior.State {
|
package/dist/cjs/behaviors/administrator-commissioning/AdministratorCommissioningServer.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/behaviors/administrator-commissioning/AdministratorCommissioningServer.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["AdministratorCommissioningServer"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"GeneralCommissioningServer.d.ts","sourceRoot":"","sources":["../../../../src/behaviors/general-commissioning/GeneralCommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAA8C,YAAY,EAAE,MAAM,UAAU,CAAC;AAGpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAMjF;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,4BAA4B;;IAChE,KAAK,EAAE,0BAA0B,CAAC,KAAK,CAAC;IAEhD,OAAgB,YAAY,UAAS;IAE5B,UAAU,IAAI,YAAY;IA+F1B,WAAW,CAAC,OAAO,EAAE,oBAAoB,CAAC,kBAAkB;;;;IAItD,mBAAmB,CAAC,EAC/B,UAAU,EACV,mBAAmB,EACnB,WAAW,GACd,EAAE,oBAAoB,CAAC,0BAA0B;;;;IAyEnC,qBAAqB;;;;CAkDvC;AAED,yBAAiB,0BAA0B,CAAC;IAGxC,MAAa,KAAM,SAAQ,4BAA4B,CAAC,KAAK;QACzD;;WAEG;QACH,sBAAsB,UAAQ;QAE9B;;WAEG;QACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAa;KAC/C;CACJ"}
|
|
@@ -178,7 +178,13 @@ class GeneralCommissioningServer extends import_GeneralCommissioningBehavior.Gen
|
|
|
178
178
|
}
|
|
179
179
|
await failsafeContext.completeCommission();
|
|
180
180
|
this.state.breadcrumb = BigInt(0);
|
|
181
|
-
logger.info(
|
|
181
|
+
logger.info(
|
|
182
|
+
"Commissioned",
|
|
183
|
+
import_general.Diagnostic.dict({
|
|
184
|
+
fabric: `${import_general.Bytes.toHex(fabric.operationalId)} (#${fabric.fabricIndex})`,
|
|
185
|
+
node: fabric.nodeId.toString(16).padStart(16, "0")
|
|
186
|
+
})
|
|
187
|
+
);
|
|
182
188
|
return SuccessResponse;
|
|
183
189
|
}
|
|
184
190
|
}
|