From aeaa9020dc49c771694e184c825130b1d57f541f Mon Sep 17 00:00:00 2001
From: Simon Chan <1330321+yume-chan@users.noreply.github.com>
Date: Tue, 24 Dec 2024 03:54:35 +0800
Subject: [PATCH] fix(scrcpy): remove extra `version` parameters

---
 libraries/adb-scrcpy/src/client.ts         | 10 ++++------
 libraries/adb-scrcpy/src/options/latest.ts |  4 +---
 libraries/adb-scrcpy/src/options/types.ts  | 12 ++----------
 libraries/scrcpy/src/index.ts              |  1 +
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/libraries/adb-scrcpy/src/client.ts b/libraries/adb-scrcpy/src/client.ts
index bc56fdb9..3b5ad12d 100644
--- a/libraries/adb-scrcpy/src/client.ts
+++ b/libraries/adb-scrcpy/src/client.ts
@@ -217,28 +217,26 @@ export class AdbScrcpyClient {
      * This method will modify the given `options`,
      * so don't reuse it elsewhere.
      */
-    static async getEncoders(
+    static getEncoders(
         adb: Adb,
         path: string,
-        version: string,
         options: AdbScrcpyOptions<object>,
     ): Promise<ScrcpyEncoder[]> {
         options.setListEncoders();
-        return await options.getEncoders(adb, path, version);
+        return options.getEncoders(adb, path);
     }
 
     /**
      * This method will modify the given `options`,
      * so don't reuse it elsewhere.
      */
-    static async getDisplays(
+    static getDisplays(
         adb: Adb,
         path: string,
-        version: string,
         options: AdbScrcpyOptions<object>,
     ): Promise<ScrcpyDisplay[]> {
         options.setListDisplays();
-        return await options.getDisplays(adb, path, version);
+        return options.getDisplays(adb, path);
     }
 
     #options: AdbScrcpyOptions<object>;
diff --git a/libraries/adb-scrcpy/src/options/latest.ts b/libraries/adb-scrcpy/src/options/latest.ts
index e3108ee2..abbd9125 100644
--- a/libraries/adb-scrcpy/src/options/latest.ts
+++ b/libraries/adb-scrcpy/src/options/latest.ts
@@ -1,3 +1 @@
-import { AdbScrcpyOptions2_1 } from "./2_1.js";
-
-export class AdbScrcpyOptionsLatest extends AdbScrcpyOptions2_1 {}
+export { AdbScrcpyOptions2_1 as AdbScrcpyOptionsLatest } from "./2_1.js";
diff --git a/libraries/adb-scrcpy/src/options/types.ts b/libraries/adb-scrcpy/src/options/types.ts
index 6ceea6b7..76b68178 100644
--- a/libraries/adb-scrcpy/src/options/types.ts
+++ b/libraries/adb-scrcpy/src/options/types.ts
@@ -7,17 +7,9 @@ import type { AdbScrcpyConnection } from "../connection.js";
 export abstract class AdbScrcpyOptions<
     T extends object,
 > extends ScrcpyOptionsWrapper<T> {
-    abstract getEncoders(
-        adb: Adb,
-        path: string,
-        version: string,
-    ): Promise<ScrcpyEncoder[]>;
+    abstract getEncoders(adb: Adb, path: string): Promise<ScrcpyEncoder[]>;
 
-    abstract getDisplays(
-        adb: Adb,
-        path: string,
-        version: string,
-    ): Promise<ScrcpyDisplay[]>;
+    abstract getDisplays(adb: Adb, path: string): Promise<ScrcpyDisplay[]>;
 
     abstract createConnection(adb: Adb): AdbScrcpyConnection;
 }
diff --git a/libraries/scrcpy/src/index.ts b/libraries/scrcpy/src/index.ts
index 590b8ec2..fcb8769a 100644
--- a/libraries/scrcpy/src/index.ts
+++ b/libraries/scrcpy/src/index.ts
@@ -24,6 +24,7 @@ export * from "./2_7/index.js";
 export * from "./3_0/index.js";
 export * from "./3_0_1.js";
 export * from "./3_0_2.js";
+export * from "./3_1/index.js";
 export * from "./android/index.js";
 export * from "./base/index.js";
 export * from "./codec/index.js";