egg 3.31.0 → 3.33.0

package/index.d.ts

@@ -2,7 +2,7 @@ import accepts = require('accepts');
 import { AsyncLocalStorage } from 'async_hooks';
 import { EventEmitter } from 'events'
 import { Readable } from 'stream';
-import { Socket } from 'net';
+import { Socket, LookupFunction } from 'net';
 import { IncomingMessage, ServerResponse } from 'http';
 import KoaApplication = require('koa');
 import KoaRouter = require('koa-router');
@@ -317,6 +317,8 @@ declare module 'egg' {
     useHttpClientNext?: boolean;
     /** Allow to use HTTP2 first, only work on `useHttpClientNext = true`. Default is `false` */
     allowH2?: boolean;
+    /** Custom lookup function for DNS resolution */
+    lookup?: LookupFunction;
   }
 
   export interface EggAppConfig {
@@ -1297,4 +1299,4 @@ declare module 'egg' {
   export interface Singleton<T> {
     get(id: string): T;
   }
-}
+}

package/lib/core/fetch_factory.js

@@ -2,6 +2,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;
 let safeFetch;
 let ssrfFetchFactory;
 
@@ -12,15 +14,31 @@ if (mainNodejsVersion >= 20) {
     FetchFactory = urllib4.FetchFactory;
     debug('urllib4 enable');
 
+
+    fetch = function fetch(url, init) {
+      if (!fetchInitialized) {
+        const clientOptions = {};
+        if (this.config.httpclient?.lookup) {
+          clientOptions.lookup = this.config.httpclient.lookup;
+        }
+        FetchFactory.setClientOptions(clientOptions);
+        fetchInitialized = true;
+      }
+      return FetchFactory.fetch(url, init);
+    };
+
     safeFetch = function safeFetch(url, init) {
       if (!ssrfFetchFactory) {
-        const ssrfConfig = this.config.security.ssrf;
+        const ssrfConfig = this.config.security?.ssrf;
         const clientOptions = {};
         if (ssrfConfig?.checkAddress) {
           clientOptions.checkAddress = ssrfConfig.checkAddress;
         } else {
           this.logger.warn('[egg-security] please configure `config.security.ssrf` first');
         }
+        if (this.config.httpclient?.lookup) {
+          clientOptions.lookup = this.config.httpclient.lookup;
+        }
         ssrfFetchFactory = new FetchFactory();
         ssrfFetchFactory.setClientOptions(clientOptions);
       }
@@ -34,4 +52,5 @@ if (mainNodejsVersion >= 20) {
 module.exports = {
   FetchFactory,
   safeFetch,
+  fetch,
 };

package/lib/core/httpclient.js

@@ -30,6 +30,7 @@ class HttpClient extends urllib.HttpClient2 {
     } else {
       args.tracer = args.tracer || this.app.tracer;
     }
+    args.lookup = args.lookup ?? this.app.config.httpclient?.lookup;
 
     try {
       return await super.request(url, args);

package/lib/core/httpclient_next.js

@@ -32,6 +32,7 @@ class HttpClientNext extends HttpClient {
       app,
       defaultArgs: options.request,
       allowH2: options.allowH2,
+      lookup: options.lookup ?? app.config.httpclient?.lookup,
       // use on egg-security ssrf
       // https://github.com/eggjs/egg-security/blob/master/lib/extend/safe_curl.js#L11
       checkAddress: options.checkAddress,
@@ -62,8 +63,12 @@ class HttpClientNext extends HttpClient {
       } else {
         this.app.logger.warn('[egg-security] please configure `config.security.ssrf` first');
       }
+      if (!options.lookup && this.app.config.httpclient.lookup) {
+        options.lookup = this.app.config.httpclient.lookup;
+      }
       this[SSRF_HTTPCLIENT] = new HttpClientNext(this.app, {
         checkAddress: ssrfConfig.checkAddress,
+        lookup: options.lookup,
       });
     }
     return await this[SSRF_HTTPCLIENT].request(url, options);

package/lib/egg.js

@@ -14,7 +14,7 @@ const Messenger = require('./core/messenger');
 const DNSCacheHttpClient = require('./core/dnscache_httpclient');
 const HttpClient = require('./core/httpclient');
 const HttpClientNext = require('./core/httpclient_next');
-const { FetchFactory, safeFetch } = require('./core/fetch_factory');
+const { FetchFactory, safeFetch, fetch } = require('./core/fetch_factory');
 const createLoggers = require('./core/logger');
 const Singleton = require('./core/singleton');
 const utils = require('./core/utils');
@@ -54,11 +54,9 @@ class EggApplication extends EggCore {
     this.HttpClientNext = HttpClientNext;
     this.FetchFactory = FetchFactory;
     if (FetchFactory) {
-      this.FetchFactory.setClientOptions();
-      this.fetch = FetchFactory.fetch;
+      this.fetch = fetch.bind(this);
       this.safeFetch = safeFetch.bind(this);
     }
-
     this.loader.loadConfig();
 
     /**
@@ -297,18 +295,64 @@ class EggApplication extends EggCore {
    * Create a new HttpClient instance with custom options
    * @param {Object} [options] HttpClient init options
    */
-  createHttpClient(options) {
+  createHttpClient(options = {}) {
     let httpClient;
     if (this.config.httpclient.useHttpClientNext || this.config.httpclient.allowH2) {
-      httpClient = new this.HttpClientNext(this, options);
-    } else if (this.config.httpclient.enableDNSCache) {
+      httpClient = this._createHttpClientNextProxy(options);
+    } else if (this.config.httpclient?.enableDNSCache) {
       httpClient = new DNSCacheHttpClient(this, options);
     } else {
+      options.lookup = options.lookup ?? this.config.httpclient.lookup;
       httpClient = new this.HttpClient(this, options);
     }
     return httpClient;
   }
 
+  _createHttpClientNextProxy(options = {}) {
+    const self = this;
+    let realClient = null;
+    const init = () => {
+      if (realClient) return;
+      options.lookup = options.lookup ?? self.config.httpclient.lookup;
+      realClient = new self.HttpClientNext(self, options);
+    };
+    return new Proxy({}, {
+      get(_target, prop) {
+        init();
+        const value = realClient[prop];
+        if (typeof value === 'function') {
+          return value.bind(realClient);
+        }
+        return value;
+      },
+      set(_target, prop, value) {
+        init();
+        realClient[prop] = value;
+        return true;
+      },
+      has(_target, prop) {
+        init();
+        return prop in realClient;
+      },
+      ownKeys() {
+        init();
+        return Reflect.ownKeys(realClient);
+      },
+      getOwnPropertyDescriptor(_target, prop) {
+        init();
+        return Object.getOwnPropertyDescriptor(realClient, prop);
+      },
+      deleteProperty(_target, prop) {
+        init();
+        return delete realClient[prop];
+      },
+      getPrototypeOf() {
+        init();
+        return Object.getPrototypeOf(realClient);
+      },
+    });
+  }
+
   /**
    * HttpClient instance
    * @see https://github.com/node-modules/urllib
@@ -495,7 +539,7 @@ class EggApplication extends EggCore {
     return this.config.env;
   }
   /* eslint no-empty-function: off */
-  set env(_) {}
+  set env(_) { }
 
   /**
    * app.proxy delegate app.config.proxy
@@ -506,7 +550,7 @@ class EggApplication extends EggCore {
     return this.config.proxy;
   }
   /* eslint no-empty-function: off */
-  set proxy(_) {}
+  set proxy(_) { }
 
   /**
    * create a singleton instance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.31.0",
+  "version": "3.33.0",
   "publishConfig": {
     "tag": "release-3.x",
     "access": "public"
@@ -79,10 +79,10 @@
     "eslint": "^8.23.1",
     "eslint-config-egg": "^12.0.0",
     "formstream": "^1.1.1",
-    "https-pem": "^3.0.0",
     "jsdoc": "^3.6.11",
     "koa": "^2.13.4",
     "koa-static": "^5.0.0",
+    "node-forge": "^1.3.3",
     "node-libs-browser": "^2.2.1",
     "pedding": "^1.1.0",
     "prettier": "^2.7.1",
@@ -126,7 +126,7 @@
   "homepage": "https://github.com/eggjs/egg",
   "repository": {
     "type": "git",
-    "url": "https://github.com/eggjs/egg.git"
+    "url": "git+https://github.com/eggjs/egg.git"
   },
   "engines": {
     "node": ">= 14.20.0"