Teardown bluetooth phoneAPI better and fix client notification issue (#4834)

* Teardown bluetooth phoneAPI better and fix client notification issue

* Fix client notification draining

src/mesh/MeshService.h

@@ -92,6 +92,9 @@ class MeshService
     /// Return the next MqttClientProxyMessage packet destined to the phone.
     meshtastic_MqttClientProxyMessage *getMqttClientProxyMessageForPhone() { return toPhoneMqttProxyQueue.dequeuePtr(0); }
 
+    /// Return the next ClientNotification packet destined to the phone.
+    meshtastic_ClientNotification *getClientNotificationForPhone() { return toPhoneClientNotificationQueue.dequeuePtr(0); }
+
     // search the queue for a request id and return the matching nodenum
     NodeNum getNodenumFromRequestId(uint32_t request_id);
 

src/mesh/PhoneAPI.cpp

@@ -62,9 +62,11 @@ void PhoneAPI::handleStartConfig()
 
 void PhoneAPI::close()
 {
+    LOG_INFO("PhoneAPI::close()\n");
+
     if (state != STATE_SEND_NOTHING) {
         state = STATE_SEND_NOTHING;
-
+        resetReadIndex();
         unobserve(&service->fromNumChanged);
 #ifdef FSCom
         unobserve(&xModem.packetReady);
@@ -72,8 +74,17 @@ void PhoneAPI::close()
         releasePhonePacket(); // Don't leak phone packets on shutdown
         releaseQueueStatusPhonePacket();
         releaseMqttClientProxyPhonePacket();
-
+        releaseClientNotification();
         onConnectionChanged(false);
+        fromRadioScratch = {};
+        toRadioScratch = {};
+        nodeInfoForPhone = {};
+        packetForPhone = NULL;
+        filesManifest.clear();
+        fromRadioNum = 0;
+        config_nonce = 0;
+        config_state = 0;
+        pauseBluetoothLogging = false;
     }
 }
 
@@ -405,6 +416,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             fromRadioScratch.which_payload_variant = meshtastic_FromRadio_xmodemPacket_tag;
             fromRadioScratch.xmodemPacket = xmodemPacketForPhone;
             xmodemPacketForPhone = meshtastic_XModem_init_zero;
+        } else if (clientNotification) {
+            fromRadioScratch.which_payload_variant = meshtastic_FromRadio_clientNotification_tag;
+            fromRadioScratch.clientNotification = *clientNotification;
+            releaseClientNotification();
         } else if (packetForPhone) {
             printPacket("phone downloaded packet", packetForPhone);
 
@@ -444,13 +459,6 @@ void PhoneAPI::sendConfigComplete()
     pauseBluetoothLogging = false;
 }
 
-void PhoneAPI::handleDisconnect()
-{
-    filesManifest.clear();
-    pauseBluetoothLogging = false;
-    LOG_INFO("PhoneAPI disconnect\n");
-}
-
 void PhoneAPI::releasePhonePacket()
 {
     if (packetForPhone) {
@@ -475,6 +483,14 @@ void PhoneAPI::releaseMqttClientProxyPhonePacket()
     }
 }
 
+void PhoneAPI::releaseClientNotification()
+{
+    if (clientNotification) {
+        service->releaseClientNotificationToPool(clientNotification);
+        clientNotification = NULL;
+    }
+}
+
 /**
  * Return true if we have data available to send to the phone
  */
@@ -509,7 +525,9 @@ bool PhoneAPI::available()
             queueStatusPacketForPhone = service->getQueueStatusForPhone();
         if (!mqttClientProxyMessageForPhone)
             mqttClientProxyMessageForPhone = service->getMqttClientProxyMessageForPhone();
-        bool hasPacket = !!queueStatusPacketForPhone || !!mqttClientProxyMessageForPhone;
+        if (!clientNotification)
+            clientNotification = service->getClientNotificationForPhone();
+        bool hasPacket = !!queueStatusPacketForPhone || !!mqttClientProxyMessageForPhone || !!clientNotification;
         if (hasPacket)
             return true;
 
@@ -552,7 +570,6 @@ void PhoneAPI::sendNotification(meshtastic_LogRecord_Level level, uint32_t reply
     cn->time = getValidTime(RTCQualityFromNet);
     strncpy(cn->message, message, sizeof(cn->message));
     service->sendClientNotification(cn);
-    delete cn;
 }
 
 /**

src/mesh/PhoneAPI.h

@@ -147,11 +147,6 @@ class PhoneAPI
      */
     virtual void onNowHasData(uint32_t fromRadioNum) {}
 
-    /**
-     * Subclasses can use this to find out when a client drops the link
-     */
-    virtual void handleDisconnect();
-
   private:
     void releasePhonePacket();
 
@@ -159,6 +154,8 @@ class PhoneAPI
 
     void releaseMqttClientProxyPhonePacket();
 
+    void releaseClientNotification();
+
     /// begin a new connection
     void handleStartConfig();
 

src/nimble/NimbleBluetooth.cpp

@@ -124,7 +124,14 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         }
     }
 
-    virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc) { LOG_INFO("BLE disconnect\n"); }
+    virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
+    {
+        LOG_INFO("BLE disconnect\n");
+
+        if (bluetoothPhoneAPI) {
+            bluetoothPhoneAPI->close();
+        }
+    }
 };
 
 static NimbleBluetoothToRadioCallback *toRadioCallbacks;

src/platform/nrf52/NRF52Bluetooth.cpp

@@ -55,7 +55,6 @@ static BluetoothPhoneAPI *bluetoothPhoneAPI;
 
 void onConnect(uint16_t conn_handle)
 {
-
     // Get the reference to current connection
     BLEConnection *connection = Bluefruit.Connection(conn_handle);
     connectionHandle = conn_handle;
@@ -70,8 +69,10 @@ void onConnect(uint16_t conn_handle)
  */
 void onDisconnect(uint16_t conn_handle, uint8_t reason)
 {
-    // FIXME - we currently assume only one active connection
     LOG_INFO("BLE Disconnected, reason = 0x%x\n", reason);
+    if (bluetoothPhoneAPI) {
+        bluetoothPhoneAPI->close();
+    }
 }
 void onCccd(uint16_t conn_hdl, BLECharacteristic *chr, uint16_t cccd_value)
 {