@modern-js/prod-server 2.35.0 → 2.35.1

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

@@ -4,8 +4,8 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, ROUTE_SPEC_FILE, fs } from "@modern-js/utils";
 import { parse as htmlParse } from "node-html-parser";
-import { matchRoutes } from "@modern-js/utils/runtime/remix-router";
-import { matchEntry } from "@modern-js/utils/runtime-node";
+import { matchRoutes } from "@modern-js/runtime-utils/remix-router";
+import { matchEntry } from "@modern-js/runtime-utils/node";
 export function parseLinks(_) {
   return _parseLinks.apply(this, arguments);
 }
@@ -69,7 +69,7 @@ function parseLinksFromRoutes(pathname, distDir) {
 }
 function _parseLinksFromRoutes() {
   _parseLinksFromRoutes = _async_to_generator(function(pathname, distDir) {
-    var noopLinks, nestedRoutesSpec, routesJsonPath, routeManifestPath, routesJson, serverRoutes, entry, _routeAssets_entryName, _matches, _assets_filter, _assets, _assets_filter1, _assets1, routes, entryName, entryRoutes, routesManifest, routeAssets, matches, entryAssets, assets, cssLinks, scriptLinks;
+    var noopLinks, nestedRoutesSpec, routesJsonPath, routeManifestPath, routesJson, serverRoutes, entry, _routeAssets_entryName, _assets_filter, _assets_filter1, routes, entryName, entryRoutes, routesManifest, routeAssets, matches, entryAssets, assets, cssLinks, scriptLinks;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -125,12 +125,11 @@ function _parseLinksFromRoutes() {
           routeAssets = routesManifest.routeAssets;
           matches = matchRoutes(entryRoutes, pathname, entry.urlPath);
           entryAssets = (_routeAssets_entryName = routeAssets[entryName]) === null || _routeAssets_entryName === void 0 ? void 0 : _routeAssets_entryName.assets;
-          assets = (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.reduce(function(acc, match) {
+          assets = matches === null || matches === void 0 ? void 0 : matches.reduce(function(acc, match) {
             var routeId = match.route.id;
             if (routeId) {
-              var _matchedManifest;
               var matchedManifest = routeAssets[routeId];
-              var assets2 = (_matchedManifest = matchedManifest) === null || _matchedManifest === void 0 ? void 0 : _matchedManifest.assets;
+              var assets2 = matchedManifest === null || matchedManifest === void 0 ? void 0 : matchedManifest.assets;
               if (Array.isArray(assets2)) {
                 var _acc;
                 (_acc = acc).push.apply(_acc, _to_consumable_array(assets2));
@@ -138,7 +137,7 @@ function _parseLinksFromRoutes() {
             }
             return acc;
           }, []).concat(entryAssets || []);
-          cssLinks = (_assets = assets) === null || _assets === void 0 ? void 0 : (_assets_filter = _assets.filter(function(asset) {
+          cssLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter(function(asset) {
             return asset.endsWith(".css");
           })) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map(function(uri) {
             return {
@@ -146,7 +145,7 @@ function _parseLinksFromRoutes() {
               as: "style"
             };
           });
-          scriptLinks = (_assets1 = assets) === null || _assets1 === void 0 ? void 0 : (_assets_filter1 = _assets1.filter(function(asset) {
+          scriptLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter1 = assets.filter(function(asset) {
             return asset.endsWith(".js");
           })) === null || _assets_filter1 === void 0 ? void 0 : _assets_filter1.map(function(uri) {
             return {

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

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

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

@@ -21,7 +21,7 @@ var createCacheConfig = function() {
 jest.setTimeout(6e4);
 describe("cache", function() {
   it("should cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var _cacheResult, cache, context, content, cacheConfig, cacheResult;
+    var cache, context, content, cacheConfig, cacheResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -48,7 +48,7 @@ describe("cache", function() {
         case 2:
           cacheResult = _state.sent();
           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");
           return [
             2
           ];
@@ -261,7 +261,7 @@ describe("cache", function() {
     });
   }));
   it("should get cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheResult, context, cacheConfig, cacheResult, err;
+    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, context, cacheConfig, cacheResult, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -304,7 +304,7 @@ describe("cache", function() {
           ];
         case 4:
           cacheResult = _state.sent();
-          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);
           _state.label = 5;
         case 5:
           _iteratorNormalCompletion = true;
@@ -346,7 +346,7 @@ describe("cache", function() {
     });
   }));
   it("should match cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheResult, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
+    var cache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, cacheable, _cacheable, baseCacheable, matchOne, other, _baseCacheable_requestOpt, requestOpt, cacheConfig, content, context, matchContext, cacheResult, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, notMatch, notMatchContext, nothing, err, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -396,7 +396,7 @@ describe("cache", function() {
           ];
         case 4:
           cacheResult = _state.sent();
-          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);
           _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
           _state.label = 5;
         case 5:
@@ -501,7 +501,7 @@ describe("cache", function() {
     });
   }));
   it("should stale cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var _freshResult, _staleResult, cache, context, config, content, shouldCache, freshResult, staleResult;
+    var cache, context, config, content, shouldCache, freshResult, staleResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -530,7 +530,7 @@ describe("cache", function() {
           ];
         case 2:
           freshResult = _state.sent();
-          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);
           return [
             4,
             new Promise(function(resolve) {
@@ -547,7 +547,7 @@ describe("cache", function() {
           ];
         case 4:
           staleResult = _state.sent();
-          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);
           return [
             2
           ];
@@ -555,7 +555,7 @@ describe("cache", function() {
     });
   }));
   it("should garbage cache correctly", /* @__PURE__ */ _async_to_generator(function() {
-    var _freshResult, _staleResult, cache, context, config, content, shouldCache, freshResult, staleResult;
+    var cache, context, config, content, shouldCache, freshResult, staleResult;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -585,7 +585,7 @@ describe("cache", function() {
           ];
         case 2:
           freshResult = _state.sent();
-          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);
           return [
             4,
             new Promise(function(resolve) {
@@ -602,7 +602,7 @@ describe("cache", function() {
           ];
         case 4:
           staleResult = _state.sent();
-          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);
           return [
             2
           ];

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

@@ -9,7 +9,7 @@ export default function(renderFn, ctx) {
   var sprCache = createCache();
   var doRender = function() {
     var _ref = _async_to_generator(function(context) {
-      var _cacheFile, cacheContext, cacheFile, renderResult, cacheHash, renderResult1, render;
+      var cacheContext, cacheFile, renderResult, cacheHash, renderResult1, render;
       function afterRender(source, onAfterRender) {
         return _afterRender.apply(this, arguments);
       }
@@ -124,7 +124,7 @@ export default function(renderFn, ctx) {
               afterRender(renderResult, saveHtmlIntoCache)
             ];
           case 3:
-            cacheHash = (_cacheFile = cacheFile) === null || _cacheFile === void 0 ? void 0 : _cacheFile.hash;
+            cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
             if (!cacheFile.isGarbage)
               return [
                 3,

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

@@ -311,11 +311,11 @@ var CacheManager = /* @__PURE__ */ function() {
       value: function del(context, cacheHash) {
         var _this = this;
         return _async_to_generator(function() {
-          var _data, cacheKey, data;
+          var cacheKey, data;
           return _ts_generator(this, function(_state) {
             cacheKey = _this.generateRequestKey(context);
             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);
             return [
               2
             ];

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

@@ -8,6 +8,9 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
+var calcFallback = function(metaName) {
+  return "x-".concat(cutNameByHyphen(metaName), "-ssr-fallback");
+};
 export var createRenderHandler = function(param) {
   var distDir = param.distDir, staticGenerate = param.staticGenerate, conf = param.conf, forceCSR = param.forceCSR, nonce = param.nonce, ssrRender = param.ssrRender, _param_metaName = param.metaName, metaName = _param_metaName === void 0 ? "modern-js" : _param_metaName;
   return function() {
@@ -54,7 +57,7 @@ export var createRenderHandler = function(param) {
                 null
               ];
             }
-            useCSR = forceCSR && (ctx.query.csr || ctx.headers["x-".concat(cutNameByHyphen(metaName), "-ssr-fallback")]);
+            useCSR = forceCSR && (ctx.query.csr || ctx.headers[calcFallback(metaName)]);
             if (!(route.isSSR && !useCSR))
               return [
                 3,
@@ -122,7 +125,7 @@ export var createRenderHandler = function(param) {
           case 8:
             err = _state.sent();
             ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);
-            ctx.res.set("x-modern-ssr-fallback", "1");
+            ctx.res.set(calcFallback(metaName), "1");
             return [
               3,
               9

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

@@ -157,7 +157,7 @@ export var LruReader = /* @__PURE__ */ function() {
 var reader = new LruReader();
 export var readFile = function() {
   var _ref = _async_to_generator(function(filepath) {
-    var _file, file;
+    var file;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -169,7 +169,7 @@ export var readFile = function() {
           file = _state.sent();
           return [
             2,
-            (_file = file) === null || _file === void 0 ? void 0 : _file.content
+            file === null || file === void 0 ? void 0 : file.content
           ];
       }
     });

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

@@ -65,9 +65,9 @@ export var RouteMatcher = /* @__PURE__ */ function() {
           if (!this.urlReg) {
             return this.urlPath.length;
           } else {
-            var _result_, _result;
+            var _result_;
             var 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;
           }
         }
       )

package/dist/esm/server/index.js

@@ -7,7 +7,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
+import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS, ensureAbsolutePath } from "@modern-js/utils";
 import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
@@ -198,7 +198,7 @@ export var Server = /* @__PURE__ */ function() {
               pwd = options.pwd, config = options.config;
               serverConfig = _this.serverConfig;
               finalServerConfig = _this.runConfigHook(runner, serverConfig);
-              resolvedConfigPath = path.join(pwd, config.output.path || "dist", OUTPUT_CONFIG_FILE);
+              resolvedConfigPath = ensureAbsolutePath(pwd, path.join(config.output.path || "dist", OUTPUT_CONFIG_FILE));
               options.config = loadConfig({
                 cliConfig: config,
                 serverConfig: finalServerConfig,
@@ -230,8 +230,7 @@ export var Server = /* @__PURE__ */ function() {
       key: "listen",
       value: function listen(options, listener) {
         var callback = function() {
-          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) {
@@ -327,7 +326,6 @@ export var Server = /* @__PURE__ */ function() {
     {
       key: "initAppContext",
       value: function initAppContext() {
-        var _appContext, _appContext1, _appContext2;
         var options = this.options;
         var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
         var serverPlugins = plugins.map(function(p) {
@@ -337,9 +335,9 @@ export var Server = /* @__PURE__ */ function() {
         });
         return {
           appDirectory: 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.resolve(appDirectory, 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.resolve(appDirectory, SHARED_DIR),
           distDirectory: path.join(appDirectory, config.output.path || "dist"),
           plugins: serverPlugins
         };

package/dist/esm/server/modernServer.js

@@ -8,7 +8,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createServer } from "http";
 import path from "path";
 import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
-import { time } from "@modern-js/utils/universal/time";
+import { time } from "@modern-js/runtime-utils/time";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
@@ -24,7 +24,6 @@ export var ModernServer = /* @__PURE__ */ function() {
   function ModernServer2(param) {
     var pwd = param.pwd, config = param.config, routes = param.routes, staticGenerate = param.staticGenerate, logger = param.logger, metrics = param.metrics, runMode = param.runMode, proxyTarget = param.proxyTarget, appContext = param.appContext;
     _class_call_check(this, ModernServer2);
-    var _appContext;
     _define_property(this, "pwd", void 0);
     _define_property(this, "distDir", void 0);
     _define_property(this, "workDir", void 0);
@@ -58,7 +57,7 @@ export var ModernServer = /* @__PURE__ */ function() {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || 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;
   }
   _create_class(ModernServer2, [
     {
@@ -68,7 +67,7 @@ export var ModernServer = /* @__PURE__ */ function() {
         function onInit(runner, app) {
           var _this = this;
           return _async_to_generator(function() {
-            var _conf_bff, _app, _this_conf_output, distDir, conf, _createProxyHandler, handlers, handleUpgrade, usageRoutes;
+            var _conf_bff, _this_conf_output, distDir, conf, _createProxyHandler, handlers, handleUpgrade, usageRoutes;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -83,7 +82,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                       _this.addHandler(handler);
                     });
                   }
-                  (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", function() {
+                  app === null || app === void 0 ? void 0 : app.on("close", function() {
                     _this.reader.close();
                   });
                   usageRoutes = _this.filterRoutes(_this.getRoutes());
@@ -432,13 +431,13 @@ export var ModernServer = /* @__PURE__ */ function() {
       value: function prepareAPIHandler(extension) {
         var _this = this;
         return _async_to_generator(function() {
-          var _bff, _bff1, workDir, runner, conf, bff, prefix, webOnly;
+          var workDir, runner, conf, bff, prefix, webOnly;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
                 workDir = _this.workDir, runner = _this.runner, conf = _this.conf;
                 bff = conf.bff;
-                prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
+                prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
                 return [
                   4,
                   isWebOnly()
@@ -460,7 +459,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                     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: function() {
@@ -712,17 +711,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                     2
                   ];
                 case 3:
-                  if (!route.entryName)
-                    return [
-                      3,
-                      6
-                    ];
-                  afterMatchContext = createAfterMatchContext(context, route.entryName);
-                  if (!(_this.runMode === RUN_MODE.FULL))
+                  if (!(route.entryName && _this.runMode === RUN_MODE.FULL))
                     return [
                       3,
                       5
                     ];
+                  afterMatchContext = createAfterMatchContext(context, route.entryName);
                   end1 = time();
                   return [
                     4,
@@ -734,8 +728,6 @@ export var ModernServer = /* @__PURE__ */ function() {
                   _state.sent();
                   cost = end1();
                   cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
-                  _state.label = 5;
-                case 5:
                   if (_this.isSend(res)) {
                     return [
                       2
@@ -758,12 +750,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                     }
                     route = matched1.generate(context.url);
                   }
-                  _state.label = 6;
-                case 6:
+                  _state.label = 5;
+                case 5:
                   if (!_this.frameWebHandler)
                     return [
                       3,
-                      8
+                      7
                     ];
                   res.locals = res.locals || {};
                   middlewareContext = createMiddlewareContext(context);
@@ -772,7 +764,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                     4,
                     _this.frameWebHandler(middlewareContext)
                   ];
-                case 7:
+                case 6:
                   _state.sent();
                   cost1 = end2();
                   cost1 && reporter.reportTiming(ServerReportTimings.SERVER_MIDDLEWARE, cost1);
@@ -782,13 +774,13 @@ export var ModernServer = /* @__PURE__ */ function() {
                       2
                     ];
                   }
-                  _state.label = 8;
-                case 8:
+                  _state.label = 7;
+                case 7:
                   return [
                     4,
                     _this.handleWeb(context, route)
                   ];
-                case 9:
+                case 8:
                   renderResult = _state.sent();
                   if (!renderResult) {
                     return [
@@ -803,17 +795,12 @@ export var ModernServer = /* @__PURE__ */ function() {
                       2
                     ];
                   }
-                  if (!route.entryName)
+                  if (!(route.entryName && _this.runMode === RUN_MODE.FULL))
                     return [
                       3,
-                      12
+                      10
                     ];
                   afterRenderContext = createAfterRenderContext(context, response.toString());
-                  if (!(_this.runMode === RUN_MODE.FULL))
-                    return [
-                      3,
-                      11
-                    ];
                   end3 = time();
                   return [
                     4,
@@ -821,20 +808,18 @@ export var ModernServer = /* @__PURE__ */ function() {
                       onLast: noop
                     })
                   ];
-                case 10:
+                case 9:
                   _state.sent();
                   cost2 = end3();
                   cost2 && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost2);
-                  _state.label = 11;
-                case 11:
                   if (_this.isSend(res)) {
                     return [
                       2
                     ];
                   }
                   response = afterRenderContext.template.get();
-                  _state.label = 12;
-                case 12:
+                  _state.label = 10;
+                case 10:
                   res.end(response);
                   return [
                     2
@@ -848,7 +833,11 @@ export var ModernServer = /* @__PURE__ */ function() {
     {
       key: "isSend",
       value: function isSend(res) {
-        if (res.writableEnded) {
+        if (res.modernFlushedHeaders) {
+          if (res.writableFinished) {
+            return true;
+          }
+        } else if (res.headersSent) {
           return true;
         }
         if (res.getHeader("Location") && isRedirect(res.statusCode)) {

package/dist/esm/workerServer.js

@@ -5,8 +5,8 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createAsyncPipeline } from "@modern-js/plugin";
+import { Logger } from "@modern-js/utils/logger";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
-import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
 import { defaultReporter } from "./libs/reporter";
@@ -92,7 +92,7 @@ export var createHandler = function(manifest) {
   routeMgr.reset(routes);
   return function() {
     var _ref = _async_to_generator(function(options) {
-      var _page_serverHooks_afterMatch, _page_serverHooks, _page, request, loadableStats, routeManifest, url, pageMatch, entryName, page, logger, metrics, reporter, hookContext, afterMatchHookContext, _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2, middlewarsHookContext, responseLike, params, baseUrl, serverRenderContext, body, afterRenderHookContext, e;
+      var _page_serverHooks_afterMatch, _page_serverHooks, request, loadableStats, routeManifest, url, pageMatch, entryName, page, logger, metrics, reporter, hookContext, afterMatchHookContext, _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2, middlewarsHookContext, responseLike, params, baseUrl, serverRenderContext, body, afterRenderHookContext, e;
       function createServerRequest(url2, baseUrl2, request2, params2) {
         var pathname = url2.pathname, host = url2.host, searchParams = url2.searchParams;
         var rawHeaders = request2.headers;
@@ -132,7 +132,7 @@ export var createHandler = function(manifest) {
             reporter = defaultReporter;
             hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
             afterMatchHookContext = 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, function() {
+            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;
             });
             if (checkIsSent(hookContext)) {
@@ -186,14 +186,13 @@ export var createHandler = function(manifest) {
               logger: logger,
               reporter: defaultReporter,
               metrics: metrics,
-              // FIXME: pass correctly req & res
               req: request,
+              res: responseLike,
               serverTiming: {
                 addServeTiming: function addServeTiming() {
                   return this;
                 }
-              },
-              res: responseLike
+              }
             };
             return [
               4,

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

@@ -1,3 +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";
@@ -9,6 +12,7 @@ import { ServerTiming } from "../serverTiming";
 import { defaultReporter } from "../reporter";
 import { headersWithoutCookie } from "../../utils";
 const MOCK_URL_BASE = "https://modernjs.dev/";
+var _urls = /* @__PURE__ */ new WeakMap(), _queries = /* @__PURE__ */ new WeakMap();
 export class ModernServerContext {
   get logger() {
     return this.req.logger;
@@ -18,7 +22,12 @@ export class ModernServerContext {
   }
   get parsedURL() {
     try {
-      return new URL(this.req.url, MOCK_URL_BASE);
+      let 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);
@@ -107,7 +116,8 @@ export 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) {
@@ -142,7 +152,12 @@ export class ModernServerContext {
   }
   get query() {
     const str = this.querystring;
-    return qs.parse(str);
+    let 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;
   }
   /* response property */
   get status() {
@@ -161,7 +176,6 @@ export 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) {
-    var _options;
     _define_property(this, "req", void 0);
     _define_property(this, "res", void 0);
     _define_property(this, "params", {});
@@ -169,10 +183,20 @@ export 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(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"));
   }
 }

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

@@ -14,9 +14,9 @@ export async function flushServerHeader({ serverConf, ctx, distDir, template, he
   const link = 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;
 }