matterbridge 3.3.4-dev-20251020-4d2dd49 → 3.3.4-dev-20251020-df40d12

package/CHANGELOG.md

@@ -37,6 +37,7 @@ Advantages:
 ### Changed
 
 - [package]: Updated dependencies.
+- [package]: Optimized @matter imports.
 - [matter]: Bumped `matter.js` version to 0.15.6. Thanks matter.js!
 - [frontend]: Bumped `frontend` version to 3.2.3.
 

package/dist/cli.js

@@ -1,24 +1,25 @@
 if (process.argv.includes('--loader') || process.argv.includes('-loader'))
-    console.log('\u001B[32mCLI loaded.\u001B[40;0m');
+    console.log('\u001B[32mCli loaded.\u001B[40;0m');
 import { AnsiLogger } from 'node-ansi-logger';
 import { cliEmitter } from './cliEmitter.js';
-import { hasParameter, hasAnyParameter } from './utils/commandLine.js';
 import { Matterbridge } from './matterbridge.js';
+import { hasParameter, hasAnyParameter } from './utils/commandLine.js';
 import { inspectError } from './utils/error.js';
 import { Tracker } from './utils/tracker.js';
 import { Inspector } from './utils/inspector.js';
+import { formatBytes, formatUptime } from './utils/format.js';
 export let instance;
-export const tracker = new Tracker('Cli', true, true);
-export const inspector = new Inspector('Cli', true, true);
+export const tracker = new Tracker('Cli', false, false);
+export const inspector = new Inspector('Cli', false, false);
 const log = new AnsiLogger({ logName: 'Cli', logTimestampFormat: 4, logLevel: hasParameter('debug') ? "debug" : "info" });
 function startCpuMemoryCheck() {
     log.debug(`Cpu memory check starting...`);
     tracker.start();
     tracker.on('uptime', (os, process) => {
-        cliEmitter.emit('uptime', tracker.formatOsUpTime(Math.floor(os)), tracker.formatOsUpTime(Math.floor(process)));
+        cliEmitter.emit('uptime', formatUptime(Math.floor(os)), formatUptime(Math.floor(process)));
     });
     tracker.on('snapshot', (snapshot) => {
-        cliEmitter.emit('memory', tracker.formatBytes(snapshot.totalMemory), tracker.formatBytes(snapshot.freeMemory), tracker.formatBytes(snapshot.rss), tracker.formatBytes(snapshot.heapTotal), tracker.formatBytes(snapshot.heapUsed), tracker.formatBytes(snapshot.external), tracker.formatBytes(snapshot.arrayBuffers));
+        cliEmitter.emit('memory', formatBytes(snapshot.totalMemory), formatBytes(snapshot.freeMemory), formatBytes(snapshot.rss), formatBytes(snapshot.heapTotal), formatBytes(snapshot.heapUsed), formatBytes(snapshot.external), formatBytes(snapshot.arrayBuffers));
         cliEmitter.emit('cpu', snapshot.osCpu, snapshot.processCpu);
     });
     log.debug(`Cpu memory check started`);

package/dist/devices/airConditioner.js

@@ -1,5 +1,5 @@
-import { ThermostatUserInterfaceConfiguration } from '@matter/main/clusters/thermostat-user-interface-configuration';
-import { FanControl } from '@matter/main/clusters/fan-control';
+import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/thermostat-user-interface-configuration';
+import { FanControl } from '@matter/types/clusters/fan-control';
 import { airConditioner, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class AirConditioner extends MatterbridgeEndpoint {

package/dist/devices/batteryStorage.js

@@ -1,6 +1,6 @@
-import { PowerSourceTag } from '@matter/main';
-import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
-import { PowerSource } from '@matter/main/clusters/power-source';
+import { PowerSourceTag } from '@matter/node';
+import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
+import { PowerSource } from '@matter/types/clusters/power-source';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { deviceEnergyManagement, electricalSensor, batteryStorage, powerSource } from '../matterbridgeDeviceTypes.js';
 export class BatteryStorage extends MatterbridgeEndpoint {

package/dist/devices/dishwasher.js

@@ -1,7 +1,7 @@
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { DishwasherModeServer } from '@matter/main/behaviors/dishwasher-mode';
-import { DishwasherAlarmServer } from '@matter/main/behaviors/dishwasher-alarm';
-import { DishwasherMode } from '@matter/main/clusters/dishwasher-mode';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { DishwasherMode } from '@matter/types/clusters/dishwasher-mode';
+import { DishwasherModeServer } from '@matter/node/behaviors/dishwasher-mode';
+import { DishwasherAlarmServer } from '@matter/node/behaviors/dishwasher-alarm';
 import { dishwasher, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';

package/dist/devices/evse.js

@@ -1,8 +1,9 @@
-import { EnergyEvseServer } from '@matter/main/behaviors/energy-evse';
-import { EnergyEvseModeServer } from '@matter/main/behaviors/energy-evse-mode';
-import { EnergyEvse, EnergyEvseMode } from '@matter/main/clusters';
-import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
-import { ModeBase } from '@matter/main/clusters/mode-base';
+import { EnergyEvseMode } from '@matter/types/clusters/energy-evse-mode';
+import { EnergyEvse } from '@matter/types/clusters/energy-evse';
+import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { EnergyEvseServer } from '@matter/node/behaviors/energy-evse';
+import { EnergyEvseModeServer } from '@matter/node/behaviors/energy-evse-mode';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
 import { deviceEnergyManagement, electricalSensor, evse, powerSource } from '../matterbridgeDeviceTypes.js';

package/dist/devices/extractorHood.js

@@ -1,4 +1,4 @@
-import { ResourceMonitoring } from '@matter/main/clusters/resource-monitoring';
+import { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
 import { extractorHood, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class ExtractorHood extends MatterbridgeEndpoint {

package/dist/devices/heatPump.js

@@ -1,5 +1,5 @@
-import { NumberTag, PowerSourceTag } from '@matter/main';
-import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
+import { NumberTag, PowerSourceTag } from '@matter/node';
+import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { deviceEnergyManagement, electricalSensor, powerSource, heatPump, temperatureSensor, thermostatDevice } from '../matterbridgeDeviceTypes.js';
 export class HeatPump extends MatterbridgeEndpoint {

package/dist/devices/laundryDryer.js

@@ -1,6 +1,6 @@
-import { LaundryWasherMode } from '@matter/main/clusters/laundry-washer-mode';
-import { LaundryDryerControls } from '@matter/main/clusters/laundry-dryer-controls';
-import { LaundryDryerControlsServer } from '@matter/main/behaviors/laundry-dryer-controls';
+import { LaundryWasherMode } from '@matter/types/clusters/laundry-washer-mode';
+import { LaundryDryerControls } from '@matter/types/clusters/laundry-dryer-controls';
+import { LaundryDryerControlsServer } from '@matter/node/behaviors/laundry-dryer-controls';
 import { laundryDryer, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeLaundryWasherModeServer } from './laundryWasher.js';

package/dist/devices/laundryWasher.js

@@ -1,8 +1,8 @@
-import { LaundryWasherControls } from '@matter/main/clusters/laundry-washer-controls';
-import { LaundryWasherMode } from '@matter/main/clusters/laundry-washer-mode';
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { LaundryWasherModeServer } from '@matter/main/behaviors/laundry-washer-mode';
-import { LaundryWasherControlsServer } from '@matter/main/behaviors/laundry-washer-controls';
+import { LaundryWasherControls } from '@matter/types/clusters/laundry-washer-controls';
+import { LaundryWasherMode } from '@matter/types/clusters/laundry-washer-mode';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { LaundryWasherModeServer } from '@matter/node/behaviors/laundry-washer-mode';
+import { LaundryWasherControlsServer } from '@matter/node/behaviors/laundry-washer-controls';
 import { laundryWasher, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeOnOffServer, MatterbridgeServer } from '../matterbridgeBehaviors.js';

package/dist/devices/microwaveOven.js

@@ -1,8 +1,8 @@
-import { OperationalState } from '@matter/main/clusters/operational-state';
-import { MicrowaveOvenMode } from '@matter/main/clusters/microwave-oven-mode';
-import { MicrowaveOvenControl } from '@matter/main/clusters/microwave-oven-control';
-import { MicrowaveOvenControlServer } from '@matter/main/behaviors/microwave-oven-control';
-import { MicrowaveOvenModeServer } from '@matter/main/behaviors/microwave-oven-mode';
+import { OperationalState } from '@matter/types/clusters/operational-state';
+import { MicrowaveOvenMode } from '@matter/types/clusters/microwave-oven-mode';
+import { MicrowaveOvenControl } from '@matter/types/clusters/microwave-oven-control';
+import { MicrowaveOvenControlServer } from '@matter/node/behaviors/microwave-oven-control';
+import { MicrowaveOvenModeServer } from '@matter/node/behaviors/microwave-oven-mode';
 import { microwaveOven, powerSource } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeServer, MatterbridgeOperationalStateServer } from '../matterbridgeBehaviors.js';

package/dist/devices/oven.js

@@ -1,8 +1,8 @@
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { OvenMode } from '@matter/main/clusters/oven-mode';
-import { OperationalState } from '@matter/main/clusters/operational-state';
-import { OvenModeServer } from '@matter/main/behaviors/oven-mode';
-import { OvenCavityOperationalStateServer } from '@matter/main/behaviors/oven-cavity-operational-state';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { OvenMode } from '@matter/types/clusters/oven-mode';
+import { OperationalState } from '@matter/types/clusters/operational-state';
+import { OvenModeServer } from '@matter/node/behaviors/oven-mode';
+import { OvenCavityOperationalStateServer } from '@matter/node/behaviors/oven-cavity-operational-state';
 import { oven, powerSource, temperatureControlledCabinetHeater } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';

package/dist/devices/refrigerator.js

@@ -1,7 +1,7 @@
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { RefrigeratorAndTemperatureControlledCabinetMode } from '@matter/main/clusters/refrigerator-and-temperature-controlled-cabinet-mode';
-import { RefrigeratorAndTemperatureControlledCabinetModeServer } from '@matter/main/behaviors/refrigerator-and-temperature-controlled-cabinet-mode';
-import { RefrigeratorAlarmServer } from '@matter/main/behaviors/refrigerator-alarm';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { RefrigeratorAndTemperatureControlledCabinetMode } from '@matter/types/clusters/refrigerator-and-temperature-controlled-cabinet-mode';
+import { RefrigeratorAndTemperatureControlledCabinetModeServer } from '@matter/node/behaviors/refrigerator-and-temperature-controlled-cabinet-mode';
+import { RefrigeratorAlarmServer } from '@matter/node/behaviors/refrigerator-alarm';
 import { powerSource, refrigerator, temperatureControlledCabinetCooler } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';

package/dist/devices/roboticVacuumCleaner.js

@@ -1,14 +1,14 @@
-import { AreaNamespaceTag } from '@matter/main';
-import { RvcRunModeServer } from '@matter/main/behaviors/rvc-run-mode';
-import { RvcOperationalStateServer } from '@matter/main/behaviors/rvc-operational-state';
-import { RvcCleanModeServer } from '@matter/main/behaviors/rvc-clean-mode';
-import { PowerSource } from '@matter/main/clusters/power-source';
-import { RvcRunMode } from '@matter/main/clusters/rvc-run-mode';
-import { RvcCleanMode } from '@matter/main/clusters/rvc-clean-mode';
-import { RvcOperationalState } from '@matter/main/clusters/rvc-operational-state';
-import { ServiceArea } from '@matter/main/clusters/service-area';
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { OperationalState } from '@matter/main/clusters/operational-state';
+import { AreaNamespaceTag } from '@matter/node';
+import { PowerSource } from '@matter/types/clusters/power-source';
+import { RvcRunMode } from '@matter/types/clusters/rvc-run-mode';
+import { RvcCleanMode } from '@matter/types/clusters/rvc-clean-mode';
+import { RvcOperationalState } from '@matter/types/clusters/rvc-operational-state';
+import { ServiceArea } from '@matter/types/clusters/service-area';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { OperationalState } from '@matter/types/clusters/operational-state';
+import { RvcRunModeServer } from '@matter/node/behaviors/rvc-run-mode';
+import { RvcOperationalStateServer } from '@matter/node/behaviors/rvc-operational-state';
+import { RvcCleanModeServer } from '@matter/node/behaviors/rvc-clean-mode';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { powerSource, roboticVacuumCleaner } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeServer, MatterbridgeServiceAreaServer } from '../matterbridgeBehaviors.js';

package/dist/devices/solarPower.js

@@ -1,5 +1,5 @@
-import { PowerSourceTag } from '@matter/main';
-import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
+import { PowerSourceTag } from '@matter/node';
+import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 import { deviceEnergyManagement, electricalSensor, solarPower, powerSource } from '../matterbridgeDeviceTypes.js';
 export class SolarPower extends MatterbridgeEndpoint {

package/dist/devices/speaker.js

@@ -1,4 +1,5 @@
-import { OnOff, LevelControl } from '@matter/main/clusters';
+import { OnOff } from '@matter/types/clusters/on-off';
+import { LevelControl } from '@matter/types/clusters/level-control';
 import { speakerDevice } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
 export class Speaker extends MatterbridgeEndpoint {

package/dist/devices/temperatureControl.js

@@ -1,5 +1,5 @@
-import { TemperatureControl } from '@matter/main/clusters/temperature-control';
-import { TemperatureControlServer } from '@matter/main/behaviors/temperature-control';
+import { TemperatureControl } from '@matter/types/clusters/temperature-control';
+import { TemperatureControlServer } from '@matter/node/behaviors/temperature-control';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
 export function createLevelTemperatureControlClusterServer(endpoint, selectedTemperatureLevel = 1, supportedTemperatureLevels = ['Cold', 'Warm', 'Hot', '30°', '40°', '60°', '80°']) {
     endpoint.behaviors.require(MatterbridgeLevelTemperatureControlServer.with(TemperatureControl.Feature.TemperatureLevel), {

package/dist/devices/waterHeater.js

@@ -1,9 +1,9 @@
-import { ModeBase } from '@matter/main/clusters/mode-base';
-import { WaterHeaterManagement } from '@matter/main/clusters/water-heater-management';
-import { WaterHeaterMode } from '@matter/main/clusters/water-heater-mode';
-import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
-import { WaterHeaterManagementServer } from '@matter/main/behaviors/water-heater-management';
-import { WaterHeaterModeServer } from '@matter/main/behaviors/water-heater-mode';
+import { ModeBase } from '@matter/types/clusters/mode-base';
+import { WaterHeaterManagement } from '@matter/types/clusters/water-heater-management';
+import { WaterHeaterMode } from '@matter/types/clusters/water-heater-mode';
+import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
+import { WaterHeaterManagementServer } from '@matter/node/behaviors/water-heater-management';
+import { WaterHeaterModeServer } from '@matter/node/behaviors/water-heater-mode';
 import { MatterbridgeServer } from '../matterbridgeBehaviors.js';
 import { electricalSensor, powerSource, waterHeater } from '../matterbridgeDeviceTypes.js';
 import { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';

package/dist/frontend.js

@@ -4,18 +4,19 @@ import os from 'node:os';
 import path from 'node:path';
 import EventEmitter from 'node:events';
 import { AnsiLogger, stringify, debugStringify, CYAN, db, er, nf, rs, UNDERLINE, UNDERLINEOFF, YELLOW, nt, wr } from 'node-ansi-logger';
-import { Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, Lifecycle, LogDestination, Diagnostic, Time, FabricIndex } from '@matter/main';
-import { BridgedDeviceBasicInformation } from '@matter/main/clusters/bridged-device-basic-information';
-import { PowerSource } from '@matter/main/clusters/power-source';
-import { DeviceAdvertiser, DeviceCommissioner, FabricManager } from '@matter/main/protocol';
-import { CommissioningOptions } from '@matter/main/types';
+import { Logger, Diagnostic, LogDestination, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, Lifecycle } from '@matter/general';
+import { DeviceAdvertiser, DeviceCommissioner, FabricManager } from '@matter/protocol';
+import { FabricIndex } from '@matter/types/datatype';
+import { CommissioningOptions } from '@matter/types/commissioning';
+import { BridgedDeviceBasicInformation } from '@matter/types/clusters/bridged-device-basic-information';
+import { PowerSource } from '@matter/types/clusters/power-source';
 import { MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_DIAGNOSTIC_FILE, MATTERBRIDGE_HISTORY_FILE, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg } from './matterbridgeTypes.js';
 import { isValidArray, isValidNumber, isValidObject, isValidString, isValidBoolean } from './utils/isvalid.js';
 import { createZip } from './utils/createZip.js';
 import { hasParameter } from './utils/commandLine.js';
 import { withTimeout, wait } from './utils/wait.js';
 import { inspectError } from './utils/error.js';
-import { formatMemoryUsage, formatOsUpTime } from './utils/network.js';
+import { formatBytes, formatUptime, formatPercent } from './utils/format.js';
 import { capitalizeFirstLetter, getAttribute } from './matterbridgeEndpointHelpers.js';
 import { cliEmitter, lastOsCpuUsage, lastProcessCpuUsage } from './cliEmitter.js';
 import { generateHistoryPage } from './cliHistory.js';
@@ -337,22 +338,22 @@ export class Frontend extends EventEmitter {
             this.log.debug('Express received /memory');
             const memoryUsageRaw = process.memoryUsage();
             const memoryUsage = {
-                rss: formatMemoryUsage(memoryUsageRaw.rss),
-                heapTotal: formatMemoryUsage(memoryUsageRaw.heapTotal),
-                heapUsed: formatMemoryUsage(memoryUsageRaw.heapUsed),
-                external: formatMemoryUsage(memoryUsageRaw.external),
-                arrayBuffers: formatMemoryUsage(memoryUsageRaw.arrayBuffers),
+                rss: formatBytes(memoryUsageRaw.rss),
+                heapTotal: formatBytes(memoryUsageRaw.heapTotal),
+                heapUsed: formatBytes(memoryUsageRaw.heapUsed),
+                external: formatBytes(memoryUsageRaw.external),
+                arrayBuffers: formatBytes(memoryUsageRaw.arrayBuffers),
             };
             const { default: v8 } = await import('node:v8');
             const heapStatsRaw = v8.getHeapStatistics();
             const heapSpacesRaw = v8.getHeapSpaceStatistics();
-            const heapStats = Object.fromEntries(Object.entries(heapStatsRaw).map(([key, value]) => [key, formatMemoryUsage(value)]));
+            const heapStats = Object.fromEntries(Object.entries(heapStatsRaw).map(([key, value]) => [key, formatBytes(value)]));
             const heapSpaces = heapSpacesRaw.map((space) => ({
                 ...space,
-                space_size: formatMemoryUsage(space.space_size),
-                space_used_size: formatMemoryUsage(space.space_used_size),
-                space_available_size: formatMemoryUsage(space.space_available_size),
-                physical_space_size: formatMemoryUsage(space.physical_space_size),
+                space_size: formatBytes(space.space_size),
+                space_used_size: formatBytes(space.space_used_size),
+                space_available_size: formatBytes(space.space_available_size),
+                physical_space_size: formatBytes(space.physical_space_size),
             }));
             const { createRequire } = await import('node:module');
             const require = createRequire(import.meta.url);
@@ -684,15 +685,15 @@ export class Frontend extends EventEmitter {
         this.log.debug('Frontend stopped successfully');
     }
     async getApiSettings() {
-        this.matterbridge.systemInformation.totalMemory = formatMemoryUsage(os.totalmem());
-        this.matterbridge.systemInformation.freeMemory = formatMemoryUsage(os.freemem());
-        this.matterbridge.systemInformation.systemUptime = formatOsUpTime(os.uptime());
-        this.matterbridge.systemInformation.processUptime = formatOsUpTime(Math.floor(process.uptime()));
-        this.matterbridge.systemInformation.cpuUsage = lastOsCpuUsage.toFixed(2) + ' %';
-        this.matterbridge.systemInformation.processCpuUsage = lastProcessCpuUsage.toFixed(2) + ' %';
-        this.matterbridge.systemInformation.rss = formatMemoryUsage(process.memoryUsage().rss);
-        this.matterbridge.systemInformation.heapTotal = formatMemoryUsage(process.memoryUsage().heapTotal);
-        this.matterbridge.systemInformation.heapUsed = formatMemoryUsage(process.memoryUsage().heapUsed);
+        this.matterbridge.systemInformation.totalMemory = formatBytes(os.totalmem());
+        this.matterbridge.systemInformation.freeMemory = formatBytes(os.freemem());
+        this.matterbridge.systemInformation.systemUptime = formatUptime(os.uptime());
+        this.matterbridge.systemInformation.processUptime = formatUptime(Math.floor(process.uptime()));
+        this.matterbridge.systemInformation.cpuUsage = formatPercent(lastOsCpuUsage);
+        this.matterbridge.systemInformation.processCpuUsage = formatPercent(lastProcessCpuUsage);
+        this.matterbridge.systemInformation.rss = formatBytes(process.memoryUsage().rss);
+        this.matterbridge.systemInformation.heapTotal = formatBytes(process.memoryUsage().heapTotal);
+        this.matterbridge.systemInformation.heapUsed = formatBytes(process.memoryUsage().heapUsed);
         const info = {
             homeDirectory: this.matterbridge.homeDirectory,
             rootDirectory: this.matterbridge.rootDirectory,
@@ -1034,7 +1035,7 @@ export class Frontend extends EventEmitter {
             diagnosticDestination.context = Diagnostic.Context();
         }
         diagnosticDestination.context.run(() => diagnosticDestination.add(Diagnostic.message({
-            now: Time.now(),
+            now: new Date(),
             facility: 'Server nodes:',
             level: MatterLogLevel.INFO,
             prefix: Logger.nestingLevel ? '⎸'.padEnd(Logger.nestingLevel * 2) : '',

package/dist/helpers.js

@@ -1,4 +1,4 @@
-import { OnOff } from '@matter/main/clusters/on-off';
+import { OnOff } from '@matter/types/clusters/on-off';
 import { Endpoint } from '@matter/node';
 import { BridgedDeviceBasicInformationServer } from '@matter/node/behaviors/bridged-device-basic-information';
 import { OnOffBaseServer } from '@matter/node/behaviors/on-off';

package/dist/matterbridge.js

@@ -7,15 +7,18 @@ import EventEmitter from 'node:events';
 import { inspect } from 'node:util';
 import { AnsiLogger, UNDERLINE, UNDERLINEOFF, db, debugStringify, BRIGHT, RESET, er, nf, rs, wr, RED, GREEN, zb, CYAN, nt, BLUE, or } from 'node-ansi-logger';
 import { NodeStorageManager } from 'node-persist-manager';
-import { DeviceTypeId, Endpoint, Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, VendorId, StorageService, Environment, ServerNode, UINT32_MAX, UINT16_MAX, Crypto, } from '@matter/main';
-import { FabricAction, PaseClient } from '@matter/main/protocol';
-import { AggregatorEndpoint } from '@matter/main/endpoints';
-import { BasicInformationServer } from '@matter/main/behaviors/basic-information';
+import '@matter/nodejs';
+import { Endpoint, ServerNode } from '@matter/node';
+import { Logger, LogLevel as MatterLogLevel, LogFormat as MatterLogFormat, UINT32_MAX, UINT16_MAX, Crypto, Environment, StorageService } from '@matter/general';
+import { DeviceTypeId, VendorId } from '@matter/types';
+import { FabricAction, PaseClient } from '@matter/protocol';
+import { AggregatorEndpoint } from '@matter/node/endpoints';
+import { BasicInformationServer } from '@matter/node/behaviors/basic-information';
 import { getParameter, getIntParameter, hasParameter } from './utils/commandLine.js';
 import { copyDirectory } from './utils/copyDirectory.js';
 import { createDirectory } from './utils/createDirectory.js';
 import { isValidString, parseVersionString, isValidNumber, isValidObject } from './utils/isvalid.js';
-import { formatMemoryUsage, formatOsUpTime } from './utils/network.js';
+import { formatBytes, formatPercent, formatUptime } from './utils/format.js';
 import { withTimeout, waiter, wait } from './utils/wait.js';
 import { dev, MATTER_LOGGER_FILE, MATTER_STORAGE_NAME, MATTERBRIDGE_LOGGER_FILE, NODE_STORAGE_DIR, plg, typ } from './matterbridgeTypes.js';
 import { PluginManager } from './pluginManager.js';
@@ -721,14 +724,15 @@ export class Matterbridge extends EventEmitter {
         this.systemInformation.osRelease = os.release();
         this.systemInformation.osPlatform = os.platform();
         this.systemInformation.osArch = os.arch();
-        this.systemInformation.totalMemory = formatMemoryUsage(os.totalmem());
-        this.systemInformation.freeMemory = formatMemoryUsage(os.freemem());
-        this.systemInformation.systemUptime = formatOsUpTime(os.uptime());
-        this.systemInformation.processUptime = formatOsUpTime(Math.floor(process.uptime()));
-        this.systemInformation.cpuUsage = '0.00 %';
-        this.systemInformation.rss = formatMemoryUsage(process.memoryUsage().rss);
-        this.systemInformation.heapTotal = formatMemoryUsage(process.memoryUsage().heapTotal);
-        this.systemInformation.heapUsed = formatMemoryUsage(process.memoryUsage().heapUsed);
+        this.systemInformation.totalMemory = formatBytes(os.totalmem());
+        this.systemInformation.freeMemory = formatBytes(os.freemem());
+        this.systemInformation.systemUptime = formatUptime(os.uptime());
+        this.systemInformation.processUptime = formatUptime(process.uptime());
+        this.systemInformation.cpuUsage = formatPercent(0);
+        this.systemInformation.processCpuUsage = formatPercent(0);
+        this.systemInformation.rss = formatBytes(process.memoryUsage().rss);
+        this.systemInformation.heapTotal = formatBytes(process.memoryUsage().heapTotal);
+        this.systemInformation.heapUsed = formatBytes(process.memoryUsage().heapUsed);
         this.log.debug('Host System Information:');
         this.log.debug(`- Hostname: ${this.systemInformation.hostname}`);
         this.log.debug(`- User: ${this.systemInformation.user}`);

package/dist/matterbridgeAccessoryPlatform.js

@@ -1,3 +1,5 @@
+if (process.argv.includes('--loader') || process.argv.includes('-loader'))
+    console.log('\u001B[32mMatterbridgeAccessoryPlatform loaded.\u001B[40;0m');
 import { MatterbridgePlatform } from './matterbridgePlatform.js';
 export class MatterbridgeAccessoryPlatform extends MatterbridgePlatform {
     constructor(matterbridge, log, config) {

package/dist/matterbridgeBehaviors.js

@@ -1,4 +1,4 @@
-import { Behavior } from '@matter/main';
+import { Behavior } from '@matter/node';
 import { BooleanStateConfiguration } from '@matter/types/clusters/boolean-state-configuration';
 import { ColorControl } from '@matter/types/clusters/color-control';
 import { FanControl } from '@matter/types/clusters/fan-control';
@@ -12,25 +12,25 @@ import { ServiceArea } from '@matter/types/clusters/service-area';
 import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
 import { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
 import { DeviceEnergyManagementMode } from '@matter/types/clusters/device-energy-management-mode';
-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 { BooleanStateConfigurationServer } from '@matter/main/behaviors/boolean-state-configuration';
-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 { ModeSelectServer } from '@matter/main/behaviors/mode-select';
-import { SmokeCoAlarmServer } from '@matter/main/behaviors/smoke-co-alarm';
-import { SwitchServer } from '@matter/main/behaviors/switch';
-import { OperationalStateServer } from '@matter/main/behaviors/operational-state';
-import { ServiceAreaServer } from '@matter/main/behaviors/service-area';
-import { DeviceEnergyManagementServer } from '@matter/main/behaviors/device-energy-management';
-import { DeviceEnergyManagementModeServer } from '@matter/main/behaviors/device-energy-management-mode';
-import { HepaFilterMonitoringServer } from '@matter/main/behaviors/hepa-filter-monitoring';
-import { ActivatedCarbonFilterMonitoringServer } from '@matter/main/behaviors/activated-carbon-filter-monitoring';
+import { IdentifyServer } from '@matter/node/behaviors/identify';
+import { OnOffServer } from '@matter/node/behaviors/on-off';
+import { LevelControlServer } from '@matter/node/behaviors/level-control';
+import { ColorControlServer } from '@matter/node/behaviors/color-control';
+import { WindowCoveringServer } from '@matter/node/behaviors/window-covering';
+import { BooleanStateConfigurationServer } from '@matter/node/behaviors/boolean-state-configuration';
+import { DoorLockServer } from '@matter/node/behaviors/door-lock';
+import { FanControlServer } from '@matter/node/behaviors/fan-control';
+import { ThermostatServer } from '@matter/node/behaviors/thermostat';
+import { ValveConfigurationAndControlServer } from '@matter/node/behaviors/valve-configuration-and-control';
+import { ModeSelectServer } from '@matter/node/behaviors/mode-select';
+import { SmokeCoAlarmServer } from '@matter/node/behaviors/smoke-co-alarm';
+import { SwitchServer } from '@matter/node/behaviors/switch';
+import { OperationalStateServer } from '@matter/node/behaviors/operational-state';
+import { ServiceAreaServer } from '@matter/node/behaviors/service-area';
+import { DeviceEnergyManagementServer } from '@matter/node/behaviors/device-energy-management';
+import { DeviceEnergyManagementModeServer } from '@matter/node/behaviors/device-energy-management-mode';
+import { HepaFilterMonitoringServer } from '@matter/node/behaviors/hepa-filter-monitoring';
+import { ActivatedCarbonFilterMonitoringServer } from '@matter/node/behaviors/activated-carbon-filter-monitoring';
 export class MatterbridgeServer extends Behavior {
     static id = 'matterbridge';
     initialize() {