@matter-server/ws-controller 0.5.3 → 0.5.4
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/esm/controller/LegacyDataInjector.d.ts +1 -1
- package/dist/esm/controller/LegacyDataInjector.d.ts.map +1 -1
- package/dist/esm/controller/LegacyDataInjector.js +22 -1
- package/dist/esm/controller/LegacyDataInjector.js.map +1 -1
- package/dist/esm/controller/MatterController.d.ts.map +1 -1
- package/dist/esm/controller/MatterController.js +1 -0
- package/dist/esm/controller/MatterController.js.map +1 -1
- package/package.json +4 -4
- package/src/controller/LegacyDataInjector.ts +24 -0
- package/src/controller/MatterController.ts +1 -0
|
@@ -89,7 +89,7 @@ export interface LegacyServerData {
|
|
|
89
89
|
fabricId?: number | bigint;
|
|
90
90
|
}
|
|
91
91
|
export declare namespace LegacyDataInjector {
|
|
92
|
-
function injectCredentials(credentialsStorage: StorageContext, crypto: Crypto, credentialData: CertificateAuthority.Configuration, fabricData?: LegacyFabricConfigData): Promise<void>;
|
|
92
|
+
function injectCredentials(credentialsStorage: StorageContext, fabricsStorage: StorageContext, crypto: Crypto, credentialData: CertificateAuthority.Configuration, fabricData?: LegacyFabricConfigData): Promise<void>;
|
|
93
93
|
function injectNodeData(baseStorage: StorageManager, nodeData?: LegacyServerFile, fabricIndex?: number): Promise<boolean>;
|
|
94
94
|
}
|
|
95
95
|
//# sourceMappingURL=LegacyDataInjector.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LegacyDataInjector.d.ts","sourceRoot":"","sources":["../../../src/controller/LegacyDataInjector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,MAAM,EASN,cAAc,EACd,cAAc,EAGjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,oBAAoB,EAA2C,MAAM,uBAAuB,CAAC;AAYtG;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,sBAAsB;IACnC,gCAAgC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,wFAAwF;IACxF,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,sFAAsF;IACtF,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,4FAA4F;IAC5F,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,0CAA0C;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,8CAA8C;IAC9C,QAAQ,EAAE,KAAK,CAAC;IAChB,6CAA6C;IAC7C,aAAa,EAAE,KAAK,CAAC;IACrB,mDAAmD;IACnD,qBAAqB,EAAE,KAAK,CAAC;IAC7B,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,sDAAsD;IACtD,eAAe,EAAE,KAAK,CAAC;IACvB,mBAAmB;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,uBAAuB,EAAE,OAAO,EAAE,CAAC;CACtC;AAED,sDAAsD;AACtD,MAAM,WAAW,gBAAgB;IAC7B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,iCAAiC,GAAG,oBAAoB,CAAC,aAAa,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC7B,WAAW,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC;IACjD,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,yBAAiB,kBAAkB,CAAC;IAUhC,SAAsB,iBAAiB,CACnC,kBAAkB,EAAE,cAAc,EAClC,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,oBAAoB,CAAC,aAAa,EAClD,UAAU,CAAC,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"LegacyDataInjector.d.ts","sourceRoot":"","sources":["../../../src/controller/LegacyDataInjector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,MAAM,EASN,cAAc,EACd,cAAc,EAGjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,oBAAoB,EAA2C,MAAM,uBAAuB,CAAC;AAYtG;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,sBAAsB;IACnC,gCAAgC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,wFAAwF;IACxF,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,sFAAsF;IACtF,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,4FAA4F;IAC5F,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,0CAA0C;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,8CAA8C;IAC9C,QAAQ,EAAE,KAAK,CAAC;IAChB,6CAA6C;IAC7C,aAAa,EAAE,KAAK,CAAC;IACrB,mDAAmD;IACnD,qBAAqB,EAAE,KAAK,CAAC;IAC7B,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,KAAK,CAAC;IAC3B,sDAAsD;IACtD,eAAe,EAAE,KAAK,CAAC;IACvB,mBAAmB;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,uBAAuB,EAAE,OAAO,EAAE,CAAC;CACtC;AAED,sDAAsD;AACtD,MAAM,WAAW,gBAAgB;IAC7B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,iCAAiC,GAAG,oBAAoB,CAAC,aAAa,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC7B,WAAW,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC;IACjD,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,yBAAiB,kBAAkB,CAAC;IAUhC,SAAsB,iBAAiB,CACnC,kBAAkB,EAAE,cAAc,EAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,oBAAoB,CAAC,aAAa,EAClD,UAAU,CAAC,EAAE,sBAAsB,iBA8EtC;IAoBD,SAAsB,cAAc,CAChC,WAAW,EAAE,cAAc,EAC3B,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,WAAW,CAAC,EAAE,MAAM,oBAwBvB;CAuMJ"}
|
|
@@ -27,7 +27,7 @@ var LegacyDataInjector;
|
|
|
27
27
|
function isPrimitiveType(value) {
|
|
28
28
|
return typeof value === "number" || value === null || typeof value == "boolean" || typeof value == "string" && !BASE64_REGEX.test(value);
|
|
29
29
|
}
|
|
30
|
-
async function injectCredentials(credentialsStorage, crypto, credentialData, fabricData) {
|
|
30
|
+
async function injectCredentials(credentialsStorage, fabricsStorage, crypto, credentialData, fabricData) {
|
|
31
31
|
const rootCertificateAuthority = new CertificateAuthority(crypto, credentialData);
|
|
32
32
|
for (const [key, value] of Object.entries(credentialData)) {
|
|
33
33
|
if (await credentialsStorage.has(key)) {
|
|
@@ -70,12 +70,15 @@ var LegacyDataInjector;
|
|
|
70
70
|
keyPair: await crypto.createKeyPair()
|
|
71
71
|
// Just use a new keypair temporarily because chip data does not have it
|
|
72
72
|
});
|
|
73
|
+
let keyRewritten = false;
|
|
73
74
|
if (await credentialsStorage.has("fabric")) {
|
|
74
75
|
const storedFabric = await credentialsStorage.get("fabric");
|
|
75
76
|
if (!Bytes.areEqual(storedFabric.rootPublicKey, tempFabric.rootPublicKey)) {
|
|
76
77
|
logger.warn("Existing fabric root public key changed. Rewriting from legacy data");
|
|
78
|
+
keyRewritten = true;
|
|
77
79
|
} else {
|
|
78
80
|
logger.info("Fabric root public key unchanged. Skipping rewrite.");
|
|
81
|
+
await syncFabrics(fabricsStorage, storedFabric, false);
|
|
79
82
|
return;
|
|
80
83
|
}
|
|
81
84
|
}
|
|
@@ -93,8 +96,26 @@ var LegacyDataInjector;
|
|
|
93
96
|
);
|
|
94
97
|
const rootFabric = await builder.build(tempFabric.fabricIndex);
|
|
95
98
|
await credentialsStorage.set("fabric", rootFabric.config);
|
|
99
|
+
await syncFabrics(fabricsStorage, rootFabric.config, keyRewritten);
|
|
96
100
|
}
|
|
97
101
|
LegacyDataInjector2.injectCredentials = injectCredentials;
|
|
102
|
+
async function syncFabrics(fabricsStorage, fabricConfig, overwriteKey) {
|
|
103
|
+
if (!await fabricsStorage.has("fabrics")) {
|
|
104
|
+
await fabricsStorage.set("fabrics", [fabricConfig]);
|
|
105
|
+
logger.info("Initializing FabricManager storage");
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
let fabrics = await fabricsStorage.get("fabrics", []);
|
|
109
|
+
if (overwriteKey) {
|
|
110
|
+
fabrics = fabrics.filter((f) => f.fabricIndex !== fabricConfig.fabricIndex);
|
|
111
|
+
} else if (fabrics.some(({ fabricIndex }) => fabricIndex === fabricConfig.fabricIndex)) {
|
|
112
|
+
logger.info("FabricManager storage already has fabric index. Skipping update.");
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
fabrics.push(fabricConfig);
|
|
116
|
+
await fabricsStorage.set("fabrics", fabrics);
|
|
117
|
+
logger.info("Added fabric to FabricManager storage");
|
|
118
|
+
}
|
|
98
119
|
async function injectNodeData(baseStorage, nodeData, fabricIndex) {
|
|
99
120
|
const nodesListStorage = baseStorage.createContext("nodes");
|
|
100
121
|
const hasCommissionedNodes = await nodesListStorage.has("commissionedNodes");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/controller/LegacyDataInjector.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;AAAA,EACI;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAIA;AAAA,OACG;AACP,SAAS,yBAAyB;AAClC,SAAS,sBAAsB,QAAQ,eAAe,KAAK,mBAAmB;AAC9E,SAAS,gBAAgB;AACzB,SAAS,kBAAkB;AAC3B,SAAS,wCAAwC;AAEjD,MAAM,SAAS,OAAO,IAAI,oBAAoB;AAG9C,MAAM,eAAe;AAErB,MAAM,gBAAgB,kBAAkB,WAAW,WAAW,GAAG,SAAS;AA2FnE,IAAU;AAAA,CAAV,CAAUA,wBAAV;AACH,WAAS,gBAAgB,OAAgB;AACrC,WACI,OAAO,UAAU,YACjB,UAAU,QACV,OAAO,SAAS,aACf,OAAO,SAAS,YAAY,CAAC,aAAa,KAAK,KAAK;AAAA,EAE7D;AAEA,iBAAsB,kBAClB,oBACA,QACA,gBACA,YACF;AACE,UAAM,2BAA2B,IAAI,qBAAqB,QAAQ,cAAc;AAEhF,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,cAAc,GAAG;AACvD,UAAI,MAAM,mBAAmB,IAAI,GAAG,GAAG;AACnC,YAAI,YAAY,MAAM,mBAAmB,IAAI,GAAG,GAAG,KAAK,GAAG;AACvD;AAAA,QACJ;AACA,eAAO,KAAK,yBAAyB,GAAG,kBAAkB;AAAA,MAC9D;AACA,YAAM,mBAAmB,IAAI,KAAK,KAAK;AAAA,IAC3C;AAEA,QAAI,eAAe,QAAW;AAC1B,aAAO,KAAK,oFAAoF;AAChG;AAAA,IACJ;AAEA,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;AAEJ,UAAM,aAAa,MAAM,OAAO,OAAO,QAAQ;AAAA,MAC3C,aAAa,YAAY,WAAW;AAAA,MACpC,UAAU,SAAS,QAAQ;AAAA,MAC3B,QAAQ,OAAO,MAAM;AAAA,MACrB,YAAY,OAAO,UAAU;AAAA,MAC7B;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc,SAAS,YAAY;AAAA,MACnC;AAAA,MACA;AAAA,MACA;AAAA,MACA,SAAS,MAAM,OAAO,cAAc;AAAA;AAAA,IACxC,CAAC;AAED,QAAI,MAAM,mBAAmB,IAAI,QAAQ,GAAG;AACxC,YAAM,eAAe,MAAM,mBAAmB,IAAmB,QAAQ;AACzE,UAAI,CAAC,MAAM,SAAS,aAAa,eAAgB,WAAW,aAAa,GAAG;AACxE,eAAO,KAAK,qEAAqE;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["LegacyDataInjector"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../../src/controller/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EACN,WAAW,EAKX,yBAAyB,EAEzB,SAAS,EACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,qBAAqB,EAAuB,oBAAoB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIrH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAsB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,OAAO,oBAAoB,CAAC;AAI5B,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,KAAK,EAAE,KAAK,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,MAAM,WAAW,uBAAuB;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+HAA+H;IAC/H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmBD,qBAAa,gBAAgB;;WAYZ,MAAM,CACf,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,uBAAuB,EAChC,UAAU,CAAC,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../../src/controller/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EACN,WAAW,EAKX,yBAAyB,EAEzB,SAAS,EACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,qBAAqB,EAAuB,oBAAoB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIrH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAsB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,OAAO,oBAAoB,CAAC;AAI5B,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,KAAK,EAAE,KAAK,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,MAAM,WAAW,uBAAuB;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+HAA+H;IAC/H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmBD,qBAAa,gBAAgB;;WAYZ,MAAM,CACf,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,uBAAuB,EAChC,UAAU,CAAC,EAAE,gBAAgB;gBA2DrB,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM;cAS/F,UAAU,CACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAC1B,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAgCpD,IAAI,cAAc,6BAuBjB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,yBAAyB,CAKxC;IAED;;;OAGG;IACH,IAAI,iBAAiB,IAAI,oBAAoB,CAK5C;IAED;;;OAGG;IACH,IAAI,kBAAkB,0BAKrB;IAED;;;OAGG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKtE;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAKzD,uBAAuB;IAkBvB,IAAI;IAmBV;;;;OAIG;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB/D;;OAEG;IACG,aAAa;CAGtB"}
|
|
@@ -60,6 +60,7 @@ class MatterController {
|
|
|
60
60
|
if (legacyData.credentials && legacyData.fabricId) {
|
|
61
61
|
await LegacyDataInjector.injectCredentials(
|
|
62
62
|
baseStorage.createContext("credentials"),
|
|
63
|
+
baseStorage.createContext("fabrics"),
|
|
63
64
|
crypto,
|
|
64
65
|
legacyData.credentials,
|
|
65
66
|
legacyData.fabric
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/controller/MatterController.ts"],
|
|
4
|
-
"mappings": "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",
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter-server/ws-controller",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "matter.js based Matter controller library",
|
|
6
6
|
"bugs": {
|
|
@@ -22,11 +22,11 @@
|
|
|
22
22
|
"node": ">=20.19.0 <22.0.0 || >=22.13.0"
|
|
23
23
|
},
|
|
24
24
|
"optionalDependencies": {
|
|
25
|
-
"@matter/nodejs-ble": "0.17.0-alpha.0-
|
|
25
|
+
"@matter/nodejs-ble": "0.17.0-alpha.0-20260308-2d3759f3b"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@matter/main": "0.17.0-alpha.0-
|
|
29
|
-
"@project-chip/matter.js": "0.17.0-alpha.0-
|
|
28
|
+
"@matter/main": "0.17.0-alpha.0-20260308-2d3759f3b",
|
|
29
|
+
"@project-chip/matter.js": "0.17.0-alpha.0-20260308-2d3759f3b",
|
|
30
30
|
"ws": "^8.19.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
@@ -134,6 +134,7 @@ export namespace LegacyDataInjector {
|
|
|
134
134
|
|
|
135
135
|
export async function injectCredentials(
|
|
136
136
|
credentialsStorage: StorageContext,
|
|
137
|
+
fabricsStorage: StorageContext,
|
|
137
138
|
crypto: Crypto,
|
|
138
139
|
credentialData: CertificateAuthority.Configuration,
|
|
139
140
|
fabricData?: LegacyFabricConfigData,
|
|
@@ -184,12 +185,15 @@ export namespace LegacyDataInjector {
|
|
|
184
185
|
keyPair: await crypto.createKeyPair(), // Just use a new keypair temporarily because chip data does not have it
|
|
185
186
|
});
|
|
186
187
|
|
|
188
|
+
let keyRewritten = false;
|
|
187
189
|
if (await credentialsStorage.has("fabric")) {
|
|
188
190
|
const storedFabric = await credentialsStorage.get<Fabric.Config>("fabric");
|
|
189
191
|
if (!Bytes.areEqual(storedFabric.rootPublicKey!, tempFabric.rootPublicKey)) {
|
|
190
192
|
logger.warn("Existing fabric root public key changed. Rewriting from legacy data");
|
|
193
|
+
keyRewritten = true;
|
|
191
194
|
} else {
|
|
192
195
|
logger.info("Fabric root public key unchanged. Skipping rewrite.");
|
|
196
|
+
await syncFabrics(fabricsStorage, storedFabric, false);
|
|
193
197
|
return;
|
|
194
198
|
}
|
|
195
199
|
}
|
|
@@ -209,6 +213,26 @@ export namespace LegacyDataInjector {
|
|
|
209
213
|
const rootFabric = await builder.build(tempFabric.fabricIndex);
|
|
210
214
|
|
|
211
215
|
await credentialsStorage.set("fabric", rootFabric.config);
|
|
216
|
+
|
|
217
|
+
await syncFabrics(fabricsStorage, rootFabric.config, keyRewritten);
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
async function syncFabrics(fabricsStorage: StorageContext, fabricConfig: Fabric.Config, overwriteKey: boolean) {
|
|
221
|
+
if (!(await fabricsStorage.has("fabrics"))) {
|
|
222
|
+
await fabricsStorage.set("fabrics", [fabricConfig]);
|
|
223
|
+
logger.info("Initializing FabricManager storage");
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
let fabrics = await fabricsStorage.get<Fabric.Config[]>("fabrics", []);
|
|
227
|
+
if (overwriteKey) {
|
|
228
|
+
fabrics = fabrics.filter(f => f.fabricIndex !== fabricConfig.fabricIndex);
|
|
229
|
+
} else if (fabrics.some(({ fabricIndex }) => fabricIndex === fabricConfig.fabricIndex)) {
|
|
230
|
+
logger.info("FabricManager storage already has fabric index. Skipping update.");
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
fabrics.push(fabricConfig);
|
|
234
|
+
await fabricsStorage.set("fabrics", fabrics);
|
|
235
|
+
logger.info("Added fabric to FabricManager storage");
|
|
212
236
|
}
|
|
213
237
|
|
|
214
238
|
export async function injectNodeData(
|
|
@@ -100,6 +100,7 @@ export class MatterController {
|
|
|
100
100
|
if (legacyData.credentials && legacyData.fabricId) {
|
|
101
101
|
await LegacyDataInjector.injectCredentials(
|
|
102
102
|
baseStorage.createContext("credentials"),
|
|
103
|
+
baseStorage.createContext("fabrics"),
|
|
103
104
|
crypto,
|
|
104
105
|
legacyData.credentials,
|
|
105
106
|
legacyData.fabric,
|