@modern-js/prod-server 2.47.1 → 2.48.1

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

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(context_exports);
 var import_class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
 var import_class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
 var import_class_private_field_set = require("@swc/helpers/_/_class_private_field_set");
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_url = require("url");
 var import_querystring = __toESM(require("querystring"));
 var import_buffer = require("buffer");
@@ -209,13 +208,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, (0, import_utils2.headersWithoutCookie)(this.headers));
   }
   constructor(req, res, options) {
-    (0, import_define_property._)(this, "req", void 0);
-    (0, import_define_property._)(this, "res", void 0);
-    (0, import_define_property._)(this, "params", {});
-    (0, import_define_property._)(this, "reporter", import_reporter.defaultReporter);
-    (0, import_define_property._)(this, "serverTiming", void 0);
-    (0, import_define_property._)(this, "serverData", {});
-    (0, import_define_property._)(this, "options", {});
     (0, import_class_private_field_init._)(this, _urls, {
       writable: true,
       value: void 0
@@ -224,6 +216,10 @@ class ModernServerContext {
       writable: true,
       value: void 0
     });
+    this.params = {};
+    this.reporter = import_reporter.defaultReporter;
+    this.serverData = {};
+    this.options = {};
     this.req = req;
     this.res = res;
     this.options = options || {};

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

@@ -32,7 +32,6 @@ __export(base_exports, {
   BaseResponse: () => BaseResponse
 });
 module.exports = __toCommonJS(base_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_cookie = __toESM(require("cookie"));
 class BaseResponse {
   get(key) {
@@ -66,8 +65,6 @@ class BaseResponse {
     this.res.end(body);
   }
   constructor(res) {
-    (0, import_define_property._)(this, "cookies", void 0);
-    (0, import_define_property._)(this, "res", void 0);
     this.res = res;
     this.cookies = {
       set: this.setCookie.bind(this),
@@ -80,14 +77,6 @@ class BaseRequest {
     return this._cookie[key];
   }
   constructor(request) {
-    (0, import_define_property._)(this, "url", void 0);
-    (0, import_define_property._)(this, "host", void 0);
-    (0, import_define_property._)(this, "pathname", void 0);
-    (0, import_define_property._)(this, "query", void 0);
-    (0, import_define_property._)(this, "headers", void 0);
-    (0, import_define_property._)(this, "cookie", void 0);
-    (0, import_define_property._)(this, "cookies", void 0);
-    (0, import_define_property._)(this, "_cookie", void 0);
     this.url = request.url;
     this.host = request.host;
     this.pathname = request.path;

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

@@ -24,7 +24,6 @@ __export(index_worker_exports, {
   createMiddlewareContext: () => createMiddlewareContext
 });
 module.exports = __toCommonJS(index_worker_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_base = require("./base");
 var import_route = require("./route");
 var import_template = require("./template");
@@ -50,8 +49,6 @@ class ServerResponse {
     this.res.isSent = true;
   }
   constructor(res) {
-    (0, import_define_property._)(this, "locals", void 0);
-    (0, import_define_property._)(this, "res", void 0);
     this.res = res;
     this.locals = res.locals;
   }

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

@@ -21,7 +21,6 @@ __export(route_exports, {
   RouteAPI: () => RouteAPI
 });
 module.exports = __toCommonJS(route_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class RouteAPI {
   redirect(url, status = 302) {
     this.url = url;
@@ -34,9 +33,6 @@ class RouteAPI {
     this.rewrite(entryName);
   }
   constructor(entryName) {
-    (0, import_define_property._)(this, "current", void 0);
-    (0, import_define_property._)(this, "status", void 0);
-    (0, import_define_property._)(this, "url", void 0);
     this.current = entryName;
     this.status = 200;
     this.url = "";

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

@@ -22,7 +22,6 @@ __export(template_exports, {
   TemplateAPI: () => TemplateAPI
 });
 module.exports = __toCommonJS(template_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 const RegList = {
   before: {
     head: "<head[^>]*>",
@@ -63,7 +62,6 @@ class TemplateAPI {
     this.content = this.content.replace(reg, text);
   }
   constructor(content) {
-    (0, import_define_property._)(this, "content", void 0);
     this.content = content;
   }
 }

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

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

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

@@ -31,7 +31,6 @@ __export(cacheMod_exports, {
   cacheMod: () => cacheMod
 });
 module.exports = __toCommonJS(cacheMod_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const CACHE_FILENAME = "cache";
@@ -44,10 +43,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() {
-    (0, import_define_property._)(this, "customContainer", void 0);
-    (0, import_define_property._)(this, "cacheOption", void 0);
-  }
 }
 const cacheMod = new ServerCacheMod();
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -35,9 +35,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 import_stream.Transform({
         write(chunk, _, callback) {
@@ -45,7 +49,10 @@ async function ssrCache(req, render, ssrContext) {
           callback();
         }
       });
-      return renderResult(stream);
+      const data = await renderResult(stream);
+      return {
+        data
+      };
     }
   }
 }

package/dist/cjs/libs/render/ssrCache/manager.js

@@ -21,8 +21,8 @@ __export(manager_exports, {
   CacheManager: () => CacheManager
 });
 module.exports = __toCommonJS(manager_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_stream = require("stream");
+var import_url = require("@modern-js/runtime-utils/url");
 class CacheManager {
   async getCacheResult(req, cacheControl, render, ssrContext) {
     const key = this.computedKey(req, cacheControl);
@@ -33,21 +33,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 = {
@@ -57,7 +65,10 @@ class CacheManager {
       await this.container.set(key, JSON.stringify(cache), {
         ttl
       });
-      return renderResult;
+      return {
+        data: renderResult,
+        status
+      };
     } else {
       let html = "";
       const stream = new import_stream.Transform({
@@ -77,14 +88,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 = (0, import_url.normalizePathname)(pathname);
     if (customKey) {
       if (typeof customKey === "string") {
         return customKey;
@@ -96,7 +111,6 @@ class CacheManager {
     }
   }
   constructor(container) {
-    (0, import_define_property._)(this, "container", void 0);
     this.container = container;
   }
 }

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

@@ -22,7 +22,6 @@ __export(route_exports, {
   RouteMatcher: () => import_matcher.RouteMatcher
 });
 module.exports = __toCommonJS(route_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_matcher = require("./matcher");
 class RouteMatchManager {
   // get all routes matches pathname
@@ -73,8 +72,7 @@ class RouteMatchManager {
     return bundles;
   }
   constructor() {
-    (0, import_define_property._)(this, "matchers", void 0);
-    (0, import_define_property._)(this, "specs", []);
+    this.specs = [];
     this.matchers = [];
   }
 }

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

@@ -21,7 +21,6 @@ __export(matcher_exports, {
   RouteMatcher: () => RouteMatcher
 });
 module.exports = __toCommonJS(matcher_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path_to_regexp = require("path-to-regexp");
 var import_route = require("./route");
 const removeTailSlash = (s) => s.replace(/\/+$/, "");
@@ -103,10 +102,7 @@ class RouteMatcher {
     }
   }
   constructor(spec) {
-    (0, import_define_property._)(this, "spec", void 0);
-    (0, import_define_property._)(this, "urlPath", "");
-    (0, import_define_property._)(this, "urlMatcher", void 0);
-    (0, import_define_property._)(this, "urlReg", void 0);
+    this.urlPath = "";
     this.spec = spec;
     this.setupUrlPath();
   }

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

@@ -21,18 +21,9 @@ __export(route_exports, {
   ModernRoute: () => ModernRoute
 });
 module.exports = __toCommonJS(route_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 class ModernRoute {
   constructor(routeSpec) {
-    (0, import_define_property._)(this, "entryName", void 0);
-    (0, import_define_property._)(this, "urlPath", void 0);
-    (0, import_define_property._)(this, "entryPath", void 0);
-    (0, import_define_property._)(this, "bundle", void 0);
-    (0, import_define_property._)(this, "isApi", void 0);
-    (0, import_define_property._)(this, "isSSR", void 0);
-    (0, import_define_property._)(this, "isSPA", void 0);
-    (0, import_define_property._)(this, "params", {});
-    (0, import_define_property._)(this, "responseHeaders", void 0);
+    this.params = {};
     this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || "";

package/dist/cjs/libs/serverTiming.js

@@ -21,7 +21,6 @@ __export(serverTiming_exports, {
   ServerTiming: () => ServerTiming
 });
 module.exports = __toCommonJS(serverTiming_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 const SERVER_TIMING = "Server-Timing";
 class ServerTiming {
   addServeTiming(name, dur, desc) {
@@ -32,8 +31,6 @@ class ServerTiming {
     return this;
   }
   constructor(res, meta) {
-    (0, import_define_property._)(this, "meta", void 0);
-    (0, import_define_property._)(this, "res", void 0);
     this.meta = meta;
     this.res = res;
   }

package/dist/cjs/renderHtml.js

@@ -1,5 +1,4 @@
 "use strict";
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_http = require("http");
 var import_stream = require("stream");
 var import_net = require("net");
@@ -8,10 +7,6 @@ var import_utils = require("./utils");
 class IncomingMessageLike extends import_stream.Readable {
   constructor({ method, url, headers }) {
     super();
-    (0, import_define_property._)(this, "headers", void 0);
-    (0, import_define_property._)(this, "method", void 0);
-    (0, import_define_property._)(this, "url", void 0);
-    (0, import_define_property._)(this, "socket", void 0);
     this.socket = new import_net.Socket();
     this.headers = headers || {};
     this.headers.host = "localhost:8080";
@@ -28,8 +23,6 @@ class ServerResponseLike extends import_http.OutgoingMessage {
   }
   constructor() {
     super();
-    (0, import_define_property._)(this, "statusCode", void 0);
-    (0, import_define_property._)(this, "data", void 0);
     this.statusCode = 200;
     this.data = [];
   }

package/dist/cjs/server/index.js

@@ -31,7 +31,6 @@ __export(server_exports, {
   Server: () => Server
 });
 module.exports = __toCommonJS(server_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_server_core = require("@modern-js/server-core");
@@ -209,12 +208,7 @@ class Server {
     }
   }
   constructor(options) {
-    (0, import_define_property._)(this, "options", void 0);
-    (0, import_define_property._)(this, "serverImpl", import_modernServerSplit.createProdServer);
-    (0, import_define_property._)(this, "server", void 0);
-    (0, import_define_property._)(this, "app", void 0);
-    (0, import_define_property._)(this, "runner", void 0);
-    (0, import_define_property._)(this, "serverConfig", void 0);
+    this.serverImpl = import_modernServerSplit.createProdServer;
     options.logger = options.logger || (0, import_utils.createLogger)({
       level: "warn"
     });

package/dist/cjs/server/modernServer.js

@@ -31,7 +31,6 @@ __export(modernServer_exports, {
   ModernServer: () => ModernServer
 });
 module.exports = __toCommonJS(modernServer_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_http = require("http");
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
@@ -360,7 +359,13 @@ class ModernServer {
     if (!renderResult) {
       return;
     }
-    const { contentStream: responseStream } = renderResult;
+    const { contentStream: responseStream, headers } = renderResult;
+    if (headers) {
+      for (const name in headers) {
+        const value = headers[name];
+        res.setHeader(name, value);
+      }
+    }
     let { content: response } = renderResult;
     if (route.entryName && responseStream) {
       responseStream.pipe(res);
@@ -491,25 +496,10 @@ class ModernServer {
     context.res.end((0, import_utils2.createErrorDocument)(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
-    (0, import_define_property._)(this, "pwd", void 0);
-    (0, import_define_property._)(this, "distDir", void 0);
-    (0, import_define_property._)(this, "workDir", void 0);
-    (0, import_define_property._)(this, "router", void 0);
-    (0, import_define_property._)(this, "conf", void 0);
-    (0, import_define_property._)(this, "handlers", []);
-    (0, import_define_property._)(this, "presetRoutes", void 0);
-    (0, import_define_property._)(this, "runner", void 0);
-    (0, import_define_property._)(this, "logger", void 0);
-    (0, import_define_property._)(this, "metrics", void 0);
-    (0, import_define_property._)(this, "runMode", void 0);
-    (0, import_define_property._)(this, "proxyTarget", void 0);
-    (0, import_define_property._)(this, "routeRenderHandler", void 0);
-    (0, import_define_property._)(this, "staticGenerate", void 0);
-    (0, import_define_property._)(this, "metaName", void 0);
-    (0, import_define_property._)(this, "loaderHandler", null);
-    (0, import_define_property._)(this, "frameWebHandler", null);
-    (0, import_define_property._)(this, "frameAPIHandler", null);
-    (0, import_define_property._)(this, "_handler", void 0);
+    this.handlers = [];
+    this.loaderHandler = null;
+    this.frameWebHandler = null;
+    this.frameAPIHandler = null;
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = import_path.default.resolve(pwd, config.output.path || "dist");

package/dist/cjs/workerServer.js

@@ -22,7 +22,6 @@ __export(workerServer_exports, {
   createHandler: () => createHandler
 });
 module.exports = __toCommonJS(workerServer_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_plugin = require("@modern-js/plugin");
 var import_hook_api = require("./libs/hook-api/index.worker");
 var import_route = require("./libs/route");
@@ -75,9 +74,6 @@ class ReturnResponse {
     return this;
   }
   constructor(body, status, headers = {}) {
-    (0, import_define_property._)(this, "body", void 0);
-    (0, import_define_property._)(this, "status", void 0);
-    (0, import_define_property._)(this, "headers", void 0);
     this.body = body;
     this.status = status;
     this.headers = new Headers(headers);
@@ -127,7 +123,7 @@ const createHandler = (manifest) => {
     const route = pageMatch.generate(url.pathname);
     const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = (0, import_hook_api.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, () => void 0);
+    await (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, () => void 0));
     if (checkIsSent(hookContext)) {
       return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
     }
@@ -176,7 +172,7 @@ const createHandler = (manifest) => {
         };
         const body = await page.serverRender(serverRenderContext);
         const afterRenderHookContext = (0, import_hook_api.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, () => void 0);
+        await ((_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, () => void 0));
         if (checkIsSent(hookContext)) {
           return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
         }
@@ -235,7 +231,7 @@ function createWorkerHookContext(url, logger, metrics, reporter) {
   };
 }
 let appliedMiddlewares = false;
-function applyMiddlewares(ctx, middleware) {
+async function applyMiddlewares(ctx, middleware) {
   if (middleware) {
     const middlewares = (() => {
       if (Array.isArray(middleware)) {
@@ -252,7 +248,7 @@ function applyMiddlewares(ctx, middleware) {
       });
       appliedMiddlewares = true;
     }
-    middlewarePipeline.run(ctx, {
+    await middlewarePipeline.run(ctx, {
       onLast: () => void 0
     });
   }