@yume-chan/adb 0.0.24 → 1.1.0

package/src/adb.ts

@@ -1,9 +1,9 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
 import type {
     MaybeConsumable,
     ReadableWritablePair,
 } from "@yume-chan/stream-extra";
 import { ConcatStringStream, TextDecoderStream } from "@yume-chan/stream-extra";
-import type { ValueOrPromise } from "@yume-chan/struct";
 
 import type { AdbBanner } from "./banner.js";
 import type { AdbFrameBuffer } from "./commands/index.js";
@@ -19,9 +19,12 @@ import {
 import type { AdbFeature } from "./features.js";
 
 export interface Closeable {
-    close(): ValueOrPromise<void>;
+    close(): MaybePromiseLike<void>;
 }
 
+/**
+ * Represents an ADB socket.
+ */
 export interface AdbSocket
     extends ReadableWritablePair<Uint8Array, MaybeConsumable<Uint8Array>>,
         Closeable {
@@ -32,7 +35,7 @@ export interface AdbSocket
 
 export type AdbIncomingSocketHandler = (
     socket: AdbSocket,
-) => ValueOrPromise<void>;
+) => MaybePromiseLike<void>;
 
 export interface AdbTransport extends Closeable {
     readonly serial: string;
@@ -45,16 +48,16 @@ export interface AdbTransport extends Closeable {
 
     readonly clientFeatures: readonly AdbFeature[];
 
-    connect(service: string): ValueOrPromise<AdbSocket>;
+    connect(service: string): MaybePromiseLike<AdbSocket>;
 
     addReverseTunnel(
         handler: AdbIncomingSocketHandler,
         address?: string,
-    ): ValueOrPromise<string>;
+    ): MaybePromiseLike<string>;
 
-    removeReverseTunnel(address: string): ValueOrPromise<void>;
+    removeReverseTunnel(address: string): MaybePromiseLike<void>;
 
-    clearReverseTunnels(): ValueOrPromise<void>;
+    clearReverseTunnels(): MaybePromiseLike<void>;
 }
 
 export class Adb implements Closeable {
@@ -105,6 +108,9 @@ export class Adb implements Closeable {
         );
     }
 
+    /**
+     * Creates a new ADB Socket to the specified service or socket address.
+     */
     async createSocket(service: string): Promise<AdbSocket> {
         return this.transport.connect(service);
     }

package/src/banner.ts

@@ -1,11 +1,13 @@
 import type { AdbFeature } from "./features.js";
 
-export enum AdbBannerKey {
-    Product = "ro.product.name",
-    Model = "ro.product.model",
-    Device = "ro.product.device",
-    Features = "features",
-}
+export const AdbBannerKey = {
+    Product: "ro.product.name",
+    Model: "ro.product.model",
+    Device: "ro.product.device",
+    Features: "features",
+} as const;
+
+export type AdbBannerKey = (typeof AdbBannerKey)[keyof typeof AdbBannerKey];
 
 export class AdbBanner {
     static parse(banner: string) {

package/src/commands/framebuffer.ts

@@ -1,44 +1,53 @@
 import { BufferedReadableStream } from "@yume-chan/stream-extra";
-import Struct, { StructEmptyError } from "@yume-chan/struct";
+import type { StructValue } from "@yume-chan/struct";
+import { buffer, struct, StructEmptyError, u32 } from "@yume-chan/struct";
 
 import type { Adb } from "../adb.js";
 
-const Version = new Struct({ littleEndian: true }).uint32("version");
+const Version = struct({ version: u32 }, { littleEndian: true });
 
-export const AdbFrameBufferV1 = new Struct({ littleEndian: true })
-    .uint32("bpp")
-    .uint32("size")
-    .uint32("width")
-    .uint32("height")
-    .uint32("red_offset")
-    .uint32("red_length")
-    .uint32("blue_offset")
-    .uint32("blue_length")
-    .uint32("green_offset")
-    .uint32("green_length")
-    .uint32("alpha_offset")
-    .uint32("alpha_length")
-    .uint8Array("data", { lengthField: "size" });
+export const AdbFrameBufferV1 = struct(
+    {
+        bpp: u32,
+        size: u32,
+        width: u32,
+        height: u32,
+        red_offset: u32,
+        red_length: u32,
+        blue_offset: u32,
+        blue_length: u32,
+        green_offset: u32,
+        green_length: u32,
+        alpha_offset: u32,
+        alpha_length: u32,
+        data: buffer("size"),
+    },
+    { littleEndian: true },
+);
 
-export type AdbFrameBufferV1 = (typeof AdbFrameBufferV1)["TDeserializeResult"];
+export type AdbFrameBufferV1 = StructValue<typeof AdbFrameBufferV1>;
 
-export const AdbFrameBufferV2 = new Struct({ littleEndian: true })
-    .uint32("bpp")
-    .uint32("colorSpace")
-    .uint32("size")
-    .uint32("width")
-    .uint32("height")
-    .uint32("red_offset")
-    .uint32("red_length")
-    .uint32("blue_offset")
-    .uint32("blue_length")
-    .uint32("green_offset")
-    .uint32("green_length")
-    .uint32("alpha_offset")
-    .uint32("alpha_length")
-    .uint8Array("data", { lengthField: "size" });
+export const AdbFrameBufferV2 = struct(
+    {
+        bpp: u32,
+        colorSpace: u32,
+        size: u32,
+        width: u32,
+        height: u32,
+        red_offset: u32,
+        red_length: u32,
+        blue_offset: u32,
+        blue_length: u32,
+        green_offset: u32,
+        green_length: u32,
+        alpha_offset: u32,
+        alpha_length: u32,
+        data: buffer("size"),
+    },
+    { littleEndian: true },
+);
 
-export type AdbFrameBufferV2 = (typeof AdbFrameBufferV2)["TDeserializeResult"];
+export type AdbFrameBufferV2 = StructValue<typeof AdbFrameBufferV2>;
 
 /**
  * ADB uses 8 int32 fields to describe bit depths
@@ -93,9 +102,9 @@ export async function framebuffer(adb: Adb): Promise<AdbFrameBuffer> {
     switch (version) {
         case 1:
             // TODO: AdbFrameBuffer: does all v1 responses uses the same color space? Add it so the command returns same format for all versions.
-            return AdbFrameBufferV1.deserialize(stream);
+            return await AdbFrameBufferV1.deserialize(stream);
         case 2:
-            return AdbFrameBufferV2.deserialize(stream);
+            return await AdbFrameBufferV2.deserialize(stream);
         default:
             throw new AdbFrameBufferUnsupportedVersionError(version);
     }

package/src/commands/reverse.ts

@@ -1,8 +1,12 @@
 // cspell: ignore killforward
 
-import { AutoDisposable } from "@yume-chan/event";
 import { BufferedReadableStream } from "@yume-chan/stream-extra";
-import Struct, { ExactReadableEndedError, encodeUtf8 } from "@yume-chan/struct";
+import {
+    encodeUtf8,
+    ExactReadableEndedError,
+    string,
+    struct,
+} from "@yume-chan/struct";
 
 import type { Adb, AdbIncomingSocketHandler } from "../adb.js";
 import { hexToNumber, sequenceEqual } from "../utils/index.js";
@@ -15,14 +19,25 @@ export interface AdbForwardListener {
     remoteName: string;
 }
 
-const AdbReverseStringResponse = new Struct()
-    .string("length", { length: 4 })
-    .string("content", { lengthField: "length", lengthFieldRadix: 16 });
+const AdbReverseStringResponse = struct(
+    {
+        length: string(4),
+        content: string({
+            field: "length",
+            convert(value: string) {
+                return Number.parseInt(value, 16);
+            },
+            back(value) {
+                return value.toString(16).padStart(4, "0");
+            },
+        }),
+    },
+    { littleEndian: true },
+);
 
 export class AdbReverseError extends Error {
     constructor(message: string) {
         super(message);
-        Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 
@@ -34,18 +49,22 @@ export class AdbReverseNotSupportedError extends AdbReverseError {
     }
 }
 
-const AdbReverseErrorResponse = new Struct()
-    .concat(AdbReverseStringResponse)
-    .postDeserialize((value) => {
-        // https://issuetracker.google.com/issues/37066218
-        // ADB on Android <9 can't create reverse tunnels when connected wirelessly (ADB over Wi-Fi),
-        // and returns this confusing "more than one device/emulator" error.
-        if (value.content === "more than one device/emulator") {
-            throw new AdbReverseNotSupportedError();
-        } else {
-            throw new AdbReverseError(value.content);
-        }
-    });
+const AdbReverseErrorResponse = struct(
+    /* #__PURE__ */ (() => AdbReverseStringResponse.fields)(),
+    {
+        littleEndian: true,
+        postDeserialize: (value) => {
+            // https://issuetracker.google.com/issues/37066218
+            // ADB on Android <9 can't create reverse tunnels when connected wirelessly (ADB over Wi-Fi),
+            // and returns this confusing "more than one device/emulator" error.
+            if (value.content === "more than one device/emulator") {
+                throw new AdbReverseNotSupportedError();
+            } else {
+                throw new AdbReverseError(value.content);
+            }
+        },
+    },
+);
 
 // Like `hexToNumber`, it's much faster than first converting `buffer` to a string
 function decimalToNumber(buffer: Uint8Array) {
@@ -62,14 +81,12 @@ function decimalToNumber(buffer: Uint8Array) {
 
 const OKAY = encodeUtf8("OKAY");
 
-export class AdbReverseCommand extends AutoDisposable {
+export class AdbReverseCommand {
     protected adb: Adb;
 
     readonly #deviceAddressToLocalAddress = new Map<string, string>();
 
     constructor(adb: Adb) {
-        super();
-
         this.adb = adb;
     }
 
@@ -89,6 +106,9 @@ export class AdbReverseCommand extends AutoDisposable {
         return stream;
     }
 
+    /**
+     * Get a list of all reverse port forwarding on the device.
+     */
     async list(): Promise<AdbForwardListener[]> {
         const stream = await this.createBufferedStream("reverse:list-forward");
 
@@ -107,10 +127,7 @@ export class AdbReverseCommand extends AutoDisposable {
     }
 
     /**
-     * Add an already existing reverse tunnel. Depends on the transport type, this may not do anything.
-     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
-     * @param localAddress The address that listens on the local machine.
-     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
+     * Add a reverse port forwarding for a program that already listens on a port.
      */
     async addExternal(deviceAddress: string, localAddress: string) {
         const stream = await this.sendRequest(
@@ -143,12 +160,7 @@ export class AdbReverseCommand extends AutoDisposable {
     }
 
     /**
-     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
-     * @param handler A callback to handle incoming connections.
-     * @param localAddressThe The address that listens on the local machine. May be `undefined` to let the transport choose an appropriate one.
-     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
-     * @throws {AdbReverseNotSupportedError} If ADB reverse tunnel is not supported on this device when connected wirelessly.
-     * @throws {AdbReverseError} If ADB daemon returns an error.
+     * Add a reverse port forwarding.
      */
     async add(
         deviceAddress: string,
@@ -170,6 +182,9 @@ export class AdbReverseCommand extends AutoDisposable {
         }
     }
 
+    /**
+     * Remove a reverse port forwarding.
+     */
     async remove(deviceAddress: string): Promise<void> {
         const localAddress =
             this.#deviceAddressToLocalAddress.get(deviceAddress);
@@ -182,6 +197,9 @@ export class AdbReverseCommand extends AutoDisposable {
         // No need to close the stream, device will close it
     }
 
+    /**
+     * Remove all reverse port forwarding, including the ones added by other programs.
+     */
     async removeAll(): Promise<void> {
         await this.adb.transport.clearReverseTunnels();
         this.#deviceAddressToLocalAddress.clear();

package/src/commands/subprocess/protocols/none.ts

@@ -2,7 +2,6 @@ import type { MaybeConsumable, WritableStream } from "@yume-chan/stream-extra";
 import { ReadableStream } from "@yume-chan/stream-extra";
 
 import type { Adb, AdbSocket } from "../../../adb.js";
-import { unreachable } from "../../../utils/index.js";
 
 import type { AdbSubprocessProtocol } from "./types.js";
 
@@ -64,10 +63,9 @@ export class AdbSubprocessNoneProtocol implements AdbSubprocessProtocol {
         this.#socket = socket;
 
         this.#stderr = new ReadableStream({
-            start: (controller) => {
-                this.#socket.closed
-                    .then(() => controller.close())
-                    .catch(unreachable);
+            start: async (controller) => {
+                await this.#socket.closed;
+                controller.close();
             },
         });
         this.#exit = socket.closed.then(() => 0);

package/src/commands/subprocess/protocols/shell.ts

@@ -10,8 +10,8 @@ import {
     StructDeserializeStream,
     WritableStream,
 } from "@yume-chan/stream-extra";
-import type { StructValueType } from "@yume-chan/struct";
-import Struct, { placeholder } from "@yume-chan/struct";
+import type { StructValue } from "@yume-chan/struct";
+import { buffer, struct, u32, u8 } from "@yume-chan/struct";
 
 import type { Adb, AdbSocket } from "../../../adb.js";
 import { AdbFeature } from "../../../features.js";
@@ -19,22 +19,28 @@ import { encodeUtf8 } from "../../../utils/index.js";
 
 import type { AdbSubprocessProtocol } from "./types.js";
 
-export enum AdbShellProtocolId {
-    Stdin,
-    Stdout,
-    Stderr,
-    Exit,
-    CloseStdin,
-    WindowSizeChange,
-}
-
-// This packet format is used in both direction.
-const AdbShellProtocolPacket = new Struct({ littleEndian: true })
-    .uint8("id", placeholder<AdbShellProtocolId>())
-    .uint32("length")
-    .uint8Array("data", { lengthField: "length" });
-
-type AdbShellProtocolPacket = StructValueType<typeof AdbShellProtocolPacket>;
+export const AdbShellProtocolId = {
+    Stdin: 0,
+    Stdout: 1,
+    Stderr: 2,
+    Exit: 3,
+    CloseStdin: 4,
+    WindowSizeChange: 5,
+} as const;
+
+export type AdbShellProtocolId =
+    (typeof AdbShellProtocolId)[keyof typeof AdbShellProtocolId];
+
+// This packet format is used in both directions.
+export const AdbShellProtocolPacket = struct(
+    {
+        id: u8<AdbShellProtocolId>(),
+        data: buffer(u32),
+    },
+    { littleEndian: true },
+);
+
+type AdbShellProtocolPacket = StructValue<typeof AdbShellProtocolPacket>;
 
 /**
  * Shell v2 a.k.a Shell Protocol
@@ -107,14 +113,10 @@ export class AdbSubprocessShellProtocol implements AdbSubprocessProtocol {
                                 this.#exit.resolve(chunk.data[0]!);
                                 break;
                             case AdbShellProtocolId.Stdout:
-                                if (!stdoutController.abortSignal.aborted) {
-                                    await stdoutController.enqueue(chunk.data);
-                                }
+                                await stdoutController.enqueue(chunk.data);
                                 break;
                             case AdbShellProtocolId.Stderr:
-                                if (!stderrController.abortSignal.aborted) {
-                                    await stderrController.enqueue(chunk.data);
-                                }
+                                await stderrController.enqueue(chunk.data);
                                 break;
                         }
                     },

package/src/commands/subprocess/protocols/types.ts

@@ -1,9 +1,9 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
 import type {
     MaybeConsumable,
     ReadableStream,
     WritableStream,
 } from "@yume-chan/stream-extra";
-import type { ValueOrPromise } from "@yume-chan/struct";
 
 import type { Adb, AdbSocket } from "../../../adb.js";
 
@@ -40,23 +40,23 @@ export interface AdbSubprocessProtocol {
      * Some `AdbSubprocessProtocol`s may not support resizing
      * and will ignore calls to this method.
      */
-    resize(rows: number, cols: number): ValueOrPromise<void>;
+    resize(rows: number, cols: number): MaybePromiseLike<void>;
 
     /**
      * Kills the current process.
      */
-    kill(): ValueOrPromise<void>;
+    kill(): MaybePromiseLike<void>;
 }
 
 export interface AdbSubprocessProtocolConstructor {
     /** Returns `true` if the `adb` instance supports this shell */
-    isSupported(adb: Adb): ValueOrPromise<boolean>;
+    isSupported(adb: Adb): MaybePromiseLike<boolean>;
 
     /** Spawns an executable in PTY (interactive) mode. */
-    pty(adb: Adb, command: string): ValueOrPromise<AdbSubprocessProtocol>;
+    pty(adb: Adb, command: string): MaybePromiseLike<AdbSubprocessProtocol>;
 
     /** Spawns an executable and pipe the output. */
-    raw(adb: Adb, command: string): ValueOrPromise<AdbSubprocessProtocol>;
+    raw(adb: Adb, command: string): MaybePromiseLike<AdbSubprocessProtocol>;
 
     /** Creates a new `AdbShell` by attaching to an exist `AdbSocket` */
     new (socket: AdbSocket): AdbSubprocessProtocol;

package/src/commands/sync/list.ts

@@ -1,4 +1,5 @@
-import Struct from "@yume-chan/struct";
+import type { StructValue } from "@yume-chan/struct";
+import { string, struct, u32 } from "@yume-chan/struct";
 
 import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js";
 import { AdbSyncResponseId, adbSyncReadResponses } from "./response.js";
@@ -14,21 +15,27 @@ export interface AdbSyncEntry extends AdbSyncStat {
     name: string;
 }
 
-export const AdbSyncEntryResponse = new Struct({ littleEndian: true })
-    .concat(AdbSyncLstatResponse)
-    .uint32("nameLength")
-    .string("name", { lengthField: "nameLength" });
+export const AdbSyncEntryResponse = /* #__PURE__ */ (() =>
+    struct(
+        {
+            ...AdbSyncLstatResponse.fields,
+            name: string(u32),
+        },
+        { littleEndian: true, extra: AdbSyncLstatResponse.extra },
+    ))();
 
-export type AdbSyncEntryResponse =
-    (typeof AdbSyncEntryResponse)["TDeserializeResult"];
+export type AdbSyncEntryResponse = StructValue<typeof AdbSyncEntryResponse>;
 
-export const AdbSyncEntry2Response = new Struct({ littleEndian: true })
-    .concat(AdbSyncStatResponse)
-    .uint32("nameLength")
-    .string("name", { lengthField: "nameLength" });
+export const AdbSyncEntry2Response = /* #__PURE__ */ (() =>
+    struct(
+        {
+            ...AdbSyncStatResponse.fields,
+            name: string(u32),
+        },
+        { littleEndian: true, extra: AdbSyncStatResponse.extra },
+    ))();
 
-export type AdbSyncEntry2Response =
-    (typeof AdbSyncEntry2Response)["TDeserializeResult"];
+export type AdbSyncEntry2Response = StructValue<typeof AdbSyncEntry2Response>;
 
 export async function* adbSyncOpenDirV2(
     socket: AdbSyncSocket,

package/src/commands/sync/pull.ts

@@ -1,17 +1,18 @@
 import type { ReadableStream } from "@yume-chan/stream-extra";
 import { PushReadableStream } from "@yume-chan/stream-extra";
-import Struct from "@yume-chan/struct";
+import type { StructValue } from "@yume-chan/struct";
+import { buffer, struct, u32 } from "@yume-chan/struct";
 
 import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js";
-import { AdbSyncResponseId, adbSyncReadResponses } from "./response.js";
+import { adbSyncReadResponses, AdbSyncResponseId } from "./response.js";
 import type { AdbSyncSocket } from "./socket.js";
 
-export const AdbSyncDataResponse = new Struct({ littleEndian: true })
-    .uint32("dataLength")
-    .uint8Array("data", { lengthField: "dataLength" });
+export const AdbSyncDataResponse = struct(
+    { data: buffer(u32) },
+    { littleEndian: true },
+);
 
-export type AdbSyncDataResponse =
-    (typeof AdbSyncDataResponse)["TDeserializeResult"];
+export type AdbSyncDataResponse = StructValue<typeof AdbSyncDataResponse>;
 
 export async function* adbSyncPullGenerator(
     socket: AdbSyncSocket,

package/src/commands/sync/push.ts

@@ -4,7 +4,7 @@ import {
     DistributionStream,
     MaybeConsumable,
 } from "@yume-chan/stream-extra";
-import Struct, { placeholder } from "@yume-chan/struct";
+import { struct, u32 } from "@yume-chan/struct";
 
 import { NOOP } from "../../utils/index.js";
 
@@ -25,8 +25,9 @@ export interface AdbSyncPushV1Options {
     packetSize?: number;
 }
 
-export const AdbSyncOkResponse = new Struct({ littleEndian: true }).uint32(
-    "unused",
+export const AdbSyncOkResponse = struct(
+    { unused: u32 },
+    { littleEndian: true },
 );
 
 async function pipeFileData(
@@ -41,8 +42,8 @@ async function pipeFileData(
     file.pipeThrough(new DistributionStream(packetSize, true))
         .pipeTo(
             new MaybeConsumable.WritableStream({
-                write: async (chunk) => {
-                    await adbSyncWriteRequest(
+                write(chunk) {
+                    return adbSyncWriteRequest(
                         locked,
                         AdbSyncRequestId.Data,
                         chunk,
@@ -86,19 +87,22 @@ export async function adbSyncPushV1({
     }
 }
 
-export enum AdbSyncSendV2Flags {
-    None = 0,
-    Brotli = 1,
+export const AdbSyncSendV2Flags = {
+    None: 0,
+    Brotli: 1,
     /**
      * 2
      */
-    Lz4 = 1 << 1,
+    Lz4: 1 << 1,
     /**
      * 4
      */
-    Zstd = 1 << 2,
-    DryRun = 0x80000000,
-}
+    Zstd: 1 << 2,
+    DryRun: 0x80000000,
+} as const;
+
+export type AdbSyncSendV2Flags =
+    (typeof AdbSyncSendV2Flags)[keyof typeof AdbSyncSendV2Flags];
 
 export interface AdbSyncPushV2Options extends AdbSyncPushV1Options {
     /**
@@ -110,10 +114,10 @@ export interface AdbSyncPushV2Options extends AdbSyncPushV1Options {
     dryRun?: boolean;
 }
 
-export const AdbSyncSendV2Request = new Struct({ littleEndian: true })
-    .uint32("id")
-    .uint32("mode")
-    .uint32("flags", placeholder<AdbSyncSendV2Flags>());
+export const AdbSyncSendV2Request = struct(
+    { id: u32, mode: u32, flags: u32<AdbSyncSendV2Flags>() },
+    { littleEndian: true },
+);
 
 export async function adbSyncPushV2({
     socket,

package/src/commands/sync/request.ts

@@ -1,25 +1,24 @@
-import Struct from "@yume-chan/struct";
-
-import { encodeUtf8 } from "../../utils/index.js";
+import { encodeUtf8, struct, u32 } from "@yume-chan/struct";
 
 import { adbSyncEncodeId } from "./response.js";
 
-export namespace AdbSyncRequestId {
-    export const List = adbSyncEncodeId("LIST");
-    export const ListV2 = adbSyncEncodeId("LIS2");
-    export const Send = adbSyncEncodeId("SEND");
-    export const SendV2 = adbSyncEncodeId("SND2");
-    export const Lstat = adbSyncEncodeId("STAT");
-    export const Stat = adbSyncEncodeId("STA2");
-    export const LstatV2 = adbSyncEncodeId("LST2");
-    export const Data = adbSyncEncodeId("DATA");
-    export const Done = adbSyncEncodeId("DONE");
-    export const Receive = adbSyncEncodeId("RECV");
-}
-
-export const AdbSyncNumberRequest = new Struct({ littleEndian: true })
-    .uint32("id")
-    .uint32("arg");
+export const AdbSyncRequestId = {
+    List: adbSyncEncodeId("LIST"),
+    ListV2: adbSyncEncodeId("LIS2"),
+    Send: adbSyncEncodeId("SEND"),
+    SendV2: adbSyncEncodeId("SND2"),
+    Lstat: adbSyncEncodeId("STAT"),
+    Stat: adbSyncEncodeId("STA2"),
+    LstatV2: adbSyncEncodeId("LST2"),
+    Data: adbSyncEncodeId("DATA"),
+    Done: adbSyncEncodeId("DONE"),
+    Receive: adbSyncEncodeId("RECV"),
+} as const;
+
+export const AdbSyncNumberRequest = struct(
+    { id: u32, arg: u32 },
+    { littleEndian: true },
+);
 
 export interface AdbSyncWritable {
     write(buffer: Uint8Array): Promise<void>;