egg 3.28.0 → 3.30.0

package/README.md

@@ -10,7 +10,7 @@ English | [简体中文](./README.zh-CN.md)
 [![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-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)
+[![codecov](https://codecov.io/gh/eggjs/egg/branch/3.x/graph/badge.svg?token=2sKMCDNkcl)](https://app.codecov.io/gh/eggjs/egg/tree/3.x)
 [![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)
 

package/README.zh-CN.md

@@ -9,7 +9,7 @@
 [![NPM download](https://img.shields.io/npm/dm/egg.svg?style=flat-square)](https://npmjs.org/package/egg)
 
 [![Continuous Integration](https://github.com/eggjs/egg/actions/workflows/nodejs.yml/badge.svg)](https://github.com/eggjs/egg/actions?query=branch%3Amaster)
-[![Test coverage](https://img.shields.io/codecov/c/github/eggjs/egg.svg?style=flat-square)](https://codecov.io/gh/eggjs/egg)
+[![codecov](https://codecov.io/gh/eggjs/egg/branch/3.x/graph/badge.svg?token=2sKMCDNkcl)](https://app.codecov.io/gh/eggjs/egg/tree/3.x)
 [![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)
 

package/lib/core/httpclient_next.js

@@ -1,3 +1,4 @@
+const debug = require('util').debuglog('egg:lib:core:httpclient_next');
 const ms = require('humanize-ms');
 
 const SSRF_HTTPCLIENT = Symbol('SSRF_HTTPCLIENT');
@@ -6,9 +7,17 @@ const mainNodejsVersion = parseInt(process.versions.node.split('.')[0]);
 let HttpClient;
 if (mainNodejsVersion >= 18) {
   // urllib@4 only works on Node.js >= 18
-  HttpClient = require('urllib4').HttpClient;
-} else {
+  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 {
@@ -26,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/core/utils.js

@@ -9,18 +9,28 @@ module.exports = {
   safeParseURL,
 };
 
-function convertObject(obj, ignore) {
-  if (!is.array(ignore)) ignore = [ ignore ];
+function convertObject(obj, ignore, ignoreKeyPaths) {
+  if (!is.array(ignore)) {
+    ignore = [ ignore ];
+  }
+  if (!is.array(ignoreKeyPaths)) {
+    ignoreKeyPaths = ignoreKeyPaths ? [ ignoreKeyPaths ] : [];
+  }
+  _convertObject(obj, ignore, ignoreKeyPaths, '');
+}
+
+function _convertObject(obj, ignore, ignoreKeyPaths, keyPath) {
   for (const key of Object.keys(obj)) {
-    obj[key] = convertValue(key, obj[key], ignore);
+    obj[key] = convertValue(key, obj[key], ignore, ignoreKeyPaths, keyPath ? `${keyPath}.${key}` : key);
   }
   return obj;
 }
 
-function convertValue(key, value, ignore) {
+function convertValue(key, value, ignore, ignoreKeyPaths, keyPath) {
   if (is.nullOrUndefined(value)) return value;
 
   let hit = false;
+  let hitKeyPath = false;
   for (const matchKey of ignore) {
     if (is.string(matchKey) && matchKey === key) {
       hit = true;
@@ -30,7 +40,13 @@ function convertValue(key, value, ignore) {
       break;
     }
   }
-  if (!hit) {
+  for (const matchKeyPath of ignoreKeyPaths) {
+    if (is.string(matchKeyPath) && keyPath === matchKeyPath) {
+      hitKeyPath = true;
+      break;
+    }
+  }
+  if (!hit && !hitKeyPath) {
     if (is.symbol(value) || is.regExp(value)) return value.toString();
     if (is.primitive(value) || is.array(value)) return value;
   }
@@ -38,7 +54,10 @@ function convertValue(key, value, ignore) {
   // only convert recursively when it's a plain object,
   // o = {}
   if (Object.getPrototypeOf(value) === Object.prototype) {
-    return convertObject(value, ignore);
+    if (hitKeyPath) {
+      return '<Object>';
+    }
+    return _convertObject(value, ignore, ignoreKeyPaths, keyPath);
   }
 
   // support class

package/lib/egg.js

@@ -395,8 +395,15 @@ class EggApplication extends EggCore {
       ignoreList = [];
     }
 
+    let ignoreKeyPaths;
+    try {
+      ignoreKeyPaths = this.config.dump.ignoreKeyPaths;
+    } catch (e) {
+      ignoreKeyPaths = {};
+    }
+
     const json = extend(true, {}, { config: this.config, plugins: this.loader.allPlugins, appInfo: this.loader.appInfo });
-    utils.convertObject(json, ignoreList);
+    utils.convertObject(json, ignoreList, ignoreKeyPaths ? Object.keys(ignoreKeyPaths) : []);
     return {
       config: json,
       meta: this.loader.configMeta,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "egg",
-  "version": "3.28.0",
+  "version": "3.30.0",
   "publishConfig": {
-    "tag": "release-3.x",
+    "tag": "latest",
     "access": "public"
   },
   "description": "A web framework's framework for Node.js",
@@ -56,7 +56,7 @@
     "sendmessage": "^2.0.0",
     "urllib": "^2.33.0",
     "urllib-next": "npm:urllib@^3.27.1",
-    "urllib4": "npm:urllib@^4.3.0",
+    "urllib4": "npm:urllib@^4.5.0",
     "utility": "^2.1.0",
     "ylru": "^1.3.2"
   },
@@ -79,6 +79,7 @@
     "eslint": "^8.23.1",
     "eslint-config-egg": "^12.0.0",
     "formstream": "^1.1.1",
+    "https-pem": "^3.0.0",
     "jsdoc": "^3.6.11",
     "koa": "^2.13.4",
     "koa-static": "^5.0.0",