egg 3.12.0 → 3.14.0

package/index.d.ts

@@ -14,9 +14,13 @@ import {
   EggLoggerOptions,
   EggContextLogger,
 } from 'egg-logger';
-import { RequestOptions2 as RequestOptions, HttpClientResponse } from 'urllib';
 import {
-  RequestURL, RequestOptions as RequestOptionsNext,
+  RequestOptions2 as RequestOptionsOld,
+  HttpClientResponse as HttpClientResponseOld,
+} from 'urllib';
+import {
+  RequestURL,
+  RequestOptions as RequestOptionsNext,
   HttpClientResponse as HttpClientResponseNext,
 } from 'urllib-next';
 import {
@@ -49,13 +53,27 @@ declare module 'egg' {
   // Remove specific property from the specific class
   type RemoveSpecProp<T, P> = Pick<T, Exclude<keyof T, P>>;
 
+  // Usage:
+  // ```ts
+  // import { HttpClientRequestURL, HttpClientRequestOptions, HttpClientResponse } from 'egg';
+  // async function request(url: HttpClientRequestURL, options: HttpClientRequestOptions): Promise<HttpClientResponse> {
+  //   return await app.httpclient.request(url, options);
+  // }
+  // ```
+  export type HttpClientRequestURL = RequestURL;
+  export type HttpClientRequestOptions = RequestOptionsNext;
+  export type HttpClientResponse<T = any> = HttpClientResponseNext<T>;
+
   // Compatible with both urllib@2 and urllib@3 RequestOptions to request
   export interface EggHttpClient extends EventEmitter {
-    request<T = any>(url: RequestURL): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
-    request<T = any>(url: RequestURL, options: RequestOptions | RequestOptionsNext): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
-    curl<T = any>(url: RequestURL): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
-    curl<T = any>(url: RequestURL, options: RequestOptions | RequestOptionsNext): Promise<HttpClientResponse<T> | HttpClientResponseNext>;
+    request<T = any>(url: HttpClientRequestURL): Promise<HttpClientResponseOld<T> | HttpClientResponse<T>>;
+    request<T = any>(url: HttpClientRequestURL, options: RequestOptionsOld | HttpClientRequestOptions):
+      Promise<HttpClientResponseOld<T> | HttpClientResponse<T>>;
+    curl<T = any>(url: HttpClientRequestURL): Promise<HttpClientResponseOld<T> | HttpClientResponse<T>>;
+    curl<T = any>(url: HttpClientRequestURL, options: RequestOptionsOld | HttpClientRequestOptions):
+      Promise<HttpClientResponseOld<T> | HttpClientResponse<T>>;
   }
+
   interface EggHttpConstructor {
     new(app: Application): EggHttpClient;
   }
@@ -278,7 +296,7 @@ declare module 'egg' {
     /** https.Agent */
     httpsAgent?: HttpClientBaseConfig;
     /** Default request args for httpclient */
-    request?: RequestOptions;
+    request?: HttpClientRequestOptions | RequestOptionsOld;
     /** Whether enable dns cache */
     enableDNSCache?: boolean;
     /** Enable proxy request, default is false. */

package/lib/egg.js

@@ -417,11 +417,13 @@ class EggApplication extends EggCore {
       const rundir = this.config.rundir;
       const dumpFile = path.join(rundir, `${this.type}_timing_${process.pid}.json`);
       fs.writeFileSync(dumpFile, CircularJSON.stringify(items, null, 2));
+      this.coreLogger.info(this.timing.toString());
       // 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) {
+        // ignore #0 name: Process Start
+        if (item.index > 0 && 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);
         }
@@ -437,10 +439,11 @@ class EggApplication extends EggCore {
 
   _setupTimeoutTimer() {
     const startTimeoutTimer = setTimeout(() => {
+      this.coreLogger.error(this.timing.toString());
       this.coreLogger.error(`${this.type} still doesn't ready after ${this.config.workerStartTimeout} ms.`);
       // log unfinished
-      const json = this.timing.toJSON();
-      for (const item of json) {
+      const items = this.timing.toJSON();
+      for (const item of items) {
         if (item.end) continue;
         this.coreLogger.error(`unfinished timing item: ${CircularJSON.stringify(item)}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg",
-  "version": "3.12.0",
+  "version": "3.14.0",
   "publishConfig": {
     "tag": "latest"
   },
@@ -28,7 +28,7 @@
     "delegates": "^1.0.0",
     "egg-cluster": "^2.0.0",
     "egg-cookies": "^2.6.1",
-    "egg-core": "^5.1.1",
+    "egg-core": "^5.3.0",
     "egg-development": "^2.7.0",
     "egg-errors": "^2.3.1",
     "egg-i18n": "^2.1.1",
@@ -64,15 +64,14 @@
     "@umijs/preset-react": "^2.1.6",
     "address": "^1.2.1",
     "antd": "^4.23.2",
-    "assert-extends": "^1.0.1",
     "assert-file": "^1.0.0",
     "coffee": "^5.4.0",
     "dumi": "^1.1.47",
     "dumi-theme-egg": "^1.2.2",
     "egg-bin": "^5",
-    "egg-mock": "^5.4.0",
+    "egg-mock": "^5.9.2",
     "egg-plugin-puml": "^2.4.0",
-    "egg-tracer": "^1.1.0",
+    "egg-tracer": "^2.0.0",
     "egg-view-nunjucks": "^2.3.0",
     "eslint": "^8.23.1",
     "eslint-config-egg": "^12.0.0",