@yume-chan/adb 0.0.9 → 0.0.10

package/src/commands/sync/request.ts

@@ -1,48 +1,49 @@
-import Struct from '@yume-chan/struct';
-import { AdbBufferedStream } from '../../stream';
-
-export enum AdbSyncRequestId {
-    List = 'LIST',
-    Send = 'SEND',
-    Lstat = 'STAT',
-    Stat = 'STA2',
-    Lstat2 = 'LST2',
-    Data = 'DATA',
-    Done = 'DONE',
-    Receive = 'RECV',
-}
-
-export const AdbSyncNumberRequest =
-    new Struct({ littleEndian: true })
-        .string('id', { length: 4 })
-        .uint32('arg');
-
-export const AdbSyncDataRequest =
-    new Struct({ littleEndian: true })
-        .fields(AdbSyncNumberRequest)
-        .arrayBuffer('data', { lengthField: 'arg' });
-
-export async function adbSyncWriteRequest(
-    stream: AdbBufferedStream,
-    id: AdbSyncRequestId | string,
-    value: number | string | ArrayBuffer
-): Promise<void> {
-    let buffer: ArrayBuffer;
-    if (typeof value === 'number') {
-        buffer = AdbSyncNumberRequest.serialize({
-            id,
-            arg: value,
-        }, stream);
-    } else if (typeof value === 'string') {
-        buffer = AdbSyncDataRequest.serialize({
-            id,
-            data: stream.encodeUtf8(value),
-        }, stream);
-    } else {
-        buffer = AdbSyncDataRequest.serialize({
-            id,
-            data: value,
-        }, stream);
-    }
-    await stream.write(buffer);
-}
+import Struct from '@yume-chan/struct';
+import type { AdbBufferedStream } from '../../stream';
+import { encodeUtf8 } from "../../utils";
+
+export enum AdbSyncRequestId {
+    List = 'LIST',
+    Send = 'SEND',
+    Lstat = 'STAT',
+    Stat = 'STA2',
+    Lstat2 = 'LST2',
+    Data = 'DATA',
+    Done = 'DONE',
+    Receive = 'RECV',
+}
+
+export const AdbSyncNumberRequest =
+    new Struct({ littleEndian: true })
+        .string('id', { length: 4 })
+        .uint32('arg');
+
+export const AdbSyncDataRequest =
+    new Struct({ littleEndian: true })
+        .fields(AdbSyncNumberRequest)
+        .arrayBuffer('data', { lengthField: 'arg' });
+
+export async function adbSyncWriteRequest(
+    stream: AdbBufferedStream,
+    id: AdbSyncRequestId | string,
+    value: number | string | ArrayBuffer
+): Promise<void> {
+    let buffer: ArrayBuffer;
+    if (typeof value === 'number') {
+        buffer = AdbSyncNumberRequest.serialize({
+            id,
+            arg: value,
+        });
+    } else if (typeof value === 'string') {
+        buffer = AdbSyncDataRequest.serialize({
+            id,
+            data: encodeUtf8(value),
+        });
+    } else {
+        buffer = AdbSyncDataRequest.serialize({
+            id,
+            data: value,
+        });
+    }
+    await stream.write(buffer);
+}

package/src/commands/sync/response.ts

@@ -1,57 +1,58 @@
-import Struct, { StructDeserializationContext, StructLike, StructValueType } from '@yume-chan/struct';
-import { AdbBufferedStream } from '../../stream';
-
-export enum AdbSyncResponseId {
-    Entry = 'DENT',
-    Lstat = 'STAT',
-    Stat = 'STA2',
-    Lstat2 = 'LST2',
-    Done = 'DONE',
-    Data = 'DATA',
-    Ok = 'OKAY',
-    Fail = 'FAIL',
-}
-
-// DONE responses' size are always same as the request's normal response.
-// For example DONE responses for LIST requests are 16 bytes (same as DENT responses),
-// but DONE responses for STAT requests are 12 bytes (same as STAT responses)
-// So we need to know responses' size in advance.
-export class AdbSyncDoneResponse implements StructLike<AdbSyncDoneResponse> {
-    private length: number;
-
-    public readonly id = AdbSyncResponseId.Done;
-
-    public constructor(length: number) {
-        this.length = length;
-    }
-
-    public async deserialize(context: StructDeserializationContext): Promise<this> {
-        await context.read(this.length);
-        return this;
-    }
-}
-
-export const AdbSyncFailResponse =
-    new Struct({ littleEndian: true })
-        .uint32('messageLength')
-        .string('message', { lengthField: 'messageLength' })
-        .postDeserialize(object => {
-            throw new Error(object.message);
-        });
-
-export async function adbSyncReadResponse<T extends Record<string, StructLike<any>>>(
-    stream: AdbBufferedStream,
-    types: T,
-): Promise<StructValueType<T[keyof T]>> {
-    const id = stream.backend.decodeUtf8(await stream.read(4));
-
-    if (id === AdbSyncResponseId.Fail) {
-        await AdbSyncFailResponse.deserialize(stream);
-    }
-
-    if (types[id]) {
-        return types[id].deserialize(stream);
-    }
-
-    throw new Error('Unexpected response id');
-}
+import Struct, { StructAsyncDeserializeStream, StructLike, StructValueType } from '@yume-chan/struct';
+import { AdbBufferedStream } from '../../stream';
+import { decodeUtf8 } from "../../utils";
+
+export enum AdbSyncResponseId {
+    Entry = 'DENT',
+    Lstat = 'STAT',
+    Stat = 'STA2',
+    Lstat2 = 'LST2',
+    Done = 'DONE',
+    Data = 'DATA',
+    Ok = 'OKAY',
+    Fail = 'FAIL',
+}
+
+// DONE responses' size are always same as the request's normal response.
+// For example DONE responses for LIST requests are 16 bytes (same as DENT responses),
+// but DONE responses for STAT requests are 12 bytes (same as STAT responses)
+// So we need to know responses' size in advance.
+export class AdbSyncDoneResponse implements StructLike<AdbSyncDoneResponse> {
+    private length: number;
+
+    public readonly id = AdbSyncResponseId.Done;
+
+    public constructor(length: number) {
+        this.length = length;
+    }
+
+    public async deserialize(stream: StructAsyncDeserializeStream): Promise<this> {
+        await stream.read(this.length);
+        return this;
+    }
+}
+
+export const AdbSyncFailResponse =
+    new Struct({ littleEndian: true })
+        .uint32('messageLength')
+        .string('message', { lengthField: 'messageLength' })
+        .postDeserialize(object => {
+            throw new Error(object.message);
+        });
+
+export async function adbSyncReadResponse<T extends Record<string, StructLike<any>>>(
+    stream: AdbBufferedStream,
+    types: T,
+): Promise<StructValueType<T[keyof T]>> {
+    const id = decodeUtf8(await stream.read(4));
+
+    if (id === AdbSyncResponseId.Fail) {
+        await AdbSyncFailResponse.deserialize(stream);
+    }
+
+    if (types[id]) {
+        return types[id].deserialize(stream);
+    }
+
+    throw new Error('Unexpected response id');
+}

package/src/commands/sync/stat.ts

@@ -1,121 +1,121 @@
-import Struct, { placeholder } from '@yume-chan/struct';
-import { AdbBufferedStream } from '../../stream';
-import { AdbSyncRequestId, adbSyncWriteRequest } from './request';
-import { adbSyncReadResponse, AdbSyncResponseId } from './response';
-
-// https://github.com/python/cpython/blob/4e581d64b8aff3e2eda99b12f080c877bb78dfca/Lib/stat.py#L36
-export enum LinuxFileType {
-    Directory = 0o04,
-    File = 0o10,
-    Link = 0o12,
-}
-
-export const AdbSyncLstatResponse =
-    new Struct({ littleEndian: true })
-        .int32('mode')
-        .int32('size')
-        .int32('mtime')
-        .extra({
-            id: AdbSyncResponseId.Lstat as const,
-            get type() { return this.mode >> 12 as LinuxFileType; },
-            get permission() { return this.mode & 0b00001111_11111111; },
-        })
-        .postDeserialize((object) => {
-            if (object.mode === 0 &&
-                object.size === 0 &&
-                object.mtime === 0
-            ) {
-                throw new Error('lstat failed');
-            }
-        });
-
-export type AdbSyncLstatResponse = typeof AdbSyncLstatResponse['TDeserializeResult'];
-
-export enum AdbSyncStatErrorCode {
-    EACCES = 13,
-    EEXIST = 17,
-    EFAULT = 14,
-    EFBIG = 27,
-    EINTR = 4,
-    EINVAL = 22,
-    EIO = 5,
-    EISDIR = 21,
-    ELOOP = 40,
-    EMFILE = 24,
-    ENAMETOOLONG = 36,
-    ENFILE = 23,
-    ENOENT = 2,
-    ENOMEM = 12,
-    ENOSPC = 28,
-    ENOTDIR = 20,
-    EOVERFLOW = 75,
-    EPERM = 1,
-    EROFS = 30,
-    ETXTBSY = 26,
-}
-
-export const AdbSyncStatResponse =
-    new Struct({ littleEndian: true })
-        .uint32('error', placeholder<AdbSyncStatErrorCode>())
-        .uint64('dev')
-        .uint64('ino')
-        .uint32('mode')
-        .uint32('nlink')
-        .uint32('uid')
-        .uint32('gid')
-        .uint64('size')
-        .uint64('atime')
-        .uint64('mtime')
-        .uint64('ctime')
-        .extra({
-            id: AdbSyncResponseId.Stat as const,
-            get type() { return this.mode >> 12 as LinuxFileType; },
-            get permission() { return this.mode & 0b00001111_11111111; },
-        })
-        .postDeserialize((object) => {
-            if (object.error) {
-                throw new Error(AdbSyncStatErrorCode[object.error]);
-            }
-        });
-
-export type AdbSyncStatResponse = typeof AdbSyncStatResponse['TDeserializeResult'];
-
-const StatResponseType = {
-    [AdbSyncResponseId.Stat]: AdbSyncStatResponse,
-};
-
-const LstatResponseType = {
-    [AdbSyncResponseId.Lstat]: AdbSyncLstatResponse,
-};
-
-const Lstat2ResponseType = {
-    [AdbSyncResponseId.Lstat2]: AdbSyncStatResponse,
-};
-
-export async function adbSyncLstat(
-    stream: AdbBufferedStream,
-    path: string,
-    v2: boolean,
-): Promise<AdbSyncLstatResponse | AdbSyncStatResponse> {
-    let requestId: AdbSyncRequestId.Lstat | AdbSyncRequestId.Lstat2;
-    let responseType: typeof LstatResponseType | typeof Lstat2ResponseType;
-
-    if (v2) {
-        requestId = AdbSyncRequestId.Lstat2;
-        responseType = Lstat2ResponseType;
-    } else {
-        requestId = AdbSyncRequestId.Lstat;
-        responseType = LstatResponseType;
-    }
-
-    await adbSyncWriteRequest(stream, requestId, path);
-    return adbSyncReadResponse(stream, responseType);
-}
-
-export async function adbSyncStat(
-    stream: AdbBufferedStream,
-    path: string,
-): Promise<AdbSyncStatResponse> {
-    await adbSyncWriteRequest(stream, AdbSyncRequestId.Stat, path);
-    return adbSyncReadResponse(stream, StatResponseType);
-}
+import Struct, { placeholder } from '@yume-chan/struct';
+import { AdbBufferedStream } from '../../stream';
+import { AdbSyncRequestId, adbSyncWriteRequest } from './request';
+import { adbSyncReadResponse, AdbSyncResponseId } from './response';
+
+// https://github.com/python/cpython/blob/4e581d64b8aff3e2eda99b12f080c877bb78dfca/Lib/stat.py#L36
+export enum LinuxFileType {
+    Directory = 0o04,
+    File = 0o10,
+    Link = 0o12,
+}
+
+export const AdbSyncLstatResponse =
+    new Struct({ littleEndian: true })
+        .int32('mode')
+        .int32('size')
+        .int32('mtime')
+        .extra({
+            id: AdbSyncResponseId.Lstat as const,
+            get type() { return this.mode >> 12 as LinuxFileType; },
+            get permission() { return this.mode & 0b00001111_11111111; },
+        })
+        .postDeserialize((object) => {
+            if (object.mode === 0 &&
+                object.size === 0 &&
+                object.mtime === 0
+            ) {
+                throw new Error('lstat failed');
+            }
+        });
+
+export type AdbSyncLstatResponse = typeof AdbSyncLstatResponse['TDeserializeResult'];
+
+export enum AdbSyncStatErrorCode {
+    EACCES = 13,
+    EEXIST = 17,
+    EFAULT = 14,
+    EFBIG = 27,
+    EINTR = 4,
+    EINVAL = 22,
+    EIO = 5,
+    EISDIR = 21,
+    ELOOP = 40,
+    EMFILE = 24,
+    ENAMETOOLONG = 36,
+    ENFILE = 23,
+    ENOENT = 2,
+    ENOMEM = 12,
+    ENOSPC = 28,
+    ENOTDIR = 20,
+    EOVERFLOW = 75,
+    EPERM = 1,
+    EROFS = 30,
+    ETXTBSY = 26,
+}
+
+export const AdbSyncStatResponse =
+    new Struct({ littleEndian: true })
+        .uint32('error', placeholder<AdbSyncStatErrorCode>())
+        .uint64('dev')
+        .uint64('ino')
+        .uint32('mode')
+        .uint32('nlink')
+        .uint32('uid')
+        .uint32('gid')
+        .uint64('size')
+        .uint64('atime')
+        .uint64('mtime')
+        .uint64('ctime')
+        .extra({
+            id: AdbSyncResponseId.Stat as const,
+            get type() { return this.mode >> 12 as LinuxFileType; },
+            get permission() { return this.mode & 0b00001111_11111111; },
+        })
+        .postDeserialize((object) => {
+            if (object.error) {
+                throw new Error(AdbSyncStatErrorCode[object.error]);
+            }
+        });
+
+export type AdbSyncStatResponse = typeof AdbSyncStatResponse['TDeserializeResult'];
+
+const StatResponseType = {
+    [AdbSyncResponseId.Stat]: AdbSyncStatResponse,
+};
+
+const LstatResponseType = {
+    [AdbSyncResponseId.Lstat]: AdbSyncLstatResponse,
+};
+
+const Lstat2ResponseType = {
+    [AdbSyncResponseId.Lstat2]: AdbSyncStatResponse,
+};
+
+export async function adbSyncLstat(
+    stream: AdbBufferedStream,
+    path: string,
+    v2: boolean,
+): Promise<AdbSyncLstatResponse | AdbSyncStatResponse> {
+    let requestId: AdbSyncRequestId.Lstat | AdbSyncRequestId.Lstat2;
+    let responseType: typeof LstatResponseType | typeof Lstat2ResponseType;
+
+    if (v2) {
+        requestId = AdbSyncRequestId.Lstat2;
+        responseType = Lstat2ResponseType;
+    } else {
+        requestId = AdbSyncRequestId.Lstat;
+        responseType = LstatResponseType;
+    }
+
+    await adbSyncWriteRequest(stream, requestId, path);
+    return adbSyncReadResponse(stream, responseType);
+}
+
+export async function adbSyncStat(
+    stream: AdbBufferedStream,
+    path: string,
+): Promise<AdbSyncStatResponse> {
+    await adbSyncWriteRequest(stream, AdbSyncRequestId.Stat, path);
+    return adbSyncReadResponse(stream, StatResponseType);
+}