@modern-js/prod-server 2.35.0 → 2.35.1

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

@@ -8,6 +8,9 @@ Object.defineProperty(exports, "ModernServerContext", {
     return ModernServerContext;
   }
 });
+const _class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
+const _class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
+const _class_private_field_set = require("@swc/helpers/_/_class_private_field_set");
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _url = require("url");
@@ -20,6 +23,7 @@ const _serverTiming = require("../serverTiming");
 const _reporter = require("../reporter");
 const _utils1 = require("../../utils");
 const MOCK_URL_BASE = "https://modernjs.dev/";
+var _urls = /* @__PURE__ */ new WeakMap(), _queries = /* @__PURE__ */ new WeakMap();
 class ModernServerContext {
   get logger() {
     return this.req.logger;
@@ -29,7 +33,12 @@ class ModernServerContext {
   }
   get parsedURL() {
     try {
-      return new _url.URL(this.req.url, MOCK_URL_BASE);
+      let url = _class_private_field_get._(this, _urls).get(this.req.url);
+      if (!url) {
+        url = new _url.URL(this.req.url, MOCK_URL_BASE);
+        _class_private_field_get._(this, _urls).set(this.req.url, url);
+      }
+      return url;
     } catch (e) {
       this.logger.error("Parse URL error", e.stack || e.message);
       return new _url.URL("/_modern_mock_path", MOCK_URL_BASE);
@@ -118,7 +127,8 @@ class ModernServerContext {
     if (!host) {
       host = this.getReqHeader("Host");
     }
-    return host.split(/\s*,\s*/, 1)[0] || "undefined";
+    host = host.split(/\s*,\s*/, 1)[0] || "undefined";
+    return host;
   }
   get protocol() {
     if (this.req.socket.encrypted) {
@@ -153,7 +163,12 @@ class ModernServerContext {
   }
   get query() {
     const str = this.querystring;
-    return _querystring.default.parse(str);
+    let query = _class_private_field_get._(this, _queries).get(str);
+    if (!query) {
+      query = _querystring.default.parse(str);
+      _class_private_field_get._(this, _queries).set(str, query);
+    }
+    return query;
   }
   /* response property */
   get status() {
@@ -172,7 +187,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, _utils1.headersWithoutCookie)(this.headers));
   }
   constructor(req, res, options) {
-    var _options;
     _define_property._(this, "req", void 0);
     _define_property._(this, "res", void 0);
     _define_property._(this, "params", {});
@@ -180,10 +194,20 @@ class ModernServerContext {
     _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
+    });
+    _class_private_field_init._(this, _queries, {
+      writable: true,
+      value: void 0
+    });
     this.req = req;
     this.res = res;
     this.options = options || {};
     this.bind();
-    this.serverTiming = new _serverTiming.ServerTiming(this.res, (0, _utils.cutNameByHyphen)(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
+    _class_private_field_set._(this, _urls, /* @__PURE__ */ new Map());
+    _class_private_field_set._(this, _queries, /* @__PURE__ */ new Map());
+    this.serverTiming = new _serverTiming.ServerTiming(this.res, (0, _utils.cutNameByHyphen)((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
   }
 }

package/dist/cjs/libs/preload/flushServerHeader.js

@@ -24,9 +24,9 @@ async function flushServerHeader({ serverConf, ctx, distDir, template, headers }
   const link = (0, _transformLinks2String.transformLinks2String)(links, ssrConf.preload);
   res.set("link", link);
   for (const key in headers || {}) {
-    var _headers;
-    const value = (_headers = headers) === null || _headers === void 0 ? void 0 : _headers[key];
+    const value = headers === null || headers === void 0 ? void 0 : headers[key];
     value && res.set(key, value);
   }
   res.flushHeaders();
+  res.modernFlushedHeaders = true;
 }

package/dist/cjs/libs/preload/parseLinks.js

@@ -13,8 +13,8 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _nodehtmlparser = require("node-html-parser");
-const _remixrouter = require("@modern-js/utils/runtime/remix-router");
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _remixrouter = require("@modern-js/runtime-utils/remix-router");
+const _node = require("@modern-js/runtime-utils/node");
 async function parseLinks({ pathname, distDir, template }) {
   const links = await parseLinksFromRoutes(pathname, distDir);
   return links.concat(parseLinksFromHtml(template));
@@ -58,9 +58,9 @@ async function parseLinksFromRoutes(pathname, distDir) {
   }
   const routesJson = await Promise.resolve(routesJsonPath).then((p) => /* @__PURE__ */ _interop_require_wildcard._(require(p)));
   const serverRoutes = routesJson.routes;
-  const entry = (0, _runtimenode.matchEntry)(pathname, serverRoutes);
+  const entry = (0, _node.matchEntry)(pathname, serverRoutes);
   if (entry) {
-    var _routeAssets_entryName, _matches, _assets_filter, _assets, _assets_filter1, _assets1;
+    var _routeAssets_entryName, _assets_filter, _assets_filter1;
     const routes = await Promise.resolve(nestedRoutesSpec).then((p) => /* @__PURE__ */ _interop_require_wildcard._(require(p)));
     const { entryName } = entry;
     if (!entryName) {
@@ -74,23 +74,22 @@ async function parseLinksFromRoutes(pathname, distDir) {
     const { routeAssets } = routesManifest;
     const matches = (0, _remixrouter.matchRoutes)(entryRoutes, pathname, entry.urlPath);
     const entryAssets = (_routeAssets_entryName = routeAssets[entryName]) === null || _routeAssets_entryName === void 0 ? void 0 : _routeAssets_entryName.assets;
-    const assets = (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.reduce((acc, match) => {
+    const assets = matches === null || matches === void 0 ? void 0 : matches.reduce((acc, match) => {
       const routeId = match.route.id;
       if (routeId) {
-        var _matchedManifest;
         const matchedManifest = routeAssets[routeId];
-        const assets2 = (_matchedManifest = matchedManifest) === null || _matchedManifest === void 0 ? void 0 : _matchedManifest.assets;
+        const assets2 = matchedManifest === null || matchedManifest === void 0 ? void 0 : matchedManifest.assets;
         if (Array.isArray(assets2)) {
           acc.push(...assets2);
         }
       }
       return acc;
     }, []).concat(entryAssets || []);
-    const cssLinks = (_assets = assets) === null || _assets === void 0 ? void 0 : (_assets_filter = _assets.filter((asset) => asset.endsWith(".css"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((uri) => ({
+    const cssLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter((asset) => asset.endsWith(".css"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((uri) => ({
       uri,
       as: "style"
     }));
-    const scriptLinks = (_assets1 = assets) === null || _assets1 === void 0 ? void 0 : (_assets_filter1 = _assets1.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter1 === void 0 ? void 0 : _assets_filter1.map((uri) => ({
+    const scriptLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter1 = assets.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter1 === void 0 ? void 0 : _assets_filter1.map((uri) => ({
       uri,
       as: "script"
     }));

package/dist/cjs/libs/preload/transformLinks2String.js

@@ -18,7 +18,6 @@ function transformLinks2String(links, preload) {
   return resolveLinks;
 }
 function addInclude(links, include) {
-  var _include;
   const images = [
     "gif",
     "jpg",
@@ -44,7 +43,7 @@ function addInclude(links, include) {
     "ttf",
     "otf"
   ];
-  const includes = ((_include = include) === null || _include === void 0 ? void 0 : _include.map((item) => {
+  const includes = (include === null || include === void 0 ? void 0 : include.map((item) => {
     if (typeof item === "string") {
       const type = (() => {
         if (item.endsWith(".js")) {

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

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

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

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

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

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

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

@@ -18,6 +18,7 @@ const _static = require("./static");
 const _reader = require("./reader");
 const _ssr = /* @__PURE__ */ _interop_require_wildcard._(require("./ssr"));
 const _utils1 = require("./utils");
+const calcFallback = (metaName) => `x-${(0, _utils.cutNameByHyphen)(metaName)}-ssr-fallback`;
 const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, ssrRender, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
@@ -33,7 +34,7 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
   if (!content) {
     return null;
   }
-  const useCSR = forceCSR && (ctx.query.csr || ctx.headers[`x-${(0, _utils.cutNameByHyphen)(metaName)}-ssr-fallback`]);
+  const useCSR = forceCSR && (ctx.query.csr || ctx.headers[calcFallback(metaName)]);
   if (route.isSSR && !useCSR) {
     try {
       const userAgent = ctx.getReqHeader("User-Agent");
@@ -71,7 +72,7 @@ const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, s
       return result;
     } catch (err) {
       ctx.error(_constants.ERROR_DIGEST.ERENDER, err.stack || err.message);
-      ctx.res.set("x-modern-ssr-fallback", "1");
+      ctx.res.set(calcFallback(metaName), "1");
     }
   }
   return {

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

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

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

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

package/dist/cjs/server/index.js

@@ -91,7 +91,7 @@ class Server {
     const { pwd, config } = options;
     const { serverConfig } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = _path.default.join(pwd, config.output.path || "dist", _utils.OUTPUT_CONFIG_FILE);
+    const resolvedConfigPath = (0, _utils.ensureAbsolutePath)(pwd, _path.default.join(config.output.path || "dist", _utils.OUTPUT_CONFIG_FILE));
     options.config = (0, _loadConfig.loadConfig)({
       cliConfig: config,
       serverConfig: finalServerConfig,
@@ -103,8 +103,7 @@ class Server {
   }
   listen(options, listener) {
     const callback = () => {
-      var _listener;
-      (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
+      listener === null || listener === void 0 ? void 0 : listener();
     };
     if (typeof options === "object") {
       if (process.env.PORT) {
@@ -154,7 +153,6 @@ class Server {
     });
   }
   initAppContext() {
-    var _appContext, _appContext1, _appContext2;
     const { options } = this;
     const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
@@ -162,9 +160,9 @@ class Server {
     }));
     return {
       appDirectory,
-      apiDirectory: (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory,
-      lambdaDirectory: (_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.lambdaDirectory,
-      sharedDirectory: ((_appContext2 = appContext) === null || _appContext2 === void 0 ? void 0 : _appContext2.sharedDirectory) || _path.default.resolve(appDirectory, _utils.SHARED_DIR),
+      apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
+      lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
+      sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || _path.default.resolve(appDirectory, _utils.SHARED_DIR),
       distDirectory: _path.default.join(appDirectory, config.output.path || "dist"),
       plugins: serverPlugins
     };

package/dist/cjs/server/modernServer.js

@@ -14,7 +14,7 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _http = require("http");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
-const _time = require("@modern-js/utils/universal/time");
+const _time = require("@modern-js/runtime-utils/time");
 const _route = require("../libs/route");
 const _render = require("../libs/render");
 const _serveFile = require("../libs/serveFile");
@@ -28,7 +28,7 @@ const SERVER_DIR = "./server";
 class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _app, _this_conf_output;
+    var _conf_bff, _this_conf_output;
     this.runner = runner;
     const { distDir, conf } = this;
     this.initReader();
@@ -40,7 +40,7 @@ class ModernServer {
         this.addHandler(handler);
       });
     }
-    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
+    app === null || app === void 0 ? void 0 : app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -176,10 +176,9 @@ class ModernServer {
     return handler;
   }
   async prepareAPIHandler(extension) {
-    var _bff, _bff1;
     const { workDir, runner, conf } = this;
     const { bff } = conf;
-    const prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
+    const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
     const webOnly = await (0, _utils.isWebOnly)();
     if (webOnly && process.env.NODE_ENV === "development") {
       return (req, res) => {
@@ -191,7 +190,7 @@ class ModernServer {
       pwd: workDir,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-      httpMethodDecider: (_bff1 = bff) === null || _bff1 === void 0 ? void 0 : _bff1.httpMethodDecider,
+      httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
       render: this.render.bind(this)
     }, {
       onLast: () => null
@@ -302,16 +301,14 @@ class ModernServer {
       await this.handleAPI(context);
       return;
     }
-    if (route.entryName) {
+    if (route.entryName && this.runMode === _constants.RUN_MODE.FULL) {
       const afterMatchContext = (0, _hookapi.createAfterMatchContext)(context, route.entryName);
-      if (this.runMode === _constants.RUN_MODE.FULL) {
-        const end2 = (0, _time.time)();
-        await this.runner.afterMatch(afterMatchContext, {
-          onLast: _utils1.noop
-        });
-        const cost = end2();
-        cost && reporter.reportTiming(_constants.ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
-      }
+      const end2 = (0, _time.time)();
+      await this.runner.afterMatch(afterMatchContext, {
+        onLast: _utils1.noop
+      });
+      const cost = end2();
+      cost && reporter.reportTiming(_constants.ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
       if (this.isSend(res)) {
         return;
       }
@@ -354,16 +351,14 @@ class ModernServer {
       responseStream.pipe(res);
       return;
     }
-    if (route.entryName) {
+    if (route.entryName && this.runMode === _constants.RUN_MODE.FULL) {
       const afterRenderContext = (0, _hookapi.createAfterRenderContext)(context, response.toString());
-      if (this.runMode === _constants.RUN_MODE.FULL) {
-        const end2 = (0, _time.time)();
-        await this.runner.afterRender(afterRenderContext, {
-          onLast: _utils1.noop
-        });
-        const cost = end2();
-        cost && reporter.reportTiming(_constants.ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost);
-      }
+      const end2 = (0, _time.time)();
+      await this.runner.afterRender(afterRenderContext, {
+        onLast: _utils1.noop
+      });
+      const cost = end2();
+      cost && reporter.reportTiming(_constants.ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost);
       if (this.isSend(res)) {
         return;
       }
@@ -372,7 +367,11 @@ class ModernServer {
     res.end(response);
   }
   isSend(res) {
-    if (res.writableEnded) {
+    if (res.modernFlushedHeaders) {
+      if (res.writableFinished) {
+        return true;
+      }
+    } else if (res.headersSent) {
       return true;
     }
     if (res.getHeader("Location") && (0, _utils1.isRedirect)(res.statusCode)) {
@@ -477,7 +476,6 @@ class ModernServer {
     context.res.end((0, _utils1.createErrorDocument)(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
-    var _appContext;
     _define_property._(this, "pwd", void 0);
     _define_property._(this, "distDir", void 0);
     _define_property._(this, "workDir", void 0);
@@ -511,6 +509,6 @@ class ModernServer {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || _constants.RUN_MODE.FULL;
-    this.metaName = (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.metaName;
+    this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
   }
 }

package/dist/cjs/workerServer.js

@@ -19,8 +19,8 @@ _export(exports, {
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _plugin = require("@modern-js/plugin");
+const _logger = require("@modern-js/utils/logger");
 const _indexworker = require("./libs/hook-api/index.worker");
-const _logger = require("./libs/logger");
 const _route = require("./libs/route");
 const _metrics = require("./libs/metrics");
 const _reporter = require("./libs/reporter");
@@ -89,7 +89,7 @@ const createHandler = (manifest) => {
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
   return async (options) => {
-    var _page_serverHooks_afterMatch, _page_serverHooks, _page;
+    var _page_serverHooks_afterMatch, _page_serverHooks;
     const { request, loadableStats, routeManifest } = options;
     const url = new URL(request.url);
     const pageMatch = routeMgr.match(url.pathname);
@@ -105,7 +105,7 @@ const createHandler = (manifest) => {
     const reporter = _reporter.defaultReporter;
     const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = (0, _indexworker.createAfterMatchContext)(hookContext, entryName);
-    (_page = 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);
+    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);
     }
@@ -141,14 +141,13 @@ const createHandler = (manifest) => {
           logger,
           reporter: _reporter.defaultReporter,
           metrics,
-          // FIXME: pass correctly req & res
           req: request,
+          res: responseLike,
           serverTiming: {
             addServeTiming() {
               return this;
             }
-          },
-          res: responseLike
+          }
         };
         const body = await page.serverRender(serverRenderContext);
         const afterRenderHookContext = (0, _indexworker.createAfterRenderContext)(hookContext, body);

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

@@ -1,4 +1,7 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+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 _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
@@ -12,11 +15,11 @@ import { ServerTiming } from "../serverTiming";
 import { defaultReporter } from "../reporter";
 import { headersWithoutCookie } from "../../utils";
 var MOCK_URL_BASE = "https://modernjs.dev/";
+var _urls = /* @__PURE__ */ new WeakMap(), _queries = /* @__PURE__ */ new WeakMap();
 export var ModernServerContext = /* @__PURE__ */ function() {
   "use strict";
   function ModernServerContext2(req, res, options) {
     _class_call_check(this, ModernServerContext2);
-    var _options;
     _define_property(this, "req", void 0);
     _define_property(this, "res", void 0);
     _define_property(this, "params", {});
@@ -24,11 +27,21 @@ export var ModernServerContext = /* @__PURE__ */ function() {
     _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
+    });
+    _class_private_field_init(this, _queries, {
+      writable: true,
+      value: void 0
+    });
     this.req = req;
     this.res = res;
     this.options = options || {};
     this.bind();
-    this.serverTiming = new ServerTiming(this.res, cutNameByHyphen(((_options = options) === null || _options === void 0 ? void 0 : _options.metaName) || "modern-js"));
+    _class_private_field_set(this, _urls, /* @__PURE__ */ new Map());
+    _class_private_field_set(this, _queries, /* @__PURE__ */ new Map());
+    this.serverTiming = new ServerTiming(this.res, cutNameByHyphen((options === null || options === void 0 ? void 0 : options.metaName) || "modern-js"));
   }
   _create_class(ModernServerContext2, [
     {
@@ -47,7 +60,12 @@ export var ModernServerContext = /* @__PURE__ */ function() {
       key: "parsedURL",
       get: function get() {
         try {
-          return new URL(this.req.url, MOCK_URL_BASE);
+          var url = _class_private_field_get(this, _urls).get(this.req.url);
+          if (!url) {
+            url = new URL(this.req.url, MOCK_URL_BASE);
+            _class_private_field_get(this, _urls).set(this.req.url, url);
+          }
+          return url;
         } catch (e) {
           this.logger.error("Parse URL error", e.stack || e.message);
           return new URL("/_modern_mock_path", MOCK_URL_BASE);
@@ -173,7 +191,8 @@ export var ModernServerContext = /* @__PURE__ */ function() {
         if (!host) {
           host = this.getReqHeader("Host");
         }
-        return host.split(/\s*,\s*/, 1)[0] || "undefined";
+        host = host.split(/\s*,\s*/, 1)[0] || "undefined";
+        return host;
       }
     },
     {
@@ -226,7 +245,12 @@ export var ModernServerContext = /* @__PURE__ */ function() {
       key: "query",
       get: function get() {
         var str = this.querystring;
-        return qs.parse(str);
+        var query = _class_private_field_get(this, _queries).get(str);
+        if (!query) {
+          query = qs.parse(str);
+          _class_private_field_get(this, _queries).set(str, query);
+        }
+        return query;
       }
     },
     {

package/dist/esm/libs/preload/flushServerHeader.js

@@ -7,7 +7,7 @@ export function flushServerHeader(_) {
 }
 function _flushServerHeader() {
   _flushServerHeader = _async_to_generator(function(param) {
-    var serverConf, ctx, distDir, template, headers, _ref, ssrConf, res, links, link, key, _headers, value;
+    var serverConf, ctx, distDir, template, headers, _ref, ssrConf, res, links, link, key, value;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -32,11 +32,11 @@ function _flushServerHeader() {
           link = transformLinks2String(links, ssrConf.preload);
           res.set("link", link);
           for (var key2 in headers || {}) {
-            ;
-            value = (_headers = headers) === null || _headers === void 0 ? void 0 : _headers[key2];
+            value = headers === null || headers === void 0 ? void 0 : headers[key2];
             value && res.set(key2, value);
           }
           res.flushHeaders();
+          res.modernFlushedHeaders = true;
           return [
             2
           ];