@matter/protocol 0.12.0-alpha.0-20241226-0f5b0fe87 → 0.12.0-alpha.0-20241228-9f74a0273
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/fabric/Fabric.d.ts +2 -1
- package/dist/cjs/fabric/Fabric.d.ts.map +1 -1
- package/dist/cjs/fabric/Fabric.js +21 -5
- package/dist/cjs/fabric/Fabric.js.map +1 -1
- package/dist/cjs/fabric/FabricAuthority.d.ts +2 -0
- package/dist/cjs/fabric/FabricAuthority.d.ts.map +1 -1
- package/dist/cjs/fabric/FabricAuthority.js +7 -1
- package/dist/cjs/fabric/FabricAuthority.js.map +1 -1
- package/dist/cjs/peer/ControllerCommissioningFlow.d.ts.map +1 -1
- package/dist/cjs/peer/ControllerCommissioningFlow.js +105 -49
- package/dist/cjs/peer/ControllerCommissioningFlow.js.map +1 -1
- package/dist/cjs/session/SecureSession.d.ts +1 -0
- package/dist/cjs/session/SecureSession.d.ts.map +1 -1
- package/dist/cjs/session/SecureSession.js +7 -1
- package/dist/cjs/session/SecureSession.js.map +1 -1
- package/dist/esm/fabric/Fabric.d.ts +2 -1
- package/dist/esm/fabric/Fabric.d.ts.map +1 -1
- package/dist/esm/fabric/Fabric.js +22 -5
- package/dist/esm/fabric/Fabric.js.map +1 -1
- package/dist/esm/fabric/FabricAuthority.d.ts +2 -0
- package/dist/esm/fabric/FabricAuthority.d.ts.map +1 -1
- package/dist/esm/fabric/FabricAuthority.js +7 -1
- package/dist/esm/fabric/FabricAuthority.js.map +1 -1
- package/dist/esm/peer/ControllerCommissioningFlow.d.ts.map +1 -1
- package/dist/esm/peer/ControllerCommissioningFlow.js +105 -49
- package/dist/esm/peer/ControllerCommissioningFlow.js.map +1 -1
- package/dist/esm/session/SecureSession.d.ts +1 -0
- package/dist/esm/session/SecureSession.d.ts.map +1 -1
- package/dist/esm/session/SecureSession.js +7 -1
- package/dist/esm/session/SecureSession.js.map +1 -1
- package/package.json +6 -6
- package/src/fabric/Fabric.ts +24 -5
- package/src/fabric/FabricAuthority.ts +11 -2
- package/src/peer/ControllerCommissioningFlow.ts +116 -51
- package/src/session/SecureSession.ts +7 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SecureSession.d.ts","sourceRoot":"","sources":["../../../src/session/SecureSession.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,QAAQ,EASX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAe,MAAM,EAAc,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,EAAgB,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACxG,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAO1D,qBAAa,uBAAwB,SAAQ,mBAAmB;gBAChD,OAAO,EAAE,MAAM;CAG9B;AAED,qBAAa,aAAc,SAAQ,OAAO;;
|
|
1
|
+
{"version":3,"file":"SecureSession.d.ts","sourceRoot":"","sources":["../../../src/session/SecureSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ class SecureSession extends import_Session.Session {
|
|
|
48
48
|
#closingAfterExchangeFinished = false;
|
|
49
49
|
#sendCloseMessageWhenClosing = true;
|
|
50
50
|
#id;
|
|
51
|
+
#isInitiator;
|
|
51
52
|
#fabric;
|
|
52
53
|
#peerNodeId;
|
|
53
54
|
#peerSessionId;
|
|
@@ -114,7 +115,8 @@ class SecureSession extends import_Session.Session {
|
|
|
114
115
|
decryptKey,
|
|
115
116
|
encryptKey,
|
|
116
117
|
attestationKey,
|
|
117
|
-
caseAuthenticatedTags
|
|
118
|
+
caseAuthenticatedTags,
|
|
119
|
+
isInitiator
|
|
118
120
|
} = args;
|
|
119
121
|
this.#id = id;
|
|
120
122
|
this.#fabric = fabric;
|
|
@@ -124,6 +126,7 @@ class SecureSession extends import_Session.Session {
|
|
|
124
126
|
this.#encryptKey = encryptKey;
|
|
125
127
|
this.#attestationKey = attestationKey;
|
|
126
128
|
this.#caseAuthenticatedTags = caseAuthenticatedTags ?? [];
|
|
129
|
+
this.#isInitiator = isInitiator;
|
|
127
130
|
manager?.sessions.add(this);
|
|
128
131
|
fabric?.addSession(this);
|
|
129
132
|
logger.debug(
|
|
@@ -159,6 +162,9 @@ class SecureSession extends import_Session.Session {
|
|
|
159
162
|
get subscriptions() {
|
|
160
163
|
return this.#subscriptions;
|
|
161
164
|
}
|
|
165
|
+
get isInitiator() {
|
|
166
|
+
return this.#isInitiator;
|
|
167
|
+
}
|
|
162
168
|
get isClosing() {
|
|
163
169
|
return this.#isClosing;
|
|
164
170
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/session/SecureSession.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAUO;AAEP,yBAA4B;AAC5B,mBAA2F;AAC3F,0BAA6E;AAE7E,4BAA+B;AAC/B,mCAA8D;AAC9D,qBAAiD;AAxBjD;AAAA;AAAA;AAAA;AAAA;AA2BA,MAAM,SAAS,sBAAO,IAAI,eAAe;AAEzC,MAAM,oBAAoB,qBAAM,WAAW,aAAa;AACxD,MAAM,+BAA+B,qBAAM,WAAW,uBAAuB;AAEtE,MAAM,gCAAgC,iCAAoB;AAAA,EAC7D,YAAY,SAAiB;AACzB,UAAM,SAAS,wBAAW,iBAAiB;AAAA,EAC/C;AACJ;AAEO,MAAM,sBAAsB,uBAAQ;AAAA,EAC9B,iBAAiB,IAAI,wBAAuB;AAAA,EACrD,gCAAgC;AAAA,EAChC,+BAA+B;AAAA,EACtB;AAAA,EACT;AAAA,EACS;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACT;AAAA,EACA,aAAa;AAAA,EACJ,cAAc;AAAA,EAEvB,aAAa,OAAO,MAYjB;AACC,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AACJ,UAAM,OAAO,MAAM,sBAAO;AAAA,MACtB;AAAA,MACA;AAAA,MACA,eAAe,+BAA+B;AAAA,MAC9C,6CAA8B;AAAA,IAClC;AACA,UAAM,aAAa,cAAc,KAAK,MAAM,IAAI,EAAE,IAAI,KAAK,MAAM,GAAG,EAAE;AACtE,UAAM,aAAa,cAAc,KAAK,MAAM,GAAG,EAAE,IAAI,KAAK,MAAM,IAAI,EAAE;AACtE,UAAM,iBAAiB,KAAK,MAAM,IAAI,EAAE;AACxC,WAAO,IAAI,cAAc;AAAA,MACrB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,mBAAmB;AAAA,MACnB;AAAA,MACA;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,YAAY,MAYT;AACC,UAAM;AAAA,MACF,GAAG;AAAA,MACH,oBAAoB;AAAA;AAAA;AAAA,MAEpB,gBAAgB,IAAI,qCAAe,MAAM;AAGrC,aAAK,IAAI,MAAM,IAAI,EAAE,MAAM,WAAS,OAAO,MAAM,gCAAgC,KAAK,EAAE,CAAC;AAAA,MAC7F,CAAC;AAAA,MACD,uBAAuB,IAAI,2EAA8C;AAAA,IAC7E,CAAC;AACD,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AAEJ,SAAK,MAAM;AACX,SAAK,UAAU;AACf,SAAK,cAAc;AACnB,SAAK,iBAAiB;AACtB,SAAK,cAAc;AACnB,SAAK,cAAc;AACnB,SAAK,kBAAkB;AACvB,SAAK,yBAAyB,yBAAyB,CAAC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -32,9 +32,9 @@ export declare class Fabric {
|
|
|
32
32
|
readonly operationalIdentityProtectionKey: Uint8Array;
|
|
33
33
|
readonly intermediateCACert: Uint8Array | undefined;
|
|
34
34
|
readonly operationalCert: Uint8Array;
|
|
35
|
-
label: string;
|
|
36
35
|
constructor(config: Fabric.Config);
|
|
37
36
|
get config(): Fabric.Config;
|
|
37
|
+
get label(): string;
|
|
38
38
|
setLabel(label: string): Promise<void>;
|
|
39
39
|
get publicKey(): Uint8Array<ArrayBufferLike>;
|
|
40
40
|
sign(data: Uint8Array): Uint8Array<ArrayBufferLike>;
|
|
@@ -92,6 +92,7 @@ export declare class FabricBuilder {
|
|
|
92
92
|
setRootVendorId(rootVendorId: VendorId): this;
|
|
93
93
|
setRootNodeId(rootNodeId: NodeId): this;
|
|
94
94
|
setIdentityProtectionKey(key: Uint8Array): this;
|
|
95
|
+
setLabel(label: string): this;
|
|
95
96
|
initializeFromFabricForUpdate(fabric: Fabric): void;
|
|
96
97
|
matchesToFabric(fabric: Fabric): boolean;
|
|
97
98
|
get nodeId(): NodeId | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fabric.d.ts","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EACH,aAAa,
|
|
1
|
+
{"version":3,"file":"Fabric.d.ts","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
Crypto,
|
|
16
16
|
DataWriter,
|
|
17
17
|
Endian,
|
|
18
|
+
ImplementationError,
|
|
18
19
|
InternalError,
|
|
19
20
|
Logger,
|
|
20
21
|
MatterError,
|
|
@@ -71,7 +72,7 @@ class Fabric {
|
|
|
71
72
|
#scopedClusterData;
|
|
72
73
|
#keyPair;
|
|
73
74
|
#sessions = /* @__PURE__ */ new Set();
|
|
74
|
-
label;
|
|
75
|
+
#label;
|
|
75
76
|
#removeCallbacks = new Array();
|
|
76
77
|
#persistCallback;
|
|
77
78
|
constructor(config) {
|
|
@@ -87,7 +88,7 @@ class Fabric {
|
|
|
87
88
|
this.operationalIdentityProtectionKey = config.operationalIdentityProtectionKey;
|
|
88
89
|
this.intermediateCACert = config.intermediateCACert;
|
|
89
90
|
this.operationalCert = config.operationalCert;
|
|
90
|
-
this
|
|
91
|
+
this.#label = config.label;
|
|
91
92
|
this.#keyPair = PrivateKey(config.keyPair);
|
|
92
93
|
this.#scopedClusterData = config.scopedClusterData ?? /* @__PURE__ */ new Map();
|
|
93
94
|
}
|
|
@@ -106,12 +107,21 @@ class Fabric {
|
|
|
106
107
|
operationalIdentityProtectionKey: this.operationalIdentityProtectionKey,
|
|
107
108
|
intermediateCACert: this.intermediateCACert,
|
|
108
109
|
operationalCert: this.operationalCert,
|
|
109
|
-
label: this
|
|
110
|
+
label: this.#label,
|
|
110
111
|
scopedClusterData: this.#scopedClusterData
|
|
111
112
|
};
|
|
112
113
|
}
|
|
114
|
+
get label() {
|
|
115
|
+
return this.#label;
|
|
116
|
+
}
|
|
113
117
|
async setLabel(label) {
|
|
114
|
-
|
|
118
|
+
if (label.length === 0 || label.length > 32) {
|
|
119
|
+
throw new ImplementationError("Fabric label must be between 1 and 32 characters long.");
|
|
120
|
+
}
|
|
121
|
+
if (this.#label === label) {
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
this.#label = label;
|
|
115
125
|
await this.persist();
|
|
116
126
|
}
|
|
117
127
|
get publicKey() {
|
|
@@ -251,7 +261,7 @@ class Fabric {
|
|
|
251
261
|
nodeId: this.nodeId,
|
|
252
262
|
rootNodeId: this.rootNodeId,
|
|
253
263
|
rootVendorId: this.rootVendorId,
|
|
254
|
-
label: this
|
|
264
|
+
label: this.#label
|
|
255
265
|
};
|
|
256
266
|
}
|
|
257
267
|
addressOf(nodeId) {
|
|
@@ -345,6 +355,13 @@ class FabricBuilder {
|
|
|
345
355
|
this.#identityProtectionKey = key;
|
|
346
356
|
return this;
|
|
347
357
|
}
|
|
358
|
+
setLabel(label) {
|
|
359
|
+
if (label.length === 0 || label.length > 32) {
|
|
360
|
+
throw new ImplementationError("Fabric label must be between 1 and 32 characters long.");
|
|
361
|
+
}
|
|
362
|
+
this.#label = label;
|
|
363
|
+
return this;
|
|
364
|
+
}
|
|
348
365
|
initializeFromFabricForUpdate(fabric) {
|
|
349
366
|
this.#rootVendorId = fabric.rootVendorId;
|
|
350
367
|
this.#rootNodeId = fabric.rootNodeId;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fabric/Fabric.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,0BAA0B;AACnC;AAAA,EAEI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OAEG;AACP,SAAS,mBAAmB;AAC5B,SAAS,sBAA+B,gBAA+D;AAGvG,MAAM,SAAS,OAAO,IAAI,QAAQ;AAElC,MAAM,4BAA4B,MAAM,WAAW,kBAAkB;AACrE,MAAM,sBAAsB,MAAM,WAAW,eAAe;AAErD,MAAM,uBAAuB,YAAY;AAAC;AAWjD,IAAU;AAAA,CAAV,CAAUA,4BAAV;AACW,EAAMA,wBAAA,gBAAgB,CACzB,wBAC2D;AAC3D,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AACJ,WAAO;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,GA1BM;AAsCH,MAAM,OAAO;AAAA,EACP;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EAEA,YAAY,oBAAI,IAAmB;AAAA,EAE5C;AAAA,EACA,mBAAmB,IAAI,MAAgC;AAAA,EACvD;AAAA,EAEA,YAAY,QAAuB;AAC/B,SAAK,cAAc,OAAO;AAC1B,SAAK,WAAW,OAAO;AACvB,SAAK,SAAS,OAAO;AACrB,SAAK,aAAa,OAAO;AACzB,SAAK,gBAAgB,OAAO;AAC5B,SAAK,gBAAgB,OAAO;AAC5B,SAAK,eAAe,OAAO;AAC3B,SAAK,WAAW,OAAO;AACvB,SAAK,wBAAwB,OAAO;AACpC,SAAK,mCAAmC,OAAO;AAC/C,SAAK,qBAAqB,OAAO;AACjC,SAAK,kBAAkB,OAAO;AAC9B,SAAK,
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,0BAA0B;AACnC;AAAA,EAEI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OAEG;AACP,SAAS,mBAAmB;AAC5B,SAAS,sBAA+B,gBAA+D;AAGvG,MAAM,SAAS,OAAO,IAAI,QAAQ;AAElC,MAAM,4BAA4B,MAAM,WAAW,kBAAkB;AACrE,MAAM,sBAAsB,MAAM,WAAW,eAAe;AAErD,MAAM,uBAAuB,YAAY;AAAC;AAWjD,IAAU;AAAA,CAAV,CAAUA,4BAAV;AACW,EAAMA,wBAAA,gBAAgB,CACzB,wBAC2D;AAC3D,UAAM;AAAA,MACF;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,IAAI;AACJ,WAAO;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,GA1BM;AAsCH,MAAM,OAAO;AAAA,EACP;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EAEA,YAAY,oBAAI,IAAmB;AAAA,EAE5C;AAAA,EACA,mBAAmB,IAAI,MAAgC;AAAA,EACvD;AAAA,EAEA,YAAY,QAAuB;AAC/B,SAAK,cAAc,OAAO;AAC1B,SAAK,WAAW,OAAO;AACvB,SAAK,SAAS,OAAO;AACrB,SAAK,aAAa,OAAO;AACzB,SAAK,gBAAgB,OAAO;AAC5B,SAAK,gBAAgB,OAAO;AAC5B,SAAK,eAAe,OAAO;AAC3B,SAAK,WAAW,OAAO;AACvB,SAAK,wBAAwB,OAAO;AACpC,SAAK,mCAAmC,OAAO;AAC/C,SAAK,qBAAqB,OAAO;AACjC,SAAK,kBAAkB,OAAO;AAC9B,SAAK,SAAS,OAAO;AAErB,SAAK,WAAW,WAAW,OAAO,OAAO;AAEzC,SAAK,qBAAqB,OAAO,qBAAqB,oBAAI,IAAI;AAAA,EAClE;AAAA,EAEA,IAAI,SAAwB;AACxB,WAAO;AAAA,MACH,aAAa,KAAK;AAAA,MAClB,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,YAAY,KAAK;AAAA,MACjB,eAAe,KAAK;AAAA,MACpB,eAAe,KAAK;AAAA,MACpB,SAAS,KAAK,SAAS;AAAA,MACvB,cAAc,KAAK;AAAA,MACnB,UAAU,KAAK;AAAA,MACf,uBAAuB,KAAK;AAAA,MAC5B,kCAAkC,KAAK;AAAA,MACvC,oBAAoB,KAAK;AAAA,MACzB,iBAAiB,KAAK;AAAA,MACtB,OAAO,KAAK;AAAA,MACZ,mBAAmB,KAAK;AAAA,IAC5B;AAAA,EACJ;AAAA,EAEA,IAAI,QAAQ;AACR,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,SAAS,OAAe;AAC1B,QAAI,MAAM,WAAW,KAAK,MAAM,SAAS,IAAI;AACzC,YAAM,IAAI,oBAAoB,wDAAwD;AAAA,IAC1F;AACA,QAAI,KAAK,WAAW,OAAO;AACvB;AAAA,IACJ;AACA,SAAK,SAAS;AACd,UAAM,KAAK,QAAQ;AAAA,EACvB;AAAA,EAEA,IAAI,YAAY;AACZ,WAAO,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,KAAK,MAAkB;AACnB,WAAO,OAAO,KAAK,KAAK,UAAU,IAAI;AAAA,EAC1C;AAAA,EAEA,kBAAkB,iBAA6B,oBAAiC;AAC5E,QAAI,uBAAuB,QAAW;AAElC,yBAAmB;AAAA,QACf,mBAAmB,OAAO,KAAK,QAAQ;AAAA,QACvC,0BAA0B,OAAO,eAAe;AAAA,MACpD;AAAA,IACJ,OAAO;AACH,YAAM,iBAAiB,2BAA2B,OAAO,kBAAkB;AAE3E,yBAAmB;AAAA,QACf;AAAA,QACA,0BAA0B,OAAO,eAAe;AAAA,MACpD;AAGA,yBAAmB;AAAA,QACf,mBAAmB,OAAO,KAAK,QAAQ;AAAA,QACvC;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,gCAAgC,UAAoB,eAA2B;AAC3E,WAAO,KAAK,aAAa,YAAY,MAAM,SAAS,KAAK,eAAe,aAAa;AAAA,EACzF;AAAA,EAEA,eAAe,SAAc;AACzB,WACI,MAAM,SAAS,KAAK,SAAS,WAAW,QAAQ,SAAS,KACzD,MAAM,SAAS,KAAK,SAAS,YAAY,QAAQ,UAAU;AAAA,EAEnE;AAAA,EAEA,iBAAiB,QAAgB,QAAoB;AACjD,UAAM,SAAS,IAAI,WAAW,OAAO,MAAM;AAC3C,WAAO,eAAe,MAAM;AAC5B,WAAO,eAAe,KAAK,aAAa;AACxC,WAAO,YAAY,KAAK,QAAQ;AAChC,WAAO,YAAY,MAAM;AACzB,WAAO,OAAO,KAAK,KAAK,kCAAkC,OAAO,YAAY,CAAC;AAAA,EAClF;AAAA,EAEA,WAAW,SAAwB;AAC/B,SAAK,UAAU,IAAI,OAAO;AAAA,EAC9B;AAAA,EAEA,cAAc,SAAwB;AAClC,SAAK,UAAU,OAAO,OAAO;AAAA,EACjC;AAAA,EAEA,kBAAkB,UAAoC;AAClD,SAAK,iBAAiB,KAAK,QAAQ;AAAA,EACvC;AAAA,EAEA,qBAAqB,UAAoC;AACrD,UAAM,QAAQ,KAAK,iBAAiB,QAAQ,QAAQ;AACpD,QAAI,SAAS,GAAG;AACZ,WAAK,iBAAiB,OAAO,OAAO,CAAC;AAAA,IACzC;AAAA,EACJ;AAAA,EAEA,IAAI,gBAAgB,UAAsD;AAEtE,SAAK,mBAAmB;AAAA,EAC5B;AAAA,EAEA,MAAM,OAAO,kBAA2B;AACpC,eAAW,YAAY,KAAK,kBAAkB;AAC1C,YAAM,SAAS;AAAA,IACnB;AACA,eAAW,WAAW,CAAC,GAAG,KAAK,SAAS,GAAG;AACvC,YAAM,QAAQ,QAAQ,OAAO,QAAQ,OAAO,gBAAgB;AAAA,IAChE;AAAA,EACJ;AAAA,EAEA,QAAQ,WAAW,MAAM;AACrB,WAAO,KAAK,mBAAmB,QAAQ;AAAA,EAC3C;AAAA,EAEA,0BAA6B,SAA2C,gBAAuC;AAC3G,UAAM,UAAU,KAAK,mBAAmB,IAAI,QAAQ,EAAE;AACtD,QAAI,YAAY,QAAW;AACvB,aAAO;AAAA,IACX;AACA,WAAO,QAAQ,IAAI,cAAc;AAAA,EACrC;AAAA,EAEA,0BAA6B,SAA2C,gBAAwB,OAAU;AACtG,QAAI,CAAC,KAAK,mBAAmB,IAAI,QAAQ,EAAE,GAAG;AAC1C,WAAK,mBAAmB,IAAI,QAAQ,IAAI,oBAAI,IAAmC,CAAC;AAAA,IACpF;AACA,SAAK,mBAAmB,IAAI,QAAQ,EAAE,EAAG,IAAI,gBAAgB,KAA8B;AAC3F,WAAO,KAAK,QAAQ,KAAK;AAAA,EAC7B;AAAA,EAEA,6BAA6B,SAA2C,gBAAwB;AAC5F,QAAI,CAAC,KAAK,mBAAmB,IAAI,QAAQ,EAAE,GAAG;AAC1C;AAAA,IACJ;AACA,SAAK,mBAAmB,IAAI,QAAQ,EAAE,EAAG,OAAO,cAAc;AAC9D,WAAO,KAAK,QAAQ,KAAK;AAAA,EAC7B;AAAA,EAEA,0BAA0B,SAA2C,gBAAwB;AACzF,WAAO,KAAK,mBAAmB,IAAI,QAAQ,EAAE,KAAK,KAAK,mBAAmB,IAAI,QAAQ,EAAE,EAAG,IAAI,cAAc;AAAA,EACjH;AAAA,EAEA,wBAAwB,SAA2C;AAC/D,SAAK,mBAAmB,OAAO,QAAQ,EAAE;AACzC,WAAO,KAAK,QAAQ,KAAK;AAAA,EAC7B;AAAA,EAEA,yBAAyB,SAAqD;AAC1E,QAAI,CAAC,KAAK,mBAAmB,IAAI,QAAQ,EAAE,GAAG;AAC1C,aAAO,CAAC;AAAA,IACZ;AACA,WAAO,MAAM,KAAK,KAAK,mBAAmB,IAAI,QAAQ,EAAE,EAAG,KAAK,CAAC;AAAA,EACrE;AAAA,EAEA,eAAe,eAAuB;AAClC,QAAI,kBAAkB,GAAG;AACrB,aAAO,uBAAuB,cAAc,KAAK,kBAAkB,CAAC;AAAA,IACxE;AAEA,WAAO;AAAA,EACX;AAAA,EAEQ,oBAA4C;AAChD,WAAO;AAAA,MACH,eAAe;AAAA,MACf,WAAW,KAAK;AAAA,MAChB,sBAAsB,KAAK;AAAA,MAC3B,iBAAiB;AAAA;AAAA,MACjB,iBAAiB;AAAA,MACjB,WAAW;AAAA,MACX,sBAAsB;AAAA,MACtB,iBAAiB;AAAA,MACjB,iBAAiB;AAAA,MACjB,WAAW;AAAA,MACX,sBAAsB;AAAA,MACtB,iBAAiB;AAAA,MACjB,iBAAiB;AAAA,MACjB,wBAAwB,mBAAmB,uBAAuB;AAAA,MAClE,yBAAyB,mBAAmB,wBAAwB;AAAA,IACxE;AAAA,EACJ;AAAA,EAEA,qBAAqB;AAEjB,WAAO,CAAC,uBAAuB,cAAc,KAAK,kBAAkB,CAAC,CAAC;AAAA,EAC1E;AAAA,EAEA,IAAI,sBAAgD;AAChD,WAAO;AAAA,MACH,aAAa,KAAK;AAAA,MAClB,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,YAAY,KAAK;AAAA,MACjB,cAAc,KAAK;AAAA,MACnB,OAAO,KAAK;AAAA,IAChB;AAAA,EACJ;AAAA,EAEA,UAAU,QAAgB;AACtB,WAAO,YAAY,EAAE,aAAa,KAAK,aAAa,OAAO,CAAC;AAAA,EAChE;AACJ;AAEO,MAAM,cAAc;AAAA,EACvB,WAAW,OAAO,cAAc;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AAAA,EAET,IAAI,YAAY;AACZ,WAAO,KAAK,SAAS;AAAA,EACzB;AAAA,EAEA,IAAI,cAAc;AACd,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,kCAAkC;AAC9B,WAAO,mBAAmB,gCAAgC,KAAK,QAAQ;AAAA,EAC3E;AAAA,EAEA,YAAY,UAAsB;AAC9B,UAAM,yBAAyB,mBAAmB,OAAO,QAAQ;AACjE,uBAAmB,sBAAsB,sBAAsB;AAC/D,SAAK,YAAY;AACjB,SAAK,iBAAiB,uBAAuB;AAC7C,WAAO;AAAA,EACX;AAAA;AAAA,EAGA,IAAI,WAAW;AACX,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,mBAAmB,iBAA6B,oBAAiC;AAC7E,QAAI,uBAAuB,UAAa,mBAAmB,WAAW,GAAG;AACrE,2BAAqB;AAAA,IACzB;AACA,UAAM;AAAA,MACF,SAAS,EAAE,QAAQ,UAAU,sBAAsB;AAAA,MACnD;AAAA,IACJ,IAAI,0BAA0B,OAAO,eAAe;AACpD,WAAO;AAAA,MACH,4CAA4C,MAAM,cAAc,QAAQ,2BAA2B,qBAAqB;AAAA,IAC5H;AACA,QAAI,0BAA0B,QAAW;AACrC,2BAAqB,mBAAmB,qBAAqB;AAAA,IACjE;AAEA,QAAI,CAAC,MAAM,SAAS,wBAAwB,KAAK,SAAS,SAAS,GAAG;AAClE,YAAM,IAAI,eAAe,oDAAoD;AAAA,IACjF;AAEA,QAAI,KAAK,cAAc,QAAW;AAC9B,YAAM,IAAI,gBAAgB,yCAAyC;AAAA,IACvE;AAEA,QAAI,uBAAuB,QAAW;AAClC,YAAM,4BAA4B,2BAA2B,OAAO,kBAAkB;AACtF,yBAAmB;AAAA,QACf,mBAAmB,OAAO,KAAK,SAAS;AAAA,QACxC;AAAA,MACJ;AACA,yBAAmB;AAAA,QACf;AAAA,QACA,0BAA0B,OAAO,eAAe;AAAA,MACpD;AAAA,IACJ,OAAO;AACH,yBAAmB;AAAA,QACf,mBAAmB,OAAO,KAAK,SAAS;AAAA,QACxC,0BAA0B,OAAO,eAAe;AAAA,MACpD;AAAA,IACJ;AAEA,SAAK,mBAAmB;AACxB,SAAK,sBAAsB;AAC3B,SAAK,YAAY,SAAS,QAAQ;AAClC,SAAK,UAAU;AAEf,WAAO;AAAA,EACX;AAAA,EAEA,gBAAgB,cAAwB;AACpC,SAAK,gBAAgB;AACrB,WAAO;AAAA,EACX;AAAA,EAEA,cAAc,YAAoB;AAC9B,SAAK,cAAc;AACnB,WAAO;AAAA,EACX;AAAA,EAEA,yBAAyB,KAAiB;AACtC,SAAK,yBAAyB;AAC9B,WAAO;AAAA,EACX;AAAA,EAEA,SAAS,OAAe;AACpB,QAAI,MAAM,WAAW,KAAK,MAAM,SAAS,IAAI;AACzC,YAAM,IAAI,oBAAoB,wDAAwD;AAAA,IAC1F;AACA,SAAK,SAAS;AACd,WAAO;AAAA,EACX;AAAA,EAEA,8BAA8B,QAAgB;AAC1C,SAAK,gBAAgB,OAAO;AAC5B,SAAK,cAAc,OAAO;AAC1B,SAAK,yBAAyB,OAAO;AACrC,SAAK,YAAY,OAAO;AACxB,SAAK,iBAAiB,OAAO;AAC7B,SAAK,SAAS,OAAO;AAAA,EACzB;AAAA,EAEA,gBAAgB,QAAgB;AAC5B,QAAI,KAAK,cAAc,UAAa,KAAK,mBAAmB,QAAW;AACnE,YAAM,IAAI,gBAAgB,8CAA8C;AAAA,IAC5E;AACA,WAAO,OAAO,gCAAgC,KAAK,WAAW,KAAK,cAAc;AAAA,EACrF;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,WAAW;AACX,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,UAAU;AACV,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,MAAM,aAA0B;AAClC,QAAI,KAAK,iBAAiB,OAAW,OAAM,IAAI,cAAc,sCAAsC;AACnG,QAAI,KAAK,gBAAgB,OAAW,OAAM,IAAI,cAAc,4BAA4B;AACxF,QAAI,KAAK,kBAAkB,OAAW,OAAM,IAAI,cAAc,0BAA0B;AACxF,QAAI,KAAK,cAAc,UAAa,KAAK,mBAAmB;AACxD,YAAM,IAAI,cAAc,0BAA0B;AACtD,QAAI,KAAK,2BAA2B,OAAW,OAAM,IAAI,cAAc,uCAAuC;AAC9G,QAAI,KAAK,qBAAqB,UAAa,KAAK,cAAc,UAAa,KAAK,YAAY;AACxF,YAAM,IAAI,cAAc,iCAAiC;AAE7D,SAAK,eAAe;AACpB,UAAM,aAAa,IAAI,WAAW,OAAO,GAAG;AAC5C,eAAW,YAAY,KAAK,SAAS;AACrC,UAAM,gBAAgB,MAAM,OAAO;AAAA,MAC/B,KAAK,eAAe,MAAM,CAAC;AAAA,MAC3B,WAAW,YAAY;AAAA,MACvB;AAAA,MACA;AAAA,IACJ;AAEA,WAAO,IAAI,OAAO;AAAA,MACd,aAAa,KAAK;AAAA,MAClB,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,MACb,YAAY,KAAK;AAAA,MACjB;AAAA,MACA,eAAe,KAAK;AAAA,MACpB,SAAS,KAAK;AAAA,MACd,cAAc,KAAK;AAAA,MACnB,UAAU,KAAK;AAAA,MACf,uBAAuB,KAAK;AAAA;AAAA,MAC5B,kCAAkC,MAAM,OAAO;AAAA,QAC3C,KAAK;AAAA,QACL;AAAA,QACA;AAAA,MACJ;AAAA,MACA,oBAAoB,KAAK;AAAA,MACzB,iBAAiB,KAAK;AAAA,MACtB,OAAO,KAAK;AAAA,IAChB,CAAC;AAAA,EACL;AACJ;",
|
|
5
5
|
"names": ["OperationalGroupKeySet"]
|
|
6
6
|
}
|
|
@@ -16,11 +16,13 @@ interface FabricAuthorityConfiguration {
|
|
|
16
16
|
fabricIndex?: FabricIndex;
|
|
17
17
|
fabricId?: FabricId;
|
|
18
18
|
caseAuthenticatedTags?: CaseAuthenticatedTag[];
|
|
19
|
+
adminFabricLabel: string;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
21
22
|
* Concrete {@link FabricAuthorityConfiguration} for environmental configuration.
|
|
22
23
|
*/
|
|
23
24
|
export declare class FabricAuthorityConfigurationProvider implements FabricAuthorityConfiguration {
|
|
25
|
+
get adminFabricLabel(): string;
|
|
24
26
|
}
|
|
25
27
|
/**
|
|
26
28
|
* Interfaces FabricAuthority with other components.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FabricAuthority.d.ts","sourceRoot":"","sources":["../../../src/fabric/FabricAuthority.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAIH,WAAW,EACX,aAAa,EAGhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,WAAW,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACvF,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD;;GAEG;AACH,UAAU,4BAA4B;IAClC,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"FabricAuthority.d.ts","sourceRoot":"","sources":["../../../src/fabric/FabricAuthority.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAIH,WAAW,EACX,aAAa,EAGhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,WAAW,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACvF,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD;;GAEG;AACH,UAAU,4BAA4B;IAClC,aAAa,CAAC,EAAE,QAAQ,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,qBAAqB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC/C,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,oCAAqC,YAAW,4BAA4B;IACrF,IAAI,gBAAgB,IAAI,MAAM,CAE7B;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,EAAE,EAAE,oBAAoB,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,4BAA4B,CAAC;CACxC;AAED,eAAO,MAAM,uBAAuB,UAAmB,CAAC;AACxD,eAAO,MAAM,iBAAiB,UAAc,CAAC;AAE7C;;GAEG;AACH,qBAAa,eAAe;;gBAKZ,OAAO,EAAE,sBAAsB;IAM3C;;OAEG;IACG,aAAa;IAcnB;;OAEG;IACH,IAAI,OAAO,aAEV;IAED;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B;;OAEG;IACG,YAAY;IAyClB,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;CASjD"}
|
|
@@ -17,6 +17,9 @@ import { FabricBuilder } from "./Fabric.js";
|
|
|
17
17
|
import { FabricManager } from "./FabricManager.js";
|
|
18
18
|
const logger = Logger.get("FabricAuthority");
|
|
19
19
|
class FabricAuthorityConfigurationProvider {
|
|
20
|
+
get adminFabricLabel() {
|
|
21
|
+
throw new ImplementationError("Admin Fabric Label must be set for FabricAuthorityConfigurationProvider.");
|
|
22
|
+
}
|
|
20
23
|
}
|
|
21
24
|
const DEFAULT_ADMIN_VENDOR_ID = VendorId(65521);
|
|
22
25
|
const DEFAULT_FABRIC_ID = FabricId(1);
|
|
@@ -35,6 +38,9 @@ class FabricAuthority {
|
|
|
35
38
|
async defaultFabric() {
|
|
36
39
|
const fabric = this.fabrics[0];
|
|
37
40
|
if (fabric !== void 0) {
|
|
41
|
+
if (fabric.label !== this.#config.adminFabricLabel) {
|
|
42
|
+
await fabric.setLabel(this.#config.adminFabricLabel);
|
|
43
|
+
}
|
|
38
44
|
return fabric;
|
|
39
45
|
}
|
|
40
46
|
return await this.createFabric();
|
|
@@ -62,7 +68,7 @@ class FabricAuthority {
|
|
|
62
68
|
vendorId = DEFAULT_ADMIN_VENDOR_ID;
|
|
63
69
|
logger.warn(`Using test vendor ID 0x${vendorId.toString(16)} for controller fabric`);
|
|
64
70
|
}
|
|
65
|
-
const fabricBuilder = new FabricBuilder().setRootCert(this.#ca.rootCert).setRootNodeId(rootNodeId).setIdentityProtectionKey(ipkValue).setRootVendorId(this.#config.adminVendorId ?? DEFAULT_ADMIN_VENDOR_ID);
|
|
71
|
+
const fabricBuilder = new FabricBuilder().setRootCert(this.#ca.rootCert).setRootNodeId(rootNodeId).setIdentityProtectionKey(ipkValue).setRootVendorId(this.#config.adminVendorId ?? DEFAULT_ADMIN_VENDOR_ID).setLabel(this.#config.adminFabricLabel);
|
|
66
72
|
fabricBuilder.setOperationalCert(
|
|
67
73
|
this.#ca.generateNoc(
|
|
68
74
|
fabricBuilder.publicKey,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/fabric/FabricAuthority.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,4BAA4B;AACrC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAA+B,UAAuB,QAAQ,gBAAgB;AAC9E,SAAiB,qBAAqB;AACtC,SAAS,qBAAqB;AAE9B,MAAM,SAAS,OAAO,IAAI,iBAAiB;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,4BAA4B;AACrC;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAA+B,UAAuB,QAAQ,gBAAgB;AAC9E,SAAiB,qBAAqB;AACtC,SAAS,qBAAqB;AAE9B,MAAM,SAAS,OAAO,IAAI,iBAAiB;AAgBpC,MAAM,qCAA6E;AAAA,EACtF,IAAI,mBAA2B;AAC3B,UAAM,IAAI,oBAAoB,0EAA0E;AAAA,EAC5G;AACJ;AAWO,MAAM,0BAA0B,SAAS,KAAM;AAC/C,MAAM,oBAAoB,SAAS,CAAC;AAKpC,MAAM,gBAAgB;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AAAA,EAEA,YAAY,SAAiC;AACzC,SAAK,MAAM,QAAQ;AACnB,SAAK,WAAW,QAAQ;AACxB,SAAK,UAAU,QAAQ;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,gBAAgB;AAElB,UAAM,SAAS,KAAK,QAAQ,CAAC;AAC7B,QAAI,WAAW,QAAW;AACtB,UAAI,OAAO,UAAU,KAAK,QAAQ,kBAAkB;AAChD,cAAM,OAAO,SAAS,KAAK,QAAQ,gBAAgB;AAAA,MACvD;AACA,aAAO;AAAA,IACX;AAGA,WAAO,MAAM,KAAK,aAAa;AAAA,EACnC;AAAA;AAAA;AAAA;AAAA,EAKA,IAAI,UAAU;AACV,WAAO,MAAM,KAAK,KAAK,QAAQ,EAAE,OAAO,KAAK,aAAa,KAAK,IAAI,CAAC;AAAA,EACxE;AAAA;AAAA;AAAA;AAAA,EAKA,aAAa,QAAgB;AACzB,WAAO,MAAM,SAAS,OAAO,UAAU,KAAK,IAAI,QAAQ;AAAA,EAC5D;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,eAAe;AACjB,UAAM,aAAa,OAAO,wBAAwB;AAClD,UAAM,WAAW,OAAO,cAAc,2BAA2B;AAEjE,QAAI,WAAW,KAAK,QAAQ;AAC5B,QAAI,aAAa,QAAW;AACxB,iBAAW;AACX,aAAO,KAAK,0BAA0B,SAAS,SAAS,EAAE,CAAC,wBAAwB;AAAA,IACvF;AAEA,UAAM,gBAAgB,IAAI,cAAc,EACnC,YAAY,KAAK,IAAI,QAAQ,EAC7B,cAAc,UAAU,EACxB,yBAAyB,QAAQ,EACjC,gBAAgB,KAAK,QAAQ,iBAAiB,uBAAuB,EACrE,SAAS,KAAK,QAAQ,gBAAgB;AAE3C,kBAAc;AAAA,MACV,KAAK,IAAI;AAAA,QACL,cAAc;AAAA,QACd,KAAK,QAAQ,YAAY;AAAA,QACzB;AAAA,QACA,KAAK,QAAQ;AAAA,MACjB;AAAA,IACJ;AAEA,QAAI,QAAQ,KAAK,QAAQ;AACzB,QAAI,UAAU,QAAW;AACrB,cAAQ,KAAK,SAAS,oBAAoB;AAAA,IAC9C,WAAW,KAAK,SAAS,YAAY,KAAK,MAAM,QAAW;AACvD,YAAM,IAAI,oBAAoB,qCAAqC,KAAK,0BAA0B;AAAA,IACtG;AAEA,UAAM,SAAS,MAAM,cAAc,MAAM,KAAK;AAC9C,SAAK,SAAS,UAAU,MAAM;AAE9B,WAAO,MAAM,iCAAiC,KAAK,EAAE;AAErD,WAAO;AAAA,EACX;AAAA,EAEA,QAAQ,cAAc,MAAM,EAAE,KAAkB;AAC5C,UAAM,WAAW,IAAI,gBAAgB;AAAA,MACjC,IAAI,IAAI,IAAI,oBAAoB;AAAA,MAChC,SAAS,IAAI,IAAI,aAAa;AAAA,MAC9B,QAAQ,IAAI,IAAI,oCAAoC;AAAA,IACxD,CAAC;AACD,QAAI,IAAI,iBAAiB,QAAQ;AACjC,WAAO;AAAA,EACX;AACJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerCommissioningFlow.d.ts","sourceRoot":"","sources":["../../../src/peer/ControllerCommissioningFlow.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAIvE,OAAO,EAAsC,WAAW,EAA6B,MAAM,UAAU,CAAC;AACtG,OAAO,
|
|
1
|
+
{"version":3,"file":"ControllerCommissioningFlow.d.ts","sourceRoot":"","sources":["../../../src/peer/ControllerCommissioningFlow.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAIvE,OAAO,EAAsC,WAAW,EAA6B,MAAM,UAAU,CAAC;AACtG,OAAO,EAQH,QAAQ,EACX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAK9E,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/C;;GAEG;AACH,MAAM,MAAM,kCAAkC,GAAG;IAC7C;;OAEG;IACH,kBAAkB,EAAE,oBAAoB,CAAC,sBAAsB,CAAC;IAEhE;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,aAAa,CAAC,EAAE,QAAQ,CAAC;IAEzB;;OAEG;IACH,WAAW,CAAC,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;KAC3B,CAAC;IAEF;;OAEG;IACH,aAAa,CAAC,EAAE;QACZ,WAAW,EAAE,MAAM,CAAC;QACpB,kBAAkB,EAAE,MAAM,CAAC;KAC9B,CAAC;CACL,CAAC;AAQF,kDAAkD;AAClD,aAAK,2BAA2B;IAC5B,OAAO,IAAA;IACP,OAAO,IAAA;IACP,OAAO,IAAA;IACP,IAAI,IAAA;CACP;AAED;;;GAGG;AACH,KAAK,uBAAuB,GAAG;IAC3B,IAAI,EAAE,2BAA2B,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC;AAsCF,kFAAkF;AAClF,qBAAa,kBAAmB,SAAQ,WAAW;CAAG;AAOtD;;GAEG;AACH,qBAAa,2BAA2B;;;IAiBhC,uDAAuD;IACvD,iBAAiB,EAAE,iBAAiB;IAEpC,4CAA4C;IAC5C,EAAE,EAAE,oBAAoB;IAExB,gCAAgC;IAChC,MAAM,EAAE,MAAM;IAEd,2DAA2D;IAC3D,oBAAoB,EAAE,kCAAkC;IAExD,+EAA+E;IAC/E,gBAAgB,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAW1F;;;;;OAKG;IACG,oBAAoB;IA+N1B,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CA6wBvE"}
|
|
@@ -128,17 +128,19 @@ class ControllerCommissioningFlow {
|
|
|
128
128
|
return client;
|
|
129
129
|
}
|
|
130
130
|
/**
|
|
131
|
-
* Initialize commissioning steps and add them in the default order
|
|
131
|
+
* Initialize commissioning steps and add them in the default order as defined by
|
|
132
|
+
* @see {@link MatterSpecification.v13.Core} § 5.5
|
|
132
133
|
*/
|
|
133
134
|
#initializeCommissioningSteps() {
|
|
134
135
|
this.#commissioningSteps.push({
|
|
135
136
|
stepNumber: 0,
|
|
137
|
+
// Preparation
|
|
136
138
|
subStepNumber: 1,
|
|
137
139
|
name: "GetInitialData",
|
|
138
140
|
stepLogic: () => this.#getInitialData()
|
|
139
141
|
});
|
|
140
142
|
this.#commissioningSteps.push({
|
|
141
|
-
stepNumber:
|
|
143
|
+
stepNumber: 4,
|
|
142
144
|
subStepNumber: 1,
|
|
143
145
|
name: "GeneralCommissioning.ArmFailsafe",
|
|
144
146
|
stepLogic: () => this.#armFailsafe()
|
|
@@ -163,26 +165,34 @@ class ControllerCommissioningFlow {
|
|
|
163
165
|
});
|
|
164
166
|
this.#commissioningSteps.push({
|
|
165
167
|
stepNumber: 7,
|
|
168
|
+
// includes 7-9
|
|
166
169
|
subStepNumber: 1,
|
|
167
170
|
name: "OperationalCredentials.Certificates",
|
|
168
171
|
stepLogic: () => this.#certificates()
|
|
169
172
|
});
|
|
170
173
|
this.#commissioningSteps.push({
|
|
171
|
-
stepNumber:
|
|
174
|
+
stepNumber: 9,
|
|
175
|
+
subStepNumber: 2,
|
|
176
|
+
name: "OperationalCredentials.UpdateFabricLabel",
|
|
177
|
+
stepLogic: () => this.#updateFabricLabel()
|
|
178
|
+
});
|
|
179
|
+
this.#commissioningSteps.push({
|
|
180
|
+
stepNumber: 11,
|
|
172
181
|
subStepNumber: 1,
|
|
173
182
|
name: "AccessControl",
|
|
174
183
|
stepLogic: () => this.#configureAccessControlLists()
|
|
175
184
|
});
|
|
176
185
|
if (this.#interactionClient.channelType === ChannelType.BLE) {
|
|
177
186
|
this.#commissioningSteps.push({
|
|
178
|
-
stepNumber:
|
|
187
|
+
stepNumber: 12,
|
|
179
188
|
subStepNumber: 1,
|
|
180
189
|
name: "NetworkCommissioning.Validate",
|
|
181
190
|
stepLogic: () => this.#validateNetwork()
|
|
182
191
|
});
|
|
183
192
|
if (this.#commissioningOptions.wifiNetwork !== void 0) {
|
|
184
193
|
this.#commissioningSteps.push({
|
|
185
|
-
stepNumber:
|
|
194
|
+
stepNumber: 12,
|
|
195
|
+
// includes step 13
|
|
186
196
|
subStepNumber: 2,
|
|
187
197
|
name: "NetworkCommissioning.Wifi",
|
|
188
198
|
stepLogic: () => this.#configureNetworkWifi()
|
|
@@ -190,7 +200,8 @@ class ControllerCommissioningFlow {
|
|
|
190
200
|
}
|
|
191
201
|
if (this.#commissioningOptions.threadNetwork !== void 0) {
|
|
192
202
|
this.#commissioningSteps.push({
|
|
193
|
-
stepNumber:
|
|
203
|
+
stepNumber: 12,
|
|
204
|
+
// includes step 13
|
|
194
205
|
subStepNumber: 3,
|
|
195
206
|
name: "NetworkCommissioning.Thread",
|
|
196
207
|
stepLogic: () => this.#configureNetworkThread()
|
|
@@ -202,13 +213,14 @@ class ControllerCommissioningFlow {
|
|
|
202
213
|
);
|
|
203
214
|
}
|
|
204
215
|
this.#commissioningSteps.push({
|
|
205
|
-
stepNumber:
|
|
216
|
+
stepNumber: 14,
|
|
217
|
+
// includes step 15 (CASE connection)
|
|
206
218
|
subStepNumber: 1,
|
|
207
219
|
name: "Reconnect",
|
|
208
220
|
stepLogic: () => this.#reconnectWithDevice()
|
|
209
221
|
});
|
|
210
222
|
this.#commissioningSteps.push({
|
|
211
|
-
stepNumber:
|
|
223
|
+
stepNumber: 16,
|
|
212
224
|
subStepNumber: 1,
|
|
213
225
|
name: "GeneralCommissioning.Complete",
|
|
214
226
|
stepLogic: () => this.#completeCommissioning()
|
|
@@ -287,13 +299,13 @@ class ControllerCommissioningFlow {
|
|
|
287
299
|
};
|
|
288
300
|
}
|
|
289
301
|
/**
|
|
290
|
-
* Step
|
|
291
|
-
*
|
|
292
|
-
* timeout
|
|
293
|
-
*
|
|
294
|
-
*
|
|
295
|
-
* reading BasicCommissioningInfo attribute (see Section 11.
|
|
296
|
-
* invoking the ArmFailSafe command.
|
|
302
|
+
* Step 4
|
|
303
|
+
* Commissioner SHALL re-arm the Fail-safe timer on the Commissionee to the desired commissioning
|
|
304
|
+
* timeout within 60 seconds of the completion of PASE session establishment, using the
|
|
305
|
+
* ArmFailSafe command (see Section 11.10.6.2, “ArmFailSafe Command”). A Commissioner MAY
|
|
306
|
+
* obtain device information including guidance on the fail-safe value from the Commissionee by
|
|
307
|
+
* reading BasicCommissioningInfo attribute (see Section 11.10.5.2, “BasicCommissioningInfo
|
|
308
|
+
* Attribute”) prior to invoking the ArmFailSafe command.
|
|
297
309
|
*/
|
|
298
310
|
async #armFailsafe() {
|
|
299
311
|
const client = this.#getClusterClient(GeneralCommissioning.Cluster);
|
|
@@ -318,23 +330,24 @@ class ControllerCommissioningFlow {
|
|
|
318
330
|
};
|
|
319
331
|
}
|
|
320
332
|
async #resetFailsafeTimer() {
|
|
333
|
+
if (this.#lastFailSafeTime === void 0) return;
|
|
321
334
|
try {
|
|
322
335
|
const client = this.#getClusterClient(GeneralCommissioning.Cluster);
|
|
323
336
|
await client.armFailSafe({
|
|
324
337
|
breadcrumb: this.#lastBreadcrumb,
|
|
325
338
|
expiryLengthSeconds: 0
|
|
326
339
|
});
|
|
340
|
+
this.#lastFailSafeTime = void 0;
|
|
327
341
|
} catch (error) {
|
|
328
342
|
logger.error(`Error while resetting failsafe timer`, error);
|
|
329
343
|
}
|
|
330
344
|
}
|
|
331
345
|
/**
|
|
332
346
|
* Step 5 - 1
|
|
333
|
-
* Commissioner SHALL configure regulatory information
|
|
334
|
-
* Network Commissioning cluster on any endpoint with either the WI (i.e. Wi-Fi) or TH (i.e. Thread)
|
|
335
|
-
* set in its FeatureMap
|
|
336
|
-
*
|
|
337
|
-
* “SetRegulatoryConfig Command”).
|
|
347
|
+
* Commissioner SHALL configure regulatory information if the Commissionee has at least one instance of
|
|
348
|
+
* the Network Commissioning cluster on any endpoint with either the WI (i.e. Wi-Fi) or TH (i.e. Thread)
|
|
349
|
+
* feature flags set in its FeatureMap, Commissioner SHALL configure regulatory information in the
|
|
350
|
+
* Commissionee using the SetRegulatoryConfig command.
|
|
338
351
|
*/
|
|
339
352
|
async #configureRegulatoryInformation() {
|
|
340
353
|
if (this.#collectedCommissioningData.networkFeatures === void 0) {
|
|
@@ -393,11 +406,12 @@ class ControllerCommissioningFlow {
|
|
|
393
406
|
}
|
|
394
407
|
/**
|
|
395
408
|
* Step 5 - 2
|
|
396
|
-
* Commissioner SHOULD configure UTC time, timezone, and DST offset, if the Commissionee supports the
|
|
397
|
-
*
|
|
398
|
-
*
|
|
399
|
-
*
|
|
400
|
-
*
|
|
409
|
+
* Commissioner SHOULD configure UTC time, timezone, and DST offset, if the Commissionee supports the
|
|
410
|
+
* time synchronization cluster.
|
|
411
|
+
* ▪ The Commissioner SHOULD configure UTC time using the SetUTCTime command.
|
|
412
|
+
* ▪ The Commissioner SHOULD set the time zone using the SetTimeZone command, if the TimeZone Feature is supported.
|
|
413
|
+
* ▪ The Commissioner SHOULD set the DST offsets using the SetDSTOffset command if the TimeZone Feature is supported, and the SetTimeZoneResponse from the Commissionee had the DSTOffsetsRequired field set to True.
|
|
414
|
+
* ▪ The Commissioner SHOULD set a Default NTP server using the SetDefaultNTP command if the NTPClient Feature is supported and the DefaultNTP attribute is null. If the current value is non-null, Commissioners MAY opt to overwrite the current value.
|
|
401
415
|
*/
|
|
402
416
|
async #synchronizeTime() {
|
|
403
417
|
if (this.#collectedCommissioningData.rootServerList !== void 0 && this.#collectedCommissioningData.rootServerList.find(
|
|
@@ -412,8 +426,8 @@ class ControllerCommissioningFlow {
|
|
|
412
426
|
}
|
|
413
427
|
/**
|
|
414
428
|
* Step 6
|
|
415
|
-
* Commissioner SHALL establish the authenticity of the Commissionee as a certified Matter device
|
|
416
|
-
* 6.2.3, “Device Attestation Procedure”).
|
|
429
|
+
* Commissioner SHALL establish the authenticity of the Commissionee as a certified Matter device
|
|
430
|
+
* (see Section 6.2.3, “Device Attestation Procedure”).
|
|
417
431
|
*/
|
|
418
432
|
async #deviceAttestation() {
|
|
419
433
|
const operationalCredentialsClusterClient = this.#getClusterClient(OperationalCredentials.Cluster);
|
|
@@ -452,8 +466,12 @@ class ControllerCommissioningFlow {
|
|
|
452
466
|
* 8: Commissioner SHALL generate or otherwise obtain an Operational Certificate containing Operational ID after
|
|
453
467
|
* receiving the CSRResponse command from the Commissionee (see Section 11.17.6.5, “CSRRequest Command”), using
|
|
454
468
|
* implementation-specific means.
|
|
455
|
-
* 9: Commissioner SHALL install operational credentials (see Figure
|
|
456
|
-
* the Commissionee using the AddTrustedRootCertificate and AddNOC commands
|
|
469
|
+
* 9: Commissioner SHALL install operational credentials (see Figure 40, “Node Operational Credentials
|
|
470
|
+
* flow”) on the Commissionee using the AddTrustedRootCertificate and AddNOC commands,
|
|
471
|
+
* and SHALL use the UpdateFabricLabel command to set a string that the user can recognize and
|
|
472
|
+
* relate to this Commissioner/Administrator.
|
|
473
|
+
* The AdminVendorId field of the AddNOC command SHALL be set to a value for which the Vendor Schema in
|
|
474
|
+
* DCL contains the name and other information of the Commissioner’s manufacturer.
|
|
457
475
|
*/
|
|
458
476
|
async #certificates() {
|
|
459
477
|
const operationalCredentialsClusterClient = this.#getClusterClient(OperationalCredentials.Cluster);
|
|
@@ -477,26 +495,63 @@ class ControllerCommissioningFlow {
|
|
|
477
495
|
this.#fabric.fabricId,
|
|
478
496
|
this.#interactionClient.address.nodeId
|
|
479
497
|
);
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
},
|
|
490
|
-
{ useExtendedFailSafeMessageResponseTimeout: true }
|
|
491
|
-
)
|
|
498
|
+
const addNocResponse = await operationalCredentialsClusterClient.addNoc(
|
|
499
|
+
{
|
|
500
|
+
nocValue: peerOperationalCert,
|
|
501
|
+
icacValue: new Uint8Array(0),
|
|
502
|
+
ipkValue: this.#fabric.identityProtectionKey,
|
|
503
|
+
adminVendorId: this.#fabric.rootVendorId,
|
|
504
|
+
caseAdminSubject: this.#fabric.rootNodeId
|
|
505
|
+
},
|
|
506
|
+
{ useExtendedFailSafeMessageResponseTimeout: true }
|
|
492
507
|
);
|
|
508
|
+
this.#ensureOperationalCredentialsSuccess("addNoc", addNocResponse);
|
|
509
|
+
const { fabricIndex } = addNocResponse;
|
|
510
|
+
this.#collectedCommissioningData.fabricIndex = fabricIndex;
|
|
511
|
+
return {
|
|
512
|
+
code: 0 /* Success */,
|
|
513
|
+
breadcrumb: this.#lastBreadcrumb
|
|
514
|
+
};
|
|
515
|
+
}
|
|
516
|
+
/**
|
|
517
|
+
* Step 9 - 2
|
|
518
|
+
* The Administrator having established a CASE session with the Commissionee over the operational network in the
|
|
519
|
+
* previous steps SHALL invoke the CommissioningComplete command (see Section 11.9.6.6,
|
|
520
|
+
* “CommissioningComplete Command”). A success response after invocation of the CommissioningComplete command ends
|
|
521
|
+
* the commissioning process.
|
|
522
|
+
*/
|
|
523
|
+
async #updateFabricLabel() {
|
|
524
|
+
const { fabricIndex } = this.#collectedCommissioningData;
|
|
525
|
+
if (fabricIndex === void 0) {
|
|
526
|
+
logger.error("No fabric index available after addNoc. This should never happen.");
|
|
527
|
+
return {
|
|
528
|
+
code: 1 /* Failure */,
|
|
529
|
+
breadcrumb: this.#lastBreadcrumb
|
|
530
|
+
};
|
|
531
|
+
}
|
|
532
|
+
const operationalCredentialCluster = this.#getClusterClient(OperationalCredentials.Cluster);
|
|
533
|
+
try {
|
|
534
|
+
this.#ensureOperationalCredentialsSuccess(
|
|
535
|
+
"updateFabricLabel",
|
|
536
|
+
await operationalCredentialCluster.updateFabricLabel({
|
|
537
|
+
label: this.#fabric.label,
|
|
538
|
+
fabricIndex
|
|
539
|
+
})
|
|
540
|
+
);
|
|
541
|
+
} catch (error) {
|
|
542
|
+
CommissioningError.accept(error);
|
|
543
|
+
return {
|
|
544
|
+
code: 1 /* Failure */,
|
|
545
|
+
breadcrumb: this.#lastBreadcrumb
|
|
546
|
+
};
|
|
547
|
+
}
|
|
493
548
|
return {
|
|
494
549
|
code: 0 /* Success */,
|
|
495
550
|
breadcrumb: this.#lastBreadcrumb
|
|
496
551
|
};
|
|
497
552
|
}
|
|
498
553
|
/**
|
|
499
|
-
* Step
|
|
554
|
+
* Step 11
|
|
500
555
|
* Commissioner MAY configure the Access Control List (see Access Control Cluster) on the Commissionee in any way
|
|
501
556
|
* it sees fit, if the singular entry added by the AddNOC command in the previous step granting Administer
|
|
502
557
|
* privilege over CASE authentication type for the Node ID provided with the command is not sufficient to express
|
|
@@ -509,15 +564,15 @@ class ControllerCommissioningFlow {
|
|
|
509
564
|
};
|
|
510
565
|
}
|
|
511
566
|
/**
|
|
512
|
-
* Step
|
|
513
|
-
*
|
|
567
|
+
* Step 12-13
|
|
568
|
+
* 12: If the Commissionee both supports it and requires it, the Commissioner SHALL configure the operational network
|
|
514
569
|
* at the Commissionee using commands such as AddOrUpdateWiFiNetwork (see Section 11.8.7.3, “AddOrUpdateWiFiNetwork
|
|
515
570
|
* Command”) and AddOrUpdateThreadNetwork (see Section 11.8.7.4, “AddOrUpdateThreadNetwork Command”).
|
|
516
571
|
* A Commissionee requires network commissioning if it is not already on the desired operational network.
|
|
517
572
|
* A Commissionee supports network commissioning if it has any NetworkCommissioning cluster instances.
|
|
518
573
|
* A Commissioner MAY learn about the networks visible to the Commissionee using ScanNetworks command
|
|
519
574
|
* (see Section 11.8.7.1, “ScanNetworks Command”).
|
|
520
|
-
*
|
|
575
|
+
* 13: The Commissioner SHALL trigger the Commissionee to connect to the operational network using ConnectNetwork
|
|
521
576
|
* command (see Section 11.8.7.9, “ConnectNetwork Command”) unless the Commissionee is already on the desired operational network.
|
|
522
577
|
*/
|
|
523
578
|
async #validateNetwork() {
|
|
@@ -778,11 +833,11 @@ class ControllerCommissioningFlow {
|
|
|
778
833
|
};
|
|
779
834
|
}
|
|
780
835
|
/**
|
|
781
|
-
* Step
|
|
782
|
-
*
|
|
836
|
+
* Step 14-15
|
|
837
|
+
* 14: Finalization of the Commissioning process begins. An Administrator configured in the ACL of the Commissionee
|
|
783
838
|
* by the Commissioner SHALL use Operational Discovery to discover the Commissionee. This Administrator MAY be
|
|
784
839
|
* the Commissioner itself, or another Node to which the Commissioner has delegated the task.
|
|
785
|
-
*
|
|
840
|
+
* 15: The Administrator SHALL open a CASE (see Section 4.13.2, “Certificate Authenticated Session Establishment
|
|
786
841
|
* (CASE)”) session with the Commissionee over the operational network.
|
|
787
842
|
*
|
|
788
843
|
*/
|
|
@@ -805,7 +860,7 @@ class ControllerCommissioningFlow {
|
|
|
805
860
|
};
|
|
806
861
|
}
|
|
807
862
|
/**
|
|
808
|
-
* Step
|
|
863
|
+
* Step 16
|
|
809
864
|
* The Administrator having established a CASE session with the Commissionee over the operational network in the
|
|
810
865
|
* previous steps SHALL invoke the CommissioningComplete command (see Section 11.9.6.6,
|
|
811
866
|
* “CommissioningComplete Command”). A success response after invocation of the CommissioningComplete command ends
|
|
@@ -819,6 +874,7 @@ class ControllerCommissioningFlow {
|
|
|
819
874
|
useExtendedFailSafeMessageResponseTimeout: true
|
|
820
875
|
})
|
|
821
876
|
);
|
|
877
|
+
this.#lastFailSafeTime = void 0;
|
|
822
878
|
return {
|
|
823
879
|
code: 0 /* Success */,
|
|
824
880
|
breadcrumb: this.#lastBreadcrumb
|