matterbridge 2.1.1-dev.2 → 2.1.2-dev.2

package/CHANGELOG.md

@@ -31,11 +31,27 @@ matterbridge-zigbee2mqtt v. 2.4.4
 matterbridge-somfy-tahoma v. 1.2.3
 matterbridge-hass v. 0.0.8
 
-## [2.1.1-dev.2] - 2025-02-02
+## [2.1.2] - 2025-02-03
+
+### Added
+
+- [frotnend]: Add rss and heap to SystemInformation.
+- [memorydump]: Add cpu to memoryDump.
+
+### Fixed
+
+- [frontend]: Fixed update matterbridge.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
+## [2.1.1] - 2025-02-02
 
 ### Fixed
 
-- [matter.js]: Fix 
+- [matter.js]: Fix close server nodes.
+
 <a href="https://www.buymeacoffee.com/luligugithub">
   <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
 </a>

package/dist/deviceManager.js

@@ -48,6 +48,8 @@ export class DeviceManager {
         return this._devices.values();
     }
     async forEach(callback) {
+        if (this.size === 0)
+            return;
         const tasks = Array.from(this._devices.values()).map(async (device) => {
             try {
                 await callback(device);
@@ -58,9 +60,6 @@ export class DeviceManager {
         });
         await Promise.all(tasks);
     }
-    get logLevel() {
-        return this.log.logLevel;
-    }
     set logLevel(logLevel) {
         this.log.logLevel = logLevel;
     }

package/dist/frontend.js

@@ -22,6 +22,7 @@ export class Frontend {
     httpServer;
     httpsServer;
     webSocketServer;
+    prevCpus = os.cpus();
     memoryData = [];
     memoryInterval;
     memoryTimeout;
@@ -162,7 +163,7 @@ export class Frontend {
             this.log.error(`WebSocketServer error: ${error}`);
         });
         if (hasParameter('memorydump')) {
-            this.startMemoryDump();
+            this.startCpuMemoryDump();
         }
         this.expressApp.post('/api/login', express.json(), async (req, res) => {
             const { password } = req.body;
@@ -630,14 +631,6 @@ export class Frontend {
                 return;
             }
             if (command === 'update') {
-                this.log.info('Updating matterbridge...');
-                try {
-                    await this.matterbridge.spawnCommand('npm', ['install', '-g', 'matterbridge', '--omit=dev', '--verbose']);
-                    this.log.info('Matterbridge has been updated. Full restart required.');
-                }
-                catch (error) {
-                    this.log.error('Error updating matterbridge');
-                }
                 await this.matterbridge.updateProcess();
                 this.wssSendRestartRequired();
                 res.json({ message: 'Command received' });
@@ -786,7 +779,7 @@ export class Frontend {
             this.webSocketServer = undefined;
         }
         if (hasParameter('memorydump')) {
-            this.stopMemoryDump();
+            this.stopCpuMemoryDump();
         }
     }
     formatMemoryUsage = (bytes) => {
@@ -794,12 +787,26 @@ export class Frontend {
         const mb = kb / 1024;
         return mb >= 1 ? `${mb.toFixed(2)} MB` : `${kb.toFixed(2)} KB`;
     };
-    startMemoryDump() {
+    startCpuMemoryDump() {
         clearInterval(this.memoryInterval);
         clearTimeout(this.memoryTimeout);
         const interval = () => {
+            const currCpus = os.cpus();
+            if (currCpus.length !== this.prevCpus.length) {
+                this.prevCpus = currCpus;
+            }
+            let totalIdle = 0, totalTick = 0;
+            this.prevCpus.forEach((prevCpu, i) => {
+                const currCpu = currCpus[i];
+                const idleDiff = currCpu.times.idle - prevCpu.times.idle;
+                const totalDiff = Object.keys(currCpu.times).reduce((acc, key) => acc + (currCpu.times[key] - prevCpu.times[key]), 0);
+                totalIdle += idleDiff;
+                totalTick += totalDiff;
+            });
+            const cpuUsage = (100 - (totalIdle / totalTick) * 100).toFixed(2);
+            this.prevCpus = currCpus;
             const memoryUsageRaw = process.memoryUsage();
-            this.memoryData.push(memoryUsageRaw);
+            this.memoryData.push({ ...memoryUsageRaw, cpu: cpuUsage });
             const memoryUsage = {
                 rss: this.formatMemoryUsage(memoryUsageRaw.rss),
                 heapTotal: this.formatMemoryUsage(memoryUsageRaw.heapTotal),
@@ -807,17 +814,17 @@ export class Frontend {
                 external: this.formatMemoryUsage(memoryUsageRaw.external),
                 arrayBuffers: this.formatMemoryUsage(memoryUsageRaw.arrayBuffers),
             };
-            this.log.debug(`***Memory usage rss ${CYAN}${memoryUsage.rss}${db} heapTotal ${CYAN}${memoryUsage.heapTotal}${db} heapUsed ${CYAN}${memoryUsage.heapUsed}${db} external ${memoryUsage.external} arrayBuffers ${memoryUsage.arrayBuffers}`);
+            this.log.debug(`***Cpu usage ${CYAN}${cpuUsage.padStart(6, ' ')} %${db} - Memory usage rss ${CYAN}${memoryUsage.rss}${db} heapTotal ${CYAN}${memoryUsage.heapTotal}${db} heapUsed ${CYAN}${memoryUsage.heapUsed}${db} external ${memoryUsage.external} arrayBuffers ${memoryUsage.arrayBuffers}`);
         };
         interval();
         this.memoryInterval = setInterval(interval, getIntParameter('memorydump') ?? 1000);
         this.memoryInterval.unref();
         this.memoryTimeout = setTimeout(() => {
-            this.stopMemoryDump();
+            this.stopCpuMemoryDump();
         }, 360000);
         this.memoryTimeout.unref();
     }
-    stopMemoryDump() {
+    stopCpuMemoryDump() {
         clearInterval(this.memoryInterval);
         this.memoryInterval = undefined;
         clearTimeout(this.memoryTimeout);
@@ -830,10 +837,14 @@ export class Frontend {
                 external: this.formatMemoryUsage(memory.external),
                 arrayBuffers: this.formatMemoryUsage(memory.arrayBuffers),
             };
-            console.log(`${YELLOW}Memory usage${db} rss ${CYAN}${memoryUsage.rss}${db} heapTotal ${CYAN}${memoryUsage.heapTotal}${db} heapUsed ${CYAN}${memoryUsage.heapUsed}${db} external ${memoryUsage.external} arrayBuffers ${memoryUsage.arrayBuffers}${rs}`);
+            console.log(`${YELLOW}Cpu usage${db} ${CYAN}${memory.cpu.padStart(6, ' ')} %${db} - ${YELLOW}Memory usage${db} rss ${CYAN}${memoryUsage.rss}${db} heapTotal ${CYAN}${memoryUsage.heapTotal}${db} heapUsed ${CYAN}${memoryUsage.heapUsed}${db} external ${memoryUsage.external} arrayBuffers ${memoryUsage.arrayBuffers}${rs}`);
         }
+        this.memoryData = [];
+        this.prevCpus = [];
     }
     async getApiSettings() {
+        this.matterbridge.systemInformation.rss = this.formatMemoryUsage(process.memoryUsage().rss);
+        this.matterbridge.systemInformation.heap = this.formatMemoryUsage(process.memoryUsage().heapUsed) + ' / ' + this.formatMemoryUsage(process.memoryUsage().heapTotal);
         this.matterbridge.matterbridgeInformation.bridgeMode = this.matterbridge.bridgeMode;
         this.matterbridge.matterbridgeInformation.restartMode = this.matterbridge.restartMode;
         this.matterbridge.matterbridgeInformation.loggerLevel = this.matterbridge.log.logLevel;

package/dist/matter/export.js

@@ -1,3 +1,4 @@
 export * from '@matter/main';
 export { SemanticNamespace, ClosureTag, CompassDirectionTag, CompassLocationTag, DirectionTag, ElectricalMeasurementTag, LaundryTag, LevelTag, LocationTag, NumberTag, PositionTag, PowerSourceTag, RefrigeratorTag, RoomAirConditionerTag, SwitchesTag, } from '@matter/main';
 export { AttributeElement, ClusterElement, ClusterModel, CommandElement, EventElement, FieldElement } from '@matter/main/model';
+export { logEndpoint, MdnsService } from '@matter/main/protocol';

package/dist/matterbridge.js

@@ -35,6 +35,8 @@ export class Matterbridge extends EventEmitter {
         totalMemory: '',
         freeMemory: '',
         systemUptime: '',
+        rss: '',
+        heap: '',
     };
     matterbridgeInformation = {
         homeDirectory: '',
@@ -995,12 +997,11 @@ export class Matterbridge extends EventEmitter {
                 }
             }
             this.frontend.stop();
-            this.log.info(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
+            this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
                     await this.stopServerNode(this.serverNode);
                     this.serverNode = undefined;
-                    this.log.info(`Stopped matter server node for Matterbridge`);
                 }
             }
             if (this.bridgeMode === 'childbridge') {
@@ -1008,11 +1009,10 @@ export class Matterbridge extends EventEmitter {
                     if (plugin.serverNode) {
                         await this.stopServerNode(plugin.serverNode);
                         plugin.serverNode = undefined;
-                        this.log.info(`Stopped matter server node for ${plugin.name}`);
                     }
                 }
             }
-            this.log.info('Stopped matter server nodes');
+            this.log.notice('Stopped matter server nodes');
             await this.stopMatterStorage();
             try {
                 Logger.removeLogger('matterfilelogger');

package/dist/matterbridgePlatform.js

@@ -83,10 +83,10 @@ export class MatterbridgePlatform {
             return false;
         return true;
     }
-    validateDevice(device, log = true) {
-        return this.validateDeviceWhiteBlackList(device, log);
-    }
     validateDeviceWhiteBlackList(device, log = true) {
+        return this.validateDevice(device, log);
+    }
+    validateDevice(device, log = true) {
         if (!Array.isArray(device))
             device = [device];
         let blackListBlocked = 0;
@@ -115,10 +115,10 @@ export class MatterbridgePlatform {
             this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because not in whitelist`);
         return false;
     }
-    validateEntity(device, entity, log = true) {
-        return this.validateEntityBlackList(device, entity, log);
-    }
     validateEntityBlackList(device, entity, log = true) {
+        return this.validateEntity(device, entity, log);
+    }
+    validateEntity(device, entity, log = true) {
         if (isValidArray(this.config.entityBlackList, 1) && this.config.entityBlackList.find((e) => e === entity)) {
             if (log)
                 this.log.info(`Skipping entity ${CYAN}${entity}${nf} because in entityBlackList`);

package/dist/pluginManager.js

@@ -42,6 +42,8 @@ export class PluginManager {
         return this._plugins.values();
     }
     async forEach(callback) {
+        if (this.size === 0)
+            return;
         const tasks = Array.from(this._plugins.values()).map(async (plugin) => {
             try {
                 await callback(plugin);
@@ -52,9 +54,6 @@ export class PluginManager {
         });
         await Promise.all(tasks);
     }
-    get logLevel() {
-        return this.log.logLevel;
-    }
     set logLevel(logLevel) {
         this.log.logLevel = logLevel;
     }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "2.1.1-dev.2",
+  "version": "2.1.2-dev.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.1-dev.2",
+      "version": "2.1.2-dev.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "0.12.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.1-dev.2",
+  "version": "2.1.2-dev.2",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",