From 6e70cb5019318bbdc0662a45f35c5b5e86a691b0 Mon Sep 17 00:00:00 2001
From: Gasol Wu <gasol.wu@gmail.com>
Date: Tue, 5 Nov 2024 23:19:19 +0800
Subject: [PATCH] feat: add display orientation options for Scrcpy version 2.3

Introduce new classes and enums to handle Scrcpy version 2.3 options.
This update includes new display orientation options and modifies the
existing interfaces to accommodate additional settings.

See https://github.com/Genymobile/scrcpy/pull/4441
---
 libraries/adb-scrcpy/src/options/2_3.ts  | 57 ++++++++++++++++++++++++
 libraries/scrcpy/src/options/2_3.spec.ts | 15 +++++++
 libraries/scrcpy/src/options/2_3.ts      | 14 ++++++
 3 files changed, 86 insertions(+)
 create mode 100644 libraries/adb-scrcpy/src/options/2_3.ts
 create mode 100644 libraries/scrcpy/src/options/2_3.spec.ts

diff --git a/libraries/adb-scrcpy/src/options/2_3.ts b/libraries/adb-scrcpy/src/options/2_3.ts
new file mode 100644
index 000000000..ab9aaabf8
--- /dev/null
+++ b/libraries/adb-scrcpy/src/options/2_3.ts
@@ -0,0 +1,57 @@
+import type { Adb } from "@gasol/adb";
+import type {
+    ScrcpyDisplay,
+    ScrcpyEncoder,
+    ScrcpyOptionsInit2_3,
+} from "@gasol/scrcpy";
+
+import type { AdbScrcpyConnection } from "../connection.js";
+
+import { AdbScrcpyOptions1_16 } from "./1_16.js";
+import { AdbScrcpyOptions2_0 } from "./2_0.js";
+import { AdbScrcpyOptions } from "./types.js";
+
+export class AdbScrcpyOptions2_3 extends AdbScrcpyOptions<
+    // Only pick options that are used in this class,
+    // so changes in `ScrcpyOptionsInitX_XX` won't affect type assignability with this class
+    Pick<
+        ScrcpyOptionsInit2_3,
+        | "displayOrientation"
+        | "tunnelForward"
+        | "control"
+        | "sendDummyByte"
+        | "scid"
+        | "audio"
+        | "video"
+    >
+> {
+    override async getEncoders(
+        adb: Adb,
+        path: string,
+        version: string,
+    ): Promise<ScrcpyEncoder[]> {
+        return AdbScrcpyOptions2_0.getEncoders(adb, path, version, this);
+    }
+
+    override getDisplays(
+        adb: Adb,
+        path: string,
+        version: string,
+    ): Promise<ScrcpyDisplay[]> {
+        return AdbScrcpyOptions1_16.getDisplays(adb, path, version, this);
+    }
+
+    override createConnection(adb: Adb): AdbScrcpyConnection {
+        return AdbScrcpyOptions1_16.createConnection(
+            adb,
+            {
+                scid: this.value.scid.value,
+                video: this.value.video,
+                audio: this.value.audio,
+                control: this.value.control,
+                sendDummyByte: this.value.sendDummyByte,
+            },
+            this.tunnelForwardOverride || this.value.tunnelForward,
+        );
+    }
+}
diff --git a/libraries/scrcpy/src/options/2_3.spec.ts b/libraries/scrcpy/src/options/2_3.spec.ts
new file mode 100644
index 000000000..cd0352ebb
--- /dev/null
+++ b/libraries/scrcpy/src/options/2_3.spec.ts
@@ -0,0 +1,15 @@
+import * as assert from "node:assert";
+import { describe, it } from "node:test";
+
+import { ScrcpyDisplayOrientation2_3, ScrcpyOptions2_3 } from "./2_3.js";
+
+describe("ScrcpyOptions2_3", () => {
+    describe("displayOrientation", () => {
+        it("should set `displayOrientation` to `flip180`", () => {
+            const options = new ScrcpyOptions2_3({
+                displayOrientation: ScrcpyDisplayOrientation2_3.Flip180,
+            });
+            assert.strictEqual(options.value.displayOrientation, "flip180");
+        });
+    });
+});
diff --git a/libraries/scrcpy/src/options/2_3.ts b/libraries/scrcpy/src/options/2_3.ts
index 35341ab84..f7c3b03ea 100644
--- a/libraries/scrcpy/src/options/2_3.ts
+++ b/libraries/scrcpy/src/options/2_3.ts
@@ -9,14 +9,28 @@ import type { ScrcpyAudioStreamMetadata } from "./codec.js";
 import { ScrcpyAudioCodec } from "./codec.js";
 import { ScrcpyOptions } from "./types.js";
 
+// https://github.com/Genymobile/scrcpy/pull/4441
+export enum ScrcpyDisplayOrientation2_3 {
+    Zero = "0",
+    Ninety = "90",
+    OneEighty = "180",
+    TwoSeventy = "270",
+    Flip0 = "flip0",
+    Flip90 = "flip90",
+    Flip180 = "flip180",
+    Flip270 = "flip270",
+}
+
 export interface ScrcpyOptionsInit2_3
     extends Omit<ScrcpyOptionsInit2_2, "audioCodec"> {
     audioCodec?: "raw" | "opus" | "aac" | "flac";
+    displayOrientation?: ScrcpyDisplayOrientation2_3 | undefined;
 }
 
 export class ScrcpyOptions2_3 extends ScrcpyOptions<ScrcpyOptionsInit2_3> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions2_2.DEFAULTS,
+        displayOrientation: undefined,
     } as const satisfies Required<ScrcpyOptionsInit2_3>;
 
     override get defaults(): Required<ScrcpyOptionsInit2_3> {