@lodestar/reqresp 1.41.0-dev.ef310100c0 → 1.41.0-dev.f2caa915ab

package/lib/utils/protocolId.d.ts

@@ -1,10 +1,10 @@
 import { Encoding, ProtocolAttributes } from "../types.js";
 /**
- * https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/phase0/p2p-interface.md#protocol-identification
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#protocol-identification
  */
 export declare function formatProtocolID(protocolPrefix: string, method: string, version: number, encoding: Encoding): string;
 /**
- * https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/phase0/p2p-interface.md#protocol-identification
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#protocol-identification
  */
 export declare function parseProtocolID(protocolId: string): ProtocolAttributes;
 //# sourceMappingURL=protocolId.d.ts.map

package/lib/utils/protocolId.js

@@ -1,12 +1,12 @@
 import { Encoding } from "../types.js";
 /**
- * https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/phase0/p2p-interface.md#protocol-identification
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#protocol-identification
  */
 export function formatProtocolID(protocolPrefix, method, version, encoding) {
     return `${protocolPrefix}/${method}/${version}/${encoding}`;
 }
 /**
- * https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/phase0/p2p-interface.md#protocol-identification
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#protocol-identification
  */
 export function parseProtocolID(protocolId) {
     const result = protocolId.split("/");

package/lib/utils/snappyCompress.d.ts

@@ -1,2 +1,2 @@
-export declare function encodeSnappy(bytes: Buffer): AsyncGenerator<Buffer>;
+export declare function encodeSnappy(bytes: Buffer): Generator<Buffer>;
 //# sourceMappingURL=snappyCompress.d.ts.map

package/lib/utils/snappyCompress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snappyCompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyCompress.ts"],"names":[],"mappings":"AAKA,wBAAuB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAmBzE"}
+{"version":3,"file":"snappyCompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyCompress.ts"],"names":[],"mappings":"AAKA,wBAAiB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAmB9D"}

package/lib/utils/snappyCompress.js

@@ -2,7 +2,7 @@
 import { compressSync } from "snappy";
 import { ChunkType, IDENTIFIER_FRAME, UNCOMPRESSED_CHUNK_SIZE, crc } from "./snappyCommon.js";
 // The logic in this file is largely copied (in simplified form) from https://github.com/ChainSafe/node-snappy-stream/
-export async function* encodeSnappy(bytes) {
+export function* encodeSnappy(bytes) {
     yield IDENTIFIER_FRAME;
     for (let i = 0; i < bytes.length; i += UNCOMPRESSED_CHUNK_SIZE) {
         const chunk = bytes.subarray(i, i + UNCOMPRESSED_CHUNK_SIZE);

package/lib/utils/snappyCompress.js.map

@@ -1 +1 @@
-{"version":3,"file":"snappyCompress.js","sourceRoot":"","sources":["../../src/utils/snappyCompress.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAC,SAAS,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,EAAC,MAAM,mBAAmB,CAAC;AAE5F,sHAAsH;AACtH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,YAAY,CAAC,KAAa;IAC/C,MAAM,gBAAgB,CAAC;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QAClH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;YAC9B,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,EAAE;gBACF,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;gBAClE,GAAG,CAAC,KAAK,CAAC;gBACV,KAAK;aACN,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"snappyCompress.js","sourceRoot":"","sources":["../../src/utils/snappyCompress.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAC,SAAS,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,EAAC,MAAM,mBAAmB,CAAC;AAE5F,sHAAsH;AACtH,MAAM,SAAS,CAAC,CAAC,YAAY,CAAC,KAAa;IACzC,MAAM,gBAAgB,CAAC;IAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QAClH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;YAC9B,MAAM,MAAM,CAAC,MAAM,CAAC;gBAClB,EAAE;gBACF,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;gBAClE,GAAG,CAAC,KAAK,CAAC;gBACV,KAAK;aACN,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC"}

package/lib/utils/snappyIndex.d.ts

@@ -1,4 +1,4 @@
 export * from "./snappyCommon.js";
 export { encodeSnappy } from "./snappyCompress.js";
-export { SnappyFramesUncompress } from "./snappyUncompress.js";
+export * from "./snappyUncompress.js";
 //# sourceMappingURL=snappyIndex.d.ts.map

package/lib/utils/snappyIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snappyIndex.d.ts","sourceRoot":"","sources":["../../src/utils/snappyIndex.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAC,sBAAsB,EAAC,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"snappyIndex.d.ts","sourceRoot":"","sources":["../../src/utils/snappyIndex.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACjD,cAAc,uBAAuB,CAAC"}

package/lib/utils/snappyIndex.js

@@ -1,4 +1,4 @@
 export * from "./snappyCommon.js";
 export { encodeSnappy } from "./snappyCompress.js";
-export { SnappyFramesUncompress } from "./snappyUncompress.js";
+export * from "./snappyUncompress.js";
 //# sourceMappingURL=snappyIndex.js.map

package/lib/utils/snappyIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"snappyIndex.js","sourceRoot":"","sources":["../../src/utils/snappyIndex.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAC,sBAAsB,EAAC,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"snappyIndex.js","sourceRoot":"","sources":["../../src/utils/snappyIndex.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACjD,cAAc,uBAAuB,CAAC"}

package/lib/utils/snappyUncompress.d.ts

@@ -1,13 +1,9 @@
 import { Uint8ArrayList } from "uint8arraylist";
-export declare class SnappyFramesUncompress {
-    private buffer;
-    private state;
-    /**
-     * Accepts chunk of data containing some part of snappy frames stream
-     * @param chunk
-     * @return Buffer if there is one or more whole frames, null if it's partial
-     */
-    uncompress(chunk: Uint8ArrayList): Uint8ArrayList | null;
-    reset(): void;
-}
+import { ChunkType } from "./snappyCommon.js";
+export declare function parseSnappyFrameHeader(header: Uint8Array): {
+    type: ChunkType;
+    frameSize: number;
+};
+export declare function decodeSnappyFrameData(type: ChunkType, frame: Uint8Array): Uint8Array | null;
+export declare function decodeSnappyFrames(data: Uint8Array): Uint8ArrayList;
 //# sourceMappingURL=snappyUncompress.d.ts.map

package/lib/utils/snappyUncompress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snappyUncompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyUncompress.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAG9C,qBAAa,sBAAsB;IACjC,OAAO,CAAC,MAAM,CAAwB;IAEtC,OAAO,CAAC,KAAK,CAEX;IAEF;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,GAAG,IAAI;IAgExD,KAAK,IAAI,IAAI;CAMd"}
+{"version":3,"file":"snappyUncompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyUncompress.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAA2C,MAAM,mBAAmB,CAAC;AAEtF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAQ/F;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,CAwC3F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAoCnE"}

package/lib/utils/snappyUncompress.js

@@ -1,81 +1,81 @@
 import { uncompress } from "snappyjs";
 import { Uint8ArrayList } from "uint8arraylist";
 import { ChunkType, IDENTIFIER, UNCOMPRESSED_CHUNK_SIZE, crc } from "./snappyCommon.js";
-export class SnappyFramesUncompress {
-    buffer = new Uint8ArrayList();
-    state = {
-        foundIdentifier: false,
-    };
-    /**
-     * Accepts chunk of data containing some part of snappy frames stream
-     * @param chunk
-     * @return Buffer if there is one or more whole frames, null if it's partial
-     */
-    uncompress(chunk) {
-        this.buffer.append(chunk);
-        const result = new Uint8ArrayList();
-        while (this.buffer.length > 0) {
-            if (this.buffer.length < 4)
-                break;
-            const type = getChunkType(this.buffer.get(0));
-            if (!this.state.foundIdentifier && type !== ChunkType.IDENTIFIER) {
-                throw "malformed input: must begin with an identifier";
+export function parseSnappyFrameHeader(header) {
+    if (header.length !== 4) {
+        throw new Error("malformed input: incomplete frame header");
+    }
+    const type = getChunkType(header[0]);
+    const frameSize = header[1] + (header[2] << 8) + (header[3] << 16);
+    return { type, frameSize };
+}
+export function decodeSnappyFrameData(type, frame) {
+    switch (type) {
+        case ChunkType.IDENTIFIER: {
+            if (!Buffer.prototype.equals.call(frame, IDENTIFIER)) {
+                throw new Error("malformed input: bad identifier");
             }
-            const frameSize = getFrameSize(this.buffer, 1);
-            if (this.buffer.length - 4 < frameSize) {
-                break;
+            return null;
+        }
+        case ChunkType.PADDING:
+        case ChunkType.SKIPPABLE:
+            return null;
+        case ChunkType.COMPRESSED: {
+            if (frame.length < 4) {
+                throw new Error("malformed input: too short");
             }
-            const frame = this.buffer.subarray(4, 4 + frameSize);
-            this.buffer.consume(4 + frameSize);
-            switch (type) {
-                case ChunkType.IDENTIFIER: {
-                    if (!Buffer.prototype.equals.call(frame, IDENTIFIER)) {
-                        throw "malformed input: bad identifier";
-                    }
-                    this.state.foundIdentifier = true;
-                    continue;
-                }
-                case ChunkType.PADDING:
-                case ChunkType.SKIPPABLE:
-                    continue;
-                case ChunkType.COMPRESSED: {
-                    const checksum = frame.subarray(0, 4);
-                    const data = frame.subarray(4);
-                    const uncompressed = uncompress(data, UNCOMPRESSED_CHUNK_SIZE);
-                    if (crc(uncompressed).compare(checksum) !== 0) {
-                        throw "malformed input: bad checksum";
-                    }
-                    result.append(uncompressed);
-                    break;
-                }
-                case ChunkType.UNCOMPRESSED: {
-                    const checksum = frame.subarray(0, 4);
-                    const uncompressed = frame.subarray(4);
-                    if (uncompressed.length > UNCOMPRESSED_CHUNK_SIZE) {
-                        throw "malformed input: too large";
-                    }
-                    if (crc(uncompressed).compare(checksum) !== 0) {
-                        throw "malformed input: bad checksum";
-                    }
-                    result.append(uncompressed);
-                    break;
-                }
+            const checksum = frame.subarray(0, 4);
+            const data = frame.subarray(4);
+            const uncompressed = uncompress(data, UNCOMPRESSED_CHUNK_SIZE);
+            if (crc(uncompressed).compare(checksum) !== 0) {
+                throw new Error("malformed input: bad checksum");
             }
+            return uncompressed;
         }
-        if (result.length === 0) {
-            return null;
+        case ChunkType.UNCOMPRESSED: {
+            if (frame.length < 4) {
+                throw new Error("malformed input: too short");
+            }
+            const checksum = frame.subarray(0, 4);
+            const uncompressed = frame.subarray(4);
+            if (uncompressed.length > UNCOMPRESSED_CHUNK_SIZE) {
+                throw new Error("malformed input: too large");
+            }
+            if (crc(uncompressed).compare(checksum) !== 0) {
+                throw new Error("malformed input: bad checksum");
+            }
+            return uncompressed;
         }
-        return result;
-    }
-    reset() {
-        this.buffer = new Uint8ArrayList();
-        this.state = {
-            foundIdentifier: false,
-        };
     }
 }
-function getFrameSize(buffer, offset) {
-    return buffer.get(offset) + (buffer.get(offset + 1) << 8) + (buffer.get(offset + 2) << 16);
+export function decodeSnappyFrames(data) {
+    const out = new Uint8ArrayList();
+    let foundIdentifier = false;
+    let offset = 0;
+    while (offset < data.length) {
+        const remaining = data.length - offset;
+        if (remaining < 4) {
+            throw new Error("malformed input: incomplete frame header");
+        }
+        const { type, frameSize } = parseSnappyFrameHeader(data.subarray(offset, offset + 4));
+        if (!foundIdentifier && type !== ChunkType.IDENTIFIER) {
+            throw new Error("malformed input: must begin with an identifier");
+        }
+        offset += 4;
+        if (data.length - offset < frameSize) {
+            throw new Error("malformed input: incomplete frame");
+        }
+        const frame = data.subarray(offset, offset + frameSize);
+        offset += frameSize;
+        if (type === ChunkType.IDENTIFIER) {
+            foundIdentifier = true;
+        }
+        const uncompressed = decodeSnappyFrameData(type, frame);
+        if (uncompressed !== null) {
+            out.append(uncompressed);
+        }
+    }
+    return out;
 }
 function getChunkType(value) {
     switch (value) {

package/lib/utils/snappyUncompress.js.map

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

package/lib/utils/stream.d.ts

@@ -0,0 +1,6 @@
+import type { Stream } from "@libp2p/interface";
+import { ByteStream } from "@libp2p/utils";
+import { Uint8ArrayList } from "uint8arraylist";
+export declare function sendChunks(stream: Stream, source: Iterable<Uint8Array | Uint8ArrayList> | AsyncIterable<Uint8Array | Uint8ArrayList>, signal?: AbortSignal): Promise<void>;
+export declare function drainByteStream(bytes: ByteStream<Stream>): Uint8Array | undefined;
+//# sourceMappingURL=stream.d.ts.map

package/lib/utils/stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAG9C,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,CAAC,UAAU,GAAG,cAAc,CAAC,GAAG,aAAa,CAAC,UAAU,GAAG,cAAc,CAAC,EAC1F,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,UAAU,GAAG,SAAS,CAYjF"}

package/lib/utils/stream.js

@@ -0,0 +1,21 @@
+import { ErrorAborted } from "@lodestar/utils";
+export async function sendChunks(stream, source, signal) {
+    for await (const chunk of source) {
+        if (signal?.aborted) {
+            throw new ErrorAborted("sendChunks");
+        }
+        if (!stream.send(chunk)) {
+            await stream.onDrain({ signal });
+        }
+    }
+}
+export function drainByteStream(bytes) {
+    const readBuffer = bytes.readBuffer;
+    if (readBuffer && readBuffer.byteLength > 0) {
+        const drained = readBuffer.subarray();
+        readBuffer.consume(readBuffer.byteLength);
+        return drained;
+    }
+    return undefined;
+}
+//# sourceMappingURL=stream.js.map

package/lib/utils/stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,MAA0F,EAC1F,MAAoB;IAEpB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,MAAM,CAAC,OAAO,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAyB;IACvD,MAAM,UAAU,GACd,KAGD,CAAC,UAAU,CAAC;IACb,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.41.0-dev.ef310100c0",
+  "version": "1.41.0-dev.f2caa915ab",
   "type": "module",
   "exports": {
     ".": {
@@ -45,12 +45,11 @@
   },
   "dependencies": {
     "@chainsafe/fast-crc32c": "^4.2.0",
-    "@libp2p/interface": "^2.7.0",
-    "@lodestar/config": "^1.41.0-dev.ef310100c0",
-    "@lodestar/params": "^1.41.0-dev.ef310100c0",
-    "@lodestar/utils": "^1.41.0-dev.ef310100c0",
-    "it-all": "^3.0.4",
-    "it-pipe": "^3.0.1",
+    "@libp2p/interface": "^3.1.0",
+    "@libp2p/utils": "^7.0.11",
+    "@lodestar/config": "^1.41.0-dev.f2caa915ab",
+    "@lodestar/params": "^1.41.0-dev.f2caa915ab",
+    "@lodestar/utils": "^1.41.0-dev.f2caa915ab",
     "snappy": "^7.2.2",
     "snappyjs": "^0.7.0",
     "uint8-varint": "^2.0.2",
@@ -58,16 +57,15 @@
   },
   "devDependencies": {
     "@chainsafe/ssz": "^1.2.2",
-    "@libp2p/crypto": "^5.1.7",
-    "@libp2p/logger": "^5.1.21",
-    "@libp2p/peer-id": "^5.1.8",
-    "@lodestar/logger": "^1.41.0-dev.ef310100c0",
-    "@lodestar/types": "^1.41.0-dev.ef310100c0",
-    "it-stream-types": "^2.0.2",
-    "libp2p": "2.9.0"
+    "@libp2p/crypto": "^5.1.13",
+    "@libp2p/logger": "^6.2.2",
+    "@libp2p/peer-id": "^6.0.4",
+    "@lodestar/logger": "^1.41.0-dev.f2caa915ab",
+    "@lodestar/types": "^1.41.0-dev.f2caa915ab",
+    "libp2p": "3.1.3"
   },
   "peerDependencies": {
-    "libp2p": "~2.9.0"
+    "libp2p": "^3.1.3"
   },
   "keywords": [
     "ethereum",
@@ -77,5 +75,5 @@
     "reqresp",
     "blockchain"
   ],
-  "gitHead": "8ad55796d153df8c5a2de477cd5b990590851a20"
+  "gitHead": "68d33fac21da9c1aa57fe7c24f9721b14ed96761"
 }

package/src/ReqResp.ts

@@ -37,8 +37,8 @@ export interface ReqRespOpts extends SendRequestOpts, ReqRespRateLimiterOpts {
 /**
  * Implementation of Ethereum Consensus p2p Req/Resp domain.
  * For the spec that this code is based on, see:
- * https://github.com/ethereum/consensus-specs/blob/v1.1.10/specs/phase0/p2p-interface.md#the-reqresp-domain
- * https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/p2p-interface.md#the-reqresp-domain
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#the-reqresp-domain
+ * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/altair/light-client/p2p-interface.md#the-reqresp-domain
  */
 export class ReqResp {
   // protected to be usable by extending class
@@ -221,7 +221,7 @@ export class ReqResp {
   }
 
   private getRequestHandler(protocol: MixedProtocol, protocolID: string) {
-    return async ({connection, stream}: {connection: Connection; stream: Stream}) => {
+    return async (stream: Stream, connection: Connection) => {
       if (this.dialOnlyProtocols.get(protocolID)) {
         throw new Error(`Received request on dial only protocol '${protocolID}'`);
       }
@@ -281,7 +281,7 @@ export class ReqResp {
    * ```
    * /ProtocolPrefix/MessageName/SchemaVersion/Encoding
    * ```
-   * https://github.com/ethereum/consensus-specs/blob/v1.2.0/specs/phase0/p2p-interface.md#protocol-identification
+   * https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/p2p-interface.md#protocol-identification
    */
   protected formatProtocolID(protocol: Pick<MixedProtocol, "method" | "version" | "encoding">): string {
     return formatProtocolID(this.protocolPrefix, protocol.method, protocol.version, protocol.encoding);

package/src/encoders/requestDecode.ts

@@ -1,8 +1,8 @@
-import type {Sink} from "it-stream-types";
-import {Uint8ArrayList} from "uint8arraylist";
+import type {Stream} from "@libp2p/interface";
+import {byteStream} from "@libp2p/utils";
 import {readEncodedPayload} from "../encodingStrategies/index.js";
 import {MixedProtocol} from "../types.js";
-import {BufferedSource} from "../utils/index.js";
+import {drainByteStream} from "../utils/stream.ts";
 
 const EMPTY_DATA = new Uint8Array();
 
@@ -12,18 +12,34 @@ const EMPTY_DATA = new Uint8Array();
  * request  ::= <encoding-dependent-header> | <encoded-payload>
  * ```
  */
-export function requestDecode(
-  protocol: MixedProtocol
-): Sink<AsyncIterable<Uint8Array | Uint8ArrayList>, Promise<Uint8Array>> {
-  return async function requestDecodeSink(source) {
-    const type = protocol.requestSizes;
-    if (type === null) {
-      // method has no body
-      return EMPTY_DATA;
-    }
+export async function requestDecode(
+  protocol: MixedProtocol,
+  stream: Stream,
+  signal?: AbortSignal
+): Promise<Uint8Array> {
+  const type = protocol.requestSizes;
+  if (type === null) {
+    // method has no body
+    return EMPTY_DATA;
+  }
 
-    // Request has a single payload, so return immediately
-    const bufferedSource = new BufferedSource(source as AsyncGenerator<Uint8ArrayList>);
-    return readEncodedPayload(bufferedSource, protocol.encoding, type);
-  };
+  // Request has a single payload, so return immediately
+  const bytes = byteStream(stream);
+  let requestReadDone = false;
+  try {
+    const requestBody = await readEncodedPayload(bytes, protocol.encoding, type, signal);
+    requestReadDone = true;
+    return requestBody;
+  } finally {
+    try {
+      if (!requestReadDone) {
+        // Do not push partial bytes back into the stream on decode failure/abort.
+        // This stream is consumed by req/resp only once.
+        drainByteStream(bytes);
+      }
+      bytes.unwrap();
+    } catch {
+      // Ignore unwrap errors - stream may already be closed
+    }
+  }
 }

package/src/encoders/requestEncode.ts

@@ -9,7 +9,7 @@ import {MixedProtocol} from "../types.js";
  * Requests may contain no payload (e.g. /eth2/beacon_chain/req/metadata/1/)
  * if so, it would yield no byte chunks
  */
-export async function* requestEncode(protocol: MixedProtocol, requestBody: Uint8Array): AsyncGenerator<Buffer> {
+export function* requestEncode(protocol: MixedProtocol, requestBody: Uint8Array): Generator<Buffer> {
   const type = protocol.requestSizes;
 
   if (type && requestBody !== null) {