matterbridge 3.0.5-dev-20250607-353b662 → 3.0.5-dev-20250609-a5046db

package/CHANGELOG.md

@@ -12,7 +12,7 @@ If you like this project and find it useful, please consider giving it a star on
 
 ### Added
 
-- [cli]: Added takeHeapSnapshot() and triggerGarbageCollection().
+- [cli]: Added takeHeapSnapshot() and triggerGarbageCollection() for internal testing.
 - [LaundryWasher]: Added Evse class and Jest test. Thanks Ludovic BOUÉ.
 - [LaundryWasher]: Added LaundryWasher class and Jest test.
 - [WaterHeater]: Added WaterHeater class and Jest test. Thanks Ludovic BOUÉ.

package/dist/cli.js

@@ -2,6 +2,7 @@
 import { Matterbridge } from './matterbridge.js';
 import { getIntParameter, hasParameter } from './utils/export.js';
 import { AnsiLogger, BRIGHT, CYAN, db, YELLOW } from './logger/export.js';
+import os from 'node:os';
 import { EventEmitter } from 'node:events';
 import { inspect } from 'node:util';
 export const cliEmitter = new EventEmitter();
@@ -41,7 +42,6 @@ const formatOsUpTime = (seconds) => {
     return `${seconds} second${seconds !== 1 ? 's' : ''}`;
 };
 async function startCpuMemoryCheck() {
-    const os = await import('node:os');
     log.debug(`Cpu memory check started`);
     prevCpus = os.cpus();
     clearInterval(memoryCheckInterval);
@@ -92,7 +92,8 @@ async function startCpuMemoryCheck() {
         log.debug(`***${YELLOW}${BRIGHT}Cpu usage:${db} ${CYAN}${cpuUsageLog.padStart(6, ' ')} %${db} ${YELLOW}${BRIGHT}Memory usage:${db} rss ${CYAN}${rss}${db} heapTotal ${CYAN}${heapTotal}${db} heapUsed ${CYAN}${heapUsed}${db} external ${external} arrayBuffers ${arrayBuffers}`);
     };
     interval();
-    memoryCheckInterval = setInterval(interval, getIntParameter('memoryinterval') ?? 10 * 1000);
+    clearInterval(memoryCheckInterval);
+    memoryCheckInterval = setInterval(interval, getIntParameter('memoryinterval') ?? 10 * 1000).unref();
 }
 async function stopCpuMemoryCheck() {
     log.debug(`***Cpu memory check stopped. Peak cpu: ${CYAN}${peakCpu.toFixed(2)} %${db}. Peak rss: ${CYAN}${formatMemoryUsage(peakRss)}${db}.`);
@@ -113,9 +114,11 @@ async function startInspector() {
         const interval = getIntParameter('snapshotinterval');
         if (interval && interval >= 30000) {
             log.debug(`***Started heap snapshot interval of ${CYAN}${interval}${db} ms`);
+            clearInterval(snapshotInterval);
             snapshotInterval = setInterval(async () => {
+                log.debug(`Run heap snapshot interval`);
                 await takeHeapSnapshot();
-            }, interval);
+            }, interval).unref();
         }
     }
     catch (err) {
@@ -164,6 +167,7 @@ async function takeHeapSnapshot() {
         log.error('No active inspector session.');
         return;
     }
+    log.debug(`Taking heap snapshot...`);
     const chunks = [];
     const chunksListener = (notification) => {
         chunks.push(Buffer.from(notification.params.chunk));
@@ -207,6 +211,14 @@ function registerHandlers() {
         instance.on('startmemorycheck', async () => start());
     if (instance)
         instance.on('stopmemorycheck', async () => stop());
+    if (instance)
+        instance.on('startinspector', async () => startInspector());
+    if (instance)
+        instance.on('stopinspector', async () => stopInspector());
+    if (instance)
+        instance.on('takeheapsnapshot', async () => takeHeapSnapshot());
+    if (instance)
+        instance.on('triggergarbagecollection', async () => triggerGarbageCollection());
     log.debug('Registered event handlers');
 }
 async function shutdown() {
@@ -214,6 +226,7 @@ async function shutdown() {
     if (hasParameter('inspect'))
         await stopInspector();
     await stopCpuMemoryCheck();
+    cliEmitter.emit('shutdown');
     process.exit(0);
 }
 async function restart() {
@@ -247,6 +260,7 @@ async function main() {
     }
     else {
         registerHandlers();
+        cliEmitter.emit('ready');
     }
 }
 process.title = 'matterbridge';

package/dist/evse.js

@@ -6,7 +6,7 @@ import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
 import { MatterbridgeServer } from './matterbridgeBehaviors.js';
 import { deviceEnergyManagement, electricalSensor, evse, powerSource } from './matterbridgeDeviceTypes.js';
 export class Evse extends MatterbridgeEndpoint {
-    constructor(name, serial, state, supplyState, faultState) {
+    constructor(name, serial, currentMode, supportedModes, state, supplyState, faultState) {
         super([evse, powerSource, electricalSensor, deviceEnergyManagement], { uniqueStorageKey: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
         this.createDefaultIdentifyClusterServer()
             .createDefaultBasicInformationClusterServer(name, serial, 0xfff1, 'Matterbridge', 0x8000, 'Matterbridge EVSE')
@@ -16,7 +16,7 @@ export class Evse extends MatterbridgeEndpoint {
             .createDefaultElectricalEnergyMeasurementClusterServer()
             .createDefaultDeviceEnergyManagementCluster()
             .createDefaultEnergyEvseClusterServer(state, supplyState, faultState)
-            .createDefaultEnergyEvseModeClusterServer()
+            .createDefaultEnergyEvseModeClusterServer(currentMode, supportedModes)
             .addRequiredClusterServers();
     }
     createDefaultEnergyEvseClusterServer(state, supplyState, faultState) {
@@ -37,20 +37,10 @@ export class Evse extends MatterbridgeEndpoint {
     createDefaultEnergyEvseModeClusterServer(currentMode, supportedModes) {
         this.behaviors.require(MatterbridgeEnergyEvseModeServer, {
             supportedModes: supportedModes ?? [
-                { label: 'Auto', mode: 1, modeTags: [{ value: EnergyEvseMode.ModeTag.Auto }] },
-                { label: 'Quick', mode: 2, modeTags: [{ value: EnergyEvseMode.ModeTag.Quick }] },
-                { label: 'Quiet', mode: 3, modeTags: [{ value: EnergyEvseMode.ModeTag.Quiet }] },
-                { label: 'LowNoise', mode: 4, modeTags: [{ value: EnergyEvseMode.ModeTag.LowNoise }] },
-                { label: 'LowEnergy', mode: 5, modeTags: [{ value: EnergyEvseMode.ModeTag.LowEnergy }] },
-                { label: 'Vacation', mode: 6, modeTags: [{ value: EnergyEvseMode.ModeTag.Vacation }] },
-                { label: 'Min', mode: 7, modeTags: [{ value: EnergyEvseMode.ModeTag.Min }] },
-                { label: 'Max', mode: 8, modeTags: [{ value: EnergyEvseMode.ModeTag.Max }] },
-                { label: 'Night', mode: 9, modeTags: [{ value: EnergyEvseMode.ModeTag.Night }] },
-                { label: 'Day', mode: 10, modeTags: [{ value: EnergyEvseMode.ModeTag.Day }] },
-                { label: 'Manual', mode: 11, modeTags: [{ value: EnergyEvseMode.ModeTag.Manual }] },
-                { label: 'TimeOfUse', mode: 12, modeTags: [{ value: EnergyEvseMode.ModeTag.TimeOfUse }] },
-                { label: 'SolarCharging', mode: 13, modeTags: [{ value: EnergyEvseMode.ModeTag.SolarCharging }] },
-                { label: 'V2X', mode: 14, modeTags: [{ value: EnergyEvseMode.ModeTag.V2X }] },
+                { label: 'Manual', mode: 1, modeTags: [{ value: EnergyEvseMode.ModeTag.Manual }] },
+                { label: 'TimeOfUse', mode: 2, modeTags: [{ value: EnergyEvseMode.ModeTag.TimeOfUse }] },
+                { label: 'SolarCharging', mode: 3, modeTags: [{ value: EnergyEvseMode.ModeTag.SolarCharging }] },
+                { label: 'Home-to-vehicle and Vehicle-to-home', mode: 4, modeTags: [{ value: EnergyEvseMode.ModeTag.V2X }] },
             ],
             currentMode: currentMode ?? 1,
         });
@@ -62,11 +52,23 @@ export class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
         const device = this.endpoint.stateOf(MatterbridgeServer).deviceCommand;
         device.disable();
         device.log.info(`MatterbridgeEnergyEvseServer disable called`);
+        this.state.supplyState = EnergyEvse.SupplyState.Disabled;
+        if (this.state.state === EnergyEvse.State.PluggedInCharging) {
+            this.state.state = EnergyEvse.State.PluggedInDemand;
+        }
+        this.state.chargingEnabledUntil = 0;
     }
-    enableCharging() {
+    enableCharging({ chargingEnabledUntil, minimumChargeCurrent, maximumChargeCurrent }) {
         const device = this.endpoint.stateOf(MatterbridgeServer).deviceCommand;
         device.enableCharging();
         device.log.info(`MatterbridgeEnergyEvseServer enableCharging called`);
+        this.state.supplyState = EnergyEvse.SupplyState.ChargingEnabled;
+        if (this.state.state === EnergyEvse.State.PluggedInDemand) {
+            this.state.state = EnergyEvse.State.PluggedInCharging;
+        }
+        this.state.chargingEnabledUntil = chargingEnabledUntil;
+        this.state.minimumChargeCurrent = minimumChargeCurrent;
+        this.state.maximumChargeCurrent = maximumChargeCurrent;
     }
 }
 export class MatterbridgeEnergyEvseModeServer extends EnergyEvseModeServer {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "3.0.5-dev-20250607-353b662",
+  "version": "3.0.5-dev-20250609-a5046db",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "3.0.5-dev-20250607-353b662",
+      "version": "3.0.5-dev-20250609-a5046db",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.14.0",
@@ -130,9 +130,9 @@
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.1.tgz",
-      "integrity": "sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.2.tgz",
+      "integrity": "sha512-HxngEd2XUcg9xi20JkwlLCtYwfoFw4JGkuZpT+WlsPD4gB/cxkvTD8fSsoAnphGZhFdZYKeQIPCuFlWPm1uE0g==",
       "license": "MIT",
       "dependencies": {
         "@noble/hashes": "1.8.0"
@@ -1021,6 +1021,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -1796,9 +1805,9 @@
       }
     },
     "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "3.0.5-dev-20250607-353b662",
+  "version": "3.0.5-dev-20250609-a5046db",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",