matterbridge 1.6.8-dev.2 → 1.6.8-dev.20

package/dist/matterbridgePlatform.js

@@ -1,91 +1,48 @@
-/**
- * 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 { MatterbridgeDevice } from './matterbridgeDevice.js';
-// AnsiLogger module
-import { CYAN, nf } from 'node-ansi-logger';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
-import { isValidArray, isValidObject } from './utils/utils.js';
-/**
- * Represents the base Matterbridge platform.
- *
- */
+import { isValidArray, isValidObject, isValidString } from './utils/utils.js';
+import { CYAN, db, nf, wr } from 'node-ansi-logger';
+import { NodeStorageManager } from 'node-persist-manager';
+import path from 'path';
 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 = ''; // Will be set by the loadPlugin() method using the package.json value.
-    /**
-     * Creates an instance of the base MatterbridgePlatform.
-     * @param {Matterbridge} matterbridge - The Matterbridge instance.
-     * @param {AnsiLogger} log - The logger instance.
-     * @param {PlatformConfig} config - The platform configuration.
-     */
+    name = '';
+    type = '';
+    version = '';
+    storage;
+    context;
     constructor(matterbridge, log, config) {
         this.matterbridge = matterbridge;
         this.log = log;
         this.config = config;
+        if (!isValidString(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({
+            dir: path.join(this.matterbridge.matterbridgeDirectory, this.config.name),
+            writeQueue: false,
+            expiredInterval: undefined,
+            logging: false,
+            forgiveParseErrors: true,
+        });
     }
-    /**
-     * 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.
-     * It is called after the platform has been commissioned.
-     * Use this method to perform any configuration of your devices.
-     */
     async onConfigure() {
-        this.log.debug("The plugin doesn't override onConfigure.");
+        this.log.debug(`Configuring platform ${this.name}`);
+        await this.checkEndpointNumbers();
     }
-    /**
-     * This method can be overridden in the extended class.
-     * 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("The plugin doesn't override onShutdown.", reason);
+        this.log.debug(`Shutting down platform ${this.name}`, reason);
+        await this.checkEndpointNumbers();
     }
-    /**
-     * 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}`);
     }
-    /**
-     * Registers a device with the Matterbridge platform.
-     * @param {MatterbridgeDevice} device - The device to register.
-     */
     async registerDevice(device) {
         device.plugin = this.name;
         if (device instanceof MatterbridgeDevice)
@@ -93,30 +50,18 @@ export class MatterbridgePlatform {
         if (device instanceof MatterbridgeEndpoint)
             await this.matterbridge.addBridgedEndpoint(this.name, device);
     }
-    /**
-     * Unregisters a device registered with the Matterbridge platform.
-     * @param {MatterbridgeDevice} device - The device to unregister.
-     */
     async unregisterDevice(device) {
         if (device instanceof MatterbridgeDevice)
             await this.matterbridge.removeBridgedDevice(this.name, device);
         if (device instanceof MatterbridgeEndpoint)
             await this.matterbridge.removeBridgedEndpoint(this.name, device);
     }
-    /**
-     * Unregisters all devices registered with the Matterbridge platform.
-     */
     async unregisterAllDevices() {
         if (this.matterbridge.edge)
             await this.matterbridge.removeAllBridgedEndpoints(this.name);
         else
             await this.matterbridge.removeAllBridgedDevices(this.name);
     }
-    /**
-     * 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) => {
@@ -141,14 +86,6 @@ export class MatterbridgePlatform {
             return false;
         return true;
     }
-    /**
-     * 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.
-     */
     validateDeviceWhiteBlackList(device, log = true) {
         if (!Array.isArray(device))
             device = [device];
@@ -178,20 +115,20 @@ export class MatterbridgePlatform {
             this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because not in whitelist`);
         return false;
     }
-    /**
-     * 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) {
+        return this.validateEntityBlackList(device, entity, log);
+    }
     validateEntityBlackList(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`);
             return false;
         }
+        if (isValidArray(this.config.entityWhiteList, 1) && !this.config.entityWhiteList.find((e) => e === entity)) {
+            if (log)
+                this.log.info(`Skipping entity ${CYAN}${entity}${nf} because not in entityWhiteList`);
+            return false;
+        }
         if (isValidObject(this.config.deviceEntityBlackList, 1) && device in this.config.deviceEntityBlackList && this.config.deviceEntityBlackList[device].includes(entity)) {
             if (log)
                 this.log.info(`Skipping entity ${CYAN}${entity}${nf} for device ${CYAN}${device}${nf} because in deviceEntityBlackList`);
@@ -199,5 +136,42 @@ export class MatterbridgePlatform {
         }
         return true;
     }
+    async checkEndpointNumbers() {
+        if (!this.storage)
+            return -1;
+        this.log.debug('Checking endpoint numbers...');
+        const context = await this.storage.createStorage('context');
+        const separator = '|.|';
+        const endpointMap = new Map(await context.get('endpointMap', []));
+        for (const device of this.matterbridge.getDevices().filter((d) => d.plugin === this.name)) {
+            if (device.uniqueId === undefined || device.maybeNumber === undefined) {
+                this.log.debug(`Not checking device ${device.deviceName} without uniqueId or maybeNumber`);
+                continue;
+            }
+            if (endpointMap.has(device.uniqueId) && endpointMap.get(device.uniqueId) !== device.maybeNumber) {
+                this.log.warn(`Endpoint number for device ${CYAN}${device.uniqueId}${wr} changed from ${CYAN}${endpointMap.get(device.uniqueId)}${wr} to ${CYAN}${device.maybeNumber}${wr}`);
+                endpointMap.set(device.uniqueId, device.maybeNumber);
+            }
+            if (!endpointMap.has(device.uniqueId)) {
+                this.log.debug(`Setting endpoint number for device ${CYAN}${device.uniqueId}${db} to ${CYAN}${device.maybeNumber}${db}`);
+                endpointMap.set(device.uniqueId, device.maybeNumber);
+            }
+            for (const child of device.getChildEndpoints()) {
+                const childId = child instanceof MatterbridgeEndpoint ? child.id : child.uniqueStorageKey;
+                if (!childId || !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.uniqueId}${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 + 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);
+                }
+            }
+        }
+        await context.set('endpointMap', Array.from(endpointMap.entries()));
+        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

package/dist/matterbridgeWebsocket.js

@@ -1,54 +1,10 @@
-/**
- * This file contains the function matterbridgeMessageHandler.
- *
- * @file matterbridgeWebsocket.ts
- * @author Luca Liguori
- * @date 2024-10-16
- * @version 1.0.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 { isValidNumber, isValidObject, isValidString } from './utils/utils.js';
-// AnsiLogger module
 import { debugStringify } from 'node-ansi-logger';
-// @matter
 import { Logger } from '@matter/main';
 import { BasicInformationCluster, BridgedDeviceBasicInformationCluster } from '@matter/main/clusters';
-/**
- * Websocket message ID for logging.
- * @constant {number}
- */
 export const WS_ID_LOG = 0;
-/**
- * Websocket message ID indicating a refresh is needed.
- * @constant {number}
- */
 export const WS_ID_REFRESH_NEEDED = 1;
-/**
- * Websocket message ID indicating a restart is needed.
- * @constant {number}
- */
 export const WS_ID_RESTART_NEEDED = 2;
-/**
- * Handles incoming websocket messages for the Matterbridge.
- *
- * @param {Matterbridge} this - The Matterbridge instance.
- * @param {WebSocket} client - The websocket client that sent the message.
- * @param {WebSocket.RawData} message - The raw data of the message received from the client.
- * @returns {Promise<void>} A promise that resolves when the message has been handled.
- */
 export async function wsMessageHandler(client, message) {
     let data;
     try {
@@ -188,4 +144,3 @@ export async function wsMessageHandler(client, message) {
         return;
     }
 }
-//# sourceMappingURL=matterbridgeWebsocket.js.map