@modern-js/server-core 2.66.0 → 2.67.1

package/dist/cjs/adapters/node/node.js

@@ -44,10 +44,13 @@ const createWebRequest = (req, res, body) => {
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
-    headerRecord.push([
-      req.rawHeaders[i],
-      req.rawHeaders[i + 1]
-    ]);
+    const key = req.rawHeaders[i];
+    if (!key.startsWith(":")) {
+      headerRecord.push([
+        key,
+        req.rawHeaders[i + 1]
+      ]);
+    }
   }
   const { method } = req;
   const controller = new AbortController();
@@ -125,12 +128,23 @@ const getRequestListener = (handler) => {
     }
   };
 };
-const createNodeServer = async (requestHandler, httpsOptions) => {
+const createNodeServer = async (requestHandler, httpsOptions, http2) => {
   const requestListener = getRequestListener(requestHandler);
   let nodeServer;
   if (httpsOptions) {
-    const { createServer } = await import("node:https");
-    nodeServer = createServer(httpsOptions, requestListener);
+    if (http2) {
+      const { createSecureServer } = await import("node:http2");
+      nodeServer = createSecureServer({
+        allowHTTP1: true,
+        maxSessionMemory: 1024,
+        ...httpsOptions
+      }, (req, res) => {
+        return requestListener(req, res);
+      });
+    } else {
+      const { createServer } = await import("node:https");
+      nodeServer = createServer(httpsOptions, requestListener);
+    }
   } else {
     const { createServer } = await import("node:http");
     nodeServer = createServer(requestListener);

package/dist/cjs/plugins/route.js

@@ -32,7 +32,7 @@ function injectRoute(route) {
   };
 }
 function getPageRoutes(routes) {
-  return routes.filter((route) => !route.isApi).sort(import_utils.sortRoutes);
+  return routes.filter((route) => route.entryName).sort(import_utils.sortRoutes);
 }
 const injectRoutePlugin = () => ({
   name: "@modern-js/plugin-inject-route",

package/dist/esm/adapters/node/node.js

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
@@ -12,10 +13,13 @@ var createWebRequest = function(req, res, body) {
   var headerRecord = [];
   var len = req.rawHeaders.length;
   for (var i = 0; i < len; i += 2) {
-    headerRecord.push([
-      req.rawHeaders[i],
-      req.rawHeaders[i + 1]
-    ]);
+    var key = req.rawHeaders[i];
+    if (!key.startsWith(":")) {
+      headerRecord.push([
+        key,
+        req.rawHeaders[i + 1]
+      ]);
+    }
   }
   var method = req.method;
   var controller = new AbortController();
@@ -182,24 +186,34 @@ var getRequestListener = function(handler) {
   }();
 };
 var createNodeServer = function() {
-  var _ref = _async_to_generator(function(requestHandler, httpsOptions) {
-    var requestListener, nodeServer, createServer, createServer1;
+  var _ref = _async_to_generator(function(requestHandler, httpsOptions, http2) {
+    var requestListener, nodeServer, createSecureServer, createServer, createServer1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           requestListener = getRequestListener(requestHandler);
           if (!httpsOptions)
+            return [
+              3,
+              5
+            ];
+          if (!http2)
             return [
               3,
               2
             ];
           return [
             4,
-            import("node:https")
+            import("node:http2")
           ];
         case 1:
-          createServer = _state.sent().createServer;
-          nodeServer = createServer(httpsOptions, requestListener);
+          createSecureServer = _state.sent().createSecureServer;
+          nodeServer = createSecureServer(_object_spread({
+            allowHTTP1: true,
+            maxSessionMemory: 1024
+          }, httpsOptions), function(req, res) {
+            return requestListener(req, res);
+          });
           return [
             3,
             4
@@ -207,13 +221,27 @@ var createNodeServer = function() {
         case 2:
           return [
             4,
-            import("node:http")
+            import("node:https")
           ];
         case 3:
-          createServer1 = _state.sent().createServer;
-          nodeServer = createServer1(requestListener);
+          createServer = _state.sent().createServer;
+          nodeServer = createServer(httpsOptions, requestListener);
           _state.label = 4;
         case 4:
+          return [
+            3,
+            7
+          ];
+        case 5:
+          return [
+            4,
+            import("node:http")
+          ];
+        case 6:
+          createServer1 = _state.sent().createServer;
+          nodeServer = createServer1(requestListener);
+          _state.label = 7;
+        case 7:
           nodeServer.getRequestListener = function() {
             return requestListener;
           };
@@ -227,7 +255,7 @@ var createNodeServer = function() {
       }
     });
   });
-  return function createNodeServer2(requestHandler, httpsOptions) {
+  return function createNodeServer2(requestHandler, httpsOptions, http2) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/plugins/route.js

@@ -30,7 +30,7 @@ function injectRoute(route) {
 }
 function getPageRoutes(routes) {
   return routes.filter(function(route) {
-    return !route.isApi;
+    return route.entryName;
   }).sort(sortRoutes);
 }
 var injectRoutePlugin = function() {

package/dist/esm-node/adapters/node/node.js

@@ -8,10 +8,13 @@ const createWebRequest = (req, res, body) => {
   const headerRecord = [];
   const len = req.rawHeaders.length;
   for (let i = 0; i < len; i += 2) {
-    headerRecord.push([
-      req.rawHeaders[i],
-      req.rawHeaders[i + 1]
-    ]);
+    const key = req.rawHeaders[i];
+    if (!key.startsWith(":")) {
+      headerRecord.push([
+        key,
+        req.rawHeaders[i + 1]
+      ]);
+    }
   }
   const { method } = req;
   const controller = new AbortController();
@@ -89,12 +92,23 @@ const getRequestListener = (handler) => {
     }
   };
 };
-const createNodeServer = async (requestHandler, httpsOptions) => {
+const createNodeServer = async (requestHandler, httpsOptions, http2) => {
   const requestListener = getRequestListener(requestHandler);
   let nodeServer;
   if (httpsOptions) {
-    const { createServer } = await import("node:https");
-    nodeServer = createServer(httpsOptions, requestListener);
+    if (http2) {
+      const { createSecureServer } = await import("node:http2");
+      nodeServer = createSecureServer({
+        allowHTTP1: true,
+        maxSessionMemory: 1024,
+        ...httpsOptions
+      }, (req, res) => {
+        return requestListener(req, res);
+      });
+    } else {
+      const { createServer } = await import("node:https");
+      nodeServer = createServer(httpsOptions, requestListener);
+    }
   } else {
     const { createServer } = await import("node:http");
     nodeServer = createServer(requestListener);

package/dist/esm-node/plugins/route.js

@@ -9,7 +9,7 @@ function injectRoute(route) {
   };
 }
 function getPageRoutes(routes) {
-  return routes.filter((route) => !route.isApi).sort(sortRoutes);
+  return routes.filter((route) => route.entryName).sort(sortRoutes);
 }
 const injectRoutePlugin = () => ({
   name: "@modern-js/plugin-inject-route",

package/dist/types/adapters/node/helper/utils.d.ts

@@ -1,4 +1,5 @@
-import type { HonoRequest, NodeRequest, NodeResponse, ServerManifest } from '../../../types';
+import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
+import type { HonoRequest, ServerManifest } from '../../../types';
 type ExtendedNodeRequest = NodeRequest & {
     __honoRequest?: HonoRequest;
     __templates?: Record<string, string>;

package/dist/types/adapters/node/hono.d.ts

@@ -1,4 +1,5 @@
-import type { Context, Middleware, Next, NodeRequest, NodeResponse, ServerEnv } from '../../types';
+import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
+import type { Context, Middleware, Next, ServerEnv } from '../../types';
 import { type NodeBindings } from './helper';
 export type ServerNodeEnv = {
     Bindings: NodeBindings;

package/dist/types/adapters/node/node.d.ts

@@ -1,12 +1,17 @@
 import { type Server as NodeServer } from 'node:http';
+import type { Http2SecureServer } from 'node:http2';
 import type { Server as NodeHttpsServer } from 'node:https';
-import type { NodeRequest, NodeResponse, RequestHandler } from '../../types';
+import type { NodeRequest, NodeResponse } from '@modern-js/types/server';
+import type { RequestHandler } from '../../types';
 export { writeReadableStreamToWritable } from './polyfills';
 export declare const createWebRequest: (req: NodeRequest, res: NodeResponse, body?: BodyInit) => Request;
 export declare const sendResponse: (response: Response, res: NodeResponse) => Promise<void>;
 declare const getRequestListener: (handler: RequestHandler) => (req: NodeRequest, res: NodeResponse) => Promise<void>;
-type NodeServerWrapper = (NodeServer | NodeHttpsServer) & {
+type NodeServerWrapper = (NodeServer | NodeHttpsServer | Http2SecureServer) & {
     getRequestListener: () => ReturnType<typeof getRequestListener>;
     getRequestHandler: () => RequestHandler;
 };
-export declare const createNodeServer: (requestHandler: RequestHandler, httpsOptions?: Record<string, unknown>) => Promise<NodeServerWrapper>;
+export declare const createNodeServer: (requestHandler: RequestHandler, httpsOptions?: {
+    key?: string | Buffer;
+    cert?: string | Buffer;
+}, http2?: boolean) => Promise<NodeServerWrapper>;

package/dist/types/adapters/node/plugins/nodeServer.d.ts

@@ -1,5 +1,6 @@
 import type { Server as NodeServer } from 'node:http';
+import type { Http2SecureServer } from 'node:http2';
 import type { ServerPluginLegacy } from '../../../types';
 export declare const injectNodeSeverPlugin: ({ nodeServer, }: {
-    nodeServer: NodeServer;
+    nodeServer: NodeServer | Http2SecureServer;
 }) => ServerPluginLegacy;

package/dist/types/plugins/render/ssrCache.d.ts

@@ -1,9 +1,9 @@
-import type { IncomingMessage } from 'http';
 import type { CacheControl, CacheOption, Container } from '@modern-js/types';
+import type { NodeRequest } from '@modern-js/types/server';
 import type { RequestHandler, RequestHandlerOptions } from '../../types/requestHandler';
 export type CacheStatus = 'hit' | 'stale' | 'expired' | 'miss';
 type MaybeAsync<T> = Promise<T> | T;
-export declare function matchCacheControl(cacheOption?: CacheOption, req?: IncomingMessage): MaybeAsync<CacheControl | undefined | false>;
+export declare function matchCacheControl(cacheOption?: CacheOption, req?: NodeRequest): MaybeAsync<CacheControl | undefined | false>;
 export interface GetCacheResultOptions {
     cacheControl: CacheControl;
     requestHandler: RequestHandler;

package/dist/types/plugins/render/ssrRender.d.ts

@@ -1,6 +1,6 @@
-import type { IncomingMessage } from 'http';
 import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
 import type { Monitors, ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types/server';
+import type { NodeRequest } from '@modern-js/types/server';
 import type { CacheConfig, ServerManifest, UserConfig } from '../../types';
 import type { OnError, OnTiming, Params } from '../../types/requestHandler';
 export interface SSRRenderOptions {
@@ -21,7 +21,7 @@ export interface SSRRenderOptions {
     /** Produce by custom server hook */
     locals?: Record<string, any>;
     cacheConfig?: CacheConfig;
-    nodeReq?: IncomingMessage;
+    nodeReq?: NodeRequest;
     monitors: Monitors;
     onError: OnError;
     onTiming: OnTiming;

package/dist/types/types/plugins/base.d.ts

@@ -1,4 +1,5 @@
-import type { IncomingMessage, Server as NodeServer, ServerResponse } from 'http';
+import type { Server as NodeServer } from 'http';
+import type { Http2SecureServer } from 'node:http2';
 import type { CacheOption, Container, HttpMethodDecider, Logger, Metrics, MiddlewareContext, Reporter, ServerRoute, UnstableMiddleware } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { UserConfig } from '../config';
@@ -59,11 +60,9 @@ declare module '@modern-js/types' {
         getRenderOptions?: GetRenderHandlerOptions;
         render?: Render;
         routes?: ServerRoute[];
-        nodeServer?: NodeServer;
+        nodeServer?: NodeServer | Http2SecureServer;
     }
 }
-export type NodeRequest = IncomingMessage;
-export type NodeResponse = ServerResponse;
 export type CacheConfig = {
     strategy: CacheOption;
     container?: Container;

package/dist/types/types/plugins/index.d.ts

@@ -1,3 +1,3 @@
 export * from './new';
 export * from './old';
-export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, NodeRequest, NodeResponse, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, } from './base';
+export type { ServerConfig, CacheConfig, OnFallback, FallbackReason, GetRenderHandlerOptions, FileChangeEvent, FallbackInput, WebServerStartInput, APIServerStartInput, } from './base';

package/dist/types/types/render.d.ts

@@ -1,5 +1,5 @@
-import type { IncomingMessage } from 'node:http';
 import type { Logger, Metrics, Monitors, Reporter, ClientManifest as RscClientManifest, SSRManifest as RscSSRManifest, ServerManifest as RscServerManifest } from '@modern-js/types';
+import type { NodeRequest } from '@modern-js/types/server';
 import type { ServerManifest } from './server';
 export interface RenderOptions {
     monitors: Monitors;
@@ -22,6 +22,6 @@ export interface RenderOptions {
     rscServerManifest?: RscServerManifest;
     rscClientManifest?: RscClientManifest;
     rscSSRManifest?: RscSSRManifest;
-    nodeReq?: IncomingMessage;
+    nodeReq?: NodeRequest;
 }
 export type Render = (request: Request, options: RenderOptions) => Promise<Response>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.66.0",
+  "version": "2.67.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,10 +53,10 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.66.0",
-    "@modern-js/runtime-utils": "2.66.0",
-    "@modern-js/plugin-v2": "2.66.0",
-    "@modern-js/utils": "2.66.0"
+    "@modern-js/plugin": "2.67.1",
+    "@modern-js/runtime-utils": "2.67.1",
+    "@modern-js/utils": "2.67.1",
+    "@modern-js/plugin-v2": "2.67.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -66,9 +66,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.66.0",
     "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/types": "2.67.1"
   },
   "sideEffects": false,
   "publishConfig": {