@libp2p/http-utils 1.0.1 → 1.0.2

package/dist/src/stream-to-socket.d.ts

@@ -1,4 +1,39 @@
+import { Duplex } from 'node:stream';
 import type { Connection, Stream } from '@libp2p/interface';
-import type { Socket } from 'node:net';
+import type { Socket, SocketConnectOpts, AddressInfo, SocketReadyState } from 'node:net';
+export declare class Libp2pSocket extends Duplex {
+    #private;
+    readonly autoSelectFamilyAttemptedAddresses: never[];
+    readonly connecting = false;
+    readonly pending = false;
+    remoteAddress: string;
+    bytesRead: number;
+    bytesWritten: number;
+    timeout: number;
+    allowHalfOpen: boolean;
+    constructor();
+    setStream(stream: Stream, connection: Connection): void;
+    _write(chunk: Uint8Array, encoding: string, cb: (err?: Error) => void): void;
+    _read(size: number): void;
+    _destroy(err: Error, cb: (err?: Error) => void): void;
+    _final(cb: (err?: Error) => void): void;
+    get readyState(): SocketReadyState;
+    get bufferSize(): number;
+    destroySoon(): void;
+    connect(options: SocketConnectOpts, connectionListener?: () => void): this;
+    connect(port: number, host: string, connectionListener?: () => void): this;
+    connect(port: number, connectionListener?: () => void): this;
+    connect(path: string, connectionListener?: () => void): this;
+    setEncoding(encoding?: BufferEncoding): this;
+    resetAndDestroy(): this;
+    setTimeout(timeout: number, callback?: () => void): this;
+    setNoDelay(noDelay?: boolean): this;
+    setKeepAlive(enable?: boolean, initialDelay?: number): this;
+    address(): AddressInfo | Record<string, any>;
+    unref(): this;
+    ref(): this;
+    write(buffer: Uint8Array | string, cb?: (err?: Error) => void): boolean;
+    write(str: Uint8Array | string, encoding?: BufferEncoding, cb?: (err?: Error) => void): boolean;
+}
 export declare function streamToSocket(stream: Stream, connection: Connection): Socket;
 //# sourceMappingURL=stream-to-socket.d.ts.map

package/dist/src/stream-to-socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-to-socket.d.ts","sourceRoot":"","sources":["../../src/stream-to-socket.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAoD,MAAM,UAAU,CAAA;AAkMxF,wBAAgB,cAAc,CAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,MAAM,CAE9E"}
+{"version":3,"file":"stream-to-socket.d.ts","sourceRoot":"","sources":["../../src/stream-to-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAIxF,qBAAa,YAAa,SAAQ,MAAM;;IACtC,SAAgB,kCAAkC,UAAK;IACvD,SAAgB,UAAU,SAAQ;IAClC,SAAgB,OAAO,SAAQ;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,SAAc;IACrB,aAAa,EAAE,OAAO,CAAA;;IAc7B,SAAS,CAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAMxD,MAAM,CAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAY7E,KAAK,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IA+B1B,QAAQ,CAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAkBtD,MAAM,CAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAaxC,IAAW,UAAU,IAAK,gBAAgB,CAczC;IAED,IAAW,UAAU,IAAK,MAAM,CAE/B;IAED,WAAW,IAAK,IAAI;IAKpB,OAAO,CAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAC3E,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAC3E,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAC7D,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAM7D,WAAW,CAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI;IAK7C,eAAe,IAAK,IAAI;IAOxB,UAAU,CAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAYzD,UAAU,CAAE,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI;IAMpC,YAAY,CAAE,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAM5D,OAAO,IAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAM7C,KAAK,IAAK,IAAI;IAMd,GAAG,IAAK,IAAI;IAMZ,KAAK,CAAE,MAAM,EAAE,UAAU,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO;IACxE,KAAK,CAAE,GAAG,EAAE,UAAU,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO;CAIjG;AAED,wBAAgB,cAAc,CAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,MAAM,CAK9E"}

package/dist/src/stream-to-socket.js

@@ -1,7 +1,7 @@
 import { Duplex } from 'node:stream';
 import { byteStream } from 'it-byte-stream';
 const MAX_TIMEOUT = 2_147_483_647;
-class Libp2pSocket extends Duplex {
+export class Libp2pSocket extends Duplex {
     autoSelectFamilyAttemptedAddresses = [];
     connecting = false;
     pending = false;
@@ -10,89 +10,92 @@ class Libp2pSocket extends Duplex {
     bytesWritten;
     timeout = MAX_TIMEOUT;
     allowHalfOpen;
-    stream;
-    constructor(stream, connection) {
-        const bytes = byteStream(stream);
-        super({
-            write: (chunk, encoding, cb) => {
-                this.stream.log('write %d bytes', chunk.byteLength);
-                this.bytesWritten += chunk.byteLength;
-                bytes.write(chunk)
-                    .then(() => {
-                    cb();
-                }, err => {
-                    cb(err);
-                });
-            },
-            read: (size) => {
-                this.stream.log('asked to read %d bytes', size);
-                void Promise.resolve().then(async () => {
-                    try {
-                        while (true) {
-                            const chunk = await bytes.read({
-                                signal: AbortSignal.timeout(this.timeout)
-                            });
-                            if (chunk == null) {
-                                this.stream.log('socket readable end closed');
-                                this.push(null);
-                                return;
-                            }
-                            this.bytesRead += chunk.byteLength;
-                            this.stream.log('socket read %d bytes', chunk.byteLength);
-                            const more = this.push(chunk.subarray());
-                            if (!more) {
-                                break;
-                            }
-                        }
+    #stream;
+    #bytes;
+    constructor() {
+        super();
+        this.bytesRead = 0;
+        this.bytesWritten = 0;
+        this.allowHalfOpen = true;
+        this.remoteAddress = '';
+    }
+    setStream(stream, connection) {
+        this.#bytes = byteStream(stream);
+        this.#stream = stream;
+        this.remoteAddress = connection.remoteAddr.toString();
+    }
+    _write(chunk, encoding, cb) {
+        this.#stream?.log('write %d bytes', chunk.byteLength);
+        this.bytesWritten += chunk.byteLength;
+        this.#bytes?.write(chunk)
+            .then(() => {
+            cb();
+        }, err => {
+            cb(err);
+        });
+    }
+    _read(size) {
+        this.#stream?.log('asked to read %d bytes', size);
+        void Promise.resolve().then(async () => {
+            try {
+                while (true) {
+                    const chunk = await this.#bytes?.read({
+                        signal: AbortSignal.timeout(this.timeout)
+                    });
+                    if (chunk == null) {
+                        this.#stream?.log('socket readable end closed');
+                        this.push(null);
+                        return;
                     }
-                    catch (err) {
-                        this.destroy(err);
+                    this.bytesRead += chunk.byteLength;
+                    this.#stream?.log('socket read %d bytes', chunk.byteLength);
+                    const more = this.push(chunk.subarray());
+                    if (!more) {
+                        break;
                     }
-                });
-            },
-            destroy: (err, cb) => {
-                this.stream.log('destroy with %d bytes buffered - %e', this.bufferSize, err);
-                if (err != null) {
-                    bytes.unwrap().abort(err);
-                    cb();
-                }
-                else {
-                    bytes.unwrap().close()
-                        .then(() => {
-                        cb();
-                    })
-                        .catch(err => {
-                        stream.abort(err);
-                        cb(err);
-                    });
                 }
-            },
-            final: (cb) => {
-                this.stream.log('final');
-                bytes.unwrap().closeWrite()
-                    .then(() => {
-                    cb();
-                })
-                    .catch(err => {
-                    bytes.unwrap().abort(err);
-                    cb(err);
-                });
+            }
+            catch (err) {
+                this.destroy(err);
             }
         });
-        this.stream = stream;
-        this.remoteAddress = connection.remoteAddr.toString();
-        this.bytesRead = 0;
-        this.bytesWritten = 0;
-        this.allowHalfOpen = true;
+    }
+    _destroy(err, cb) {
+        this.#stream?.log('destroy with %d bytes buffered - %e', this.bufferSize, err);
+        if (err != null) {
+            this.#bytes?.unwrap().abort(err);
+            cb();
+        }
+        else {
+            this.#bytes?.unwrap().close()
+                .then(() => {
+                cb();
+            })
+                .catch(err => {
+                this.#stream?.abort(err);
+                cb(err);
+            });
+        }
+    }
+    _final(cb) {
+        this.#stream?.log('final');
+        this.#bytes?.unwrap().closeWrite()
+            .then(() => {
+            cb();
+        })
+            .catch(err => {
+            this.#bytes?.unwrap().abort(err);
+            cb(err);
+        });
     }
     get readyState() {
-        if (this.stream.status === 'closed') {
+        if (this.#stream?.status === 'closed') {
             return 'closed';
         }
-        if (this.stream.writeStatus === 'closed' || this.stream.writeStatus === 'closing') {
+        if (this.#stream?.writeStatus === 'closed' || this.#stream?.writeStatus === 'closing') {
             return 'readOnly';
         }
-        if (this.stream.readStatus === 'closed' || this.stream.readStatus === 'closing') {
+        if (this.#stream?.readStatus === 'closed' || this.#stream?.readStatus === 'closing') {
             return 'writeOnly';
         }
         return 'open';
@@ -101,24 +104,24 @@ class Libp2pSocket extends Duplex {
         return this.writableLength;
     }
     destroySoon() {
-        this.stream.log('destroySoon with %d bytes buffered', this.bufferSize);
+        this.#stream?.log('destroySoon with %d bytes buffered', this.bufferSize);
         this.destroy();
     }
     connect(...args) {
-        this.stream.log('connect %o', args);
+        this.#stream?.log('connect %o', args);
         return this;
     }
     setEncoding(encoding) {
-        this.stream.log('setEncoding %s', encoding);
+        this.#stream?.log('setEncoding %s', encoding);
         return this;
     }
     resetAndDestroy() {
-        this.stream.log('resetAndDestroy');
-        this.stream.abort(new Error('Libp2pSocket.resetAndDestroy'));
+        this.#stream?.log('resetAndDestroy');
+        this.#stream?.abort(new Error('Libp2pSocket.resetAndDestroy'));
         return this;
     }
     setTimeout(timeout, callback) {
-        this.stream.log('setTimeout %d', timeout);
+        this.#stream?.log('setTimeout %d', timeout);
         if (callback != null) {
             this.addListener('timeout', callback);
         }
@@ -126,23 +129,23 @@ class Libp2pSocket extends Duplex {
         return this;
     }
     setNoDelay(noDelay) {
-        this.stream.log('setNoDelay %b', noDelay);
+        this.#stream?.log('setNoDelay %b', noDelay);
         return this;
     }
     setKeepAlive(enable, initialDelay) {
-        this.stream.log('setKeepAlive %b %d', enable, initialDelay);
+        this.#stream?.log('setKeepAlive %b %d', enable, initialDelay);
         return this;
     }
     address() {
-        this.stream.log('address');
+        this.#stream?.log('address');
         return {};
     }
     unref() {
-        this.stream.log('unref');
+        this.#stream?.log('unref');
         return this;
     }
     ref() {
-        this.stream.log('ref');
+        this.#stream?.log('ref');
         return this;
     }
     write(chunk, encoding, cb) {
@@ -150,6 +153,8 @@ class Libp2pSocket extends Duplex {
     }
 }
 export function streamToSocket(stream, connection) {
-    return new Libp2pSocket(stream, connection);
+    const socket = new Libp2pSocket();
+    socket.setStream(stream, connection);
+    return socket;
 }
 //# sourceMappingURL=stream-to-socket.js.map

package/dist/src/stream-to-socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-to-socket.js","sourceRoot":"","sources":["../../src/stream-to-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAI3C,MAAM,WAAW,GAAG,aAAa,CAAA;AAEjC,MAAM,YAAa,SAAQ,MAAM;IACf,kCAAkC,GAAG,EAAE,CAAA;IACvC,UAAU,GAAG,KAAK,CAAA;IAClB,OAAO,GAAG,KAAK,CAAA;IACf,aAAa,CAAQ;IAC9B,SAAS,CAAQ;IACjB,YAAY,CAAQ;IACpB,OAAO,GAAG,WAAW,CAAA;IACrB,aAAa,CAAS;IAEZ,MAAM,CAAQ;IAE/B,YAAa,MAAc,EAAE,UAAsB;QACjD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;QAEhC,KAAK,CAAC;YACJ,KAAK,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;gBAEnD,IAAI,CAAC,YAAY,IAAI,KAAK,CAAC,UAAU,CAAA;gBACrC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;qBACf,IAAI,CAAC,GAAG,EAAE;oBACT,EAAE,EAAE,CAAA;gBACN,CAAC,EAAE,GAAG,CAAC,EAAE;oBACP,EAAE,CAAC,GAAG,CAAC,CAAA;gBACT,CAAC,CAAC,CAAA;YACN,CAAC;YACD,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;gBACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAA;gBAE/C,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBACrC,IAAI,CAAC;wBACH,OAAO,IAAI,EAAE,CAAC;4BACZ,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC;gCAC7B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;6BAC1C,CAAC,CAAA;4BAEF,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gCAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;gCAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gCACf,OAAM;4BACR,CAAC;4BAED,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU,CAAA;4BAElC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;4BACzD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAExC,IAAI,CAAC,IAAI,EAAE,CAAC;gCACV,MAAK;4BACP,CAAC;wBACH,CAAC;oBACH,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBACnB,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;gBACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;gBAE5E,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;oBAChB,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACzB,EAAE,EAAE,CAAA;gBACN,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;yBACnB,IAAI,CAAC,GAAG,EAAE;wBACT,EAAE,EAAE,CAAA;oBACN,CAAC,CAAC;yBACD,KAAK,CAAC,GAAG,CAAC,EAAE;wBACX,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;wBACjB,EAAE,CAAC,GAAG,CAAC,CAAA;oBACT,CAAC,CAAC,CAAA;gBACN,CAAC;YACH,CAAC;YACD,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAExB,KAAK,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE;qBACxB,IAAI,CAAC,GAAG,EAAE;oBACT,EAAE,EAAE,CAAA;gBACN,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;oBACzB,EAAE,CAAC,GAAG,CAAC,CAAA;gBACT,CAAC,CAAC,CAAA;YACN,CAAC;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAClB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAA;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,IAAW,UAAU;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YAClF,OAAO,UAAU,CAAA;QACnB,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAChF,OAAO,WAAW,CAAA;QACpB,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAED,WAAW;QACT,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oCAAoC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACtE,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAMD,OAAO,CAAE,GAAG,IAAW;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,WAAW,CAAE,QAAyB;QACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAC3C,OAAO,IAAI,CAAA;IACb,CAAC;IAED,eAAe;QACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAA;QAE5D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,UAAU,CAAE,OAAe,EAAE,QAAqB;QAChD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QAEzC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACvC,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAA;QAEpD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,UAAU,CAAE,OAAiB;QAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;QAEzC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,YAAY,CAAE,MAAgB,EAAE,YAAqB;QACnD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;QAE3D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QAE1B,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAExB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,GAAG;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAEtB,OAAO,IAAI,CAAA;IACb,CAAC;IAID,KAAK,CAAE,KAAU,EAAE,QAAc,EAAE,EAAQ;QACzC,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;IACzC,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAE,MAAc,EAAE,UAAsB;IACpE,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"stream-to-socket.js","sourceRoot":"","sources":["../../src/stream-to-socket.ts"],"names":[],"mappings":"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"}

package/dist/typedoc-urls.json

@@ -3,6 +3,7 @@
   ".:Middleware": "https://libp2p.github.io/js-libp2p-http/interfaces/_libp2p_http-utils.Middleware.html",
   "MiddlewareOptions": "https://libp2p.github.io/js-libp2p-http/interfaces/_libp2p_http.index.MiddlewareOptions.html",
   ".:MiddlewareOptions": "https://libp2p.github.io/js-libp2p-http/interfaces/_libp2p_http-utils.MiddlewareOptions.html",
+  "Libp2pSocket": "https://libp2p.github.io/js-libp2p-http/classes/_libp2p_http-utils.Libp2pSocket.html",
   "Request": "https://libp2p.github.io/js-libp2p-http/classes/_libp2p_http-utils.Request.html",
   "Response": "https://libp2p.github.io/js-libp2p-http/classes/_libp2p_http-utils.Response.html",
   "HeaderInfo": "https://libp2p.github.io/js-libp2p-http/interfaces/_libp2p_http-utils.HeaderInfo.html",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/http-utils",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Shared utils and common code for HTTP modules",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-http/tree/main/packages/http-utils#readme",

package/src/stream-to-socket.ts

@@ -1,115 +1,123 @@
 import { Duplex } from 'node:stream'
 import { byteStream } from 'it-byte-stream'
 import type { Connection, Stream } from '@libp2p/interface'
+import type { ByteStream } from 'it-byte-stream'
 import type { Socket, SocketConnectOpts, AddressInfo, SocketReadyState } from 'node:net'
 
 const MAX_TIMEOUT = 2_147_483_647
 
-class Libp2pSocket extends Duplex {
+export class Libp2pSocket extends Duplex {
   public readonly autoSelectFamilyAttemptedAddresses = []
   public readonly connecting = false
   public readonly pending = false
-  public readonly remoteAddress: string
+  public remoteAddress: string
   public bytesRead: number
   public bytesWritten: number
   public timeout = MAX_TIMEOUT
   public allowHalfOpen: boolean
 
-  private readonly stream: Stream
+  #stream?: Stream
+  #bytes?: ByteStream<Stream>
 
-  constructor (stream: Stream, connection: Connection) {
-    const bytes = byteStream(stream)
+  constructor () {
+    super()
 
-    super({
-      write: (chunk, encoding, cb) => {
-        this.stream.log('write %d bytes', chunk.byteLength)
+    this.bytesRead = 0
+    this.bytesWritten = 0
+    this.allowHalfOpen = true
+    this.remoteAddress = ''
+  }
 
-        this.bytesWritten += chunk.byteLength
-        bytes.write(chunk)
-          .then(() => {
-            cb()
-          }, err => {
-            cb(err)
+  setStream (stream: Stream, connection: Connection): void {
+    this.#bytes = byteStream(stream)
+    this.#stream = stream
+    this.remoteAddress = connection.remoteAddr.toString()
+  }
+
+  _write (chunk: Uint8Array, encoding: string, cb: (err?: Error) => void): void {
+    this.#stream?.log('write %d bytes', chunk.byteLength)
+
+    this.bytesWritten += chunk.byteLength
+    this.#bytes?.write(chunk)
+      .then(() => {
+        cb()
+      }, err => {
+        cb(err)
+      })
+  }
+
+  _read (size: number): void {
+    this.#stream?.log('asked to read %d bytes', size)
+
+    void Promise.resolve().then(async () => {
+      try {
+        while (true) {
+          const chunk = await this.#bytes?.read({
+            signal: AbortSignal.timeout(this.timeout)
           })
-      },
-      read: (size) => {
-        this.stream.log('asked to read %d bytes', size)
-
-        void Promise.resolve().then(async () => {
-          try {
-            while (true) {
-              const chunk = await bytes.read({
-                signal: AbortSignal.timeout(this.timeout)
-              })
-
-              if (chunk == null) {
-                this.stream.log('socket readable end closed')
-                this.push(null)
-                return
-              }
-
-              this.bytesRead += chunk.byteLength
-
-              this.stream.log('socket read %d bytes', chunk.byteLength)
-              const more = this.push(chunk.subarray())
-
-              if (!more) {
-                break
-              }
-            }
-          } catch (err: any) {
-            this.destroy(err)
+
+          if (chunk == null) {
+            this.#stream?.log('socket readable end closed')
+            this.push(null)
+            return
           }
-        })
-      },
-      destroy: (err, cb) => {
-        this.stream.log('destroy with %d bytes buffered - %e', this.bufferSize, err)
 
-        if (err != null) {
-          bytes.unwrap().abort(err)
-          cb()
-        } else {
-          bytes.unwrap().close()
-            .then(() => {
-              cb()
-            })
-            .catch(err => {
-              stream.abort(err)
-              cb(err)
-            })
-        }
-      },
-      final: (cb) => {
-        this.stream.log('final')
+          this.bytesRead += chunk.byteLength
 
-        bytes.unwrap().closeWrite()
-          .then(() => {
-            cb()
-          })
-          .catch(err => {
-            bytes.unwrap().abort(err)
-            cb(err)
-          })
+          this.#stream?.log('socket read %d bytes', chunk.byteLength)
+          const more = this.push(chunk.subarray())
+
+          if (!more) {
+            break
+          }
+        }
+      } catch (err: any) {
+        this.destroy(err)
       }
     })
+  }
 
-    this.stream = stream
-    this.remoteAddress = connection.remoteAddr.toString()
-    this.bytesRead = 0
-    this.bytesWritten = 0
-    this.allowHalfOpen = true
+  _destroy (err: Error, cb: (err?: Error) => void): void {
+    this.#stream?.log('destroy with %d bytes buffered - %e', this.bufferSize, err)
+
+    if (err != null) {
+      this.#bytes?.unwrap().abort(err)
+      cb()
+    } else {
+      this.#bytes?.unwrap().close()
+        .then(() => {
+          cb()
+        })
+        .catch(err => {
+          this.#stream?.abort(err)
+          cb(err)
+        })
+    }
+  }
+
+  _final (cb: (err?: Error) => void): void {
+    this.#stream?.log('final')
+
+    this.#bytes?.unwrap().closeWrite()
+      .then(() => {
+        cb()
+      })
+      .catch(err => {
+        this.#bytes?.unwrap().abort(err)
+        cb(err)
+      })
   }
 
   public get readyState (): SocketReadyState {
-    if (this.stream.status === 'closed') {
+    if (this.#stream?.status === 'closed') {
       return 'closed'
     }
 
-    if (this.stream.writeStatus === 'closed' || this.stream.writeStatus === 'closing') {
+    if (this.#stream?.writeStatus === 'closed' || this.#stream?.writeStatus === 'closing') {
       return 'readOnly'
     }
 
-    if (this.stream.readStatus === 'closed' || this.stream.readStatus === 'closing') {
+    if (this.#stream?.readStatus === 'closed' || this.#stream?.readStatus === 'closing') {
       return 'writeOnly'
     }
 
@@ -121,7 +129,7 @@ class Libp2pSocket extends Duplex {
   }
 
   destroySoon (): void {
-    this.stream.log('destroySoon with %d bytes buffered', this.bufferSize)
+    this.#stream?.log('destroySoon with %d bytes buffered', this.bufferSize)
     this.destroy()
   }
 
@@ -130,24 +138,24 @@ class Libp2pSocket extends Duplex {
   connect (port: number, connectionListener?: () => void): this
   connect (path: string, connectionListener?: () => void): this
   connect (...args: any[]): this {
-    this.stream.log('connect %o', args)
+    this.#stream?.log('connect %o', args)
     return this
   }
 
   setEncoding (encoding?: BufferEncoding): this {
-    this.stream.log('setEncoding %s', encoding)
+    this.#stream?.log('setEncoding %s', encoding)
     return this
   }
 
   resetAndDestroy (): this {
-    this.stream.log('resetAndDestroy')
-    this.stream.abort(new Error('Libp2pSocket.resetAndDestroy'))
+    this.#stream?.log('resetAndDestroy')
+    this.#stream?.abort(new Error('Libp2pSocket.resetAndDestroy'))
 
     return this
   }
 
   setTimeout (timeout: number, callback?: () => void): this {
-    this.stream.log('setTimeout %d', timeout)
+    this.#stream?.log('setTimeout %d', timeout)
 
     if (callback != null) {
       this.addListener('timeout', callback)
@@ -159,31 +167,31 @@ class Libp2pSocket extends Duplex {
   }
 
   setNoDelay (noDelay?: boolean): this {
-    this.stream.log('setNoDelay %b', noDelay)
+    this.#stream?.log('setNoDelay %b', noDelay)
 
     return this
   }
 
   setKeepAlive (enable?: boolean, initialDelay?: number): this {
-    this.stream.log('setKeepAlive %b %d', enable, initialDelay)
+    this.#stream?.log('setKeepAlive %b %d', enable, initialDelay)
 
     return this
   }
 
   address (): AddressInfo | Record<string, any> {
-    this.stream.log('address')
+    this.#stream?.log('address')
 
     return {}
   }
 
   unref (): this {
-    this.stream.log('unref')
+    this.#stream?.log('unref')
 
     return this
   }
 
   ref (): this {
-    this.stream.log('ref')
+    this.#stream?.log('ref')
 
     return this
   }
@@ -196,5 +204,8 @@ class Libp2pSocket extends Duplex {
 }
 
 export function streamToSocket (stream: Stream, connection: Connection): Socket {
-  return new Libp2pSocket(stream, connection)
+  const socket = new Libp2pSocket()
+  socket.setStream(stream, connection)
+
+  return socket
 }