egg 3.3.2 → 3.4.0-beta.0

package/app/middleware/meta.js

@@ -2,15 +2,9 @@
  * meta middleware, should be the first middleware
  */
 
-'use strict';
-
 const { performance } = require('perf_hooks');
-const semver = require('semver');
 
 module.exports = options => {
-  // Node.js >=14.8.0 and >= 12.19.0 will set Keep-Alive Header, see https://github.com/nodejs/node/pull/34561
-  const shouldPatchKeepAliveHeader = !semver.satisfies(process.version, '>=14.8.0 || ^12.19.0');
-
   return async function meta(ctx, next) {
     if (options.logging) {
       ctx.coreLogger.info('[meta] request started, host: %s, user-agent: %s', ctx.host, ctx.header['user-agent']);
@@ -22,15 +16,5 @@ module.exports = options => {
     } else {
       ctx.set('x-readtime', Date.now() - ctx.starttime);
     }
-
-    // try to support Keep-Alive Header when < 14.8.0
-    const server = ctx.app.server;
-    if (shouldPatchKeepAliveHeader && server && server.keepAliveTimeout && server.keepAliveTimeout >= 1000 && ctx.header.connection !== 'close') {
-      /**
-       * use Math.floor instead of parseInt. More: https://github.com/eggjs/egg/pull/2702
-       */
-      const timeout = Math.floor(server.keepAliveTimeout / 1000);
-      ctx.set('keep-alive', `timeout=${timeout}`);
-    }
   };
 };

package/config/config.default.js

@@ -152,6 +152,10 @@ module.exports = appInfo => {
         // ignore any key contains "secret" keyword
         /secret/i,
       ]),
+      timing: {
+        // if boot action >= slowBootActionMinDuration, egg core will print it to warnning log
+        slowBootActionMinDuration: 5000,
+      },
     },
 
     /**

package/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * @namespace Egg
  */

package/lib/core/context_httpclient.js

@@ -1,5 +1,3 @@
-'use strict';
-
 class ContextHttpClient {
   constructor(ctx) {
     this.ctx = ctx;
@@ -14,14 +12,14 @@ class ContextHttpClient {
    * @param {Object} [options] - options for request.
    * @return {Object} see {@link Application#curl}
    */
-  curl(url, options) {
+  async curl(url, options) {
     options = options || {};
     options.ctx = this.ctx;
-    return this.app.curl(url, options);
+    return await this.app.curl(url, options);
   }
 
-  request(url, options) {
-    return this.curl(url, options);
+  async request(url, options) {
+    return await this.curl(url, options);
   }
 }
 

package/lib/core/dnscache_httpclient.js

@@ -1,6 +1,4 @@
-'use strict';
-
-const dns = require('mz/dns');
+const dns = require('dns').promises;
 const LRU = require('ylru');
 const HttpClient = require('./httpclient');
 const utility = require('utility');
@@ -17,39 +15,13 @@ class DNSCacheHttpClient extends HttpClient {
     this.dnsCache = new LRU(this.app.config.httpclient.dnsCacheMaxLength);
   }
 
-  request(url, args, callback) {
-    // request(url, callback)
-    if (typeof args === 'function') {
-      callback = args;
-      args = null;
-    }
-
-    // the callback style
-    if (callback) {
-      this.app.deprecate('[dnscache_httpclient] We now support async for this function, so callback isn\'t recommended.');
-      // disable dns cache in request by args handle
-      if (args && args.enableDNSCache === false) {
-        super.request(url, args, callback);
-        return;
-      }
-      this[DNSLOOKUP](url, args)
-        .then(result => {
-          return super.request(result.url, result.args);
-        })
-        .then(result => process.nextTick(() => callback(null, result.data, result.res)))
-        .catch(err => process.nextTick(() => callback(err)));
-      return;
+  async request(url, args) {
+    // disable dns cache in request by args handle
+    if (args && args.enableDNSCache === false) {
+      return await super.request(url, args);
     }
-
-    // the Promise style
-    return (async () => {
-      // disable dns cache in request by args handle
-      if (args && args.enableDNSCache === false) {
-        return super.request(url, args);
-      }
-      const result = await this[DNSLOOKUP](url, args);
-      return super.request(result.url, result.args);
-    })();
+    const result = await this[DNSLOOKUP](url, args);
+    return await super.request(result.url, result.args);
   }
 
   async [DNSLOOKUP](url, args) {
@@ -96,7 +68,7 @@ class DNSCacheHttpClient extends HttpClient {
   async [UPDATE_DNS](hostname, args) {
     const logger = args.ctx ? args.ctx.coreLogger : this.app.coreLogger;
     try {
-      const [ address ] = await dns.lookup(hostname, { family: 4 });
+      const { address } = await dns.lookup(hostname, { family: 4 });
       logger.info('[dnscache_httpclient] dns lookup success: %s => %s',
         hostname, address);
       this.dnsCache.set(hostname, { timestamp: Date.now(), ip: address });
@@ -106,7 +78,6 @@ class DNSCacheHttpClient extends HttpClient {
       throw err;
     }
   }
-
 }
 
 module.exports = DNSCacheHttpClient;

package/lib/core/httpclient.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const Agent = require('agentkeepalive');
 const HttpsAgent = require('agentkeepalive').HttpsAgent;
 const urllib = require('urllib');
@@ -25,58 +23,26 @@ class HttpClient extends urllib.HttpClient2 {
     this.app = app;
   }
 
-  request(url, args, callback) {
-    if (typeof args === 'function') {
-      callback = args;
-      args = null;
-    }
-
+  async request(url, args) {
     args = args || {};
-
     if (args.ctx && args.ctx.tracer) {
       args.tracer = args.ctx.tracer;
     } else {
       args.tracer = args.tracer || this.app.tracer;
     }
 
-    // the callback style
-    if (callback) {
-      this.app.deprecate('[httpclient] We now support async for this function, so callback isn\'t recommended.');
-      super.request(url, args)
-        .then(result => process.nextTick(() => callback(null, result.data, result.res)))
-        .catch(err => process.nextTick(() => callback(err)));
-      return;
+    try {
+      return await super.request(url, args);
+    } catch (err) {
+      if (err.code === 'ENETUNREACH') {
+        throw HttpClientError.create(err.message, err.code);
+      }
+      throw err;
     }
-
-    // the Promise style
-    return super.request(url, args)
-      .catch(err => {
-        if (err.code === 'ENETUNREACH') {
-          throw HttpClientError.create(err.message, err.code);
-        }
-        throw err;
-      });
-  }
-
-  curl(url, args, callback) {
-    return this.request(url, args, callback);
   }
 
-  requestThunk(url, args) {
-    this.app.deprecate('[httpclient] Please use `request()` instead of `requestThunk()`');
-    return callback => {
-      this.request(url, args, (err, data, res) => {
-        if (err) {
-          return callback(err);
-        }
-        callback(null, {
-          data,
-          status: res.status,
-          headers: res.headers,
-          res,
-        });
-      });
-    };
+  async curl(...args) {
+    return await this.request(...args);
   }
 }
 

package/lib/core/httpclient_next.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const { HttpClient } = require('urllib-next');
 const ms = require('humanize-ms');
 

package/lib/egg.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const { performance } = require('perf_hooks');
 const path = require('path');
 const fs = require('fs');
@@ -52,6 +50,7 @@ class EggApplication extends EggCore {
     this.ContextLogger = ContextLogger;
     this.ContextHttpClient = ContextHttpClient;
     this.HttpClient = HttpClient;
+    this.HttpClientNext = HttpClientNext;
 
     this.loader.loadConfig();
 
@@ -281,8 +280,8 @@ class EggApplication extends EggCore {
    * console.log(result.status, result.headers, result.data);
    * ```
    */
-  curl(url, opts) {
-    return this.httpclient.request(url, opts);
+  async curl(url, opts) {
+    return await this.httpclient.request(url, opts);
   }
 
   /**
@@ -293,7 +292,7 @@ class EggApplication extends EggCore {
   get httpclient() {
     if (!this[HTTPCLIENT]) {
       if (this.config.httpclient.useHttpClientNext) {
-        this[HTTPCLIENT] = new HttpClientNext(this);
+        this[HTTPCLIENT] = new this.HttpClientNext(this);
       } else if (this.config.httpclient.enableDNSCache) {
         this[HTTPCLIENT] = new DNSCacheHttpClient(this);
       } else {
@@ -411,12 +410,19 @@ class EggApplication extends EggCore {
 
   dumpTiming() {
     try {
-      const json = this.timing.toJSON();
+      const items = this.timing.toJSON();
       const rundir = this.config.rundir;
       const dumpFile = path.join(rundir, `${this.type}_timing_${process.pid}.json`);
-      fs.writeFileSync(dumpFile, CircularJSON.stringify(json, null, 2));
+      fs.writeFileSync(dumpFile, CircularJSON.stringify(items, null, 2));
       // only disable, not clear bootstrap timing data.
       this.timing.disable();
+      // show duration >= ${slowBootActionMinDuration}ms action to warnning log
+      for (const item of items) {
+        if (item.duration >= this.config.dump.timing.slowBootActionMinDuration) {
+          this.coreLogger.warn('[egg:core][slow-boot-action] #%d %dms, name: %s',
+            item.index, item.duration, item.name);
+        }
+      }
     } catch (err) {
       this.coreLogger.warn(`dumpTiming error: ${err.message}`);
     }

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "egg",
-  "version": "3.3.2",
+  "version": "3.4.0-beta.0",
+  "publishConfig": {
+    "tag": "test"
+  },
   "description": "A web framework's framework for Node.js",
   "keywords": [
     "web",
@@ -48,9 +51,7 @@
     "koa-is-json": "^1.0.0",
     "koa-override": "^3.0.0",
     "ms": "^2.1.3",
-    "mz": "^2.7.0",
     "on-finished": "^2.4.1",
-    "semver": "^7.3.7",
     "sendmessage": "^1.1.0",
     "urllib": "^2.33.0",
     "urllib-next": "^3.1.3",
@@ -68,7 +69,6 @@
     "coffee": "^5.4.0",
     "dumi": "^1.1.47",
     "dumi-theme-egg": "^1.2.2",
-    "egg-alinode": "^2.0.1",
     "egg-bin": "^5",
     "egg-mock": "^4.2.1",
     "egg-plugin-puml": "^2.4.0",
@@ -81,8 +81,6 @@
     "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.7.1",
     "runscript": "^1.5.3",