@yume-chan/adb 0.0.9 → 0.0.10

package/src/stream/buffered-stream.ts

@@ -1,100 +1,92 @@
-import { StructDeserializationContext } from '@yume-chan/struct';
-import { AdbSocket, AdbSocketInfo } from '../socket';
-import { AdbSocketStream } from './stream';
-
-export interface Stream {
-    /**
-     * @param length A hint of how much data should be read.
-     * @returns Data, which can be either more or less than `length`
-     */
-    read(length: number): ArrayBuffer | Promise<ArrayBuffer>;
-
-    close?(): void;
-}
-
-export class BufferedStream<T extends Stream> {
-    private buffer: Uint8Array | undefined;
-
-    protected readonly stream: T;
-
-    public constructor(stream: T) {
-        this.stream = stream;
-    }
-
-    public async read(length: number): Promise<ArrayBuffer> {
-        let array: Uint8Array;
-        let index: number;
-        if (this.buffer) {
-            const buffer = this.buffer;
-            if (buffer.byteLength > length) {
-                this.buffer = buffer.subarray(length);
-                return buffer.slice(0, length).buffer;
-            }
-
-            array = new Uint8Array(length);
-            array.set(buffer);
-            index = buffer.byteLength;
-            this.buffer = undefined;
-        } else {
-            const buffer = await this.stream.read(length);
-            if (buffer.byteLength === length) {
-                return buffer;
-            }
-
-            if (buffer.byteLength > length) {
-                this.buffer = new Uint8Array(buffer, length);
-                return buffer.slice(0, length);
-            }
-
-            array = new Uint8Array(length);
-            array.set(new Uint8Array(buffer), 0);
-            index = buffer.byteLength;
-        }
-
-        while (index < length) {
-            const left = length - index;
-
-            const buffer = await this.stream.read(left);
-            if (buffer.byteLength > left) {
-                array.set(new Uint8Array(buffer, 0, left), index);
-                this.buffer = new Uint8Array(buffer, left);
-                return array.buffer;
-            }
-
-            array.set(new Uint8Array(buffer), index);
-            index += buffer.byteLength;
-        }
-
-        return array.buffer;
-    }
-
-    public close() {
-        this.stream.close?.();
-    }
-}
-
-export class AdbBufferedStream
-    extends BufferedStream<AdbSocketStream>
-    implements AdbSocketInfo, StructDeserializationContext {
-    public get backend() { return this.stream.backend; }
-    public get localId() { return this.stream.localId; }
-    public get remoteId() { return this.stream.remoteId; }
-    public get localCreated() { return this.stream.localCreated; }
-    public get serviceString() { return this.stream.serviceString; }
-
-    public constructor(socket: AdbSocket) {
-        super(new AdbSocketStream(socket));
-    }
-
-    public write(data: ArrayBuffer): Promise<void> {
-        return this.stream.write(data);
-    }
-
-    public decodeUtf8(buffer: ArrayBuffer): string {
-        return this.backend.decodeUtf8(buffer);
-    }
-
-    public encodeUtf8(input: string): ArrayBuffer {
-        return this.backend.encodeUtf8(input);
-    }
-}
+import { StructAsyncDeserializeStream } from '@yume-chan/struct';
+import { AdbSocket, AdbSocketInfo } from '../socket';
+import { AdbSocketStream } from './stream';
+
+export interface Stream {
+    /**
+     * @param length A hint of how much data should be read.
+     * @returns Data, which can be either more or less than `length`
+     */
+    read(length: number): ArrayBuffer | Promise<ArrayBuffer>;
+
+    close?(): void;
+}
+
+export class BufferedStream<T extends Stream> {
+    private buffer: Uint8Array | undefined;
+
+    protected readonly stream: T;
+
+    public constructor(stream: T) {
+        this.stream = stream;
+    }
+
+    public async read(length: number): Promise<ArrayBuffer> {
+        let array: Uint8Array;
+        let index: number;
+        if (this.buffer) {
+            const buffer = this.buffer;
+            if (buffer.byteLength > length) {
+                this.buffer = buffer.subarray(length);
+                return buffer.slice(0, length).buffer;
+            }
+
+            array = new Uint8Array(length);
+            array.set(buffer);
+            index = buffer.byteLength;
+            this.buffer = undefined;
+        } else {
+            const buffer = await this.stream.read(length);
+            if (buffer.byteLength === length) {
+                return buffer;
+            }
+
+            if (buffer.byteLength > length) {
+                this.buffer = new Uint8Array(buffer, length);
+                return buffer.slice(0, length);
+            }
+
+            array = new Uint8Array(length);
+            array.set(new Uint8Array(buffer), 0);
+            index = buffer.byteLength;
+        }
+
+        while (index < length) {
+            const left = length - index;
+
+            const buffer = await this.stream.read(left);
+            if (buffer.byteLength > left) {
+                array.set(new Uint8Array(buffer, 0, left), index);
+                this.buffer = new Uint8Array(buffer, left);
+                return array.buffer;
+            }
+
+            array.set(new Uint8Array(buffer), index);
+            index += buffer.byteLength;
+        }
+
+        return array.buffer;
+    }
+
+    public close() {
+        this.stream.close?.();
+    }
+}
+
+export class AdbBufferedStream
+    extends BufferedStream<AdbSocketStream>
+    implements AdbSocketInfo, StructAsyncDeserializeStream {
+    public get backend() { return this.stream.backend; }
+    public get localId() { return this.stream.localId; }
+    public get remoteId() { return this.stream.remoteId; }
+    public get localCreated() { return this.stream.localCreated; }
+    public get serviceString() { return this.stream.serviceString; }
+
+    public constructor(socket: AdbSocket) {
+        super(new AdbSocketStream(socket));
+    }
+
+    public write(data: ArrayBuffer): Promise<void> {
+        return this.stream.write(data);
+    }
+}

package/src/stream/index.ts

@@ -1,2 +1,2 @@
-export * from './buffered-stream';
-export * from './stream';
+export * from './buffered-stream';
+export * from './stream';

package/src/stream/stream.ts

@@ -1,50 +1,50 @@
-import { once } from '@yume-chan/event';
-import { ValueOrPromise } from '@yume-chan/struct';
-import { AdbSocket, AdbSocketInfo } from '../socket';
-import { EventQueue } from '../utils';
-
-export class AdbSocketStream implements AdbSocketInfo {
-    private socket: AdbSocket;
-
-    private queue: EventQueue<ArrayBuffer>;
-
-    public get backend() { return this.socket.backend; }
-    public get localId() { return this.socket.localId; }
-    public get remoteId() { return this.socket.remoteId; }
-    public get localCreated() { return this.socket.localCreated; }
-    public get serviceString() { return this.socket.serviceString; }
-
-    public constructor(socket: AdbSocket) {
-        this.socket = socket;
-
-        this.queue = new EventQueue<ArrayBuffer>({
-            highWaterMark: 16 * 1024,
-        });
-
-        this.socket.onData((buffer): ValueOrPromise<void> => {
-            if (!this.queue.enqueue(buffer, buffer.byteLength)) {
-                return once(this.queue.onDrain);
-            }
-        });
-
-        this.socket.onClose(() => {
-            this.queue.end();
-        });
-    }
-
-    public async read(): Promise<ArrayBuffer> {
-        try {
-            return await this.queue.dequeue();
-        } catch {
-            throw new Error('Can not read after AdbSocketStream has been closed');
-        }
-    }
-
-    public write(data: ArrayBuffer): Promise<void> {
-        return this.socket.write(data);
-    }
-
-    close(): void {
-        this.socket.close();
-    }
-}
+import { once } from '@yume-chan/event';
+import { ValueOrPromise } from '@yume-chan/struct';
+import { AdbSocket, AdbSocketInfo } from '../socket';
+import { EventQueue } from '../utils';
+
+export class AdbSocketStream implements AdbSocketInfo {
+    private socket: AdbSocket;
+
+    private queue: EventQueue<ArrayBuffer>;
+
+    public get backend() { return this.socket.backend; }
+    public get localId() { return this.socket.localId; }
+    public get remoteId() { return this.socket.remoteId; }
+    public get localCreated() { return this.socket.localCreated; }
+    public get serviceString() { return this.socket.serviceString; }
+
+    public constructor(socket: AdbSocket) {
+        this.socket = socket;
+
+        this.queue = new EventQueue<ArrayBuffer>({
+            highWaterMark: 16 * 1024,
+        });
+
+        this.socket.onData((buffer): ValueOrPromise<void> => {
+            if (!this.queue.enqueue(buffer, buffer.byteLength)) {
+                return once(this.queue.onDrain);
+            }
+        });
+
+        this.socket.onClose(() => {
+            this.queue.end();
+        });
+    }
+
+    public async read(): Promise<ArrayBuffer> {
+        try {
+            return await this.queue.dequeue();
+        } catch {
+            throw new Error('Can not read after AdbSocketStream has been closed');
+        }
+    }
+
+    public write(data: ArrayBuffer): Promise<void> {
+        return this.socket.write(data);
+    }
+
+    close(): void {
+        this.socket.close();
+    }
+}

package/src/utils/auto-reset-event.ts

@@ -1,41 +1,41 @@
-import { PromiseResolver } from '@yume-chan/async';
-import { Disposable } from '@yume-chan/event';
-
-export class AutoResetEvent implements Disposable {
-    private readonly list: PromiseResolver<void>[] = [];
-
-    private blocking: boolean;
-
-    public constructor(initialSet = false) {
-        this.blocking = initialSet;
-    }
-
-    public wait(): Promise<void> {
-        if (!this.blocking) {
-            this.blocking = true;
-
-            if (this.list.length === 0) {
-                return Promise.resolve();
-            }
-        }
-
-        const resolver = new PromiseResolver<void>();
-        this.list.push(resolver);
-        return resolver.promise;
-    }
-
-    public notify() {
-        if (this.list.length !== 0) {
-            this.list.pop()!.resolve();
-        } else {
-            this.blocking = false;
-        }
-    }
-
-    public dispose() {
-        for (const item of this.list) {
-            item.reject(new Error('The AutoResetEvent has been disposed'));
-        }
-        this.list.length = 0;
-    }
-}
+import { PromiseResolver } from '@yume-chan/async';
+import { Disposable } from '@yume-chan/event';
+
+export class AutoResetEvent implements Disposable {
+    private readonly list: PromiseResolver<void>[] = [];
+
+    private blocking: boolean;
+
+    public constructor(initialSet = false) {
+        this.blocking = initialSet;
+    }
+
+    public wait(): Promise<void> {
+        if (!this.blocking) {
+            this.blocking = true;
+
+            if (this.list.length === 0) {
+                return Promise.resolve();
+            }
+        }
+
+        const resolver = new PromiseResolver<void>();
+        this.list.push(resolver);
+        return resolver.promise;
+    }
+
+    public notify() {
+        if (this.list.length !== 0) {
+            this.list.pop()!.resolve();
+        } else {
+            this.blocking = false;
+        }
+    }
+
+    public dispose() {
+        for (const item of this.list) {
+            item.reject(new Error('The AutoResetEvent has been disposed'));
+        }
+        this.list.length = 0;
+    }
+}