@modern-js/prod-server 2.27.0 → 2.29.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @modern-js/prod-server
 
+## 2.29.0
+
+### Minor Changes
+
+- 16e5195: feat(prod-server): add body parser
+  feat(prod-server): 增加 body 解析器
+- cba7675: feat: add a server reporter that report server cost, logger about error, info etc.
+  feat: 添加一个 server 端 reporter，来报告 server 端耗时，报错等
+
+### Patch Changes
+
+- 76ace5d: fix(prod-server): bff may run bodyParser by themself, so we need't to run
+  fix(prod-server): bff 可能会在内部运行, 所以我们不需要运行
+- Updated dependencies [e6b5355]
+- Updated dependencies [93db783]
+- Updated dependencies [cba7675]
+- Updated dependencies [99052ea]
+- Updated dependencies [1d71d2e]
+  - @modern-js/utils@2.29.0
+  - @modern-js/server-core@2.29.0
+  - @modern-js/plugin@2.29.0
+
+## 2.28.0
+
+### Minor Changes
+
+- 6eae1e7: feat: support worker hmr using dev-server
+  feat: 借用 dev-server 支持 wokrer hmr
+
+### Patch Changes
+
+- Updated dependencies [00b58a7]
+  - @modern-js/utils@2.28.0
+  - @modern-js/server-core@2.28.0
+  - @modern-js/plugin@2.28.0
+
 ## 2.27.0
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -19,6 +19,9 @@ _export(exports, {
   createProxyHandler: function() {
     return _proxy.createProxyHandler;
   },
+  createRenderHandler: function() {
+    return _render.createRenderHandler;
+  },
   default: function() {
     return _default;
   }
@@ -29,6 +32,7 @@ const _modernServer = require("./server/modernServer");
 const _proxy = require("./libs/proxy");
 _export_star._(require("./type"), exports);
 _export_star._(require("./constants"), exports);
+const _render = require("./libs/render");
 const _default = (options) => {
   if (options == null) {
     throw new Error("can not start mserver without options");

package/dist/cjs/libs/context/context.js

@@ -15,7 +15,10 @@ const _querystring = /* @__PURE__ */ _interop_require_default._(require("queryst
 const _buffer = require("buffer");
 const _etag = /* @__PURE__ */ _interop_require_default._(require("etag"));
 const _fresh = /* @__PURE__ */ _interop_require_default._(require("fresh"));
-const _utils = require("../../utils");
+const _utils = require("@modern-js/utils");
+const _serverTiming = require("../serverTiming");
+const _reporter = require("../reporter");
+const _utils1 = require("../../utils");
 const MOCK_URL_BASE = "https://modernjs.dev/";
 class ModernServerContext {
   get logger() {
@@ -157,18 +160,21 @@ class ModernServerContext {
     return this.res.writableEnded;
   }
   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, (0, _utils.headersWithoutCookie)(this.headers));
+    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, (0, _utils1.headersWithoutCookie)(this.headers));
   }
   constructor(req, res, options) {
+    var _options;
     _define_property._(this, "req", void 0);
     _define_property._(this, "res", void 0);
     _define_property._(this, "params", {});
-    _define_property._(this, "serverData", void 0);
+    _define_property._(this, "reporter", _reporter.defaultReporter);
+    _define_property._(this, "serverTiming", void 0);
+    _define_property._(this, "serverData", {});
     _define_property._(this, "options", {});
     this.req = req;
     this.res = res;
     this.options = options || {};
-    this.serverData = {};
+    this.serverTiming = new _serverTiming.ServerTiming(res, (0, _utils.cutNameByHyphen)(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
     this.bind();
   }
 }

package/dist/cjs/libs/hook-api/index.js

@@ -27,10 +27,11 @@ const _route = require("./route");
 const _template = require("./template");
 const _base = require("./base");
 const base = (context) => {
-  const { res } = context;
+  const { res, reporter } = context;
   return {
     response: new _base.BaseResponse(res),
     request: new _base.BaseRequest(context),
+    reporter,
     logger: context.logger,
     metrics: context.metrics
   };

package/dist/cjs/libs/hook-api/index.worker.js

@@ -56,7 +56,7 @@ class ServerResponse {
   }
 }
 const base = (context) => {
-  const { req, res, logger, metrics } = context;
+  const { req, res, logger, metrics, reporter } = context;
   const serverResponse = new ServerResponse(res);
   const { host, pathname, searchParams } = new URL(req.url);
   const headers = {};
@@ -65,6 +65,7 @@ const base = (context) => {
   });
   return {
     response: new _base.BaseResponse(serverResponse),
+    reporter,
     request: new _base.BaseRequest({
       url: req.url,
       host,

package/dist/cjs/libs/render/cache/__tests__/cache.test.js

@@ -19,6 +19,7 @@ const createCacheConfig = (config = {}) => ({
 jest.setTimeout(6e4);
 describe("cache", () => {
   it("should cache correctly", async () => {
+    var _cacheResult;
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
     const context = {
@@ -32,7 +33,7 @@ describe("cache", () => {
     await cache.set(context, content, cacheConfig, true);
     const cacheResult = await cache.get(context);
     expect(cacheResult).not.toBe(null);
-    expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe("hello");
+    expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe("hello");
   });
   it("should ignore cache set when cache config not exist", async () => {
     (0, _spr.destroyCache)();
@@ -127,6 +128,7 @@ describe("cache", () => {
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
     for (const cacheable of _cacheable.cacheabelAry) {
+      var _cacheResult;
       const context = {
         entry: "",
         pathname: cacheable.requestOpt.url,
@@ -136,13 +138,14 @@ describe("cache", () => {
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
       await cache.set(context, cacheable.content, cacheConfig, true);
       const cacheResult = await cache.get(context);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
+      expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(cacheable.content);
     }
   });
   it("should match cache correctly", async () => {
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
     for (const cacheable of _matchedcache.matchedCacheableAry) {
+      var _cacheResult;
       const [baseCacheable, matchOne, ...other] = cacheable;
       const { requestOpt = {}, cacheConfig, content } = baseCacheable;
       const context = {
@@ -159,7 +162,7 @@ describe("cache", () => {
         headers: matchOne.headers
       };
       const cacheResult = await cache.get(matchContext);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
+      expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
           entry: "",
@@ -173,6 +176,7 @@ describe("cache", () => {
     }
   });
   it("should stale cache correctly", async () => {
+    var _freshResult, _staleResult;
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
     const context = {
@@ -188,16 +192,17 @@ describe("cache", () => {
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
+    expect((_freshResult = freshResult) === null || _freshResult === void 0 ? void 0 : _freshResult.isStale).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 6e3);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
+    expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isStale).toBe(true);
   });
   it("should garbage cache correctly", async () => {
+    var _freshResult, _staleResult;
     (0, _spr.destroyCache)();
     const cache = (0, _spr.createCache)();
     const context = {
@@ -214,13 +219,13 @@ describe("cache", () => {
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
+    expect((_freshResult = freshResult) === null || _freshResult === void 0 ? void 0 : _freshResult.isGarbage).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 1e4);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
+    expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isGarbage).toBe(true);
   });
 });

package/dist/cjs/libs/render/cache/index.js

@@ -15,6 +15,7 @@ const _util = require("./util");
 const _default = (renderFn, ctx) => {
   const sprCache = (0, _spr.createCache)();
   const doRender = async (context) => {
+    var _cacheFile;
     const cacheContext = {
       entry: context.entryName,
       ...context.request
@@ -50,7 +51,7 @@ const _default = (renderFn, ctx) => {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);
     }
-    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
+    const cacheHash = (_cacheFile = cacheFile) === null || _cacheFile === void 0 ? void 0 : _cacheFile.hash;
     if (cacheFile.isGarbage) {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);

package/dist/cjs/libs/render/cache/spr.js

@@ -161,9 +161,10 @@ class CacheManager {
     return (0, _util.maybeSync)(doCache)(sync);
   }
   async del(context, cacheHash) {
+    var _data;
     const cacheKey = this.generateRequestKey(context);
     const data = this.cache.get(cacheKey);
-    data === null || data === void 0 ? void 0 : data.caches.del(cacheHash);
+    (_data = data) === null || _data === void 0 ? void 0 : _data.caches.del(cacheHash);
   }
   constructor(cacheOptions) {
     _define_property._(this, "cache", void 0);

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

@@ -17,7 +17,7 @@ const _static = require("./static");
 const _reader = require("./reader");
 const _ssr = /* @__PURE__ */ _interop_require_wildcard._(require("./ssr"));
 const _utils1 = require("./utils");
-const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
+const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, ssrRender, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -35,7 +35,7 @@ const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, metaNam
   const useCSR = forceCSR && (ctx.query.csr || ctx.headers[`x-${(0, _utils.cutNameByHyphen)(metaName)}-ssr-fallback`]);
   if (route.isSSR && !useCSR) {
     try {
-      const result = await _ssr.render(ctx, {
+      const ssrRenderOptions = {
         distDir,
         entryName: route.entryName,
         urlPath: route.urlPath,
@@ -43,7 +43,16 @@ const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, metaNam
         template: content.toString(),
         staticGenerate,
         nonce
-      }, runner);
+      };
+      const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : _ssr.render(ctx, {
+        distDir,
+        entryName: route.entryName,
+        urlPath: route.urlPath,
+        bundle: route.bundle,
+        template: content.toString(),
+        staticGenerate,
+        nonce
+      }, runner));
       return result;
     } catch (err) {
       ctx.error(_constants.ERROR_DIGEST.ERENDER, err.stack || err.message);

package/dist/cjs/libs/render/reader.js

@@ -101,8 +101,9 @@ class LruReader {
 }
 const reader = new LruReader();
 const readFile = async (filepath) => {
+  var _file;
   const file = await reader.read(filepath);
-  return file === null || file === void 0 ? void 0 : file.content;
+  return (_file = file) === null || _file === void 0 ? void 0 : _file.content;
 };
 const updateFile = () => {
   reader.update();

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

@@ -22,7 +22,6 @@ const render = async (ctx, renderOptions, runner) => {
   const loadableStats = _utils.fs.existsSync(loadableUri) ? require(loadableUri) : "";
   const routesManifestUri = _path.default.join(distDir, _utils.ROUTE_MANIFEST_FILE);
   const routeManifest = _utils.fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
-  const body = await getRequestBody(ctx.req);
   const context = {
     request: {
       baseUrl: urlPath,
@@ -32,7 +31,7 @@ const render = async (ctx, renderOptions, runner) => {
       query: ctx.query,
       url: ctx.href,
       headers: ctx.headers,
-      body
+      body: ctx.req.body
     },
     response: {
       setHeader: (key, value) => {
@@ -51,6 +50,8 @@ const render = async (ctx, renderOptions, runner) => {
     staticGenerate,
     logger: void 0,
     metrics: void 0,
+    reporter: ctx.reporter,
+    serverTiming: ctx.serverTiming,
     req: ctx.req,
     res: ctx.res,
     enableUnsafeCtx,
@@ -84,21 +85,3 @@ const render = async (ctx, renderOptions, runner) => {
     };
   }
 };
-const getRequestBody = (req) => {
-  return new Promise((resolve, reject) => {
-    if ((req === null || req === void 0 ? void 0 : req.method) && req.method.toLowerCase() !== "get") {
-      let body = "";
-      req.on("data", (chunk) => {
-        body += chunk.toString();
-      });
-      req.on("end", () => {
-        resolve(body);
-      });
-      req.on("error", (err) => {
-        reject(err);
-      });
-    } else {
-      resolve(void 0);
-    }
-  });
-};

package/dist/cjs/libs/reporter.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "defaultReporter", {
+  enumerable: true,
+  get: function() {
+    return defaultReporter;
+  }
+});
+const defaultReporter = {
+  init() {
+  },
+  reportError() {
+  },
+  reportTiming() {
+  },
+  reportInfo() {
+  },
+  reportWarn() {
+  }
+};

package/dist/cjs/libs/route/matcher.js

@@ -49,9 +49,9 @@ class RouteMatcher {
     if (!this.urlReg) {
       return this.urlPath.length;
     } else {
-      var _result_;
+      var _result_, _result;
       const result = this.urlReg.exec(pathname);
-      return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
+      return ((_result = result) === null || _result === void 0 ? void 0 : (_result_ = _result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
     }
   }
   // if match url path

package/dist/cjs/libs/serverTiming.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ServerTiming", {
+  enumerable: true,
+  get: function() {
+    return ServerTiming;
+  }
+});
+const _define_property = require("@swc/helpers/_/_define_property");
+const SERVER_TIMING = "Server-Timing";
+class ServerTiming {
+  addServeTiming(name, dur, desc) {
+    const _name = `bd-${this.meta}-${name}`;
+    const serverTiming = this.res.getHeader(SERVER_TIMING) || this.res.getHeader(SERVER_TIMING.toLocaleLowerCase());
+    const value = `${_name};${desc ? `decs="${desc}";` : ""} dur=${dur}`;
+    this.res.setHeader(SERVER_TIMING, serverTiming ? `${serverTiming}, ${value}` : value);
+    return this;
+  }
+  constructor(res, meta) {
+    _define_property._(this, "meta", void 0);
+    _define_property._(this, "res", void 0);
+    this.meta = meta;
+    this.res = res;
+  }
+}

package/dist/cjs/server/index.js

@@ -89,7 +89,8 @@ class Server {
   }
   listen(options, listener) {
     const callback = () => {
-      listener === null || listener === void 0 ? void 0 : listener();
+      var _listener;
+      (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
     };
     if (typeof options === "object") {
       if (process.env.PORT) {
@@ -139,6 +140,7 @@ class Server {
     });
   }
   initAppContext() {
+    var _appContext, _appContext1, _appContext2;
     const { options } = this;
     const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
@@ -146,9 +148,9 @@ class Server {
     }));
     return {
       appDirectory,
-      apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
-      lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
-      sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || _path.default.resolve(appDirectory, _utils.SHARED_DIR),
+      apiDirectory: (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory,
+      lambdaDirectory: (_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.lambdaDirectory,
+      sharedDirectory: ((_appContext2 = appContext) === null || _appContext2 === void 0 ? void 0 : _appContext2.sharedDirectory) || _path.default.resolve(appDirectory, _utils.SHARED_DIR),
       distDirectory: _path.default.join(appDirectory, config.output.path || "dist"),
       plugins: serverPlugins
     };

package/dist/cjs/server/modernServer.js

@@ -14,6 +14,7 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _http = require("http");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
+const _time = require("@modern-js/utils/universal/time");
 const _route = require("../libs/route");
 const _render = require("../libs/render");
 const _serveFile = require("../libs/serveFile");
@@ -27,9 +28,9 @@ const SERVER_DIR = "./server";
 class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
+    var _conf_bff, _app, _this_conf_output;
     this.runner = runner;
-    const { distDir, staticGenerate, conf, metaName } = this;
+    const { distDir, conf } = this;
     this.initReader();
     (0, _utils1.debug)("final server conf", this.conf);
     this.proxyHandler = (0, _proxy.createProxyHandler)((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
@@ -38,7 +39,7 @@ class ModernServer {
         this.addHandler(handler);
       });
     }
-    app === null || app === void 0 ? void 0 : app.on("close", () => {
+    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -46,20 +47,25 @@ class ModernServer {
     this.warmupSSRBundle();
     await this.prepareFrameHandler();
     await this.prepareLoaderHandler(usageRoutes, distDir);
+    this.routeRenderHandler = this.getRenderHandler();
+    await this.setupBeforeProdMiddleware();
+    this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
+    this.addHandler(_serveFile.faviconFallbackHandler);
+    this.addHandler(this.routeHandler.bind(this));
+    this.compose();
+  }
+  getRenderHandler() {
+    var _this_conf_server, _conf_security;
+    const { distDir, staticGenerate, conf, metaName } = this;
     const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
     const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-    this.routeRenderHandler = (0, _render.createRenderHandler)({
+    return (0, _render.createRenderHandler)({
       distDir,
       staticGenerate,
       forceCSR,
       nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
       metaName
     });
-    await this.setupBeforeProdMiddleware();
-    this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
-    this.addHandler(_serveFile.faviconFallbackHandler);
-    this.addHandler(this.routeHandler.bind(this));
-    this.compose();
   }
   // server ready
   onRepack(_) {
@@ -71,7 +77,9 @@ class ModernServer {
   async render(req, res, url) {
     req.logger = req.logger || this.logger;
     req.metrics = req.metrics || this.metrics;
-    const context = (0, _context.createContext)(req, res);
+    const context = (0, _context.createContext)(req, res, {
+      metaName: this.metaName
+    });
     const matched = this.router.match(url || context.path);
     if (!matched) {
       return null;
@@ -165,9 +173,10 @@ class ModernServer {
     return handler;
   }
   async prepareAPIHandler(extension) {
+    var _bff, _bff1;
     const { workDir, runner, conf } = this;
     const { bff } = conf;
-    const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
+    const prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
     const webOnly = await (0, _utils.isWebOnly)();
     if (webOnly && process.env.NODE_ENV === "development") {
       return (req, res) => {
@@ -179,7 +188,7 @@ class ModernServer {
       pwd: workDir,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-      httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
+      httpMethodDecider: (_bff1 = bff) === null || _bff1 === void 0 ? void 0 : _bff1.httpMethodDecider,
       render: this.render.bind(this)
     }, {
       onLast: () => null
@@ -271,23 +280,35 @@ class ModernServer {
   /* —————————————————————— private function —————————————————————— */
   // handler route.json, include api / csr / ssr
   async routeHandler(context) {
-    const { res } = context;
+    const { res, req, reporter } = context;
     const matched = this.router.match(context.path);
     if (!matched) {
       this.render404(context);
       return;
     }
+    await reporter.init({
+      match: matched
+    });
+    const end = (0, _time.time)();
+    res.on("finish", () => {
+      const cost = end();
+      reporter.reportTiming("server_handle_request", cost);
+    });
     let route = matched.generate(context.url);
     if (route.isApi) {
       await this.handleAPI(context);
       return;
     }
+    await (0, _utils1.bodyParser)(req);
     if (route.entryName) {
       const afterMatchContext = (0, _hookapi.createAfterMatchContext)(context, route.entryName);
       if (this.runMode === _constants.RUN_MODE.FULL) {
+        const end2 = (0, _time.time)();
         await this.runner.afterMatch(afterMatchContext, {
           onLast: _utils1.noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -309,7 +330,10 @@ class ModernServer {
     if (this.frameWebHandler) {
       res.locals = res.locals || {};
       const middlewareContext = (0, _hookapi.createMiddlewareContext)(context);
+      const end2 = (0, _time.time)();
       await this.frameWebHandler(middlewareContext);
+      const cost = end2();
+      reporter.reportTiming("server_middleware", cost);
       res.locals = {
         ...res.locals,
         ...middlewareContext.response.locals
@@ -331,9 +355,12 @@ class ModernServer {
     if (route.entryName) {
       const afterRenderContext = (0, _hookapi.createAfterRenderContext)(context, response.toString());
       if (this.runMode === _constants.RUN_MODE.FULL) {
+        const end2 = (0, _time.time)();
         await this.runner.afterRender(afterRenderContext, {
           onLast: _utils1.noop
         });
+        const cost = end2();
+        reporter.reportTiming("server_hook_after_render", cost);
       }
       if (this.isSend(res)) {
         return;
@@ -446,6 +473,7 @@ class ModernServer {
     context.res.end((0, _utils1.createErrorDocument)(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
+    var _appContext;
     _define_property._(this, "pwd", void 0);
     _define_property._(this, "distDir", void 0);
     _define_property._(this, "workDir", void 0);
@@ -460,13 +488,13 @@ class ModernServer {
     _define_property._(this, "reader", _reader);
     _define_property._(this, "proxyTarget", void 0);
     _define_property._(this, "routeRenderHandler", void 0);
+    _define_property._(this, "staticGenerate", void 0);
+    _define_property._(this, "metaName", void 0);
     _define_property._(this, "loaderHandler", null);
     _define_property._(this, "frameWebHandler", null);
     _define_property._(this, "frameAPIHandler", null);
     _define_property._(this, "proxyHandler", null);
     _define_property._(this, "_handler", void 0);
-    _define_property._(this, "staticGenerate", void 0);
-    _define_property._(this, "metaName", void 0);
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = _path.default.resolve(pwd, config.output.path || "dist");
@@ -480,6 +508,6 @@ class ModernServer {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || _constants.RUN_MODE.FULL;
-    this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
+    this.metaName = (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.metaName;
   }
 }

package/dist/cjs/utils.js

@@ -36,6 +36,9 @@ _export(exports, {
   },
   isRedirect: function() {
     return isRedirect;
+  },
+  bodyParser: function() {
+    return bodyParser;
   }
 });
 const _utils = require("@modern-js/utils");
@@ -159,3 +162,33 @@ const isRedirect = (code) => {
     308
   ].includes(code);
 };
+function parseBodyTypes(headers, body) {
+  switch (headers["content-type"]) {
+    case "application/json":
+      return JSON.parse(body);
+    default:
+      return body;
+  }
+}
+const getRequestBody = (req) => new Promise((resolve, reject) => {
+  var _req;
+  if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
+    let body = "";
+    req.on("data", (chunk) => {
+      body += chunk.toString();
+    });
+    req.on("end", () => {
+      resolve(parseBodyTypes(req.headers, body));
+    });
+    req.on("error", (err) => {
+      reject(err);
+    });
+  } else {
+    resolve(void 0);
+  }
+});
+const bodyParser = async (req) => {
+  if (!req.body) {
+    req.body = await getRequestBody(req);
+  }
+};