fix: Proper disconnect/reconnect of BLE.

Author: petejohanson

src-tauri/src/transport/gatt.rs

@@ -5,7 +5,7 @@ use futures::StreamExt;
 use std::time::Duration;
 use uuid::Uuid;
 
-use bluest::{Adapter, DeviceId};
+use bluest::{Adapter, ConnectionEvent, DeviceId};
 
 use tauri::{command, AppHandle, State};
 
@@ -46,22 +46,38 @@ pub async fn gatt_connect(
 
         if let Some(c) = char {
             let c2 = c.clone();
-            tauri::async_runtime::spawn(async move {
+            let ah1 = app_handle.clone();
+            let notify_handle = tauri::async_runtime::spawn(async move {
                 if let Ok(mut n) = c2.notify().await {
-                    // Need to keep adapter from being dropped while active/connected
-                    let a = adapter;
-
                     use tauri::Manager;
 
                     while let Some(Ok(vn)) = n.next().await {
-                        app_handle.emit("connection_data", vn.clone());
+                        ah1.emit("connection_data", vn.clone());
                     }
+                }
+            });
+
+            let ah2 = app_handle.clone();
+            tauri::async_runtime::spawn(async move {
+                // Need to keep adapter from being dropped while active/connected
+                let a = adapter;
 
-                    let state = app_handle.state::<super::commands::ActiveConnection>();
-                    *state.conn.lock().await = None;
+                use tauri::Manager;
 
-                    app_handle.emit("connection_disconnected", ());
-                }
+                if let Ok(mut events) = a.device_connection_events(&d).await {
+                    while let Some(ev) = events.next().await {
+                        if ev == ConnectionEvent::Disconnected {
+                            let state = ah2.state::<super::commands::ActiveConnection>();
+                            *state.conn.lock().await = None;
+
+                            if let Err(e) = ah2.emit("connection_disconnected", ()) {
+                                println!("ERROR RAISING! {:?}", e);
+                            }
+
+                            notify_handle.abort();
+                        }
+                    }
+                };
             });
 
             let (send, mut recv) = channel(5);

src/tauri/ble.ts

@@ -30,7 +30,7 @@ export async function connect(dev: AvailableDevice): Promise<RpcTransport> {
   const unlisten_disconnected = await listen('connection_disconnected', async (_ev: any) => {
     unlisten_data();
     unlisten_disconnected();
-    readable.cancel();
+    response_writable.close();
   });
 
   return { label: dev.label, readable, writable };