Revert "feat: upgrade to undici v7 (#547)"

This reverts commit 9803c4e.
node-modules · Nov 30, 2024 · cbf75b6 · cbf75b6
1 parent e030ec9
commit cbf75b6
Show file tree

Hide file tree

Showing 19 changed files with 98 additions and 498 deletions.
diff --git a/examples/h2-other-side-closed-exit-0-fetch.cjs b/examples/h2-other-side-closed-exit-0-fetch.cjs
diff --git a/examples/h2-other-side-closed-exit-0.cjs b/examples/h2-other-side-closed-exit-0.cjs
diff --git a/examples/longruning.cjs b/examples/longruning.cjs
diff --git a/package.json b/package.json
@@ -44,12 +44,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "form-data": "^4.0.1",
     "formstream": "^1.5.1",
     "mime-types": "^2.1.35",
     "qs": "^6.12.1",
     "type-fest": "^4.20.1",
-    "undici": "^7.0.0",
+    "undici": "^6.19.2",
     "ylru": "^2.0.0"
   },
   "devDependencies": {
@@ -69,7 +68,6 @@
     "cross-env": "^7.0.3",
     "eslint": "8",
     "eslint-config-egg": "14",
-    "https-pem": "^3.0.0",
     "iconv-lite": "^0.6.3",
     "proxy": "^1.0.2",
     "selfsigned": "^2.0.1",

diff --git a/scripts/replace_urllib_version.js b/scripts/replace_urllib_version.js
@@ -13,9 +13,8 @@ async function main() {
   for (const file of files) {
     const content = await fs.readFile(file, 'utf-8');
     // replace "const VERSION = 'VERSION';" to "const VERSION = '4.0.0';"
-    // "exports.VERSION = 'VERSION';" => "exports.VERSION = '4.0.0';"
-    const newContent = content.replace(/ = 'VERSION';/, match => {
-      const after = ` = '${pkg.version}';`;
+    const newContent = content.replace(/const VERSION = 'VERSION';/, match => {
+      const after = `const VERSION = '${pkg.version}';`;
       console.log('[%s] %s => %s', file, match, after);
       return after;
     });

diff --git a/src/FetchOpaqueInterceptor.ts b/src/FetchOpaqueInterceptor.ts
@@ -32,7 +32,7 @@ export interface OpaqueInterceptorOptions {
 export function fetchOpaqueInterceptor(opts: OpaqueInterceptorOptions) {
   const opaqueLocalStorage = opts?.opaqueLocalStorage;
   return (dispatch: Dispatcher['dispatch']): Dispatcher['dispatch'] => {
-    return function redirectInterceptor(opts: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler) {
+    return function redirectInterceptor(opts: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers) {
       const opaque = opaqueLocalStorage?.getStore();
       (handler as any).opaque = opaque;
       return dispatch(opts, handler);

diff --git a/src/FormData.ts b/src/FormData.ts
diff --git a/src/HttpAgent.ts b/src/HttpAgent.ts
@@ -70,7 +70,7 @@ export class HttpAgent extends Agent {
     this.#checkAddress = options.checkAddress;
   }
 
-  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean {
+  dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean {
     if (this.#checkAddress && options.origin) {
       const originUrl = typeof options.origin === 'string' ? new URL(options.origin) : options.origin;
       let hostname = originUrl.hostname;