Merge branch 'dev' into visual_rework

Author: GuillaumeLeroy34

package-lock.json

@@ -43,6 +43,7 @@
     "@yume-chan/adb": "^2.5.1",
     "@yume-chan/adb-scrcpy": "^2.3.2",
     "@yume-chan/adb-server-node-tcp": "^2.5.2",
+    "@yume-chan/android-bin": "^2.1.0",
     "@yume-chan/scrcpy-decoder-webcodecs": "^2.5.0",
     "@yume-chan/stream-extra": "2.1.0",
     "autoprefixer": "^10.4.20",
@@ -56,6 +57,7 @@
     "express": "^4.21.2",
     "geoip-lite": "^1.4.10",
     "i18next": "^23.15.1",
+    "node-hid": "^3.3.0",
     "postcss": "^8.4.40",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

package.json

@@ -16,7 +16,7 @@ import { ENV_EXTRA_VERBOSE, ENV_VERBOSE } from "../../index.ts";
 import { ScrcpyServer } from "../scrcpy/ScrcpyServer.ts";
 import { getLogger } from "@logtape/logtape";
 import DeviceFinder from "./DeviceFinder.ts";
-import {ON_DEVICE_ADB_GLOBAL_SETTINGS} from "../../core/Constants.ts";
+import { HeadsetSetup } from "./HeadsetSetup.ts";
 
 // Override the log function
 const logger = getLogger(["android", "AdbManager"]);
@@ -25,6 +25,7 @@ export class AdbManager {
     controller: Controller;
     adbServer!: AdbServerClient;
     videoStreamServer: ScrcpyServer;
+    headsetSetup!: HeadsetSetup;
     // Keep list of serial of devices with a stream already starting
     clientCurrentlyStreaming: Device[] = [];
     observer!: AdbServerClient.DeviceObserver;//!: AdbServerClient;
@@ -41,6 +42,7 @@ export class AdbManager {
         logger.info("Connect to device's ADB server");
 
         this.videoStreamServer = new ScrcpyServer(this);
+        this.headsetSetup = new HeadsetSetup(this.adbServer);
     }
 
     async init() {
@@ -56,8 +58,8 @@ export class AdbManager {
                 // Sanitize stale ADB entries on startup (side-effect: disconnects offline ones)
                 if (this.isDeviceReady(device)) {
                     // Apply M2L2 headset settings only if the device is ready
-                    this.checkAdbParameters(device).catch(e =>
-                        logger.error(`[${device.serial}] Unexpected error in checkAdbParameters: {e}`, { e })
+                    this.headsetSetup.setupHeadset(device).catch(e =>
+                        logger.error(`[${device.serial}] Unexpected error in setupHeadset: {e}`, { e })
                     );
                 }
 
@@ -76,8 +78,8 @@ export class AdbManager {
                 this.startNewStream(device).catch(e =>
                     logger.error(`[${device.serial}] Unexpected error in startNewStream: {e}`, { e })
                 );
-                this.checkAdbParameters(device).catch(e =>
-                    logger.error(`[${device.serial}] Unexpected error in checkAdbParameters: {e}`, { e })
+                this.headsetSetup.setupHeadset(device).catch(e =>
+                    logger.error(`[${device.serial}] Unexpected error in setupHeadset: {e}`, { e })
                 );
             }
         });
@@ -203,6 +205,20 @@ export class AdbManager {
         return isReady;
     }
 
+    /** Send reboot -p to every currently streaming ADB-connected headset */
+    async shutdownAllHeadsets(): Promise<void> {
+        for (const device of this.clientCurrentlyStreaming) {
+            try {
+                const transport = await this.adbServer.createTransport(device);
+                const adb = new Adb(transport);
+                await adb.subprocess.noneProtocol.spawn('reboot -p');
+                logger.info(`[${device.serial}] Power-off command sent`);
+            } catch (e) {
+                logger.warn(`[${device.serial}] Failed to send power-off command: {e}`, { e });
+            }
+        }
+    }
+
     async disconnectDevice(serial: string): Promise<void> {
         const index = this.clientCurrentlyStreaming.findIndex(d => d.serial === serial);
         if (index > -1) this.clientCurrentlyStreaming.splice(index, 1);
@@ -237,69 +253,4 @@ export class AdbManager {
         return success
     }
 
-    async checkAdbParameters(device: Device) {
-        if (!this.isDeviceReady(device)) return;
-
-        // Only modify headsets, don't jam phone's parameters
-        if (!device.model?.startsWith("Quest_")) return;
-
-        logger.debug(`[${device.serial}] Checking on-device global ADB settings...`);
-
-        let adb: Adb;
-        try {
-            adb = new Adb(await this.adbServer.createTransport(device));
-        } catch (e) {
-            logger.warn(`[${device.serial}] Could not open ADB transport to check parameters — device may not be authorized yet: {e}`, { e });
-            return;
-        }
-
-        for (const [globalSetting, globalSettingValue] of Object.entries(ON_DEVICE_ADB_GLOBAL_SETTINGS) as [
-                keyof typeof ON_DEVICE_ADB_GLOBAL_SETTINGS,
-                typeof ON_DEVICE_ADB_GLOBAL_SETTINGS[keyof typeof ON_DEVICE_ADB_GLOBAL_SETTINGS]
-            ][])
-        {
-            if ( ! await this.checkAdbParameter(adb, globalSetting, globalSettingValue)){
-                logger.debug(`[${device.serial}] ADB parameters for '${globalSetting}' isn't correct, fixing it...`);
-                await this.setAdbParameter(adb, globalSetting, globalSettingValue);
-                if (! await this.checkAdbParameter(adb, globalSetting, globalSettingValue)) {
-                    logger.warn(`[${device.serial}] Couldn't properly set setting ${globalSetting}, skipping it...`);
-                }
-            }
-        }
-        logger.debug(`[${device.serial}] All on-device global ADB settings are good`);
-    }
-
-    async checkAdbParameter(adb: Adb, globalParam: string, expectedValue: any): Promise<boolean> {
-        let result: any;
-
-        const process = await adb.subprocess.noneProtocol.spawn("settings get global " + globalParam);
-        // @ts-expect-error
-        for await (const chunk of process.output.pipeThrough(new TextDecoderStream())) {
-            result = chunk;
-        }
-        // Cleaning trailing '\n' from chunk reading
-        result = result.trim();
-
-        logger.trace(`[${adb.serial}] Checking ADB parameters '${globalParam}' = ${result} and should be ${expectedValue} (${result == expectedValue})`);
-
-        return result == expectedValue;
-    }
-
-    async setAdbParameter(adb: Adb, globalParam: string, expectedValue: any) {
-        let result: any;
-
-        const process = await adb.subprocess.noneProtocol.spawn(["settings put global ", globalParam, expectedValue]);
-        // @ts-expect-error
-        for await (const chunk of process.output.pipeThrough(new TextDecoderStream())) {
-            result = chunk;
-        }
-
-        logger.trace(`[${adb.serial}] Setting ADB parameters '${globalParam}' = ${expectedValue} and it ${result == undefined ? "worked" : "failed"}`);
-
-        if (result != undefined) {
-            logger.error(`[${adb.serial}] Something happened while setting the ADB setting '${globalParam}'`);
-            logger.error(result.toString());
-        }
-    }
-
 }