@modern-js/server-core 2.55.0 → 2.56.0

package/dist/esm-node/plugins/render/index.js

@@ -1,5 +1,5 @@
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-import { initReporter } from "../monitor";
+import { initReporter } from "../monitors";
 import { sortRoutes } from "../../utils";
 import { getLoaderCtx, CustomServer, getServerMidFromUnstableMid } from "../customServer";
 import { createRender } from "./render";
@@ -64,6 +64,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");
@@ -72,8 +73,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,

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

@@ -4,7 +4,6 @@ import { parseQuery, getPathname, createErrorHtml, sortRoutes, transformResponse
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
-import { ServerTiming } from "./serverTiming";
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
   const dynamicRoutes = [];
@@ -42,10 +41,9 @@ function getHeadersWithoutCookie(headers) {
   delete _headers.cookie;
   return _headers;
 }
-const SERVER_TIMING = "Server-Timing";
 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, {
@@ -74,16 +72,14 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
     const pathname = getPathname(req);
     const headerData = parseHeaders(req);
-    const serverTimingInstance = new ServerTiming(metaName || "modern");
     const onError = (e) => {
-      logger.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));
+      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) => {
-      logger.debug(`SSR Debug - ${name}, cost = %s, req.url = %s`, dur, pathname);
-      serverTimingInstance.addServeTiming(name, dur);
+      monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
     };
     const onBoundError = async (e) => {
-      onErrorFn(ErrorDigest.ERENDER, e, logger, req);
+      onErrorFn(ErrorDigest.ERENDER, e, monitors, req);
       await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
     };
     const renderOptions = {
@@ -117,9 +113,6 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       default:
         throw new Error(`Unknown render mode: ${renderMode}`);
     }
-    serverTimingInstance.headers.forEach((value) => {
-      response.headers.append(SERVER_TIMING, value);
-    });
     return response;
   };
 }

package/dist/esm-node/utils/error.js

@@ -43,11 +43,11 @@ var ErrorDigest;
   ErrorDigest2["EINTER"] = "Internal server error";
   ErrorDigest2["ERENDER"] = "SSR render failed";
 })(ErrorDigest || (ErrorDigest = {}));
-function onError(digest, error, logger, req) {
+function onError(digest, error, monitors, req) {
   const headerData = req && parseHeaders(req);
   headerData && delete headerData.cookie;
-  if (logger) {
-    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, headerData);
+  if (monitors) {
+    monitors.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, headerData);
   } else if (req) {
     console.error(`Server Error - ${digest}, error = ${error instanceof Error ? error.stack || error.message : error}, req.url = ${req.url}, req.headers = ${JSON.stringify(headerData)}`);
   } else {

package/dist/types/constants.d.ts

@@ -15,11 +15,12 @@ export declare const REPLACE_REG: {
         body: string;
     };
 };
-export declare enum ServerReportTimings {
+export declare enum ServerTimings {
     SERVER_HANDLE_REQUEST = "server-handle-request",
     SERVER_MIDDLEWARE = "server-middleware",
     SERVER_HOOK_AFTER_RENDER = "server-hook-after-render",
     SERVER_HOOK_AFTER_MATCH = "server-hook-after-match"
 }
+export declare const SERVER_TIMING = "Server-Timing";
 export declare const X_RENDER_CACHE = "x-render-cache";
 export declare const X_MODERNJS_RENDER = "x-modernjs-render";

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

@@ -3,4 +3,4 @@ export { faviconPlugin } from './favicon';
 export { processedByPlugin } from './processedBy';
 export { getLoaderCtx } from './customServer';
 export { logPlugin } from './log';
-export { monitorPlugin } from './monitor';
+export { initMonitorsPlugin, injectServerTiming, injectloggerPluigin, } from './monitors';

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

@@ -0,0 +1,6 @@
+import type { Logger } from '@modern-js/types';
+import type { Context, Next, ServerEnv, ServerPlugin } from '../types';
+export declare const initMonitorsPlugin: () => ServerPlugin;
+export declare const injectloggerPluigin: (logger: Logger) => ServerPlugin;
+export declare const injectServerTiming: (metaName?: string) => ServerPlugin;
+export declare function initReporter(entryName: string): (c: Context<ServerEnv>, next: Next) => Promise<void>;

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

@@ -1,18 +1,21 @@
 /// <reference types="node" />
 import type { IncomingMessage } from 'node:http';
-import type { Logger, Metrics, Reporter } from '@modern-js/types';
+import type { Logger, Metrics, Monitors, Reporter } from '@modern-js/types';
 import type { ServerManifest } from './server';
 export interface RenderOptions {
-    logger: Logger;
     loaderContext?: Map<string, unknown>;
     /** ssr render html templates */
     templates: Record<string, string>;
     /** Communicating with custom server hook & modern ssr runtime. */
     locals?: Record<string, any>;
-    /** Metrics */
+    /** @deprecated  */
+    logger: Logger;
+    /** @deprecated */
     metrics?: Metrics;
-    serverManifest: ServerManifest;
+    /** @deprecated */
     reporter?: Reporter;
+    monitors?: Monitors;
+    serverManifest: ServerManifest;
     nodeReq?: IncomingMessage;
 }
 export type Render = (request: Request, options: RenderOptions) => Promise<Response>;

package/dist/types/types/requestHandler.d.ts

@@ -14,8 +14,6 @@ export type RequestHandlerConfig = {
     scriptLoading?: 'defer' | 'blocking' | 'module' | 'async';
     enableInlineStyles?: boolean | RegExp;
     enableInlineScripts?: boolean | RegExp;
-    disablePrerender?: boolean;
-    chunkLoadingGlobal?: string;
     ssr?: ServerUserConfig['ssr'];
     ssrByEntries?: ServerUserConfig['ssrByEntries'];
 };

package/dist/types/types/server.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { Readable } from 'node:stream';
-import type { Metrics, Logger, Reporter, BaseSSRServerContext, ServerRoute, NestedRoute } from '@modern-js/types';
+import type { Metrics, Logger, Reporter, BaseSSRServerContext, ServerRoute, NestedRoute, Monitors } from '@modern-js/types';
 import { RequestHandler as BundleRequestHandler, OnError, OnTiming } from './requestHandler';
 export type SSRServerContext = BaseSSRServerContext & {
     staticGenerate?: boolean;
@@ -30,8 +30,13 @@ export type ServerManifest = {
     routeManifest?: Record<string, any>;
 };
 type ServerVariables = {
+    /** @deprecated  */
     logger: Logger;
+    /** @deprecated  */
     reporter?: Reporter;
+    /** @deprecated  */
+    metrics?: Metrics;
+    monitors: Monitors;
     serverManifest?: ServerManifest;
     templates?: Record<string, string>;
     /**
@@ -41,7 +46,6 @@ type ServerVariables = {
      * Custom by ssrRuntime.
      */
     locals?: Record<string, any>;
-    metrics?: Metrics;
 };
 export type ServerEnv = {
     Variables: ServerVariables;

package/dist/types/utils/error.d.ts

@@ -1,8 +1,8 @@
-import type { Logger } from '@modern-js/types';
+import type { Monitors } from '@modern-js/types';
 export declare const createErrorHtml: (status: number) => string;
 export declare enum ErrorDigest {
     ENOTF = "Page could not be found",
     EINTER = "Internal server error",
     ERENDER = "SSR render failed"
 }
-export declare function onError(digest: ErrorDigest, error: Error | string, logger?: Logger, req?: Request): void;
+export declare function onError(digest: ErrorDigest, error: Error | string, monitors?: Monitors, req?: Request): void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.55.0",
+  "version": "2.56.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -52,9 +52,9 @@
     "@web-std/file": "^3.0.3",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.0",
-    "@modern-js/plugin": "2.55.0",
-    "@modern-js/runtime-utils": "2.55.0",
-    "@modern-js/utils": "2.55.0"
+    "@modern-js/plugin": "2.56.0",
+    "@modern-js/runtime-utils": "2.56.0",
+    "@modern-js/utils": "2.56.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -64,9 +64,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.55.0",
-    "@scripts/jest-config": "2.55.0",
-    "@scripts/build": "2.55.0"
+    "@modern-js/types": "2.56.0",
+    "@scripts/build": "2.56.0",
+    "@scripts/jest-config": "2.56.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/plugins/monitor.js

@@ -1,87 +0,0 @@
-"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 monitor_exports = {};
-__export(monitor_exports, {
-  initReporter: () => initReporter,
-  monitorPlugin: () => monitorPlugin
-});
-module.exports = __toCommonJS(monitor_exports);
-var import_time = require("@modern-js/runtime-utils/time");
-var import_constants = require("../constants");
-const defaultReporter = {
-  init() {
-  },
-  reportError() {
-  },
-  reportTiming() {
-  },
-  reportInfo() {
-  },
-  reportWarn() {
-  }
-};
-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.ServerReportTimings.SERVER_HANDLE_REQUEST, cost);
-  };
-}
-const monitorPlugin = (options) => ({
-  name: "@modern-js/plugin-monitor",
-  setup(api) {
-    return {
-      prepare() {
-        const { middlewares } = api.useAppContext();
-        middlewares.push({
-          name: "monitor",
-          handler: async (c, next) => {
-            const logger = c.get("logger");
-            if (!logger && options.logger) {
-              c.set("logger", options.logger);
-            }
-            const metrics = c.get("metrics");
-            if (!metrics && options.metrics) {
-              c.set("metrics", metrics);
-            }
-            const reporter = c.get("reporter");
-            if (!reporter) {
-              c.set("reporter", reporter || defaultReporter);
-            }
-            await next();
-          }
-        });
-      }
-    };
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  initReporter,
-  monitorPlugin
-});

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

@@ -1,42 +0,0 @@
-"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 serverTiming_exports = {};
-__export(serverTiming_exports, {
-  ServerTiming: () => ServerTiming
-});
-module.exports = __toCommonJS(serverTiming_exports);
-class ServerTiming {
-  get headers() {
-    return this.headerList;
-  }
-  addServeTiming(name, dur, desc) {
-    const _name = `bd-${this.meta}-${name}`;
-    const value = `${_name};${desc ? `decs="${desc}";` : ""} dur=${dur}`;
-    this.headerList.push(value);
-    return this;
-  }
-  constructor(meta) {
-    this.headerList = [];
-    this.meta = meta;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ServerTiming
-});

package/dist/esm/plugins/monitor.js

@@ -1,120 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { time } from "@modern-js/runtime-utils/time";
-import { ServerReportTimings } from "../constants";
-var defaultReporter = {
-  init: function init() {
-  },
-  reportError: function reportError() {
-  },
-  reportTiming: function reportTiming() {
-  },
-  reportInfo: function reportInfo() {
-  },
-  reportWarn: function reportWarn() {
-  }
-};
-function initReporter(entryName) {
-  return function() {
-    var _ref = _async_to_generator(function(c, next) {
-      var reporter, getCost, cost;
-      return _ts_generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            reporter = c.get("reporter");
-            if (!!reporter)
-              return [
-                3,
-                2
-              ];
-            return [
-              4,
-              next()
-            ];
-          case 1:
-            _state.sent();
-            return [
-              2
-            ];
-          case 2:
-            return [
-              4,
-              reporter.init({
-                entryName
-              })
-            ];
-          case 3:
-            _state.sent();
-            getCost = time();
-            return [
-              4,
-              next()
-            ];
-          case 4:
-            _state.sent();
-            cost = getCost();
-            reporter.reportTiming(ServerReportTimings.SERVER_HANDLE_REQUEST, cost);
-            return [
-              2
-            ];
-        }
-      });
-    });
-    return function(c, next) {
-      return _ref.apply(this, arguments);
-    };
-  }();
-}
-var monitorPlugin = function(options) {
-  return {
-    name: "@modern-js/plugin-monitor",
-    setup: function setup(api) {
-      return {
-        prepare: function prepare() {
-          var middlewares = api.useAppContext().middlewares;
-          middlewares.push({
-            name: "monitor",
-            handler: function() {
-              var _ref = _async_to_generator(function(c, next) {
-                var logger, metrics, reporter;
-                return _ts_generator(this, function(_state) {
-                  switch (_state.label) {
-                    case 0:
-                      logger = c.get("logger");
-                      if (!logger && options.logger) {
-                        c.set("logger", options.logger);
-                      }
-                      metrics = c.get("metrics");
-                      if (!metrics && options.metrics) {
-                        c.set("metrics", metrics);
-                      }
-                      reporter = c.get("reporter");
-                      if (!reporter) {
-                        c.set("reporter", reporter || defaultReporter);
-                      }
-                      return [
-                        4,
-                        next()
-                      ];
-                    case 1:
-                      _state.sent();
-                      return [
-                        2
-                      ];
-                  }
-                });
-              });
-              return function(c, next) {
-                return _ref.apply(this, arguments);
-              };
-            }()
-          });
-        }
-      };
-    }
-  };
-};
-export {
-  initReporter,
-  monitorPlugin
-};

package/dist/esm/plugins/render/serverTiming.js

@@ -1,29 +0,0 @@
-import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-var ServerTiming = /* @__PURE__ */ function() {
-  "use strict";
-  function ServerTiming2(meta) {
-    _class_call_check(this, ServerTiming2);
-    this.headerList = [];
-    this.meta = meta;
-  }
-  var _proto = ServerTiming2.prototype;
-  _proto.addServeTiming = function addServeTiming(name, dur, desc) {
-    var _name = "bd-".concat(this.meta, "-").concat(name);
-    var value = "".concat(_name, ";").concat(desc ? 'decs="'.concat(desc, '";') : "", " dur=").concat(dur);
-    this.headerList.push(value);
-    return this;
-  };
-  _create_class(ServerTiming2, [
-    {
-      key: "headers",
-      get: function get() {
-        return this.headerList;
-      }
-    }
-  ]);
-  return ServerTiming2;
-}();
-export {
-  ServerTiming
-};

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

@@ -1,62 +0,0 @@
-import { time } from "@modern-js/runtime-utils/time";
-import { ServerReportTimings } from "../constants";
-const defaultReporter = {
-  init() {
-  },
-  reportError() {
-  },
-  reportTiming() {
-  },
-  reportInfo() {
-  },
-  reportWarn() {
-  }
-};
-function initReporter(entryName) {
-  return async (c, next) => {
-    const reporter = c.get("reporter");
-    if (!reporter) {
-      await next();
-      return;
-    }
-    await reporter.init({
-      entryName
-    });
-    const getCost = time();
-    await next();
-    const cost = getCost();
-    reporter.reportTiming(ServerReportTimings.SERVER_HANDLE_REQUEST, cost);
-  };
-}
-const monitorPlugin = (options) => ({
-  name: "@modern-js/plugin-monitor",
-  setup(api) {
-    return {
-      prepare() {
-        const { middlewares } = api.useAppContext();
-        middlewares.push({
-          name: "monitor",
-          handler: async (c, next) => {
-            const logger = c.get("logger");
-            if (!logger && options.logger) {
-              c.set("logger", options.logger);
-            }
-            const metrics = c.get("metrics");
-            if (!metrics && options.metrics) {
-              c.set("metrics", metrics);
-            }
-            const reporter = c.get("reporter");
-            if (!reporter) {
-              c.set("reporter", reporter || defaultReporter);
-            }
-            await next();
-          }
-        });
-      }
-    };
-  }
-});
-export {
-  initReporter,
-  monitorPlugin
-};

package/dist/esm-node/plugins/render/serverTiming.js

@@ -1,18 +0,0 @@
-class ServerTiming {
-  get headers() {
-    return this.headerList;
-  }
-  addServeTiming(name, dur, desc) {
-    const _name = `bd-${this.meta}-${name}`;
-    const value = `${_name};${desc ? `decs="${desc}";` : ""} dur=${dur}`;
-    this.headerList.push(value);
-    return this;
-  }
-  constructor(meta) {
-    this.headerList = [];
-    this.meta = meta;
-  }
-}
-export {
-  ServerTiming
-};

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

@@ -1,9 +0,0 @@
-import { Logger, Metrics, Reporter } from '@modern-js/types';
-import { Context, Next, ServerEnv, ServerPlugin } from '../types';
-export interface MonitorOptions {
-    logger?: Logger;
-    metrics?: Metrics;
-    reporter?: Reporter;
-}
-export declare function initReporter(entryName: string): (c: Context<ServerEnv>, next: Next) => Promise<void>;
-export declare const monitorPlugin: (options: MonitorOptions) => ServerPlugin;

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

@@ -1,8 +0,0 @@
-import { ServerTiming as ServerTimingInterafce } from '@modern-js/types';
-export declare class ServerTiming implements ServerTimingInterafce {
-    private headerList;
-    private meta;
-    constructor(meta: string);
-    get headers(): string[];
-    addServeTiming(name: string, dur: number, desc?: string): this;
-}