fix: load webHandler & nodeReuqestListener to nodeServer (#5559)

web-infra-dev · Mar 21, 2024 · 0d36841 · 0d36841
1 parent cbf1439
commit 0d36841
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 45 deletions.
diff --git a/packages/runtime/plugin-testing/src/cli/bff/app.ts b/packages/runtime/plugin-testing/src/cli/bff/app.ts
@@ -29,15 +29,16 @@ const createApp = async (
     });
   }
 
-  const app = server.getRequestHandler();
+  const app = server.getRequestListener();
+
   return app;
 };
 
 const getApp = () => {
   if (!server) {
     throw new Error('please createApp first');
   }
-  return server.getRequestHandler();
+  return server.getRequestListener();
 };
 
 const closeServer = async () => {

diff --git a/packages/server/core/src/base/adapters/node/node.ts b/packages/server/core/src/base/adapters/node/node.ts
@@ -137,16 +137,18 @@ const getRequestListener = (handler: RequestHandler) => {
 };
 
 type NodeServerWrapper = NodeServer & {
-  getRequestHandler: () => ReturnType<typeof getRequestListener>;
+  getRequestListener: () => ReturnType<typeof getRequestListener>;
+  getRequestHandler: () => RequestHandler;
 };
 
 export const createNodeServer = (
-  handleRequest: RequestHandler,
+  requestHandler: RequestHandler,
 ): NodeServerWrapper => {
-  const requestListener = getRequestListener(handleRequest);
+  const requestListener = getRequestListener(requestHandler);
   const nodeServer = createServer(requestListener) as NodeServerWrapper;
 
-  nodeServer.getRequestHandler = () => requestListener;
+  nodeServer.getRequestListener = () => requestListener;
+  nodeServer.getRequestHandler = () => requestHandler;
 
   return nodeServer;
 };
diff --git a/packages/server/prod-server/package.json b/packages/server/prod-server/package.json
@@ -32,20 +32,12 @@
       "types": "./dist/types/index.d.ts",
       "jsnext:source": "./src/index.ts",
       "default": "./dist/cjs/index.js"
-    },
-    "./handler": {
-      "types": "./dist/types/handler.d.ts",
-      "jsnext:source": "./src/handler.ts",
-      "default": "./dist/cjs/handler.js"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
         "./dist/types/index.d.ts"
-      ],
-      "handler": [
-        "./dist/types/handler.d.ts"
       ]
     }
   },
@@ -81,11 +73,6 @@
         "types": "./dist/types/index.d.ts",
         "jsnext:source": "./src/index.ts",
         "default": "./dist/cjs/index.js"
-      },
-      "./handler": {
-        "types": "./dist/types/handler.d.ts",
-        "jsnext:source": "./src/handler.ts",
-        "default": "./dist/cjs/handler.js"
       }
     }
   }

diff --git a/packages/server/prod-server/src/index.ts b/packages/server/prod-server/src/index.ts
@@ -1,13 +1,21 @@
-import { createNodeServer } from '@modern-js/server-core/base/node';
-import { createWebServer, initProdMiddlewares } from './handler';
-import { ProdServerOptions } from './types';
+import {
+  createNodeServer,
+  loadServerEnv,
+} from '@modern-js/server-core/base/node';
+import { createServerBase } from '@modern-js/server-core/base';
+import { initProdMiddlewares } from './init';
+import { BaseEnv, ProdServerOptions } from './types';
 
-export { initProdMiddlewares, type InitProdMiddlewares } from './handler';
+export { initProdMiddlewares, type InitProdMiddlewares } from './init';
 
 export type { ProdServerOptions, BaseEnv } from './types';
 
 export const createProdServer = async (options: ProdServerOptions) => {
-  const server = await createWebServer(options);
+  const server = createServerBase<BaseEnv>(options);
+  // load env file.
+  await loadServerEnv(options);
+  await server.init();
+
   const nodeServer = createNodeServer(server.handle.bind(server));
   await server.runner.beforeServerInit({
     app: nodeServer,

diff --git a/packages/server/prod-server/src/handler.ts → packages/server/prod-server/src/init.ts b/packages/server/prod-server/src/handler.ts → packages/server/prod-server/src/init.ts
@@ -5,11 +5,9 @@ import {
   injectReporter,
   injectLogger,
   createErrorHtml,
-  createServerBase,
 } from '@modern-js/server-core/base';
 import { createLogger } from '@modern-js/utils';
 import {
-  loadServerEnv,
   injectTemplates,
   bindBFFHandler,
   injectServerManifest,
@@ -18,26 +16,8 @@ import {
 import { ErrorDigest, onError } from './error';
 import { ProdServerOptions, BaseEnv } from './types';
 
-export type { ProdServerOptions, BaseEnv } from './types';
-
-export async function createRequestHandler(
-  options: ProdServerOptions,
-): Promise<ReturnType<typeof createServerBase>['handle']> {
-  const server = await createWebServer(options);
-  await initProdMiddlewares(server, options);
-  return server.handle.bind(server);
-}
-
-export async function createWebServer(options: ProdServerOptions) {
-  const server = createServerBase<BaseEnv>(options);
-  // load env file.
-  await loadServerEnv(options);
-  await server.init();
-
-  return server;
-}
-
 export type InitProdMiddlewares = typeof initProdMiddlewares;
+
 export const initProdMiddlewares = async (
   server: ServerBase<BaseEnv>,
   options: ProdServerOptions,