@modern-js/prod-server 2.48.5 → 2.49.0

package/README.md

@@ -1,26 +1,30 @@
-<p align="center">
-  <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
-</p>
+# Modern.js Package
 
-<h1 align="center">Modern.js</h1>
+## Get Started
 
-<p align="center">
-  A Progressive React Framework for modern web development.
-</p>
+Run and debug the module:
 
-## Getting Started
+```bash
+pnpm run dev
+```
 
-Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js.
+Run test cases:
 
-## Documentation
+```bash
+pnpm run test
+```
 
-- [English Documentation](https://modernjs.dev/en/)
-- [中文文档](https://modernjs.dev)
+Build the module for production:
 
-## Contributing
+```bash
+pnpm run build
+```
 
-Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
+Enable optional features:
 
-## License
+```bash
+pnpm run new
+```
 
-Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).
+
+For more information, see the [Modern.js Module documentation](https://modernjs.dev/module-tools/en).

package/dist/cjs/{libs/route/route.js → error.js}

@@ -16,25 +16,24 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var route_exports = {};
-__export(route_exports, {
-  ModernRoute: () => ModernRoute
+var error_exports = {};
+__export(error_exports, {
+  ErrorDigest: () => ErrorDigest,
+  onError: () => onError
 });
-module.exports = __toCommonJS(route_exports);
-class ModernRoute {
-  constructor(routeSpec) {
-    this.params = {};
-    this.entryName = routeSpec.entryName || "";
-    this.urlPath = routeSpec.urlPath;
-    this.entryPath = routeSpec.entryPath || "";
-    this.isSSR = routeSpec.isSSR || false;
-    this.isSPA = routeSpec.isSPA || false;
-    this.isApi = routeSpec.isApi || false;
-    this.bundle = routeSpec.bundle || "";
-    this.responseHeaders = routeSpec.responseHeaders;
-  }
+module.exports = __toCommonJS(error_exports);
+var ErrorDigest;
+(function(ErrorDigest2) {
+  ErrorDigest2["ENOTF"] = "Page could not be found";
+  ErrorDigest2["EINTER"] = "Internal server error";
+})(ErrorDigest || (ErrorDigest = {}));
+function onError(logger, digest, error, req) {
+  const headers = req === null || req === void 0 ? void 0 : req.headers;
+  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
+  logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ModernRoute
+  ErrorDigest,
+  onError
 });

package/dist/cjs/index.js

@@ -15,36 +15,30 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  ModernServer: () => import_modernServer.ModernServer,
-  Server: () => import_server.Server,
-  createProxyHandler: () => import_proxy.createProxyHandler,
-  createRenderHandler: () => import_render.createRenderHandler,
-  default: () => src_default
+  createProdServer: () => createProdServer,
+  initProdMiddlewares: () => import_init2.initProdMiddlewares
 });
 module.exports = __toCommonJS(src_exports);
-var import_server = require("./server");
-var import_modernServer = require("./server/modernServer");
-var import_proxy = require("./libs/proxy");
-__reExport(src_exports, require("./type"), module.exports);
-__reExport(src_exports, require("./constants"), module.exports);
-var import_render = require("./libs/render");
-var src_default = (options) => {
-  if (options == null) {
-    throw new Error("can not start mserver without options");
-  }
-  const server = new import_server.Server(options);
-  return server.init();
+var import_node = require("@modern-js/server-core/base/node");
+var import_base = require("@modern-js/server-core/base");
+var import_init = require("./init");
+var import_init2 = require("./init");
+const createProdServer = async (options) => {
+  const server = (0, import_base.createServerBase)(options);
+  await (0, import_node.loadServerEnv)(options);
+  await server.init();
+  const nodeServer = (0, import_node.createNodeServer)(server.handle.bind(server));
+  await server.runner.beforeServerInit({
+    app: nodeServer
+  });
+  await (0, import_init.initProdMiddlewares)(server, options);
+  return nodeServer;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ModernServer,
-  Server,
-  createProxyHandler,
-  createRenderHandler,
-  ...require("./type"),
-  ...require("./constants")
+  createProdServer,
+  initProdMiddlewares
 });

package/dist/cjs/init.js

@@ -0,0 +1,71 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var init_exports = {};
+__export(init_exports, {
+  initProdMiddlewares: () => initProdMiddlewares
+});
+module.exports = __toCommonJS(init_exports);
+var import_base = require("@modern-js/server-core/base");
+var import_utils = require("@modern-js/utils");
+var import_node = require("@modern-js/server-core/base/node");
+var import_error = require("./error");
+function getLogger() {
+  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
+    return (0, import_utils.createLogger)({
+      level: "verbose"
+    });
+  } else {
+    return (0, import_utils.createLogger)();
+  }
+}
+const initProdMiddlewares = async (server, options) => {
+  const { config, pwd, routes, logger: inputLogger } = options;
+  const logger = inputLogger || getLogger();
+  const staticMiddleware = (0, import_node.createStaticMiddleware)({
+    pwd,
+    output: (config === null || config === void 0 ? void 0 : config.output) || {},
+    html: (config === null || config === void 0 ? void 0 : config.html) || {},
+    routes
+  });
+  server.all("*", import_base.processedBy);
+  server.all("*", (0, import_base.injectReporter)());
+  server.all("*", (0, import_base.injectLogger)(logger));
+  server.all("*", (0, import_base.logHandler)());
+  server.all("*", (0, import_node.injectServerManifest)(pwd, routes));
+  server.all("*", (0, import_node.injectTemplates)(pwd, routes));
+  server.notFound((c) => {
+    const logger2 = c.get("logger");
+    (0, import_error.onError)(logger2, import_error.ErrorDigest.ENOTF, "404 not found", c.req.raw);
+    return c.html((0, import_base.createErrorHtml)(404), 404);
+  });
+  server.onError((err, c) => {
+    const logger2 = c.get("logger");
+    (0, import_error.onError)(logger2, import_error.ErrorDigest.EINTER, err, c.req.raw);
+    return c.html((0, import_base.createErrorHtml)(500), 500);
+  });
+  server.get("*", staticMiddleware);
+  server.get("*", import_base.favionFallbackMiddleware);
+  await (0, import_node.bindBFFHandler)(server, options);
+  await (0, import_base.bindRenderHandler)(server, options);
+  return server;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  initProdMiddlewares
+});

package/dist/cjs/{type.js → types.js}

@@ -12,5 +12,5 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var type_exports = {};
-module.exports = __toCommonJS(type_exports);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/esm/error.js

@@ -0,0 +1,15 @@
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+var ErrorDigest;
+(function(ErrorDigest2) {
+  ErrorDigest2["ENOTF"] = "Page could not be found";
+  ErrorDigest2["EINTER"] = "Internal server error";
+})(ErrorDigest || (ErrorDigest = {}));
+function onError(logger, digest, error, req) {
+  var headers = req === null || req === void 0 ? void 0 : req.headers;
+  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
+  logger.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
+}
+export {
+  ErrorDigest,
+  onError
+};

package/dist/esm/index.js

@@ -1,21 +1,55 @@
-import { Server } from "./server";
-import { ModernServer } from "./server/modernServer";
-import { createProxyHandler } from "./libs/proxy";
-export * from "./type";
-export * from "./constants";
-import { createRenderHandler } from "./libs/render";
-function src_default(options) {
-  if (options == null) {
-    throw new Error("can not start mserver without options");
-  }
-  var server = new Server(options);
-  return server.init();
-}
-;
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { createNodeServer, loadServerEnv } from "@modern-js/server-core/base/node";
+import { createServerBase } from "@modern-js/server-core/base";
+import { initProdMiddlewares } from "./init";
+import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
+var createProdServer = function() {
+  var _ref = _async_to_generator(function(options) {
+    var server, nodeServer;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          server = createServerBase(options);
+          return [
+            4,
+            loadServerEnv(options)
+          ];
+        case 1:
+          _state.sent();
+          return [
+            4,
+            server.init()
+          ];
+        case 2:
+          _state.sent();
+          nodeServer = createNodeServer(server.handle.bind(server));
+          return [
+            4,
+            server.runner.beforeServerInit({
+              app: nodeServer
+            })
+          ];
+        case 3:
+          _state.sent();
+          return [
+            4,
+            initProdMiddlewares(server, options)
+          ];
+        case 4:
+          _state.sent();
+          return [
+            2,
+            nodeServer
+          ];
+      }
+    });
+  });
+  return function createProdServer2(options) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
-  ModernServer,
-  Server,
-  createProxyHandler,
-  createRenderHandler,
-  src_default as default
+  createProdServer,
+  initProdMiddlewares2 as initProdMiddlewares
 };

package/dist/esm/init.js

@@ -0,0 +1,73 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy } from "@modern-js/server-core/base";
+import { createLogger } from "@modern-js/utils";
+import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
+import { ErrorDigest, onError } from "./error";
+function getLogger() {
+  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
+    return createLogger({
+      level: "verbose"
+    });
+  } else {
+    return createLogger();
+  }
+}
+var initProdMiddlewares = function() {
+  var _ref = _async_to_generator(function(server, options) {
+    var config, pwd, routes, inputLogger, logger, staticMiddleware;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          config = options.config, pwd = options.pwd, routes = options.routes, inputLogger = options.logger;
+          logger = inputLogger || getLogger();
+          staticMiddleware = createStaticMiddleware({
+            pwd,
+            output: (config === null || config === void 0 ? void 0 : config.output) || {},
+            html: (config === null || config === void 0 ? void 0 : config.html) || {},
+            routes
+          });
+          server.all("*", processedBy);
+          server.all("*", injectReporter());
+          server.all("*", injectLogger(logger));
+          server.all("*", logHandler());
+          server.all("*", injectServerManifest(pwd, routes));
+          server.all("*", injectTemplates(pwd, routes));
+          server.notFound(function(c) {
+            var logger2 = c.get("logger");
+            onError(logger2, ErrorDigest.ENOTF, "404 not found", c.req.raw);
+            return c.html(createErrorHtml(404), 404);
+          });
+          server.onError(function(err, c) {
+            var logger2 = c.get("logger");
+            onError(logger2, ErrorDigest.EINTER, err, c.req.raw);
+            return c.html(createErrorHtml(500), 500);
+          });
+          server.get("*", staticMiddleware);
+          server.get("*", favionFallbackMiddleware);
+          return [
+            4,
+            bindBFFHandler(server, options)
+          ];
+        case 1:
+          _state.sent();
+          return [
+            4,
+            bindRenderHandler(server, options)
+          ];
+        case 2:
+          _state.sent();
+          return [
+            2,
+            server
+          ];
+      }
+    });
+  });
+  return function initProdMiddlewares2(server, options) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  initProdMiddlewares
+};

package/dist/esm-node/error.js

@@ -0,0 +1,14 @@
+var ErrorDigest;
+(function(ErrorDigest2) {
+  ErrorDigest2["ENOTF"] = "Page could not be found";
+  ErrorDigest2["EINTER"] = "Internal server error";
+})(ErrorDigest || (ErrorDigest = {}));
+function onError(logger, digest, error, req) {
+  const headers = req === null || req === void 0 ? void 0 : req.headers;
+  headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
+  logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
+}
+export {
+  ErrorDigest,
+  onError
+};

package/dist/esm-node/index.js

@@ -1,20 +1,19 @@
-import { Server } from "./server";
-import { ModernServer } from "./server/modernServer";
-import { createProxyHandler } from "./libs/proxy";
-export * from "./type";
-export * from "./constants";
-import { createRenderHandler } from "./libs/render";
-var src_default = (options) => {
-  if (options == null) {
-    throw new Error("can not start mserver without options");
-  }
-  const server = new Server(options);
-  return server.init();
+import { createNodeServer, loadServerEnv } from "@modern-js/server-core/base/node";
+import { createServerBase } from "@modern-js/server-core/base";
+import { initProdMiddlewares } from "./init";
+import { initProdMiddlewares as initProdMiddlewares2 } from "./init";
+const createProdServer = async (options) => {
+  const server = createServerBase(options);
+  await loadServerEnv(options);
+  await server.init();
+  const nodeServer = createNodeServer(server.handle.bind(server));
+  await server.runner.beforeServerInit({
+    app: nodeServer
+  });
+  await initProdMiddlewares(server, options);
+  return nodeServer;
 };
 export {
-  ModernServer,
-  Server,
-  createProxyHandler,
-  createRenderHandler,
-  src_default as default
+  createProdServer,
+  initProdMiddlewares2 as initProdMiddlewares
 };

package/dist/esm-node/init.js

@@ -0,0 +1,47 @@
+import { bindRenderHandler, favionFallbackMiddleware, injectReporter, injectLogger, createErrorHtml, logHandler, processedBy } from "@modern-js/server-core/base";
+import { createLogger } from "@modern-js/utils";
+import { injectTemplates, bindBFFHandler, injectServerManifest, createStaticMiddleware } from "@modern-js/server-core/base/node";
+import { ErrorDigest, onError } from "./error";
+function getLogger() {
+  if (process.env.DEBUG || process.env.NODE_ENV === "production") {
+    return createLogger({
+      level: "verbose"
+    });
+  } else {
+    return createLogger();
+  }
+}
+const initProdMiddlewares = async (server, options) => {
+  const { config, pwd, routes, logger: inputLogger } = options;
+  const logger = inputLogger || getLogger();
+  const staticMiddleware = createStaticMiddleware({
+    pwd,
+    output: (config === null || config === void 0 ? void 0 : config.output) || {},
+    html: (config === null || config === void 0 ? void 0 : config.html) || {},
+    routes
+  });
+  server.all("*", processedBy);
+  server.all("*", injectReporter());
+  server.all("*", injectLogger(logger));
+  server.all("*", logHandler());
+  server.all("*", injectServerManifest(pwd, routes));
+  server.all("*", injectTemplates(pwd, routes));
+  server.notFound((c) => {
+    const logger2 = c.get("logger");
+    onError(logger2, ErrorDigest.ENOTF, "404 not found", c.req.raw);
+    return c.html(createErrorHtml(404), 404);
+  });
+  server.onError((err, c) => {
+    const logger2 = c.get("logger");
+    onError(logger2, ErrorDigest.EINTER, err, c.req.raw);
+    return c.html(createErrorHtml(500), 500);
+  });
+  server.get("*", staticMiddleware);
+  server.get("*", favionFallbackMiddleware);
+  await bindBFFHandler(server, options);
+  await bindRenderHandler(server, options);
+  return server;
+};
+export {
+  initProdMiddlewares
+};

package/dist/types/error.d.ts

@@ -0,0 +1,6 @@
+import { Logger } from '@modern-js/types';
+export declare enum ErrorDigest {
+    ENOTF = "Page could not be found",
+    EINTER = "Internal server error"
+}
+export declare function onError(logger: Logger, digest: ErrorDigest, error: Error | string, req?: Request): void;

package/dist/types/index.d.ts

@@ -1,11 +1,8 @@
-import { ModernServerOptions } from './type';
-import { Server } from './server';
-export { Server };
-export type { ServerConfig } from '@modern-js/server-core';
-export { ModernServer } from './server/modernServer';
-export { createProxyHandler } from './libs/proxy';
-export * from './type';
-export * from './constants';
-export { createRenderHandler } from './libs/render';
-declare const _default: (options: ModernServerOptions) => Promise<Server>;
-export default _default;
+/// <reference types="node" />
+import { ProdServerOptions } from './types';
+export { initProdMiddlewares, type InitProdMiddlewares } from './init';
+export type { ProdServerOptions, BaseEnv } from './types';
+export declare const createProdServer: (options: ProdServerOptions) => Promise<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> & {
+    getRequestListener: () => (req: import("http").IncomingMessage, res: import("@modern-js/server-core/dist/types/core").NodeResponse) => Promise<void>;
+    getRequestHandler: () => import("@modern-js/server-core/dist/types/core/server").RequestHandler;
+}>;

package/dist/types/init.d.ts

@@ -0,0 +1,4 @@
+import { ServerBase } from '@modern-js/server-core/base';
+import { ProdServerOptions, BaseEnv } from './types';
+export type InitProdMiddlewares = typeof initProdMiddlewares;
+export declare const initProdMiddlewares: (server: ServerBase<BaseEnv>, options: ProdServerOptions) => Promise<ServerBase<BaseEnv>>;

package/dist/types/types.d.ts

@@ -0,0 +1,14 @@
+import { ServerBaseOptions, BindRenderHandleOptions } from '@modern-js/server-core/base';
+import { Reporter } from '@modern-js/types';
+import { Logger } from '@modern-js/utils';
+interface MonitorOptions {
+    logger?: Logger;
+}
+export type ProdServerOptions = ServerBaseOptions & Omit<BindRenderHandleOptions, 'templates'> & MonitorOptions;
+export type BaseEnv = {
+    Variables: {
+        logger: Logger;
+        reporter: Reporter;
+    };
+};
+export {};