egg 3.33.1 → 3.34.0

package/index.d.ts

@@ -295,6 +295,10 @@ declare module 'egg' {
     maxFreeSockets?: number;
   }
 
+  type Dispatcher = FetchFactory['getDispatcher'] extends () => infer R
+    ? R
+    : never;
+
   /** HttpClient config */
   export interface HttpClientConfig extends HttpClientBaseConfig {
     /** http.Agent */
@@ -319,8 +323,8 @@ declare module 'egg' {
     allowH2?: boolean;
     /** Custom lookup function for DNS resolution */
     lookup?: LookupFunction;
+    interceptors?: Parameters<Dispatcher['compose']>;
   }
-
   export interface EggAppConfig {
     workerStartTimeout: number;
     baseDir: string;

package/lib/core/fetch_factory.js

@@ -3,7 +3,8 @@ const debug = require('util').debuglog('egg:lib:core:fetch_factory');
 const mainNodejsVersion = parseInt(process.versions.node.split('.')[0]);
 let FetchFactory;
 let fetch;
-let fetchInitialized = false;
+// Track initialization per app instance by storing a WeakMap
+const fetchInitializedMap = new WeakMap();
 let safeFetch;
 let ssrfFetchFactory;
 
@@ -14,15 +15,24 @@ if (mainNodejsVersion >= 20) {
     FetchFactory = urllib4.FetchFactory;
     debug('urllib4 enable');
 
-
-    fetch = function fetch(url, init) {
-      if (!fetchInitialized) {
+    fetch = function(url, init) {
+      if (!fetchInitializedMap.get(this)) {
         const clientOptions = {};
         if (this.config.httpclient?.lookup) {
           clientOptions.lookup = this.config.httpclient.lookup;
         }
         FetchFactory.setClientOptions(clientOptions);
-        fetchInitialized = true;
+
+        // Support custom interceptors via dispatcher.compose
+        // Must be set after setClientOptions because setClientOptions resets dispatcher
+        // interceptors is an array of interceptor functions that follow undici's dispatcher API(undici have not supported clientOptions.interceptors natively yet)
+        if (this.config.httpclient?.interceptors) {
+          const interceptors = this.config.httpclient.interceptors;
+          const originalDispatcher = FetchFactory.getDispatcher();
+          FetchFactory.setDispatcher(originalDispatcher.compose(interceptors));
+        }
+
+        fetchInitializedMap.set(this, true);
       }
       return FetchFactory.fetch(url, init);
     };
@@ -41,6 +51,12 @@ if (mainNodejsVersion >= 20) {
         }
         ssrfFetchFactory = new FetchFactory();
         ssrfFetchFactory.setClientOptions(clientOptions);
+
+        if (this.config.httpclient?.interceptors) {
+          const interceptors = this.config.httpclient.interceptors;
+          const originalDispatcher = ssrfFetchFactory.getDispatcher();
+          ssrfFetchFactory.setDispatcher(originalDispatcher.compose(interceptors));
+        }
       }
       return ssrfFetchFactory.fetch(url, init);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.33.1",
+  "version": "3.34.0",
   "publishConfig": {
     "tag": "release-3.x",
     "access": "public"