matterbridge 1.6.5 → 1.6.6-dev.13

package/dist/matterbridgePlatform.js

@@ -1,88 +1,32 @@
-/**
- * This file contains the class MatterbridgeAccessoryPlatform.
- *
- * @file matterbridgePlatform.ts
- * @author Luca Liguori
- * @date 2024-03-21
- * @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 { MatterbridgeDevice } from './matterbridgeDevice.js';
+import { CYAN, nf, wr } from 'node-ansi-logger';
 import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
-/**
- * Represents the base Matterbridge platform.
- *
- */
+import { isValidArray, isValidObject } from './utils/utils.js';
 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 = '';
     constructor(matterbridge, log, config) {
         this.matterbridge = matterbridge;
         this.log = log;
         this.config = config;
     }
-    /**
-     * 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 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);
     }
-    /**
-     * 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)
@@ -90,32 +34,23 @@ 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() {
-        await this.matterbridge.removeAllBridgedDevices(this.name);
+        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) => {
                 const parts = v.split('-');
-                return parts.length > 0 ? parts[0] : v;
+                return parts[0];
             };
             const v1Parts = stripTag(matterbridgeVersion).split('.').map(Number);
             const v2Parts = stripTag(requiredVersion).split('.').map(Number);
@@ -135,5 +70,30 @@ export class MatterbridgePlatform {
             return false;
         return true;
     }
+    validateDeviceWhiteBlackList(device, log = true) {
+        if (isValidArray(this.config.whiteList, 1) && !this.config.whiteList.includes(device)) {
+            if (log)
+                this.log.info(`Skipping device ${CYAN}${device}${nf} because not in whitelist`);
+            return false;
+        }
+        if (isValidArray(this.config.blackList, 1) && this.config.blackList.includes(device)) {
+            if (log)
+                this.log.info(`Skipping device ${CYAN}${device}${nf} because in blacklist`);
+            return false;
+        }
+        return true;
+    }
+    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 (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}${wr} for device ${CYAN}${device}${nf} because in deviceEntityBlackList`);
+            return false;
+        }
+        return true;
+    }
 }
-//# 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 {
@@ -125,6 +81,9 @@ export async function wsMessageHandler(client, message) {
             this.matterbridgeInformation.mattermdnsinterface = (await this.nodeContext?.get('mattermdnsinterface', '')) || '';
             this.matterbridgeInformation.matteripv4address = (await this.nodeContext?.get('matteripv4address', '')) || '';
             this.matterbridgeInformation.matteripv6address = (await this.nodeContext?.get('matteripv6address', '')) || '';
+            this.matterbridgeInformation.matterPort = (await this.nodeContext?.get('matterport', 5540)) ?? 5540;
+            this.matterbridgeInformation.matterDiscriminator = await this.nodeContext?.get('matterdiscriminator');
+            this.matterbridgeInformation.matterPasscode = await this.nodeContext?.get('matterpasscode');
             this.matterbridgeInformation.matterbridgePaired = this.matterbridgePaired;
             this.matterbridgeInformation.matterbridgeConnected = this.matterbridgeConnected;
             this.matterbridgeInformation.matterbridgeQrPairingCode = this.matterbridgeQrPairingCode;
@@ -152,6 +111,9 @@ export async function wsMessageHandler(client, message) {
                 let serial = device.getClusterServer(BasicInformationCluster)?.attributes.serialNumber?.getLocal();
                 if (!serial)
                     serial = device.getClusterServer(BridgedDeviceBasicInformationCluster)?.attributes.serialNumber?.getLocal() ?? 'Unknown';
+                let productUrl = device.getClusterServer(BasicInformationCluster)?.attributes.productUrl?.getLocal();
+                if (!productUrl)
+                    productUrl = device.getClusterServer(BridgedDeviceBasicInformationCluster)?.attributes.productUrl?.getLocal() ?? 'Unknown';
                 let uniqueId = device.getClusterServer(BasicInformationCluster)?.attributes.uniqueId?.getLocal();
                 if (!uniqueId)
                     uniqueId = device.getClusterServer(BridgedDeviceBasicInformationCluster)?.attributes.uniqueId?.getLocal() ?? 'Unknown';
@@ -162,6 +124,8 @@ export async function wsMessageHandler(client, message) {
                     endpoint: device.number,
                     name,
                     serial,
+                    productUrl,
+                    configUrl: device.configUrl,
                     uniqueId,
                     cluster: cluster,
                 });
@@ -180,4 +144,3 @@ export async function wsMessageHandler(client, message) {
         return;
     }
 }
-//# sourceMappingURL=matterbridgeWebsocket.js.map