chore: move undici to undici/v6

3846masa · 3846masa · commit c15b908626f0 · 2025-04-13T22:19:29.000+09:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -2,7 +2,7 @@ import { configs as sharedConfigs } from '@3846masa/configs/eslint';
 
 /** @type {import('eslint').Linter.Config[]} */
 const configs = [
-  { ignores: ['dist/', 'http/index.js', 'undici/index.js'] },
+  { ignores: ['dist/', 'http/index.js', 'undici/index.js', 'undici/v6/index.js'] },
   ...sharedConfigs,
   {
     files: ['examples/**/*'],
diff --git a/jest.config.js b/jest.config.js
@@ -1,13 +1,33 @@
 /** @type {import('jest').Config} */
 const config = {
-  extensionsToTreatAsEsm: ['.ts'],
-  injectGlobals: false,
-  roots: ['./src'],
-  setupFiles: ['./jest/setup.ts'],
-  testMatch: ['**/__tests__/*.spec.ts'],
-  transform: {
-    '\\.+(ts)$': 'babel-jest',
-  },
+  projects: [
+    {
+      displayName: 'default',
+      extensionsToTreatAsEsm: ['.ts'],
+      injectGlobals: false,
+      roots: ['./src'],
+      setupFiles: ['./jest/setup.ts'],
+      testMatch: ['**/__tests__/*.spec.ts', '!**/undici/v6/__tests__/*.spec.ts'],
+      transform: {
+        '\\.+(ts)$': 'babel-jest',
+      },
+    },
+    {
+      displayName: 'undici@6',
+      extensionsToTreatAsEsm: ['.ts'],
+      injectGlobals: false,
+      moduleNameMapper: {
+        '^undici$': 'undici@v6',
+        '^undici/(.*)$': 'undici@v6/$1',
+      },
+      roots: ['./src'],
+      setupFiles: ['./jest/setup.ts'],
+      testMatch: ['**/undici/v6/__tests__/*.spec.ts'],
+      transform: {
+        '\\.+(ts)$': 'babel-jest',
+      },
+    },
+  ],
 };
 
 module.exports = config;
diff --git a/package.json b/package.json
@@ -32,7 +32,8 @@
   "author": "3846masa <3846masahiro+git@gmail.com>",
   "exports": {
     "./http": "./http/index.js",
-    "./undici": "./undici/index.js"
+    "./undici": "./undici/index.js",
+    "./undici/v6": "./undici/v6/index.js"
   },
   "files": [
     "dist",
@@ -95,6 +96,7 @@
     "tough-cookie": "5.1.2",
     "typescript": "5.8.3",
     "undici": "7.8.0",
+    "undici@v6": "npm:undici@6.21.2",
     "urllib": "4.4.0"
   },
   "peerDependencies": {
diff --git a/src/undici/v6/__tests__/global_fetch.spec.ts b/src/undici/v6/__tests__/global_fetch.spec.ts
@@ -5,7 +5,7 @@ import { expect, jest, test } from '@jest/globals';
 import semver from 'semver';
 import { CookieJar } from 'tough-cookie';
 
-import { createTestServer } from '../../__tests__/helpers';
+import { createTestServer } from '../../../__tests__/helpers';
 import { CookieAgent } from '../cookie_agent';
 
 if (semver.lt(process.version, 'v18.2.0')) {
diff --git a/src/undici/v6/__tests__/undici.spec.ts b/src/undici/v6/__tests__/undici.spec.ts
@@ -4,7 +4,7 @@ import { expect, jest, test } from '@jest/globals';
 import { CookieJar } from 'tough-cookie';
 import { request } from 'undici';
 
-import { createTestServer } from '../../__tests__/helpers';
+import { createTestServer } from '../../../__tests__/helpers';
 import { CookieAgent } from '../cookie_agent';
 
 test('should set cookies to CookieJar from Set-Cookie header', async () => {
diff --git a/src/undici/v6/__tests__/undici_fetch.spec.ts b/src/undici/v6/__tests__/undici_fetch.spec.ts
@@ -4,7 +4,7 @@ import { expect, jest, test } from '@jest/globals';
 import { CookieJar } from 'tough-cookie';
 import { fetch } from 'undici';
 
-import { createTestServer } from '../../__tests__/helpers';
+import { createTestServer } from '../../../__tests__/helpers';
 import { CookieAgent } from '../cookie_agent';
 
 test('should set cookies to CookieJar from Set-Cookie header', async () => {
diff --git a/src/undici/v6/__tests__/undici_proxy.spec.ts b/src/undici/v6/__tests__/undici_proxy.spec.ts
@@ -2,7 +2,7 @@ import { expect, jest, test } from '@jest/globals';
 import { CookieJar } from 'tough-cookie';
 import { ProxyAgent, request } from 'undici';
 
-import { createTestServerWithProxy } from '../../__tests__/helpers';
+import { createTestServerWithProxy } from '../../../__tests__/helpers';
 import { CookieClient } from '../cookie_client';
 
 test('should set cookies to CookieJar from Set-Cookie header', async () => {
diff --git a/src/undici/v6/__tests__/urllib.spec.skip.ts b/src/undici/v6/__tests__/urllib.spec.skip.ts
@@ -4,7 +4,7 @@ import { expect, jest, test } from '@jest/globals';
 import { CookieJar } from 'tough-cookie';
 import { request } from 'urllib';
 
-import { createTestServer } from '../../__tests__/helpers';
+import { createTestServer } from '../../../__tests__/helpers';
 import { CookieAgent } from '../index';
 
 test('should set cookies to CookieJar from Set-Cookie header', async () => {
diff --git a/src/undici/v6/cookie_agent.ts b/src/undici/v6/cookie_agent.ts
@@ -1,7 +1,7 @@
 import { Agent, errors, Pool } from 'undici';
 
-import type { CookieOptions } from '../cookie_options';
-import { validateCookieOptions } from '../utils/validate_cookie_options';
+import type { CookieOptions } from '../../cookie_options';
+import { validateCookieOptions } from '../../utils/validate_cookie_options';
 
 import { CookieClient } from './cookie_client';
 
diff --git a/src/undici/v6/cookie_client.ts b/src/undici/v6/cookie_client.ts
@@ -2,12 +2,12 @@ import type { Agent, Dispatcher } from 'undici';
 import { Client, RedirectHandler } from 'undici';
 import Symbols from 'undici/lib/core/symbols';
 
-import type { CookieOptions } from '../cookie_options';
-import { createCookieHeaderValue } from '../utils/create_cookie_header_value';
-import { validateCookieOptions } from '../utils/validate_cookie_options';
+import type { CookieOptions } from '../../cookie_options';
+import { convertToHeadersObject } from '../../utils/convert_to_headers_object';
+import { createCookieHeaderValue } from '../../utils/create_cookie_header_value';
+import { validateCookieOptions } from '../../utils/validate_cookie_options';
 
 import { CookieHandler } from './cookie_handler';
-import { convertToHeadersObject } from './utils/convert_to_headers_object';
 
 const kCookieOptions = Symbol('cookieOptions');
 
@@ -34,7 +34,7 @@ function createCookieClient<BaseClient extends Client = Client, BaseClientOption
       }
     }
 
-    override [Symbols.kDispatch](opts: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers) {
+    override [Symbols.kDispatch](opts: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler) {
       const { maxRedirections = this[Symbols.kMaxRedirections] } = opts;
 
       if (maxRedirections) {
diff --git a/src/undici/v6/cookie_handler.ts b/src/undici/v6/cookie_handler.ts
@@ -1,24 +1,34 @@
+/* eslint-disable @typescript-eslint/no-deprecated */
 /* global Buffer */
 import type { Duplex } from 'node:stream';
 
 import type { Dispatcher } from 'undici';
 import { errors } from 'undici';
 
-import type { CookieOptions } from '../cookie_options';
-import { saveCookiesFromHeader } from '../utils/save_cookies_from_header';
+import type { CookieOptions } from '../../cookie_options';
+import { convertToHeadersObject } from '../../utils/convert_to_headers_object';
+import { saveCookiesFromHeader } from '../../utils/save_cookies_from_header';
 
-import { convertToHeadersObject } from './utils/convert_to_headers_object';
+type UndiciV6HandlerMethods =
+  | 'onConnect'
+  | 'onError'
+  | 'onUpgrade'
+  | 'onResponseStarted'
+  | 'onHeaders'
+  | 'onData'
+  | 'onComplete'
+  | 'onBodySent';
 
 const kRequestUrl = Symbol('requestUrl');
 const kCookieOptions = Symbol('cookieOptions');
 const kHandlers = Symbol('handlers');
 
-class CookieHandler implements Required<Dispatcher.DispatchHandlers> {
+class CookieHandler implements Pick<Required<Dispatcher.DispatchHandler>, UndiciV6HandlerMethods> {
   private [kRequestUrl]: string;
   private [kCookieOptions]: CookieOptions;
-  private [kHandlers]: Dispatcher.DispatchHandlers;
+  private [kHandlers]: Dispatcher.DispatchHandler;
 
-  constructor(requestUrl: string, cookieOptions: CookieOptions, handlers: Dispatcher.DispatchHandlers) {
+  constructor(requestUrl: string, cookieOptions: CookieOptions, handlers: Dispatcher.DispatchHandler) {
     this[kRequestUrl] = requestUrl;
     this[kCookieOptions] = cookieOptions;
     this[kHandlers] = handlers;
diff --git a/src/undici/v6/index.ts b/src/undici/v6/index.ts
diff --git a/src/utils/convert_to_headers_object.ts b/src/utils/convert_to_headers_object.ts
diff --git a/undici/index.js b/undici/index.js
diff --git a/undici/v6/index.d.ts b/undici/v6/index.d.ts
diff --git a/undici/v6/index.js b/undici/v6/index.js
@@ -0,0 +1 @@
+module.exports = require('../../dist/undici/v6');

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { configs as sharedConfigs } from '@3846masa/configs/eslint';`
`2`	`2`
`3`	`3`	`/** @type {import('eslint').Linter.Config[]} */`
`4`	`4`	`const configs = [`
`5`		`- { ignores: ['dist/', 'http/index.js', 'undici/index.js'] },`
	`5`	`+ { ignores: ['dist/', 'http/index.js', 'undici/index.js', 'undici/v6/index.js'] },`
`6`	`6`	`...sharedConfigs,`
`7`	`7`	`{`
`8`	`8`	`files: ['examples/*/'],`