feat(scrcpy): move `version` info to option classes (cb44b638) · Commits · e / tools / webadb

.changeset/warm-badgers-burn.md

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		---
		"@yume-chan/adb-scrcpy": minor
		"@yume-chan/scrcpy": minor
		---

		Move `version` info to option classes and provide default values

libraries/adb-scrcpy/src/client.ts

+1 −2

Original line number	Diff line number	Diff line
		@@ -120,7 +120,6 @@ export class AdbScrcpyClient {
		static async start(
		adb: Adb,
		path: string,
		version: string,
		options: AdbScrcpyOptions<
		Pick<ScrcpyOptions1_15.Init, "tunnelForward">
		>,
		@@ -151,7 +150,7 @@ export class AdbScrcpyClient {
		"app_process",
		/* unused */ "/",
		"com.genymobile.scrcpy.Server",
		version,
		options.version,
		...options.serialize(),
		],
		{

libraries/adb-scrcpy/src/options/1_16.ts

+6 −21

Original line number	Diff line number	Diff line
		@@ -38,12 +38,11 @@ export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<
		static async getEncoders(
		adb: Adb,
		path: string,
		version: string,
		options: AdbScrcpyOptions<
		Pick<ScrcpyOptions1_16Impl.Init, "tunnelForward">
		>,
		): Promise<ScrcpyEncoder[]> {
		const client = await AdbScrcpyClient.start(adb, path, version, options);
		const client = await AdbScrcpyClient.start(adb, path, options);

		const encoders: ScrcpyEncoder[] = [];

		@@ -65,7 +64,6 @@ export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<
		static async getDisplays(
		adb: Adb,
		path: string,
		version: string,
		options: AdbScrcpyOptions<
		Pick<ScrcpyOptions1_16Impl.Init, "tunnelForward">
		>,
		@@ -73,12 +71,7 @@ export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<
		try {
		// Server will exit before opening connections when an invalid display id was given
		// so `start` will throw an `AdbScrcpyExitedError`
		const client = await AdbScrcpyClient.start(
		adb,
		path,
		version,
		options,
		);
		const client = await AdbScrcpyClient.start(adb, path, options);

		// If the server didn't exit, manually stop it and throw an error
		await client.close();
		@@ -103,20 +96,12 @@ export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<
		}
		}

		override getEncoders(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyEncoder[]> {
		return AdbScrcpyOptions1_16.getEncoders(adb, path, version, this);
		override getEncoders(adb: Adb, path: string): Promise<ScrcpyEncoder[]> {
		return AdbScrcpyOptions1_16.getEncoders(adb, path, this);
		}

		override getDisplays(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, version, this);
		override getDisplays(adb: Adb, path: string): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, this);
		}

		override createConnection(adb: Adb): AdbScrcpyConnection {

libraries/adb-scrcpy/src/options/1_22.ts

+4 −12

Original line number	Diff line number	Diff line
		@@ -18,20 +18,12 @@ export class AdbScrcpyOptions1_22 extends AdbScrcpyOptions<
		"tunnelForward" \| "control" \| "sendDummyByte"
		>
		> {
		override getEncoders(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyEncoder[]> {
		return AdbScrcpyOptions1_16.getEncoders(adb, path, version, this);
		override getEncoders(adb: Adb, path: string): Promise<ScrcpyEncoder[]> {
		return AdbScrcpyOptions1_16.getEncoders(adb, path, this);
		}

		override getDisplays(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, version, this);
		override getDisplays(adb: Adb, path: string): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, this);
		}

		override createConnection(adb: Adb): AdbScrcpyConnection {

libraries/adb-scrcpy/src/options/2_0.ts

+4 −15

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<
		static async getEncoders(
		adb: Adb,
		path: string,
		version: string,
		options: AdbScrcpyOptions<
		Pick<ScrcpyOptions1_16Impl.Init, "tunnelForward">
		>,
		@@ -32,12 +31,7 @@ export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<
		try {
		// Similar to `AdbScrcpyOptions1_16.getDisplays`,
		// server start procedure won't complete and `start `will throw
		const client = await AdbScrcpyClient.start(
		adb,
		path,
		version,
		options,
		);
		const client = await AdbScrcpyClient.start(adb, path, options);

		// If the server didn't exit, manually stop it and throw an error
		await client.close();
		@@ -61,17 +55,12 @@ export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<
		override async getEncoders(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyEncoder[]> {
		return AdbScrcpyOptions2_0.getEncoders(adb, path, version, this);
		return AdbScrcpyOptions2_0.getEncoders(adb, path, this);
		}

		override getDisplays(
		adb: Adb,
		path: string,
		version: string,
		): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, version, this);
		override getDisplays(adb: Adb, path: string): Promise<ScrcpyDisplay[]> {
		return AdbScrcpyOptions1_16.getDisplays(adb, path, this);
		}

		override createConnection(adb: Adb): AdbScrcpyConnection {