egg 3.0.0 → 3.1.0

package/config/config.default.js

@@ -290,6 +290,7 @@ module.exports = appInfo => {
    * @property {Number} httpsAgent.freeSocketTimeout - httpss agent socket keepalive max free time, default is 4000 ms.
    * @property {Number} httpsAgent.maxSockets - https agent max socket number of one host, default is `Number.MAX_SAFE_INTEGER` @ses https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/MAX_SAFE_INTEGER
    * @property {Number} httpsAgent.maxFreeSockets - https agent max free socket number of one host, default is 256.
+   * @property {Boolean} useHttpClientNext - use urllib@3 HttpClient
    */
   config.httpclient = {
     enableDNSCache: false,
@@ -311,6 +312,7 @@ module.exports = appInfo => {
       maxSockets: Number.MAX_SAFE_INTEGER,
       maxFreeSockets: 256,
     },
+    useHttpClientNext: false,
   };
 
   /**

package/index.d.ts

@@ -270,6 +270,8 @@ declare module 'egg' {
     dnsCacheLookupInterval?: number;
     /** DNS cache max age */
     dnsCacheMaxLength?: number;
+    /** use urllib@3 HttpClient */
+    useHttpClientNext?: boolean;
   }
 
   export interface EggAppConfig {

package/lib/core/httpclient_next.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const { HttpClient } = require('urllib-next');
+const ms = require('humanize-ms');
+
+class HttpClientNext extends HttpClient {
+  constructor(app) {
+    normalizeConfig(app);
+    const config = app.config.httpclient;
+    super({
+      app,
+      defaultArgs: config.request,
+    });
+    this.app = app;
+  }
+
+  async request(url, options) {
+    options = options || {};
+    if (options.ctx && options.ctx.tracer) {
+      options.tracer = options.ctx.tracer;
+    } else {
+      options.tracer = options.tracer || this.app.tracer;
+    }
+    return await super.request(url, options);
+  }
+
+  async curl(...args) {
+    return await this.request(...args);
+  }
+}
+
+function normalizeConfig(app) {
+  const config = app.config.httpclient;
+  if (typeof config.request.timeout === 'string') {
+    config.request.timeout = ms(config.request.timeout);
+  }
+}
+
+module.exports = HttpClientNext;

package/lib/egg.js

@@ -15,6 +15,7 @@ const ContextHttpClient = require('./core/context_httpclient');
 const Messenger = require('./core/messenger');
 const DNSCacheHttpClient = require('./core/dnscache_httpclient');
 const HttpClient = require('./core/httpclient');
+const HttpClientNext = require('./core/httpclient_next');
 const createLoggers = require('./core/logger');
 const Singleton = require('./core/singleton');
 const utils = require('./core/utils');
@@ -291,7 +292,9 @@ class EggApplication extends EggCore {
    */
   get httpclient() {
     if (!this[HTTPCLIENT]) {
-      if (this.config.httpclient.enableDNSCache) {
+      if (this.config.httpclient.useHttpClientNext) {
+        this[HTTPCLIENT] = new HttpClientNext(this);
+      } else if (this.config.httpclient.enableDNSCache) {
         this[HTTPCLIENT] = new DNSCacheHttpClient(this);
       } else {
         this[HTTPCLIENT] = new this.HttpClient(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "A web framework's framework for Node.js",
   "keywords": [
     "web",
@@ -53,6 +53,7 @@
     "semver": "^7.3.2",
     "sendmessage": "^1.1.0",
     "urllib": "^2.33.0",
+    "urllib-next": "^3.1.1",
     "utility": "^1.15.0",
     "ylru": "^1.2.1"
   },