aioble/security: Defer saving of CCCD bond information.

pi-anl · pi-anl · commit 5d3101b776d5 · 2021-12-02T13:14:25.000+11:00
diff --git a/micropython/bluetooth/aioble/aioble/device.py b/micropython/bluetooth/aioble/aioble/device.py
@@ -216,6 +216,7 @@ async def disconnect(self, timeout_ms=2000):
         await self.disconnected(timeout_ms, disconnect=True)
 
     async def disconnected(self, timeout_ms=60000, disconnect=False):
+        from . import security
         if not self.is_connected():
             return
 
@@ -231,6 +232,9 @@ async def disconnected(self, timeout_ms=60000, disconnect=False):
         with DeviceTimeout(None, timeout_ms):
             await self._task
 
+        # Ensure any cached secrets are written to disk
+        security.flush()
+
     # Retrieve a single service matching this uuid.
     async def service(self, uuid, timeout_ms=2000):
         result = None
diff --git a/micropython/bluetooth/aioble/aioble/security.py b/micropython/bluetooth/aioble/aioble/security.py
@@ -82,6 +82,14 @@ def load_secrets(path=None):
         log_warn("No secrets available")
 
 
+# Writes secrets to disk if needed
+def flush():
+    if _modified:
+        schedule(_save_secrets, None)
+    else:
+        print("security flush not needed")
+
+        
 # Call this whenever the secrets dict changes.
 def _save_secrets(arg=None):
     global _modified, _path
@@ -189,8 +197,13 @@ def _security_irq(event, data):
                 log_info("Removed:", addr)
             # Add new value to database
             secrets.append((key, value))
-
-        _log_peers("set_secret")            
+        
+        if sec_type in SEC_TYPES_CCCD:
+            # Don't write immediately for CCCD, queue up for later flush when needed
+            log_info("set_cccd")
+            _modified = True
+        else:            
+            _log_peers("set_secret")            
 
         # Queue up a save (don't synchronously write to flash).
         _modified = True
@@ -248,6 +261,7 @@ def _security_irq(event, data):
 
 def _security_shutdown():
     global _secrets, _modified, _path
+    flush()
     _secrets = {}
     _modified = False
     _path = None
