matterbridge 2.1.4-dev.1 → 2.1.4-dev.3

package/CHANGELOG.md

@@ -31,11 +31,13 @@ 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
+## [2.1.4] - 2025-02-06
 
 ### Added
 
 - [frontend]: Added memorycheck before cleanup.
+- [platform]: Added a check for not latin characters.
+- [platform]: Added a check for already registered device names.
 
 ### Changed
 

package/dist/matterbridge.js

@@ -1078,6 +1078,9 @@ export class Matterbridge extends EventEmitter {
             this.hasCleanupStarted = false;
             this.initialized = false;
         }
+        else {
+            this.log.debug('Cleanup already started...');
+        }
     }
     async createAccessoryPlugin(plugin, device, start = false) {
         if (!plugin.locked && device.deviceName && device.vendorId && device.productId && device.vendorName && device.productName) {

package/dist/matterbridgeEndpoint.js

@@ -2,7 +2,7 @@ import { AnsiLogger, BLUE, CYAN, YELLOW, db, debugStringify, er, hk, or, zb } fr
 import { bridgedNode } from './matterbridgeDeviceTypes.js';
 import { isValidNumber, isValidObject } from './utils/utils.js';
 import { MatterbridgeBehavior, MatterbridgeBehaviorDevice, MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, MatterbridgeSwitchServer, } from './matterbridgeBehaviors.js';
-import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, } from './matterbridgeEndpointHelpers.js';
+import { addClusterServers, addFixedLabel, addOptionalClusterServers, addRequiredClusterServers, addUserLabel, capitalizeFirstLetter, createUniqueId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, getDefaultOccupancySensingClusterServer, lowercaseFirstLetter, updateAttribute, getClusterId, getAttributeId, setAttribute, getAttribute, checkNotLatinCharacters, generateUniqueId, } from './matterbridgeEndpointHelpers.js';
 import { Endpoint, Lifecycle, MutableEndpoint, NamedHandler, SupportedBehaviors, VendorId } from '@matter/main';
 import { getClusterNameById, MeasurementType } from '@matter/main/types';
 import { Descriptor } from '@matter/main/clusters/descriptor';
@@ -110,6 +110,9 @@ export class MatterbridgeEndpoint extends Endpoint {
             behaviors: options.tagList ? SupportedBehaviors(DescriptorServer.with(Descriptor.Feature.TagList)) : {},
         };
         const endpointV8 = MutableEndpoint(deviceTypeDefinitionV8);
+        if (options.uniqueStorageKey && checkNotLatinCharacters(options.uniqueStorageKey)) {
+            options.uniqueStorageKey = generateUniqueId(options.uniqueStorageKey);
+        }
         const optionsV8 = {
             id: options.uniqueStorageKey?.replace(/[ .]/g, ''),
             number: options.endpointId,

package/dist/matterbridgePlatform.js

@@ -1,8 +1,8 @@
+import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
 import { isValidArray, isValidObject, isValidString } from './utils/utils.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;
@@ -42,10 +42,21 @@ export class MatterbridgePlatform {
     async onShutdown(reason) {
         this.log.debug(`Shutting down platform ${this.name}`, reason);
         await this.checkEndpointNumbers();
+        this.selectDevice.clear();
+        this.selectEntity.clear();
+        this.registeredEndpoints.clear();
+        this.registeredEndpointsByName.clear();
+        await this.context?.close();
+        this.context = undefined;
+        await this.storage?.close();
+        this.storage = undefined;
     }
     async onChangeLoggerLevel(logLevel) {
         this.log.debug(`The plugin doesn't override onChangeLoggerLevel. Logger level set to: ${logLevel}`);
     }
+    hasDeviceName(deviceName) {
+        return this.registeredEndpointsByName.has(deviceName);
+    }
     async registerDevice(device) {
         device.plugin = this.name;
         if (device.deviceName && this.registeredEndpointsByName.has(device.deviceName)) {
@@ -53,8 +64,7 @@ export class MatterbridgePlatform {
             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;
+            this.log.debug(`Device with name ${CYAN}${device.deviceName}${db} has non latin characters. Please keep the name as short as possible.`);
         }
         await this.matterbridge.addBridgedEndpoint(this.name, device);
         if (device.uniqueId)

package/npm-shrinkwrap.json

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

package/package.json

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