@matter/node 0.15.4 → 0.15.6
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/controller/ControllerBehavior.d.ts +7 -0
- package/dist/cjs/behavior/system/controller/ControllerBehavior.d.ts.map +1 -1
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js +10 -0
- package/dist/cjs/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/cjs/node/server/ServerEnvironment.d.ts.map +1 -1
- package/dist/cjs/node/server/ServerEnvironment.js +1 -0
- package/dist/cjs/node/server/ServerEnvironment.js.map +1 -1
- package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts +7 -0
- package/dist/esm/behavior/system/controller/ControllerBehavior.d.ts.map +1 -1
- package/dist/esm/behavior/system/controller/ControllerBehavior.js +10 -0
- package/dist/esm/behavior/system/controller/ControllerBehavior.js.map +1 -1
- package/dist/esm/node/server/ServerEnvironment.d.ts.map +1 -1
- package/dist/esm/node/server/ServerEnvironment.js +2 -1
- package/dist/esm/node/server/ServerEnvironment.js.map +1 -1
- package/package.json +7 -7
- package/src/behavior/system/controller/ControllerBehavior.ts +13 -0
- package/src/node/server/ServerEnvironment.ts +2 -1
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Behavior } from "#behavior/Behavior.js";
|
|
7
7
|
import { MdnsScannerTargetCriteria } from "#protocol";
|
|
8
|
+
import { FabricId } from "@matter/types";
|
|
8
9
|
/**
|
|
9
10
|
* Node controller functionality.
|
|
10
11
|
*
|
|
@@ -45,6 +46,12 @@ export declare namespace ControllerBehavior {
|
|
|
45
46
|
* Contains the label of the admin fabric which is set for all commissioned devices
|
|
46
47
|
*/
|
|
47
48
|
adminFabricLabel: string;
|
|
49
|
+
/**
|
|
50
|
+
* Contains the FabricId of the admin fabric when a defined number needs to be used because special Certificates
|
|
51
|
+
* are used.
|
|
52
|
+
* If not provided, a random FabricId will be generated.
|
|
53
|
+
*/
|
|
54
|
+
adminFabricId?: FabricId;
|
|
48
55
|
}
|
|
49
56
|
}
|
|
50
57
|
//# sourceMappingURL=ControllerBehavior.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EASH,yBAAyB,EAI5B,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EASH,yBAAyB,EAI5B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOzC;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,QAAQ;;IAC5C,gBAAyB,EAAE,gBAAgB;IAEnC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAEzB,UAAU;IAgEV,CAAC,MAAM,CAAC,YAAY,CAAC;CAqEvC;AAED,yBAAiB,kBAAkB,CAAC;IAChC,MAAa,QAAQ;QACjB;;WAEG;QACH,kBAAkB,EAAE,yBAAyB,CAG3C;KACL;IAED,MAAa,KAAK;QACd;;;;WAIG;QACH,GAAG,CAAC,EAAE,OAAO,CAAa;QAE1B;;;;WAIG;QACH,EAAE,CAAC,EAAE,OAAO,CAAa;QAEzB;;WAEG;QACH,gBAAgB,SAAe;QAE/B;;;;WAIG;QACH,aAAa,CAAC,EAAE,QAAQ,CAAa;KACxC;CACJ"}
|
|
@@ -42,6 +42,7 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
42
42
|
throw new import_general.ImplementationError("adminFabricLabel must be set for ControllerBehavior.");
|
|
43
43
|
}
|
|
44
44
|
const adminFabricLabel = this.state.adminFabricLabel;
|
|
45
|
+
const adminFabricId = this.state.adminFabricId;
|
|
45
46
|
if (this.state.ip === void 0) {
|
|
46
47
|
this.state.ip = true;
|
|
47
48
|
}
|
|
@@ -65,6 +66,9 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
65
66
|
get adminFabricLabel() {
|
|
66
67
|
return adminFabricLabel;
|
|
67
68
|
}
|
|
69
|
+
get fabricId() {
|
|
70
|
+
return adminFabricId;
|
|
71
|
+
}
|
|
68
72
|
}()
|
|
69
73
|
);
|
|
70
74
|
}
|
|
@@ -164,6 +168,12 @@ class ControllerBehavior extends import_Behavior.Behavior {
|
|
|
164
168
|
* Contains the label of the admin fabric which is set for all commissioned devices
|
|
165
169
|
*/
|
|
166
170
|
adminFabricLabel = "matter.js";
|
|
171
|
+
/**
|
|
172
|
+
* Contains the FabricId of the admin fabric when a defined number needs to be used because special Certificates
|
|
173
|
+
* are used.
|
|
174
|
+
* If not provided, a random FabricId will be generated.
|
|
175
|
+
*/
|
|
176
|
+
adminFabricId = void 0;
|
|
167
177
|
}
|
|
168
178
|
ControllerBehavior2.State = State;
|
|
169
179
|
})(ControllerBehavior || (ControllerBehavior = {}));
|
|
@@ -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;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ControllerBehavior"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBAuBhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBAuBhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,iBAO3C;CACJ"}
|
|
@@ -58,6 +58,7 @@ var ServerEnvironment;
|
|
|
58
58
|
const { env } = node;
|
|
59
59
|
env.close(import_protocol.FabricManager);
|
|
60
60
|
await env.close(import_protocol.SessionManager);
|
|
61
|
+
await env.close(import_protocol.OccurrenceManager);
|
|
61
62
|
await env.close(import_ServerNodeStore.ServerNodeStore);
|
|
62
63
|
}
|
|
63
64
|
ServerEnvironment2.close = close;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/server/ServerEnvironment.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qCAA8C;AAC9C,iCAAoC;AACpC,qBAAmC;AACnC,uCAA0C;AAE1C,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qCAA8C;AAC9C,iCAAoC;AACpC,qBAAmC;AACnC,uCAA0C;AAE1C,sBAAiE;AACjE,6BAAgC;AAChC,6BAAgC;AAbhC;AAAA;AAAA;AAAA;AAAA;AAkBO,IAAU;AAAA,CAAV,CAAUA,uBAAV;AAEI,EAAMA,mBAAA,gCAA4B,2BAAW;AAEpD,iBAAsB,WAAW,MAAkB;AAC/C,UAAM,EAAE,IAAI,IAAI;AAGhB,UAAM,QAAQ,MAAM,uCAAgB,OAAO,KAAK,KAAK,EAAE;AACvD,QAAI,IAAI,wCAAiB,KAAK;AAC9B,QAAI,IAAI,gDAAqB,IAAI,2DAA0B,GAAG,CAAC;AAC/D,QAAI,IAAI,wCAAiB,IAAI,uCAAgB,IAAI,CAAC;AAGlD,UAAM,UAAU,MAAM,IAAI,KAAK,6BAAa;AAE5C,YAAQ,OAAO,QAAQ,GAAG,YAAY;AAClC,YAAM,gBAAgB,QAAQ,QAAQ,IAAI,YAAU,OAAO,WAAW;AACtE,UAAI,cAAc,SAAS,GAAG;AAC1B,kBAAM,8DAA8B,MAAM,aAAa;AAAA,MAC3D;AACA,MAAAA,mBAAA,0BAA0B,KAAK;AAAA,IACnC,CAAC;AAED,UAAM,IAAI,KAAK,8BAAc;AAE7B,QAAI,IAAI,qBAAM,EAAE,YAAY,KAAK,EAAE;AAAA,EACvC;AAvBA,EAAAA,mBAAsB;AAyBtB,iBAAsB,MAAM,MAAkB;AAC1C,UAAM,EAAE,IAAI,IAAI;AAEhB,QAAI,MAAM,6BAAa;AACvB,UAAM,IAAI,MAAM,8BAAc;AAC9B,UAAM,IAAI,MAAM,iCAAiB;AACjC,UAAM,IAAI,MAAM,sCAAe;AAAA,EACnC;AAPA,EAAAA,mBAAsB;AAAA,GA7BT;",
|
|
5
5
|
"names": ["ServerEnvironment"]
|
|
6
6
|
}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { Behavior } from "#behavior/Behavior.js";
|
|
7
7
|
import { MdnsScannerTargetCriteria } from "#protocol";
|
|
8
|
+
import { FabricId } from "@matter/types";
|
|
8
9
|
/**
|
|
9
10
|
* Node controller functionality.
|
|
10
11
|
*
|
|
@@ -45,6 +46,12 @@ export declare namespace ControllerBehavior {
|
|
|
45
46
|
* Contains the label of the admin fabric which is set for all commissioned devices
|
|
46
47
|
*/
|
|
47
48
|
adminFabricLabel: string;
|
|
49
|
+
/**
|
|
50
|
+
* Contains the FabricId of the admin fabric when a defined number needs to be used because special Certificates
|
|
51
|
+
* are used.
|
|
52
|
+
* If not provided, a random FabricId will be generated.
|
|
53
|
+
*/
|
|
54
|
+
adminFabricId?: FabricId;
|
|
48
55
|
}
|
|
49
56
|
}
|
|
50
57
|
//# sourceMappingURL=ControllerBehavior.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EASH,yBAAyB,EAI5B,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ControllerBehavior.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/controller/ControllerBehavior.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjD,OAAO,EASH,yBAAyB,EAI5B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOzC;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,QAAQ;;IAC5C,gBAAyB,EAAE,gBAAgB;IAEnC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,CAAC;IACtC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC;IAEzB,UAAU;IAgEV,CAAC,MAAM,CAAC,YAAY,CAAC;CAqEvC;AAED,yBAAiB,kBAAkB,CAAC;IAChC,MAAa,QAAQ;QACjB;;WAEG;QACH,kBAAkB,EAAE,yBAAyB,CAG3C;KACL;IAED,MAAa,KAAK;QACd;;;;WAIG;QACH,GAAG,CAAC,EAAE,OAAO,CAAa;QAE1B;;;;WAIG;QACH,EAAE,CAAC,EAAE,OAAO,CAAa;QAEzB;;WAEG;QACH,gBAAgB,SAAe;QAE/B;;;;WAIG;QACH,aAAa,CAAC,EAAE,QAAQ,CAAa;KACxC;CACJ"}
|
|
@@ -29,6 +29,7 @@ class ControllerBehavior extends Behavior {
|
|
|
29
29
|
throw new ImplementationError("adminFabricLabel must be set for ControllerBehavior.");
|
|
30
30
|
}
|
|
31
31
|
const adminFabricLabel = this.state.adminFabricLabel;
|
|
32
|
+
const adminFabricId = this.state.adminFabricId;
|
|
32
33
|
if (this.state.ip === void 0) {
|
|
33
34
|
this.state.ip = true;
|
|
34
35
|
}
|
|
@@ -52,6 +53,9 @@ class ControllerBehavior extends Behavior {
|
|
|
52
53
|
get adminFabricLabel() {
|
|
53
54
|
return adminFabricLabel;
|
|
54
55
|
}
|
|
56
|
+
get fabricId() {
|
|
57
|
+
return adminFabricId;
|
|
58
|
+
}
|
|
55
59
|
}()
|
|
56
60
|
);
|
|
57
61
|
}
|
|
@@ -151,6 +155,12 @@ class ControllerBehavior extends Behavior {
|
|
|
151
155
|
* Contains the label of the admin fabric which is set for all commissioned devices
|
|
152
156
|
*/
|
|
153
157
|
adminFabricLabel = "matter.js";
|
|
158
|
+
/**
|
|
159
|
+
* Contains the FabricId of the admin fabric when a defined number needs to be used because special Certificates
|
|
160
|
+
* are used.
|
|
161
|
+
* If not provided, a random FabricId will be generated.
|
|
162
|
+
*/
|
|
163
|
+
adminFabricId = void 0;
|
|
154
164
|
}
|
|
155
165
|
ControllerBehavior2.State = State;
|
|
156
166
|
})(ControllerBehavior || (ControllerBehavior = {}));
|
|
@@ -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;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["ControllerBehavior"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBAuBhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"ServerEnvironment.d.ts","sourceRoot":"","sources":["../../../../src/node/server/ServerEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAU,UAAU,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKtD;;GAEG;AACH,yBAAiB,iBAAiB,CAAC;IAC/B,sGAAsG;IAC/F,MAAM,yBAAyB,yBAAe,CAAC;IAEtD,SAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,iBAuBhD;IAED,SAAsB,KAAK,CAAC,IAAI,EAAE,UAAU,iBAO3C;CACJ"}
|
|
@@ -7,7 +7,7 @@ import { limitNodeDataToAllowedFabrics } from "#behavior/cluster/FabricScopedDat
|
|
|
7
7
|
import { EndpointInitializer } from "#endpoint/properties/EndpointInitializer.js";
|
|
8
8
|
import { Crypto, Observable } from "#general";
|
|
9
9
|
import { ServerEndpointInitializer } from "#node/server/ServerEndpointInitializer.js";
|
|
10
|
-
import { FabricManager, SessionManager } from "#protocol";
|
|
10
|
+
import { FabricManager, OccurrenceManager, SessionManager } from "#protocol";
|
|
11
11
|
import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
|
|
12
12
|
import { IdentityService } from "./IdentityService.js";
|
|
13
13
|
var ServerEnvironment;
|
|
@@ -35,6 +35,7 @@ var ServerEnvironment;
|
|
|
35
35
|
const { env } = node;
|
|
36
36
|
env.close(FabricManager);
|
|
37
37
|
await env.close(SessionManager);
|
|
38
|
+
await env.close(OccurrenceManager);
|
|
38
39
|
await env.close(ServerNodeStore);
|
|
39
40
|
}
|
|
40
41
|
ServerEnvironment2.close = close;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/node/server/ServerEnvironment.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,qCAAqC;AAC9C,SAAS,2BAA2B;AACpC,SAAS,QAAQ,kBAAkB;AACnC,SAAS,iCAAiC;AAE1C,SAAS,eAAe,sBAAsB;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,qCAAqC;AAC9C,SAAS,2BAA2B;AACpC,SAAS,QAAQ,kBAAkB;AACnC,SAAS,iCAAiC;AAE1C,SAAS,eAAe,mBAAmB,sBAAsB;AACjE,SAAS,uBAAuB;AAChC,SAAS,uBAAuB;AAKzB,IAAU;AAAA,CAAV,CAAUA,uBAAV;AAEI,EAAMA,mBAAA,4BAA4B,WAAW;AAEpD,iBAAsB,WAAW,MAAkB;AAC/C,UAAM,EAAE,IAAI,IAAI;AAGhB,UAAM,QAAQ,MAAM,gBAAgB,OAAO,KAAK,KAAK,EAAE;AACvD,QAAI,IAAI,iBAAiB,KAAK;AAC9B,QAAI,IAAI,qBAAqB,IAAI,0BAA0B,GAAG,CAAC;AAC/D,QAAI,IAAI,iBAAiB,IAAI,gBAAgB,IAAI,CAAC;AAGlD,UAAM,UAAU,MAAM,IAAI,KAAK,aAAa;AAE5C,YAAQ,OAAO,QAAQ,GAAG,YAAY;AAClC,YAAM,gBAAgB,QAAQ,QAAQ,IAAI,YAAU,OAAO,WAAW;AACtE,UAAI,cAAc,SAAS,GAAG;AAC1B,cAAM,8BAA8B,MAAM,aAAa;AAAA,MAC3D;AACA,MAAAA,mBAAA,0BAA0B,KAAK;AAAA,IACnC,CAAC;AAED,UAAM,IAAI,KAAK,cAAc;AAE7B,QAAI,IAAI,MAAM,EAAE,YAAY,KAAK,EAAE;AAAA,EACvC;AAvBA,EAAAA,mBAAsB;AAyBtB,iBAAsB,MAAM,MAAkB;AAC1C,UAAM,EAAE,IAAI,IAAI;AAEhB,QAAI,MAAM,aAAa;AACvB,UAAM,IAAI,MAAM,cAAc;AAC9B,UAAM,IAAI,MAAM,iBAAiB;AACjC,UAAM,IAAI,MAAM,eAAe;AAAA,EACnC;AAPA,EAAAA,mBAAsB;AAAA,GA7BT;",
|
|
5
5
|
"names": ["ServerEnvironment"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/node",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.6",
|
|
4
4
|
"description": "API for building Matter nodes",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -42,14 +42,14 @@
|
|
|
42
42
|
"#*": "./src/*"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@matter/general": "0.15.
|
|
46
|
-
"@matter/model": "0.15.
|
|
47
|
-
"@matter/types": "0.15.
|
|
48
|
-
"@matter/protocol": "0.15.
|
|
45
|
+
"@matter/general": "0.15.6",
|
|
46
|
+
"@matter/model": "0.15.6",
|
|
47
|
+
"@matter/types": "0.15.6",
|
|
48
|
+
"@matter/protocol": "0.15.6"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@matter/tools": "0.15.
|
|
52
|
-
"@matter/testing": "0.15.
|
|
51
|
+
"@matter/tools": "0.15.6",
|
|
52
|
+
"@matter/testing": "0.15.6"
|
|
53
53
|
},
|
|
54
54
|
"files": [
|
|
55
55
|
"dist/**/*",
|
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
Scanner,
|
|
24
24
|
ScannerSet,
|
|
25
25
|
} from "#protocol";
|
|
26
|
+
import { FabricId } from "@matter/types";
|
|
26
27
|
import type { CommissioningClient } from "../commissioning/CommissioningClient.js";
|
|
27
28
|
import { CommissioningServer } from "../commissioning/CommissioningServer.js";
|
|
28
29
|
import { NetworkServer } from "../network/NetworkServer.js";
|
|
@@ -48,6 +49,7 @@ export class ControllerBehavior extends Behavior {
|
|
|
48
49
|
throw new ImplementationError("adminFabricLabel must be set for ControllerBehavior.");
|
|
49
50
|
}
|
|
50
51
|
const adminFabricLabel = this.state.adminFabricLabel;
|
|
52
|
+
const adminFabricId = this.state.adminFabricId;
|
|
51
53
|
|
|
52
54
|
// Configure discovery transports
|
|
53
55
|
if (this.state.ip === undefined) {
|
|
@@ -77,6 +79,10 @@ export class ControllerBehavior extends Behavior {
|
|
|
77
79
|
override get adminFabricLabel() {
|
|
78
80
|
return adminFabricLabel;
|
|
79
81
|
}
|
|
82
|
+
|
|
83
|
+
get fabricId() {
|
|
84
|
+
return adminFabricId;
|
|
85
|
+
}
|
|
80
86
|
})(),
|
|
81
87
|
);
|
|
82
88
|
}
|
|
@@ -203,5 +209,12 @@ export namespace ControllerBehavior {
|
|
|
203
209
|
* Contains the label of the admin fabric which is set for all commissioned devices
|
|
204
210
|
*/
|
|
205
211
|
adminFabricLabel = "matter.js";
|
|
212
|
+
|
|
213
|
+
/**
|
|
214
|
+
* Contains the FabricId of the admin fabric when a defined number needs to be used because special Certificates
|
|
215
|
+
* are used.
|
|
216
|
+
* If not provided, a random FabricId will be generated.
|
|
217
|
+
*/
|
|
218
|
+
adminFabricId?: FabricId = undefined;
|
|
206
219
|
}
|
|
207
220
|
}
|
|
@@ -9,7 +9,7 @@ import { EndpointInitializer } from "#endpoint/properties/EndpointInitializer.js
|
|
|
9
9
|
import { Crypto, Observable } from "#general";
|
|
10
10
|
import { ServerEndpointInitializer } from "#node/server/ServerEndpointInitializer.js";
|
|
11
11
|
import type { ServerNode } from "#node/ServerNode.js";
|
|
12
|
-
import { FabricManager, SessionManager } from "#protocol";
|
|
12
|
+
import { FabricManager, OccurrenceManager, SessionManager } from "#protocol";
|
|
13
13
|
import { ServerNodeStore } from "#storage/server/ServerNodeStore.js";
|
|
14
14
|
import { IdentityService } from "./IdentityService.js";
|
|
15
15
|
|
|
@@ -50,6 +50,7 @@ export namespace ServerEnvironment {
|
|
|
50
50
|
|
|
51
51
|
env.close(FabricManager);
|
|
52
52
|
await env.close(SessionManager);
|
|
53
|
+
await env.close(OccurrenceManager);
|
|
53
54
|
await env.close(ServerNodeStore);
|
|
54
55
|
}
|
|
55
56
|
}
|