Update disconnect detection logic

Author: DanTheMan827

mbf-site/src/App.tsx

@@ -17,6 +17,7 @@ import { OpenLogsButton } from './components/OpenLogsButton';
 import { isViewingOnIos, isViewingOnMobile, isViewingOnWindows, usingOculusBrowser } from './platformDetection';
 import { SourceUrl } from '.';
 import { AdbServerWebSocketConnector, bridgeData, checkForBridge } from './AdbServerWebSocketConnector';
+import { waitForDisconnect } from "./waitForDisconnect";
 
 type NoDeviceCause = "NoDeviceSelected" | "DeviceInUse";
 
@@ -145,7 +146,7 @@ function ChooseDevice() {
           if (!areDevicesEqual(devices, adbDevices)) {
             setAdbDevices(devices);
             if (devices.length == 1) {
-              setChosenDevice(await connectAdbDevice(bridgeClient, devices[0]));
+              await connectDevice(await connectAdbDevice(bridgeClient, devices[0]));
             }
           }
         } catch (err) {
@@ -169,23 +170,7 @@ function ChooseDevice() {
     setAuthing(false);
     setChosenDevice(device);
 
-    // Track if the transport disconnects early
-    let disconnectedEarly = true;
-    setTimeout(() => disconnectedEarly = false, 1000);
-
-    // Wait for the transport to determine disconnect
-    await device.transport.disconnected;
-
-    // Old adb server versions don't support the wait-for-any-disconnect feautre
-    // so if the transport disconnects within 1 second, we spawn a process that
-    // never exits and await it instead.
-    if (disconnectedEarly) {
-      try {
-        await device.subprocess.spawnAndWait("read");
-      } catch (error) {
-        Log.error("ADB server process exited: " + error, error);
-      }
-    }
+    await waitForDisconnect(device);
 
     setChosenDevice(null);
   }

mbf-site/src/components/ModManager.tsx

@@ -15,6 +15,7 @@ import useFileDropper from "../hooks/useFileDropper";
 import { Log } from "../Logging";
 import { useSetWorking, useSyncStore, wrapOperation } from "../SyncStore";
 import { ModRepoMod } from "../ModsRepo";
+import { waitForDisconnect } from "../waitForDisconnect";
 
 interface ModManagerProps {
     gameVersion: string,
@@ -279,7 +280,7 @@ function AddModsMenu(props: ModMenuProps) {
         isProcessingQueue = true;
 
         let disconnected = false;
-        device.disconnected.then(() => disconnected = true);
+        waitForDisconnect(device).then(() => disconnected = true);
         const setWorking = useSetWorking("Importing");
         const { setStatusText } = useSyncStore.getState(); 
 

mbf-site/src/waitForDisconnect.ts

@@ -0,0 +1,39 @@
+import type { Adb } from "@yume-chan/adb";
+import { PromiseResolver } from "@yume-chan/async";
+import { Log } from "./Logging";
+
+const disconnectPromises = new Map<string, Promise<void>>();
+export async function waitForDisconnect(device: Adb) {
+    if (disconnectPromises.has(device.serial)) {
+        Log.debug(`Already waiting for ${device.serial} to disconnect`, device);
+        return await disconnectPromises.get(device.serial);
+    }
+
+    Log.debug(`Waiting for ${device.serial} to disconnect`, device);
+    var resolver = new PromiseResolver<void>();
+
+    disconnectPromises.set(device.serial, resolver.promise);
+
+    // Track if the transport disconnects early
+    let disconnectedEarly = true;
+    setTimeout(() => disconnectedEarly = false, 1000);
+
+    // Wait for the transport to determine disconnect
+    await device.transport.disconnected;
+
+    // Old adb server versions don't support the wait-for-any-disconnect feautre
+    // so if the transport disconnects within 1 second, we spawn a process that
+    // never exits and await it instead.
+    if (disconnectedEarly) {
+        try {
+            Log.debug(`Waiting for ${device.serial} to disconnect using subprocess`, device);
+            await device.subprocess.spawnAndWait("read");
+        } catch (error) {
+            console.error("ADB server process exited: " + error, error);
+        }
+    }
+
+    Log.debug(`Devoce ${device.serial} disconnected`, device);
+    resolver.resolve();
+    disconnectPromises.delete(device.serial);
+}