From 1433a180f7c0c156cdc40e8efd7fa3c5738bfc04 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Wed, 21 Feb 2024 08:22:32 +0100
Subject: [PATCH] refactor: move web stuff into their own folder

Refs: https://github.com/nodejs/undici/issues/2732
---
 index-fetch.js                                | 16 +++++-----
 index.js                                      | 30 +++++++++----------
 lib/cache/symbols.js                          |  5 ----
 lib/{ => web}/cache/cache.js                  |  4 +--
 lib/{ => web}/cache/cachestorage.js           |  2 +-
 lib/web/cache/symbols.js                      |  5 ++++
 lib/{ => web}/cache/util.js                   |  0
 lib/{ => web}/cookies/constants.js            |  0
 lib/{ => web}/cookies/index.js                |  0
 lib/{ => web}/cookies/parse.js                |  0
 lib/{ => web}/cookies/util.js                 |  2 +-
 .../eventsource/eventsource-stream.js         |  0
 lib/{ => web}/eventsource/eventsource.js      |  2 +-
 lib/{ => web}/eventsource/util.js             |  0
 lib/{ => web}/fetch/LICENSE                   |  0
 lib/{ => web}/fetch/body.js                   |  4 +--
 lib/{ => web}/fetch/constants.js              |  0
 lib/{ => web}/fetch/dataURL.js                |  0
 lib/{ => web}/fetch/file.js                   |  2 +-
 lib/{ => web}/fetch/formdata.js               |  2 +-
 lib/{ => web}/fetch/global.js                 |  0
 lib/{ => web}/fetch/headers.js                |  4 +--
 lib/{ => web}/fetch/index.js                  |  4 +--
 lib/{ => web}/fetch/request.js                |  6 ++--
 lib/{ => web}/fetch/response.js               |  4 +--
 lib/{ => web}/fetch/symbols.js                |  0
 lib/{ => web}/fetch/util.js                   |  2 +-
 lib/{ => web}/fetch/webidl.js                 |  2 +-
 lib/{ => web}/fileapi/encoding.js             |  0
 lib/{ => web}/fileapi/filereader.js           |  0
 lib/{ => web}/fileapi/progressevent.js        |  0
 lib/{ => web}/fileapi/symbols.js              |  0
 lib/{ => web}/fileapi/util.js                 |  0
 lib/{ => web}/websocket/connection.js         |  0
 lib/{ => web}/websocket/constants.js          |  0
 lib/{ => web}/websocket/events.js             |  0
 lib/{ => web}/websocket/frame.js              |  0
 lib/{ => web}/websocket/receiver.js           |  0
 lib/{ => web}/websocket/symbols.js            |  0
 lib/{ => web}/websocket/util.js               |  0
 lib/{ => web}/websocket/websocket.js          |  0
 41 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 lib/cache/symbols.js
 rename lib/{ => web}/cache/cache.js (99%)
 rename lib/{ => web}/cache/cachestorage.js (98%)
 create mode 100644 lib/web/cache/symbols.js
 rename lib/{ => web}/cache/util.js (100%)
 rename lib/{ => web}/cookies/constants.js (100%)
 rename lib/{ => web}/cookies/index.js (100%)
 rename lib/{ => web}/cookies/parse.js (100%)
 rename lib/{ => web}/cookies/util.js (99%)
 rename lib/{ => web}/eventsource/eventsource-stream.js (100%)
 rename lib/{ => web}/eventsource/eventsource.js (99%)
 rename lib/{ => web}/eventsource/util.js (100%)
 rename lib/{ => web}/fetch/LICENSE (100%)
 rename lib/{ => web}/fetch/body.js (99%)
 rename lib/{ => web}/fetch/constants.js (100%)
 rename lib/{ => web}/fetch/dataURL.js (100%)
 rename lib/{ => web}/fetch/file.js (99%)
 rename lib/{ => web}/fetch/formdata.js (99%)
 rename lib/{ => web}/fetch/global.js (100%)
 rename lib/{ => web}/fetch/headers.js (99%)
 rename lib/{ => web}/fetch/index.js (99%)
 rename lib/{ => web}/fetch/request.js (99%)
 rename lib/{ => web}/fetch/response.js (99%)
 rename lib/{ => web}/fetch/symbols.js (100%)
 rename lib/{ => web}/fetch/util.js (99%)
 rename lib/{ => web}/fetch/webidl.js (99%)
 rename lib/{ => web}/fileapi/encoding.js (100%)
 rename lib/{ => web}/fileapi/filereader.js (100%)
 rename lib/{ => web}/fileapi/progressevent.js (100%)
 rename lib/{ => web}/fileapi/symbols.js (100%)
 rename lib/{ => web}/fileapi/util.js (100%)
 rename lib/{ => web}/websocket/connection.js (100%)
 rename lib/{ => web}/websocket/constants.js (100%)
 rename lib/{ => web}/websocket/events.js (100%)
 rename lib/{ => web}/websocket/frame.js (100%)
 rename lib/{ => web}/websocket/receiver.js (100%)
 rename lib/{ => web}/websocket/symbols.js (100%)
 rename lib/{ => web}/websocket/util.js (100%)
 rename lib/{ => web}/websocket/websocket.js (100%)

diff --git a/index-fetch.js b/index-fetch.js
index 851731865b5..b8b3f3c7cac 100644
--- a/index-fetch.js
+++ b/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
diff --git a/index.js b/index.js
index 2e274b24029..f2a4057d803 100644
--- a/index.js
+++ b/index.js
@@ -94,7 +94,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)
@@ -106,39 +106,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
@@ -154,6 +154,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
diff --git a/lib/cache/symbols.js b/lib/cache/symbols.js
deleted file mode 100644
index 40448d6001e..00000000000
--- a/lib/cache/symbols.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict'
-
-module.exports = {
-  kConstruct: require('../core/symbols').kConstruct
-}
diff --git a/lib/cache/cache.js b/lib/web/cache/cache.js
similarity index 99%
rename from lib/cache/cache.js
rename to lib/web/cache/cache.js
index 74cd802de7f..acbd6c7d0f7 100644
--- a/lib/cache/cache.js
+++ b/lib/web/cache/cache.js
@@ -2,7 +2,7 @@
 
 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')
@@ -10,7 +10,7 @@ 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
diff --git a/lib/cache/cachestorage.js b/lib/web/cache/cachestorage.js
similarity index 98%
rename from lib/cache/cachestorage.js
rename to lib/web/cache/cachestorage.js
index 4f3351a6a9b..de3813cfecb 100644
--- a/lib/cache/cachestorage.js
+++ b/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 {
   /**
diff --git a/lib/web/cache/symbols.js b/lib/web/cache/symbols.js
new file mode 100644
index 00000000000..9271fb61267
--- /dev/null
+++ b/lib/web/cache/symbols.js
@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+  kConstruct: require('../../core/symbols').kConstruct
+}
diff --git a/lib/cache/util.js b/lib/web/cache/util.js
similarity index 100%
rename from lib/cache/util.js
rename to lib/web/cache/util.js
diff --git a/lib/cookies/constants.js b/lib/web/cookies/constants.js
similarity index 100%
rename from lib/cookies/constants.js
rename to lib/web/cookies/constants.js
diff --git a/lib/cookies/index.js b/lib/web/cookies/index.js
similarity index 100%
rename from lib/cookies/index.js
rename to lib/web/cookies/index.js
diff --git a/lib/cookies/parse.js b/lib/web/cookies/parse.js
similarity index 100%
rename from lib/cookies/parse.js
rename to lib/web/cookies/parse.js
diff --git a/lib/cookies/util.js b/lib/web/cookies/util.js
similarity index 99%
rename from lib/cookies/util.js
rename to lib/web/cookies/util.js
index 203c4bcf37c..0c1353d5ca3 100644
--- a/lib/cookies/util.js
+++ b/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) {
diff --git a/lib/eventsource/eventsource-stream.js b/lib/web/eventsource/eventsource-stream.js
similarity index 100%
rename from lib/eventsource/eventsource-stream.js
rename to lib/web/eventsource/eventsource-stream.js
diff --git a/lib/eventsource/eventsource.js b/lib/web/eventsource/eventsource.js
similarity index 99%
rename from lib/eventsource/eventsource.js
rename to lib/web/eventsource/eventsource.js
index ee61cfde880..ad6ea26dcd1 100644
--- a/lib/eventsource/eventsource.js
+++ b/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
diff --git a/lib/eventsource/util.js b/lib/web/eventsource/util.js
similarity index 100%
rename from lib/eventsource/util.js
rename to lib/web/eventsource/util.js
diff --git a/lib/fetch/LICENSE b/lib/web/fetch/LICENSE
similarity index 100%
rename from lib/fetch/LICENSE
rename to lib/web/fetch/LICENSE
diff --git a/lib/fetch/body.js b/lib/web/fetch/body.js
similarity index 99%
rename from lib/fetch/body.js
rename to lib/web/fetch/body.js
index 65fd63c5b23..4b81fcedc42 100644
--- a/lib/fetch/body.js
+++ b/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')
diff --git a/lib/fetch/constants.js b/lib/web/fetch/constants.js
similarity index 100%
rename from lib/fetch/constants.js
rename to lib/web/fetch/constants.js
diff --git a/lib/fetch/dataURL.js b/lib/web/fetch/dataURL.js
similarity index 100%
rename from lib/fetch/dataURL.js
rename to lib/web/fetch/dataURL.js
diff --git a/lib/fetch/file.js b/lib/web/fetch/file.js
similarity index 99%
rename from lib/fetch/file.js
rename to lib/web/fetch/file.js
index d52feb3e3c9..61a232017b2 100644
--- a/lib/fetch/file.js
+++ b/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 {
diff --git a/lib/fetch/formdata.js b/lib/web/fetch/formdata.js
similarity index 99%
rename from lib/fetch/formdata.js
rename to lib/web/fetch/formdata.js
index 80df2b8f399..e8dcd6fa614 100644
--- a/lib/fetch/formdata.js
+++ b/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')
diff --git a/lib/fetch/global.js b/lib/web/fetch/global.js
similarity index 100%
rename from lib/fetch/global.js
rename to lib/web/fetch/global.js
diff --git a/lib/fetch/headers.js b/lib/web/fetch/headers.js
similarity index 99%
rename from lib/fetch/headers.js
rename to lib/web/fetch/headers.js
index 41ae9b02368..770c9380874 100644
--- a/lib/fetch/headers.js
+++ b/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,
diff --git a/lib/fetch/index.js b/lib/web/fetch/index.js
similarity index 99%
rename from lib/fetch/index.js
rename to lib/web/fetch/index.js
index f65bfbe78da..f4a6e5e6262 100644
--- a/lib/fetch/index.js
+++ b/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']
diff --git a/lib/fetch/request.js b/lib/web/fetch/request.js
similarity index 99%
rename from lib/fetch/request.js
rename to lib/web/fetch/request.js
index 998e407e527..03b64a678c1 100644
--- a/lib/fetch/request.js
+++ b/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('../../compat/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')
 
diff --git a/lib/fetch/response.js b/lib/web/fetch/response.js
similarity index 99%
rename from lib/fetch/response.js
rename to lib/web/fetch/response.js
index 69aba18ba6e..355c2847aba 100644
--- a/lib/fetch/response.js
+++ b/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')
 
diff --git a/lib/fetch/symbols.js b/lib/web/fetch/symbols.js
similarity index 100%
rename from lib/fetch/symbols.js
rename to lib/web/fetch/symbols.js
diff --git a/lib/fetch/util.js b/lib/web/fetch/util.js
similarity index 99%
rename from lib/fetch/util.js
rename to lib/web/fetch/util.js
index c07db2338a4..b3523cb2e15 100644
--- a/lib/fetch/util.js
+++ b/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')
diff --git a/lib/fetch/webidl.js b/lib/web/fetch/webidl.js
similarity index 99%
rename from lib/fetch/webidl.js
rename to lib/web/fetch/webidl.js
index 0978e67f26f..da5df4a362f 100644
--- a/lib/fetch/webidl.js
+++ b/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 = {}
diff --git a/lib/fileapi/encoding.js b/lib/web/fileapi/encoding.js
similarity index 100%
rename from lib/fileapi/encoding.js
rename to lib/web/fileapi/encoding.js
diff --git a/lib/fileapi/filereader.js b/lib/web/fileapi/filereader.js
similarity index 100%
rename from lib/fileapi/filereader.js
rename to lib/web/fileapi/filereader.js
diff --git a/lib/fileapi/progressevent.js b/lib/web/fileapi/progressevent.js
similarity index 100%
rename from lib/fileapi/progressevent.js
rename to lib/web/fileapi/progressevent.js
diff --git a/lib/fileapi/symbols.js b/lib/web/fileapi/symbols.js
similarity index 100%
rename from lib/fileapi/symbols.js
rename to lib/web/fileapi/symbols.js
diff --git a/lib/fileapi/util.js b/lib/web/fileapi/util.js
similarity index 100%
rename from lib/fileapi/util.js
rename to lib/web/fileapi/util.js
diff --git a/lib/websocket/connection.js b/lib/web/websocket/connection.js
similarity index 100%
rename from lib/websocket/connection.js
rename to lib/web/websocket/connection.js
diff --git a/lib/websocket/constants.js b/lib/web/websocket/constants.js
similarity index 100%
rename from lib/websocket/constants.js
rename to lib/web/websocket/constants.js
diff --git a/lib/websocket/events.js b/lib/web/websocket/events.js
similarity index 100%
rename from lib/websocket/events.js
rename to lib/web/websocket/events.js
diff --git a/lib/websocket/frame.js b/lib/web/websocket/frame.js
similarity index 100%
rename from lib/websocket/frame.js
rename to lib/web/websocket/frame.js
diff --git a/lib/websocket/receiver.js b/lib/web/websocket/receiver.js
similarity index 100%
rename from lib/websocket/receiver.js
rename to lib/web/websocket/receiver.js
diff --git a/lib/websocket/symbols.js b/lib/web/websocket/symbols.js
similarity index 100%
rename from lib/websocket/symbols.js
rename to lib/web/websocket/symbols.js
diff --git a/lib/websocket/util.js b/lib/web/websocket/util.js
similarity index 100%
rename from lib/websocket/util.js
rename to lib/web/websocket/util.js
diff --git a/lib/websocket/websocket.js b/lib/web/websocket/websocket.js
similarity index 100%
rename from lib/websocket/websocket.js
rename to lib/web/websocket/websocket.js