@modern-js/server-core 2.54.6 → 2.56.0

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

@@ -77,7 +77,7 @@ const loadBundle = async (filepath, logger) => {
     return void 0;
   }
   return dynamicImport(filepath).catch((e) => {
-    logger.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
+    logger === null || logger === void 0 ? void 0 : logger.error(`Load ${filepath} bundle failed, error = %s`, e instanceof Error ? e.stack || e.message : e);
     return void 0;
   });
 };

package/dist/cjs/constants.js

@@ -20,7 +20,8 @@ var constants_exports = {};
 __export(constants_exports, {
   AGGRED_DIR: () => AGGRED_DIR,
   REPLACE_REG: () => REPLACE_REG,
-  ServerReportTimings: () => ServerReportTimings,
+  SERVER_TIMING: () => SERVER_TIMING,
+  ServerTimings: () => ServerTimings,
   X_MODERNJS_RENDER: () => X_MODERNJS_RENDER,
   X_RENDER_CACHE: () => X_RENDER_CACHE
 });
@@ -42,20 +43,22 @@ const REPLACE_REG = {
     body: "</body>"
   }
 };
-var ServerReportTimings;
-(function(ServerReportTimings2) {
-  ServerReportTimings2["SERVER_HANDLE_REQUEST"] = "server-handle-request";
-  ServerReportTimings2["SERVER_MIDDLEWARE"] = "server-middleware";
-  ServerReportTimings2["SERVER_HOOK_AFTER_RENDER"] = "server-hook-after-render";
-  ServerReportTimings2["SERVER_HOOK_AFTER_MATCH"] = "server-hook-after-match";
-})(ServerReportTimings || (ServerReportTimings = {}));
+var ServerTimings;
+(function(ServerTimings2) {
+  ServerTimings2["SERVER_HANDLE_REQUEST"] = "server-handle-request";
+  ServerTimings2["SERVER_MIDDLEWARE"] = "server-middleware";
+  ServerTimings2["SERVER_HOOK_AFTER_RENDER"] = "server-hook-after-render";
+  ServerTimings2["SERVER_HOOK_AFTER_MATCH"] = "server-hook-after-match";
+})(ServerTimings || (ServerTimings = {}));
+const SERVER_TIMING = "Server-Timing";
 const X_RENDER_CACHE = "x-render-cache";
 const X_MODERNJS_RENDER = "x-modernjs-render";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AGGRED_DIR,
   REPLACE_REG,
-  ServerReportTimings,
+  SERVER_TIMING,
+  ServerTimings,
   X_MODERNJS_RENDER,
   X_RENDER_CACHE
 });

package/dist/cjs/index.js

@@ -36,6 +36,7 @@ __reExport(src_exports, require("./types/plugin"), module.exports);
 __reExport(src_exports, require("./types/render"), module.exports);
 __reExport(src_exports, require("@modern-js/plugin"), module.exports);
 __reExport(src_exports, require("./types/config"), module.exports);
+__reExport(src_exports, require("./types/requestHandler"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AGGRED_DIR,
@@ -48,5 +49,6 @@ __reExport(src_exports, require("./types/config"), module.exports);
   ...require("./types/plugin"),
   ...require("./types/render"),
   ...require("@modern-js/plugin"),
-  ...require("./types/config")
+  ...require("./types/config"),
+  ...require("./types/requestHandler")
 });

package/dist/cjs/plugins/customServer/index.js

@@ -40,7 +40,7 @@ class CustomServer {
   getHookMiddleware(entryName, routes) {
     return async (c, next) => {
       const routeInfo = routes.find((route) => route.entryName === entryName);
-      const reporter = c.get("reporter");
+      const monitors = c.get("monitors");
       const baseHookCtx = (0, import_base.createBaseHookContext)(c);
       const afterMatchCtx = (0, import_context.getAfterMatchCtx)(entryName, baseHookCtx);
       const getCost = (0, import_time.time)();
@@ -48,7 +48,7 @@ class CustomServer {
         onLast: noop
       });
       const cost = getCost();
-      cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(import_constants.ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost));
+      cost && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(import_constants.ServerTimings.SERVER_HOOK_AFTER_MATCH, cost));
       const { url, status } = afterMatchCtx.router;
       if (url) {
         return c.redirect(url, status);
@@ -88,7 +88,7 @@ class CustomServer {
           onLast: noop
         });
         const cost2 = getCost2();
-        cost2 && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(import_constants.ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost2));
+        cost2 && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(import_constants.ServerTimings.SERVER_HOOK_AFTER_RENDER, cost2));
         if (afterRenderCtx.response.private_overrided) {
           return void 0;
         }
@@ -107,7 +107,7 @@ class CustomServer {
     }
     return async (c, next) => {
       var _c_env_node_res, _c_env_node, _c_env;
-      const reporter = c.get("reporter");
+      const monitors = c.get("monitors");
       const locals = {};
       const resArgs = {
         headers: new Headers()
@@ -116,7 +116,7 @@ class CustomServer {
       const getCost = (0, import_time.time)();
       await serverMiddleware(customMiddlewareCtx);
       const cost = getCost();
-      cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(import_constants.ServerReportTimings.SERVER_MIDDLEWARE, cost));
+      cost && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(import_constants.ServerTimings.SERVER_MIDDLEWARE, cost));
       c.set("locals", locals);
       if (isRedirect(resArgs.headers, resArgs.status)) {
         return c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302);

package/dist/cjs/plugins/index.js

@@ -21,8 +21,10 @@ __export(plugins_exports, {
   faviconPlugin: () => import_favicon.faviconPlugin,
   getLoaderCtx: () => import_customServer.getLoaderCtx,
   getRenderHandler: () => import_render.getRenderHandler,
+  initMonitorsPlugin: () => import_monitors.initMonitorsPlugin,
+  injectServerTiming: () => import_monitors.injectServerTiming,
+  injectloggerPluigin: () => import_monitors.injectloggerPluigin,
   logPlugin: () => import_log.logPlugin,
-  monitorPlugin: () => import_monitor.monitorPlugin,
   processedByPlugin: () => import_processedBy.processedByPlugin,
   renderPlugin: () => import_render.renderPlugin
 });
@@ -32,14 +34,16 @@ var import_favicon = require("./favicon");
 var import_processedBy = require("./processedBy");
 var import_customServer = require("./customServer");
 var import_log = require("./log");
-var import_monitor = require("./monitor");
+var import_monitors = require("./monitors");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   faviconPlugin,
   getLoaderCtx,
   getRenderHandler,
+  initMonitorsPlugin,
+  injectServerTiming,
+  injectloggerPluigin,
   logPlugin,
-  monitorPlugin,
   processedByPlugin,
   renderPlugin
 });

package/dist/cjs/plugins/log.js

@@ -62,13 +62,13 @@ function log(fn, prefix, method, path, status = 0, elapsed) {
 function logHandler() {
   return async function logger(c, next) {
     const { method } = c.req;
-    const logger2 = c.get("logger");
-    if (!logger2) {
+    const monitors = c.get("monitors");
+    if (!monitors) {
       await next();
       return;
     }
     const path = (0, import_utils.getPathname)(c.req.raw);
-    const logFn = logger2.debug;
+    const logFn = monitors.debug;
     log(logFn, "<--", method, path);
     const start = Date.now();
     await next();

package/dist/cjs/plugins/monitors.js

@@ -0,0 +1,183 @@
+"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 monitors_exports = {};
+__export(monitors_exports, {
+  initMonitorsPlugin: () => initMonitorsPlugin,
+  initReporter: () => initReporter,
+  injectServerTiming: () => injectServerTiming,
+  injectloggerPluigin: () => injectloggerPluigin
+});
+module.exports = __toCommonJS(monitors_exports);
+var import_time = require("@modern-js/runtime-utils/time");
+var import_constants = require("../constants");
+function createMonitors() {
+  const coreMonitors = [];
+  const log = (level, message, args) => {
+    const event = {
+      type: "log",
+      payload: {
+        level,
+        message,
+        args
+      }
+    };
+    coreMonitors.forEach((monitor) => monitor(event));
+  };
+  const mointors = {
+    push(monitor) {
+      coreMonitors.push(monitor);
+    },
+    error(message, ...args) {
+      log("error", message, args);
+    },
+    warn(message, ...args) {
+      log("warn", message, args);
+    },
+    debug(message, ...args) {
+      log("debug", message, args);
+    },
+    info(message, ...args) {
+      log("info", message, args);
+    },
+    timing(name, dur, desc) {
+      const event = {
+        type: "timing",
+        payload: {
+          name,
+          dur,
+          desc
+        }
+      };
+      coreMonitors.forEach((monitor) => monitor(event));
+    }
+  };
+  return mointors;
+}
+const initMonitorsPlugin = () => ({
+  name: "@modern-js/init-mointor",
+  setup(api) {
+    return {
+      prepare() {
+        const { middlewares } = api.useAppContext();
+        middlewares.push({
+          name: "init-monitor",
+          handler: async (c, next) => {
+            if (!c.get("monitors")) {
+              const monitors = createMonitors();
+              c.set("monitors", monitors);
+            }
+            return next();
+          },
+          order: "pre"
+        });
+      }
+    };
+  }
+});
+const injectloggerPluigin = (logger) => ({
+  name: "@modern-js/inject-logger",
+  setup(api) {
+    return {
+      prepare() {
+        const { middlewares } = api.useAppContext();
+        middlewares.push({
+          name: "inject-logger",
+          handler: async (c, next) => {
+            if (!c.get("logger")) {
+              c.set("logger", logger);
+            }
+            const pathname = c.req.path;
+            const loggerMonitor = (event) => {
+              if (event.type === "log") {
+                const { level, message, args } = event.payload;
+                logger[level](message, ...args || []);
+              }
+              if (event.type === "timing") {
+                const { name, dur, desc } = event.payload;
+                if (desc) {
+                  logger.debug(`%s Debug - ${name}, cost: %s, req.url = %s `, desc, dur, pathname);
+                } else {
+                  logger.debug(`Debug - ${name}, cost: %s, req.url = %s`, dur, pathname);
+                }
+              }
+            };
+            const monitors = c.get("monitors");
+            monitors === null || monitors === void 0 ? void 0 : monitors.push(loggerMonitor);
+            return next();
+          }
+        });
+      }
+    };
+  }
+});
+const injectServerTiming = (metaName = "modern-js") => ({
+  name: "@modern-js/inject-server-timing",
+  setup(api) {
+    return {
+      prepare() {
+        const { middlewares } = api.useAppContext();
+        middlewares.push({
+          name: "inject-server-timing",
+          handler: async (c, next) => {
+            const serverTimings = [];
+            const timingMonitor = (event) => {
+              if (event.type === "timing") {
+                serverTimings.push(event.payload);
+              }
+            };
+            const monitors = c.get("monitors");
+            monitors === null || monitors === void 0 ? void 0 : monitors.push(timingMonitor);
+            await next();
+            serverTimings.forEach((serverTiming) => {
+              const { name, desc, dur } = serverTiming;
+              const _name = `bd-${metaName}-${name}`;
+              const value = `${_name};${desc ? `decs="${desc}";` : ""} dur=${dur}`;
+              c.header(import_constants.SERVER_TIMING, value, {
+                append: true
+              });
+            });
+          }
+        });
+      }
+    };
+  }
+});
+function initReporter(entryName) {
+  return async (c, next) => {
+    const reporter = c.get("reporter");
+    if (!reporter) {
+      await next();
+      return;
+    }
+    await reporter.init({
+      entryName
+    });
+    const getCost = (0, import_time.time)();
+    await next();
+    const cost = getCost();
+    reporter.reportTiming(import_constants.ServerTimings.SERVER_HANDLE_REQUEST, cost);
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  initMonitorsPlugin,
+  initReporter,
+  injectServerTiming,
+  injectloggerPluigin
+});

package/dist/cjs/plugins/render/dataHandler.js

@@ -22,7 +22,7 @@ __export(dataHandler_exports, {
 });
 module.exports = __toCommonJS(dataHandler_exports);
 var import_constants = require("@modern-js/utils/universal/constants");
-const dataHandler = async (request, { routeInfo, serverRoutes, reporter, logger, serverManifest }) => {
+const dataHandler = async (request, { routeInfo, serverRoutes, reporter, onError, onTiming, serverManifest }) => {
   var _serverManifest_loaderBundles;
   const serverLoaderModule = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_loaderBundles = serverManifest.loaderBundles) === null || _serverManifest_loaderBundles === void 0 ? void 0 : _serverManifest_loaderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
   if (!serverLoaderModule) {
@@ -33,9 +33,10 @@ const dataHandler = async (request, { routeInfo, serverRoutes, reporter, logger,
     request,
     serverRoutes,
     context: {
-      logger,
       reporter
     },
+    onTiming,
+    onError,
     routes
   });
   return response;

package/dist/cjs/plugins/render/index.js

@@ -23,7 +23,7 @@ __export(render_exports, {
 });
 module.exports = __toCommonJS(render_exports);
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_monitor = require("../monitor");
+var import_monitors = require("../monitors");
 var import_utils = require("../../utils");
 var import_customServer = require("../customServer");
 var import_render = require("./render");
@@ -56,7 +56,7 @@ const renderPlugin = (options = {}) => ({
           const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
           middlewares.push({
             name: "init-reporter",
-            handler: (0, import_monitor.initReporter)(entryName || import_constants.MAIN_ENTRY_NAME)
+            handler: (0, import_monitors.initReporter)(entryName || import_constants.MAIN_ENTRY_NAME)
           });
           const customServerHookMiddleware = customServer.getHookMiddleware(entryName || "main", routes);
           middlewares.push({
@@ -88,6 +88,7 @@ function createRenderHandler(render) {
     var _c_env_node;
     const logger = c.get("logger");
     const reporter = c.get("reporter");
+    const monitors = c.get("monitors");
     const templates = c.get("templates") || {};
     const serverManifest = c.get("serverManifest") || {};
     const locals = c.get("locals");
@@ -96,8 +97,9 @@ function createRenderHandler(render) {
     const request = c.req.raw;
     const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
     const res = await render(request, {
-      logger,
       nodeReq,
+      monitors,
+      logger,
       reporter,
       templates,
       metrics,
@@ -120,7 +122,7 @@ async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, st
   const render = (0, import_render.createRender)({
     routes,
     pwd,
-    // TODO: need static Genrate
+    config,
     staticGenerate,
     cacheConfig,
     forceCSR,

package/dist/cjs/plugins/render/render.js

@@ -56,9 +56,17 @@ function matchRoute(router, request) {
   const result = matched[0][0];
   return result || [];
 }
-async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, nonce, onFallback: onFallbackFn }) {
+function getHeadersWithoutCookie(headers) {
+  const _headers = {
+    ...headers,
+    cookie: void 0
+  };
+  delete _headers.cookie;
+  return _headers;
+}
+async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
-  return async (req, { logger, nodeReq, reporter, templates, serverManifest, locals, metrics, loaderContext }) => {
+  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, loaderContext }) => {
     const [routeInfo, params] = matchRoute(router, req);
     const onFallback = async (reason, error) => {
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
@@ -85,8 +93,16 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       });
     }
     const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
-    const onError = async (e) => {
-      (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, logger, req);
+    const pathname = (0, import_utils.getPathname)(req);
+    const headerData = (0, import_utils.parseHeaders)(req);
+    const onError = (e) => {
+      monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${e instanceof Error ? e.name : e}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, getHeadersWithoutCookie(headerData));
+    };
+    const onTiming = (name, dur) => {
+      monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
+    };
+    const onBoundError = async (e) => {
+      (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, monitors, req);
       await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
     };
     const renderOptions = {
@@ -94,32 +110,33 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       html,
       routeInfo,
       staticGenerate: staticGenerate || false,
-      metaName: metaName || "modern-js",
-      nonce,
-      logger,
+      config,
       nodeReq,
       cacheConfig,
       reporter,
       serverRoutes: routes,
       params,
+      logger,
+      metrics,
       locals,
       serverManifest,
-      metrics,
-      loaderContext: loaderContext || /* @__PURE__ */ new Map()
+      loaderContext: loaderContext || /* @__PURE__ */ new Map(),
+      onError,
+      onTiming
     };
+    let response;
     switch (renderMode) {
       case "data":
-        let response = await (0, import_dataHandler.dataHandler)(req, renderOptions);
-        if (!response) {
-          response = await renderHandler(req, renderOptions, "ssr", onError);
-        }
-        return response;
+        response = await (0, import_dataHandler.dataHandler)(req, renderOptions) || await renderHandler(req, renderOptions, "ssr", onBoundError);
+        break;
       case "ssr":
       case "csr":
-        return renderHandler(req, renderOptions, renderMode, onError);
+        response = await renderHandler(req, renderOptions, renderMode, onBoundError);
+        break;
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
     }
+    return response;
   };
 }
 async function renderHandler(request, options, mode, onError) {