Matter add option to disable bridge mode (#18992)

Author: s-hadinger

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 ## [13.0.0.1]
 ### Added
 - Command ``Delay -1`` to wait until next second (#18984)
+- Matter add option to disable bridge mode
 
 ### Breaking Changed
 - Berry `bool( [] )` and `bool( {} )` now evaluate as `false` (#18986)

lib/libesp32/berry_matter/src/embedded/Matter_Device.be

@@ -63,6 +63,7 @@ class Matter_Device
   var root_discriminator              # as `int`
   var root_passcode                   # as `int`
   var ipv4only                        # advertize only IPv4 addresses (no IPv6)
+  var disable_bridge_mode             # default is bridge mode, this flag disables this mode for some non-compliant controllers
   var next_ep                         # next endpoint to be allocated for bridge, start at 1
   # context for PBKDF
   var root_iterations                 # PBKDF number of iterations
@@ -92,6 +93,7 @@ class Matter_Device
     self.next_ep = 1                              # start at endpoint 1 for dynamically allocated endpoints
     self.root_salt = crypto.random(16)
     self.ipv4only = false
+    self.disable_bridge_mode = false
     self.load_param()
 
     self.sessions = matter.Session_Store(self)
@@ -628,7 +630,7 @@ class Matter_Device
     import json
     self.update_remotes_info()    # update self.plugins_config_remotes
 
-    var j = format('{"distinguish":%i,"passcode":%i,"ipv4only":%s,"nextep":%i', self.root_discriminator, self.root_passcode, self.ipv4only ? 'true':'false', self.next_ep)
+    var j = format('{"distinguish":%i,"passcode":%i,"ipv4only":%s,"disable_bridge_mode":%s,"nextep":%i', self.root_discriminator, self.root_passcode, self.ipv4only ? 'true':'false', self.disable_bridge_mode ? 'true':'false', self.next_ep)
     if self.plugins_persist
       j += ',"config":'
       j += json.dump(self.plugins_config)
@@ -693,6 +695,7 @@ class Matter_Device
       self.root_discriminator = j.find("distinguish", self.root_discriminator)
       self.root_passcode = j.find("passcode", self.root_passcode)
       self.ipv4only = bool(j.find("ipv4only", false))
+      self.disable_bridge_mode = bool(j.find("disable_bridge_mode", false))
       self.next_ep = j.find("nextep", self.next_ep)
       self.plugins_config = j.find("config")
       if self.plugins_config != nil

lib/libesp32/berry_matter/src/embedded/Matter_Plugin_Device.be

@@ -104,7 +104,7 @@ class Matter_Plugin_Device : Matter_Plugin
           d1.add_TLV(1, TLV.U2, types[dt])      # Revision
         end
         # if fabric is not Alexa
-        if self.NON_BRIDGE_VENDOR.find(session.get_admin_vendor()) == nil
+        if (self.NON_BRIDGE_VENDOR.find(session.get_admin_vendor()) == nil) && (!self.device.disable_bridge_mode)
           var d1 = dtl.add_struct()
           d1.add_TLV(0, TLV.U2, 0x0013)     # DeviceType
           d1.add_TLV(1, TLV.U2, 1)      # Revision

lib/libesp32/berry_matter/src/embedded/Matter_UI.be

@@ -197,6 +197,8 @@ class Matter_UI
     webserver.content_send(f"<input type='number' min='0' max='4095' name='discriminator' value='{self.device.root_discriminator:i}'>")
     var ipv4only_checked = self.device.ipv4only ? " checked" : ""
     webserver.content_send(f"<p><input type='checkbox' name='ipv4'{ipv4only_checked}>IPv4 only</p>")
+    var disable_bridge_mode_checked = self.device.disable_bridge_mode ? " checked" : ""
+    webserver.content_send(f"<p><input type='checkbox' name='nobridge'{disable_bridge_mode_checked}>Disable bridge mode (not recommended)</p>")
     webserver.content_send("<p></p><button name='passcode' class='button bgrn'>Change</button></form></p>"
                            "<p></p></fieldset><p></p>")
 
@@ -755,6 +757,7 @@ class Matter_UI
           self.device.root_discriminator = int(webserver.arg("discriminator"))
         end
         self.device.ipv4only = webserver.arg("ipv4") == 'on'
+        self.device.disable_bridge_mode = webserver.arg("nobridge") == 'on'
         self.device.save_param()
 
         #- and force restart -#