@project-chip/matter.js 0.4.0 → 0.5.0

package/dist/es/device/OnOffDevices.js

@@ -7,19 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-/**
- * @license
- * Copyright 2022 The matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-import { DeviceTypes } from "./DeviceTypes.js";
-import { Device } from "./Device.js";
-import { createDefaultOnOffClusterServer } from "../cluster/server/OnOffServer.js";
+import { Groups } from "../cluster/definitions/GroupsCluster.js";
+import { Identify } from "../cluster/definitions/IdentifyCluster.js";
+import { OnOff } from "../cluster/definitions/OnOffCluster.js";
+import { Scenes } from "../cluster/definitions/ScenesCluster.js";
 import { createDefaultGroupsClusterServer } from "../cluster/server/GroupsServer.js";
-import { createDefaultScenesClusterServer } from "../cluster/server/ScenesServer.js";
 import { createDefaultIdentifyClusterServer } from "../cluster/server/IdentifyServer.js";
-import { OnOffCluster } from "../cluster/OnOffCluster.js";
+import { createDefaultOnOffClusterServer } from "../cluster/server/OnOffServer.js";
+import { createDefaultScenesClusterServer } from "../cluster/server/ScenesServer.js";
 import { extendPublicHandlerMethods } from "../util/NamedHandler.js";
+import { Device } from "./Device.js";
+import { DeviceTypes } from "./DeviceTypes.js";
 /**
  * Utility function to get the initial attribute values for a cluster out of an object with initial attribute values
  * for multiple clusters
@@ -27,7 +25,7 @@ import { extendPublicHandlerMethods } from "../util/NamedHandler.js";
  * @param attributeInitialValues Object with initial attribute values for automatically added clusters
  * @param cluster Cluster to get the initial attribute values for
  */
-function getClusterInitialAttributeValues(attributeInitialValues, cluster) {
+export function getClusterInitialAttributeValues(attributeInitialValues, cluster) {
     if (attributeInitialValues === undefined)
         return undefined;
     return attributeInitialValues[cluster.id];
@@ -35,17 +33,17 @@ function getClusterInitialAttributeValues(attributeInitialValues, cluster) {
 /**
  * Abstract Base class for OnOff devices
  */
-class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
+export class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
     /**
      * Creates a new OnOffBaseDevice
      *
      * @protected
      * @param definition Device type definition of the device to create
      * @param attributeInitialValues Optional object with initial attribute values for automatically added clusters
-     * @param endpointId Optional endpoint ID of the device. If not set, the device will be instanced as a root device
+     * @param options Optional endpoint options
      */
-    constructor(definition, attributeInitialValues, endpointId) {
-        super(definition, [], endpointId);
+    constructor(definition, attributeInitialValues, options = {}) {
+        super(definition, options);
         this.addDeviceClusters(attributeInitialValues);
     }
     /**
@@ -53,15 +51,24 @@ class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
      *
      * @protected
      * @param attributeInitialValues Optional object with initial attribute values for automatically added clusters
+     * @param excludeList List of clusters to exclude from being added
      */
-    addDeviceClusters(attributeInitialValues) {
+    addDeviceClusters(attributeInitialValues, excludeList = []) {
         // TODO: Find a way to make this automated based on the required clusters?
-        this.addClusterServer(createDefaultIdentifyClusterServer({
-            identify: (data) => __awaiter(this, void 0, void 0, function* () { return yield this._executeHandler("identify", data); })
-        }));
-        this.addClusterServer(createDefaultGroupsClusterServer());
-        this.addClusterServer(createDefaultScenesClusterServer());
-        this.addClusterServer(createDefaultOnOffClusterServer(getClusterInitialAttributeValues(attributeInitialValues, OnOffCluster)));
+        if (!excludeList.includes(Identify.Cluster.id)) {
+            this.addClusterServer(createDefaultIdentifyClusterServer({
+                identify: (data) => __awaiter(this, void 0, void 0, function* () { return yield this._executeHandler("identify", data); }),
+            }));
+        }
+        if (!excludeList.includes(Groups.Cluster.id)) {
+            this.addClusterServer(createDefaultGroupsClusterServer());
+        }
+        if (!excludeList.includes(Scenes.Cluster.id)) {
+            this.addClusterServer(createDefaultScenesClusterServer());
+        }
+        if (!excludeList.includes(OnOff.Cluster.id)) {
+            this.addClusterServer(createDefaultOnOffClusterServer(this.commandHandler, getClusterInitialAttributeValues(attributeInitialValues, OnOff.Cluster)));
+        }
     }
     /**
      * Turns the device on or off
@@ -72,7 +79,7 @@ class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
     onOff(onOff) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            (_a = this.getClusterServer(OnOffCluster)) === null || _a === void 0 ? void 0 : _a.setOnOffAttribute(onOff);
+            (_a = this.getClusterServer(OnOff.Cluster)) === null || _a === void 0 ? void 0 : _a.setOnOffAttribute(onOff);
         });
     }
     /**
@@ -81,10 +88,16 @@ class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
      */
     toggle() {
         return __awaiter(this, void 0, void 0, function* () {
-            const cluster = this.getClusterServer(OnOffCluster);
+            const cluster = this.getClusterServer(OnOff.Cluster);
             cluster === null || cluster === void 0 ? void 0 : cluster.setOnOffAttribute(!(cluster === null || cluster === void 0 ? void 0 : cluster.getOnOffAttribute()));
         });
     }
+    isOn() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return (_a = this.getClusterServer(OnOff.Cluster)) === null || _a === void 0 ? void 0 : _a.getOnOffAttribute();
+        });
+    }
     // Add Listeners convenient for chosen attributes
     /**
      * Adds a listener for the OnOff attribute
@@ -94,23 +107,37 @@ class OnOffBaseDevice extends extendPublicHandlerMethods(Device) {
      */
     addOnOffListener(listener) {
         var _a;
-        (_a = this.getClusterServer(OnOffCluster)) === null || _a === void 0 ? void 0 : _a.subscribeOnOffAttribute(listener);
+        (_a = this.getClusterServer(OnOff.Cluster)) === null || _a === void 0 ? void 0 : _a.subscribeOnOffAttribute(listener);
     }
 }
 /**
  * Device class for an OnOffPluginUnit Device
  */
 export class OnOffPluginUnitDevice extends OnOffBaseDevice {
-    constructor(onOffAttributeInitialValues, endpointId) {
-        super(DeviceTypes.ON_OFF_PLUGIN_UNIT, onOffAttributeInitialValues, endpointId);
+    constructor(onOffAttributeInitialValues, options = {}) {
+        const initialAttributeValues = {};
+        if (onOffAttributeInitialValues !== undefined) {
+            initialAttributeValues[OnOff.Cluster.id] = onOffAttributeInitialValues;
+        }
+        super(DeviceTypes.ON_OFF_PLUGIN_UNIT, initialAttributeValues, options);
     }
 }
 /**
  * Device class for an OnOffPluginUnit Device
  */
 export class OnOffLightDevice extends OnOffBaseDevice {
-    constructor(onOffAttributeInitialValues, endpointId) {
-        super(DeviceTypes.ON_OFF_LIGHT, onOffAttributeInitialValues, endpointId);
+    constructor(onOffAttributeInitialValues, options = {}) {
+        const initialAttributeValues = {};
+        if (onOffAttributeInitialValues !== undefined) {
+            initialAttributeValues[OnOff.Cluster.id] = onOffAttributeInitialValues;
+        }
+        super(DeviceTypes.ON_OFF_LIGHT, initialAttributeValues, options);
+    }
+    addDeviceClusters(attributeInitialValues, excludeList = []) {
+        super.addDeviceClusters(attributeInitialValues, [OnOff.Cluster.id]);
+        if (!excludeList.includes(OnOff.Cluster.id)) {
+            this.addClusterServer(createDefaultOnOffClusterServer(this.commandHandler, getClusterInitialAttributeValues(attributeInitialValues, OnOff.Cluster.with(OnOff.Feature.LevelControlForLighting))));
+        }
     }
 }
 /*

package/dist/es/device/OnOffDevices.js.map

@@ -1 +1 @@
-{"version":3,"file":"OnOffDevices.js","sourceRoot":"","sources":["../../../src/device/OnOffDevices.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;GAIG;AACH,OAAO,EAAE,WAAW,EAAwB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AAGzF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AASrE;;;;;;GAMG;AACH,SAAS,gCAAgC,CAAmH,sBAAkF,EAAE,OAAgC;IAC5Q,IAAI,sBAAsB,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3D,OAAO,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAA8B,CAAC;AAC3E,CAAC;AAED;;GAEG;AACH,MAAe,eAAgB,SAAQ,0BAA0B,CAAyC,MAAM,CAAC;IAE7G;;;;;;;OAOG;IACH,YAAsB,UAAgC,EAAE,sBAAuE,EAAE,UAAmB;QAChJ,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAClC,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACO,iBAAiB,CAAC,sBAAuE;QAC/F,0EAA0E;QAC1E,IAAI,CAAC,gBAAgB,CAAC,kCAAkC,CAAC;YACrD,QAAQ,EAAE,CAAO,IAAI,EAAE,EAAE,gDAAC,OAAA,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA,GAAA;SACzE,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,gBAAgB,CAAC,gCAAgC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,CAAC,gCAAgC,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,gCAAgC,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IACnI,CAAC;IAED;;;;;OAKG;IACG,KAAK,CAAC,KAAc;;;YACtB,MAAA,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,0CAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;;KACjE;IAED;;;OAGG;IACG,MAAM;;YACR,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YACpD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,EAAE,CAAA,CAAC,CAAC;QAC9D,CAAC;KAAA;IAED,iDAAiD;IACjD;;;;;OAKG;IACH,gBAAgB,CAAC,QAAwD;;QACrE,MAAA,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,0CAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;CACJ;AAGD;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,eAAe;IACtD,YAAY,2BAAoF,EAAE,UAAmB;QACjH,KAAK,CAAC,WAAW,CAAC,kBAAkB,EAAE,2BAA2B,EAAE,UAAU,CAAC,CAAC;IACnF,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,eAAe;IACjD,YAAY,2BAAoF,EAAE,UAAmB;QACjH,KAAK,CAAC,WAAW,CAAC,YAAY,EAAE,2BAA2B,EAAE,UAAU,CAAC,CAAC;IAC7E,CAAC;CACJ;AAGD;;;;;;;;;;;;;;;;;;GAkBG"}
+{"version":3,"file":"OnOffDevices.js","sourceRoot":"","sources":["../../../src/device/OnOffDevices.ts"],"names":[],"mappings":"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"}

package/dist/es/device/export.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export * from "./Aggregator.js";
+export * from "./ComposedDevice.js";
+export * from "./Device.js";
+export * from "./DeviceTypes.js";
+export * from "./DimmableDevices.js";
+export * from "./Endpoint.js";
+export * from "./OnOffDevices.js";
+//# sourceMappingURL=export.d.ts.map

package/dist/es/device/export.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/device/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}

package/dist/es/device/export.js

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export * from "./Aggregator.js";
+export * from "./ComposedDevice.js";
+export * from "./Device.js";
+export * from "./DeviceTypes.js";
+export * from "./DimmableDevices.js";
+export * from "./Endpoint.js";
+export * from "./OnOffDevices.js";
+//# sourceMappingURL=export.js.map

package/dist/es/device/export.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/device/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}

package/dist/es/export.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export * from "./CommissioningController.js";
+export * from "./CommissioningServer.js";
+export * from "./MatterNode.js";
+export * from "./MatterServer.js";
+export * from "./spec/Specifications.js";
+//# sourceMappingURL=export.d.ts.map

package/dist/es/export.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../src/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,cAAc,8BAA8B,CAAC;AAE7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}

package/dist/es/export.js

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// Export Specs types
+export * from "./CommissioningController.js";
+// Export new High Level API basic classes
+export * from "./CommissioningServer.js";
+export * from "./MatterNode.js";
+export * from "./MatterServer.js";
+export * from "./spec/Specifications.js";
+//# sourceMappingURL=export.js.map

package/dist/es/export.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/export.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,qBAAqB;AACrB,cAAc,8BAA8B,CAAC;AAC7C,0CAA0C;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}

package/dist/es/fabric/Fabric.d.ts

@@ -3,24 +3,24 @@
  * Copyright 2022-2023 Project CHIP Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { KeyPair } from "../crypto/Crypto.js";
-import { NodeId } from "../datatype/NodeId.js";
-import { FabricIndex } from "../datatype/FabricIndex.js";
+import { Cluster } from "../cluster/Cluster.js";
+import { BinaryKeyPair, Key } from "../crypto/Key.js";
 import { FabricId } from "../datatype/FabricId.js";
+import { FabricIndex } from "../datatype/FabricIndex.js";
+import { NodeId } from "../datatype/NodeId.js";
 import { VendorId } from "../datatype/VendorId.js";
-import { Cluster } from "../cluster/Cluster.js";
 import { SecureSession } from "../session/SecureSession.js";
-import { ByteArray } from "../util/ByteArray.js";
 import { SupportedStorageTypes } from "../storage/StringifyTools.js";
+import { ByteArray } from "../util/ByteArray.js";
 export type FabricJsonObject = {
-    fabricIndex: number;
-    fabricId: bigint;
-    nodeId: bigint;
-    rootNodeId: bigint;
+    fabricIndex: FabricIndex;
+    fabricId: FabricId;
+    nodeId: NodeId;
+    rootNodeId: NodeId;
     operationalId: ByteArray;
     rootPublicKey: ByteArray;
-    keyPair: KeyPair;
-    rootVendorId: number;
+    keyPair: BinaryKeyPair;
+    rootVendorId: VendorId;
     rootCert: ByteArray;
     identityProtectionKey: ByteArray;
     operationalIdentityProtectionKey: ByteArray;
@@ -38,7 +38,7 @@ export declare class Fabric {
     readonly rootPublicKey: ByteArray;
     private readonly keyPair;
     readonly rootVendorId: VendorId;
-    private readonly rootCert;
+    readonly rootCert: ByteArray;
     readonly identityProtectionKey: ByteArray;
     readonly operationalIdentityProtectionKey: ByteArray;
     readonly intermediateCACert: ByteArray | undefined;
@@ -48,7 +48,7 @@ export declare class Fabric {
     private readonly scopedClusterData;
     private removeCallback;
     private persistCallback;
-    constructor(fabricIndex: FabricIndex, fabricId: FabricId, nodeId: NodeId, rootNodeId: NodeId, operationalId: ByteArray, rootPublicKey: ByteArray, keyPair: KeyPair, rootVendorId: VendorId, rootCert: ByteArray, identityProtectionKey: ByteArray, operationalIdentityProtectionKey: ByteArray, intermediateCACert: ByteArray | undefined, operationalCert: ByteArray, label: string, scopedClusterData?: Map<number, Map<string, SupportedStorageTypes>>);
+    constructor(fabricIndex: FabricIndex, fabricId: FabricId, nodeId: NodeId, rootNodeId: NodeId, operationalId: ByteArray, rootPublicKey: ByteArray, keyPair: Key, rootVendorId: VendorId, rootCert: ByteArray, identityProtectionKey: ByteArray, operationalIdentityProtectionKey: ByteArray, intermediateCACert: ByteArray | undefined, operationalCert: ByteArray, label: string, scopedClusterData?: Map<number, Map<string, SupportedStorageTypes>>);
     toStorageObject(): FabricJsonObject;
     static createFromStorageObject(fabricObject: FabricJsonObject): Fabric;
     setLabel(label: string): void;
@@ -60,7 +60,7 @@ export declare class Fabric {
     removeSession(session: SecureSession<any>): void;
     setRemoveCallback(callback: () => void): void;
     setPersistCallback(callback: () => void): void;
-    remove(): void;
+    remove(): Promise<void>;
     persist(): void;
     getScopedClusterDataValue<T>(cluster: Cluster<any, any, any, any, any>, clusterDataKey: string): T | undefined;
     setScopedClusterDataValue<T>(cluster: Cluster<any, any, any, any, any>, clusterDataKey: string, value: T): void;
@@ -68,6 +68,13 @@ export declare class Fabric {
     hasScopedClusterDataValue(cluster: Cluster<any, any, any, any, any>, clusterDataKey: string): any;
     deleteScopedClusterData(cluster: Cluster<any, any, any, any, any>): void;
     getScopedClusterDataKeys(cluster: Cluster<any, any, any, any, any>): string[];
+    getExternalInformation(): {
+        fabricId: FabricId;
+        nodeId: NodeId;
+        rootNodeId: NodeId;
+        rootVendorId: VendorId;
+        label: string;
+    };
 }
 export declare class FabricBuilder {
     private readonly fabricIndex;

package/dist/es/fabric/Fabric.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Fabric.d.ts","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Fabric.d.ts","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"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"}

package/dist/es/fabric/Fabric.js

@@ -12,15 +12,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { CertificateManager, TlvOperationalCertificate, TlvRootCertificate, } from "../certificate/CertificateManager.js";
+import { InternalError } from "../common/MatterError.js";
 import { Crypto } from "../crypto/Crypto.js";
-import { CertificateManager, TlvOperationalCertificate, TlvRootCertificate } from "../certificate/CertificateManager.js";
-import { NodeId } from "../datatype/NodeId.js";
-import { FabricIndex } from "../datatype/FabricIndex.js";
+import { PrivateKey } from "../crypto/Key.js";
 import { FabricId } from "../datatype/FabricId.js";
-import { VendorId } from "../datatype/VendorId.js";
 import { ByteArray, Endian } from "../util/ByteArray.js";
 import { DataWriter } from "../util/DataWriter.js";
-import { toBigInt } from "../util/Number.js";
 const COMPRESSED_FABRIC_ID_INFO = ByteArray.fromString("CompressedFabric");
 const GROUP_SECURITY_INFO = ByteArray.fromString("GroupKey v1.0");
 export class Fabric {
@@ -44,25 +42,25 @@ export class Fabric {
     }
     toStorageObject() {
         return {
-            fabricIndex: this.fabricIndex.index,
-            fabricId: this.fabricId.id,
-            nodeId: this.nodeId.id,
-            rootNodeId: this.rootNodeId.id,
+            fabricIndex: this.fabricIndex,
+            fabricId: this.fabricId,
+            nodeId: this.nodeId,
+            rootNodeId: this.rootNodeId,
             operationalId: this.operationalId,
             rootPublicKey: this.rootPublicKey,
-            keyPair: this.keyPair,
-            rootVendorId: this.rootVendorId.id,
+            keyPair: this.keyPair.keyPair,
+            rootVendorId: this.rootVendorId,
             rootCert: this.rootCert,
             identityProtectionKey: this.identityProtectionKey,
             operationalIdentityProtectionKey: this.operationalIdentityProtectionKey,
             intermediateCACert: this.intermediateCACert,
             operationalCert: this.operationalCert,
             label: this.label,
-            scopedClusterData: this.scopedClusterData
+            scopedClusterData: this.scopedClusterData,
         };
     }
     static createFromStorageObject(fabricObject) {
-        return new Fabric(new FabricIndex(fabricObject.fabricIndex), new FabricId(fabricObject.fabricId), new NodeId(fabricObject.nodeId), new NodeId(fabricObject.rootNodeId), fabricObject.operationalId, fabricObject.rootPublicKey, fabricObject.keyPair, new VendorId(fabricObject.rootVendorId), fabricObject.rootCert, fabricObject.identityProtectionKey, fabricObject.operationalIdentityProtectionKey, fabricObject.intermediateCACert, fabricObject.operationalCert, fabricObject.label);
+        return new Fabric(fabricObject.fabricIndex, fabricObject.fabricId, fabricObject.nodeId, fabricObject.rootNodeId, fabricObject.operationalId, fabricObject.rootPublicKey, PrivateKey(fabricObject.keyPair), fabricObject.rootVendorId, fabricObject.rootCert, fabricObject.identityProtectionKey, fabricObject.operationalIdentityProtectionKey, fabricObject.intermediateCACert, fabricObject.operationalCert, fabricObject.label);
     }
     setLabel(label) {
         this.label = label;
@@ -72,7 +70,7 @@ export class Fabric {
         return this.keyPair.publicKey;
     }
     sign(data) {
-        return Crypto.signPkcs8(this.keyPair.privateKey, data);
+        return Crypto.sign(this.keyPair, data);
     }
     verifyCredentials(_operationalCert, _intermediateCACert) {
         // TODO: implement verification
@@ -82,8 +80,8 @@ export class Fabric {
         const writer = new DataWriter(Endian.Little);
         writer.writeByteArray(random);
         writer.writeByteArray(this.rootPublicKey);
-        writer.writeUInt64(this.fabricId.id);
-        writer.writeUInt64(nodeId.id);
+        writer.writeUInt64(this.fabricId);
+        writer.writeUInt64(nodeId);
         return Crypto.hmac(this.operationalIdentityProtectionKey, writer.toByteArray());
     }
     addSession(session) {
@@ -103,8 +101,12 @@ export class Fabric {
     }
     remove() {
         var _a;
-        this.sessions.forEach(session => session.destroy());
-        (_a = this.removeCallback) === null || _a === void 0 ? void 0 : _a.call(this);
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const session of this.sessions) {
+                yield session.end();
+            }
+            (_a = this.removeCallback) === null || _a === void 0 ? void 0 : _a.call(this);
+        });
     }
     persist() {
         var _a;
@@ -144,6 +146,15 @@ export class Fabric {
         }
         return Array.from(this.scopedClusterData.get(cluster.id).keys());
     }
+    getExternalInformation() {
+        return {
+            fabricId: this.fabricId,
+            nodeId: this.nodeId,
+            rootNodeId: this.rootNodeId,
+            rootVendorId: this.rootVendorId,
+            label: this.label,
+        };
+    }
 }
 export class FabricBuilder {
     constructor(fabricIndex) {
@@ -163,8 +174,8 @@ export class FabricBuilder {
     }
     setOperationalCert(operationalCert) {
         this.operationalCert = operationalCert;
-        const { subject: { nodeId, fabricId } } = TlvOperationalCertificate.decode(operationalCert);
-        this.fabricId = new FabricId(toBigInt(fabricId));
+        const { subject: { nodeId, fabricId }, } = TlvOperationalCertificate.decode(operationalCert);
+        this.fabricId = FabricId(fabricId);
         this.nodeId = nodeId;
         return this;
     }
@@ -187,17 +198,17 @@ export class FabricBuilder {
     build() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.rootNodeId === undefined)
-                throw new Error("rootNodeId needs to be set");
+                throw new InternalError("rootNodeId needs to be set");
             if (this.rootVendorId === undefined)
-                throw new Error("vendorId needs to be set");
+                throw new InternalError("vendorId needs to be set");
             if (this.rootCert === undefined || this.rootPublicKey === undefined)
-                throw new Error("rootCert needs to be set");
+                throw new InternalError("rootCert needs to be set");
             if (this.identityProtectionKey === undefined)
-                throw new Error("identityProtectionKey needs to be set");
+                throw new InternalError("identityProtectionKey needs to be set");
             if (this.operationalCert === undefined || this.fabricId === undefined || this.nodeId === undefined)
-                throw new Error("operationalCert needs to be set");
+                throw new InternalError("operationalCert needs to be set");
             const saltWriter = new DataWriter(Endian.Big);
-            saltWriter.writeUInt64(this.fabricId.id);
+            saltWriter.writeUInt64(this.fabricId);
             const operationalId = yield Crypto.hkdf(this.rootPublicKey.slice(1), saltWriter.toByteArray(), COMPRESSED_FABRIC_ID_INFO, 8);
             return new Fabric(this.fabricIndex, this.fabricId, this.nodeId, this.rootNodeId, operationalId, this.rootPublicKey, this.keyPair, this.rootVendorId, this.rootCert, this.identityProtectionKey, yield Crypto.hkdf(this.identityProtectionKey, operationalId, GROUP_SECURITY_INFO, 16), this.intermediateCACert, this.operationalCert, "");
         });

package/dist/es/fabric/Fabric.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fabric.js","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Fabric.js","sourceRoot":"","sources":["../../../src/fabric/Fabric.ts"],"names":[],"mappings":"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"}

package/dist/es/fabric/FabricManager.d.ts

@@ -3,11 +3,11 @@
  * Copyright 2022-2023 Project CHIP Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Fabric, FabricBuilder } from "./Fabric.js";
 import { MatterError } from "../common/MatterError.js";
 import { FabricIndex } from "../datatype/FabricIndex.js";
-import { StorageManager } from "../storage/StorageManager.js";
+import { StorageContext } from "../storage/StorageContext.js";
 import { ByteArray } from "../util/ByteArray.js";
+import { Fabric, FabricBuilder } from "./Fabric.js";
 /** Specific Error for when a fabric is not found. */
 export declare class FabricNotFoundError extends MatterError {
 }
@@ -16,7 +16,7 @@ export declare class FabricManager {
     private readonly fabrics;
     private fabricBuilder?;
     private readonly fabricStorage;
-    constructor(storageManager: StorageManager);
+    constructor(storage: StorageContext);
     persistFabrics(): void;
     addFabric(fabric: Fabric): void;
     removeFabric(fabricIndex: FabricIndex): void;

package/dist/es/fabric/FabricManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FabricManager.d.ts","sourceRoot":"","sources":["../../../src/fabric/FabricManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,aAAa,EAAoB,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,qDAAqD;AACrD,qBAAa,mBAAoB,SAAQ,WAAW;CAAI;AAExD,qBAAa,aAAa;IACtB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;gBAEnC,cAAc,EAAE,cAAc;IAO1C,cAAc;IAKd,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,YAAY,CAAC,WAAW,EAAE,WAAW;IAOrC,UAAU;IAIV,2BAA2B,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS;IAUhF,WAAW;IAIX,gBAAgB;IAMV,oBAAoB;IAM1B,kBAAkB;CAKrB"}
+{"version":3,"file":"FabricManager.d.ts","sourceRoot":"","sources":["../../../src/fabric/FabricManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAiB,WAAW,EAAmB,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAoB,MAAM,aAAa,CAAC;AAEtE,qDAAqD;AACrD,qBAAa,mBAAoB,SAAQ,WAAW;CAAG;AAEvD,qBAAa,aAAa;IACtB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;gBAEnC,OAAO,EAAE,cAAc;IAOnC,cAAc;IAQd,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,YAAY,CAAC,WAAW,EAAE,WAAW;IAUrC,UAAU;IAIV,2BAA2B,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS;IAUhF,WAAW;IAIX,gBAAgB;IAMV,oBAAoB;IAM1B,kBAAkB;CAKrB"}

package/dist/es/fabric/FabricManager.js

@@ -12,17 +12,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Fabric, FabricBuilder } from "./Fabric.js";
-import { MatterError } from "../common/MatterError.js";
+import { InternalError, MatterError, MatterFlowError } from "../common/MatterError.js";
 import { FabricIndex } from "../datatype/FabricIndex.js";
+import { Fabric, FabricBuilder } from "./Fabric.js";
 /** Specific Error for when a fabric is not found. */
 export class FabricNotFoundError extends MatterError {
 }
 export class FabricManager {
-    constructor(storageManager) {
+    constructor(storage) {
         this.nextFabricIndex = 1;
         this.fabrics = new Array();
-        this.fabricStorage = storageManager.createContext("FabricManager");
+        this.fabricStorage = storage.createContext("FabricManager");
         const fabrics = this.fabricStorage.get("fabrics", []);
         fabrics.forEach(fabric => this.addFabric(Fabric.createFromStorageObject(fabric)));
         this.nextFabricIndex = this.fabricStorage.get("nextFabricIndex", this.nextFabricIndex);
@@ -37,7 +37,7 @@ export class FabricManager {
         fabric.setPersistCallback(() => this.persistFabrics());
     }
     removeFabric(fabricIndex) {
-        const index = this.fabrics.findIndex(fabric => fabric.fabricIndex.index === fabricIndex.index);
+        const index = this.fabrics.findIndex(fabric => fabric.fabricIndex === fabricIndex);
         if (index === -1)
             throw new FabricNotFoundError(`Fabric with index ${fabricIndex} cannot be removed because it does not exist.`);
         this.fabrics.splice(index, 1);
@@ -53,21 +53,21 @@ export class FabricManager {
                 continue;
             return fabric;
         }
-        throw new Error("Fabric cannot be found from destinationId");
+        throw new InternalError("Fabric cannot be found from destinationId");
     }
     armFailSafe() {
-        this.fabricBuilder = new FabricBuilder(new FabricIndex(this.nextFabricIndex++));
+        this.fabricBuilder = new FabricBuilder(FabricIndex(this.nextFabricIndex++));
     }
     getFabricBuilder() {
         const result = this.fabricBuilder;
         if (result === undefined)
-            throw new Error("armFailSafe should be called first!");
+            throw new MatterFlowError("armFailSafe should be called first!");
         return result;
     }
     tentativelyAddFabric() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.fabricBuilder === undefined)
-                throw new Error("armFailSafe should be called first!");
+                throw new MatterFlowError("armFailSafe should be called first!");
             this.fabrics.push(yield this.fabricBuilder.build());
             this.fabricBuilder = undefined;
         });