@libp2p/utils 6.7.2 → 7.0.0-55b7e5fea

package/dist/src/stream-utils.js

@@ -0,0 +1,371 @@
+import { StreamMessageEvent, StreamCloseEvent, InvalidParametersError } from '@libp2p/interface';
+import { pipe as itPipe } from 'it-pipe';
+import { pushable } from 'it-pushable';
+import { pEvent } from 'p-event';
+import { raceSignal } from 'race-signal';
+import * as varint from 'uint8-varint';
+import { Uint8ArrayList } from 'uint8arraylist';
+import { UnexpectedEOFError } from './errors.js';
+const DEFAULT_MAX_BUFFER_SIZE = 4_194_304;
+export class UnwrappedError extends Error {
+    static name = 'UnwrappedError';
+    name = 'UnwrappedError';
+}
+/**
+ * The reported length of the next data message was not a positive integer
+ */
+export class InvalidMessageLengthError extends Error {
+    name = 'InvalidMessageLengthError';
+    code = 'ERR_INVALID_MSG_LENGTH';
+}
+/**
+ * The reported length of the next data message was larger than the configured
+ * max allowable value
+ */
+export class InvalidDataLengthError extends Error {
+    name = 'InvalidDataLengthError';
+    code = 'ERR_MSG_DATA_TOO_LONG';
+}
+/**
+ * The varint used to specify the length of the next data message contained more
+ * bytes than the configured max allowable value
+ */
+export class InvalidDataLengthLengthError extends Error {
+    name = 'InvalidDataLengthLengthError';
+    code = 'ERR_MSG_LENGTH_TOO_LONG';
+}
+function isStream(obj) {
+    return typeof obj?.closeRead === 'function';
+}
+function isMultiaddrConnection(obj) {
+    return typeof obj?.close === 'function';
+}
+function isEOF(obj) {
+    if (isStream(obj)) {
+        return obj.readStatus === 'closing' || obj.readStatus === 'closed';
+    }
+    if (isMultiaddrConnection(obj)) {
+        return obj.status !== 'open';
+    }
+    return false;
+}
+function isValid(obj) {
+    return obj?.addEventListener != null && obj?.removeEventListener != null && obj?.send != null && obj?.push != null && obj?.log != null;
+}
+export function byteStream(stream, opts) {
+    const maxBufferSize = opts?.maxBufferSize ?? DEFAULT_MAX_BUFFER_SIZE;
+    const readBuffer = new Uint8ArrayList();
+    let hasBytes;
+    let unwrapped = false;
+    if (!isValid(stream)) {
+        throw new InvalidParametersError('Argument should be a Stream or a Multiaddr');
+    }
+    const byteStreamOnMessageListener = (evt) => {
+        readBuffer.append(evt.data);
+        if (readBuffer.byteLength > maxBufferSize) {
+            const readBufferSize = readBuffer.byteLength;
+            readBuffer.consume(readBuffer.byteLength);
+            hasBytes?.reject(new Error(`Read buffer overflow - ${readBufferSize} > ${maxBufferSize}`));
+        }
+        hasBytes?.resolve();
+    };
+    stream.addEventListener('message', byteStreamOnMessageListener);
+    const byteStreamOnCloseListener = (evt) => {
+        if (evt.error != null) {
+            hasBytes?.reject(evt.error);
+        }
+        else {
+            hasBytes?.resolve();
+        }
+    };
+    stream.addEventListener('close', byteStreamOnCloseListener);
+    const byteStreamOnRemoteCloseWrite = () => {
+        hasBytes?.resolve();
+    };
+    stream.addEventListener('remoteCloseWrite', byteStreamOnRemoteCloseWrite);
+    const byteStream = {
+        readBuffer,
+        // @ts-expect-error options type prevents type inference
+        async read(options) {
+            if (unwrapped === true) {
+                throw new UnwrappedError('Stream was unwrapped');
+            }
+            if (isEOF(stream)) {
+                if (options?.bytes == null) {
+                    return null;
+                }
+                if (readBuffer.byteLength < options.bytes) {
+                    stream.log.error('closed after reading %d/%d bytes', readBuffer.byteLength, options.bytes);
+                    throw new UnexpectedEOFError(`Unexpected EOF - stream closed after reading ${readBuffer.byteLength}/${options.bytes} bytes`);
+                }
+            }
+            const bytesToRead = options?.bytes ?? 1;
+            hasBytes = Promise.withResolvers();
+            while (true) {
+                if (readBuffer.byteLength >= bytesToRead) {
+                    // if we are about to exit the loop this promise will not be awaited
+                    // so resolve it to prevent and unhandled promise rejections that may
+                    // occur
+                    hasBytes.resolve();
+                    break;
+                }
+                await raceSignal(hasBytes.promise, options?.signal);
+                if (isEOF(stream)) {
+                    if (readBuffer.byteLength === 0 && options?.bytes == null) {
+                        return null;
+                    }
+                    break;
+                }
+                hasBytes = Promise.withResolvers();
+            }
+            const toRead = options?.bytes ?? readBuffer.byteLength;
+            if (readBuffer.byteLength < toRead) {
+                if (isEOF(stream)) {
+                    stream.log.error('closed while reading %d/%d bytes', readBuffer.byteLength, toRead);
+                    throw new UnexpectedEOFError(`Unexpected EOF - stream closed while reading ${readBuffer.byteLength}/${toRead} bytes`);
+                }
+                return byteStream.read(options);
+            }
+            const output = readBuffer.sublist(0, toRead);
+            readBuffer.consume(toRead);
+            return output;
+        },
+        async write(data, options) {
+            if (unwrapped === true) {
+                throw new UnwrappedError('Stream was unwrapped');
+            }
+            if (!stream.send(data)) {
+                await pEvent(stream, 'drain', {
+                    signal: options?.signal,
+                    rejectionEvents: ['close']
+                });
+            }
+        },
+        unwrap() {
+            // already unwrapped, just return the original stream
+            if (unwrapped) {
+                return stream;
+            }
+            // only unwrap once
+            unwrapped = true;
+            stream.removeEventListener('message', byteStreamOnMessageListener);
+            stream.removeEventListener('close', byteStreamOnCloseListener);
+            stream.removeEventListener('remoteCloseWrite', byteStreamOnRemoteCloseWrite);
+            // emit any unread data
+            if (readBuffer.byteLength > 0) {
+                stream.log('stream unwrapped with %d unread bytes', readBuffer.byteLength);
+                stream.push(readBuffer);
+            }
+            return stream;
+        }
+    };
+    return byteStream;
+}
+export function lpStream(stream, opts = {}) {
+    const bytes = byteStream(stream, opts);
+    if (opts.maxDataLength != null && opts.maxLengthLength == null) {
+        // if max data length is set but max length length is not, calculate the
+        // max length length needed to encode max data length
+        opts.maxLengthLength = varint.encodingLength(opts.maxDataLength);
+    }
+    const decodeLength = opts?.lengthDecoder ?? varint.decode;
+    const encodeLength = opts?.lengthEncoder ?? varint.encode;
+    const lpStream = {
+        async read(options) {
+            let dataLength = -1;
+            const lengthBuffer = new Uint8ArrayList();
+            while (true) {
+                // read one byte at a time until we can decode a varint
+                const buf = await bytes.read({
+                    ...options,
+                    bytes: 1
+                });
+                // the underlying resource closed gracefully
+                if (buf == null) {
+                    break;
+                }
+                // append byte and try to decode
+                lengthBuffer.append(buf);
+                try {
+                    dataLength = decodeLength(lengthBuffer);
+                }
+                catch (err) {
+                    if (err instanceof RangeError) {
+                        continue;
+                    }
+                    throw err;
+                }
+                if (dataLength < 0) {
+                    throw new InvalidMessageLengthError('Invalid message length');
+                }
+                if (opts?.maxLengthLength != null && lengthBuffer.byteLength > opts.maxLengthLength) {
+                    throw new InvalidDataLengthLengthError(`Message length length too long - ${lengthBuffer.byteLength} > ${opts.maxLengthLength}`);
+                }
+                if (dataLength > -1) {
+                    break;
+                }
+            }
+            if (opts?.maxDataLength != null && dataLength > opts.maxDataLength) {
+                throw new InvalidDataLengthError(`Message length too long - ${dataLength} > ${opts.maxDataLength}`);
+            }
+            const buf = await bytes.read({
+                ...options,
+                bytes: dataLength
+            });
+            if (buf == null) {
+                stream.log.error('tried to read %d bytes but the stream closed', dataLength);
+                throw new UnexpectedEOFError(`Unexpected EOF - tried to read ${dataLength} bytes but the stream closed`);
+            }
+            if (buf.byteLength !== dataLength) {
+                stream.log.error('read %d/%d bytes before the stream closed', buf.byteLength, dataLength);
+                throw new UnexpectedEOFError(`Unexpected EOF - read ${buf.byteLength}/${dataLength} bytes before the stream closed`);
+            }
+            return buf;
+        },
+        async write(data, options) {
+            // encode, write
+            await bytes.write(new Uint8ArrayList(encodeLength(data.byteLength), data), options);
+        },
+        async writeV(data, options) {
+            const list = new Uint8ArrayList(...data.flatMap(buf => ([encodeLength(buf.byteLength), buf])));
+            // encode, write
+            await bytes.write(list, options);
+        },
+        unwrap() {
+            return bytes.unwrap();
+        }
+    };
+    return lpStream;
+}
+export function pbStream(stream, opts) {
+    const lp = lpStream(stream, opts);
+    const pbStream = {
+        read: async (proto, options) => {
+            // readLP, decode
+            const value = await lp.read(options);
+            return proto.decode(value);
+        },
+        write: async (message, proto, options) => {
+            // encode, writeLP
+            await lp.write(proto.encode(message), options);
+        },
+        writeV: async (messages, proto, options) => {
+            // encode, writeLP
+            await lp.writeV(messages.map(message => proto.encode(message)), options);
+        },
+        pb: (proto) => {
+            return {
+                read: async (options) => pbStream.read(proto, options),
+                write: async (d, options) => pbStream.write(d, proto, options),
+                writeV: async (d, options) => pbStream.writeV(d, proto, options),
+                unwrap: () => pbStream
+            };
+        },
+        unwrap: () => {
+            return lp.unwrap();
+        }
+    };
+    return pbStream;
+}
+export async function echo(stream, options) {
+    const log = stream.log.newScope('echo');
+    const start = Date.now();
+    let bytes = 0;
+    try {
+        for await (const buf of stream) {
+            bytes += buf.byteLength;
+            if (!stream.send(buf)) {
+                stream.pause();
+                await pEvent(stream, 'drain', {
+                    rejectionEvents: [
+                        'close'
+                    ],
+                    ...options
+                });
+                stream.resume();
+            }
+        }
+        log('echoed %d bytes in %dms', bytes, Date.now() - start);
+        await stream.close(options);
+    }
+    catch (err) {
+        stream.abort(err);
+    }
+}
+function isMessageStream(obj) {
+    return obj?.addEventListener != null;
+}
+export function messageStreamToDuplex(stream) {
+    const source = pushable();
+    let onError;
+    const onMessage = (evt) => {
+        source.push(evt.data);
+    };
+    const onRemoteCloseWrite = () => {
+        source.end();
+        stream.removeEventListener('message', onMessage);
+        stream.removeEventListener('close', onClose);
+        stream.removeEventListener('remoteCloseWrite', onRemoteCloseWrite);
+    };
+    const onClose = (evt) => {
+        source.end(evt.error);
+        if (evt.error != null) {
+            onError?.reject(evt.error);
+        }
+        stream.removeEventListener('message', onMessage);
+        stream.removeEventListener('close', onClose);
+        stream.removeEventListener('remoteCloseWrite', onRemoteCloseWrite);
+    };
+    stream.addEventListener('message', onMessage);
+    stream.addEventListener('close', onClose, {
+        once: true
+    });
+    stream.addEventListener('remoteCloseWrite', onRemoteCloseWrite, {
+        once: true
+    });
+    return {
+        source,
+        async sink(source) {
+            async function* toGenerator() {
+                yield* source;
+            }
+            const gen = toGenerator();
+            while (true) {
+                onError = Promise.withResolvers();
+                const { done, value } = await Promise.race([
+                    gen.next(),
+                    onError.promise
+                ]);
+                if (stream.writeStatus === 'closing' || stream.writeStatus === 'closed') {
+                    break;
+                }
+                if (value != null) {
+                    if (!stream.send(value)) {
+                        await Promise.race([
+                            pEvent(stream, 'drain', {
+                                rejectionEvents: [
+                                    'close'
+                                ]
+                            })
+                        ]);
+                    }
+                }
+                if (done === true) {
+                    break;
+                }
+            }
+            await stream.close();
+        }
+    };
+}
+export function pipe(...input) {
+    const sources = input.map(source => {
+        if (isMessageStream(source)) {
+            return messageStreamToDuplex(source);
+        }
+        return source;
+    });
+    // @ts-expect-error it-pipe types say args cannot be spread like this
+    return itPipe(...sources);
+}
+//# sourceMappingURL=stream-utils.js.map

package/dist/src/stream-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-utils.js","sourceRoot":"","sources":["../../src/stream-utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "6.7.2",
+  "version": "7.0.0-55b7e5fea",
   "description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/utils#readme",
@@ -17,22 +17,6 @@
   },
   "type": "module",
   "types": "./dist/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "*",
-        "dist/*",
-        "dist/src/*",
-        "dist/src/*/index"
-      ],
-      "src/*": [
-        "*",
-        "dist/*",
-        "dist/src/*",
-        "dist/src/*/index"
-      ]
-    }
-  },
   "files": [
     "src",
     "dist",
@@ -43,135 +27,6 @@
     ".": {
       "types": "./dist/src/index.d.ts",
       "import": "./dist/src/index.js"
-    },
-    "./abort-options": {
-      "types": "./dist/src/abort-options.d.ts",
-      "import": "./dist/src/abort-options.js"
-    },
-    "./abstract-stream": {
-      "types": "./dist/src/abstract-stream.d.ts",
-      "import": "./dist/src/abstract-stream.js"
-    },
-    "./adaptive-timeout": {
-      "types": "./dist/src/adaptive-timeout.d.ts",
-      "import": "./dist/src/adaptive-timeout.js"
-    },
-    "./array-equals": {
-      "types": "./dist/src/array-equals.d.ts",
-      "import": "./dist/src/array-equals.js"
-    },
-    "./close": {
-      "types": "./dist/src/close.d.ts",
-      "import": "./dist/src/close.js"
-    },
-    "./close-source": {
-      "types": "./dist/src/close-source.d.ts",
-      "import": "./dist/src/close-source.js"
-    },
-    "./debounce": {
-      "types": "./dist/src/debounce.d.ts",
-      "import": "./dist/src/debounce.js"
-    },
-    "./filters": {
-      "types": "./dist/src/filters/index.d.ts",
-      "import": "./dist/src/filters/index.js"
-    },
-    "./get-thin-waist-addresses": {
-      "types": "./dist/src/get-thin-waist-addresses.d.ts",
-      "browser": "./dist/src/get-thin-waist-addresses.browser.js",
-      "import": "./dist/src/get-thin-waist-addresses.js"
-    },
-    "./global-unicast-ip": {
-      "types": "./dist/src/global-unicast-ip.d.ts",
-      "import": "./dist/src/global-unicast-ip.js"
-    },
-    "./ip-port-to-multiaddr": {
-      "types": "./dist/src/ip-port-to-multiaddr.d.ts",
-      "import": "./dist/src/ip-port-to-multiaddr.js"
-    },
-    "./is-async-generator": {
-      "types": "./dist/src/is-async-generator.d.ts",
-      "import": "./dist/src/is-async-generator.js"
-    },
-    "./is-generator": {
-      "types": "./dist/src/is-generator.d.ts",
-      "import": "./dist/src/is-generator.js"
-    },
-    "./is-promise": {
-      "types": "./dist/src/is-promise.d.ts",
-      "import": "./dist/src/is-promise.js"
-    },
-    "./link-local-ip": {
-      "types": "./dist/src/link-local-ip.d.ts",
-      "import": "./dist/src/link-local-ip.js"
-    },
-    "./merge-options": {
-      "types": "./dist/src/merge-options.d.ts",
-      "import": "./dist/src/merge-options.js"
-    },
-    "./moving-average": {
-      "types": "./dist/src/moving-average.d.ts",
-      "import": "./dist/src/moving-average.js"
-    },
-    "./multiaddr/is-global-unicast": {
-      "types": "./dist/src/multiaddr/is-global-unicast.d.ts",
-      "import": "./dist/src/multiaddr/is-global-unicast.js"
-    },
-    "./multiaddr/is-ip-based": {
-      "types": "./dist/src/multiaddr/is-ip-based.d.ts",
-      "import": "./dist/src/multiaddr/is-ip-based.js"
-    },
-    "./multiaddr/is-link-local": {
-      "types": "./dist/src/multiaddr/is-link-local.d.ts",
-      "import": "./dist/src/multiaddr/is-link-local.js"
-    },
-    "./multiaddr/is-loopback": {
-      "types": "./dist/src/multiaddr/is-loopback.d.ts",
-      "import": "./dist/src/multiaddr/is-loopback.js"
-    },
-    "./multiaddr/is-network-address": {
-      "types": "./dist/src/multiaddr/is-network-address.d.ts",
-      "import": "./dist/src/multiaddr/is-network-address.js"
-    },
-    "./multiaddr/is-private": {
-      "types": "./dist/src/multiaddr/is-private.d.ts",
-      "import": "./dist/src/multiaddr/is-private.js"
-    },
-    "./peer-queue": {
-      "types": "./dist/src/peer-queue.d.ts",
-      "import": "./dist/src/peer-queue.js"
-    },
-    "./priority-queue": {
-      "types": "./dist/src/priority-queue.d.ts",
-      "import": "./dist/src/priority-queue.js"
-    },
-    "./private-ip": {
-      "types": "./dist/src/private-ip.d.ts",
-      "import": "./dist/src/private-ip.js"
-    },
-    "./queue": {
-      "types": "./dist/src/queue/index.d.ts",
-      "import": "./dist/src/queue/index.js"
-    },
-    "./rate-limiter": {
-      "types": "./dist/src/rate-limiter.d.ts",
-      "import": "./dist/src/rate-limiter.js"
-    },
-    "./repeating-task": {
-      "types": "./dist/src/repeating-task.d.ts",
-      "import": "./dist/src/repeating-task.js"
-    },
-    "./stream-to-ma-conn": {
-      "types": "./dist/src/stream-to-ma-conn.d.ts",
-      "import": "./dist/src/stream-to-ma-conn.js"
-    },
-    "./tracked-list": {
-      "types": "./dist/src/tracked-list.d.ts",
-      "import": "./dist/src/tracked-list.js"
-    },
-    "./tracked-map": {
-      "types": "./dist/src/tracked-map.d.ts",
-      "import": "./dist/src/tracked-map.js"
     }
   },
   "scripts": {
@@ -191,38 +46,36 @@
   "dependencies": {
     "@chainsafe/is-ip": "^2.1.0",
     "@chainsafe/netmask": "^2.0.0",
-    "@libp2p/crypto": "^5.1.8",
-    "@libp2p/interface": "^2.11.0",
-    "@libp2p/logger": "^5.2.0",
-    "@multiformats/multiaddr": "^12.4.4",
+    "@libp2p/crypto": "5.1.9-55b7e5fea",
+    "@libp2p/interface": "3.0.0-55b7e5fea",
+    "@libp2p/logger": "6.0.0-55b7e5fea",
+    "@multiformats/multiaddr": "^13.0.1",
     "@sindresorhus/fnv1a": "^3.1.0",
     "any-signal": "^4.1.1",
+    "cborg": "^4.2.14",
     "delay": "^6.0.0",
-    "get-iterator": "^2.0.1",
     "is-loopback-addr": "^2.0.2",
-    "is-plain-obj": "^4.1.0",
-    "it-foreach": "^2.1.3",
+    "it-length-prefixed": "^10.0.1",
     "it-pipe": "^3.0.1",
     "it-pushable": "^3.2.3",
     "it-stream-types": "^2.0.2",
     "main-event": "^1.0.1",
     "netmask": "^2.0.2",
     "p-defer": "^4.0.1",
-    "race-event": "^1.3.0",
-    "race-signal": "^1.1.3",
+    "p-event": "^7.0.0",
+    "race-signal": "^2.0.0",
+    "uint8-varint": "^2.0.4",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/peer-id": "^5.1.9",
+    "@libp2p/peer-id": "6.0.0-55b7e5fea",
     "@types/netmask": "^2.0.5",
-    "aegir": "^47.0.14",
+    "aegir": "^47.0.22",
     "benchmark": "^2.1.4",
-    "delay": "^6.0.0",
-    "it-all": "^3.0.8",
-    "it-drain": "^3.0.9",
-    "it-pair": "^2.0.6",
-    "sinon": "^20.0.0",
+    "it-all": "^3.0.9",
+    "it-drain": "^3.0.10",
+    "sinon": "^21.0.0",
     "sinon-ts": "^2.0.0",
     "wherearewe": "^2.0.1"
   },