@modern-js/prod-server 2.47.1 → 2.48.1

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

@@ -3,7 +3,6 @@ import { _ as _class_private_field_get } from "@swc/helpers/_/_class_private_fie
 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 _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { URL } from "url";
 import qs from "querystring";
@@ -20,13 +19,6 @@ var ModernServerContext = /* @__PURE__ */ function() {
   "use strict";
   function ModernServerContext2(req, res, options) {
     _class_call_check(this, ModernServerContext2);
-    _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
@@ -35,6 +27,10 @@ var ModernServerContext = /* @__PURE__ */ function() {
       writable: true,
       value: void 0
     });
+    this.params = {};
+    this.reporter = defaultReporter;
+    this.serverData = {};
+    this.options = {};
     this.req = req;
     this.res = res;
     this.options = options || {};
@@ -44,6 +40,68 @@ var ModernServerContext = /* @__PURE__ */ function() {
     this.serverTiming = new ServerTiming(this.res, cutNameByHyphen((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
     req.reporter && (this.reporter = req.reporter);
   }
+  var _proto = ModernServerContext2.prototype;
+  _proto.bind = function bind() {
+    var _this = this;
+    var _this1 = this, req = _this1.req, res = _this1.res;
+    req.get = function(key) {
+      return _this.getReqHeader(key);
+    };
+    res.set = function(key, value) {
+      if (!res.headersSent) {
+        res.setHeader(key, value);
+      }
+      return res;
+    };
+    res.send = function(body) {
+      _this.send(body);
+    };
+  };
+  _proto.send = function send(body) {
+    try {
+      var generateETag = !this.res.getHeader("ETag") && this.options.etag;
+      if (body !== void 0 && generateETag) {
+        var encoding = typeof body === "string" ? "utf-8" : void 0;
+        var buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
+        var etag = createEtag(buf, {
+          weak: true
+        });
+        if (etag) {
+          this.res.setHeader("ETag", etag);
+        }
+      }
+      if (this.fresh) {
+        this.status = 304;
+      }
+    } catch (e) {
+      this.logger.error(e.message);
+    }
+    this.res.end(body);
+  };
+  _proto.setParams = function setParams(params) {
+    this.params = params;
+  };
+  _proto.setServerData = function setServerData(key, value) {
+    this.serverData[key] = value;
+  };
+  _proto.getReqHeader = function getReqHeader(key) {
+    var req = this.req;
+    var field = key.toLowerCase();
+    switch (field) {
+      case "referer":
+      case "referrer":
+        return req.headers.referrer || req.headers.referer || "";
+      default:
+        return req.headers[field] || "";
+    }
+  };
+  _proto.resHasHandled = function resHasHandled() {
+    return this.res.writableEnded;
+  };
+  _proto.error = function error(dig) {
+    var e = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+    this.logger.error("Web Server Error - ".concat(dig, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, this.path, headersWithoutCookie(this.headers));
+  };
   _create_class(ModernServerContext2, [
     {
       key: "logger",
@@ -73,78 +131,6 @@ var ModernServerContext = /* @__PURE__ */ function() {
         }
       }
     },
-    {
-      key: "bind",
-      value: function bind() {
-        var _this = this;
-        var _this1 = this, req = _this1.req, res = _this1.res;
-        req.get = function(key) {
-          return _this.getReqHeader(key);
-        };
-        res.set = function(key, value) {
-          if (!res.headersSent) {
-            res.setHeader(key, value);
-          }
-          return res;
-        };
-        res.send = function(body) {
-          _this.send(body);
-        };
-      }
-    },
-    {
-      key: "send",
-      value: (
-        // compat express res.send, only support etag now
-        function send(body) {
-          try {
-            var generateETag = !this.res.getHeader("ETag") && this.options.etag;
-            if (body !== void 0 && generateETag) {
-              var encoding = typeof body === "string" ? "utf-8" : void 0;
-              var buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
-              var etag = createEtag(buf, {
-                weak: true
-              });
-              if (etag) {
-                this.res.setHeader("ETag", etag);
-              }
-            }
-            if (this.fresh) {
-              this.status = 304;
-            }
-          } catch (e) {
-            this.logger.error(e.message);
-          }
-          this.res.end(body);
-        }
-      )
-    },
-    {
-      key: "setParams",
-      value: function setParams(params) {
-        this.params = params;
-      }
-    },
-    {
-      key: "setServerData",
-      value: function setServerData(key, value) {
-        this.serverData[key] = value;
-      }
-    },
-    {
-      key: "getReqHeader",
-      value: function getReqHeader(key) {
-        var req = this.req;
-        var field = key.toLowerCase();
-        switch (field) {
-          case "referer":
-          case "referrer":
-            return req.headers.referrer || req.headers.referer || "";
-          default:
-            return req.headers[field] || "";
-        }
-      }
-    },
     {
       key: "fresh",
       get: function get() {
@@ -265,24 +251,6 @@ var ModernServerContext = /* @__PURE__ */ function() {
       set: function set(statusCode) {
         this.res.statusCode = statusCode;
       }
-    },
-    {
-      key: "resHasHandled",
-      value: (
-        /**
-        * 判断链接是否已经关闭
-        */
-        function resHasHandled() {
-          return this.res.writableEnded;
-        }
-      )
-    },
-    {
-      key: "error",
-      value: function error(dig) {
-        var e = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
-        this.logger.error("Web Server Error - ".concat(dig, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, this.path, headersWithoutCookie(this.headers));
-      }
     }
   ]);
   return ModernServerContext2;

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

@@ -1,86 +1,55 @@
 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 cookie from "cookie";
 var BaseResponse = /* @__PURE__ */ function() {
   "use strict";
   function BaseResponse2(res) {
     _class_call_check(this, BaseResponse2);
-    _define_property(this, "cookies", void 0);
-    _define_property(this, "res", void 0);
     this.res = res;
     this.cookies = {
       set: this.setCookie.bind(this),
       clear: this.clearCookie.bind(this)
     };
   }
-  _create_class(BaseResponse2, [
-    {
-      key: "get",
-      value: function get(key) {
-        return this.res.getHeader(key);
-      }
-    },
-    {
-      key: "set",
-      value: function set(key, value) {
-        return this.res.setHeader(key, value);
-      }
-    },
-    {
-      key: "status",
-      value: function status(code) {
-        this.res.statusCode = code;
-      }
-    },
-    {
-      key: "setCookie",
-      value: function setCookie(key, value, options) {
-        var cookieValue = this.res.getHeader("set-cookie") || "";
-        var fmt = Array.isArray(cookieValue) ? cookieValue : [
-          cookieValue
-        ].filter(Boolean);
-        fmt.push(cookie.serialize(key, value, options));
-        this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
-      }
-    },
-    {
-      key: "clearCookie",
-      value: function clearCookie() {
-        this.res.removeHeader("set-cookie");
-      }
-    },
-    {
-      key: "raw",
-      value: function raw(body, options) {
-        var _this = this;
-        var _ref = options || {}, status = _ref.status, _ref_headers = _ref.headers, headers = _ref_headers === void 0 ? {} : _ref_headers;
-        Object.entries(headers).forEach(function(param) {
-          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
-          _this.res.setHeader(key, value);
-        });
-        if (status) {
-          this.res.statusCode = status;
-        }
-        this.res.end(body);
-      }
+  var _proto = BaseResponse2.prototype;
+  _proto.get = function get(key) {
+    return this.res.getHeader(key);
+  };
+  _proto.set = function set(key, value) {
+    return this.res.setHeader(key, value);
+  };
+  _proto.status = function status(code) {
+    this.res.statusCode = code;
+  };
+  _proto.setCookie = function setCookie(key, value, options) {
+    var cookieValue = this.res.getHeader("set-cookie") || "";
+    var fmt = Array.isArray(cookieValue) ? cookieValue : [
+      cookieValue
+    ].filter(Boolean);
+    fmt.push(cookie.serialize(key, value, options));
+    this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
+  };
+  _proto.clearCookie = function clearCookie() {
+    this.res.removeHeader("set-cookie");
+  };
+  _proto.raw = function raw(body, options) {
+    var _this = this;
+    var _ref = options || {}, status = _ref.status, _ref_headers = _ref.headers, headers = _ref_headers === void 0 ? {} : _ref_headers;
+    Object.entries(headers).forEach(function(param) {
+      var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+      _this.res.setHeader(key, value);
+    });
+    if (status) {
+      this.res.statusCode = status;
     }
-  ]);
+    this.res.end(body);
+  };
   return BaseResponse2;
 }();
 var BaseRequest = /* @__PURE__ */ function() {
   "use strict";
   function BaseRequest2(request) {
     _class_call_check(this, BaseRequest2);
-    _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;
@@ -92,14 +61,10 @@ var BaseRequest = /* @__PURE__ */ function() {
       get: this.getCookie.bind(this)
     };
   }
-  _create_class(BaseRequest2, [
-    {
-      key: "getCookie",
-      value: function getCookie(key) {
-        return this._cookie[key];
-      }
-    }
-  ]);
+  var _proto = BaseRequest2.prototype;
+  _proto.getCookie = function getCookie(key) {
+    return this._cookie[key];
+  };
   return BaseRequest2;
 }();
 export {

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

@@ -1,6 +1,5 @@
 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 _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { BaseRequest, BaseResponse } from "./base";
@@ -10,11 +9,24 @@ var ServerResponse = /* @__PURE__ */ function() {
   "use strict";
   function ServerResponse2(res) {
     _class_call_check(this, ServerResponse2);
-    _define_property(this, "locals", void 0);
-    _define_property(this, "res", void 0);
     this.res = res;
     this.locals = res.locals;
   }
+  var _proto = ServerResponse2.prototype;
+  _proto.getHeader = function getHeader(key) {
+    var _this_res_headers_get;
+    return (_this_res_headers_get = this.res.headers.get(key)) !== null && _this_res_headers_get !== void 0 ? _this_res_headers_get : void 0;
+  };
+  _proto.setHeader = function setHeader(key, value) {
+    this.res.headers.set(key, value);
+  };
+  _proto.removeHeader = function removeHeader(key) {
+    this.res.headers.delete(key);
+  };
+  _proto.end = function end(body) {
+    this.res.body = body;
+    this.res.isSent = true;
+  };
   _create_class(ServerResponse2, [
     {
       key: "statusCode",
@@ -24,32 +36,6 @@ var ServerResponse = /* @__PURE__ */ function() {
       set: function set(code) {
         this.res.status = code;
       }
-    },
-    {
-      key: "getHeader",
-      value: function getHeader(key) {
-        var _this_res_headers_get;
-        return (_this_res_headers_get = this.res.headers.get(key)) !== null && _this_res_headers_get !== void 0 ? _this_res_headers_get : void 0;
-      }
-    },
-    {
-      key: "setHeader",
-      value: function setHeader(key, value) {
-        this.res.headers.set(key, value);
-      }
-    },
-    {
-      key: "removeHeader",
-      value: function removeHeader(key) {
-        this.res.headers.delete(key);
-      }
-    },
-    {
-      key: "end",
-      value: function end(body) {
-        this.res.body = body;
-        this.res.isSent = true;
-      }
     }
   ]);
   return ServerResponse2;

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

@@ -1,39 +1,24 @@
 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";
 var RouteAPI = /* @__PURE__ */ function() {
   "use strict";
   function RouteAPI2(entryName) {
     _class_call_check(this, RouteAPI2);
-    _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 = "";
   }
-  _create_class(RouteAPI2, [
-    {
-      key: "redirect",
-      value: function redirect(url) {
-        var status = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 302;
-        this.url = url;
-        this.status = status;
-      }
-    },
-    {
-      key: "rewrite",
-      value: function rewrite(entryName) {
-        this.current = entryName;
-      }
-    },
-    {
-      key: "use",
-      value: function use(entryName) {
-        this.rewrite(entryName);
-      }
-    }
-  ]);
+  var _proto = RouteAPI2.prototype;
+  _proto.redirect = function redirect(url) {
+    var status = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 302;
+    this.url = url;
+    this.status = status;
+  };
+  _proto.rewrite = function rewrite(entryName) {
+    this.current = entryName;
+  };
+  _proto.use = function use(entryName) {
+    this.rewrite(entryName);
+  };
   return RouteAPI2;
 }();
 export {

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

@@ -1,6 +1,4 @@
 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";
 var RegList = {
   before: {
     head: "<head[^>]*>",
@@ -15,67 +13,41 @@ var TemplateAPI = /* @__PURE__ */ function() {
   "use strict";
   function TemplateAPI2(content) {
     _class_call_check(this, TemplateAPI2);
-    _define_property(this, "content", void 0);
     this.content = content;
   }
-  _create_class(TemplateAPI2, [
-    {
-      key: "get",
-      value: function get() {
-        return this.content;
-      }
-    },
-    {
-      key: "set",
-      value: function set(content) {
-        this.content = content;
-      }
-    },
-    {
-      key: "prependHead",
-      value: function prependHead(fragment) {
-        var head = RegList.before.head;
-        return this.replaceByFunction(new RegExp(head), function(beforeHead) {
-          return "".concat(beforeHead).concat(fragment);
-        });
-      }
-    },
-    {
-      key: "appendHead",
-      value: function appendHead(fragment) {
-        var head = RegList.after.head;
-        return this.replace(head, "".concat(fragment).concat(head));
-      }
-    },
-    {
-      key: "prependBody",
-      value: function prependBody(fragment) {
-        var body = RegList.before.body;
-        return this.replaceByFunction(new RegExp(body), function(beforeBody) {
-          return "".concat(beforeBody).concat(fragment);
-        });
-      }
-    },
-    {
-      key: "appendBody",
-      value: function appendBody(fragment) {
-        var body = RegList.after.body;
-        return this.replace(body, "".concat(fragment).concat(body));
-      }
-    },
-    {
-      key: "replaceByFunction",
-      value: function replaceByFunction(reg, replacer) {
-        this.content = this.content.replace(reg, replacer);
-      }
-    },
-    {
-      key: "replace",
-      value: function replace(reg, text) {
-        this.content = this.content.replace(reg, text);
-      }
-    }
-  ]);
+  var _proto = TemplateAPI2.prototype;
+  _proto.get = function get() {
+    return this.content;
+  };
+  _proto.set = function set(content) {
+    this.content = content;
+  };
+  _proto.prependHead = function prependHead(fragment) {
+    var head = RegList.before.head;
+    return this.replaceByFunction(new RegExp(head), function(beforeHead) {
+      return "".concat(beforeHead).concat(fragment);
+    });
+  };
+  _proto.appendHead = function appendHead(fragment) {
+    var head = RegList.after.head;
+    return this.replace(head, "".concat(fragment).concat(head));
+  };
+  _proto.prependBody = function prependBody(fragment) {
+    var body = RegList.before.body;
+    return this.replaceByFunction(new RegExp(body), function(beforeBody) {
+      return "".concat(beforeBody).concat(fragment);
+    });
+  };
+  _proto.appendBody = function appendBody(fragment) {
+    var body = RegList.after.body;
+    return this.replace(body, "".concat(fragment).concat(body));
+  };
+  _proto.replaceByFunction = function replaceByFunction(reg, replacer) {
+    this.content = this.content.replace(reg, replacer);
+  };
+  _proto.replace = function replace(reg, text) {
+    this.content = this.content.replace(reg, text);
+  };
   return TemplateAPI2;
 }();
 export {

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

@@ -10,7 +10,7 @@ import { injectServerDataStream, injectServerData } from "./utils";
 import { ssrCache } from "./ssrCache";
 var render = function() {
   var _ref = _async_to_generator(function(ctx, renderOptions, runner) {
-    var _ctx_res, distDir, route, template, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, urlPath, bundle, entryName, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, isSpider, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status, contentStream, afterStreamingRenderContext;
+    var _ctx_res, distDir, route, template, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, urlPath, bundle, entryName, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, isSpider, context, bundleJSContent, serverRender, _ref2, content, cacheStatus, _context_redirection, url, _context_redirection_status, status, headers, contentStream, afterStreamingRenderContext;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -72,7 +72,7 @@ var render = function() {
             ssrCache(ctx.req, serverRender, context)
           ];
         case 2:
-          content = _state.sent();
+          _ref2 = _state.sent(), content = _ref2.data, cacheStatus = _ref2.status;
           _context_redirection = context.redirection, url = _context_redirection.url, _context_redirection_status = _context_redirection.status, status = _context_redirection_status === void 0 ? 302 : _context_redirection_status;
           if (url) {
             return [
@@ -85,12 +85,15 @@ var render = function() {
               }
             ];
           }
+          headers = {};
+          cacheStatus && (headers["x-render-cache"] = cacheStatus);
           if (typeof content === "string") {
             return [
               2,
               {
                 content: injectServerData(content, ctx),
-                contentType: mime.contentType("html")
+                contentType: mime.contentType("html"),
+                headers
               }
             ];
           } else {
@@ -110,7 +113,8 @@ var render = function() {
               {
                 content: "",
                 contentStream,
-                contentType: mime.contentType("html")
+                contentType: mime.contentType("html"),
+                headers
               }
             ];
           }

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

@@ -1,6 +1,4 @@
 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 path from "path";
 import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
 var CACHE_FILENAME = "cache";
@@ -8,23 +6,17 @@ var ServerCacheMod = /* @__PURE__ */ function() {
   "use strict";
   function ServerCacheMod2() {
     _class_call_check(this, ServerCacheMod2);
-    _define_property(this, "customContainer", void 0);
-    _define_property(this, "cacheOption", void 0);
   }
-  _create_class(ServerCacheMod2, [
-    {
-      key: "loadServerCacheMod",
-      value: function loadServerCacheMod() {
-        var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
-        var serverCacheFilepath = path.resolve(pwd, SERVER_DIR, CACHE_FILENAME);
-        var mod = requireExistModule(serverCacheFilepath, {
-          interop: false
-        });
-        this.customContainer = mod === null || mod === void 0 ? void 0 : mod.customContainer;
-        this.cacheOption = mod === null || mod === void 0 ? void 0 : mod.cacheOption;
-      }
-    }
-  ]);
+  var _proto = ServerCacheMod2.prototype;
+  _proto.loadServerCacheMod = function loadServerCacheMod() {
+    var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : process.cwd();
+    var serverCacheFilepath = path.resolve(pwd, SERVER_DIR, CACHE_FILENAME);
+    var mod = requireExistModule(serverCacheFilepath, {
+      interop: false
+    });
+    this.customContainer = mod === null || mod === void 0 ? void 0 : mod.customContainer;
+    this.cacheOption = mod === null || mod === void 0 ? void 0 : mod.cacheOption;
+  };
   return ServerCacheMod2;
 }();
 var cacheMod = new ServerCacheMod();