matterbridge 1.6.6-dev.13 → 1.6.6-dev.14

package/dist/matterbridge.js

@@ -2335,7 +2335,7 @@ export class Matterbridge extends EventEmitter {
         });
         this.expressApp.get('/api/devices', (req, res) => {
             this.log.debug('The frontend sent /api/devices');
-            const data = [];
+            const devices = [];
             this.devices.forEach(async (device) => {
                 const pluginName = device.plugin ?? 'Unknown';
                 if (this.edge)
@@ -2353,7 +2353,7 @@ export class Matterbridge extends EventEmitter {
                 if (!uniqueId)
                     uniqueId = device.getClusterServer(BridgedDeviceBasicInformationCluster)?.attributes.uniqueId?.getLocal() ?? 'Unknown';
                 const cluster = this.getClusterTextFromDevice(device);
-                data.push({
+                devices.push({
                     pluginName,
                     type: device.name + ' (0x' + device.deviceType.toString(16).padStart(4, '0') + ')',
                     endpoint: device.number,
@@ -2365,7 +2365,7 @@ export class Matterbridge extends EventEmitter {
                     cluster: cluster,
                 });
             });
-            res.json(data);
+            res.json(devices);
         });
         this.expressApp.get('/api/devices_clusters/:selectedPluginName/:selectedDeviceEndpoint', (req, res) => {
             const selectedPluginName = req.params.selectedPluginName;

package/dist/matterbridgePlatform.js

@@ -71,17 +71,33 @@ export class MatterbridgePlatform {
         return true;
     }
     validateDeviceWhiteBlackList(device, log = true) {
-        if (isValidArray(this.config.whiteList, 1) && !this.config.whiteList.includes(device)) {
+        if (!Array.isArray(device))
+            device = [device];
+        let blackListBlocked = 0;
+        if (isValidArray(this.config.blackList, 1)) {
+            for (const d of device)
+                if (this.config.blackList.includes(d))
+                    blackListBlocked++;
+        }
+        if (blackListBlocked > 0) {
             if (log)
-                this.log.info(`Skipping device ${CYAN}${device}${nf} because not in whitelist`);
+                this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because in blacklist`);
             return false;
         }
-        if (isValidArray(this.config.blackList, 1) && this.config.blackList.includes(device)) {
+        let whiteListPassed = 0;
+        if (isValidArray(this.config.whiteList, 1)) {
+            for (const d of device)
+                if (this.config.whiteList.includes(d))
+                    whiteListPassed++;
+        }
+        else
+            whiteListPassed++;
+        if (whiteListPassed > 0) {
             if (log)
-                this.log.info(`Skipping device ${CYAN}${device}${nf} because in blacklist`);
-            return false;
+                this.log.info(`Skipping device ${CYAN}${device.join(', ')}${nf} because not in whitelist`);
+            return true;
         }
-        return true;
+        return false;
     }
     validateEntityBlackList(device, entity, log = true) {
         if (isValidArray(this.config.entityBlackList, 1) && this.config.entityBlackList.find((e) => e === entity)) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "matterbridge",
-  "version": "1.6.6-dev.13",
+  "version": "1.6.6-dev.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge",
-      "version": "1.6.6-dev.13",
+      "version": "1.6.6-dev.14",
       "license": "Apache-2.0",
       "dependencies": {
         "@matter/main": "^0.11.9-alpha.0-20241207-b604cfa44",

package/package.json

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