refactor: move fetch util to core util

nodejs · Nov 22, 2021 · af20fdc · af20fdc
1 parent 8097b96
commit af20fdc
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 41 deletions.
diff --git a/lib/api/readable.js b/lib/api/readable.js
@@ -6,7 +6,7 @@ const assert = require('assert')
 const { Readable } = require('stream')
 const { RequestAbortedError, NotSupportedError } = require('../core/errors')
 const util = require('../core/util')
-const { ReadableStreamFrom, toUSVString } = require('../fetch/util')
+const { ReadableStreamFrom, toUSVString } = require('../core/util')
 
 let Blob
 

diff --git a/lib/core/util.js b/lib/core/util.js
@@ -7,6 +7,7 @@ const stream = require('stream')
 const net = require('net')
 const { InvalidArgumentError } = require('./errors')
 const { Blob } = require('buffer')
+const nodeUtil = require('util')
 
 function nop () {}
 
@@ -269,13 +270,51 @@ function getSocketInfo (socket) {
   }
 }
 
+let ReadableStream
+function ReadableStreamFrom (iterable) {
+  if (!ReadableStream) {
+    ReadableStream = require('stream/web').ReadableStream
+  }
+
+  if (ReadableStream.from) {
+    // https://github.com/whatwg/streams/pull/1083
+    return ReadableStream.from(iterable)
+  }
+
+  let iterator
+  return new ReadableStream(
+    {
+      async start () {
+        iterator = iterable[Symbol.asyncIterator]()
+      },
+      async pull (controller) {
+        const { done, value } = await iterator.next()
+        if (done) {
+          queueMicrotask(() => {
+            controller.close()
+          })
+        } else {
+          const buf = Buffer.isBuffer(value) ? value : Buffer.from(value)
+          controller.enqueue(new Uint8Array(buf))
+        }
+        return controller.desiredSize > 0
+      },
+      async cancel (reason) {
+        await iterator.return()
+      }
+    },
+    0
+  )
+}
+
 const kEnumerableProperty = Object.create(null)
 kEnumerableProperty.enumerable = true
 
 module.exports = {
   kEnumerableProperty,
   nop,
   isDisturbed,
+  toUSVString: nodeUtil.toUSVString || ((val) => `${val}`),
   isAborted,
   isBlobLike,
   parseOrigin,
@@ -290,6 +329,7 @@ module.exports = {
   destroy,
   bodyLength,
   deepClone,
+  ReadableStreamFrom,
   isBuffer,
   isBlob,
   validateHandler,

diff --git a/lib/fetch/util.js b/lib/fetch/util.js
@@ -2,11 +2,9 @@
 
 const { redirectStatus } = require('./constants')
 const { performance } = require('perf_hooks')
-const nodeUtil = require('util')
-const { isBlobLike } = require('../core/util')
+const { isBlobLike, toUSVString, ReadableStreamFrom } = require('../core/util')
 
 let File
-let ReadableStream
 
 // https://fetch.spec.whatwg.org/#block-bad-port
 const badPorts = [
@@ -145,42 +143,6 @@ function isValidHTTPToken (characters) {
   return true
 }
 
-function ReadableStreamFrom (iterable) {
-  if (!ReadableStream) {
-    ReadableStream = require('stream/web').ReadableStream
-  }
-
-  if (ReadableStream.from) {
-    // https://github.com/whatwg/streams/pull/1083
-    return ReadableStream.from(iterable)
-  }
-
-  let iterator
-  return new ReadableStream(
-    {
-      async start () {
-        iterator = iterable[Symbol.asyncIterator]()
-      },
-      async pull (controller) {
-        const { done, value } = await iterator.next()
-        if (done) {
-          queueMicrotask(() => {
-            controller.close()
-          })
-        } else {
-          const buf = Buffer.isBuffer(value) ? value : Buffer.from(value)
-          controller.enqueue(new Uint8Array(buf))
-        }
-        return controller.desiredSize > 0
-      },
-      async cancel (reason) {
-        await iterator.return()
-      }
-    },
-    0
-  )
-}
-
 // https://w3c.github.io/webappsec-referrer-policy/#set-requests-referrer-policy-on-redirect
 function setRequestReferrerPolicyOnRedirect (request, actualResponse) {
   //  Given a request request and a response actualResponse, this algorithm
@@ -343,7 +305,8 @@ module.exports = {
   ServiceWorkerGlobalScope,
   Window,
   EnvironmentSettingsObject,
-  toUSVString: nodeUtil.toUSVString || ((val) => `${val}`),
+  ReadableStreamFrom,
+  toUSVString,
   tryUpgradeRequestToAPotentiallyTrustworthyURL,
   coarsenedSharedCurrentTime,
   matchRequestIntegrity,