From 8f21f35ec1eaf3ccba046c39309899e65598baed Mon Sep 17 00:00:00 2001 From: Matteo Collina Date: Fri, 8 Sep 2023 10:35:27 +0200 Subject: [PATCH 1/2] Fix fetch in node v20.6.0 Signed-off-by: Matteo Collina --- lib/core/util.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/core/util.js b/lib/core/util.js index 4f8c1f8f1a1..4dd164dd7f1 100644 --- a/lib/core/util.js +++ b/lib/core/util.js @@ -355,6 +355,15 @@ function getSocketInfo (socket) { } } +async function * convertIterableToBuffer (iterable) { + for await (let chunk of iterable) { + if (!Buffer.isBuffer(chunk)) { + chunk = Buffer.from(chunk) + } + yield chunk + } +} + let ReadableStream function ReadableStreamFrom (iterable) { if (!ReadableStream) { @@ -362,8 +371,7 @@ function ReadableStreamFrom (iterable) { } if (ReadableStream.from) { - // https://github.com/whatwg/streams/pull/1083 - return ReadableStream.from(iterable) + return ReadableStream.from(convertIterableToBuffer(iterable)) } let iterator From 07d801de7c1957997f93477a374c5bf92188346f Mon Sep 17 00:00:00 2001 From: Matteo Collina Date: Fri, 8 Sep 2023 10:48:42 +0200 Subject: [PATCH 2/2] fixup Signed-off-by: Matteo Collina --- lib/core/util.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/core/util.js b/lib/core/util.js index 4dd164dd7f1..88e34a90123 100644 --- a/lib/core/util.js +++ b/lib/core/util.js @@ -356,11 +356,8 @@ function getSocketInfo (socket) { } async function * convertIterableToBuffer (iterable) { - for await (let chunk of iterable) { - if (!Buffer.isBuffer(chunk)) { - chunk = Buffer.from(chunk) - } - yield chunk + for await (const chunk of iterable) { + yield Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk) } }