refactor: move web stuff into their own folder (nodejs#2793)

Refs: nodejs#2732

benchmarks/cacheGetFieldValues.mjs

@@ -1,5 +1,5 @@
 import { bench, group, run } from 'mitata'
-import { getFieldValues } from '../lib/cache/util.js'
+import { getFieldValues } from '../lib/web/cache/util.js'
 
 const values = [
   '',

benchmarks/headers-length32.mjs

@@ -1,5 +1,5 @@
 import { bench, run } from 'mitata'
-import { Headers } from '../lib/fetch/headers.js'
+import { Headers } from '../lib/web/fetch/headers.js'
 
 const headers = new Headers(
   [

benchmarks/headers.mjs

@@ -1,5 +1,5 @@
 import { bench, group, run } from 'mitata'
-import { Headers } from '../lib/fetch/headers.js'
+import { Headers } from '../lib/web/fetch/headers.js'
 
 const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
 const charactersLength = characters.length

benchmarks/sort.mjs

@@ -1,5 +1,5 @@
 import { bench, group, run } from 'mitata'
-import { sort, heapSort, introSort } from '../lib/fetch/sort.js'
+import { sort, heapSort, introSort } from '../lib/web/fetch/sort.js'
 
 function compare (a, b) {
   return a < b ? -1 : 1

index-fetch.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 
 module.exports.fetch = function fetch (resource, init = undefined) {
   return fetchImpl(resource, init).catch((err) => {
@@ -10,12 +10,12 @@ module.exports.fetch = function fetch (resource, init = undefined) {
     throw err
   })
 }
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
 
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
-module.exports.MessageEvent = require('./lib/websocket/events').MessageEvent
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
+module.exports.MessageEvent = require('./lib/web/websocket/events').MessageEvent
 
-module.exports.EventSource = require('./lib/eventsource/eventsource').EventSource
+module.exports.EventSource = require('./lib/web/eventsource/eventsource').EventSource

index.js

@@ -96,7 +96,7 @@ function makeDispatcher (fn) {
 module.exports.setGlobalDispatcher = setGlobalDispatcher
 module.exports.getGlobalDispatcher = getGlobalDispatcher
 
-const fetchImpl = require('./lib/fetch').fetch
+const fetchImpl = require('./lib/web/fetch').fetch
 module.exports.fetch = async function fetch (init, options = undefined) {
   try {
     return await fetchImpl(init, options)
@@ -108,39 +108,39 @@ module.exports.fetch = async function fetch (init, options = undefined) {
     throw err
   }
 }
-module.exports.Headers = require('./lib/fetch/headers').Headers
-module.exports.Response = require('./lib/fetch/response').Response
-module.exports.Request = require('./lib/fetch/request').Request
-module.exports.FormData = require('./lib/fetch/formdata').FormData
-module.exports.File = require('./lib/fetch/file').File
-module.exports.FileReader = require('./lib/fileapi/filereader').FileReader
+module.exports.Headers = require('./lib/web/fetch/headers').Headers
+module.exports.Response = require('./lib/web/fetch/response').Response
+module.exports.Request = require('./lib/web/fetch/request').Request
+module.exports.FormData = require('./lib/web/fetch/formdata').FormData
+module.exports.File = require('./lib/web/fetch/file').File
+module.exports.FileReader = require('./lib/web/fileapi/filereader').FileReader
 
-const { setGlobalOrigin, getGlobalOrigin } = require('./lib/fetch/global')
+const { setGlobalOrigin, getGlobalOrigin } = require('./lib/web/fetch/global')
 
 module.exports.setGlobalOrigin = setGlobalOrigin
 module.exports.getGlobalOrigin = getGlobalOrigin
 
-const { CacheStorage } = require('./lib/cache/cachestorage')
-const { kConstruct } = require('./lib/cache/symbols')
+const { CacheStorage } = require('./lib/web/cache/cachestorage')
+const { kConstruct } = require('./lib/web/cache/symbols')
 
 // Cache & CacheStorage are tightly coupled with fetch. Even if it may run
 // in an older version of Node, it doesn't have any use without fetch.
 module.exports.caches = new CacheStorage(kConstruct)
 
-const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/cookies')
+const { deleteCookie, getCookies, getSetCookies, setCookie } = require('./lib/web/cookies')
 
 module.exports.deleteCookie = deleteCookie
 module.exports.getCookies = getCookies
 module.exports.getSetCookies = getSetCookies
 module.exports.setCookie = setCookie
 
-const { parseMIMEType, serializeAMimeType } = require('./lib/fetch/dataURL')
+const { parseMIMEType, serializeAMimeType } = require('./lib/web/fetch/dataURL')
 
 module.exports.parseMIMEType = parseMIMEType
 module.exports.serializeAMimeType = serializeAMimeType
 
-const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/websocket/events')
-module.exports.WebSocket = require('./lib/websocket/websocket').WebSocket
+const { CloseEvent, ErrorEvent, MessageEvent } = require('./lib/web/websocket/events')
+module.exports.WebSocket = require('./lib/web/websocket/websocket').WebSocket
 module.exports.CloseEvent = CloseEvent
 module.exports.ErrorEvent = ErrorEvent
 module.exports.MessageEvent = MessageEvent
@@ -156,6 +156,6 @@ module.exports.MockPool = MockPool
 module.exports.MockAgent = MockAgent
 module.exports.mockErrors = mockErrors
 
-const { EventSource } = require('./lib/eventsource/eventsource')
+const { EventSource } = require('./lib/web/eventsource/eventsource')
 
 module.exports.EventSource = EventSource

lib/client.js

@@ -1500,7 +1500,7 @@ function write (client, request) {
 
   if (util.isFormDataLike(body)) {
     if (!extractBody) {
-      extractBody = require('./fetch/body.js').extractBody
+      extractBody = require('./web/fetch/body.js').extractBody
     }
 
     const [bodyStream, contentType] = extractBody(body)

lib/mock/mock-interceptor.js

@@ -74,7 +74,7 @@ class MockInterceptor {
       if (opts.query) {
         opts.path = buildURL(opts.path, opts.query)
       } else {
-        // Matches https://github.com/nodejs/undici/blob/main/lib/fetch/index.js#L1811
+        // Matches https://github.com/nodejs/undici/blob/main/lib/web/fetch/index.js#L1811
         const parsedURL = new URL(opts.path, 'data://')
         opts.path = parsedURL.pathname + parsedURL.search
       }

lib/cache/cache.js → lib/web/cache/cache.js

@@ -2,15 +2,15 @@
 
 const { kConstruct } = require('./symbols')
 const { urlEquals, getFieldValues } = require('./util')
-const { kEnumerableProperty, isDisturbed } = require('../core/util')
+const { kEnumerableProperty, isDisturbed } = require('../../core/util')
 const { webidl } = require('../fetch/webidl')
 const { Response, cloneResponse, fromInnerResponse } = require('../fetch/response')
 const { Request, fromInnerRequest } = require('../fetch/request')
 const { kState } = require('../fetch/symbols')
 const { fetching } = require('../fetch/index')
 const { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require('../fetch/util')
 const assert = require('node:assert')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 
 /**
  * @see https://w3c.github.io/ServiceWorker/#dfn-cache-batch-operation

lib/cache/cachestorage.js → lib/web/cache/cachestorage.js

@@ -3,7 +3,7 @@
 const { kConstruct } = require('./symbols')
 const { Cache } = require('./cache')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class CacheStorage {
   /**

lib/web/cache/symbols.js

@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  kConstruct: require('../../core/symbols').kConstruct
+}

lib/cookies/util.js → lib/web/cookies/util.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const assert = require('node:assert')
-const { kHeadersList } = require('../core/symbols')
+const { kHeadersList } = require('../../core/symbols')
 
 function isCTLExcludingHtab (value) {
   if (value.length === 0) {

lib/eventsource/eventsource.js → lib/web/eventsource/eventsource.js

@@ -9,7 +9,7 @@ const { EventSourceStream } = require('./eventsource-stream')
 const { parseMIMEType } = require('../fetch/dataURL')
 const { MessageEvent } = require('../websocket/events')
 const { isNetworkError } = require('../fetch/response')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 const { delay } = require('./util')
 
 let experimentalWarned = false

lib/fetch/body.js → lib/web/fetch/body.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Busboy = require('@fastify/busboy')
-const util = require('../core/util')
+const util = require('../../core/util')
 const {
   ReadableStreamFrom,
   isBlobLike,
@@ -16,7 +16,7 @@ const { kState } = require('./symbols')
 const { webidl } = require('./webidl')
 const { Blob, File: NativeFile } = require('node:buffer')
 const assert = require('node:assert')
-const { isErrored } = require('../core/util')
+const { isErrored } = require('../../core/util')
 const { isArrayBuffer } = require('node:util/types')
 const { File: UndiciFile } = require('./file')
 const { serializeAMimeType } = require('./dataURL')

lib/compat/dispatcher-weakref.js → lib/web/fetch/dispatcher-weakref.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { kConnected, kSize } = require('../core/symbols')
+const { kConnected, kSize } = require('../../core/symbols')
 
 class CompatWeakRef {
   constructor (value) {

lib/fetch/file.js → lib/web/fetch/file.js

@@ -6,7 +6,7 @@ const { kState } = require('./symbols')
 const { isBlobLike } = require('./util')
 const { webidl } = require('./webidl')
 const { parseMIMEType, serializeAMimeType } = require('./dataURL')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const encoder = new TextEncoder()
 
 class File extends Blob {

lib/fetch/formdata.js → lib/web/fetch/formdata.js

@@ -2,7 +2,7 @@
 
 const { isBlobLike, iteratorMixin } = require('./util')
 const { kState } = require('./symbols')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { File: UndiciFile, FileLike, isFileLike } = require('./file')
 const { webidl } = require('./webidl')
 const { File: NativeFile } = require('node:buffer')

lib/fetch/headers.js → lib/web/fetch/headers.js

@@ -2,9 +2,9 @@
 
 'use strict'
 
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const { kGuard } = require('./symbols')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const {
   iteratorMixin,
   isValidHeaderName,

lib/fetch/index.js → lib/web/fetch/index.js

@@ -59,9 +59,9 @@ const {
 } = require('./constants')
 const EE = require('node:events')
 const { Readable, pipeline } = require('node:stream')
-const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../core/util')
+const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor, bufferToLowerCasedHeaderName } = require('../../core/util')
 const { dataURLProcessor, serializeAMimeType, minimizeSupportedMimeType } = require('./dataURL')
-const { getGlobalDispatcher } = require('../global')
+const { getGlobalDispatcher } = require('../../global')
 const { webidl } = require('./webidl')
 const { STATUS_CODES } = require('node:http')
 const GET_OR_HEAD = ['GET', 'HEAD']

lib/fetch/request.js → lib/web/fetch/request.js

@@ -4,8 +4,8 @@
 
 const { extractBody, mixinBody, cloneBody } = require('./body')
 const { Headers, fill: fillHeaders, HeadersList } = require('./headers')
-const { FinalizationRegistry } = require('../compat/dispatcher-weakref')()
-const util = require('../core/util')
+const { FinalizationRegistry } = require('./dispatcher-weakref')()
+const util = require('../../core/util')
 const {
   isValidHTTPToken,
   sameOrigin,
@@ -28,7 +28,7 @@ const { kHeaders, kSignal, kState, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')
 const { getGlobalOrigin } = require('./global')
 const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { getMaxListeners, setMaxListeners, getEventListeners, defaultMaxListeners } = require('node:events')
 

lib/fetch/response.js → lib/web/fetch/response.js

@@ -2,7 +2,7 @@
 
 const { Headers, HeadersList, fill } = require('./headers')
 const { extractBody, cloneBody, mixinBody } = require('./body')
-const util = require('../core/util')
+const util = require('../../core/util')
 const { kEnumerableProperty } = util
 const {
   isValidReasonPhrase,
@@ -22,7 +22,7 @@ const { webidl } = require('./webidl')
 const { FormData } = require('./formdata')
 const { getGlobalOrigin } = require('./global')
 const { URLSerializer } = require('./dataURL')
-const { kHeadersList, kConstruct } = require('../core/symbols')
+const { kHeadersList, kConstruct } = require('../../core/symbols')
 const assert = require('node:assert')
 const { types } = require('node:util')
 

lib/fetch/util.js → lib/web/fetch/util.js

@@ -6,7 +6,7 @@ const { redirectStatusSet, referrerPolicySet: referrerPolicyTokens, badPortsSet
 const { getGlobalOrigin } = require('./global')
 const { collectASequenceOfCodePoints, collectAnHTTPQuotedString, removeChars, parseMIMEType } = require('./dataURL')
 const { performance } = require('node:perf_hooks')
-const { isBlobLike, ReadableStreamFrom, isValidHTTPToken } = require('../core/util')
+const { isBlobLike, ReadableStreamFrom, isValidHTTPToken } = require('../../core/util')
 const assert = require('node:assert')
 const { isUint8Array } = require('node:util/types')
 const { webidl } = require('./webidl')

lib/fetch/webidl.js → lib/web/fetch/webidl.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { types } = require('node:util')
-const { toUSVString } = require('../core/util')
+const { toUSVString } = require('../../core/util')
 
 /** @type {import('../../types/webidl').Webidl} */
 const webidl = {}

lib/fileapi/filereader.js → lib/web/fileapi/filereader.js

@@ -13,7 +13,7 @@ const {
   kAborted
 } = require('./symbols')
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 
 class FileReader extends EventTarget {
   constructor () {

lib/websocket/connection.js → lib/web/websocket/connection.js

@@ -8,13 +8,13 @@ const {
   kReceivedClose
 } = require('./symbols')
 const { fireEvent, failWebsocketConnection } = require('./util')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { CloseEvent } = require('./events')
 const { makeRequest } = require('../fetch/request')
 const { fetching } = require('../fetch/index')
 const { Headers } = require('../fetch/headers')
-const { getGlobalDispatcher } = require('../global')
-const { kHeadersList } = require('../core/symbols')
+const { getGlobalDispatcher } = require('../../global')
+const { kHeadersList } = require('../../core/symbols')
 
 /** @type {import('crypto')} */
 let crypto

lib/websocket/events.js → lib/web/websocket/events.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { webidl } = require('../fetch/webidl')
-const { kEnumerableProperty } = require('../core/util')
+const { kEnumerableProperty } = require('../../core/util')
 const { MessagePort } = require('node:worker_threads')
 
 /**

lib/websocket/receiver.js → lib/web/websocket/receiver.js

@@ -3,7 +3,7 @@
 const { Writable } = require('node:stream')
 const { parserStates, opcodes, states, emptyBuffer } = require('./constants')
 const { kReadyState, kSentClose, kResponse, kReceivedClose } = require('./symbols')
-const { channels } = require('../core/diagnostics')
+const { channels } = require('../../core/diagnostics')
 const { isValidStatusCode, failWebsocketConnection, websocketMessageReceived } = require('./util')
 const { WebsocketFrameSend } = require('./frame')
 

lib/websocket/websocket.js → lib/web/websocket/websocket.js

@@ -17,8 +17,8 @@ const { isEstablished, isClosing, isValidSubprotocol, failWebsocketConnection, f
 const { establishWebSocketConnection } = require('./connection')
 const { WebsocketFrameSend } = require('./frame')
 const { ByteParser } = require('./receiver')
-const { kEnumerableProperty, isBlobLike } = require('../core/util')
-const { getGlobalDispatcher } = require('../global')
+const { kEnumerableProperty, isBlobLike } = require('../../core/util')
+const { getGlobalDispatcher } = require('../../global')
 const { types } = require('node:util')
 
 let experimentalWarned = false

test/cache/get-field-values.js

@@ -2,7 +2,7 @@
 
 const { deepStrictEqual, throws } = require('node:assert')
 const { test } = require('node:test')
-const { getFieldValues } = require('../../lib/cache/util')
+const { getFieldValues } = require('../../lib/web/cache/util')
 
 test('getFieldValues', () => {
   throws(() => getFieldValues(null), {

test/cookie/global-headers.js

@@ -8,7 +8,7 @@ const {
   getSetCookies,
   setCookie
 } = require('../..')
-const { getHeadersList } = require('../../lib/cookies/util')
+const { getHeadersList } = require('../../lib/web/cookies/util')
 
 describe('Using global Headers', async () => {
   test('deleteCookies', () => {