egg 3.24.0 → 3.25.0

package/README.md

@@ -9,12 +9,11 @@ English | [简体中文](./README.zh-CN.md)
 [![NPM download](https://img.shields.io/npm/dm/egg.svg?style=flat-square)](https://npmjs.org/package/egg)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Feggjs%2Fegg.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Feggjs%2Fegg?ref=badge_shield)
 
-[![Continuous Integration](https://github.com/eggjs/egg/actions/workflows/nodejs.yml/badge.svg)](https://github.com/eggjs/egg/actions?query=branch%3Amaster)
+[![Continuous Integration](https://github.com/eggjs/egg/actions/workflows/nodejs-3.x.yml/badge.svg)](https://github.com/eggjs/egg/actions?query=branch%3A3.x)
 [![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg)
 [![Known Vulnerabilities](https://snyk.io/test/npm/egg/badge.svg?style=flat-square)](https://snyk.io/test/npm/egg)
 [![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/eggjs?style=flat-square)](https://opencollective.com/eggjs)
 
-
 ## Features
 
 - Built-in Process Management
@@ -62,5 +61,4 @@ To become a contributor, please follow our [contributing guide](CONTRIBUTING.md)
 
 [MIT](LICENSE)
 
-
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Feggjs%2Fegg.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Feggjs%2Fegg?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Feggjs%2Fegg.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Feggjs%2Fegg?ref=badge_large)

package/config/config.default.js

@@ -304,6 +304,7 @@ module.exports = appInfo => {
    * @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
+   * @property {Boolean} allowH2 - Allow to use HTTP2 first, only work on `useHttpClientNext = true`
    */
   config.httpclient = {
     enableDNSCache: false,
@@ -326,6 +327,7 @@ module.exports = appInfo => {
       maxFreeSockets: 256,
     },
     useHttpClientNext: false,
+    // allowH2: false,
   };
 
   /**
@@ -359,7 +361,7 @@ module.exports = appInfo => {
   config.workerStartTimeout = 10 * 60 * 1000;
 
   /**
-   * server timeout in milliseconds, default to 2 minutes.
+   * server timeout in milliseconds, default to 0 (no timeout).
    *
    * for special request, just use `ctx.req.setTimeout(ms)`
    *

package/index.d.ts

@@ -296,16 +296,18 @@ declare module 'egg' {
     request?: HttpClientRequestOptions | RequestOptionsOld;
     /** Whether enable dns cache */
     enableDNSCache?: boolean;
-    /** Enable proxy request, default is false. */
+    /** Enable proxy request. Default is `false`. */
     enableProxy?: boolean;
-    /** proxy agent uri or options, default is null. */
+    /** proxy agent uri or options. Default is `null`. */
     proxy?: string | { [key: string]: any };
     /** DNS cache lookup interval */
     dnsCacheLookupInterval?: number;
     /** DNS cache max age */
     dnsCacheMaxLength?: number;
-    /** use urllib@3 HttpClient */
+    /** use urllib@3 HttpClient. Default is `false`  */
     useHttpClientNext?: boolean;
+    /** Allow to use HTTP2 first, only work on `useHttpClientNext = true`. Default is `false` */
+    allowH2?: boolean;
   }
 
   export interface EggAppConfig {
@@ -330,7 +332,7 @@ declare module 'egg' {
      * @property {Number} queryString.parameterLimit - parameter number limit, default 1000
      * @property {String[]} enableTypes - parser will only parse when request type hits enableTypes, default is ['json', 'form']
      * @property {Object} extendTypes - support extend types
-     * @property {String} onProtoPoisoning - Defines what action must take when parsing a JSON object with `__proto__`. Possible values are `'error'`, `'remove'` and `'ignore'`. Default is `'error'`, it will return `403` response when `Prototype-Poisoning` happen.
+     * @property {String} onProtoPoisoning - Defines what action must take when parsing a JSON object with `__proto__`. Possible values are `'error'`, `'remove'` and `'ignore'`. Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen.
      */
     bodyParser: {
       enable: boolean;
@@ -352,7 +354,7 @@ declare module 'egg' {
         form: string[];
         text: string[];
       };
-      /** Default is `'error'`, it will return `403` response when `Prototype-Poisoning` happen. */
+      /** Default is `'error'`, it will return `400` response when `Prototype-Poisoning` happen. */
       onProtoPoisoning: 'error' | 'remove' | 'ignore';
     };
 
@@ -532,7 +534,7 @@ declare module 'egg' {
     onClientError(err: Error, socket: Socket, app: EggApplication): ClientErrorResponse | Promise<ClientErrorResponse>;
 
     /**
-     * server timeout in milliseconds, default to 2 minutes.
+     * server timeout in milliseconds, default to 0 (no timeout).
      *
      * for special request, just use `ctx.req.setTimeout(ms)`
      *

package/lib/core/httpclient_next.js

@@ -8,6 +8,7 @@ class HttpClientNext extends HttpClient {
     super({
       app,
       defaultArgs: config.request,
+      allowH2: config.allowH2,
     });
     this.app = app;
   }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "egg",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "publishConfig": {
-    "tag": "latest"
+    "tag": "release-3.x",
+    "access": "public"
   },
   "description": "A web framework's framework for Node.js",
   "keywords": [
@@ -54,7 +55,7 @@
     "onelogger": "^1.0.0",
     "sendmessage": "^2.0.0",
     "urllib": "^2.33.0",
-    "urllib-next": "npm:urllib@^3.22.4",
+    "urllib-next": "npm:urllib@^3.26.0",
     "utility": "^2.1.0",
     "ylru": "^1.3.2"
   },