matterbridge 2.1.3-dev.1 → 2.1.4-dev.1

package/CHANGELOG.md

@@ -21,7 +21,7 @@ Starting from v. 2.1.0, the legacy old api of matter.js have been completely rem
 
 For this reason there is no compatibility with the old versions of the plugins.
 
-You need to update all plugins you use and Matterbridge in the same moment. 
+You need to update all plugins you use and Matterbridge in the same moment.
 
 I suggest to first update all plugins without restarting and then to update Matterbridge so when it restarts, all versions will be the latest.
 
@@ -31,11 +31,25 @@ matterbridge-zigbee2mqtt v. 2.4.4
 matterbridge-somfy-tahoma v. 1.2.3
 matterbridge-hass v. 0.0.8
 
+## [2.1.4] - 2025-02-05
+
+### Added
+
+- [frontend]: Added memorycheck before cleanup.
+
+### Changed
+
+- [package]: Update matter.js to 0.12.3.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [2.1.3] - 2025-02-04
 
 ### Added
 
-- [matter.js]: Added temporary solution to serverNode.close() not returning.
+- [matter.js]: Added temporary solution to prevent serverNode.close() not returning.
 
 ### Changed
 

package/dist/frontend.js

@@ -745,6 +745,15 @@ export class Frontend {
         this.log.debug(`Frontend initialized on port ${YELLOW}${this.port}${db} static ${UNDERLINE}${path.join(this.matterbridge.rootDirectory, 'frontend/build')}${UNDERLINEOFF}${rs}`);
     }
     async stop() {
+        if (hasParameter('memorycheck')) {
+            await new Promise((resolve) => {
+                this.log.debug(`***Memory check started for ${getIntParameter('memorycheck') ?? 5 * 60 * 1000} ms`);
+                setTimeout(() => {
+                    this.log.debug(`***Memory check stopped after ${getIntParameter('memorycheck') ?? 5 * 60 * 1000} ms`);
+                    resolve();
+                }, getIntParameter('memorycheck') ?? 5 * 60 * 1000);
+            });
+        }
         if (this.httpServer) {
             this.httpServer.close();
             this.httpServer.removeAllListeners();
@@ -814,7 +823,7 @@ export class Frontend {
                 external: this.formatMemoryUsage(memoryUsageRaw.external),
                 arrayBuffers: this.formatMemoryUsage(memoryUsageRaw.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}`);
+            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('memoryinterval') ?? 1000);
@@ -837,7 +846,7 @@ export class Frontend {
                 external: this.formatMemoryUsage(memory.external),
                 arrayBuffers: this.formatMemoryUsage(memory.arrayBuffers),
             };
-            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}`);
+            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 = [];

package/dist/matterbridge.js

@@ -14,7 +14,7 @@ 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 { DeviceCommissioner, FabricAction, PaseClient } from '@matter/main/protocol';
+import { DeviceCommissioner, FabricAction, MdnsService, PaseClient } from '@matter/main/protocol';
 import { AggregatorEndpoint } from '@matter/main/endpoints';
 const plg = '\u001B[38;5;33m';
 const dev = '\u001B[38;5;79m';
@@ -141,7 +141,22 @@ export class Matterbridge extends EventEmitter {
         return Matterbridge.instance;
     }
     async destroyInstance() {
+        const servers = [];
+        if (this.bridgeMode === 'bridge') {
+            if (this.serverNode)
+                servers.push(this.serverNode);
+        }
+        if (this.bridgeMode === 'childbridge') {
+            for (const plugin of this.plugins.array()) {
+                if (plugin.serverNode)
+                    servers.push(plugin.serverNode);
+            }
+        }
         await this.cleanup('destroying instance...', false);
+        for (const server of servers) {
+            await server.env.get(MdnsService)[Symbol.asyncDispose]();
+            this.log.info(`Closed ${server.id} MdnsService`);
+        }
         await new Promise((resolve) => {
             setTimeout(resolve, 1000);
         });
@@ -571,11 +586,11 @@ export class Matterbridge extends EventEmitter {
         process.removeAllListeners('uncaughtException');
         process.removeAllListeners('unhandledRejection');
         this.exceptionHandler = async (error) => {
-            this.log.fatal('Unhandled Exception detected at:', error.stack || error, rs);
+            this.log.error('Unhandled Exception detected at:', error.stack || error, rs);
         };
         process.on('uncaughtException', this.exceptionHandler);
         this.rejectionHandler = async (reason, promise) => {
-            this.log.fatal('Unhandled Rejection detected at:', promise, 'reason:', reason instanceof Error ? reason.stack : reason, rs);
+            this.log.error('Unhandled Rejection detected at:', promise, 'reason:', reason instanceof Error ? reason.stack : reason, rs);
         };
         process.on('unhandledRejection', this.rejectionHandler);
         this.log.debug(`Registering SIGINT and SIGTERM signal handlers...`);
@@ -999,7 +1014,6 @@ export class Matterbridge extends EventEmitter {
                     this.log.debug(`Plugin ${plg}${plugin.name}${db} reachability timeout cleared`);
                 }
             }
-            await this.frontend.stop();
             this.log.notice(`Stopping matter server nodes in ${this.bridgeMode} mode...`);
             if (this.bridgeMode === 'bridge') {
                 if (this.serverNode) {
@@ -1017,6 +1031,7 @@ export class Matterbridge extends EventEmitter {
             }
             this.log.notice('Stopped matter server nodes');
             await this.stopMatterStorage();
+            await this.frontend.stop();
             try {
                 Logger.removeLogger('matterfilelogger');
             }

package/dist/matterbridgeEndpointHelpers.js

@@ -84,6 +84,22 @@ export function lowercaseFirstLetter(name) {
         return name;
     return name.charAt(0).toLowerCase() + name.slice(1);
 }
+export function checkNotLatinCharacters(deviceName) {
+    const nonLatinRegexList = [
+        /[\u0400-\u04FF\u0500-\u052F]/,
+        /[\u2E80-\u9FFF]/,
+        /[\uAC00-\uD7AF]/,
+        /[\u0600-\u06FF\u0750-\u077F]/,
+        /[\u0590-\u05FF]/,
+        /[\u0900-\u097F]/,
+        /[\u0E00-\u0E7F]/,
+        /[\u1200-\u137F]/,
+    ];
+    return nonLatinRegexList.some((regex) => regex.test(deviceName));
+}
+export function generateUniqueId(deviceName) {
+    return createHash('md5').update(deviceName).digest('hex');
+}
 export function createUniqueId(param1, param2, param3, param4) {
     const hash = createHash('md5');
     hash.update(param1 + param2 + param3 + param4);

package/dist/matterbridgePlatform.js

@@ -1,7 +1,8 @@
 import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
-import { CYAN, db, nf, wr } from './logger/export.js';
+import { CYAN, db, er, nf, wr } from './logger/export.js';
 import { NodeStorageManager } from './storage/export.js';
 import path from 'path';
+import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
 export class MatterbridgePlatform {
     matterbridge;
     log;
@@ -14,6 +15,7 @@ export class MatterbridgePlatform {
     selectDevice = new Map();
     selectEntity = new Map();
     registeredEndpoints = new Map();
+    registeredEndpointsByName = new Map();
     constructor(matterbridge, log, config) {
         this.matterbridge = matterbridge;
         this.log = log;
@@ -46,18 +48,31 @@ export class MatterbridgePlatform {
     }
     async registerDevice(device) {
         device.plugin = this.name;
+        if (device.deviceName && this.registeredEndpointsByName.has(device.deviceName)) {
+            this.log.error(`Device with name ${CYAN}${device.deviceName}${er} is already registered. The device will not be added. Please change the device name.`);
+            return;
+        }
+        if (device.deviceName && checkNotLatinCharacters(device.deviceName)) {
+            this.log.debug(`Device with name ${CYAN}${device.deviceName}${er} has not latin characters. Please keep the name as short as possible.`);
+            return;
+        }
         await this.matterbridge.addBridgedEndpoint(this.name, device);
         if (device.uniqueId)
             this.registeredEndpoints.set(device.uniqueId, device);
+        if (device.deviceName)
+            this.registeredEndpointsByName.set(device.deviceName, device);
     }
     async unregisterDevice(device) {
         await this.matterbridge.removeBridgedEndpoint(this.name, device);
         if (device.uniqueId)
             this.registeredEndpoints.delete(device.uniqueId);
+        if (device.deviceName)
+            this.registeredEndpointsByName.delete(device.deviceName);
     }
     async unregisterAllDevices() {
         await this.matterbridge.removeAllBridgedEndpoints(this.name);
         this.registeredEndpoints.clear();
+        this.registeredEndpointsByName.clear();
     }
     verifyMatterbridgeVersion(requiredVersion) {
         const compareVersions = (matterbridgeVersion, requiredVersion) => {

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "matterbridge",
-  "version": "2.1.3-dev.1",
+  "version": "2.1.4-dev.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "2.1.3-dev.1",
+      "version": "2.1.4-dev.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/main": "0.12.2",
+        "@matter/main": "0.12.3",
         "archiver": "7.0.1",
         "express": "4.21.2",
         "glob": "11.0.1",
@@ -47,65 +47,65 @@
       }
     },
     "node_modules/@matter/general": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.12.2.tgz",
-      "integrity": "sha512-D8S2CQHD7KI8L9lxeRgFCLDziXZRAEHqAJei7e0d5Jqh5thPH6S2HUcSX+je6EZDFTshguMgboW09lhXnUR8lA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.12.3.tgz",
+      "integrity": "sha512-1dya8bKRAhNkXD5xDWapVSO4Wfug8Qw2RWw74NZQNtGKbyBuNQsCnShtOdYGLnkjf/7XUGsYGmCG8hKepBHnbQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/curves": "^1.8.1"
       }
     },
     "node_modules/@matter/main": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.12.2.tgz",
-      "integrity": "sha512-bMHBLKmXpLmV/bkOxyhc+j+BhagFg5W6x/TJjfdZv0dZolkD1yT5zGZClmdGaLhhvyuYEKGKlecCM9uQksgxnA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.12.3.tgz",
+      "integrity": "sha512-PjbSuQfm7pv/opqODgU7JhA5Gj/6TxiFiDr+i4NWFit+/NyVorDpjCKTpCZmj3XD7QhEp0iKeDG7KKBqrQ4TUQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.12.2",
-        "@matter/model": "0.12.2",
-        "@matter/node": "0.12.2",
-        "@matter/protocol": "0.12.2",
-        "@matter/types": "0.12.2",
+        "@matter/general": "0.12.3",
+        "@matter/model": "0.12.3",
+        "@matter/node": "0.12.3",
+        "@matter/protocol": "0.12.3",
+        "@matter/types": "0.12.3",
         "@noble/curves": "^1.8.1"
       },
       "optionalDependencies": {
-        "@matter/nodejs": "0.12.2"
+        "@matter/nodejs": "0.12.3"
       }
     },
     "node_modules/@matter/model": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.12.2.tgz",
-      "integrity": "sha512-xM8hwqVepb6YpvjE9jXacA4YypPHJm0latei7YTZystgvh8lUHDk5dkLELyrXzbNYTs//LMPAbj6SIsz9CorPA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.12.3.tgz",
+      "integrity": "sha512-wuiBuUR45lno2PMx1YPhwZyaG7+20iBlb5SlnzYfI5j6fJv1WyYv22APDDPKDglPj4rP2RABCyCUfd1/K5EfXg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.12.2",
+        "@matter/general": "0.12.3",
         "@noble/curves": "^1.8.1"
       }
     },
     "node_modules/@matter/node": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.12.2.tgz",
-      "integrity": "sha512-/VHnBHf6bFf6fVP6SvTrJDtKCzfZ6j5DTuEPRQFbdH1ph7OGyzVXjVRwoLPTzo2XT/VrTPcFNB38UNxTky1zQA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.12.3.tgz",
+      "integrity": "sha512-+bIYQtjCR053lgCd8mlnIp6ufm+H+zJGlZp8cdMX6IkkvT0vRqF2QxDtHpQn8CtzjnFzg+O5j0R4jdss2SluXg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.12.2",
-        "@matter/model": "0.12.2",
-        "@matter/protocol": "0.12.2",
-        "@matter/types": "0.12.2",
+        "@matter/general": "0.12.3",
+        "@matter/model": "0.12.3",
+        "@matter/protocol": "0.12.3",
+        "@matter/types": "0.12.3",
         "@noble/curves": "^1.8.1"
       }
     },
     "node_modules/@matter/nodejs": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.12.2.tgz",
-      "integrity": "sha512-sMnczk+3+7tr5OQDntPP7TuZP83/jC9jG713J1iJxU77cv/GMKIecKfAOrbFl50Ga+4zZTfIV9Mpekn50IT0ig==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.12.3.tgz",
+      "integrity": "sha512-Jx6TIYvl+2WlD9Zh6eMdClsjoPQjIkR3qhYGPbbhHlO7QXZWZz7d83jo1yShHWQrqnnfqqrkXy6iLBphrZ4SSg==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@matter/general": "0.12.2",
-        "@matter/node": "0.12.2",
-        "@matter/protocol": "0.12.2",
-        "@matter/types": "0.12.2",
+        "@matter/general": "0.12.3",
+        "@matter/node": "0.12.3",
+        "@matter/protocol": "0.12.3",
+        "@matter/types": "0.12.3",
         "node-localstorage": "^3.0.5"
       },
       "engines": {
@@ -113,25 +113,25 @@
       }
     },
     "node_modules/@matter/protocol": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.12.2.tgz",
-      "integrity": "sha512-BhfPqRgnNy+Fx6VWffFtA8aGdspvzxp+TY5PJpAqExBLwGB/kc/knagOOfLvSjSyT/gdZmIxep3Iw2ycm7UYYA==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.12.3.tgz",
+      "integrity": "sha512-mUL6rSXdm0LaS/i6bxjBQlZ/0fi8hXoinBytbKNkztfDOB9I3FeNlgp9FJxZ+ZJtrsPleMg4q+loLU7uNQi30w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.12.2",
-        "@matter/model": "0.12.2",
-        "@matter/types": "0.12.2",
+        "@matter/general": "0.12.3",
+        "@matter/model": "0.12.3",
+        "@matter/types": "0.12.3",
         "@noble/curves": "^1.8.1"
       }
     },
     "node_modules/@matter/types": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.12.2.tgz",
-      "integrity": "sha512-sTujir3YTDrbFnkccCrc9zdSx4AGRHdOeVBLPvVORNieHoKlBeKLBtCA9GsjRbbpnmSrpPe9Fl6z1MkCWblAmw==",
+      "version": "0.12.3",
+      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.12.3.tgz",
+      "integrity": "sha512-4nlu7nCW+V/Sed1XkJoPvtdRz0wIv8o9YSDj4To3yGR77HDqK9nbLXxpM7J+PQmGQ0/xEX1ylWU9X2dSIsH8WQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.12.2",
-        "@matter/model": "0.12.2",
+        "@matter/general": "0.12.3",
+        "@matter/model": "0.12.3",
         "@noble/curves": "^1.8.1"
       }
     },
@@ -1355,9 +1355,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
-      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge",
-  "version": "2.1.3-dev.1",
+  "version": "2.1.4-dev.1",
   "description": "Matterbridge plugin manager for Matter",
   "author": "https://github.com/Luligu",
   "license": "Apache-2.0",
@@ -94,7 +94,7 @@
     }
   },
   "dependencies": {
-    "@matter/main": "0.12.2",
+    "@matter/main": "0.12.3",
     "archiver": "7.0.1",
     "express": "4.21.2",
     "glob": "11.0.1",