egg 3.27.1 → 3.29.0

package/History.md

@@ -0,0 +1,52 @@
+
+3.29.0 / 2024-11-30
+==================
+
+**features**
+  * [[`e4f706990`](http://github.com/eggjs/egg/commit/e4f7069904b99c842e65692f2531a72543719207)] - feat: use urllib@4.5.0 (#5371) (fengmk2 <<fengmk2@gmail.com>>)
+
+3.28.0 / 2024-09-16
+==================
+
+**features**
+  * [[`46d3fb222`](http://github.com/eggjs/egg/commit/46d3fb222bcf455d2aee9a99005d18c271f29b16)] - feat: support allowH2 on urllib@4 (#5357) (fengmk2 <<suqian.yf@antgroup.com>>)
+
+3.27.1 / 2024-07-12
+==================
+
+**fixes**
+  * [[`f3d8df1b`](http://github.com/eggjs/egg/commit/f3d8df1b7c2aef88cca3beec8c753656f8cc629c)] - fix: add httpclient.safeCurl typing (#5341) (killa <<zhubin.gzb@antgroup.com>>)
+
+3.27.0 / 2024-07-12
+==================
+
+**features**
+  * [[`68cbd241`](http://github.com/eggjs/egg/commit/68cbd241e2172b8018328d77ea087dd5974a580f)] - feat: impl httpclient.safeCurl (#5339) (killa <<zhubin.gzb@antgroup.com>>)
+
+3.26.1 / 2024-07-04
+==================
+
+**fixes**
+  * [[`872273cb`](http://github.com/eggjs/egg/commit/872273cb23cd6f5d76b3f33528916effade31011)] - fix: xframe value type (#5336) (hongzzz <<hongzzz@foxmail.com>>)
+
+**others**
+  * [[`8ae76d09`](http://github.com/eggjs/egg/commit/8ae76d09db8cf020cbdacfc64fee0750b9612136)] - docs: fix typo (#5330) (Fu Yuchen <<78291982+fyc09@users.noreply.github.com>>)
+
+3.26.0 / 2024-07-01
+==================
+
+**features**
+  * [[`b0292a8b`](http://github.com/eggjs/egg/commit/b0292a8b7e76d5dbf7441b7164c39441dbae51ec)] - feat: allow to create httpClient from app (#5334) (fengmk2 <<suqian.yf@antgroup.com>>)
+
+3.25.0 / 2024-06-27
+==================
+
+**features**
+  * [[`ceded0b1`](http://github.com/eggjs/egg/commit/ceded0b1c9217503c5ed9226f96c493d6bd00547)] - feat: allow to httpClient use HTTP2 first (#5332) (fengmk2 <<suqian.yf@antgroup.com>>)
+
+**others**
+  * [[`8553c3f2`](http://github.com/eggjs/egg/commit/8553c3f23e423e9f60144b11a484b703fe7c9229)] - chore: remove auto release (fengmk2 <<suqian.yf@antgroup.com>>)
+  * [[`b4f01a1c`](http://github.com/eggjs/egg/commit/b4f01a1c6bf006c943c85fce334b81d61f55b7d0)] - chore: fix release branches name (fengmk2 <<suqian.yf@antgroup.com>>)
+  * [[`a8073b04`](http://github.com/eggjs/egg/commit/a8073b04fc3821bb23326c6c8b4fd0ccaeb5c200)] - chore: add release config (fengmk2 <<suqian.yf@antgroup.com>>)
+  * [[`8ce2ff90`](http://github.com/eggjs/egg/commit/8ce2ff90bfbb9e4580a23ea49a15fdb1c185fbb5)] - chore: add npm publish tag (fengmk2 <<suqian.yf@antgroup.com>>)
+  * [[`44950ed8`](http://github.com/eggjs/egg/commit/44950ed82a3ce4d5d4b9028aee98d6650298a552)] - chore: start 3.x LTS (fengmk2 <<suqian.yf@antgroup.com>>)

package/config/config.default.js

@@ -303,8 +303,8 @@ 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
-   * @property {Boolean} allowH2 - Allow to use HTTP2 first, only work on `useHttpClientNext = true`
+   * @property {Boolean} useHttpClientNext - use urllib@3 HttpClient, default is false
+   * @property {Boolean} allowH2 - use urllib@4 HttpClient and enable H2, default is false. Only works on Node.js >= 18
    */
   config.httpclient = {
     enableDNSCache: false,

package/lib/core/httpclient_next.js

@@ -1,7 +1,25 @@
-const { HttpClient } = require('urllib-next');
+const debug = require('util').debuglog('egg:lib:core:httpclient_next');
 const ms = require('humanize-ms');
+
 const SSRF_HTTPCLIENT = Symbol('SSRF_HTTPCLIENT');
 
+const mainNodejsVersion = parseInt(process.versions.node.split('.')[0]);
+let HttpClient;
+if (mainNodejsVersion >= 18) {
+  // urllib@4 only works on Node.js >= 18
+  try {
+    HttpClient = require('urllib4').HttpClient;
+    debug('urllib4 enable');
+  } catch (err) {
+    debug('require urllib4 error: %s', err);
+  }
+}
+if (!HttpClient) {
+  // fallback to urllib@3
+  HttpClient = require('urllib-next').HttpClient;
+  debug('urllib3 enable');
+}
+
 class HttpClientNext extends HttpClient {
   constructor(app, options) {
     normalizeConfig(app);
@@ -17,6 +35,7 @@ class HttpClientNext extends HttpClient {
       // use on egg-security ssrf
       // https://github.com/eggjs/egg-security/blob/master/lib/extend/safe_curl.js#L11
       checkAddress: options.checkAddress,
+      connect: options.connect,
     });
     this.app = app;
   }

package/lib/egg.js

@@ -292,7 +292,7 @@ class EggApplication extends EggCore {
    */
   createHttpClient(options) {
     let httpClient;
-    if (this.config.httpclient.useHttpClientNext) {
+    if (this.config.httpclient.useHttpClientNext || this.config.httpclient.allowH2) {
       httpClient = new this.HttpClientNext(this, options);
     } else if (this.config.httpclient.enableDNSCache) {
       httpClient = new DNSCacheHttpClient(this, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.27.1",
+  "version": "3.29.0",
   "publishConfig": {
     "tag": "release-3.x",
     "access": "public"
@@ -55,7 +55,8 @@
     "onelogger": "^1.0.0",
     "sendmessage": "^2.0.0",
     "urllib": "^2.33.0",
-    "urllib-next": "npm:urllib@^3.26.0",
+    "urllib-next": "npm:urllib@^3.27.1",
+    "urllib4": "npm:urllib@^4.5.0",
     "utility": "^2.1.0",
     "ylru": "^1.3.2"
   },
@@ -77,19 +78,17 @@
     "egg-view-nunjucks": "^2.3.0",
     "eslint": "^8.23.1",
     "eslint-config-egg": "^12.0.0",
-    "findlinks": "^2.2.0",
     "formstream": "^1.1.1",
+    "https-pem": "^3.0.0",
     "jsdoc": "^3.6.11",
     "koa": "^2.13.4",
     "koa-static": "^5.0.0",
     "node-libs-browser": "^2.2.1",
     "pedding": "^1.1.0",
     "prettier": "^2.7.1",
-    "puppeteer": "^19.11.1",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-router": "^5.3.4",
-    "runscript": "^1.5.3",
     "sdk-base": "^4.2.1",
     "spy": "^1.0.0",
     "supertest": "^6.2.4",