@project-chip/matter.js 0.4.0 → 0.5.0

package/dist/cjs/datatype/export.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * @license
+ * Copyright 2022-2023 Project CHIP Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// Export Common types
+__exportStar(require("./AttributeId.js"), exports);
+__exportStar(require("./ClusterId.js"), exports);
+__exportStar(require("./CommandId.js"), exports);
+__exportStar(require("./DeviceTypeId.js"), exports);
+__exportStar(require("./EndpointNumber.js"), exports);
+__exportStar(require("./EventId.js"), exports);
+__exportStar(require("./FabricId.js"), exports);
+__exportStar(require("./FabricIndex.js"), exports);
+__exportStar(require("./GroupId.js"), exports);
+__exportStar(require("./NodeId.js"), exports);
+__exportStar(require("./SubjectId.js"), exports);
+__exportStar(require("./VendorId.js"), exports);
+//# sourceMappingURL=export.js.map

package/dist/cjs/datatype/export.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/datatype/export.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;AAEH,sBAAsB;AACtB,mDAAiC;AACjC,iDAA+B;AAC/B,iDAA+B;AAC/B,oDAAkC;AAClC,sDAAoC;AACpC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,+CAA6B;AAC7B,8CAA4B;AAC5B,iDAA+B;AAC/B,gDAA8B"}

package/dist/cjs/device/Aggregator.d.ts

@@ -3,10 +3,11 @@
  * Copyright 2022 The matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Device } from "./Device.js";
+import { BridgedDeviceBasicInformationCluster } from "../cluster/definitions/BridgedDeviceBasicInformationCluster.js";
+import { AttributeInitialValues } from "../cluster/server/ClusterServerTypes.js";
 import { ComposedDevice } from "./ComposedDevice.js";
-import { AttributeInitialValues } from "../cluster/server/ClusterServer.js";
-import { BridgedDeviceBasicInformationCluster } from "../cluster/BridgedDeviceBasicInformationCluster.js";
+import { Device } from "./Device.js";
+import { Endpoint, EndpointOptions } from "./Endpoint.js";
 /**
  * An Aggregator is a special endpoint that exposes multiple devices as a "bridge" into the matter ecosystem.
  * Use the `addBridgedDevice` or `addBridgedDeviceWithPowerSourceInfo` method to add the devices and provide the details
@@ -14,27 +15,24 @@ import { BridgedDeviceBasicInformationCluster } from "../cluster/BridgedDeviceBa
  * If Power source information should be provided you need to also add the needed clusters (PowerSourceConfigurationCluster
  * and PowerSourceCluster) to the device!
  */
-export declare class Aggregator extends ComposedDevice {
+export declare class Aggregator extends Endpoint {
     /**
      * Create a new Aggregator instance and optionally directly add devices to it. If this is used the devices must
      * already have the BridgedDeviceBasicInformationCluster added!
      * @param devices Array of devices to add
-     * @param endpointId Optional endpoint ID to use. If not provided will automatically be assigned
-     */
-    constructor(devices?: Device[], endpointId?: number);
-    /**
-     * @deprecated Use addBridgedDevice or addBridgedDeviceWithPowerSourceInfo instead
+     * @param options Optional Endpoint options
      */
-    addDevice(): void;
+    constructor(devices?: Device[], options?: EndpointOptions);
     /**
      * Add a bridged device to the Aggregator. If provided the bridgedBasicInformation is used to automatically add the
-     * BridgedDeviceBasicInformationCluster to the device. If not provided the BridgedDeviceBasicInformationCluster must
-     * be already existing on the device!
+     * BridgedDeviceBasicInformationCluster to the device and also handles Reachability event triggering when
+     * reachability event changes. If not provided the BridgedDeviceBasicInformationCluster must be already existing
+     * on the device!
      *
      * @param device Device instance to add
      * @param bridgedBasicInformation Optional BridgedDeviceBasicInformationCluster attribute values to
      */
-    addBridgedDevice(device: Device, bridgedBasicInformation?: AttributeInitialValues<typeof BridgedDeviceBasicInformationCluster.attributes>): void;
+    addBridgedDevice(device: Device | ComposedDevice, bridgedBasicInformation?: AttributeInitialValues<typeof BridgedDeviceBasicInformationCluster.attributes>): void;
     /**
      * Add a bridged device with power source information to the Aggregator. If provided the bridgedBasicInformation is
      * used to automatically add the BridgedDeviceBasicInformationCluster to the device. If not provided the
@@ -44,12 +42,13 @@ export declare class Aggregator extends ComposedDevice {
      * @param device Device instance to add
      * @param bridgedBasicInformation Optional BridgedDeviceBasicInformationCluster attribute values to
      */
-    addBridgedDeviceWithPowerSourceInfo(device: Device, bridgedBasicInformation?: AttributeInitialValues<typeof BridgedDeviceBasicInformationCluster.attributes>): void;
+    addBridgedDeviceWithPowerSourceInfo(device: Device | ComposedDevice, bridgedBasicInformation?: AttributeInitialValues<typeof BridgedDeviceBasicInformationCluster.attributes>): void;
     /**
      * Returns all bridged devices added to the Aggregator
      *
      * @returns Array of bridged devices
      */
-    getBridgedDevices(): import("./Endpoint.js").Endpoint[];
+    getBridgedDevices(): Endpoint[];
+    removeBridgedDevice(device: Device | ComposedDevice): void;
 }
 //# sourceMappingURL=Aggregator.d.ts.map

package/dist/cjs/device/Aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Aggregator.d.ts","sourceRoot":"","sources":["../../../src/device/Aggregator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,oCAAoC,EAAE,MAAM,oDAAoD,CAAC;AAG1G;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,cAAc;IAC1C;;;;;OAKG;gBACS,OAAO,GAAE,MAAM,EAAO,EAAE,UAAU,CAAC,EAAE,MAAM;IAMvD;;OAEG;IACM,SAAS,IAAI,IAAI;IAI1B;;;;;;;OAOG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,uBAAuB,CAAC,EAAE,sBAAsB,CAAC,OAAO,oCAAoC,CAAC,UAAU,CAAC,GAAG,IAAI;IAiBhJ;;;;;;;;OAQG;IACH,mCAAmC,CAAC,MAAM,EAAE,MAAM,EAAE,uBAAuB,CAAC,EAAE,sBAAsB,CAAC,OAAO,oCAAoC,CAAC,UAAU,CAAC,GAAG,IAAI;IAiBnK;;;;OAIG;IACH,iBAAiB;CAGpB"}
+{"version":3,"file":"Aggregator.d.ts","sourceRoot":"","sources":["../../../src/device/Aggregator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,oCAAoC,EAAE,MAAM,gEAAgE,CAAC;AAEtH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE1D;;;;;;GAMG;AACH,qBAAa,UAAW,SAAQ,QAAQ;IACpC;;;;;OAKG;gBACS,OAAO,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,eAAoB;IAMjE;;;;;;;;OAQG;IACH,gBAAgB,CACZ,MAAM,EAAE,MAAM,GAAG,cAAc,EAC/B,uBAAuB,CAAC,EAAE,sBAAsB,CAAC,OAAO,oCAAoC,CAAC,UAAU,CAAC,GACzG,IAAI;IA+BP;;;;;;;;OAQG;IACH,mCAAmC,CAC/B,MAAM,EAAE,MAAM,GAAG,cAAc,EAC/B,uBAAuB,CAAC,EAAE,sBAAsB,CAAC,OAAO,oCAAoC,CAAC,UAAU,CAAC,GACzG,IAAI;IAmBP;;;;OAIG;IACH,iBAAiB;IAIjB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;CAGtD"}

package/dist/cjs/device/Aggregator.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Aggregator = void 0;
+/**
+ * @license
+ * Copyright 2022 The matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const BridgedDeviceBasicInformationCluster_js_1 = require("../cluster/definitions/BridgedDeviceBasicInformationCluster.js");
+const ClusterServer_js_1 = require("../cluster/server/ClusterServer.js");
+const MatterError_js_1 = require("../common/MatterError.js");
 const DeviceTypes_js_1 = require("./DeviceTypes.js");
-const ComposedDevice_js_1 = require("./ComposedDevice.js");
-const BridgedDeviceBasicInformationCluster_js_1 = require("../cluster/BridgedDeviceBasicInformationCluster.js");
-const InteractionServer_js_1 = require("../protocol/interaction/InteractionServer.js");
+const Endpoint_js_1 = require("./Endpoint.js");
 /**
  * An Aggregator is a special endpoint that exposes multiple devices as a "bridge" into the matter ecosystem.
  * Use the `addBridgedDevice` or `addBridgedDeviceWithPowerSourceInfo` method to add the devices and provide the details
@@ -12,28 +18,23 @@ const InteractionServer_js_1 = require("../protocol/interaction/InteractionServe
  * If Power source information should be provided you need to also add the needed clusters (PowerSourceConfigurationCluster
  * and PowerSourceCluster) to the device!
  */
-class Aggregator extends ComposedDevice_js_1.ComposedDevice {
+class Aggregator extends Endpoint_js_1.Endpoint {
     /**
      * Create a new Aggregator instance and optionally directly add devices to it. If this is used the devices must
      * already have the BridgedDeviceBasicInformationCluster added!
      * @param devices Array of devices to add
-     * @param endpointId Optional endpoint ID to use. If not provided will automatically be assigned
+     * @param options Optional Endpoint options
      */
-    constructor(devices = [], endpointId) {
+    constructor(devices = [], options = {}) {
         // Aggregator is a Composed device with an DeviceTypes.AGGREGATOR device type
-        super([DeviceTypes_js_1.DeviceTypes.AGGREGATOR], [], endpointId);
+        super([DeviceTypes_js_1.DeviceTypes.AGGREGATOR], options);
         devices.forEach(device => this.addBridgedDevice(device));
     }
-    /**
-     * @deprecated Use addBridgedDevice or addBridgedDeviceWithPowerSourceInfo instead
-     */
-    addDevice() {
-        throw new Error("Aggregator does not support addDevice. Use addBridgedDevice instead.");
-    }
     /**
      * Add a bridged device to the Aggregator. If provided the bridgedBasicInformation is used to automatically add the
-     * BridgedDeviceBasicInformationCluster to the device. If not provided the BridgedDeviceBasicInformationCluster must
-     * be already existing on the device!
+     * BridgedDeviceBasicInformationCluster to the device and also handles Reachability event triggering when
+     * reachability event changes. If not provided the BridgedDeviceBasicInformationCluster must be already existing
+     * on the device!
      *
      * @param device Device instance to add
      * @param bridgedBasicInformation Optional BridgedDeviceBasicInformationCluster attribute values to
@@ -46,14 +47,20 @@ class Aggregator extends ComposedDevice_js_1.ComposedDevice {
             device.setDeviceTypes(deviceTypes);
         }
         if (bridgedBasicInformation !== undefined) {
-            device.addClusterServer((0, InteractionServer_js_1.ClusterServer)(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster, bridgedBasicInformation, {}));
+            const bridgedBasicInformationCluster = (0, ClusterServer_js_1.ClusterServer)(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster, bridgedBasicInformation, {}, {
+                reachableChanged: true,
+            });
+            device.addClusterServer(bridgedBasicInformationCluster);
+            bridgedBasicInformationCluster.subscribeReachableAttribute(newValue => {
+                bridgedBasicInformationCluster.triggerReachableChangedEvent({ reachableNewValue: newValue });
+            });
         }
         else {
             if (!device.hasClusterServer(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster)) {
-                throw new Error("BridgedDeviceBasicInformationCluster is required for bridged devices. Please add yourself or provide as second parameter");
+                throw new MatterError_js_1.ImplementationError("BridgedDeviceBasicInformationCluster is required for bridged devices. Please add yourself or provide as second parameter");
             }
         }
-        super.addDevice(device);
+        this.addChildEndpoint(device);
     }
     /**
      * Add a bridged device with power source information to the Aggregator. If provided the bridgedBasicInformation is
@@ -72,14 +79,14 @@ class Aggregator extends ComposedDevice_js_1.ComposedDevice {
             device.setDeviceTypes(deviceTypes);
         }
         if (bridgedBasicInformation !== undefined) {
-            device.addClusterServer((0, InteractionServer_js_1.ClusterServer)(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster, bridgedBasicInformation, {}));
+            device.addClusterServer((0, ClusterServer_js_1.ClusterServer)(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster, bridgedBasicInformation, {}));
         }
         else {
             if (!device.hasClusterServer(BridgedDeviceBasicInformationCluster_js_1.BridgedDeviceBasicInformationCluster)) {
-                throw new Error("BridgedDeviceBasicInformationCluster is required for bridged devices. Please add yourself or provide as second parameter");
+                throw new MatterError_js_1.ImplementationError("BridgedDeviceBasicInformationCluster is required for bridged devices. Please add yourself or provide as second parameter");
             }
         }
-        super.addDevice(device);
+        this.addChildEndpoint(device);
     }
     /**
      * Returns all bridged devices added to the Aggregator
@@ -87,7 +94,10 @@ class Aggregator extends ComposedDevice_js_1.ComposedDevice {
      * @returns Array of bridged devices
      */
     getBridgedDevices() {
-        return super.getDevices();
+        return this.getChildEndpoints();
+    }
+    removeBridgedDevice(device) {
+        this.removeChildEndpoint(device);
     }
 }
 exports.Aggregator = Aggregator;

package/dist/cjs/device/Aggregator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Aggregator.js","sourceRoot":"","sources":["../../../src/device/Aggregator.ts"],"names":[],"mappings":";;;AAMA,qDAA+C;AAC/C,2DAAqD;AAErD,gHAA0G;AAC1G,uFAA6E;AAE7E;;;;;;GAMG;AACH,MAAa,UAAW,SAAQ,kCAAc;IAC1C;;;;;OAKG;IACH,YAAY,UAAoB,EAAE,EAAE,UAAmB;QACnD,6EAA6E;QAC7E,KAAK,CAAC,CAAC,4BAAW,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QAChD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;OAEG;IACM,SAAS;QACd,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;IAC5F,CAAC;IAED;;;;;;;OAOG;IACH,gBAAgB,CAAC,MAAc,EAAE,uBAAwG;QACrI,kFAAkF;QAClF,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,4BAAW,CAAC,YAAY,CAAC,EAAE;YACjD,WAAW,CAAC,IAAI,CAAC,4BAAW,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QACD,IAAI,uBAAuB,KAAK,SAAS,EAAE;YACvC,MAAM,CAAC,gBAAgB,CAAC,IAAA,oCAAa,EAAC,8EAAoC,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAC;SAC7G;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,8EAAoC,CAAC,EAAE;gBAChE,MAAM,IAAI,KAAK,CAAC,0HAA0H,CAAC,CAAC;aAC/I;SACJ;QACD,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;;;OAQG;IACH,mCAAmC,CAAC,MAAc,EAAE,uBAAwG;QACxJ,gHAAgH;QAChH,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,4BAAW,CAAC,4CAA4C,CAAC,EAAE;YACjF,WAAW,CAAC,IAAI,CAAC,4BAAW,CAAC,4CAA4C,CAAC,CAAC;YAC3E,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QACD,IAAI,uBAAuB,KAAK,SAAS,EAAE;YACvC,MAAM,CAAC,gBAAgB,CAAC,IAAA,oCAAa,EAAC,8EAAoC,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAC;SAC7G;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,8EAAoC,CAAC,EAAE;gBAChE,MAAM,IAAI,KAAK,CAAC,0HAA0H,CAAC,CAAC;aAC/I;SACJ;QACD,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,iBAAiB;QACb,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC;IAC9B,CAAC;CACJ;AA/ED,gCA+EC"}
+{"version":3,"file":"Aggregator.js","sourceRoot":"","sources":["../../../src/device/Aggregator.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,4HAAsH;AACtH,yEAAmE;AAEnE,6DAA+D;AAG/D,qDAA+C;AAC/C,+CAA0D;AAE1D;;;;;;GAMG;AACH,MAAa,UAAW,SAAQ,sBAAQ;IACpC;;;;;OAKG;IACH,YAAY,UAAoB,EAAE,EAAE,UAA2B,EAAE;QAC7D,6EAA6E;QAC7E,KAAK,CAAC,CAAC,4BAAW,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;;;OAQG;IACH,gBAAgB,CACZ,MAA+B,EAC/B,uBAAwG;QAExG,kFAAkF;QAClF,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,4BAAW,CAAC,YAAY,CAAC,EAAE;YACjD,WAAW,CAAC,IAAI,CAAC,4BAAW,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QACD,IAAI,uBAAuB,KAAK,SAAS,EAAE;YACvC,MAAM,8BAA8B,GAAG,IAAA,gCAAa,EAChD,8EAAoC,EACpC,uBAAuB,EACvB,EAAE,EACF;gBACI,gBAAgB,EAAE,IAAI;aACzB,CACJ,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;YAExD,8BAA8B,CAAC,2BAA2B,CAAC,QAAQ,CAAC,EAAE;gBAClE,8BAA8B,CAAC,4BAA4B,CAAC,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,CAAC;YACjG,CAAC,CAAC,CAAC;SACN;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,8EAAoC,CAAC,EAAE;gBAChE,MAAM,IAAI,oCAAmB,CACzB,0HAA0H,CAC7H,CAAC;aACL;SACJ;QACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;OAQG;IACH,mCAAmC,CAC/B,MAA+B,EAC/B,uBAAwG;QAExG,gHAAgH;QAChH,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,4BAAW,CAAC,4CAA4C,CAAC,EAAE;YACjF,WAAW,CAAC,IAAI,CAAC,4BAAW,CAAC,4CAA4C,CAAC,CAAC;YAC3E,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACtC;QACD,IAAI,uBAAuB,KAAK,SAAS,EAAE;YACvC,MAAM,CAAC,gBAAgB,CAAC,IAAA,gCAAa,EAAC,8EAAoC,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC,CAAC;SAC7G;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,8EAAoC,CAAC,EAAE;gBAChE,MAAM,IAAI,oCAAmB,CACzB,0HAA0H,CAC7H,CAAC;aACL;SACJ;QACD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,iBAAiB;QACb,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAED,mBAAmB,CAAC,MAA+B;QAC/C,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;CACJ;AAnGD,gCAmGC"}

package/dist/cjs/device/ComposedDevice.d.ts

@@ -3,10 +3,9 @@
  * Copyright 2022 The matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Endpoint } from "./Endpoint.js";
 import { Device } from "./Device.js";
 import { DeviceTypeDefinition } from "./DeviceTypes.js";
-import { AtLeastOne } from "../util/Array.js";
+import { Endpoint, EndpointOptions } from "./Endpoint.js";
 /**
  * A ComposedDevice is a special endpoint that allows to combine multiple sub devices and expose this as one device
  * (e.g. a fan and a light).
@@ -15,11 +14,11 @@ export declare class ComposedDevice extends Endpoint {
     /**
      * Creates a new ComposedDevice.
      *
-     * @param deviceTypes Array with Device types how this device should be presented to the Matter ecosystem.
+     * @param definition DeviceTypeDefinitions of the composed device
      * @param devices Array with devices that should be combined into one device that are directly added.
-     * @param endpointId Optional endpoint ID to use. If not provided will automatically be assigned
+     * @param options Optional Endpoint options
      */
-    constructor(deviceTypes: AtLeastOne<DeviceTypeDefinition>, devices?: Device[], endpointId?: number);
+    constructor(definition: DeviceTypeDefinition, devices?: Device[], options?: EndpointOptions);
     /**
      * Add a sub-device to the composed device.
      * @param device Device instance to add
@@ -34,6 +33,6 @@ export declare class ComposedDevice extends Endpoint {
     /**
      * Verify that the required clusters exists on the device.
      */
-    protected verifyRequiredClusters(): void;
+    verifyRequiredClusters(): void;
 }
 //# sourceMappingURL=ComposedDevice.d.ts.map

package/dist/cjs/device/ComposedDevice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ComposedDevice.d.ts","sourceRoot":"","sources":["../../../src/device/ComposedDevice.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IACxC;;;;;;OAMG;gBAEC,WAAW,EAAE,UAAU,CAAC,oBAAoB,CAAC,EAC7C,OAAO,GAAE,MAAM,EAAO,EACtB,UAAU,CAAC,EAAE,MAAM;IAMvB;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB;;;;OAIG;IACH,UAAU;IAIV;;OAEG;cACgB,sBAAsB;CAM5C"}
+{"version":3,"file":"ComposedDevice.d.ts","sourceRoot":"","sources":["../../../src/device/ComposedDevice.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IACxC;;;;;;OAMG;gBACS,UAAU,EAAE,oBAAoB,EAAE,OAAO,GAAE,MAAM,EAAO,EAAE,OAAO,GAAE,eAAoB;IAKnG;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB;;;;OAIG;IACH,UAAU;IAIV;;OAEG;IACM,sBAAsB;CAMlC"}

package/dist/cjs/device/ComposedDevice.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComposedDevice = void 0;
-/**
- * @license
- * Copyright 2022 The matter.js Authors
- * SPDX-License-Identifier: Apache-2.0
- */
 const Endpoint_js_1 = require("./Endpoint.js");
 /**
  * A ComposedDevice is a special endpoint that allows to combine multiple sub devices and expose this as one device
@@ -15,12 +10,12 @@ class ComposedDevice extends Endpoint_js_1.Endpoint {
     /**
      * Creates a new ComposedDevice.
      *
-     * @param deviceTypes Array with Device types how this device should be presented to the Matter ecosystem.
+     * @param definition DeviceTypeDefinitions of the composed device
      * @param devices Array with devices that should be combined into one device that are directly added.
-     * @param endpointId Optional endpoint ID to use. If not provided will automatically be assigned
+     * @param options Optional Endpoint options
      */
-    constructor(deviceTypes, devices = [], endpointId) {
-        super(deviceTypes, [], endpointId);
+    constructor(definition, devices = [], options = {}) {
+        super([definition], options);
         devices.forEach(device => this.addDevice(device));
     }
     /**

package/dist/cjs/device/ComposedDevice.js.map

@@ -1 +1 @@
-{"version":3,"file":"ComposedDevice.js","sourceRoot":"","sources":["../../../src/device/ComposedDevice.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,+CAAyC;AAKzC;;;GAGG;AACH,MAAa,cAAe,SAAQ,sBAAQ;IACxC;;;;;;OAMG;IACH,YACI,WAA6C,EAC7C,UAAoB,EAAE,EACtB,UAAmB;QAEnB,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;QACnC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,MAAc;QACpB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,UAAU;QACN,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAED;;OAEG;IACgB,sBAAsB;QACrC,+GAA+G;QAC/G,oEAAoE;QACpE,oCAAoC;QACpC,OAAO;IACX,CAAC;CACJ;AA3CD,wCA2CC"}
+{"version":3,"file":"ComposedDevice.js","sourceRoot":"","sources":["../../../src/device/ComposedDevice.ts"],"names":[],"mappings":";;;AAOA,+CAA0D;AAE1D;;;GAGG;AACH,MAAa,cAAe,SAAQ,sBAAQ;IACxC;;;;;;OAMG;IACH,YAAY,UAAgC,EAAE,UAAoB,EAAE,EAAE,UAA2B,EAAE;QAC/F,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,MAAc;QACpB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,UAAU;QACN,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAED;;OAEG;IACM,sBAAsB;QAC3B,+GAA+G;QAC/G,oEAAoE;QACpE,oCAAoC;QACpC,OAAO;IACX,CAAC;CACJ;AAvCD,wCAuCC"}

package/dist/cjs/device/Device.d.ts

@@ -3,20 +3,30 @@
  * Copyright 2022 The matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DeviceTypeDefinition } from "./DeviceTypes.js";
-import { Endpoint } from "./Endpoint.js";
-import { AtLeastOne } from "../util/Array.js";
-import { HandlerFunction } from "../util/NamedHandler.js";
-import { ClusterClientObj } from "../cluster/client/ClusterClient.js";
-import { ClusterServerObj } from "../cluster/server/ClusterServer.js";
+import { ClusterClientObj } from "../cluster/client/ClusterClientTypes.js";
 import { Attributes, Cluster, Commands, Events } from "../cluster/Cluster.js";
-import { BitSchema, TypeFromBitSchema } from "../schema/BitmapSchema.js";
+import { ClusterServerHandlers, ClusterServerObj } from "../cluster/server/ClusterServerTypes.js";
+import { DeviceTypeId } from "../datatype/DeviceTypeId.js";
+import { EndpointNumber } from "../datatype/EndpointNumber.js";
+import { BitSchema, TypeFromPartialBitSchema } from "../schema/BitmapSchema.js";
+import { AtLeastOne } from "../util/Array.js";
+import { HandlerFunction, NamedHandler } from "../util/NamedHandler.js";
+import { DeviceTypeDefinition } from "./DeviceTypes.js";
+import { Endpoint, EndpointOptions } from "./Endpoint.js";
+/**
+ * Utility function to wrap externally registered command handlers into the internal command handler and make sure
+ * the custom ones are used if defined
+ *
+ * @param commandHandler Command handler instance with the registered handlers
+ * @param handler Internal handlers instance to wrap the external handler into
+ */
+export declare const WrapCommandHandler: <C extends Cluster<any, any, any, any, any>>(handler: ClusterServerHandlers<C>, commandHandler?: NamedHandler<any>) => ClusterServerHandlers<C>;
 /**
  * Temporary used device class for paired devices until we added a layer to choose the right specialized device class
  * based on the device classes and features of the paired device
  */
 export declare class PairedDevice extends Endpoint {
-    private declineAddingMoreClusters;
+    private readonly declineAddingMoreClusters;
     /**
      * Create a new PairedDevice instance. All data are automatically parsed from the paired device!
      *
@@ -24,21 +34,23 @@ export declare class PairedDevice extends Endpoint {
      * @param clusters Clusters of the paired device as reported by the device
      * @param endpointId Endpoint ID of the paired device as reported by the device
      */
-    constructor(definition: AtLeastOne<DeviceTypeDefinition>, clusters: (ClusterServerObj<Attributes, Commands> | ClusterClientObj<Attributes, Commands>)[] | undefined, endpointId: number);
+    constructor(definition: AtLeastOne<DeviceTypeDefinition>, clusters: (ClusterServerObj<Attributes, Events> | ClusterClientObj<any, Attributes, Commands, Events>)[] | undefined, endpointId: EndpointNumber);
     /**
+     * Add cluster servers (used internally only!)
      * @deprecated PairedDevice does not support adding additional clusters
      */
-    addClusterServer<A extends Attributes, C extends Commands>(cluster: ClusterServerObj<A, C>): void;
+    addClusterServer<A extends Attributes, E extends Events>(cluster: ClusterServerObj<A, E>): void;
     /**
+     * Add cluster clients (used internally only!)
      * @deprecated PairedDevice does not support adding additional clusters
      */
-    addClusterClient<A extends Attributes, C extends Commands>(cluster: ClusterClientObj<A, C>): void;
+    addClusterClient<F extends BitSchema, A extends Attributes, C extends Commands, E extends Events>(cluster: ClusterClientObj<F, A, C, E>): void;
 }
 /**
  * Root endpoint of a device. This is used internally and not needed to be instanced by the user.
  */
 export declare class RootEndpoint extends Endpoint {
-    readonly deviceType: number;
+    readonly deviceType: DeviceTypeId;
     /**
      * Create a new RootEndpoint instance. This is automatically instanced by the CommissioningServer class.
      */
@@ -49,15 +61,14 @@ export declare class RootEndpoint extends Endpoint {
  */
 export declare class Device extends Endpoint {
     readonly deviceType: number;
-    private commandHandler;
+    protected commandHandler: NamedHandler<any>;
     /**
      * Create a new Device instance.
      *
      * @param definition DeviceTypeDefinitions of the device
-     * @param clusters Optional Array of clusters to be added to the device directly
-     * @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: DeviceTypeDefinition, clusters?: (ClusterServerObj<Attributes, Commands> | ClusterClientObj<Attributes, Commands>)[], endpointId?: number);
+    constructor(definition: DeviceTypeDefinition, options?: EndpointOptions);
     /**
      * Method to add command handlers to the device.
      * The base class do not expose any commands!
@@ -82,10 +93,10 @@ export declare class Device extends Endpoint {
      * @param command Command name to execute the handler for
      * @param args Arguments to be passed to the handler
      */
-    protected _executeHandler(command: never, ...args: any[]): Promise<void>;
-    protected createOptionalClusterServer<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(_cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, C>;
-    protected createOptionalClusterClient<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(_cluster: Cluster<F, SF, A, C, E>): ClusterClientObj<A, C>;
-    getClusterServer<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, C> | undefined;
-    getClusterClient<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterClientObj<A, C> | undefined;
+    protected _executeHandler(command: never, ...args: any[]): Promise<any>;
+    protected createOptionalClusterServer<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(_cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, E>;
+    protected createOptionalClusterClient<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(_cluster: Cluster<F, SF, A, C, E>): ClusterClientObj<F, A, C, E>;
+    getClusterServer<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, E> | undefined;
+    getClusterClient<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterClientObj<F, A, C, E> | undefined;
 }
 //# sourceMappingURL=Device.d.ts.map

package/dist/cjs/device/Device.d.ts.map

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

package/dist/cjs/device/Device.js

@@ -14,12 +14,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Device = exports.RootEndpoint = exports.PairedDevice = void 0;
+exports.Device = exports.RootEndpoint = exports.PairedDevice = exports.WrapCommandHandler = void 0;
+const ClusterClientTypes_js_1 = require("../cluster/client/ClusterClientTypes.js");
+const BindingCluster_js_1 = require("../cluster/definitions/BindingCluster.js");
+const ClusterServer_js_1 = require("../cluster/server/ClusterServer.js");
+const ClusterServerTypes_js_1 = require("../cluster/server/ClusterServerTypes.js");
+const MatterError_js_1 = require("../common/MatterError.js");
+const EndpointNumber_js_1 = require("../datatype/EndpointNumber.js");
+const NamedHandler_js_1 = require("../util/NamedHandler.js");
 const DeviceTypes_js_1 = require("./DeviceTypes.js");
 const Endpoint_js_1 = require("./Endpoint.js");
-const NamedHandler_js_1 = require("../util/NamedHandler.js");
-const BindingCluster_js_1 = require("../cluster/BindingCluster.js");
-const InteractionServer_js_1 = require("../protocol/interaction/InteractionServer.js");
+/**
+ * Utility function to wrap externally registered command handlers into the internal command handler and make sure
+ * the custom ones are used if defined
+ *
+ * @param commandHandler Command handler instance with the registered handlers
+ * @param handler Internal handlers instance to wrap the external handler into
+ */
+const WrapCommandHandler = (handler, commandHandler) => {
+    if (commandHandler === undefined) {
+        return handler;
+    }
+    const mergedHandler = {};
+    for (const key in handler) {
+        mergedHandler[key] = (...args) => __awaiter(void 0, void 0, void 0, function* () {
+            if (commandHandler.hasHandler(key)) {
+                return yield commandHandler.executeHandler(key, ...args);
+            }
+            return yield handler[key](...args);
+        });
+    }
+    return mergedHandler;
+};
+exports.WrapCommandHandler = WrapCommandHandler;
 /**
  * Temporary used device class for paired devices until we added a layer to choose the right specialized device class
  * based on the device classes and features of the paired device
@@ -33,25 +60,34 @@ class PairedDevice extends Endpoint_js_1.Endpoint {
      * @param endpointId Endpoint ID of the paired device as reported by the device
      */
     constructor(definition, clusters = [], endpointId) {
-        super(definition, clusters, endpointId);
-        this.declineAddingMoreClusters = false;
+        super(definition, { endpointId });
+        clusters.forEach(cluster => {
+            if ((0, ClusterServerTypes_js_1.isClusterServer)(cluster)) {
+                this.addClusterServer(cluster);
+            }
+            else if ((0, ClusterClientTypes_js_1.isClusterClient)(cluster)) {
+                this.addClusterClient(cluster);
+            }
+        });
         this.declineAddingMoreClusters = true;
     }
     /**
+     * Add cluster servers (used internally only!)
      * @deprecated PairedDevice does not support adding additional clusters
      */
     addClusterServer(cluster) {
         if (this.declineAddingMoreClusters) {
-            throw new Error("PairedDevice does not support adding additional clusters");
+            throw new MatterError_js_1.ImplementationError("PairedDevice does not support adding additional clusters");
         }
         return super.addClusterServer(cluster);
     }
     /**
+     * Add cluster clients (used internally only!)
      * @deprecated PairedDevice does not support adding additional clusters
      */
     addClusterClient(cluster) {
         if (this.declineAddingMoreClusters) {
-            throw new Error("PairedDevice does not support adding additional clusters");
+            throw new MatterError_js_1.ImplementationError("PairedDevice does not support adding additional clusters");
         }
         return super.addClusterClient(cluster);
     }
@@ -65,7 +101,7 @@ class RootEndpoint extends Endpoint_js_1.Endpoint {
      * Create a new RootEndpoint instance. This is automatically instanced by the CommissioningServer class.
      */
     constructor() {
-        super([DeviceTypes_js_1.DeviceTypes.ROOT], [], 0);
+        super([DeviceTypes_js_1.DeviceTypes.ROOT], { endpointId: (0, EndpointNumber_js_1.EndpointNumber)(0) });
         this.deviceType = DeviceTypes_js_1.DeviceTypes.ROOT.code;
     }
 }
@@ -81,19 +117,18 @@ class Device extends Endpoint_js_1.Endpoint {
      * Create a new Device instance.
      *
      * @param definition DeviceTypeDefinitions of the device
-     * @param clusters Optional Array of clusters to be added to the device directly
-     * @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, clusters = [], endpointId) {
+    constructor(definition, options = {}) {
         if (definition.deviceClass === DeviceTypes_js_1.DeviceClasses.Node) {
-            throw new Error("MatterNode devices are not supported");
+            throw new MatterError_js_1.NotImplementedError("MatterNode devices are not supported");
         }
-        super([definition], clusters, endpointId);
+        super([definition], options);
         this.commandHandler = new NamedHandler_js_1.NamedHandler();
         this.deviceType = definition.code;
         if (definition.deviceClass === DeviceTypes_js_1.DeviceClasses.Simple || definition.deviceClass === DeviceTypes_js_1.DeviceClasses.Client) {
-            this.addClusterServer((0, InteractionServer_js_1.ClusterServer)(BindingCluster_js_1.BindingCluster, {
-                bindingList: []
+            this.addClusterServer((0, ClusterServer_js_1.ClusterServer)(BindingCluster_js_1.Binding.Cluster, {
+                binding: [],
             }, {}));
         }
     }
@@ -132,11 +167,11 @@ class Device extends Endpoint_js_1.Endpoint {
     }
     createOptionalClusterServer(_cluster) {
         // TODO: Implement this in upper classes to add optional clusters on the fly
-        throw new Error("createOptionalClusterServer needs to be implemented by derived classes");
+        throw new MatterError_js_1.ImplementationError("createOptionalClusterServer needs to be implemented by derived classes");
     }
     createOptionalClusterClient(_cluster) {
         // TODO: Implement this in upper classes to add optional clusters on the fly
-        throw new Error("createOptionalClusterClient needs to be implemented by derived classes");
+        throw new MatterError_js_1.ImplementationError("createOptionalClusterClient needs to be implemented by derived classes");
     }
     getClusterServer(cluster) {
         const clusterServer = super.getClusterServer(cluster);
@@ -147,6 +182,7 @@ class Device extends Endpoint_js_1.Endpoint {
             if (deviceType.optionalServerClusters.includes(cluster.id)) {
                 const clusterServer = this.createOptionalClusterServer(cluster);
                 this.addClusterServer(clusterServer);
+                return clusterServer;
             }
         }
     }

package/dist/cjs/device/Device.js.map

@@ -1 +1 @@
-{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/device/Device.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,qDAAoF;AACpF,+CAAyC;AAEzC,6DAAwE;AAKxE,oEAA8D;AAC9D,uFAA6E;AAE7E;;;GAGG;AACH,MAAa,YAAa,SAAQ,sBAAQ;IAEtC;;;;;;OAMG;IACH,YACI,UAA4C,EAC5C,WAAgG,EAAE,EAClG,UAAkB;QAElB,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAbpC,8BAAyB,GAAG,KAAK,CAAC;QActC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED;;OAEG;IACM,gBAAgB,CAA2C,OAA+B;QAC/F,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;SAC/E;QACD,OAAO,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;OAEG;IACM,gBAAgB,CAA2C,OAA+B;QAC/F,IAAI,IAAI,CAAC,yBAAyB,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;SAC/E;QACD,OAAO,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;CACJ;AArCD,oCAqCC;AAED;;GAEG;AACH,MAAa,YAAa,SAAQ,sBAAQ;IAGtC;;OAEG;IACH;QAEI,KAAK,CAAC,CAAC,4BAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,4BAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IAC5C,CAAC;CACJ;AAXD,oCAWC;AAED,uDAAuD;AACvD,oEAAoE;AACpE,qJAAqJ;AAErJ;;GAEG;AACH,MAAa,MAAO,SAAQ,sBAAQ;IAIhC;;;;;;OAMG;IACH,YACI,UAAgC,EAChC,WAAgG,EAAE,EAClG,UAAmB;QAEnB,IAAI,UAAU,CAAC,WAAW,KAAK,8BAAa,CAAC,IAAI,EAAE;YAC/C,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SAC3D;QACD,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAjBtC,mBAAc,GAAG,IAAI,8BAAY,EAAO,CAAC;QAkB7C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;QAClC,IAAI,UAAU,CAAC,WAAW,KAAK,8BAAa,CAAC,MAAM,IAAI,UAAU,CAAC,WAAW,KAAK,8BAAa,CAAC,MAAM,EAAE;YACpG,IAAI,CAAC,gBAAgB,CAAC,IAAA,oCAAa,EAC/B,kCAAc,EACd;gBACI,WAAW,EAAE,EAAE;aAClB,EACD,EAAE,CACL,CAAC,CAAC;SACN;IACL,CAAC;IAED;;;;;;OAMG;IACH,iBAAiB,CAAC,OAAc,EAAE,OAAwB;QACtD,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,OAAc,EAAE,OAAwB;QACzD,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED;;;;;;;OAOG;IACa,eAAe,CAAC,OAAc,EAAE,GAAG,IAAW;;YAC1D,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACtE,CAAC;KAAA;IAES,2BAA2B,CAAmH,QAAiC;QACrL,4EAA4E;QAC5E,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC9F,CAAC;IAES,2BAA2B,CAAmH,QAAiC;QACrL,4EAA4E;QAC5E,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC9F,CAAC;IAEQ,gBAAgB,CAAmH,OAAgC;QACxK,MAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,OAAO,aAAa,CAAC;SACxB;QACD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,UAAU,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACxD,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;gBAChE,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;IAEQ,gBAAgB,CAAmH,OAAgC;QACxK,MAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,OAAO,aAAa,CAAC;SACxB;QACD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,UAAU,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACxD,MAAM,aAAa,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;gBAChE,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;CACJ;AArGD,wBAqGC"}
+{"version":3,"file":"Device.js","sourceRoot":"","sources":["../../../src/device/Device.ts"],"names":[],"mappings":"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"}