@modern-js/server-core 2.55.0 → 2.56.1

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

@@ -3,7 +3,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { time } from "@modern-js/runtime-utils/time";
 import { transformResponse } from "../../utils";
-import { ServerReportTimings } from "../../constants";
+import { ServerTimings } from "../../constants";
 import { getLoaderCtx } from "./loader";
 import { getAfterMatchCtx, getAfterRenderCtx, createCustomMiddlewaresCtx, createAfterStreamingRenderContext } from "./context";
 import { createBaseHookContext } from "./base";
@@ -37,14 +37,14 @@ var CustomServer = /* @__PURE__ */ function() {
     var _this = this;
     return function() {
       var _ref = _async_to_generator(function(c, next) {
-        var routeInfo, reporter, baseHookCtx, afterMatchCtx, getCost, cost, _afterMatchCtx_router, url, status, current, rewriteRoute, afterStreamingRenderContext, afterRenderCtx, getCost1, cost1, newBody;
+        var routeInfo, monitors, baseHookCtx, afterMatchCtx, getCost, cost, _afterMatchCtx_router, url, status, current, rewriteRoute, afterStreamingRenderContext, afterRenderCtx, getCost1, cost1, newBody;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
               routeInfo = routes.find(function(route) {
                 return route.entryName === entryName;
               });
-              reporter = c.get("reporter");
+              monitors = c.get("monitors");
               baseHookCtx = createBaseHookContext(c);
               afterMatchCtx = getAfterMatchCtx(entryName, baseHookCtx);
               getCost = time();
@@ -57,7 +57,7 @@ var CustomServer = /* @__PURE__ */ function() {
             case 1:
               _state.sent();
               cost = getCost();
-              cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost));
+              cost && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(ServerTimings.SERVER_HOOK_AFTER_MATCH, cost));
               _afterMatchCtx_router = afterMatchCtx.router, url = _afterMatchCtx_router.url, status = _afterMatchCtx_router.status;
               if (url) {
                 return [
@@ -137,7 +137,7 @@ var CustomServer = /* @__PURE__ */ function() {
             case 5:
               _state.sent();
               cost1 = getCost1();
-              cost1 && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost1));
+              cost1 && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(ServerTimings.SERVER_HOOK_AFTER_RENDER, cost1));
               if (afterRenderCtx.response.private_overrided) {
                 return [
                   2,
@@ -187,11 +187,11 @@ var CustomServer = /* @__PURE__ */ function() {
               2,
               function() {
                 var _ref = _async_to_generator(function(c, next) {
-                  var _c_env_node_res, _c_env_node, _c_env, reporter, locals, resArgs, customMiddlewareCtx, getCost, cost;
+                  var _c_env_node_res, _c_env_node, _c_env, monitors, locals, resArgs, customMiddlewareCtx, getCost, cost;
                   return _ts_generator(this, function(_state2) {
                     switch (_state2.label) {
                       case 0:
-                        reporter = c.get("reporter");
+                        monitors = c.get("monitors");
                         locals = {};
                         resArgs = {
                           headers: new Headers()
@@ -205,7 +205,7 @@ var CustomServer = /* @__PURE__ */ function() {
                       case 1:
                         _state2.sent();
                         cost = getCost();
-                        cost && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(ServerReportTimings.SERVER_MIDDLEWARE, cost));
+                        cost && (monitors === null || monitors === void 0 ? void 0 : monitors.timing(ServerTimings.SERVER_MIDDLEWARE, cost));
                         c.set("locals", locals);
                         if (isRedirect(resArgs.headers, resArgs.status)) {
                           return [
@@ -248,11 +248,19 @@ function getServerMidFromUnstableMid(serverMiddleware) {
       var _ref = _async_to_generator(function(c, next) {
         var context;
         return _ts_generator(this, function(_state) {
-          context = createMiddlewareContextFromHono(c);
-          return [
-            2,
-            middleware(context, next)
-          ];
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                createMiddlewareContextFromHono(c)
+              ];
+            case 1:
+              context = _state.sent();
+              return [
+                2,
+                middleware(context, next)
+              ];
+          }
         });
       });
       return function(c, next) {
@@ -270,29 +278,71 @@ function isRedirect(headers, code) {
   ].includes(code || 0) || headers.get("Location");
 }
 function createMiddlewareContextFromHono(c) {
-  var loaderContext = getLoaderCtx(c);
-  return {
-    get request() {
-      return c.req.raw;
-    },
-    get response() {
-      return c.res;
-    },
-    set response(newRes) {
-      c.res = newRes;
-    },
-    get: function get(key) {
-      return loaderContext.get(key);
-    },
-    set: function set(key, value) {
-      return loaderContext.set(key, value);
-    },
-    status: c.status.bind(c),
-    header: c.header.bind(c),
-    body: c.body.bind(c),
-    html: c.html.bind(c),
-    redirect: c.redirect.bind(c)
-  };
+  return _createMiddlewareContextFromHono.apply(this, arguments);
+}
+function _createMiddlewareContextFromHono() {
+  _createMiddlewareContextFromHono = _async_to_generator(function(c) {
+    var loaderContext, rawRequest, method, streamPath, createReadableStreamFromReadable, init;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          loaderContext = getLoaderCtx(c);
+          rawRequest = c.req.raw;
+          method = rawRequest.method.toUpperCase();
+          if (!(![
+            "GET",
+            "HEAD"
+          ].includes(method) && !rawRequest.body && c.env.node.req))
+            return [
+              3,
+              2
+            ];
+          streamPath = "../../adapters/node/polyfills/stream";
+          return [
+            4,
+            import(streamPath)
+          ];
+        case 1:
+          createReadableStreamFromReadable = _state.sent().createReadableStreamFromReadable;
+          init = {
+            body: createReadableStreamFromReadable(c.env.node.req),
+            headers: rawRequest.headers,
+            signal: rawRequest.signal,
+            method: rawRequest.method
+          };
+          init.duplex = "half";
+          rawRequest = new Request(rawRequest.url, init);
+          _state.label = 2;
+        case 2:
+          return [
+            2,
+            {
+              get request() {
+                return rawRequest;
+              },
+              get response() {
+                return c.res;
+              },
+              set response(newRes) {
+                c.res = newRes;
+              },
+              get: function get(key) {
+                return loaderContext.get(key);
+              },
+              set: function set(key, value) {
+                return loaderContext.set(key, value);
+              },
+              status: c.status.bind(c),
+              header: c.header.bind(c),
+              body: c.body.bind(c),
+              html: c.html.bind(c),
+              redirect: c.redirect.bind(c)
+            }
+          ];
+      }
+    });
+  });
+  return _createMiddlewareContextFromHono.apply(this, arguments);
 }
 export {
   CustomServer,

package/dist/esm/plugins/index.js

@@ -3,13 +3,15 @@ import { faviconPlugin } from "./favicon";
 import { processedByPlugin } from "./processedBy";
 import { getLoaderCtx } from "./customServer";
 import { logPlugin } from "./log";
-import { monitorPlugin } from "./monitor";
+import { initMonitorsPlugin, injectServerTiming, injectloggerPluigin } from "./monitors";
 export {
   faviconPlugin,
   getLoaderCtx,
   getRenderHandler,
+  initMonitorsPlugin,
+  injectServerTiming,
+  injectloggerPluigin,
   logPlugin,
-  monitorPlugin,
   processedByPlugin,
   renderPlugin
 };

package/dist/esm/plugins/log.js

@@ -41,13 +41,13 @@ function log(fn, prefix, method, path) {
 function logHandler() {
   return function() {
     var _logger = _async_to_generator(function(c, next) {
-      var method, _$logger, path, logFn, start;
+      var method, monitors, path, logFn, start;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             method = c.req.method;
-            _$logger = c.get("logger");
-            if (!!_$logger)
+            monitors = c.get("monitors");
+            if (!!monitors)
               return [
                 3,
                 2
@@ -63,7 +63,7 @@ function logHandler() {
             ];
           case 2:
             path = getPathname(c.req.raw);
-            logFn = _$logger.debug;
+            logFn = monitors.debug;
             log(logFn, "<--", method, path);
             start = Date.now();
             return [

package/dist/esm/plugins/monitors.js

@@ -0,0 +1,261 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { time } from "@modern-js/runtime-utils/time";
+import { SERVER_TIMING, ServerTimings } from "../constants";
+function createMonitors() {
+  var coreMonitors = [];
+  var log = function(level, message, args) {
+    var event = {
+      type: "log",
+      payload: {
+        level,
+        message,
+        args
+      }
+    };
+    coreMonitors.forEach(function(monitor) {
+      return monitor(event);
+    });
+  };
+  var mointors = {
+    push: function push(monitor) {
+      coreMonitors.push(monitor);
+    },
+    error: function error(message) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+      log("error", message, args);
+    },
+    warn: function warn(message) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+      log("warn", message, args);
+    },
+    debug: function debug(message) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+      log("debug", message, args);
+    },
+    info: function info(message) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+      log("info", message, args);
+    },
+    timing: function timing(name, dur, desc) {
+      var event = {
+        type: "timing",
+        payload: {
+          name,
+          dur,
+          desc
+        }
+      };
+      coreMonitors.forEach(function(monitor) {
+        return monitor(event);
+      });
+    }
+  };
+  return mointors;
+}
+var initMonitorsPlugin = function() {
+  return {
+    name: "@modern-js/init-mointor",
+    setup: function setup(api) {
+      return {
+        prepare: function prepare() {
+          var middlewares = api.useAppContext().middlewares;
+          middlewares.push({
+            name: "init-monitor",
+            handler: function() {
+              var _ref = _async_to_generator(function(c, next) {
+                var monitors;
+                return _ts_generator(this, function(_state) {
+                  if (!c.get("monitors")) {
+                    monitors = createMonitors();
+                    c.set("monitors", monitors);
+                  }
+                  return [
+                    2,
+                    next()
+                  ];
+                });
+              });
+              return function(c, next) {
+                return _ref.apply(this, arguments);
+              };
+            }(),
+            order: "pre"
+          });
+        }
+      };
+    }
+  };
+};
+var injectloggerPluigin = function(logger) {
+  return {
+    name: "@modern-js/inject-logger",
+    setup: function setup(api) {
+      return {
+        prepare: function prepare() {
+          var middlewares = api.useAppContext().middlewares;
+          middlewares.push({
+            name: "inject-logger",
+            handler: function() {
+              var _ref = _async_to_generator(function(c, next) {
+                var pathname, loggerMonitor, monitors;
+                return _ts_generator(this, function(_state) {
+                  if (!c.get("logger")) {
+                    c.set("logger", logger);
+                  }
+                  pathname = c.req.path;
+                  loggerMonitor = function(event) {
+                    if (event.type === "log") {
+                      var _logger;
+                      var _event_payload = event.payload, level = _event_payload.level, message = _event_payload.message, args = _event_payload.args;
+                      (_logger = logger)[level].apply(_logger, [
+                        message
+                      ].concat(_to_consumable_array(args || [])));
+                    }
+                    if (event.type === "timing") {
+                      var _event_payload1 = event.payload, name = _event_payload1.name, dur = _event_payload1.dur, desc = _event_payload1.desc;
+                      if (desc) {
+                        logger.debug("%s Debug - ".concat(name, ", cost: %s, req.url = %s "), desc, dur, pathname);
+                      } else {
+                        logger.debug("Debug - ".concat(name, ", cost: %s, req.url = %s"), dur, pathname);
+                      }
+                    }
+                  };
+                  monitors = c.get("monitors");
+                  monitors === null || monitors === void 0 ? void 0 : monitors.push(loggerMonitor);
+                  return [
+                    2,
+                    next()
+                  ];
+                });
+              });
+              return function(c, next) {
+                return _ref.apply(this, arguments);
+              };
+            }()
+          });
+        }
+      };
+    }
+  };
+};
+var injectServerTiming = function() {
+  var metaName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "modern-js";
+  return {
+    name: "@modern-js/inject-server-timing",
+    setup: function setup(api) {
+      return {
+        prepare: function prepare() {
+          var middlewares = api.useAppContext().middlewares;
+          middlewares.push({
+            name: "inject-server-timing",
+            handler: function() {
+              var _ref = _async_to_generator(function(c, next) {
+                var serverTimings, timingMonitor, monitors;
+                return _ts_generator(this, function(_state) {
+                  switch (_state.label) {
+                    case 0:
+                      serverTimings = [];
+                      timingMonitor = function(event) {
+                        if (event.type === "timing") {
+                          serverTimings.push(event.payload);
+                        }
+                      };
+                      monitors = c.get("monitors");
+                      monitors === null || monitors === void 0 ? void 0 : monitors.push(timingMonitor);
+                      return [
+                        4,
+                        next()
+                      ];
+                    case 1:
+                      _state.sent();
+                      serverTimings.forEach(function(serverTiming) {
+                        var name = serverTiming.name, desc = serverTiming.desc, dur = serverTiming.dur;
+                        var _name = "bd-".concat(metaName, "-").concat(name);
+                        var value = "".concat(_name, ";").concat(desc ? 'decs="'.concat(desc, '";') : "", " dur=").concat(dur);
+                        c.header(SERVER_TIMING, value, {
+                          append: true
+                        });
+                      });
+                      return [
+                        2
+                      ];
+                  }
+                });
+              });
+              return function(c, next) {
+                return _ref.apply(this, arguments);
+              };
+            }()
+          });
+        }
+      };
+    }
+  };
+};
+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(ServerTimings.SERVER_HANDLE_REQUEST, cost);
+            return [
+              2
+            ];
+        }
+      });
+    });
+    return function(c, next) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}
+export {
+  initMonitorsPlugin,
+  initReporter,
+  injectServerTiming,
+  injectloggerPluigin
+};

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

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -150,12 +150,13 @@ function getPageRoutes(routes) {
 function createRenderHandler(render) {
   return function() {
     var _ref = _async_to_generator(function(c, _) {
-      var _c_env_node, logger, reporter, templates, serverManifest, locals, metrics, loaderContext, request, nodeReq, res, body, status, headers, headersData;
+      var _c_env_node, logger, reporter, monitors, templates, serverManifest, locals, metrics, loaderContext, request, nodeReq, res, body, status, headers, headersData;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             logger = c.get("logger");
             reporter = c.get("reporter");
+            monitors = c.get("monitors");
             templates = c.get("templates") || {};
             serverManifest = c.get("serverManifest") || {};
             locals = c.get("locals");
@@ -166,8 +167,9 @@ function createRenderHandler(render) {
             return [
               4,
               render(request, {
-                logger,
                 nodeReq,
+                monitors,
+                logger,
                 reporter,
                 templates,
                 metrics,

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

@@ -12,7 +12,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";
 var DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
   var dynamicRoutes = [];
@@ -63,7 +62,6 @@ function getHeadersWithoutCookie(headers) {
   delete _headers.cookie;
   return _headers;
 }
-var SERVER_TIMING = "Server-Timing";
 function createRender(_) {
   return _createRender.apply(this, arguments);
 }
@@ -77,11 +75,11 @@ function _createRender() {
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, nodeReq, reporter, templates, serverManifest, locals, metrics, loaderContext, _matchRoute, routeInfo, params, onFallback, html, renderMode, pathname, headerData, serverTimingInstance, onError, onTiming, onBoundError, renderOptions, response, _tmp;
+            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, loaderContext, _matchRoute, routeInfo, params, onFallback, html, renderMode, pathname, headerData, onError, onTiming, onBoundError, renderOptions, response, _tmp;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
-                  logger = param2.logger, nodeReq = param2.nodeReq, reporter = param2.reporter, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, metrics = param2.metrics, loaderContext = param2.loaderContext;
+                  logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, loaderContext = param2.loaderContext;
                   _matchRoute = _sliced_to_array(matchRoute(router, req), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
                   onFallback = function() {
                     var _ref2 = _async_to_generator(function(reason, error) {
@@ -131,20 +129,18 @@ function _createRender() {
                   renderMode = _state2.sent();
                   pathname = getPathname(req);
                   headerData = parseHeaders(req);
-                  serverTimingInstance = new ServerTiming(metaName || "modern");
                   onError = function(e) {
-                    logger.error("SSR Error - ".concat(_instanceof(e, Error) ? e.name : e, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, pathname, getHeadersWithoutCookie(headerData));
+                    monitors === null || monitors === void 0 ? void 0 : monitors.error("SSR Error - ".concat(_instanceof(e, Error) ? e.name : e, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, pathname, getHeadersWithoutCookie(headerData));
                   };
                   onTiming = function(name, dur) {
-                    logger.debug("SSR Debug - ".concat(name, ", cost = %s, req.url = %s"), dur, pathname);
-                    serverTimingInstance.addServeTiming(name, dur);
+                    monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
                   };
                   onBoundError = function() {
                     var _ref2 = _async_to_generator(function(e) {
                       return _ts_generator(this, function(_state3) {
                         switch (_state3.label) {
                           case 0:
-                            onErrorFn(ErrorDigest.ERENDER, e, logger, req);
+                            onErrorFn(ErrorDigest.ERENDER, e, monitors, req);
                             return [
                               4,
                               onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e)
@@ -240,9 +236,6 @@ function _createRender() {
                 case 8:
                   throw new Error("Unknown render mode: ".concat(renderMode));
                 case 9:
-                  serverTimingInstance.headers.forEach(function(value) {
-                    response.headers.append(SERVER_TIMING, value);
-                  });
                   return [
                     2,
                     response

package/dist/esm/utils/error.js

@@ -15,11 +15,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) {
   var headerData = req && parseHeaders(req);
   headerData && delete headerData.cookie;
-  if (logger) {
-    logger.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headerData);
+  if (monitors) {
+    monitors.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headerData);
   } else if (req) {
     console.error("Server Error - ".concat(digest, ", error = ").concat(_instanceof(error, Error) ? error.stack || error.message : error, ", req.url = ").concat(req.url, ", req.headers = ").concat(JSON.stringify(headerData)));
   } else {

package/dist/esm-node/adapters/node/plugins/resource.js

@@ -40,7 +40,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/esm-node/constants.js

@@ -15,19 +15,21 @@ 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";
 export {
   AGGRED_DIR,
   REPLACE_REG,
-  ServerReportTimings,
+  SERVER_TIMING,
+  ServerTimings,
   X_MODERNJS_RENDER,
   X_RENDER_CACHE
 };