matterbridge 3.0.0-edge.1 → 3.0.0-edge.10

package/CHANGELOG.md

@@ -47,26 +47,70 @@ Modified clusters:
 ### Added
 
 - [addEndpoint]: Added an error handler with deep stack on aggregatorNode.add() and serverNode.add() calls.
+- [endpoint]: Added createOffOnlyOnOffClusterServer().
+- [endpoint]: Added createBaseFanControlClusterServer().
+- [endpoint]: Added createDefaultHepaFilterMonitoringClusterServer().
+- [endpoint]: Added createDefaultActivatedCarbonFilterMonitoringClusterServer().
+- [deviceTypes]: Added Robotic device type.
+- [deviceTypes]: Added Appliances device types.
 
 ### Changed
 
+- [package]: Update express to 5.1.0.
+- [package]: Update dependencies.
 - [deviceTypes]: Updated device types to Matter 1.4
 - [matter.js]: Update to 0.13.0-alpha.0-20250405-7fc7db48.
+- [matter.js]: Update to 0.13.0-alpha.0-20250408-c916c7e8.
+- [matter.js]: Update to 0.13.0-alpha.0-20250412-5fad64e7b.
+- [matter.js]: Update to 0.13.0-alpha.0-20250413-d5a27700d.
+- [matter.js]: Update to 0.13.0-alpha.0-20250415-475996bb5.
+- [matter.js]: Update to 0.13.0-alpha.0-20250418-8cfc0b832.
 
 ### Fixed
 
 - [doorLock]: Fixed supportedOperatingModes inverted bitmap (Thanks Apollon).
+- [DevicesIcon]: Fixed rendering of leak freeze and rain sensors.
+- [QRCode]: Fixed rendering of QRCode panel when advertising stops.
+- [matterbridge]: Fixed wrong message when advertising stops and the node has been paired.
 
-## [2.2.8] - 2025-04-08
+## [2.2.9] - 2025-04-18
 
 ### Added
 
-- [platform]: Added stack to errors messages.
+- [deviceTypes]: Added extendedColorLight device type.
+
+### Changed
+
+- [package]: Update dependencies.
+
+### Fixed
+
+- [QRCode]: Fixed update when the server node is no more advertising.
+- [frontend]: Fixed wrong notification when the server node has been paired.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="bmc-button.svg" alt="Buy me a coffee" width="80">
+</a>
+
+## [2.2.8] - 2025-04-10
+
+### Added
+
+- [platform]: Added stack to error messages.
+- [endpoint]: Added createLevelControlClusterServer()
 - [endpoint]: Added createLevelTvocMeasurementClusterServer()
+- [frontend]: Added a restart button on the QRCode panel when the advertising for a not paired node is expired.
 
 ### Changed
 
 - [package]: Update dependencies.
+- [package]: Use node:https.
+- [endpoint]: Modified createOnOffClusterServer().
+
+### Fixed
+
+- [homepage]: Fixed warning log for homepage property in package.json.
+- [DevicesIcon]: Fixed rendering of rain, freeze and leak sensors.
 
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="bmc-button.svg" alt="Buy me a coffee" width="80">

package/dist/cli.js

@@ -3,6 +3,7 @@ import { Matterbridge } from './matterbridge.js';
 import { getIntParameter, hasParameter } from './utils/export.js';
 import { AnsiLogger, BRIGHT, CYAN, db, YELLOW } from './logger/export.js';
 import { EventEmitter } from 'node:events';
+import { inspect } from 'node:util';
 export const cliEmitter = new EventEmitter();
 export let instance;
 let session;
@@ -186,5 +187,7 @@ async function main() {
 }
 process.title = 'matterbridge';
 main().catch((error) => {
-    log.error(`Matterbridge.loadInstance() failed with error: ${error instanceof Error ? error.message : error}`);
+    const errorMessage = error instanceof Error ? error.message : error;
+    const errorInspect = inspect(error, { depth: 10 });
+    log.error(`Matterbridge.loadInstance() failed with error: ${errorMessage}\n${errorInspect}`);
 });

package/dist/frontend.js

@@ -1,9 +1,9 @@
 import { EndpointServer, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, Lifecycle } from '@matter/main';
 import { createServer } from 'node:http';
+import https from 'node:https';
 import os from 'node:os';
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
-import https from 'https';
 import express from 'express';
 import WebSocket, { WebSocketServer } from 'ws';
 import multer from 'multer';
@@ -814,9 +814,8 @@ export class Frontend {
                 res.status(500).send(`Error uploading or installing plugin package ${filename}`);
             }
         });
-        this.expressApp.get('*', (req, res) => {
+        this.expressApp.use((req, res) => {
             this.log.debug('The frontend sent:', req.url);
-            this.log.debug('Response send file:', path.join(this.matterbridge.rootDirectory, 'frontend/build/index.html'));
             res.sendFile(path.join(this.matterbridge.rootDirectory, 'frontend/build/index.html'));
         });
         this.log.debug(`Frontend initialized on port ${YELLOW}${this.port}${db} static ${UNDERLINE}${path.join(this.matterbridge.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);

package/dist/matterbridge.js

@@ -15,8 +15,8 @@ import { Frontend } from './frontend.js';
 import { DeviceTypeId, Endpoint as EndpointNode, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode } from '@matter/main';
 import { DeviceCommissioner, FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
-import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
 import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
+import { BridgedDeviceBasicInformationServer } from '@matter/main/behaviors/bridged-device-basic-information';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
 const typ = '\u001B[38;5;207m';
@@ -122,7 +122,7 @@ export class Matterbridge extends EventEmitter {
     matterStorageService;
     matterStorageManager;
     matterbridgeContext;
-    mattercontrollerContext;
+    controllerContext;
     mdnsInterface;
     ipv4address;
     ipv6address;
@@ -1337,6 +1337,19 @@ export class Matterbridge extends EventEmitter {
         }, 1000);
     }
     async startController() {
+        if (!this.matterStorageManager) {
+            this.log.error('No storage manager initialized');
+            await this.cleanup('No storage manager initialized');
+            return;
+        }
+        this.log.info('Creating context: mattercontrollerContext');
+        this.controllerContext = this.matterStorageManager.createContext('mattercontrollerContext');
+        if (!this.controllerContext) {
+            this.log.error('No storage context mattercontrollerContext initialized');
+            await this.cleanup('No storage context mattercontrollerContext initialized');
+            return;
+        }
+        this.log.debug('Starting matterbridge in mode', this.bridgeMode);
     }
     async startMatterStorage() {
         this.log.info(`Starting matter node storage...`);
@@ -1494,6 +1507,8 @@ export class Matterbridge extends EventEmitter {
                     }
                 }
                 setTimeout(() => {
+                    if (serverNode.lifecycle.isCommissioned)
+                        return;
                     if (this.bridgeMode === 'bridge') {
                         this.matterbridgeQrPairingCode = undefined;
                         this.matterbridgeManualPairingCode = undefined;
@@ -1503,10 +1518,12 @@ export class Matterbridge extends EventEmitter {
                         if (plugin) {
                             plugin.qrPairingCode = undefined;
                             plugin.manualPairingCode = undefined;
-                            this.frontend.wssSendRefreshRequired('plugins');
                         }
                     }
+                    this.frontend.wssSendRefreshRequired('plugins');
                     this.frontend.wssSendRefreshRequired('settings');
+                    this.frontend.wssSendRefreshRequired('fabrics');
+                    this.frontend.wssSendRefreshRequired('sessions');
                     this.frontend.wssSendSnackbarMessage(`Advertising on server node for ${storeId} stopped. Restart to commission.`, 0);
                     this.log.notice(`Advertising on server node for ${storeId} stopped. Restart to commission.`);
                 }, 15 * 60 * 1000).unref();
@@ -1728,12 +1745,14 @@ export class Matterbridge extends EventEmitter {
         this.devices.remove(device);
     }
     async removeAllBridgedEndpoints(pluginName, delay = 0) {
-        this.log.debug(`Removing all bridged endpoints for plugin ${plg}${pluginName}${db}`);
+        this.log.debug(`Removing all bridged endpoints for plugin ${plg}${pluginName}${db}${delay > 0 ? ` with delay ${delay} ms` : ''}`);
         for (const device of this.devices.array().filter((device) => device.plugin === pluginName)) {
             await this.removeBridgedEndpoint(pluginName, device);
             if (delay > 0)
                 await new Promise((resolve) => setTimeout(resolve, delay));
         }
+        if (delay > 0)
+            await new Promise((resolve) => setTimeout(resolve, 2000));
     }
     async subscribeAttributeChanged(plugin, device) {
         this.log.info(`Subscribing attributes for endpoint ${dev}${device.deviceName}${nf} (${dev}${device.id}${nf}) plugin ${plg}${plugin.name}${nf}`);

package/dist/matterbridgeBehaviors.js

@@ -19,7 +19,7 @@ import { ValveConfigurationAndControlBehavior } from '@matter/main/behaviors/val
 import { ModeSelectServer } from '@matter/main/behaviors/mode-select';
 import { SmokeCoAlarmServer } from '@matter/main/behaviors/smoke-co-alarm';
 import { SwitchServer } from '@matter/main/behaviors/switch';
-export class MatterbridgeBehaviorDevice {
+export class MatterbridgeServerDevice {
     log;
     commandHandler;
     device;
@@ -141,107 +141,107 @@ export class MatterbridgeBehaviorDevice {
         this.commandHandler.executeHandler('enableDisableAlarm', { request: { alarmsToEnableDisable }, attributes: {}, endpoint: { number: this.endpointNumber, uniqueStorageKey: this.endpointId } });
     }
 }
-export class MatterbridgeBehavior extends Behavior {
+export class MatterbridgeServer extends Behavior {
     static id = 'matterbridge';
 }
-(function (MatterbridgeBehavior) {
+(function (MatterbridgeServer) {
     class State {
         deviceCommand;
     }
-    MatterbridgeBehavior.State = State;
-})(MatterbridgeBehavior || (MatterbridgeBehavior = {}));
+    MatterbridgeServer.State = State;
+})(MatterbridgeServer || (MatterbridgeServer = {}));
 export class MatterbridgeIdentifyServer extends IdentifyServer {
     initialize() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.setEndpointId(this.endpoint.maybeId);
         device.setEndpointNumber(this.endpoint.maybeNumber);
         super.initialize();
     }
     identify({ identifyTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.identify({ identifyTime });
         super.identify({ identifyTime });
     }
     triggerEffect({ effectIdentifier, effectVariant }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.triggerEffect({ effectIdentifier, effectVariant });
         super.triggerEffect({ effectIdentifier, effectVariant });
     }
 }
 export class MatterbridgeOnOffServer extends OnOffServer {
     async on() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.on();
         super.on();
     }
     async off() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.off();
         super.off();
     }
     async toggle() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.toggle();
         super.toggle();
     }
 }
 export class MatterbridgeLevelControlServer extends LevelControlServer {
     async moveToLevel({ level, transitionTime, optionsMask, optionsOverride }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToLevel({ level, transitionTime, optionsMask, optionsOverride });
         super.moveToLevel({ level, transitionTime, optionsMask, optionsOverride });
     }
     async moveToLevelWithOnOff({ level, transitionTime, optionsMask, optionsOverride }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToLevelWithOnOff({ level, transitionTime, optionsMask, optionsOverride });
         super.moveToLevelWithOnOff({ level, transitionTime, optionsMask, optionsOverride });
     }
 }
 export class MatterbridgeColorControlServer extends ColorControlServer.with(ColorControl.Feature.HueSaturation, ColorControl.Feature.Xy, ColorControl.Feature.ColorTemperature) {
     async moveToHue({ optionsMask, optionsOverride, hue, direction, transitionTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToHue({ optionsMask, optionsOverride, hue, direction, transitionTime });
         super.moveToHue({ optionsMask, optionsOverride, hue, direction, transitionTime });
     }
     async moveToSaturation({ optionsMask, optionsOverride, saturation, transitionTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToSaturation({ optionsMask, optionsOverride, saturation, transitionTime });
         super.moveToSaturation({ optionsMask, optionsOverride, saturation, transitionTime });
     }
     async moveToHueAndSaturation({ optionsOverride, optionsMask, saturation, hue, transitionTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToHueAndSaturation({ optionsOverride, optionsMask, saturation, hue, transitionTime });
         super.moveToHueAndSaturation({ optionsOverride, optionsMask, saturation, hue, transitionTime });
     }
     async moveToColor({ optionsMask, optionsOverride, colorX, colorY, transitionTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToColor({ optionsMask, optionsOverride, colorX, colorY, transitionTime });
         super.moveToColor({ optionsMask, optionsOverride, colorX, colorY, transitionTime });
     }
     async moveToColorTemperature({ optionsOverride, optionsMask, colorTemperatureMireds, transitionTime }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.moveToColorTemperature({ optionsOverride, optionsMask, colorTemperatureMireds, transitionTime });
         super.moveToColorTemperature({ optionsOverride, optionsMask, colorTemperatureMireds, transitionTime });
     }
 }
 export class MatterbridgeWindowCoveringServer extends WindowCoveringServer.with(WindowCovering.Feature.Lift, WindowCovering.Feature.PositionAwareLift) {
     async upOrOpen() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.upOrOpen();
         super.upOrOpen();
     }
     async downOrClose() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.downOrClose();
         super.downOrClose();
     }
     stopMotion() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.stopMotion();
         super.stopMotion();
     }
     goToLiftPercentage({ liftPercent100thsValue }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.goToLiftPercentage({ liftPercent100thsValue });
         super.goToLiftPercentage({ liftPercent100thsValue });
     }
@@ -250,26 +250,26 @@ export class MatterbridgeWindowCoveringServer extends WindowCoveringServer.with(
 }
 export class MatterbridgeDoorLockServer extends DoorLockServer {
     async lockDoor() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.lockDoor();
         super.lockDoor();
     }
     async unlockDoor() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.unlockDoor();
         super.unlockDoor();
     }
 }
 export class MatterbridgeModeSelectServer extends ModeSelectServer {
     async changeToMode({ newMode }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.changeToMode({ newMode });
         super.changeToMode({ newMode });
     }
 }
 export class MatterbridgeFanControlServer extends FanControlServer.with(FanControl.Feature.MultiSpeed, FanControl.Feature.Auto, FanControl.Feature.Step) {
     async step({ direction, wrap, lowestOff }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.step({ direction, wrap, lowestOff });
         const lookupStepDirection = ['Increase', 'Decrease'];
         device.log.debug(`Command step called with direction: ${lookupStepDirection[direction]} wrap: ${wrap} lowestOff: ${lowestOff}`);
@@ -294,7 +294,7 @@ export class MatterbridgeFanControlServer extends FanControlServer.with(FanContr
 }
 export class MatterbridgeThermostatServer extends ThermostatBehavior.with(Thermostat.Feature.Cooling, Thermostat.Feature.Heating, Thermostat.Feature.AutoMode) {
     async setpointRaiseLower({ mode, amount }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.setpointRaiseLower({ mode, amount });
         const lookupSetpointAdjustMode = ['Heat', 'Cool', 'Both'];
         device.log.debug(`Command setpointRaiseLower called with mode: ${lookupSetpointAdjustMode[mode]} amount: ${amount / 10}`);
@@ -316,14 +316,14 @@ export class MatterbridgeValveConfigurationAndControlServer extends ValveConfigu
     initialize() {
     }
     open({ openDuration, targetLevel }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.log.debug(`Command open called with openDuration: ${openDuration} targetLevel: ${targetLevel}`);
         device.open({ openDuration, targetLevel });
         this.state.targetLevel = targetLevel ?? 100;
         this.state.currentLevel = targetLevel ?? 100;
     }
     close() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.log.debug(`Command close called`);
         device.close();
         this.state.targetLevel = 0;
@@ -332,14 +332,14 @@ export class MatterbridgeValveConfigurationAndControlServer extends ValveConfigu
 }
 export class MatterbridgeSmokeCoAlarmServer extends SmokeCoAlarmServer.with(SmokeCoAlarm.Feature.SmokeAlarm, SmokeCoAlarm.Feature.CoAlarm) {
     async selfTestRequest() {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.selfTestRequest();
         super.selfTestRequest();
     }
 }
 export class MatterbridgeBooleanStateConfigurationServer extends BooleanStateConfigurationServer.with(BooleanStateConfiguration.Feature.Visual, BooleanStateConfiguration.Feature.Audible, BooleanStateConfiguration.Feature.SensitivityLevel) {
     async enableDisableAlarm({ alarmsToEnableDisable }) {
-        const device = this.agent.get(MatterbridgeBehavior).state.deviceCommand;
+        const device = this.agent.get(MatterbridgeServer).state.deviceCommand;
         device.enableDisableAlarm({ alarmsToEnableDisable });
         super.enableDisableAlarm({ alarmsToEnableDisable });
     }

package/dist/matterbridgeDeviceTypes.js

@@ -44,41 +44,48 @@ import { EnergyPreference } from '@matter/main/clusters/energy-preference';
 import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
 import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
 import { RvcCleanMode } from '@matter/main/clusters/rvc-clean-mode';
-import { ScenesManagement } from '@matter/main/clusters/scenes-management';
 import { HepaFilterMonitoring } from '@matter/main/clusters/hepa-filter-monitoring';
 import { ActivatedCarbonFilterMonitoring } from '@matter/main/clusters/activated-carbon-filter-monitoring';
 import { DeviceEnergyManagementMode } from '@matter/main/clusters/device-energy-management-mode';
 import { AdministratorCommissioning } from '@matter/main/clusters/administrator-commissioning';
 import { EcosystemInformation } from '@matter/main/clusters/ecosystem-information';
-import { AccessControl } from '@matter/main/clusters/access-control';
 import { CommissionerControl } from '@matter/main/clusters/commissioner-control';
-import { ServiceArea } from '@matter/main/clusters';
+import { DishwasherAlarm } from '@matter/main/clusters/dishwasher-alarm';
+import { DishwasherMode } from '@matter/main/clusters/dishwasher-mode';
+import { LaundryDryerControls } from '@matter/main/clusters/laundry-dryer-controls';
+import { LaundryWasherControls } from '@matter/main/clusters/laundry-washer-controls';
+import { LaundryWasherMode } from '@matter/main/clusters/laundry-washer-mode';
+import { MicrowaveOvenControl } from '@matter/main/clusters/microwave-oven-control';
+import { MicrowaveOvenMode } from '@matter/main/clusters/microwave-oven-mode';
+import { OperationalState } from '@matter/main/clusters/operational-state';
+import { OvenCavityOperationalState } from '@matter/main/clusters/oven-cavity-operational-state';
+import { OvenMode } from '@matter/main/clusters/oven-mode';
+import { RefrigeratorAlarm } from '@matter/main/clusters/refrigerator-alarm';
+import { RefrigeratorAndTemperatureControlledCabinetMode } from '@matter/main/clusters/refrigerator-and-temperature-controlled-cabinet-mode';
+import { ServiceArea } from '@matter/main/clusters/service-area';
+import { TemperatureControl } from '@matter/main/clusters/temperature-control';
 export var DeviceClasses;
 (function (DeviceClasses) {
     DeviceClasses["Node"] = "Node";
-    DeviceClasses["Utility"] = "Utility";
     DeviceClasses["App"] = "App";
+    DeviceClasses["Utility"] = "Utility";
     DeviceClasses["Simple"] = "Simple";
     DeviceClasses["Dynamic"] = "Dynamic";
     DeviceClasses["Client"] = "Client";
     DeviceClasses["Server"] = "Server";
     DeviceClasses["Composed"] = "Composed";
-    DeviceClasses["Multiple"] = "Multiple";
-    DeviceClasses["EZInitiator"] = "EZ-Initiator";
-    DeviceClasses["EZTarget"] = "EZ-Target";
+    DeviceClasses["Duplicate"] = "Duplicate";
     DeviceClasses["BridgedPowerSourceInfo"] = "BridgedPowerSourceInfo";
 })(DeviceClasses || (DeviceClasses = {}));
-export const DeviceTypeDefinition = ({ name, code, deviceClass, superSet, revision, requiredServerClusters = [], optionalServerClusters = [], requiredClientClusters = [], optionalClientClusters = [], unknown = false, }) => ({
+export const DeviceTypeDefinition = ({ name, code, deviceClass, revision, requiredServerClusters = [], optionalServerClusters = [], requiredClientClusters = [], optionalClientClusters = [], }) => ({
     name,
     code: DeviceTypeId(code),
     deviceClass,
-    superSet,
     revision,
     requiredServerClusters,
     optionalServerClusters,
     requiredClientClusters,
     optionalClientClusters,
-    unknown,
 });
 export const powerSource = DeviceTypeDefinition({
     name: 'MA-powerSource',
@@ -161,7 +168,7 @@ export const dimmableOutlet = DeviceTypeDefinition({
     optionalServerClusters: [],
 });
 export const onOffMountedSwitch = DeviceTypeDefinition({
-    name: 'MA-onoffswitch',
+    name: 'MA-onoffmountedswitch',
     code: 0x010f,
     deviceClass: DeviceClasses.Simple,
     revision: 1,
@@ -169,7 +176,7 @@ export const onOffMountedSwitch = DeviceTypeDefinition({
     optionalServerClusters: [LevelControl.Cluster.id],
 });
 export const dimmableMountedSwitch = DeviceTypeDefinition({
-    name: 'MA-dimmableswitch',
+    name: 'MA-dimmablemountedswitch',
     code: 0x0110,
     deviceClass: DeviceClasses.Simple,
     revision: 1,
@@ -182,7 +189,7 @@ export const pumpDevice = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [OnOff.Cluster.id, PumpConfigurationAndControl.Cluster.id, Identify.Cluster.id],
-    optionalServerClusters: [LevelControl.Cluster.id, Groups.Cluster.id, ScenesManagement.Cluster.id, TemperatureMeasurement.Cluster.id, PressureMeasurement.Cluster.id, FlowMeasurement.Cluster.id],
+    optionalServerClusters: [LevelControl.Cluster.id, Groups.Cluster.id, TemperatureMeasurement.Cluster.id, PressureMeasurement.Cluster.id, FlowMeasurement.Cluster.id],
 });
 export const waterValve = DeviceTypeDefinition({
     name: 'MA-waterValve',
@@ -198,7 +205,7 @@ export const onOffSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id],
 });
 export const dimmableSwitch = DeviceTypeDefinition({
     name: 'MA-dimmableswitch',
@@ -206,7 +213,7 @@ export const dimmableSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id],
 });
 export const colorTemperatureSwitch = DeviceTypeDefinition({
     name: 'MA-colortemperatureswitch',
@@ -214,7 +221,7 @@ export const colorTemperatureSwitch = DeviceTypeDefinition({
     deviceClass: DeviceClasses.Simple,
     revision: 3,
     requiredServerClusters: [Identify.Cluster.id, Groups.Cluster.id, OnOff.Cluster.id, LevelControl.Cluster.id, ColorControl.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id],
+    optionalServerClusters: [Groups.Cluster.id],
 });
 export const genericSwitch = DeviceTypeDefinition({
     name: 'MA-genericswitch',
@@ -333,7 +340,7 @@ export const doorLockDevice = DeviceTypeDefinition({
     code: 0xa,
     deviceClass: DeviceClasses.Simple,
     revision: 3,
-    requiredServerClusters: [Identify.Cluster.id, DoorLock.Cluster.id, AccessControl.Cluster.id],
+    requiredServerClusters: [Identify.Cluster.id, DoorLock.Cluster.id],
     optionalServerClusters: [],
 });
 export const coverDevice = DeviceTypeDefinition({
@@ -375,7 +382,7 @@ export const modeSelect = DeviceTypeDefinition({
     revision: 1,
     requiredServerClusters: [ModeSelect.Cluster.id],
 });
-export const bridge = DeviceTypeDefinition({
+export const aggregator = DeviceTypeDefinition({
     name: 'MA-aggregator',
     code: 0x000e,
     deviceClass: DeviceClasses.Dynamic,
@@ -383,7 +390,7 @@ export const bridge = DeviceTypeDefinition({
     requiredServerClusters: [],
     optionalServerClusters: [Actions.Cluster.id, Identify.Cluster.id, CommissionerControl.Cluster.id],
 });
-export const aggregator = bridge;
+export const bridge = aggregator;
 export const roboticVacuumCleaner = DeviceTypeDefinition({
     name: 'MA-roboticvacuumcleaner',
     code: 0x74,
@@ -392,11 +399,105 @@ export const roboticVacuumCleaner = DeviceTypeDefinition({
     requiredServerClusters: [Identify.Cluster.id, RvcRunMode.Cluster.id, RvcOperationalState.Cluster.id],
     optionalServerClusters: [RvcCleanMode.Cluster.id, ServiceArea.Cluster.id],
 });
+export const laundryWasher = DeviceTypeDefinition({
+    name: 'MA-laundrywasher',
+    code: 0x73,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [OperationalState.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, LaundryWasherMode.Cluster.id, OnOff.Cluster.id, LaundryWasherControls.Cluster.id, TemperatureControl.Cluster.id],
+});
+export const refrigerator = DeviceTypeDefinition({
+    name: 'MA-refrigerator',
+    code: 0x70,
+    deviceClass: DeviceClasses.Simple,
+    revision: 2,
+    requiredServerClusters: [Identify.Cluster.id, RefrigeratorAndTemperatureControlledCabinetMode.Cluster.id, RefrigeratorAlarm.Cluster.id],
+    optionalServerClusters: [],
+});
 export const airConditioner = DeviceTypeDefinition({
     name: 'MA-airConditioner',
     code: 0x72,
     deviceClass: DeviceClasses.Simple,
     revision: 2,
     requiredServerClusters: [Identify.Cluster.id, OnOff.Cluster.id, Thermostat.Cluster.id],
-    optionalServerClusters: [Groups.Cluster.id, ScenesManagement.Cluster.id, FanControl.Cluster.id, ThermostatUserInterfaceConfiguration.Cluster.id, TemperatureMeasurement.Cluster.id, RelativeHumidityMeasurement.Cluster.id],
+    optionalServerClusters: [
+        Groups.Cluster.id,
+        FanControl.Cluster.id,
+        ThermostatUserInterfaceConfiguration.Cluster.id,
+        TemperatureMeasurement.Cluster.id,
+        RelativeHumidityMeasurement.Cluster.id,
+    ],
+});
+export const temperatureControlledCabinetCooler = DeviceTypeDefinition({
+    name: 'MA-temperaturecontrolledcabinetcooler',
+    code: 0x71,
+    deviceClass: DeviceClasses.Simple,
+    revision: 3,
+    requiredServerClusters: [TemperatureControl.Cluster.id, RefrigeratorAndTemperatureControlledCabinetMode.Cluster.id],
+    optionalServerClusters: [TemperatureMeasurement.Cluster.id],
+});
+export const temperatureControlledCabinetHeater = DeviceTypeDefinition({
+    name: 'MA-temperaturecontrolledcabinetheater',
+    code: 0x71,
+    deviceClass: DeviceClasses.Simple,
+    revision: 3,
+    requiredServerClusters: [TemperatureControl.Cluster.id, OvenMode.Cluster.id, OvenCavityOperationalState.Cluster.id],
+    optionalServerClusters: [TemperatureMeasurement.Cluster.id],
+});
+export const dishwasher = DeviceTypeDefinition({
+    name: 'MA-dishwasher',
+    code: 0x75,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [OperationalState.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, OnOff.Cluster.id, TemperatureControl.Cluster.id, DishwasherMode.Cluster.id, DishwasherAlarm.Cluster.id],
+});
+export const laundryDryer = DeviceTypeDefinition({
+    name: 'MA-laundrydryer',
+    code: 0x7c,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [OperationalState.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, LaundryWasherMode.Cluster.id, OnOff.Cluster.id, LaundryDryerControls.Cluster.id, TemperatureControl.Cluster.id],
+});
+export const cookSurface = DeviceTypeDefinition({
+    name: 'MA-cooksurface',
+    code: 0x77,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [TemperatureControl.Cluster.id, TemperatureMeasurement.Cluster.id],
+    optionalServerClusters: [OnOff.Cluster.id],
+});
+export const cooktop = DeviceTypeDefinition({
+    name: 'MA-cooktop',
+    code: 0x78,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [OnOff.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id],
+});
+export const oven = DeviceTypeDefinition({
+    name: 'MA-oven',
+    code: 0x7b,
+    deviceClass: DeviceClasses.Simple,
+    revision: 2,
+    requiredServerClusters: [Identify.Cluster.id],
+    optionalServerClusters: [],
+});
+export const extractorHood = DeviceTypeDefinition({
+    name: 'MA-extractorhood',
+    code: 0x7a,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [FanControl.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, HepaFilterMonitoring.Cluster.id, ActivatedCarbonFilterMonitoring.Cluster.id],
+});
+export const microwaveOven = DeviceTypeDefinition({
+    name: 'MA-microwaveoven',
+    code: 0x79,
+    deviceClass: DeviceClasses.Simple,
+    revision: 1,
+    requiredServerClusters: [OperationalState.Cluster.id, MicrowaveOvenMode.Cluster.id, MicrowaveOvenControl.Cluster.id],
+    optionalServerClusters: [Identify.Cluster.id, FanControl.Cluster.id],
 });