@modern-js/types 2.67.0 → 2.67.1

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.0",
+  "version": "2.67.1",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -48,8 +48,8 @@
     "http-proxy-middleware": "^2.0.4",
     "jest": "^29",
     "type-fest": "2.15.0",
-    "@scripts/jest-config": "2.66.0",
-    "@scripts/build": "2.66.0"
+    "@scripts/build": "2.66.0",
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/server/devServer.d.ts

@@ -1,11 +1,11 @@
-import type { IncomingMessage, ServerResponse } from 'http';
+import type { NodeRequest, NodeResponse } from '@modern-js/server-core/node';
 import type { BffProxyOptions, NextFunction } from './utils';
 
 export type DevServerHttpsOptions = boolean | { key: string; cert: string };
 
 export type RequestHandler = (
-  req: IncomingMessage,
-  res: ServerResponse,
+  req: NodeRequest,
+  res: NodeResponse,
   next: NextFunction,
 ) => void;
 

package/server/hook.d.ts

@@ -4,6 +4,7 @@ import type {
   ServerResponse,
 } from 'http';
 import type { ServerRoute } from './route';
+import type { NodeRequest, NodeResponse } from './server';
 import type { Logger, Metrics, Reporter } from './utils';
 
 export type CookieAPI = {
@@ -90,7 +91,7 @@ export type MiddlewareContext<T extends 'worker' | 'node' = 'node'> =
     reporter?: Reporter;
     response: ModernResponse & { locals: Record<string, any> };
     source: {
-      req: T extends 'worker' ? Request : IncomingMessage;
-      res: T extends 'worker' ? ModernResponse : ServerResponse;
+      req: T extends 'worker' ? Request : NodeRequest;
+      res: T extends 'worker' ? ModernResponse : NodeResponse;
     };
   };

package/server/index.d.ts

@@ -3,6 +3,7 @@ export * from './hook';
 export * from './utils';
 export * from './route';
 export * from './bff';
+export * from './server';
 export * from './devServer';
 export * from './middleware';
 export * from './monitor';

package/server/server.d.ts

@@ -0,0 +1,2 @@
+export type NodeRequest = IncomingMessage | Http2ServerRequest;
+export type NodeResponse = ServerResponse | Http2ServerResponse;

package/server/utils.d.ts

@@ -1,9 +1,10 @@
 import type { IncomingMessage, ServerResponse } from 'http';
+import type { Http2ServerRequest } from 'node:http2';
 import type {
   Filter as ProxyFilter,
   Options as ProxyOptions,
 } from 'http-proxy-middleware';
-
+import type { NodeRequest } from './server';
 export interface Metrics {
   emitCounter: (
     name: string,
@@ -102,7 +103,7 @@ export type CacheControl = {
 };
 
 export type CacheOptionProvider = (
-  req: IncomingMessage,
+  req: NodeRequest,
 ) => Promise<CacheControl | false> | CacheControl | false;
 
 export type CacheOption =