matterbridge 2.1.5 → 2.1.6-dev.2

package/dist/matterbridgeEndpointHelpers.js

@@ -1,13 +1,8 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-// Node.js modules
 import { createHash } from 'crypto';
-// AnsiLogger module
 import { BLUE, CYAN, db, debugStringify, er, hk, or, YELLOW, zb } from './logger/export.js';
 import { MatterbridgeIdentifyServer, MatterbridgeOnOffServer, MatterbridgeLevelControlServer, MatterbridgeColorControlServer, MatterbridgeWindowCoveringServer, MatterbridgeThermostatServer, MatterbridgeFanControlServer, MatterbridgeDoorLockServer, MatterbridgeModeSelectServer, MatterbridgeValveConfigurationAndControlServer, MatterbridgeSmokeCoAlarmServer, MatterbridgeBooleanStateConfigurationServer, } from './matterbridgeBehaviors.js';
-// @matter
 import { Lifecycle } from '@matter/main';
 import { getClusterNameById } from '@matter/main/types';
-// @matter clusters
 import { PowerSource } from '@matter/main/clusters/power-source';
 import { UserLabel } from '@matter/main/clusters/user-label';
 import { FixedLabel } from '@matter/main/clusters/fixed-label';
@@ -49,7 +44,6 @@ import { Pm25ConcentrationMeasurement } from '@matter/main/clusters/pm25-concent
 import { Pm10ConcentrationMeasurement } from '@matter/main/clusters/pm10-concentration-measurement';
 import { RadonConcentrationMeasurement } from '@matter/main/clusters/radon-concentration-measurement';
 import { TotalVolatileOrganicCompoundsConcentrationMeasurement } from '@matter/main/clusters/total-volatile-organic-compounds-concentration-measurement';
-// @matter behaviors
 import { PowerSourceServer } from '@matter/main/behaviors/power-source';
 import { UserLabelServer } from '@matter/main/behaviors/user-label';
 import { FixedLabelServer } from '@matter/main/behaviors/fixed-label';
@@ -92,19 +86,19 @@ export function lowercaseFirstLetter(name) {
 }
 export function checkNotLatinCharacters(deviceName) {
     const nonLatinRegexList = [
-        /[\u0400-\u04FF\u0500-\u052F]/, // Cyrillic
-        /[\u2E80-\u9FFF]/, // CJK (Chinese, Japanese, Korean)
-        /[\uAC00-\uD7AF]/, // Korean Hangul
-        /[\u0600-\u06FF\u0750-\u077F]/, // Arabic, Persian
-        /[\u0590-\u05FF]/, // Hebrew
-        /[\u0900-\u097F]/, // Devanagari (Hindi, Sanskrit)
-        /[\u0E00-\u0E7F]/, // Thai
-        /[\u1200-\u137F]/, // Ethiopic (Amharic, Tigrinya)
+        /[\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'); // MD5 hash of the device name
+    return createHash('md5').update(deviceName).digest('hex');
 }
 export function createUniqueId(param1, param2, param3, param4) {
     const hash = createHash('md5');
@@ -112,7 +106,6 @@ export function createUniqueId(param1, param2, param3, param4) {
     return hash.digest('hex');
 }
 export function getBehaviourTypesFromClusterServerIds(clusterServerList) {
-    // Map Server ClusterId to Behavior.Type
     const behaviorTypes = [];
     clusterServerList.forEach((clusterId) => {
         behaviorTypes.push(getBehaviourTypeFromClusterServerId(clusterId));
@@ -120,15 +113,12 @@ export function getBehaviourTypesFromClusterServerIds(clusterServerList) {
     return behaviorTypes;
 }
 export function getBehaviourTypesFromClusterClientIds(clusterClientList) {
-    // Map Client ClusterId to Behavior.Type
     const behaviorTypes = [];
     clusterClientList.forEach((clusterId) => {
-        // behaviorTypes.push(getBehaviourTypeFromClusterClientId(clusterId));
     });
     return behaviorTypes;
 }
 export function getBehaviourTypeFromClusterServerId(clusterId) {
-    // Map ClusterId to Server Behavior.Type
     if (clusterId === PowerSource.Cluster.id)
         return PowerSourceServer.with(PowerSource.Feature.Wired);
     if (clusterId === UserLabel.Cluster.id)
@@ -214,8 +204,6 @@ export function getBehaviourTypeFromClusterServerId(clusterId) {
     return MatterbridgeIdentifyServer;
 }
 export function getBehaviourTypeFromClusterClientId(clusterId) {
-    // Map ClusterId to Client Behavior.Type
-    // return IdentifyClient;
 }
 export function getBehavior(endpoint, cluster) {
     let behavior;
@@ -261,13 +249,6 @@ export function addOptionalClusterServers(endpoint) {
     });
     addClusterServers(endpoint, optionalServerList);
 }
-/**
- * Adds cluster servers to the specified endpoint based on the provided server list.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to add the cluster servers to.
- * @param {ClusterId[]} serverList - The list of cluster IDs to add.
- * @returns void
- */
 export function addClusterServers(endpoint, serverList) {
     if (serverList.includes(PowerSource.Cluster.id))
         endpoint.createDefaultPowerSourceWiredClusterServer();
@@ -341,16 +322,7 @@ export function addClusterServers(endpoint, serverList) {
         endpoint.createDefaultRadonConcentrationMeasurementClusterServer();
     if (serverList.includes(TotalVolatileOrganicCompoundsConcentrationMeasurement.Cluster.id))
         endpoint.createDefaultTvocMeasurementClusterServer();
-    // if (serverList.includes(DeviceEnergyManagement.Cluster.id)) endpoint.createDefaultDeviceEnergyManagementClusterServer();
-    // if (serverList.includes(DeviceEnergyManagementMode.Cluster.id)) endpoint.createDefaultDeviceEnergyManagementModeClusterServer();
 }
-/**
- * Adds a fixed label to the FixedLabel cluster. The FixedLabel cluster is created if it does not exist.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to add the cluster servers to.
- * @param {string} label - The label to add.
- * @param {string} value - The value of the label.
- */
 export async function addFixedLabel(endpoint, label, value) {
     if (!endpoint.hasClusterServer(FixedLabel.Cluster.id)) {
         endpoint.log.debug(`addFixedLabel: add cluster ${hk}FixedLabel${db}:${hk}fixedLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
@@ -367,13 +339,6 @@ export async function addFixedLabel(endpoint, label, value) {
         await endpoint.setAttribute(FixedLabel.Cluster.id, 'labelList', labelList, endpoint.log);
     }
 }
-/**
- * Adds a user label to the UserLabel cluster. The UserLabel cluster is created if it does not exist.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to add the cluster servers to.
- * @param {string} label - The label to add.
- * @param {string} value - The value of the label.
- */
 export async function addUserLabel(endpoint, label, value) {
     if (!endpoint.hasClusterServer(UserLabel.Cluster.id)) {
         endpoint.log.debug(`addUserLabel: add cluster ${hk}UserLabel${db}:${hk}userLabel${db} with label ${CYAN}${label}${db} value ${CYAN}${value}${db}`);
@@ -437,16 +402,6 @@ export function getAttributeId(endpoint, cluster, attribute) {
         return endpoint.behaviors.supported[lowercaseFirstLetter(cluster)]?.schema?.children?.find((child) => child.name === capitalizeFirstLetter(attribute))?.id;
     }
 }
-/**
- * Retrieves the value of the provided attribute from the given cluster.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to retrieve the attribute from.
- * @param {Behavior.Type | ClusterType | ClusterId | string} cluster - The cluster to retrieve the attribute from.
- * @param {string} attribute - The name of the attribute to retrieve.
- * @param {AnsiLogger} [log] - (Optional) The logger to use for logging the retrieve. Errors are logged to the endpoint logger.
- * @returns {any} The value of the attribute, or undefined if the attribute is not found.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getAttribute(endpoint, cluster, attribute, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {
@@ -469,16 +424,6 @@ export function getAttribute(endpoint, cluster, attribute, log) {
     log?.info(`${db}Get endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db} value ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
     return value;
 }
-/**
- * Sets the value of an attribute on a cluster server.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to set the attribute on.
- * @param {Behavior.Type | ClusterType | ClusterId | string} cluster - The cluster to set the attribute on.
- * @param {string} attribute - The name of the attribute.
- * @param {boolean | number | bigint | string | object | null} value - The value to set for the attribute.
- * @param {AnsiLogger} [log] - (Optional) The logger to use for logging the set. Errors are logged to the endpoint logger.
- * @returns {Promise<boolean>} - A promise that resolves to a boolean indicating whether the attribute was successfully set.
- */
 export async function setAttribute(endpoint, cluster, attribute, value, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {
@@ -504,16 +449,6 @@ export async function setAttribute(endpoint, cluster, attribute, value, log) {
         `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
     return true;
 }
-/**
- * Sets the value of an attribute on a cluster server.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to update the attribute on.
- * @param {Behavior.Type | ClusterType | ClusterId | string} cluster - The cluster to update the attribute on.
- * @param {string} attribute - The name of the attribute.
- * @param {boolean | number | bigint | string | object | null} value - The value to set for the attribute.
- * @param {AnsiLogger} [log] - (Optional) The logger to use for logging the update. Errors are logged to the endpoint logger.
- * @returns {Promise<boolean>} - A promise that resolves to a boolean indicating whether the attribute was successfully set.
- */
 export async function updateAttribute(endpoint, cluster, attribute, value, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {
@@ -544,17 +479,6 @@ export async function updateAttribute(endpoint, cluster, attribute, value, log)
         `to ${YELLOW}${value !== null && typeof value === 'object' ? debugStringify(value) : value}${db}`);
     return true;
 }
-/**
- * Subscribes to the provided attribute on a cluster.
- *
- * @param {MatterbridgeEndpoint} endpoint - The endpoint to subscribe the attribute to.
- * @param {Behavior.Type | ClusterType | ClusterId | string} cluster - The cluster to subscribe the attribute to.
- * @param {string} attribute - The name of the attribute to subscribe to.
- * @param {(newValue: any, oldValue: any) => void} listener - A callback function that will be called when the attribute value changes.
- * @param {AnsiLogger} [log] - Optional logger for logging errors and information.
- * @returns {boolean} - A boolean indicating whether the subscription was successful.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function subscribeAttribute(endpoint, cluster, attribute, listener, log) {
     const clusterName = getBehavior(endpoint, cluster)?.id;
     if (!clusterName) {
@@ -565,7 +489,6 @@ export async function subscribeAttribute(endpoint, cluster, attribute, listener,
         endpoint.log.debug(`subscribeAttribute ${hk}${clusterName}.${attribute}${db}: Endpoint ${or}${endpoint.maybeId}${db}:${or}${endpoint.maybeNumber}${db} is in the ${BLUE}${endpoint.construction.status}${db} state`);
         await endpoint.construction.ready;
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const events = endpoint.events;
     attribute = lowercaseFirstLetter(attribute) + '$Changed';
     if (!(clusterName in events) || !(attribute in events[clusterName])) {
@@ -576,11 +499,6 @@ export async function subscribeAttribute(endpoint, cluster, attribute, listener,
     log?.info(`${db}Subscribed endpoint ${or}${endpoint.id}${db}:${or}${endpoint.number}${db} attribute ${hk}${capitalizeFirstLetter(clusterName)}${db}.${hk}${attribute}${db}`);
     return true;
 }
-/**
- * Get the default TemperatureMeasurement cluster server options.
- *
- * @param {number} measuredValue - The measured value of the temperature x 100.
- */
 export function getDefaultTemperatureMeasurementClusterServer(measuredValue = 0) {
     return optionsFor(TemperatureMeasurementServer, {
         measuredValue,
@@ -589,11 +507,6 @@ export function getDefaultTemperatureMeasurementClusterServer(measuredValue = 0)
         tolerance: 0,
     });
 }
-/**
- * Get the default RelativeHumidityMeasurement cluster server options.
- *
- * @param {number} measuredValue - The measured value of the relative humidity x 100.
- */
 export function getDefaultRelativeHumidityMeasurementClusterServer(measuredValue = 0) {
     return optionsFor(RelativeHumidityMeasurementServer, {
         measuredValue,
@@ -602,11 +515,6 @@ export function getDefaultRelativeHumidityMeasurementClusterServer(measuredValue
         tolerance: 0,
     });
 }
-/**
- * Get the default PressureMeasurement cluster server options.
- *
- * @param {number} measuredValue - The measured value for the pressure.
- */
 export function getDefaultPressureMeasurementClusterServer(measuredValue = 1000) {
     return optionsFor(PressureMeasurementServer, {
         measuredValue,
@@ -615,11 +523,6 @@ export function getDefaultPressureMeasurementClusterServer(measuredValue = 1000)
         tolerance: 0,
     });
 }
-/**
- * Get the default IlluminanceMeasurement cluster server options.
- *
- * @param {number} measuredValue - The measured value of illuminance.
- */
 export function getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0) {
     return optionsFor(IlluminanceMeasurementServer, {
         measuredValue,
@@ -628,11 +531,6 @@ export function getDefaultIlluminanceMeasurementClusterServer(measuredValue = 0)
         tolerance: 0,
     });
 }
-/**
- * Get the default FlowMeasurement cluster server options.
- *
- * @param {number} measuredValue - The measured value of the flow in 10 x m3/h.
- */
 export function getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
     return optionsFor(FlowMeasurementServer, {
         measuredValue,
@@ -641,11 +539,6 @@ export function getDefaultFlowMeasurementClusterServer(measuredValue = 0) {
         tolerance: 0,
     });
 }
-/**
- * Get the default OccupancySensing cluster server options.
- *
- * @param {boolean} occupied - A boolean indicating whether the occupancy is occupied or not. Default is false.
- */
 export function getDefaultOccupancySensingClusterServer(occupied = false) {
     return optionsFor(OccupancySensingServer, {
         occupancy: { occupied },
@@ -654,4 +547,3 @@ export function getDefaultOccupancySensingClusterServer(occupied = false) {
         pirOccupiedToUnoccupiedDelay: 30,
     });
 }
-//# sourceMappingURL=matterbridgeEndpointHelpers.js.map

package/dist/matterbridgePlatform.js

@@ -1,65 +1,30 @@
-/**
- * This file contains the class MatterbridgeAccessoryPlatform.
- *
- * @file matterbridgePlatform.ts
- * @author Luca Liguori
- * @date 2024-03-21
- * @version 1.1.0
- *
- * Copyright 2024, 2025, 2026 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. *
- */
 import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
 import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
-// AnsiLogger module
 import { CYAN, db, er, nf, wr } from './logger/export.js';
-// Storage module
 import { NodeStorageManager } from './storage/export.js';
-// Node.js module
 import path from 'path';
-/**
- * Represents the base Matterbridge platform. It is extended by the MatterbridgeAccessoryPlatform and MatterbridgeServicePlatform classes.
- *
- */
 export class MatterbridgePlatform {
     matterbridge;
     log;
     config = {};
-    name = ''; // Will be set by the loadPlugin() method using the package.json value.
-    type = ''; // Will be set by the extending classes.
-    version = '1.0.0'; // Will be set by the loadPlugin() method using the package.json value.
-    // Platform storage
+    name = '';
+    type = '';
+    version = '1.0.0';
     storage;
     context;
-    // Device and entity selection
     selectDevice = new Map();
     selectEntity = new Map();
-    // Registered devices
-    registeredEndpoints = new Map(); // uniqueId, MatterbridgeEndpoint
-    registeredEndpointsByName = new Map(); // deviceName, MatterbridgeEndpoint
-    /**
-     * Creates an instance of the base MatterbridgePlatform. It is extended by the MatterbridgeAccessoryPlatform and MatterbridgeServicePlatform classes.
-     * @param {Matterbridge} matterbridge - The Matterbridge instance.
-     * @param {AnsiLogger} log - The logger instance.
-     * @param {PlatformConfig} config - The platform configuration.
-     */
+    contextReady;
+    selectDeviceContextReady;
+    selectEntityContextReady;
+    ready;
+    registeredEndpoints = new Map();
+    registeredEndpointsByName = new Map();
     constructor(matterbridge, log, config) {
         this.matterbridge = matterbridge;
         this.log = log;
         this.config = config;
-        // create the NodeStorageManager for the plugin platform
-        if (!isValidString(this.config.name))
+        if (!isValidString(this.config.name) || this.config.name === '')
             return;
         this.log.debug(`Creating storage for plugin ${this.config.name} in ${path.join(this.matterbridge.matterbridgeDirectory, this.config.name)}`);
         this.storage = new NodeStorageManager({
@@ -69,64 +34,69 @@ export class MatterbridgePlatform {
             logging: false,
             forgiveParseErrors: true,
         });
+        this.log.debug(`Creating context for plugin ${this.config.name}`);
+        this.contextReady = this.storage.createStorage('context').then((context) => {
+            this.context = context;
+            this.log.debug(`Created context for plugin ${this.config.name}`);
+            return context;
+        });
+        this.log.debug(`Loading selectDevice for plugin ${this.config.name}`);
+        this.selectDeviceContextReady = this.storage.createStorage('selectDevice').then(async (context) => {
+            const selectDevice = await context.get('selectDevice', []);
+            for (const device of selectDevice)
+                this.selectDevice.set(device.serial, device);
+            this.log.debug(`Loaded ${this.selectDevice.size} selectDevice for plugin ${this.config.name}`);
+        });
+        this.log.debug(`Loading selectEntity for plugin ${this.config.name}`);
+        this.selectEntityContextReady = this.storage.createStorage('selectEntity').then(async (context) => {
+            const selectEntity = await context.get('selectEntity', []);
+            for (const entity of selectEntity)
+                this.selectEntity.set(entity.name, entity);
+            this.log.debug(`Loaded ${this.selectEntity.size} selectEntity for plugin ${this.config.name}`);
+        });
+        this.ready = Promise.all([this.contextReady, this.selectDeviceContextReady, this.selectEntityContextReady]).then(() => {
+            this.log.debug(`MatterbridgePlatform for plugin ${this.config.name} is fully initialized`);
+        });
     }
-    /**
-     * This method must be overridden in the extended class.
-     * It is called when the platform is started.
-     * Use this method to create the MatterbridgeDevice and call this.registerDevice().
-     * @param {string} [reason] - The reason for starting.
-     * @throws {Error} - Throws an error if the method is not overridden.
-     */
     async onStart(reason) {
         this.log.error('Plugins must override onStart.', reason);
         throw new Error('Plugins must override onStart.');
     }
-    /**
-     * This method can be overridden in the extended class. Call super.onConfigure() to run checkEndpointNumbers().
-     * It is called after the platform has been commissioned.
-     * Use this method to perform any configuration of your devices.
-     */
     async onConfigure() {
         this.log.debug(`Configuring platform ${this.name}`);
         await this.checkEndpointNumbers();
     }
-    /**
-     * This method can be overridden in the extended class. Call super.onShutdown() to run checkEndpointNumbers() and cleanup memory.
-     * It is called when the platform is shutting down.
-     * Use this method to clean up any resources.
-     * @param {string} [reason] - The reason for shutting down.
-     */
     async onShutdown(reason) {
         this.log.debug(`Shutting down platform ${this.name}`, reason);
+        if (this.storage) {
+            this.log.debug(`Saving ${this.selectDevice.size} selectDevice...`);
+            const selectDevice = await this.storage.createStorage('selectDevice');
+            await selectDevice.set('selectDevice', Array.from(this.selectDevice.values()));
+            await selectDevice.close();
+            this.log.debug(`Saving ${this.selectEntity.size} selectEntity...`);
+            const selectEntity = await this.storage.createStorage('selectEntity');
+            await selectEntity.set('selectEntity', Array.from(this.selectEntity.values()));
+            await selectEntity.close();
+        }
         await this.checkEndpointNumbers();
         this.selectDevice.clear();
         this.selectEntity.clear();
         this.registeredEndpoints.clear();
         this.registeredEndpointsByName.clear();
+        this.contextReady = undefined;
+        this.selectDeviceContextReady = undefined;
+        this.selectEntityContextReady = undefined;
         await this.context?.close();
         this.context = undefined;
         await this.storage?.close();
         this.storage = undefined;
     }
-    /**
-     * Sets the logger level and logs a debug message indicating that the plugin doesn't override this method.
-     * @param {LogLevel} logLevel The new logger level.
-     */
     async onChangeLoggerLevel(logLevel) {
         this.log.debug(`The plugin doesn't override onChangeLoggerLevel. Logger level set to: ${logLevel}`);
     }
-    /**
-     * Check if a device with this name is already registered in the platform.
-     * @param {string} deviceName - The device name to check.
-     * @returns {boolean} True if the device is already registered, false otherwise.
-     */
     hasDeviceName(deviceName) {
         return this.registeredEndpointsByName.has(deviceName);
     }
-    /**
-     * Registers a device with the Matterbridge platform.
-     * @param {MatterbridgeEndpoint} device - The device to register.
-     */
     async registerDevice(device) {
         device.plugin = this.name;
         if (device.deviceName && this.registeredEndpointsByName.has(device.deviceName)) {
@@ -142,10 +112,6 @@ export class MatterbridgePlatform {
         if (device.deviceName)
             this.registeredEndpointsByName.set(device.deviceName, device);
     }
-    /**
-     * Unregisters a device registered with the Matterbridge platform.
-     * @param {MatterbridgeEndpoint} device - The device to unregister.
-     */
     async unregisterDevice(device) {
         await this.matterbridge.removeBridgedEndpoint(this.name, device);
         if (device.uniqueId)
@@ -153,19 +119,11 @@ export class MatterbridgePlatform {
         if (device.deviceName)
             this.registeredEndpointsByName.delete(device.deviceName);
     }
-    /**
-     * Unregisters all devices registered with the Matterbridge platform.
-     */
     async unregisterAllDevices() {
         await this.matterbridge.removeAllBridgedEndpoints(this.name);
         this.registeredEndpoints.clear();
         this.registeredEndpointsByName.clear();
     }
-    /**
-     * Verifies if the Matterbridge version meets the required version.
-     * @param {string} requiredVersion - The required version to compare against.
-     * @returns {boolean} True if the Matterbridge version meets or exceeds the required version, false otherwise.
-     */
     verifyMatterbridgeVersion(requiredVersion) {
         const compareVersions = (matterbridgeVersion, requiredVersion) => {
             const stripTag = (v) => {
@@ -190,21 +148,9 @@ export class MatterbridgePlatform {
             return false;
         return true;
     }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions. Use validateDevice instead.
-     */
     validateDeviceWhiteBlackList(device, log = true) {
         return this.validateDevice(device, log);
     }
-    /**
-     * Validates if a device is allowed based on the whitelist and blacklist configurations.
-     * The blacklist has priority over the whitelist.
-     *
-     * @param {string | string[]} device - The device name(s) to validate.
-     * @param {boolean} [log=true] - Whether to log the validation result.
-     * @returns {boolean} - Returns true if the device is allowed, false otherwise.
-     *
-     */
     validateDevice(device, log = true) {
         if (!Array.isArray(device))
             device = [device];
@@ -234,21 +180,9 @@ export class MatterbridgePlatform {
             this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because not in whitelist`);
         return false;
     }
-    /**
-     * @deprecated This method is deprecated and will be removed in future versions. Use validateEntity instead.
-     */
     validateEntityBlackList(device, entity, log = true) {
         return this.validateEntity(device, entity, log);
     }
-    /**
-     * Validates if an entity is allowed based on the entity blacklist and device-entity blacklist configurations.
-     *
-     * @param {string} device - The device to which the entity belongs.
-     * @param {string} entity - The entity to validate.
-     * @param {boolean} [log=true] - Whether to log the validation result.
-     * @returns {boolean} - Returns true if the entity is allowed, false otherwise.
-     *
-     */
     validateEntity(device, entity, log = true) {
         if (isValidArray(this.config.entityBlackList, 1) && this.config.entityBlackList.find((e) => e === entity)) {
             if (log)
@@ -267,20 +201,11 @@ export class MatterbridgePlatform {
         }
         return true;
     }
-    /**
-     * Checks and updates the endpoint numbers for Matterbridge devices.
-     *
-     * This method retrieves the list of Matterbridge devices and their child endpoints,
-     * compares their current endpoint numbers with the stored ones, and updates the storage
-     * if there are any changes. It logs the changes and updates the endpoint numbers accordingly.
-     *
-     * @returns {Promise<number>} The size of the updated endpoint map, or -1 if storage is not available.
-     */
     async checkEndpointNumbers() {
         if (!this.storage)
             return -1;
         this.log.debug('Checking endpoint numbers...');
-        const context = await this.storage.createStorage('context');
+        const context = await this.storage.createStorage('endpointNumbers');
         const separator = '|.|';
         const endpointMap = new Map(await context.get('endpointMap', []));
         for (const device of this.matterbridge.getDevices().filter((d) => d.plugin === this.name)) {
@@ -297,22 +222,22 @@ export class MatterbridgePlatform {
                 endpointMap.set(device.uniqueId, device.maybeNumber);
             }
             for (const child of device.getChildEndpoints()) {
-                const childId = child.id;
-                if (!childId || !child.maybeNumber)
+                if (!child.maybeId || !child.maybeNumber)
                     continue;
-                if (endpointMap.has(device.uniqueId + separator + childId) && endpointMap.get(device.uniqueId + separator + childId) !== child.maybeNumber) {
-                    this.log.warn(`Child endpoint number for device ${CYAN}${device.deviceName}${wr}.${CYAN}${childId}${wr} changed from ${CYAN}${endpointMap.get(device.uniqueId + separator + childId)}${wr} to ${CYAN}${child.maybeNumber}${wr}`);
-                    endpointMap.set(device.uniqueId + separator + childId, child.maybeNumber);
+                if (endpointMap.has(device.uniqueId + separator + child.id) && endpointMap.get(device.uniqueId + separator + child.id) !== child.maybeNumber) {
+                    this.log.warn(`Child endpoint number for device ${CYAN}${device.deviceName}${wr}.${CYAN}${child.id}${wr} changed from ${CYAN}${endpointMap.get(device.uniqueId + separator + child.id)}${wr} to ${CYAN}${child.maybeNumber}${wr}`);
+                    endpointMap.set(device.uniqueId + separator + child.id, child.maybeNumber);
                 }
-                if (!endpointMap.has(device.uniqueId + separator + childId)) {
-                    this.log.debug(`Setting child endpoint number for device ${CYAN}${device.uniqueId}${db}.${CYAN}${childId}${db} to ${CYAN}${child.maybeNumber}${db}`);
-                    endpointMap.set(device.uniqueId + separator + childId, child.maybeNumber);
+                if (!endpointMap.has(device.uniqueId + separator + child.id)) {
+                    this.log.debug(`Setting child endpoint number for device ${CYAN}${device.uniqueId}${db}.${CYAN}${child.id}${db} to ${CYAN}${child.maybeNumber}${db}`);
+                    endpointMap.set(device.uniqueId + separator + child.id, child.maybeNumber);
                 }
             }
         }
+        this.log.debug('Saving endpointNumbers...');
         await context.set('endpointMap', Array.from(endpointMap.entries()));
+        await context.close();
         this.log.debug('Endpoint numbers check completed.');
         return endpointMap.size;
     }
 }
-//# sourceMappingURL=matterbridgePlatform.js.map

package/dist/matterbridgeTypes.js

@@ -1,27 +1,3 @@
-/**
- * This file contains the types for Matterbridge.
- *
- * @file matterbridgeTypes.ts
- * @author Luca Liguori
- * @date 2024-07-12
- * @version 1.0.2
- *
- * Copyright 2023, 2024, 2025 Luca Liguori.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License. *
- */
-// Default colors
 export const plg = '\u001B[38;5;33m';
 export const dev = '\u001B[38;5;79m';
 export const typ = '\u001B[38;5;207m';
-//# sourceMappingURL=matterbridgeTypes.js.map