Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6a18fa29 authored by Simon Chan's avatar Simon Chan
Browse files

fix(stream): remove `UnwrapStream`, it doesn't work

parent d862077c

libraries/adb-server-node-tcp/src/index.ts

+2 −6
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ import { 
    MaybeConsumable,

    PushReadableStream,

    tryClose,

    WrapWritableStream,

    WritableStream,

} from "@yume-chan/stream-extra";

import type { ValueOrPromise } from "@yume-chan/struct";
@@ -36,7 +34,7 @@ function nodeSocketToConnection( 
                tryClose(controller);

            });

        }),

        writable: new WritableStream<Uint8Array>({

        writable: new MaybeConsumable.WritableStream<Uint8Array>({

            write: (chunk) => {

                return new Promise<void>((resolve, reject) => {

                    socket.write(chunk, (err) => {
@@ -100,9 +98,7 @@ export class AdbServerNodeTcpConnector 
                await handler({

                    service: address!,

                    readable: connection.readable,

                    writable: new WrapWritableStream(

                        connection.writable,

                    ).bePipedThroughFrom(new MaybeConsumable.UnwrapStream()),

                    writable: connection.writable,

                    get closed() {

                        return connection.closed;

                    },

libraries/adb/src/commands/sync/push.ts

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,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,

libraries/adb/src/commands/sync/socket.ts

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ export class AdbSyncSocketLocked implements AsyncExactReadable { 
        this.#combiner = new BufferCombiner(bufferSize);

    }



    async #write(buffer: Uint8Array) {

    #write(buffer: Uint8Array) {

        // `#combiner` will reuse the buffer, so we need to use the Consumable pattern

        await Consumable.WritableStream.write(this.#writer, buffer);

        return Consumable.WritableStream.write(this.#writer, buffer);

    }



    async flush() {

libraries/adb/src/server/client.ts

+5 −8
Original line number Diff line number Diff line
@@ -6,11 +6,10 @@ import type { 
    AbortSignal,

    ReadableWritablePair,

    WritableStreamDefaultWriter,

    MaybeConsumable,

} from "@yume-chan/stream-extra";

import {

    BufferedReadableStream,

    MaybeConsumable,

    WrapWritableStream,

    tryCancel,

    tryClose,

} from "@yume-chan/stream-extra";
@@ -211,8 +210,8 @@ export class AdbServerClient { 
    readonly wireless = new AdbServerClient.WirelessCommands(this);

    readonly mDns = new AdbServerClient.MDnsCommands(this);



    constructor(connection: AdbServerClient.ServerConnector) {

        this.connector = connection;

    constructor(connector: AdbServerClient.ServerConnector) {

        this.connector = connector;

    }



    async createConnection(
@@ -437,9 +436,7 @@ export class AdbServerClient { 
                transportId,

                service,

                readable: socket.readable,

                writable: new WrapWritableStream(

                    socket.writable,

                ).bePipedThroughFrom(new MaybeConsumable.UnwrapStream()),

                writable: socket.writable,

                get closed() {

                    return socket.closed;

                },
@@ -567,7 +564,7 @@ export namespace AdbServerClient { 
    }



    export interface ServerConnection

        extends ReadableWritablePair<Uint8Array, Uint8Array>,

        extends ReadableWritablePair<Uint8Array, MaybeConsumable<Uint8Array>>,

            Closeable {

        get closed(): Promise<void>;

    }

libraries/adb/src/server/transport.ts

+1 −3
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ export class AdbServerTransport implements AdbTransport { 


    async connect(service: string): Promise<AdbSocket> {

        return await this.#client.createDeviceConnection(

            {

                transportId: this.transportId,

            },

            { transportId: this.transportId },

            service,

        );

    }