@modern-js/prod-server 2.47.1 → 2.48.1

package/dist/esm/server/modernServerSplit.js

@@ -1,6 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _get } from "@swc/helpers/_/_get";
 import { _ as _get_prototype_of } from "@swc/helpers/_/_get_prototype_of";
 import { _ as _inherits } from "@swc/helpers/_/_inherits";
@@ -15,28 +14,21 @@ var ModernSSRServer = /* @__PURE__ */ function(ModernServer2) {
     _class_call_check(this, ModernSSRServer2);
     return _super.apply(this, arguments);
   }
-  _create_class(ModernSSRServer2, [
-    {
-      key: "prepareAPIHandler",
-      value: function prepareAPIHandler(_) {
-        return null;
-      }
-    },
-    {
-      key: "handleAPI",
-      value: function handleAPI(context) {
-        var _this = this;
-        return _async_to_generator(function() {
-          return _ts_generator(this, function(_state) {
-            return [
-              2,
-              _this.render404(context)
-            ];
-          });
-        })();
-      }
-    }
-  ]);
+  var _proto = ModernSSRServer2.prototype;
+  _proto.prepareAPIHandler = function prepareAPIHandler(_) {
+    return null;
+  };
+  _proto.handleAPI = function handleAPI(context) {
+    var _this = this;
+    return _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          _this.render404(context)
+        ];
+      });
+    })();
+  };
   return ModernSSRServer2;
 }(ModernServer);
 var ModernAPIServer = /* @__PURE__ */ function(ModernServer2) {
@@ -47,22 +39,15 @@ var ModernAPIServer = /* @__PURE__ */ function(ModernServer2) {
     _class_call_check(this, ModernAPIServer2);
     return _super.apply(this, arguments);
   }
-  _create_class(ModernAPIServer2, [
-    {
-      key: "prepareWebHandler",
-      value: function prepareWebHandler(_) {
-        return null;
-      }
-    },
-    {
-      key: "filterRoutes",
-      value: function filterRoutes(routes) {
-        return routes.filter(function(route) {
-          return route.isApi;
-        });
-      }
-    }
-  ]);
+  var _proto = ModernAPIServer2.prototype;
+  _proto.prepareWebHandler = function prepareWebHandler(_) {
+    return null;
+  };
+  _proto.filterRoutes = function filterRoutes(routes) {
+    return routes.filter(function(route) {
+      return route.isApi;
+    });
+  };
   return ModernAPIServer2;
 }(ModernServer);
 var ModernWebServer = /* @__PURE__ */ function(ModernServer2) {
@@ -73,53 +58,43 @@ var ModernWebServer = /* @__PURE__ */ function(ModernServer2) {
     _class_call_check(this, ModernWebServer2);
     return _super.apply(this, arguments);
   }
-  _create_class(ModernWebServer2, [
-    {
-      key: "warmupSSRBundle",
-      value: function warmupSSRBundle() {
-        return _async_to_generator(function() {
-          return _ts_generator(this, function(_state) {
-            return [
-              2,
-              null
-            ];
-          });
-        })();
-      }
-    },
-    {
-      key: "handleAPI",
-      value: function handleAPI(context) {
-        var _this = this;
-        return _async_to_generator(function() {
-          return _ts_generator(this, function(_state) {
-            return [
-              2,
-              _this.render404(context)
-            ];
-          });
-        })();
-      }
-    },
-    {
-      key: "handleWeb",
-      value: function handleWeb(context, route) {
-        var _this = this;
-        var _this1 = this, _superprop_get_handleWeb = function() {
-          return _get(_get_prototype_of(ModernWebServer2.prototype), "handleWeb", _this);
-        };
-        return _async_to_generator(function() {
-          return _ts_generator(this, function(_state) {
-            route.isSSR = false;
-            return [
-              2,
-              _superprop_get_handleWeb().call(_this1, context, route)
-            ];
-          });
-        })();
-      }
-    }
-  ]);
+  var _proto = ModernWebServer2.prototype;
+  _proto.warmupSSRBundle = function warmupSSRBundle() {
+    return _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          null
+        ];
+      });
+    })();
+  };
+  _proto.handleAPI = function handleAPI(context) {
+    var _this = this;
+    return _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          _this.render404(context)
+        ];
+      });
+    })();
+  };
+  _proto.handleWeb = function handleWeb(context, route) {
+    var _this = this;
+    var _this1 = this, _superprop_get_handleWeb = function() {
+      return _get(_get_prototype_of(ModernWebServer2.prototype), "handleWeb", _this);
+    };
+    return _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        route.isSSR = false;
+        return [
+          2,
+          _superprop_get_handleWeb().call(_this1, context, route)
+        ];
+      });
+    })();
+  };
   return ModernWebServer2;
 }(ModernServer);
 var createProdServer = function(options) {

package/dist/esm/workerServer.js

@@ -1,7 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
-import { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -58,56 +56,28 @@ var ReturnResponse = /* @__PURE__ */ function() {
   function ReturnResponse2(body, status) {
     var headers = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
     _class_call_check(this, ReturnResponse2);
-    _define_property(this, "body", void 0);
-    _define_property(this, "status", void 0);
-    _define_property(this, "headers", void 0);
     this.body = body;
     this.status = status;
     this.headers = new Headers(headers);
     this.headers.set("content-type", "text/html;charset=UTF-8");
   }
-  _create_class(ReturnResponse2, [
-    {
-      /**
-      * Iterate a Object
-      * 1. adds the value if the key does not already exist.
-      * 2. append the value if the key does already exist.
-      *
-      * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/append
-      * @param headers
-      * @returns
-      */
-      key: "appendHeaders",
-      value: function appendHeaders(headers) {
-        var _this = this;
-        Object.entries(headers).forEach(function(param) {
-          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
-          _this.headers.append(key, value.toString());
-        });
-        return this;
-      }
-    },
-    {
-      /**
-      * Iterate a Object
-      * 1. adds the value if the key does not already exist.
-      * 2. modify the value if the key does already exist.
-      *
-      * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/set
-      * @param headers
-      * @returns
-      */
-      key: "setHeaders",
-      value: function setHeaders(headers) {
-        var _this = this;
-        Object.entries(headers).forEach(function(param) {
-          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
-          _this.headers.set(key, value.toString());
-        });
-        return this;
-      }
-    }
-  ]);
+  var _proto = ReturnResponse2.prototype;
+  _proto.appendHeaders = function appendHeaders(headers) {
+    var _this = this;
+    Object.entries(headers).forEach(function(param) {
+      var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+      _this.headers.append(key, value.toString());
+    });
+    return this;
+  };
+  _proto.setHeaders = function setHeaders(headers) {
+    var _this = this;
+    Object.entries(headers).forEach(function(param) {
+      var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+      _this.headers.set(key, value.toString());
+    });
+    return this;
+  };
   return ReturnResponse2;
 }();
 var RESPONSE_NOTFOUND = new ReturnResponse("404: Page not found", 404);
@@ -181,9 +151,14 @@ var createHandler = function(manifest) {
             route = pageMatch.generate(url.pathname);
             hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
             afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
-            page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, function() {
-              return void 0;
-            });
+            return [
+              4,
+              page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, function() {
+                return void 0;
+              })
+            ];
+          case 1:
+            _state.sent();
             if (checkIsSent(hookContext)) {
               return [
                 2,
@@ -193,15 +168,15 @@ var createHandler = function(manifest) {
             if (!page.serverRender)
               return [
                 3,
-                4
+                6
               ];
-            _state.label = 1;
-          case 1:
+            _state.label = 2;
+          case 2:
             _state.trys.push([
-              1,
-              3,
+              2,
+              5,
               ,
-              4
+              6
             ]);
             middlewarsHookContext = createMiddlewareContext(hookContext);
             applyMiddlewares(middlewarsHookContext, (_page_serverHooks1 = page.serverHooks) === null || _page_serverHooks1 === void 0 ? void 0 : _page_serverHooks1.middleware);
@@ -253,12 +228,17 @@ var createHandler = function(manifest) {
               4,
               page.serverRender(serverRenderContext)
             ];
-          case 2:
+          case 3:
             body = _state.sent();
             afterRenderHookContext = createAfterRenderContext(hookContext, route, body);
-            (_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, function() {
-              return void 0;
-            });
+            return [
+              4,
+              (_page_serverHooks2 = page.serverHooks) === null || _page_serverHooks2 === void 0 ? void 0 : (_page_serverHooks_afterRender = _page_serverHooks2.afterRender) === null || _page_serverHooks_afterRender === void 0 ? void 0 : _page_serverHooks_afterRender.call(_page_serverHooks2, afterRenderHookContext, function() {
+                return void 0;
+              })
+            ];
+          case 4:
+            _state.sent();
             if (checkIsSent(hookContext)) {
               return [
                 2,
@@ -269,7 +249,7 @@ var createHandler = function(manifest) {
               2,
               new ReturnResponse(afterRenderHookContext.template.get(), responseLike.statusCode, responseLike.headers)
             ];
-          case 3:
+          case 5:
             e = _state.sent();
             console.warn("page(".concat(pageMatch.spec.urlPath, ") serverRender occur error: "));
             console.warn(e);
@@ -277,7 +257,7 @@ var createHandler = function(manifest) {
               2,
               createResponse(page.template)
             ];
-          case 4:
+          case 6:
             console.warn("Can't not page(".concat(entryName, ") serverRender"));
             return [
               2,
@@ -318,28 +298,53 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
 }
 var appliedMiddlewares = false;
 function applyMiddlewares(ctx, middleware) {
-  if (middleware) {
-    var middlewares = function() {
-      if (Array.isArray(middleware)) {
-        return middleware;
-      } else {
-        return [
-          middleware
-        ];
-      }
-    }();
-    if (!appliedMiddlewares) {
-      middlewares.forEach(function(middleware2) {
-        middlewarePipeline.use(middleware2);
-      });
-      appliedMiddlewares = true;
-    }
-    middlewarePipeline.run(ctx, {
-      onLast: function() {
-        return void 0;
+  return _applyMiddlewares.apply(this, arguments);
+}
+function _applyMiddlewares() {
+  _applyMiddlewares = _async_to_generator(function(ctx, middleware) {
+    var middlewares;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          if (!middleware)
+            return [
+              3,
+              2
+            ];
+          middlewares = function() {
+            if (Array.isArray(middleware)) {
+              return middleware;
+            } else {
+              return [
+                middleware
+              ];
+            }
+          }();
+          if (!appliedMiddlewares) {
+            middlewares.forEach(function(middleware2) {
+              middlewarePipeline.use(middleware2);
+            });
+            appliedMiddlewares = true;
+          }
+          return [
+            4,
+            middlewarePipeline.run(ctx, {
+              onLast: function() {
+                return void 0;
+              }
+            })
+          ];
+        case 1:
+          _state.sent();
+          _state.label = 2;
+        case 2:
+          return [
+            2
+          ];
       }
     });
-  }
+  });
+  return _applyMiddlewares.apply(this, arguments);
 }
 export {
   ReturnResponse,

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

@@ -1,7 +1,6 @@
 import { _ as _class_private_field_get } from "@swc/helpers/_/_class_private_field_get";
 import { _ as _class_private_field_init } from "@swc/helpers/_/_class_private_field_init";
 import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_field_set";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { URL } from "url";
 import qs from "querystring";
 import { Buffer } from "buffer";
@@ -176,13 +175,6 @@ class ModernServerContext {
     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, headersWithoutCookie(this.headers));
   }
   constructor(req, res, options) {
-    _define_property(this, "req", void 0);
-    _define_property(this, "res", void 0);
-    _define_property(this, "params", {});
-    _define_property(this, "reporter", defaultReporter);
-    _define_property(this, "serverTiming", void 0);
-    _define_property(this, "serverData", {});
-    _define_property(this, "options", {});
     _class_private_field_init(this, _urls, {
       writable: true,
       value: void 0
@@ -191,6 +183,10 @@ class ModernServerContext {
       writable: true,
       value: void 0
     });
+    this.params = {};
+    this.reporter = defaultReporter;
+    this.serverData = {};
+    this.options = {};
     this.req = req;
     this.res = res;
     this.options = options || {};

package/dist/esm-node/libs/hook-api/base.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import cookie from "cookie";
 class BaseResponse {
   get(key) {
@@ -32,8 +31,6 @@ class BaseResponse {
     this.res.end(body);
   }
   constructor(res) {
-    _define_property(this, "cookies", void 0);
-    _define_property(this, "res", void 0);
     this.res = res;
     this.cookies = {
       set: this.setCookie.bind(this),
@@ -46,14 +43,6 @@ class BaseRequest {
     return this._cookie[key];
   }
   constructor(request) {
-    _define_property(this, "url", void 0);
-    _define_property(this, "host", void 0);
-    _define_property(this, "pathname", void 0);
-    _define_property(this, "query", void 0);
-    _define_property(this, "headers", void 0);
-    _define_property(this, "cookie", void 0);
-    _define_property(this, "cookies", void 0);
-    _define_property(this, "_cookie", void 0);
     this.url = request.url;
     this.host = request.host;
     this.pathname = request.path;

package/dist/esm-node/libs/hook-api/index.worker.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { BaseRequest, BaseResponse } from "./base";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
@@ -24,8 +23,6 @@ class ServerResponse {
     this.res.isSent = true;
   }
   constructor(res) {
-    _define_property(this, "locals", void 0);
-    _define_property(this, "res", void 0);
     this.res = res;
     this.locals = res.locals;
   }

package/dist/esm-node/libs/hook-api/route.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 class RouteAPI {
   redirect(url, status = 302) {
     this.url = url;
@@ -11,9 +10,6 @@ class RouteAPI {
     this.rewrite(entryName);
   }
   constructor(entryName) {
-    _define_property(this, "current", void 0);
-    _define_property(this, "status", void 0);
-    _define_property(this, "url", void 0);
     this.current = entryName;
     this.status = 200;
     this.url = "";

package/dist/esm-node/libs/hook-api/template.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 const RegList = {
   before: {
     head: "<head[^>]*>",
@@ -39,7 +38,6 @@ class TemplateAPI {
     this.content = this.content.replace(reg, text);
   }
   constructor(content) {
-    _define_property(this, "content", void 0);
     this.content = content;
   }
 }

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

@@ -56,7 +56,7 @@ const render = async (ctx, renderOptions, runner) => {
   runner.extendSSRContext(context);
   const bundleJSContent = await Promise.resolve(require(bundleJS));
   const serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
-  const content = await ssrCache(ctx.req, serverRender, context);
+  const { data: content, status: cacheStatus } = await ssrCache(ctx.req, serverRender, context);
   const { url, status = 302 } = context.redirection;
   if (url) {
     return {
@@ -66,10 +66,13 @@ const render = async (ctx, renderOptions, runner) => {
       redirect: true
     };
   }
+  const headers = {};
+  cacheStatus && (headers["x-render-cache"] = cacheStatus);
   if (typeof content === "string") {
     return {
       content: injectServerData(content, ctx),
-      contentType: mime.contentType("html")
+      contentType: mime.contentType("html"),
+      headers
     };
   } else {
     let contentStream = injectServerDataStream(content, ctx);
@@ -83,7 +86,8 @@ const render = async (ctx, renderOptions, runner) => {
     return {
       content: "",
       contentStream,
-      contentType: mime.contentType("html")
+      contentType: mime.contentType("html"),
+      headers
     };
   }
 };

package/dist/esm-node/libs/render/ssrCache/cacheMod.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
 import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
 const CACHE_FILENAME = "cache";
@@ -11,10 +10,6 @@ class ServerCacheMod {
     this.customContainer = mod === null || mod === void 0 ? void 0 : mod.customContainer;
     this.cacheOption = mod === null || mod === void 0 ? void 0 : mod.cacheOption;
   }
-  constructor() {
-    _define_property(this, "customContainer", void 0);
-    _define_property(this, "cacheOption", void 0);
-  }
 }
 const cacheMod = new ServerCacheMod();
 export {

package/dist/esm-node/libs/render/ssrCache/index.js

@@ -12,9 +12,13 @@ async function ssrCache(req, render, ssrContext) {
   } else {
     const renderResult = await render(ssrContext);
     if (!renderResult) {
-      return "";
+      return {
+        data: ""
+      };
     } else if (typeof renderResult === "string") {
-      return renderResult;
+      return {
+        data: renderResult
+      };
     } else {
       const stream = new Transform({
         write(chunk, _, callback) {
@@ -22,7 +26,10 @@ async function ssrCache(req, render, ssrContext) {
           callback();
         }
       });
-      return renderResult(stream);
+      const data = await renderResult(stream);
+      return {
+        data
+      };
     }
   }
 }

package/dist/esm-node/libs/render/ssrCache/manager.js

@@ -1,5 +1,5 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { Transform } from "stream";
+import { normalizePathname } from "@modern-js/runtime-utils/url";
 class CacheManager {
   async getCacheResult(req, cacheControl, render, ssrContext) {
     const key = this.computedKey(req, cacheControl);
@@ -10,21 +10,29 @@ class CacheManager {
       const cache = JSON.parse(value);
       const interval = Date.now() - cache.cursor;
       if (interval <= maxAge) {
-        return cache.val;
+        return {
+          data: cache.val,
+          status: "hit"
+        };
       } else if (interval <= staleWhileRevalidate + maxAge) {
         this.processCache(key, render, ssrContext, ttl);
-        return cache.val;
+        return {
+          data: cache.val,
+          status: "stale"
+        };
       } else {
-        return this.processCache(key, render, ssrContext, ttl);
+        return this.processCache(key, render, ssrContext, ttl, "expired");
       }
     } else {
-      return this.processCache(key, render, ssrContext, ttl);
+      return this.processCache(key, render, ssrContext, ttl, "miss");
     }
   }
-  async processCache(key, render, ssrContext, ttl) {
+  async processCache(key, render, ssrContext, ttl, status) {
     const renderResult = await render(ssrContext);
     if (!renderResult) {
-      return "";
+      return {
+        data: ""
+      };
     } else if (typeof renderResult === "string") {
       const current = Date.now();
       const cache = {
@@ -34,7 +42,10 @@ class CacheManager {
       await this.container.set(key, JSON.stringify(cache), {
         ttl
       });
-      return renderResult;
+      return {
+        data: renderResult,
+        status
+      };
     } else {
       let html = "";
       const stream = new Transform({
@@ -54,14 +65,18 @@ class CacheManager {
           ttl
         });
       });
-      return renderResult(stream);
+      const readable = await renderResult(stream);
+      return {
+        data: readable,
+        status
+      };
     }
   }
   computedKey(req, cacheControl) {
     const { url } = req;
     const [pathname] = url.split("?");
     const { customKey } = cacheControl;
-    const defaultKey = pathname.replace(/.+\/+$/, "");
+    const defaultKey = normalizePathname(pathname);
     if (customKey) {
       if (typeof customKey === "string") {
         return customKey;
@@ -73,7 +88,6 @@ class CacheManager {
     }
   }
   constructor(container) {
-    _define_property(this, "container", void 0);
     this.container = container;
   }
 }