f

fengmk2 · fengmk2 · commit 5bd9567d2879 · 2025-01-03T00:16:49.000+08:00
diff --git a/src/app/extend/context.ts b/src/app/extend/context.ts
@@ -4,7 +4,7 @@ import {
   utils, Context as EggCoreContext, Router,
 } from '@eggjs/core';
 import type { Cookies as ContextCookies } from '@eggjs/cookies';
-import { EggLogger } from 'egg-logger';
+import type { EggLogger } from 'egg-logger';
 import type { Application } from '../../lib/application.js';
 import type {
   HttpClientRequestURL, HttpClientRequestOptions, HttpClient,
diff --git a/src/index.ts b/src/index.ts
@@ -9,6 +9,8 @@ import Helper from './app/extend/helper.js';
 // export extends
 export {
   Helper,
+};
+export type {
   // keep compatible with egg v3
   Helper as IHelper,
 };
@@ -24,6 +26,7 @@ export * from './lib/error/index.js';
 // export loggers
 export type {
   LoggerLevel,
+  EggLogger,
 } from 'egg-logger';
 
 // export httpClients
diff --git a/src/lib/agent.ts b/src/lib/agent.ts
@@ -1,4 +1,4 @@
-import { EggLogger } from 'egg-logger';
+import type { EggLogger } from 'egg-logger';
 import { EggApplicationCore, EggApplicationCoreOptions } from './egg.js';
 import { AgentWorkerLoader } from './loader/index.js';
 
diff --git a/src/lib/core/httpclient.ts b/src/lib/core/httpclient.ts
@@ -44,7 +44,7 @@ export class HttpClient extends RawHttpClient {
 }
 
 // keep compatible
-export {
+export type {
   HttpClient as EggHttpClient,
   HttpClient as EggContextHttpClient,
 };
diff --git a/src/lib/egg.ts b/src/lib/egg.ts
@@ -80,7 +80,6 @@ export type MiddlewareFunc<T extends Context = Context> = EggCoreMiddlewareFunc<
 export {
   Context,
   Router,
-  EggLogger,
 };
 
 /**
@@ -664,8 +663,8 @@ export class EggApplicationCore extends EggCore {
    * @param  {Res} res - node native Response object
    * @return {Context} context object
    */
-  createContext(req: IncomingMessage, res: ServerResponse): EggContext {
-    const context = Object.create(this.context) as EggContext;
+  createContext(req: IncomingMessage, res: ServerResponse): Context {
+    const context = Object.create(this.context) as Context;
     const request = context.request = Object.create(this.request);
     const response = context.response = Object.create(this.response);
     context.app = request.app = response.app = this as any;
diff --git a/test/app/middleware/meta.test.ts b/test/app/middleware/meta.test.ts
@@ -18,7 +18,7 @@ describe('test/app/middleware/meta.test.ts', () => {
     it('should get X-Readtime header', () => {
       return app.httpRequest()
         .get('/')
-        .expect('X-Readtime', /\d+/)
+        .expect('X-Readtime', /^\d+\.\d{1,3}$/)
         .expect(200);
     });
   });
diff --git a/test/index.test.ts b/test/index.test.ts
@@ -13,11 +13,12 @@ describe('test/index.test.ts', () => {
       'ClusterAgentWorkerError',
       'ClusterWorkerExceptionError',
       'Context',
+      'ContextHttpClient',
       'Controller',
       'CookieLimitExceedError',
       'EggApplicationCore',
-      'EggLogger',
       'Helper',
+      'HttpClient',
       'Master',
       'MessageUnhandledRejectionError',
       'Request',
diff --git a/test/lib/cluster/master.test.ts b/test/lib/cluster/master.test.ts
@@ -25,7 +25,7 @@ describe('test/lib/cluster/master.test.ts', () => {
       }
 
       // wait for app worker restart
-      await scheduler.wait(5000);
+      await scheduler.wait(10000);
 
       // error pipe to console
       app.expect('stdout', /app_worker#1:\d+ disconnect/);
@@ -43,7 +43,7 @@ describe('test/lib/cluster/master.test.ts', () => {
       }
 
       // wait for app worker restart
-      await scheduler.wait(5000);
+      await scheduler.wait(10000);
 
       app.expect('stderr', /\[graceful:worker:\d+:uncaughtException] throw error 1 times/);
       app.expect('stdout', /app_worker#\d:\d+ started/);
diff --git a/test/lib/egg.test.ts b/test/lib/egg.test.ts
@@ -452,6 +452,8 @@ describe('test/lib/egg.test.ts', () => {
   });
 
   describe('egg-ready', () => {
+    if (process.platform === 'win32') return;
+
     let app: MockApplication;
 
     before(() => {
@@ -472,6 +474,8 @@ describe('test/lib/egg.test.ts', () => {
   });
 
   describe('createAnonymousContext()', () => {
+    if (process.platform === 'win32') return;
+
     let app: MockApplication;
     before(() => {
       app = createApp('apps/demo');
diff --git a/test/lib/plugins/depd.test.ts b/test/lib/plugins/depd.test.ts
@@ -3,6 +3,8 @@ import { mm } from '@eggjs/mock';
 import { MockApplication, createApp } from '../../utils.js';
 
 describe('test/lib/plugins/depd.test.ts', () => {
+  if (process.platform === 'win32') return;
+
   afterEach(mm.restore);
 
   let app: MockApplication;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { EggLogger } from 'egg-logger';`
	`1`	`+import type { EggLogger } from 'egg-logger';`
`2`	`2`	`import { EggApplicationCore, EggApplicationCoreOptions } from './egg.js';`
`3`	`3`	`import { AgentWorkerLoader } from './loader/index.js';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export class HttpClient extends RawHttpClient {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// keep compatible`
`47`		`-export {`
	`47`	`+export type {`
`48`	`48`	`HttpClient as EggHttpClient,`
`49`	`49`	`HttpClient as EggContextHttpClient,`
`50`	`50`	`};`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ describe('test/lib/cluster/master.test.ts', () => {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// wait for app worker restart`
`28`		`- await scheduler.wait(5000);`
	`28`	`+ await scheduler.wait(10000);`
`29`	`29`
`30`	`30`	`// error pipe to console`
`31`	`31`	`app.expect('stdout', /app_worker#1:\d+ disconnect/);`
`@@ -43,7 +43,7 @@ describe('test/lib/cluster/master.test.ts', () => {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// wait for app worker restart`
`46`		`- await scheduler.wait(5000);`
	`46`	`+ await scheduler.wait(10000);`
`47`	`47`
`48`	`48`	`app.expect('stderr', /\[graceful:worker:\d+:uncaughtException] throw error 1 times/);`
`49`	`49`	`app.expect('stdout', /app_worker#\d:\d+ started/);`