From 6294bc5a0221299e97ebbe20028c634c9728bd19 Mon Sep 17 00:00:00 2001 From: Aras Abbasi Date: Sun, 17 Aug 2025 09:50:08 +0200 Subject: [PATCH] chore: improve imports and requires --- lib/dispatcher/proxy-agent.js | 3 +-- lib/web/cache/cache.js | 8 ++++---- lib/web/fetch/response.js | 5 +++-- lib/web/websocket/stream/websocketstream.js | 4 ++-- lib/web/websocket/websocket.js | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/dispatcher/proxy-agent.js b/lib/dispatcher/proxy-agent.js index 139ae6d1727..f0a71f7adbf 100644 --- a/lib/dispatcher/proxy-agent.js +++ b/lib/dispatcher/proxy-agent.js @@ -1,7 +1,6 @@ 'use strict' const { kProxy, kClose, kDestroy, kDispatch } = require('../core/symbols') -const { URL } = require('node:url') const Agent = require('./agent') const Pool = require('./pool') const DispatcherBase = require('./dispatcher-base') @@ -208,7 +207,7 @@ class ProxyAgent extends DispatcherBase { } /** - * @param {import('../types/proxy-agent').ProxyAgent.Options | string | URL} opts + * @param {import('../../types/proxy-agent').ProxyAgent.Options | string | URL} opts * @returns {URL} */ #getUrl (opts) { diff --git a/lib/web/cache/cache.js b/lib/web/cache/cache.js index dd9e2f8163a..70a3787a71d 100644 --- a/lib/web/cache/cache.js +++ b/lib/web/cache/cache.js @@ -18,7 +18,7 @@ const { createDeferredPromise } = require('../../util/promise') * @property {'delete' | 'put'} type * @property {any} request * @property {any} response - * @property {import('../../types/cache').CacheQueryOptions} options + * @property {import('../../../types/cache').CacheQueryOptions} options */ /** @@ -452,7 +452,7 @@ class Cache { /** * @see https://w3c.github.io/ServiceWorker/#dom-cache-keys * @param {any} request - * @param {import('../../types/cache').CacheQueryOptions} options + * @param {import('../../../types/cache').CacheQueryOptions} options * @returns {Promise} */ async keys (request = undefined, options = {}) { @@ -670,7 +670,7 @@ class Cache { /** * @see https://w3c.github.io/ServiceWorker/#query-cache * @param {any} requestQuery - * @param {import('../../types/cache').CacheQueryOptions} options + * @param {import('../../../types/cache').CacheQueryOptions} options * @param {requestResponseList} targetStorage * @returns {requestResponseList} */ @@ -695,7 +695,7 @@ class Cache { * @param {any} requestQuery * @param {any} request * @param {any | null} response - * @param {import('../../types/cache').CacheQueryOptions | undefined} options + * @param {import('../../../types/cache').CacheQueryOptions | undefined} options * @returns {boolean} */ #requestMatchesCachedItem (requestQuery, request, response = null, options) { diff --git a/lib/web/fetch/response.js b/lib/web/fetch/response.js index fba44ef6dca..ab5e699cb41 100644 --- a/lib/web/fetch/response.js +++ b/lib/web/fetch/response.js @@ -22,7 +22,8 @@ const { webidl } = require('../webidl') const { URLSerializer } = require('./data-url') const { kConstruct } = require('../../core/symbols') const assert = require('node:assert') -const { types } = require('node:util') + +const { isArrayBuffer } = nodeUtil.types const textEncoder = new TextEncoder('utf-8') @@ -576,7 +577,7 @@ webidl.converters.XMLHttpRequestBodyInit = function (V, prefix, name) { return V } - if (ArrayBuffer.isView(V) || types.isArrayBuffer(V)) { + if (ArrayBuffer.isView(V) || isArrayBuffer(V)) { return V } diff --git a/lib/web/websocket/stream/websocketstream.js b/lib/web/websocket/stream/websocketstream.js index dc364a00e66..e7a8bce614a 100644 --- a/lib/web/websocket/stream/websocketstream.js +++ b/lib/web/websocket/stream/websocketstream.js @@ -6,7 +6,7 @@ const { states, opcodes, sentCloseFrameState } = require('../constants') const { webidl } = require('../../webidl') const { getURLRecord, isValidSubprotocol, isEstablished, utf8Decode } = require('../util') const { establishWebSocketConnection, failWebsocketConnection, closeWebSocketConnection } = require('../connection') -const { types } = require('node:util') +const { isArrayBuffer } = require('node:util/types') const { channels } = require('../../../core/diagnostics') const { WebsocketFrameSend } = require('../frame') const { ByteParser } = require('../receiver') @@ -210,7 +210,7 @@ class WebSocketStream { let opcode = null // 4. If chunk is a BufferSource , - if (ArrayBuffer.isView(chunk) || types.isArrayBuffer(chunk)) { + if (ArrayBuffer.isView(chunk) || isArrayBuffer(chunk)) { // 4.1. Set data to a copy of the bytes given chunk . data = new Uint8Array(ArrayBuffer.isView(chunk) ? new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength) : chunk) diff --git a/lib/web/websocket/websocket.js b/lib/web/websocket/websocket.js index 32e716c489d..1f10cb0a73a 100644 --- a/lib/web/websocket/websocket.js +++ b/lib/web/websocket/websocket.js @@ -1,5 +1,6 @@ 'use strict' +const { isArrayBuffer } = require('node:util/types') const { webidl } = require('../webidl') const { URLSerializer } = require('../fetch/data-url') const { environmentSettingsObject } = require('../fetch/util') @@ -19,7 +20,6 @@ const { establishWebSocketConnection, closeWebSocketConnection, failWebsocketCon const { ByteParser } = require('./receiver') const { kEnumerableProperty } = require('../../core/util') const { getGlobalDispatcher } = require('../../global') -const { types } = require('node:util') const { ErrorEvent, CloseEvent, createFastMessageEvent } = require('./events') const { SendQueue } = require('./sender') const { WebsocketFrameSend } = require('./frame') @@ -257,7 +257,7 @@ class WebSocket extends EventTarget { this.#sendQueue.add(buffer, () => { this.#bufferedAmount -= buffer.byteLength }, sendHints.text) - } else if (types.isArrayBuffer(data)) { + } else if (isArrayBuffer(data)) { // If the WebSocket connection is established, and the WebSocket // closing handshake has not yet started, then the user agent must // send a WebSocket Message comprised of data using a binary frame @@ -735,7 +735,7 @@ webidl.converters.WebSocketSendData = function (V) { return V } - if (ArrayBuffer.isView(V) || types.isArrayBuffer(V)) { + if (ArrayBuffer.isView(V) || isArrayBuffer(V)) { return V } }