option to ignore matter devices

homebridge-plugins · Sep 21, 2023 · e1bf886 · e1bf886
1 parent 36c7fb7
commit e1bf886
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - `MINOR` version when a new device type is added, or when a new feature is added that is backwards-compatible
 - `PATCH` version when backwards-compatible bug fixes are implemented
 
+## BETA
+
+### Added
+
+- Option to ignore Matter devices
+
 ## 9.2.6 (2023-09-18)
 
 ⚠️ Note this will be the last version of the plugin to support Node 16.

diff --git a/config.schema.json b/config.schema.json
@@ -60,6 +60,13 @@
         "functionBody": "return (model.username && model.password);"
       }
     },
+    "ignoreMatter": {
+      "type": "boolean",
+      "title": "Ignore Matter Devices",
+      "condition": {
+        "functionBody": "return (model.username && model.password);"
+      }
+    },
     "disableDeviceLogging": {
       "type": "boolean",
       "title": "Disable Device Logging",
@@ -1611,6 +1618,7 @@
     "password",
     "userkey",
     "ignoreHKNative",
+    "ignoreMatter",
     "connection",
     {
       "type": "fieldset",

diff --git a/lib/connection/http.js b/lib/connection/http.js
@@ -13,6 +13,7 @@ export default class {
   constructor(platform) {
     this.ignoredDevices = platform.ignoredDevices;
     this.ignoreHKNative = platform.config.ignoreHKNative;
+    this.ignoreMatter = platform.config.ignoreMatter;
     this.localUUIDs = platform.localUUIDs;
     this.log = platform.log;
     this.password = platform.config.password;
@@ -149,8 +150,9 @@ export default class {
           return;
         }
 
-        // Don't initialise the device if the 'ignore homekit native option' is enabled and hardware matches
         const model = device.deviceType.toUpperCase();
+
+        // Don't initialise the device if the 'ignore homekit native option' is enabled and hardware matches
         if (
           this.ignoreHKNative
           && device.hdwareVersion
@@ -161,6 +163,17 @@ export default class {
           return;
         }
 
+        // Don't initialise the device if the 'ignore matter option' is enabled and hardware matches
+        if (
+          this.ignoreMatter
+          && device.hdwareVersion
+          && Array.isArray(platformConsts.matterHardware[model])
+          && platformConsts.matterHardware[model].includes(device.hdwareVersion.charAt(0))
+        ) {
+          this.log('[%s] %s.', device.devName, platformLang.noInitMatterIgnore);
+          return;
+        }
+
         // Add the device to the return array for the plugin to initialise as a cloud device
         toReturn.push(device);
       });

diff --git a/lib/platform.js b/lib/platform.js
@@ -242,6 +242,7 @@ export default class {
         }
         case 'disableDeviceLogging':
         case 'ignoreHKNative':
+        case 'ignoreMatter':
           if (typeof val === 'string') {
             logQuotes(key);
           }

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
@@ -5,6 +5,7 @@ export default {
     password: '',
     userkey: '',
     ignoreHKNative: false,
+    ignoreMatter: false,
     connection: 'hybrid',
     domain: 'iot.meross.com',
     disableDeviceLogging: false,
@@ -328,6 +329,10 @@ export default {
     SP425EW: ['4'], // MSS425E
   },
 
+  matterHardware: {
+    MSS315: ['9'], // https://github.com/bwp91/homebridge-meross/issues/537
+  },
+
   noLocalControl: ['MSH300', 'MSH300HK'],
 
   httpRetryCodes: ['ENOTFOUND', 'ETIMEDOUT', 'EAI_AGAIN', 'ECONNABORTED'],

diff --git a/lib/utils/lang-en.js b/lib/utils/lang-en.js
@@ -72,6 +72,7 @@ export default {
   noHybridMode: 'cloud control is forced',
   noInitHKIgnore: 'not initialising cloud device as matched as HomeKit native model',
   noInitIgnore: 'not initialising cloud device as ignored or configured locally',
+  noInitMatterIgnore: 'not initialising cloud device as matched as Matter model',
   noIP: 'no IP address provided for device',
   noResponse: 'no response received from Meross server',
   notAuth: 'not authenticated',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   },
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^16.20.2 || ^18.17.1 || ^20.5.1"
+    "node": "^16.20.2 || ^18.18.0 || ^20.7.0"
   },
   "repository": {
     "type": "git",