egg 3.0.0 → 3.2.0

package/README.md

@@ -32,7 +32,7 @@ $ npm run dev
 $ open http://localhost:7001
 ```
 
-> Node.js >= 8.5.0 required.
+> Node.js >= 14.20.0 required.
 
 ## Documentations
 

package/README.zh-CN.md

@@ -18,7 +18,7 @@
 - 深度框架定制
 - 丰富的[插件](https://github.com/search?q=topic%3Aegg-plugin&type=Repositories)
 
-> 支持 Node.js 8.5.x 及以上版本。
+> 支持 Node.js 14.20.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/agent.js

@@ -10,7 +10,7 @@ const EGG_PATH = Symbol.for('egg#eggPath');
 
 /**
  * Singleton instance in Agent Worker, extend {@link EggApplication}
- * @extends EggApplication
+ * @augments EggApplication
  */
 class Agent extends EggApplication {
   /**

package/lib/application.js

@@ -47,7 +47,7 @@ function escapeHeaderValue(value) {
 // Refs: https://github.com/nodejs/node/blob/b38c81/lib/_http_outgoing.js#L706-L710
 /**
  * Singleton instance in App Worker, extend {@link EggApplication}
- * @extends EggApplication
+ * @augments EggApplication
  */
 class Application extends EggApplication {
 

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/core/messenger/ipc.js

@@ -123,7 +123,7 @@ class Messenger extends EventEmitter {
   }
 
   /**
-   * @method Messenger#on
+   * @function Messenger#on
    * @param {String} action - message key
    * @param {Object} data - message value
    */

package/lib/core/messenger/local.js

@@ -132,7 +132,7 @@ class Messenger extends EventEmitter {
   }
 
   /**
-   * @method Messenger#on
+   * @function Messenger#on
    * @param {String} action - message key
    * @param {Object} data - message value
    */

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');
@@ -30,7 +31,7 @@ const CLUSTER_CLIENTS = Symbol.for('egg#clusterClients');
  * Base on koa's Application
  * @see https://github.com/eggjs/egg-core
  * @see http://koajs.com/#application
- * @extends EggCore
+ * @augments EggCore
  */
 class EggApplication extends EggCore {
 
@@ -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.2.0",
   "description": "A web framework's framework for Node.js",
   "keywords": [
     "web",
@@ -14,83 +14,84 @@
   ],
   "dependencies": {
     "@types/accepts": "^1.3.5",
-    "@types/koa": "^2.0.48",
-    "@types/koa-router": "^7.0.40",
-    "accepts": "^1.3.5",
-    "agentkeepalive": "^4.0.2",
+    "@types/koa": "^2.13.5",
+    "@types/koa-router": "^7.4.4",
+    "accepts": "^1.3.8",
+    "agentkeepalive": "^4.2.1",
     "cache-content-type": "^1.0.1",
     "circular-json-for-egg": "^1.0.0",
-    "cluster-client": "^3.0.1",
-    "debug": "^4.1.1",
+    "cluster-client": "^3.1.1",
+    "debug": "^4.3.4",
     "delegates": "^1.0.0",
-    "egg-cluster": "^1.23.0",
-    "egg-cookies": "^2.3.0",
-    "egg-core": "^4.18.0",
-    "egg-development": "^2.4.2",
-    "egg-errors": "^2.3.0",
-    "egg-i18n": "^2.0.0",
+    "egg-cluster": "^1.27.1",
+    "egg-cookies": "^2.6.1",
+    "egg-core": "^4.26.1",
+    "egg-development": "^2.7.0",
+    "egg-errors": "^2.3.1",
+    "egg-i18n": "^2.1.1",
     "egg-jsonp": "^2.0.0",
-    "egg-logger": "^2.3.2",
-    "egg-logrotator": "^3.0.5",
-    "egg-multipart": "^2.4.0",
-    "egg-onerror": "^2.1.0",
-    "egg-schedule": "^3.6.0",
-    "egg-security": "^2.4.3",
-    "egg-session": "^3.1.0",
+    "egg-logger": "^2.9.0",
+    "egg-logrotator": "^3.1.0",
+    "egg-multipart": "^3.0.0",
+    "egg-onerror": "^2.1.1",
+    "egg-schedule": "^3.7.0",
+    "egg-security": "^2.11.0",
+    "egg-session": "^3.3.0",
     "egg-static": "^2.2.0",
-    "egg-view": "^2.1.2",
-    "egg-watcher": "^3.1.0",
-    "extend2": "^1.0.0",
+    "egg-view": "^2.1.3",
+    "egg-watcher": "^3.1.1",
+    "extend2": "^1.0.1",
     "graceful": "^1.0.2",
     "humanize-ms": "^1.2.1",
     "is-type-of": "^1.2.1",
-    "koa-bodyparser": "^4.2.1",
+    "koa-bodyparser": "^4.3.0",
     "koa-is-json": "^1.0.0",
     "koa-override": "^3.0.0",
-    "ms": "^2.1.1",
+    "ms": "^2.1.3",
     "mz": "^2.7.0",
-    "on-finished": "^2.3.0",
-    "semver": "^7.3.2",
+    "on-finished": "^2.4.1",
+    "semver": "^7.3.7",
     "sendmessage": "^1.1.0",
     "urllib": "^2.33.0",
-    "utility": "^1.15.0",
-    "ylru": "^1.2.1"
+    "urllib-next": "^3.1.3",
+    "utility": "^1.17.0",
+    "ylru": "^1.3.2"
   },
   "devDependencies": {
-    "@umijs/preset-react": "^2.1.2",
-    "address": "^1.0.3",
-    "antd": "^4.18.6",
+    "@umijs/preset-react": "^2.1.6",
+    "address": "^1.2.1",
+    "antd": "^4.23.2",
     "assert-extends": "^1.0.1",
     "assert-file": "^1.0.0",
-    "autod": "^3.0.1",
+    "autod": "^3.1.2",
     "autod-egg": "^1.1.0",
-    "coffee": "^5.2.1",
-    "dumi": "^1.1.38",
-    "dumi-theme-egg": "^1.2.0",
-    "egg-alinode": "^1.0.3",
-    "egg-bin": "^4.12.3",
+    "coffee": "^5.4.0",
+    "dumi": "^1.1.47",
+    "dumi-theme-egg": "^1.2.2",
+    "egg-alinode": "^2.0.1",
+    "egg-bin": "^5",
     "egg-doctools": "^2.9.1",
-    "egg-mock": "^3.21.0",
+    "egg-mock": "^4.2.1",
     "egg-plugin-puml": "^2.4.0",
     "egg-tracer": "^1.1.0",
-    "egg-view-nunjucks": "^2.2.0",
-    "eslint": "^5.15.1",
-    "eslint-config-egg": "^7.1.0",
+    "egg-view-nunjucks": "^2.3.0",
+    "eslint": "^8.23.1",
+    "eslint-config-egg": "^12.0.0",
     "findlinks": "^2.1.0",
-    "formstream": "^1.1.0",
-    "glob": "^7.1.3",
-    "jsdoc": "^3.6.10",
-    "koa": "^2.11.0",
-    "koa-static": "^3.0.0",
+    "formstream": "^1.1.1",
+    "glob": "^8",
+    "jsdoc": "^3.6.11",
+    "koa": "^2.13.4",
+    "koa-static": "^5.0.0",
     "mz": "^2.7.0",
     "mz-modules": "^2.1.0",
     "pedding": "^1.1.0",
-    "prettier": "^2.5.1",
-    "runscript": "^1.3.0",
+    "prettier": "^2.7.1",
+    "runscript": "^1.5.3",
     "spy": "^1.0.0",
-    "supertest": "^3.4.2",
-    "ts-node": "^8.0.3",
-    "typescript": "^3.3.3333"
+    "supertest": "^6.2.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.3"
   },
   "main": "index.js",
   "types": "index.d.ts",