@modern-js/prod-server 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/prod-server
 
+## 1.1.3
+
+### Patch Changes
+
+- a4c5fe78: fix test case
+- 6fa74d5f: add internal metrics and logger
+- Updated dependencies [0ee4bb4e]
+- Updated dependencies [6fa74d5f]
+  - @modern-js/utils@1.7.0
+  - @modern-js/server-core@1.3.3
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/js/modern/libs/context/context.js

@@ -1,6 +1,5 @@
 import { URL } from 'url';
 import qs from 'querystring';
-import { toMessage } from "../../utils";
 export class ModernServerContext {
   /**
    * http request
@@ -13,17 +12,21 @@ export class ModernServerContext {
   /**
    * url params
    */
+  get logger() {
+    return this.req.logger;
+  }
+
+  get metrics() {
+    return this.req.metrics;
+  }
+
   constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
-    this.logger = void 0;
-    this.metrics = void 0;
     this.serverData = void 0;
     this.req = req;
     this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
     this.serverData = {};
     this.bind();
   }
@@ -163,18 +166,8 @@ export class ModernServerContext {
     return this.res.writableEnded;
   }
 
-  logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url
-    };
-  }
-
-  error(dig, err = '') {
-    const message = toMessage(dig, err);
-    const reqInfo = this.logInfo();
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
+  error(dig, e = '') {
+    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, this.headers);
   }
 
 }

package/dist/js/modern/libs/metrics.js

@@ -2,10 +2,10 @@ const metrics = {
   gauges() {// no impl
   },
 
-  counter() {// no impl
+  emitCounter() {// no impl
   },
 
-  timer() {// no impl
+  emitTimer() {// no impl
   }
 
 };

package/dist/js/modern/libs/render/measure.js

@@ -0,0 +1,59 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+export const createMetrics = (context, metrics) => {
+  const {
+    entryName: entry,
+    request
+  } = context;
+  const {
+    pathname = ''
+  } = request || {};
+
+  const emitTimer = (name, cost, tags = {}) => {
+    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  const emitCounter = (name, counter, tags = {}) => {
+    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  return {
+    emitTimer,
+    emitCounter
+  };
+};
+export const createLogger = (serverContext, logger) => {
+  const request = serverContext.request || {};
+  const {
+    headers = {},
+    pathname = ''
+  } = request;
+
+  const debug = (message, ...args) => {
+    logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const info = (message, ...args) => {
+    logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const error = (message, e) => {
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+  };
+
+  return {
+    error,
+    info,
+    debug
+  };
+};

package/dist/js/modern/libs/render/ssr.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { mime, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import cookie from 'cookie';
 import cache from "./cache";
+import { createLogger, createMetrics } from "./measure";
 export const render = async (ctx, renderOptions, runner) => {
   const {
     urlPath,
@@ -28,9 +29,11 @@ export const render = async (ctx, renderOptions, runner) => {
     entryName,
     distDir,
     staticGenerate,
-    logger: ctx.logger,
-    metrics: ctx.metrics
+    logger: undefined,
+    metrics: undefined
   };
+  context.logger = createLogger(context, ctx.logger);
+  context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];

package/dist/js/modern/server/index.js

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
-import { logger as defaultLogger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
+import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
@@ -19,7 +19,9 @@ export class Server {
     this.app = void 0;
     this.runner = void 0;
     this.serverConfig = void 0;
-    options.logger = options.logger || defaultLogger;
+    options.logger = options.logger || new Logger({
+      level: 'warn'
+    });
     options.metrics = options.metrics || defaultMetrics;
     this.options = options;
     this.serverConfig = {};

package/dist/js/modern/server/modern-server-split.js

@@ -10,9 +10,9 @@ class ModernSSRServer extends ModernServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -33,9 +33,9 @@ class ModernAPIServer extends ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

package/dist/js/modern/server/modern-server.js

@@ -128,7 +128,7 @@ export class ModernServer {
       distDir,
       staticGenerate
     });
-    await this.preServerInit();
+    await this.setupBeforeProdMiddleware();
     this.addHandler(this.staticFileHandler);
     this.addHandler(this.routeHandler.bind(this)); // compose middlewares to http handler
 
@@ -193,7 +193,7 @@ export class ModernServer {
 
 
   render404(context) {
-    context.error(ERROR_DIGEST.ENOTF);
+    context.error(ERROR_DIGEST.ENOTF, '404 Not Found');
     this.renderErrorPage(context, 404);
   } // gather frame extension and get framework handler
 
@@ -276,12 +276,12 @@ export class ModernServer {
     });
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     const {
       conf,
       runner
     } = this;
-    const preMiddleware = await runner.preServerInit(conf);
+    const preMiddleware = await runner.beforeProdServer(conf);
     preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
@@ -525,8 +525,8 @@ export class ModernServer {
   requestHandler(req, res, next = () => {// empty
   }) {
     res.statusCode = 200;
-    req.logger = req.logger || this.logger;
-    req.metrics = req.metrics || this.metrics;
+    req.logger = this.logger;
+    req.metrics = this.metrics;
     const context = createContext(req, res);
 
     try {

package/dist/js/modern/utils.js

@@ -7,15 +7,6 @@ export const mergeExtension = users => {
     middleware: output.concat(users)
   };
 };
-export const toMessage = (dig, e) => {
-  const message = e instanceof Error ? e.message : e;
-
-  if (message) {
-    return `${dig}: ${message}`;
-  } else {
-    return dig;
-  }
-};
 export const noop = () => {// noop
 };
 export const createErrorDocument = (status, text) => {

package/dist/js/node/libs/context/context.js

@@ -9,8 +9,6 @@ var _url = require("url");
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
-var _utils = require("../../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class ModernServerContext {
@@ -25,17 +23,21 @@ class ModernServerContext {
   /**
    * url params
    */
+  get logger() {
+    return this.req.logger;
+  }
+
+  get metrics() {
+    return this.req.metrics;
+  }
+
   constructor(req, res) {
     this.req = void 0;
     this.res = void 0;
     this.params = {};
-    this.logger = void 0;
-    this.metrics = void 0;
     this.serverData = void 0;
     this.req = req;
     this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
     this.serverData = {};
     this.bind();
   }
@@ -175,18 +177,8 @@ class ModernServerContext {
     return this.res.writableEnded;
   }
 
-  logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url
-    };
-  }
-
-  error(dig, err = '') {
-    const message = (0, _utils.toMessage)(dig, err);
-    const reqInfo = this.logInfo();
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
+  error(dig, e = '') {
+    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, this.headers);
   }
 
 }

package/dist/js/node/libs/metrics.js

@@ -8,10 +8,10 @@ const metrics = {
   gauges() {// no impl
   },
 
-  counter() {// no impl
+  emitCounter() {// no impl
   },
 
-  timer() {// no impl
+  emitTimer() {// no impl
   }
 
 };

package/dist/js/node/libs/render/measure.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMetrics = exports.createLogger = void 0;
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const createMetrics = (context, metrics) => {
+  const {
+    entryName: entry,
+    request
+  } = context;
+  const {
+    pathname = ''
+  } = request || {};
+
+  const emitTimer = (name, cost, tags = {}) => {
+    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  const emitCounter = (name, counter, tags = {}) => {
+    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+      pathname,
+      entry
+    }));
+  };
+
+  return {
+    emitTimer,
+    emitCounter
+  };
+};
+
+exports.createMetrics = createMetrics;
+
+const createLogger = (serverContext, logger) => {
+  const request = serverContext.request || {};
+  const {
+    headers = {},
+    pathname = ''
+  } = request;
+
+  const debug = (message, ...args) => {
+    logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const info = (message, ...args) => {
+    logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const error = (message, e) => {
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+  };
+
+  return {
+    error,
+    info,
+    debug
+  };
+};
+
+exports.createLogger = createLogger;

package/dist/js/node/libs/render/ssr.js

@@ -13,6 +13,8 @@ var _cookie = _interopRequireDefault(require("cookie"));
 
 var _cache = _interopRequireDefault(require("./cache"));
 
+var _measure = require("./measure");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const render = async (ctx, renderOptions, runner) => {
@@ -43,9 +45,11 @@ const render = async (ctx, renderOptions, runner) => {
     entryName,
     distDir,
     staticGenerate,
-    logger: ctx.logger,
-    metrics: ctx.metrics
+    logger: undefined,
+    metrics: undefined
   };
+  context.logger = (0, _measure.createLogger)(context, ctx.logger);
+  context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
 
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];

package/dist/js/node/server/index.js

@@ -35,7 +35,9 @@ class Server {
     this.app = void 0;
     this.runner = void 0;
     this.serverConfig = void 0;
-    options.logger = options.logger || _utils.logger;
+    options.logger = options.logger || new _utils.Logger({
+      level: 'warn'
+    });
     options.metrics = options.metrics || _metrics.metrics;
     this.options = options;
     this.serverConfig = {};

package/dist/js/node/server/modern-server-split.js

@@ -18,9 +18,9 @@ class ModernSSRServer extends _modernServer.ModernServer {
     return routes.filter(route => route.isSSR);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _constants.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -41,9 +41,9 @@ class ModernAPIServer extends _modernServer.ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     if (this.runMode === _constants.RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

package/dist/js/node/server/modern-server.js

@@ -157,7 +157,7 @@ class ModernServer {
       distDir,
       staticGenerate
     });
-    await this.preServerInit();
+    await this.setupBeforeProdMiddleware();
     this.addHandler(this.staticFileHandler);
     this.addHandler(this.routeHandler.bind(this)); // compose middlewares to http handler
 
@@ -223,7 +223,7 @@ class ModernServer {
 
 
   render404(context) {
-    context.error(_constants.ERROR_DIGEST.ENOTF);
+    context.error(_constants.ERROR_DIGEST.ENOTF, '404 Not Found');
     this.renderErrorPage(context, 404);
   } // gather frame extension and get framework handler
 
@@ -309,12 +309,12 @@ class ModernServer {
     });
   }
 
-  async preServerInit() {
+  async setupBeforeProdMiddleware() {
     const {
       conf,
       runner
     } = this;
-    const preMiddleware = await runner.preServerInit(conf);
+    const preMiddleware = await runner.beforeProdServer(conf);
     preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
     });
@@ -559,8 +559,8 @@ class ModernServer {
   requestHandler(req, res, next = () => {// empty
   }) {
     res.statusCode = 200;
-    req.logger = req.logger || this.logger;
-    req.metrics = req.metrics || this.metrics;
+    req.logger = this.logger;
+    req.metrics = this.metrics;
     const context = (0, _context.createContext)(req, res);
 
     try {

package/dist/js/node/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toPath = exports.toMessage = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
 
 var _pathToRegexp = require("path-to-regexp");
 
@@ -21,18 +21,6 @@ const mergeExtension = users => {
 
 exports.mergeExtension = mergeExtension;
 
-const toMessage = (dig, e) => {
-  const message = e instanceof Error ? e.message : e;
-
-  if (message) {
-    return `${dig}: ${message}`;
-  } else {
-    return dig;
-  }
-};
-
-exports.toMessage = toMessage;
-
 const noop = () => {// noop
 };
 

package/dist/types/libs/context/context.d.ts

@@ -24,8 +24,8 @@ export declare class ModernServerContext implements ModernServerContextInterface
    */
 
   params: Record<string, string>;
-  logger: Logger;
-  metrics?: Metrics;
+  get logger(): Logger;
+  get metrics(): Metrics;
   serverData: Record<string, any>;
   constructor(req: IncomingMessage, res: ServerResponse);
   private bind;
@@ -52,10 +52,5 @@ export declare class ModernServerContext implements ModernServerContextInterface
    */
 
   resHasHandled(): boolean;
-  logInfo(): {
-    headers: import("http").IncomingHttpHeaders;
-    href: string;
-    url: string;
-  };
-  error(dig: string, err?: Error | string): void;
+  error(dig: string, e?: Error | string): void;
 }

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

@@ -0,0 +1,10 @@
+import { BaseSSRServerContext, Logger, Metrics } from '@modern-js/types';
+export declare const createMetrics: (context: BaseSSRServerContext, metrics: Metrics) => {
+  emitTimer: (name: string, cost: number, tags?: Record<string, unknown>) => void;
+  emitCounter: (name: string, counter: number, tags?: Record<string, unknown>) => void;
+};
+export declare const createLogger: (serverContext: BaseSSRServerContext, logger: Logger) => {
+  error: (message: string, e: Error | string) => void;
+  info: (message: string, ...args: any[]) => void;
+  debug: (message: string, ...args: any[]) => void;
+};

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

@@ -59,7 +59,7 @@ export declare class ModernServer implements ModernServerInterface {
     context: ModernServerContext;
     [propsName: string]: any;
   }): Promise<any>;
-  protected preServerInit(): Promise<void>;
+  protected setupBeforeProdMiddleware(): Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
   protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
   protected proxy(): Promise<any>;

package/dist/types/utils.d.ts

@@ -3,7 +3,6 @@ export declare const debug: any;
 export declare const mergeExtension: (users: any[]) => {
   middleware: any[];
 };
-export declare const toMessage: (dig: string, e: Error | string) => string;
 export declare const noop: () => void;
 export declare const createErrorDocument: (status: number, text: string) => string;
 export declare type CollectMiddlewaresResult = {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.6.0",
+    "@modern-js/utils": "^1.7.0",
     "@babel/compat-data": "^7.17.0",
-    "@modern-js/server-core": "^1.3.2",
+    "@modern-js/server-core": "^1.3.3",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,8 +43,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.1",
-    "@modern-js/core": "1.9.0",
+    "@modern-js/types": "1.5.2",
+    "@modern-js/core": "1.10.0",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",

package/src/libs/context/context.ts

@@ -6,7 +6,6 @@ import type {
   Metrics,
   Logger,
 } from '@modern-js/types/server';
-import { toMessage } from '../../utils';
 
 export type ContextOptions = {
   logger?: Logger;
@@ -29,17 +28,19 @@ export class ModernServerContext implements ModernServerContextInterface {
    */
   public params: Record<string, string> = {};
 
-  public logger: Logger;
+  get logger() {
+    return this.req.logger;
+  }
 
-  public metrics?: Metrics;
+  get metrics() {
+    return this.req.metrics;
+  }
 
   public serverData: Record<string, any>;
 
   constructor(req: IncomingMessage, res: ServerResponse) {
     this.req = req;
     this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
     this.serverData = {};
 
     this.bind();
@@ -166,18 +167,12 @@ export class ModernServerContext implements ModernServerContextInterface {
     return this.res.writableEnded;
   }
 
-  public logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url,
-    };
-  }
-
-  public error(dig: string, err: Error | string = '') {
-    const message = toMessage(dig, err);
-    const reqInfo = this.logInfo();
-
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
+  public error(dig: string, e: Error | string = '') {
+    this.logger.error(
+      `Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`,
+      e instanceof Error ? e.stack || e.message : e,
+      this.path,
+      this.headers,
+    );
   }
 }

package/src/libs/metrics.ts

@@ -4,10 +4,10 @@ const metrics: Metrics = {
   gauges() {
     // no impl
   },
-  counter() {
+  emitCounter() {
     // no impl
   },
-  timer() {
+  emitTimer() {
     // no impl
   },
 };

package/src/libs/render/measure.ts

@@ -0,0 +1,66 @@
+import { BaseSSRServerContext, Logger, Metrics } from '@modern-js/types';
+
+export const createMetrics = (
+  context: BaseSSRServerContext,
+  metrics: Metrics,
+) => {
+  const { entryName: entry, request } = context;
+  const { pathname = '' } = request || {};
+
+  const emitTimer = (
+    name: string,
+    cost: number,
+    tags: Record<string, unknown> = {},
+  ) => {
+    metrics.emitTimer(name, cost, {
+      ...tags,
+      pathname,
+      entry,
+    });
+  };
+
+  const emitCounter = (
+    name: string,
+    counter: number,
+    tags: Record<string, unknown> = {},
+  ) => {
+    metrics.emitCounter(name, counter, {
+      ...tags,
+      pathname,
+      entry,
+    });
+  };
+
+  return { emitTimer, emitCounter };
+};
+
+export const createLogger = (
+  serverContext: BaseSSRServerContext,
+  logger: Logger,
+) => {
+  const request = serverContext.request || {};
+  const { headers = {}, pathname = '' } = request;
+
+  const debug = (message: string, ...args: any[]) => {
+    logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const info = (message: string, ...args: any[]) => {
+    logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
+  };
+
+  const error = (message: string, e: Error | string) => {
+    logger.error(
+      `SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`,
+      e instanceof Error ? e.stack || e.message : e,
+      pathname,
+      headers,
+    );
+  };
+
+  return {
+    error,
+    info,
+    debug,
+  };
+};

package/src/libs/render/ssr.ts

@@ -5,6 +5,7 @@ import { ModernServerContext } from '../context';
 import { RenderResult, ServerHookRunner } from '../../type';
 import cache from './cache';
 import { SSRServerContext } from './type';
+import { createLogger, createMetrics } from './measure';
 
 export const render = async (
   ctx: ModernServerContext,
@@ -38,9 +39,11 @@ export const render = async (
     entryName,
     distDir,
     staticGenerate,
-    logger: ctx.logger,
-    metrics: ctx.metrics,
+    logger: undefined!,
+    metrics: undefined!,
   };
+  context.logger = createLogger(context, ctx.logger);
+  context.metrics = createMetrics(context, ctx.metrics);
 
   runner.extendSSRContext(context);
 

package/src/server/index.ts

@@ -8,9 +8,10 @@ import {
   ServerConfig,
 } from '@modern-js/server-core';
 import {
-  logger as defaultLogger,
+  Logger,
   SHARED_DIR,
   OUTPUT_CONFIG_FILE,
+  LoggerInterface,
 } from '@modern-js/utils';
 import type { UserConfig } from '@modern-js/core';
 import { ISAppContext } from '@modern-js/types';
@@ -43,7 +44,11 @@ export class Server {
   private serverConfig: ServerConfig;
 
   constructor(options: ModernServerOptions) {
-    options.logger = options.logger || defaultLogger;
+    options.logger =
+      options.logger ||
+      (new Logger({
+        level: 'warn',
+      }) as Logger & LoggerInterface);
     options.metrics = options.metrics || defaultMetrics;
 
     this.options = options;

package/src/server/modern-server-split.ts

@@ -17,9 +17,9 @@ class ModernSSRServer extends ModernServer {
     return routes.filter(route => route.isSSR);
   }
 
-  protected async preServerInit() {
+  protected async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 
@@ -39,9 +39,9 @@ class ModernAPIServer extends ModernServer {
     return routes.filter(route => route.isApi);
   }
 
-  protected async preServerInit() {
+  protected async setupBeforeProdMiddleware() {
     if (this.runMode === RUN_MODE.FULL) {
-      await super.preServerInit();
+      await super.setupBeforeProdMiddleware();
     }
   }
 

package/src/server/modern-server.ts

@@ -180,7 +180,7 @@ export class ModernServer implements ModernServerInterface {
       staticGenerate,
     });
 
-    await this.preServerInit();
+    await this.setupBeforeProdMiddleware();
 
     this.addHandler(this.staticFileHandler);
     this.addHandler(this.routeHandler.bind(this));
@@ -253,7 +253,7 @@ export class ModernServer implements ModernServerInterface {
 
   // return 404 page
   protected render404(context: ModernServerContext) {
-    context.error(ERROR_DIGEST.ENOTF);
+    context.error(ERROR_DIGEST.ENOTF, '404 Not Found');
     this.renderErrorPage(context, 404);
   }
 
@@ -335,10 +335,10 @@ export class ModernServer implements ModernServerInterface {
     return this.runner[eventName](input as any, { onLast: noop as any });
   }
 
-  protected async preServerInit() {
+  protected async setupBeforeProdMiddleware() {
     const { conf, runner } = this;
     const preMiddleware: ModernServerAsyncHandler[] =
-      await runner.preServerInit(conf);
+      await runner.beforeProdServer(conf);
 
     preMiddleware.flat().forEach(mid => {
       this.addHandler(mid);
@@ -565,8 +565,8 @@ export class ModernServer implements ModernServerInterface {
     },
   ) {
     res.statusCode = 200;
-    req.logger = req.logger || this.logger;
-    req.metrics = req.metrics || this.metrics;
+    req.logger = this.logger;
+    req.metrics = this.metrics;
     const context: ModernServerContext = createContext(req, res);
 
     try {

package/src/utils.ts

@@ -9,15 +9,6 @@ export const mergeExtension = (users: any[]) => {
   return { middleware: output.concat(users) };
 };
 
-export const toMessage = (dig: string, e: Error | string): string => {
-  const message = e instanceof Error ? e.message : e;
-  if (message) {
-    return `${dig}: ${message}`;
-  } else {
-    return dig;
-  }
-};
-
 export const noop = () => {
   // noop
 };