matterbridge 2.0.0-edge.3 → 2.0.0-edge.5

package/CHANGELOG.md

@@ -21,7 +21,7 @@ The legacy old api have been completely removed.
 The frontend has a new dark and light mode. The dark mode is now the default mode.
 It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbridge settings.
 
-## [2.0.0-edge.3] - 2025-01-16
+## [2.0.0-edge.5] - 2025-01-18
 
 ### Added
 
@@ -39,6 +39,8 @@ It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbr
 - [frontend]: WebSocketProvider added a startTimeout of 300 sec. to start ping.
 - [frontend]: WebSocketProvider changed pingIntervalSeconds to 60 sec. and offlineTimeoutSeconds to 50 sec.
 - [frontend]: Search on select is no more case sensitive.
+- [matterbridge]: Deferred memory intensive tasks after initialization.
+- [package]: Optimized all imports from matter.js.
 - [package]: Update dependencies.
 
 ### Fixed

package/dist/deviceManager.js

@@ -1,4 +1,4 @@
-import { AnsiLogger, BLUE, er } from 'node-ansi-logger';
+import { AnsiLogger, BLUE, er } from './logger/export.js';
 import { dev } from './matterbridgeTypes.js';
 export class DeviceManager {
     _devices = new Map();

package/dist/frontend.js

@@ -6,7 +6,7 @@ import WebSocket, { WebSocketServer } from 'ws';
 import os from 'os';
 import path from 'path';
 import { promises as fs } from 'fs';
-import { AnsiLogger, CYAN, db, debugStringify, er, nf, rs, stringify, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from 'node-ansi-logger';
+import { AnsiLogger, CYAN, db, debugStringify, er, nf, rs, stringify, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from './logger/export.js';
 import { createZip, hasParameter, isValidNumber, isValidObject, isValidString } from './utils/utils.js';
 import { plg } from './matterbridgeTypes.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';

package/dist/index.js

@@ -1,9 +1,8 @@
 import { Matterbridge } from './matterbridge.js';
+export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
 export * from '@matter/main/clusters';
 export * from '@matter/main/types';
-export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/node';
-export * from '@project-chip/matter.js/device';
-export * from '@project-chip/matter.js/cluster';
+export { ClusterServer, ClusterClient } from '@project-chip/matter.js/cluster';
 export * from './matterbridge.js';
 export * from './matterbridgeTypes.js';
 export * from './matterbridgeEndpoint.js';

package/dist/matterbridge.js

@@ -5,17 +5,17 @@ import EventEmitter from 'events';
 import os from 'os';
 import path from 'path';
 import { randomBytes } from 'crypto';
-import { NodeStorageManager } from 'node-persist-manager';
-import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from 'node-ansi-logger';
+import { NodeStorageManager } from './storage/export.js';
+import { AnsiLogger, UNDERLINE, UNDERLINEOFF, YELLOW, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt } from './logger/export.js';
 import { logInterfaces, wait, waiter, copyDirectory, getParameter, getIntParameter, hasParameter } from './utils/utils.js';
 import { PluginManager } from './pluginManager.js';
 import { DeviceManager } from './deviceManager.js';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { bridge } from './matterbridgeDeviceTypes.js';
+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 { FabricAction, PaseClient } from '@matter/main/protocol';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
-import { Frontend } from './frontend.js';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
 const typ = '\u001B[38;5;207m';
@@ -545,7 +545,6 @@ export class Matterbridge extends EventEmitter {
                 plugin.error = true;
                 continue;
             }
-            this.getPluginLatestVersion(plugin);
             if (!plugin.enabled) {
                 this.log.info(`Plugin ${plg}${plugin.name}${nf} not enabled`);
                 continue;
@@ -680,18 +679,8 @@ export class Matterbridge extends EventEmitter {
                 this.log.error(`Error getting global node_modules directory: ${error}`);
             }
         }
-        else {
-            this.getGlobalNodeModules()
-                .then(async (globalModulesDirectory) => {
-                this.globalModulesDirectory = globalModulesDirectory;
-                this.matterbridgeInformation.globalModulesDirectory = this.globalModulesDirectory;
-                this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
-                await this.nodeContext?.set('globalModulesDirectory', this.globalModulesDirectory);
-            })
-                .catch((error) => {
-                this.log.error(`Error getting global node_modules directory: ${error}`);
-            });
-        }
+        else
+            this.log.debug(`Global node_modules Directory: ${this.globalModulesDirectory}`);
         this.matterbridgeDirectory = path.join(this.homeDirectory, '.matterbridge');
         this.matterbridgeInformation.matterbridgeDirectory = this.matterbridgeDirectory;
         try {
@@ -739,13 +728,12 @@ export class Matterbridge extends EventEmitter {
         }
         this.log.debug(`Matterbridge Plugin Directory: ${this.matterbridgePluginDirectory}`);
         const packageJson = JSON.parse(await fs.readFile(path.join(this.rootDirectory, 'package.json'), 'utf-8'));
-        this.matterbridgeVersion = packageJson.version;
-        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeVersion;
+        this.matterbridgeVersion = this.matterbridgeLatestVersion = packageJson.version;
+        this.matterbridgeInformation.matterbridgeVersion = this.matterbridgeInformation.matterbridgeLatestVersion = this.matterbridgeVersion;
         this.log.debug(`Matterbridge Version: ${this.matterbridgeVersion}`);
         if (this.nodeContext)
-            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', '');
+            this.matterbridgeLatestVersion = await this.nodeContext.get('matterbridgeLatestVersion', this.matterbridgeVersion);
         this.log.debug(`Matterbridge Latest Version: ${this.matterbridgeLatestVersion}`);
-        this.getMatterbridgeLatestVersion();
         const currentDir = process.cwd();
         this.log.debug(`Current Working Directory: ${currentDir}`);
         const cmdArgs = process.argv.slice(2).join(' ');
@@ -1355,17 +1343,21 @@ export class Matterbridge extends EventEmitter {
                 hardwareVersionString: await storageContext.get('hardwareVersionString'),
             },
         });
-        const sanitizeFabrics = (fabrics) => {
+        const sanitizeFabrics = (fabrics, resetSessions = false) => {
             const sanitizedFabrics = this.sanitizeFabricInformations(Array.from(Object.values(fabrics)));
             this.log.info(`Fabrics: ${debugStringify(sanitizedFabrics)}`);
             if (this.bridgeMode === 'bridge') {
                 this.matterbridgeFabricInformations = sanitizedFabrics;
+                if (resetSessions)
+                    this.matterbridgeSessionInformations = [];
                 this.matterbridgePaired = true;
             }
             if (this.bridgeMode === 'childbridge') {
                 const plugin = this.plugins.get(storeId);
                 if (plugin) {
                     plugin.fabricInformations = sanitizedFabrics;
+                    if (resetSessions)
+                        plugin.sessionInformations = [];
                     plugin.paired = true;
                 }
             }
@@ -1401,7 +1393,7 @@ export class Matterbridge extends EventEmitter {
             }
             else {
                 this.log.notice(`Server node for ${storeId} is already commissioned. Waiting for controllers to connect ...`);
-                sanitizeFabrics(serverNode.state.commissioning.fabrics);
+                sanitizeFabrics(serverNode.state.commissioning.fabrics, true);
             }
             this.frontend.wssSendRefreshRequired();
         });

package/dist/matterbridgeBehaviors.js

@@ -1,7 +1,20 @@
 import { Behavior } from '@matter/main';
-import { ColorControlServer, DoorLockServer, IdentifyServer, LevelControlServer, WindowCoveringServer, ThermostatServer, FanControlServer, BooleanStateConfigurationServer, ValveConfigurationAndControlServer, } from '@matter/main/behaviors';
-import { BooleanStateConfiguration, ColorControl, FanControl, Thermostat, ValveConfigurationAndControl, WindowCovering } from '@matter/main/clusters';
-import { OnOffServer } from '@matter/node/behaviors/on-off';
+import { IdentifyServer } from '@matter/main/behaviors/identify';
+import { OnOffServer } from '@matter/main/behaviors/on-off';
+import { LevelControlServer } from '@matter/main/behaviors/level-control';
+import { ColorControlServer } from '@matter/main/behaviors/color-control';
+import { WindowCoveringServer } from '@matter/main/behaviors/window-covering';
+import { DoorLockServer } from '@matter/main/behaviors/door-lock';
+import { FanControlServer } from '@matter/main/behaviors/fan-control';
+import { ThermostatServer } from '@matter/main/behaviors/thermostat';
+import { ValveConfigurationAndControlServer } from '@matter/main/behaviors/valve-configuration-and-control';
+import { BooleanStateConfigurationServer } from '@matter/main/behaviors/boolean-state-configuration';
+import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-configuration';
+import { ColorControl } from '@matter/main/clusters/color-control';
+import { FanControl } from '@matter/main/clusters/fan-control';
+import { Thermostat } from '@matter/main/clusters/thermostat';
+import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
+import { WindowCovering } from '@matter/main/clusters/window-covering';
 export class MatterbridgeBehaviorDevice {
     log;
     commandHandler;

package/dist/matterbridgeDeviceTypes.js

@@ -1,5 +1,82 @@
-import { AirQuality, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation, CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, ColorControl, DeviceEnergyManagement, DeviceEnergyManagementMode, DoorLock, ElectricalEnergyMeasurement, ElectricalPowerMeasurement, EnergyPreference, FanControl, FlowMeasurement, FormaldehydeConcentrationMeasurement, Groups, Identify, IlluminanceMeasurement, LevelControl, ModeSelect, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff, OzoneConcentrationMeasurement, Pm10ConcentrationMeasurement, Pm1ConcentrationMeasurement, Pm25ConcentrationMeasurement, PowerSource, PowerTopology, PressureMeasurement, RadonConcentrationMeasurement, RelativeHumidityMeasurement, SmokeCoAlarm, SwitchCluster, TemperatureMeasurement, Thermostat, ThermostatUserInterfaceConfiguration, TimeSynchronization, TotalVolatileOrganicCompoundsConcentrationMeasurement, WindowCovering, ValveConfigurationAndControl, HepaFilterMonitoring, ActivatedCarbonFilterMonitoring, Actions, FixedLabel, RvcRunMode, RvcOperationalState, RvcCleanMode, ScenesManagement, PumpConfigurationAndControl, } from '@matter/main/clusters';
-import { DeviceClasses, DeviceTypeDefinition } from '@project-chip/matter.js/device';
+import { DeviceTypeId } from '@matter/main';
+import { BooleanState } from '@matter/main/clusters/boolean-state';
+import { BooleanStateConfiguration } from '@matter/main/clusters/boolean-state-configuration';
+import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
+import { CarbonDioxideConcentrationMeasurement } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
+import { CarbonMonoxideConcentrationMeasurement } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
+import { ColorControl } from '@matter/main/clusters/color-control';
+import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
+import { DoorLock } from '@matter/main/clusters/door-lock';
+import { ElectricalEnergyMeasurement } from '@matter/main/clusters/electrical-energy-measurement';
+import { ElectricalPowerMeasurement } from '@matter/main/clusters/electrical-power-measurement';
+import { FanControl } from '@matter/main/clusters/fan-control';
+import { FixedLabel } from '@matter/main/clusters/fixed-label';
+import { FlowMeasurement } from '@matter/main/clusters/flow-measurement';
+import { FormaldehydeConcentrationMeasurement } from '@matter/main/clusters/formaldehyde-concentration-measurement';
+import { Groups } from '@matter/main/clusters/groups';
+import { Identify } from '@matter/main/clusters/identify';
+import { IlluminanceMeasurement } from '@matter/main/clusters/illuminance-measurement';
+import { LevelControl } from '@matter/main/clusters/level-control';
+import { ModeSelect } from '@matter/main/clusters/mode-select';
+import { NitrogenDioxideConcentrationMeasurement } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
+import { OccupancySensing } from '@matter/main/clusters/occupancy-sensing';
+import { OnOff } from '@matter/main/clusters/on-off';
+import { OzoneConcentrationMeasurement } from '@matter/main/clusters/ozone-concentration-measurement';
+import { Pm10ConcentrationMeasurement } from '@matter/main/clusters/pm10-concentration-measurement';
+import { Pm1ConcentrationMeasurement } from '@matter/main/clusters/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurement } from '@matter/main/clusters/pm25-concentration-measurement';
+import { PowerSource } from '@matter/main/clusters/power-source';
+import { PowerTopology } from '@matter/main/clusters/power-topology';
+import { PressureMeasurement } from '@matter/main/clusters/pressure-measurement';
+import { PumpConfigurationAndControl } from '@matter/main/clusters/pump-configuration-and-control';
+import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
+import { RelativeHumidityMeasurement } from '@matter/main/clusters/relative-humidity-measurement';
+import { SmokeCoAlarm } from '@matter/main/clusters/smoke-co-alarm';
+import { SwitchCluster } from '@matter/main/clusters/switch';
+import { TemperatureMeasurement } from '@matter/main/clusters/temperature-measurement';
+import { Thermostat } from '@matter/main/clusters/thermostat';
+import { TimeSynchronization } from '@matter/main/clusters/time-synchronization';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
+import { ValveConfigurationAndControl } from '@matter/main/clusters/valve-configuration-and-control';
+import { WindowCovering } from '@matter/main/clusters/window-covering';
+import { AirQuality } from '@matter/main/clusters/air-quality';
+import { Actions } from '@matter/main/clusters/actions';
+import { ThermostatUserInterfaceConfiguration } from '@matter/main/clusters/thermostat-user-interface-configuration';
+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';
+export var DeviceClasses;
+(function (DeviceClasses) {
+    DeviceClasses["Node"] = "Node";
+    DeviceClasses["Utility"] = "Utility";
+    DeviceClasses["App"] = "App";
+    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["BridgedPowerSourceInfo"] = "BridgedPowerSourceInfo";
+})(DeviceClasses || (DeviceClasses = {}));
+export const DeviceTypeDefinition = ({ name, code, deviceClass, superSet, revision, requiredServerClusters = [], optionalServerClusters = [], requiredClientClusters = [], optionalClientClusters = [], unknown = false, }) => ({
+    name,
+    code: DeviceTypeId(code),
+    deviceClass,
+    superSet,
+    revision,
+    requiredServerClusters,
+    optionalServerClusters,
+    requiredClientClusters,
+    optionalClientClusters,
+    unknown,
+});
 export const bridge = DeviceTypeDefinition({
     name: 'MA-aggregator',
     code: 0x000e,

package/dist/matterbridgeEndpoint.js

@@ -1,13 +1,54 @@
 import { createHash } from 'crypto';
-import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, rs, zb } from 'node-ansi-logger';
+import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, rs, zb } from './logger/export.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeBooleanStateConfigurationServer, MatterbridgeColorControlServer, MatterbridgeDoorLockServer, MatterbridgeFanControlServer, MatterbridgeIdentifyServer, MatterbridgeLevelControlServer, MatterbridgeOnOffServer, MatterbridgeThermostatServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeWindowCoveringServer, } from './matterbridgeBehaviors.js';
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { deepCopy, isValidNumber } from './utils/utils.js';
-import { Endpoint, MutableEndpoint, SupportedBehaviors, NamedHandler, Lifecycle } from '@matter/main';
-import { EndpointNumber, VendorId } from '@matter/main';
-import { AirQuality, AirQualityCluster, BasicInformation, BasicInformationCluster, BooleanState, BooleanStateCluster, BooleanStateConfiguration, BooleanStateConfigurationCluster, BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster, CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster, CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster, ColorControl, ColorControlCluster, ConcentrationMeasurement, Descriptor, DoorLock, DoorLockCluster, ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster, ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster, FanControl, FanControlCluster, FixedLabel, FixedLabelCluster, FlowMeasurement, FlowMeasurementCluster, FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster, Groups, GroupsCluster, Identify, IdentifyCluster, IlluminanceMeasurement, IlluminanceMeasurementCluster, LevelControl, LevelControlCluster, ModeSelect, ModeSelectCluster, NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster, OccupancySensing, OccupancySensingCluster, OnOff, OnOffCluster, OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster, Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster, Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster, Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster, PowerSource, PowerSourceCluster, PowerSourceConfigurationCluster, PowerTopology, PowerTopologyCluster, PressureMeasurement, PressureMeasurementCluster, PumpConfigurationAndControl, PumpConfigurationAndControlCluster, RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster, RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster, SmokeCoAlarm, SmokeCoAlarmCluster, Switch, SwitchCluster, TemperatureMeasurement, TemperatureMeasurementCluster, Thermostat, ThermostatCluster, TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster, UserLabel, UserLabelCluster, ValveConfigurationAndControl, ValveConfigurationAndControlCluster, WindowCovering, WindowCoveringCluster, } from '@matter/main/clusters';
+import { Endpoint, MutableEndpoint, SupportedBehaviors, NamedHandler, Lifecycle, VendorId } from '@matter/main';
 import { MeasurementType, getClusterNameById } from '@matter/main/types';
 import { Specification } from '@matter/main/model';
+import { BasicInformation, BasicInformationCluster } from '@matter/main/clusters/basic-information';
+import { BooleanState, BooleanStateCluster } from '@matter/main/clusters/boolean-state';
+import { BooleanStateConfiguration, BooleanStateConfigurationCluster } from '@matter/main/clusters/boolean-state-configuration';
+import { BridgedDeviceBasicInformation, BridgedDeviceBasicInformationCluster } from '@matter/main/clusters/bridged-device-basic-information';
+import { CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurementCluster } from '@matter/main/clusters/carbon-dioxide-concentration-measurement';
+import { CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurementCluster } from '@matter/main/clusters/carbon-monoxide-concentration-measurement';
+import { ColorControl, ColorControlCluster } from '@matter/main/clusters/color-control';
+import { ConcentrationMeasurement } from '@matter/main/clusters/concentration-measurement';
+import { Descriptor } from '@matter/main/clusters/descriptor';
+import { DoorLock, DoorLockCluster } from '@matter/main/clusters/door-lock';
+import { ElectricalEnergyMeasurement, ElectricalEnergyMeasurementCluster } from '@matter/main/clusters/electrical-energy-measurement';
+import { ElectricalPowerMeasurement, ElectricalPowerMeasurementCluster } from '@matter/main/clusters/electrical-power-measurement';
+import { FanControl, FanControlCluster } from '@matter/main/clusters/fan-control';
+import { FixedLabel, FixedLabelCluster } from '@matter/main/clusters/fixed-label';
+import { FlowMeasurement, FlowMeasurementCluster } from '@matter/main/clusters/flow-measurement';
+import { FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurementCluster } from '@matter/main/clusters/formaldehyde-concentration-measurement';
+import { Groups, GroupsCluster } from '@matter/main/clusters/groups';
+import { Identify, IdentifyCluster } from '@matter/main/clusters/identify';
+import { IlluminanceMeasurement, IlluminanceMeasurementCluster } from '@matter/main/clusters/illuminance-measurement';
+import { LevelControl, LevelControlCluster } from '@matter/main/clusters/level-control';
+import { ModeSelect, ModeSelectCluster } from '@matter/main/clusters/mode-select';
+import { NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurementCluster } from '@matter/main/clusters/nitrogen-dioxide-concentration-measurement';
+import { OccupancySensing, OccupancySensingCluster } from '@matter/main/clusters/occupancy-sensing';
+import { OnOff, OnOffCluster } from '@matter/main/clusters/on-off';
+import { OzoneConcentrationMeasurement, OzoneConcentrationMeasurementCluster } from '@matter/main/clusters/ozone-concentration-measurement';
+import { Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurementCluster } from '@matter/main/clusters/pm10-concentration-measurement';
+import { Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurementCluster } from '@matter/main/clusters/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurementCluster } from '@matter/main/clusters/pm25-concentration-measurement';
+import { PowerSource, PowerSourceCluster } from '@matter/main/clusters/power-source';
+import { PowerTopology, PowerTopologyCluster } from '@matter/main/clusters/power-topology';
+import { PressureMeasurement, PressureMeasurementCluster } from '@matter/main/clusters/pressure-measurement';
+import { PumpConfigurationAndControl, PumpConfigurationAndControlCluster } from '@matter/main/clusters/pump-configuration-and-control';
+import { RadonConcentrationMeasurement, RadonConcentrationMeasurementCluster } from '@matter/main/clusters/radon-concentration-measurement';
+import { RelativeHumidityMeasurement, RelativeHumidityMeasurementCluster } from '@matter/main/clusters/relative-humidity-measurement';
+import { SmokeCoAlarm, SmokeCoAlarmCluster } from '@matter/main/clusters/smoke-co-alarm';
+import { Switch, SwitchCluster } from '@matter/main/clusters/switch';
+import { TemperatureMeasurement, TemperatureMeasurementCluster } from '@matter/main/clusters/temperature-measurement';
+import { Thermostat, ThermostatCluster } from '@matter/main/clusters/thermostat';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurementCluster } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
+import { UserLabel, UserLabelCluster } from '@matter/main/clusters/user-label';
+import { ValveConfigurationAndControl, ValveConfigurationAndControlCluster } from '@matter/main/clusters/valve-configuration-and-control';
+import { WindowCovering, WindowCoveringCluster } from '@matter/main/clusters/window-covering';
+import { AirQuality, AirQualityCluster } from '@matter/main/clusters/air-quality';
 import { DescriptorServer } from '@matter/node/behaviors/descriptor';
 import { IdentifyBehavior } from '@matter/node/behaviors/identify';
 import { GroupsServer } from '@matter/node/behaviors/groups';
@@ -19,7 +60,27 @@ import { FlowMeasurementServer } from '@matter/node/behaviors/flow-measurement';
 import { IlluminanceMeasurementServer } from '@matter/node/behaviors/illuminance-measurement';
 import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
 import { OccupancySensingServer } from '@matter/node/behaviors/occupancy-sensing';
-import { AirQualityServer, BasicInformationServer, CarbonDioxideConcentrationMeasurementServer, CarbonMonoxideConcentrationMeasurementServer, ElectricalEnergyMeasurementServer, ElectricalPowerMeasurementServer, FixedLabelServer, FormaldehydeConcentrationMeasurementServer, ModeSelectServer, NitrogenDioxideConcentrationMeasurementServer, OzoneConcentrationMeasurementServer, Pm10ConcentrationMeasurementServer, Pm1ConcentrationMeasurementServer, Pm25ConcentrationMeasurementServer, PowerSourceServer, PowerTopologyServer, RadonConcentrationMeasurementServer, SmokeCoAlarmServer, SwitchServer, TotalVolatileOrganicCompoundsConcentrationMeasurementServer, UserLabelServer, } from '@matter/main/behaviors';
+import { AirQualityServer } from '@matter/main/behaviors/air-quality';
+import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
+import { CarbonDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-dioxide-concentration-measurement';
+import { CarbonMonoxideConcentrationMeasurementServer } from '@matter/main/behaviors/carbon-monoxide-concentration-measurement';
+import { ElectricalEnergyMeasurementServer } from '@matter/main/behaviors/electrical-energy-measurement';
+import { ElectricalPowerMeasurementServer } from '@matter/main/behaviors/electrical-power-measurement';
+import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
+import { FormaldehydeConcentrationMeasurementServer } from '@matter/main/behaviors/formaldehyde-concentration-measurement';
+import { ModeSelectServer } from '@matter/main/behaviors/mode-select';
+import { NitrogenDioxideConcentrationMeasurementServer } from '@matter/main/behaviors/nitrogen-dioxide-concentration-measurement';
+import { OzoneConcentrationMeasurementServer } from '@matter/main/behaviors/ozone-concentration-measurement';
+import { Pm10ConcentrationMeasurementServer } from '@matter/main/behaviors/pm10-concentration-measurement';
+import { Pm1ConcentrationMeasurementServer } from '@matter/main/behaviors/pm1-concentration-measurement';
+import { Pm25ConcentrationMeasurementServer } from '@matter/main/behaviors/pm25-concentration-measurement';
+import { PowerSourceServer } from '@matter/main/behaviors/power-source';
+import { PowerTopologyServer } from '@matter/main/behaviors/power-topology';
+import { RadonConcentrationMeasurementServer } from '@matter/main/behaviors/radon-concentration-measurement';
+import { SmokeCoAlarmServer } from '@matter/main/behaviors/smoke-co-alarm';
+import { SwitchServer } from '@matter/main/behaviors/switch';
+import { TotalVolatileOrganicCompoundsConcentrationMeasurementServer } from '@matter/main/behaviors/total-volatile-organic-compounds-concentration-measurement';
+import { UserLabelServer } from '@matter/main/behaviors/user-label';
 import { ClusterServer, GroupsClusterHandler } from '@project-chip/matter.js/cluster';
 export class MatterbridgeEndpoint extends Endpoint {
     static bridgeMode = '';
@@ -418,12 +479,12 @@ export class MatterbridgeEndpoint extends Endpoint {
             return clusterServer;
         }
     }
-    getAllClusterServers() {
-        return [...this.clusterServers.values()];
-    }
     getClusterServerById(clusterId) {
         return this.clusterServers.get(clusterId);
     }
+    getAllClusterServers() {
+        return [...this.clusterServers.values()];
+    }
     addTagList(endpoint, mfgCode, namespaceId, tag, label) {
     }
     addClusterServer(cluster) {
@@ -1514,11 +1575,6 @@ export class MatterbridgeEndpoint extends Endpoint {
     createDefaultPowerSourceWiredClusterServer(wiredCurrentType = PowerSource.WiredCurrentType.Ac) {
         this.addClusterServer(this.getDefaultPowerSourceWiredClusterServer(wiredCurrentType));
     }
-    createDefaultPowerSourceConfigurationClusterServer(endpointNumber) {
-        this.addClusterServer(ClusterServer(PowerSourceConfigurationCluster, {
-            sources: endpointNumber ? [EndpointNumber(endpointNumber)] : [],
-        }, {}, {}));
-    }
     getDefaultAirQualityClusterServer(airQuality = AirQuality.AirQualityEnum.Unknown) {
         return ClusterServer(AirQualityCluster.with(AirQuality.Feature.Fair, AirQuality.Feature.Moderate, AirQuality.Feature.VeryPoor, AirQuality.Feature.ExtremelyPoor), {
             airQuality,

package/dist/matterbridgeEndpointDefault.js

@@ -0,0 +1,104 @@
+import { Endpoint, MutableEndpoint, SupportedBehaviors } from '@matter/main';
+import { Descriptor } from '@matter/main/clusters/descriptor';
+import { Identify } from '@matter/main/clusters/identify';
+import { OnOff } from '@matter/main/clusters/on-off';
+import { LevelControl } from '@matter/main/clusters/level-control';
+import { DescriptorServer } from '@matter/node/behaviors/descriptor';
+import { IdentifyServer } from '@matter/node/behaviors/identify';
+import { GroupsServer } from '@matter/node/behaviors/groups';
+import { ScenesManagementServer } from '@matter/node/behaviors/scenes-management';
+import { OnOffServer } from '@matter/main/behaviors/on-off';
+import { LevelControlServer } from '@matter/main/behaviors/level-control';
+class MatterbridgeEndpoint extends Endpoint {
+    constructor(definition, options = {}, debug = false) {
+        let deviceTypeList = [];
+        let firstDefinition;
+        if (Array.isArray(definition)) {
+            firstDefinition = definition[0];
+            deviceTypeList = Array.from(definition.values()).map((dt) => ({
+                deviceType: dt.code,
+                revision: dt.revision,
+            }));
+        }
+        else {
+            firstDefinition = definition;
+            deviceTypeList = [{ deviceType: firstDefinition.code, revision: firstDefinition.revision }];
+        }
+        const deviceTypeDefinitionV8 = {
+            name: firstDefinition.name.replace('-', '_'),
+            deviceType: firstDefinition.code,
+            deviceRevision: firstDefinition.revision,
+            deviceClass: firstDefinition.deviceClass.toLowerCase(),
+            requirements: {
+                server: {
+                    mandatory: {},
+                    optional: {},
+                },
+                client: {
+                    mandatory: {},
+                    optional: {},
+                },
+            },
+            behaviors: options.tagList ? SupportedBehaviors(DescriptorServer.with(Descriptor.Feature.TagList)) : {},
+        };
+        const endpointV8 = MutableEndpoint(deviceTypeDefinitionV8);
+        const optionsV8 = {
+            id: options.uniqueStorageKey?.replace(/[ .]/g, ''),
+            number: options.endpointId,
+            descriptor: options.tagList ? { tagList: options.tagList, deviceTypeList } : { deviceTypeList },
+        };
+        super(endpointV8, optionsV8);
+    }
+    createDefaultIdentifyClusterServer(identifyTime = 0, identifyType = Identify.IdentifyType.None) {
+        this.behaviors.require(IdentifyServer, {
+            identifyTime,
+            identifyType,
+        });
+        return this;
+    }
+    createDefaultGroupsClusterServer() {
+        this.behaviors.require(GroupsServer);
+        return this;
+    }
+    createDefaultScenesClusterServer() {
+        this.behaviors.require(ScenesManagementServer);
+        return this;
+    }
+    createDefaultOnOffClusterServer(onOff = false, globalSceneControl = false, onTime = 0, offWaitTime = 0, startUpOnOff = null) {
+        this.behaviors.require(OnOffServer.with(OnOff.Feature.Lighting), {
+            onOff,
+            globalSceneControl,
+            onTime,
+            offWaitTime,
+            startUpOnOff,
+        });
+        return this;
+    }
+    createOnOffClusterServer(onOff = false) {
+        this.behaviors.require(OnOffServer, {
+            onOff,
+        });
+        return this;
+    }
+    createDeadFrontOnOffClusterServer(onOff = false) {
+        this.behaviors.require(OnOffServer.with(OnOff.Feature.DeadFrontBehavior), {
+            onOff,
+        });
+        return this;
+    }
+    createDefaultLevelControlClusterServer(currentLevel = 254, minLevel = 1, maxLevel = 254, onLevel = null, startUpCurrentLevel = null) {
+        this.behaviors.require(LevelControlServer.with(LevelControl.Feature.OnOff, LevelControl.Feature.Lighting), {
+            currentLevel,
+            minLevel,
+            maxLevel,
+            onLevel,
+            remainingTime: 0,
+            startUpCurrentLevel,
+            options: {
+                executeIfOff: false,
+                coupleColorTempToLevel: false,
+            },
+        });
+        return this;
+    }
+}

package/dist/matterbridgePlatform.js

@@ -1,7 +1,6 @@
-import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
-import { CYAN, db, nf, wr } from 'node-ansi-logger';
-import { NodeStorageManager } from 'node-persist-manager';
+import { CYAN, db, nf, wr } from './logger/export.js';
+import { NodeStorageManager } from './storage/export.js';
 import path from 'path';
 export class MatterbridgePlatform {
     matterbridge;
@@ -175,7 +174,4 @@ export class MatterbridgePlatform {
         this.log.debug('Endpoint numbers check completed.');
         return endpointMap.size;
     }
-    async _createMutableDevice(definition, options = {}, debug = false) {
-        return new MatterbridgeEndpoint(definition, options, debug);
-    }
 }

package/dist/pluginManager.js

@@ -1,4 +1,4 @@
-import { AnsiLogger, BLUE, db, er, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr } from 'node-ansi-logger';
+import { AnsiLogger, BLUE, db, er, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr } from './logger/export.js';
 import path from 'path';
 import { promises as fs } from 'fs';
 import { pathToFileURL } from 'url';
@@ -650,7 +650,7 @@ export class PluginManager {
         }
     }
     async loadSchema(plugin) {
-        let schemaFile = plugin.path.replace('package.json', `${plugin.name}.schema.json`);
+        const schemaFile = plugin.path.replace('package.json', `${plugin.name}.schema.json`);
         try {
             await fs.access(schemaFile);
             const data = await fs.readFile(schemaFile, 'utf8');
@@ -658,18 +658,10 @@ export class PluginManager {
             schema.title = plugin.description;
             schema.description = plugin.name + ' v. ' + plugin.version + ' by ' + plugin.author;
             this.log.debug(`Loaded schema file ${schemaFile} for plugin ${plg}${plugin.name}${db}.`);
-            schemaFile = path.join(this.matterbridge.matterbridgeDirectory, `${plugin.name}.schema.json`);
-            try {
-                await fs.unlink(schemaFile);
-                this.log.debug(`Schema file ${schemaFile} deleted.`);
-            }
-            catch (err) {
-                this.log.debug(`Schema file ${schemaFile} to delete not found.`);
-            }
             return schema;
         }
-        catch (err) {
-            this.log.debug(`Schema file ${schemaFile} for plugin ${plg}${plugin.name}${db} not found. Loading default schema.`);
+        catch (error) {
+            this.log.debug(`Schema file ${schemaFile} for plugin ${plg}${plugin.name}${db} not found. Loading default schema. Error: ${error instanceof Error ? error.message : error}`);
             return this.getDefaultSchema(plugin);
         }
     }

package/npm-shrinkwrap.json

@@ -1,16 +1,15 @@
 {
   "name": "matterbridge",
-  "version": "2.0.0-edge.3",
+  "version": "2.0.0-edge.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.0.0-edge.3",
+      "version": "2.0.0-edge.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.11.9",
-        "@matter/nodejs": "0.11.9",
         "@project-chip/matter.js": "0.11.9",
         "archiver": "7.0.1",
         "express": "4.21.2",
@@ -102,6 +101,7 @@
       "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.11.9.tgz",
       "integrity": "sha512-NJR2lKElalnjljl+KXgmXcLrdoaK4MH/BA57RYJ2KC3e5ZD+oxhFXfIxCUm37p7anlvv6GcK9ELkJyNaB0zg8A==",
       "license": "Apache-2.0",
+      "optional": true,
       "dependencies": {
         "@matter/general": "0.11.9",
         "@matter/node": "0.11.9",
@@ -137,12 +137,12 @@
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.0.tgz",
-      "integrity": "sha512-j84kjAbzEnQHaSIhRPUmB3/eVXu2k3dKPl2LOrR8fSOIL+89U+7lV117EWHtq/GHM3ReGHM46iRBdZfpc4HRUQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.1.tgz",
+      "integrity": "sha512-warwspo+UYUPep0Q+vtdVB4Ugn8GGQj8iyB3gnRWsztmUHTI3S1nhdiWNsPUGL0vud7JlRRk1XEu7Lq1KGTnMQ==",
       "license": "MIT",
       "dependencies": {
-        "@noble/hashes": "1.7.0"
+        "@noble/hashes": "1.7.1"
       },
       "engines": {
         "node": "^14.21.3 || >=16"
@@ -152,9 +152,9 @@
       }
     },
     "node_modules/@noble/hashes": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.0.tgz",
-      "integrity": "sha512-HXydb0DgzTpDPwbVeDGCG1gIu7X6+AuU6Zl6av/E/KG8LMsvPntvq+w17CHRpKBmN6Ybdrt1eP3k4cj8DJa78w==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.1.tgz",
+      "integrity": "sha512-B8XBPsn4vT/KJAGqDzbwztd+6Yte3P4V7iafm24bxgDe/mlRuK6xmWPuCNrKt2vDafZ8MfJLlchDG/vYafQEjQ==",
       "license": "MIT",
       "engines": {
         "node": "^14.21.3 || >=16"
@@ -1083,6 +1083,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "license": "MIT",
+      "optional": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -1309,6 +1310,7 @@
       "resolved": "https://registry.npmjs.org/node-localstorage/-/node-localstorage-3.0.5.tgz",
       "integrity": "sha512-GCwtK33iwVXboZWYcqQHu3aRvXEBwmPkAMRBLeaX86ufhqslyUkLGsi4aW3INEfdQYpUB5M9qtYf3eHvAk2VBg==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "write-file-atomic": "^5.0.1"
       },
@@ -1321,6 +1323,7 @@
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
       "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "license": "ISC",
+      "optional": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^4.0.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.0.0-edge.3",
+  "version": "2.0.0-edge.5",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -75,7 +75,6 @@
   },
   "dependencies": {
     "@matter/main": "0.11.9",
-    "@matter/nodejs": "0.11.9",
     "@project-chip/matter.js": "0.11.9",
     "archiver": "7.0.1",
     "express": "4.21.2",