Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: load webHandler & nodeReuqestListener to nodeServer #5559

Merged
merged 2 commits into from
Mar 21, 2024
Merged

fix: load webHandler & nodeReuqestListener to nodeServer #5559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c97fc
fix: upload handler in nodeServer
GiveMe-A-Name Mar 21, 2024
e97946e
fix: error
GiveMe-A-Name Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/runtime/plugin-testing/src/cli/bff/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
10 changes: 6 additions & 4 deletions packages/server/core/src/base/adapters/node/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
13 changes: 0 additions & 13 deletions packages/server/prod-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
},
Expand Down Expand Up @@ -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"
}
}
}
Expand Down
18 changes: 13 additions & 5 deletions packages/server/prod-server/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
22 changes: 1 addition & 21 deletions packages/server/prod-server/src/handler.ts → packages/server/prod-server/src/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down