@modern-js/server-core 2.49.4-alpha.1 → 2.49.4-alpha.2

package/dist/cjs/base/adapters/node/middlewares/serverPublic.js

@@ -47,6 +47,9 @@ function createPublicMiddleware({ pwd, routes }) {
         if (mimeType) {
           c.header("Content-Type", mimeType);
         }
+        Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
+          c.header(k, v);
+        });
         return c.body(data, 200);
       }
     }
@@ -55,7 +58,7 @@ function createPublicMiddleware({ pwd, routes }) {
 }
 function matchRoute(req, routes) {
   for (const route of routes.sort(import_utils.sortRoutes)) {
-    if (!route.isSSR && !route.isApi && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
+    if (!route.isSSR && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
       return route;
     }
   }

package/dist/cjs/base/adapters/node/middlewares/serverStatic.js

@@ -35,7 +35,6 @@ var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_mime = require("hono/utils/mime");
 var import_fileReader = require("@modern-js/runtime-utils/fileReader");
-var import_utils2 = require("../../../utils");
 var import_serverPublic = require("./serverPublic");
 function createStaticMiddleware(options) {
   const { pwd, routes } = options;
@@ -69,7 +68,7 @@ function createStaticMiddleware(options) {
     if (hit) {
       const filepath = import_path.default.join(pwd, pathname.replace(prefix, () => ""));
       if (!await import_utils.fs.pathExists(filepath)) {
-        return c.html((0, import_utils2.createErrorHtml)(404), 404);
+        return next();
       }
       const mimeType = (0, import_mime.getMimeType)(filepath);
       if (mimeType) {

package/dist/cjs/base/middlewares/renderHandler/render.js

@@ -22,13 +22,31 @@ __export(render_exports, {
 });
 module.exports = __toCommonJS(render_exports);
 var import_universal = require("@modern-js/utils/universal");
+var import_trie_router = require("hono/router/trie-router");
 var import_constants = require("../../../base/constants");
 var import_utils = require("../../utils");
 var import_dataHandler = require("./dataHandler");
 var import_ssrRender = require("./ssrRender");
+function getRouter(routes) {
+  const sorted = routes.sort(import_utils.sortRoutes);
+  const router = new import_trie_router.TrieRouter();
+  for (const route of sorted) {
+    const { urlPath: originUrlPath } = route;
+    const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
+    router.add("*", urlPath, route);
+  }
+  return router;
+}
+function matchRoute(router, request) {
+  const pathname = (0, import_utils.getPathname)(request);
+  const matched = router.match("*", pathname);
+  const result = matched[0][0];
+  return result || [];
+}
 async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce, onFallback: onFallbackFn }) {
+  const router = getRouter(routes);
   return async (req, { logger, nodeReq, reporter, templates, serverManifest, locals, metrics }) => {
-    const routeInfo = matchRoute(req, routes);
+    const [routeInfo, params] = matchRoute(router, req);
     const onFallback = async (reason, error) => {
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
         logger,
@@ -69,6 +87,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, n
       nodeReq,
       reporter,
       serverRoutes: routes,
+      params,
       locals,
       serverManifest,
       metrics
@@ -92,7 +111,7 @@ async function renderHandler(request, options, mode, onError) {
   const serverData = {
     router: {
       baseUrl: options.routeInfo.urlPath,
-      params: {}
+      params: options.params
     }
   };
   let response;
@@ -106,17 +125,15 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  return (0, import_utils.transformResponse)(response, injectServerData(serverData));
-}
-function matchRoute(req, routes) {
-  const sorted = routes.sort(import_utils.sortRoutes);
-  for (const route of sorted) {
-    const pathname = (0, import_utils.getPathname)(req);
-    if (pathname.startsWith(route.urlPath)) {
-      return route;
-    }
+  const newRes = (0, import_utils.transformResponse)(response, injectServerData(serverData));
+  const { routeInfo } = options;
+  applyExtendHeaders(newRes, routeInfo);
+  return newRes;
+  function applyExtendHeaders(r, route) {
+    Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
+      r.headers.set(k, v);
+    });
   }
-  return void 0;
 }
 async function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
   const query = (0, import_utils.parseQuery)(req);

package/dist/cjs/base/middlewares/renderHandler/ssrRender.js

@@ -49,7 +49,7 @@ const defaultReporter = {
   reportWarn() {
   }
 };
-async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, metrics }) {
+async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics }) {
   var _serverManifest_renderBundles;
   const { entryName } = routeInfo;
   const loadableStats = serverManifest.loadableStats || {};
@@ -69,7 +69,7 @@ async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, meta
   const ssrContext = {
     request: {
       baseUrl: routeInfo.urlPath,
-      params: {},
+      params,
       pathname: nodeReq ? getPathnameFromNodeReq(nodeReq) : (0, import_utils.getPathname)(request),
       host,
       query,

package/dist/esm/base/adapters/node/middlewares/serverPublic.js

@@ -1,4 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
@@ -31,6 +32,10 @@ function createPublicMiddleware(param) {
               if (mimeType) {
                 c.header("Content-Type", mimeType);
               }
+              Object.entries(route.responseHeaders || {}).forEach(function(param2) {
+                var _param = _sliced_to_array(param2, 2), k = _param[0], v = _param[1];
+                c.header(k, v);
+              });
               return [
                 2,
                 c.body(data, 200)
@@ -60,7 +65,7 @@ function matchRoute(req, routes) {
   try {
     for (var _iterator = routes.sort(sortRoutes)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var route = _step.value;
-      if (!route.isSSR && !route.isApi && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
+      if (!route.isSSR && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
         return route;
       }
     }

package/dist/esm/base/adapters/node/middlewares/serverStatic.js

@@ -5,7 +5,6 @@ import path from "path";
 import { fs } from "@modern-js/utils";
 import { getMimeType } from "hono/utils/mime";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-import { createErrorHtml } from "../../../utils";
 import { createPublicMiddleware } from "./serverPublic";
 function createStaticMiddleware(options) {
   var pwd = options.pwd, routes = options.routes;
@@ -54,7 +53,7 @@ function createStaticMiddleware(options) {
             if (!_state.sent()) {
               return [
                 2,
-                c.html(createErrorHtml(404), 404)
+                next()
               ];
             }
             mimeType = getMimeType(filepath);

package/dist/esm/base/middlewares/renderHandler/render.js

@@ -1,28 +1,64 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
+import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG } from "../../../base/constants";
 import { createErrorHtml, sortRoutes, parseQuery, transformResponse, getPathname, onError as onErrorFn, ErrorDigest } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
+function getRouter(routes) {
+  var sorted = routes.sort(sortRoutes);
+  var router = new TrieRouter();
+  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = sorted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var route = _step.value;
+      var originUrlPath = route.urlPath;
+      var urlPath = originUrlPath.endsWith("/") ? "".concat(originUrlPath, "*") : "".concat(originUrlPath, "/*");
+      router.add("*", urlPath, route);
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+  return router;
+}
+function matchRoute(router, request) {
+  var pathname = getPathname(request);
+  var matched = router.match("*", pathname);
+  var result = matched[0][0];
+  return result || [];
+}
 function createRender(_) {
   return _createRender.apply(this, arguments);
 }
 function _createRender() {
   _createRender = _async_to_generator(function(param) {
-    var routes, pwd, metaName, staticGenerate, forceCSR, nonce, onFallbackFn;
+    var routes, pwd, metaName, staticGenerate, forceCSR, nonce, onFallbackFn, router;
     return _ts_generator(this, function(_state) {
       routes = param.routes, pwd = param.pwd, metaName = param.metaName, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR, nonce = param.nonce, onFallbackFn = param.onFallback;
+      router = getRouter(routes);
       return [
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, nodeReq, reporter, templates, serverManifest, locals, metrics, routeInfo, onFallback, html, renderMode, onError, renderOptions, response;
+            var logger, nodeReq, reporter, templates, serverManifest, locals, metrics, _matchRoute, routeInfo, params, onFallback, html, renderMode, onError, renderOptions, response;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
                   logger = param2.logger, nodeReq = param2.nodeReq, reporter = param2.reporter, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, metrics = param2.metrics;
-                  routeInfo = matchRoute(req, routes);
+                  _matchRoute = _sliced_to_array(matchRoute(router, req), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
                   onFallback = function() {
                     var _ref2 = _async_to_generator(function(reason, error) {
                       return _ts_generator(this, function(_state3) {
@@ -102,6 +138,7 @@ function _createRender() {
                     nodeReq,
                     reporter,
                     serverRoutes: routes,
+                    params,
                     locals,
                     serverManifest,
                     metrics
@@ -179,14 +216,20 @@ function renderHandler(request, options, mode, onError) {
 }
 function _renderHandler() {
   _renderHandler = _async_to_generator(function(request, options, mode, onError) {
-    var serverData, response, e;
+    var serverData, response, e, newRes, routeInfo;
+    function applyExtendHeaders(r, route) {
+      Object.entries(route.responseHeaders || {}).forEach(function(param) {
+        var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
+        r.headers.set(k, v);
+      });
+    }
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           serverData = {
             router: {
               baseUrl: options.routeInfo.urlPath,
-              params: {}
+              params: options.params
             }
           };
           if (!(mode === "ssr"))
@@ -234,42 +277,18 @@ function _renderHandler() {
           response = csrRender(options.html);
           _state.label = 7;
         case 7:
+          newRes = transformResponse(response, injectServerData(serverData));
+          routeInfo = options.routeInfo;
+          applyExtendHeaders(newRes, routeInfo);
           return [
             2,
-            transformResponse(response, injectServerData(serverData))
+            newRes
           ];
       }
     });
   });
   return _renderHandler.apply(this, arguments);
 }
-function matchRoute(req, routes) {
-  var sorted = routes.sort(sortRoutes);
-  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-  try {
-    for (var _iterator = sorted[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var route = _step.value;
-      var pathname = getPathname(req);
-      if (pathname.startsWith(route.urlPath)) {
-        return route;
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return void 0;
-}
 function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
   return _getRenderMode.apply(this, arguments);
 }

package/dist/esm/base/middlewares/renderHandler/ssrRender.js

@@ -24,11 +24,11 @@ function ssrRender(request, _) {
 }
 function _ssrRender() {
   _ssrRender = _async_to_generator(function(request, param) {
-    var routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, metrics, _serverManifest_renderBundles, entryName, loadableStats, routeManifest, host, isSpider, responseProxy, query, headers, key, ssrContext, renderBundle, runtimeEnv, ssrResult, cacheStatus, render, cacheModuleName, ssrCache, incomingMessage, cacheControl, _ref, data, status, redirection, headers1, Readable, streamModule, createReadableStreamFromReadable, _tmp, data1;
+    var routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics, _serverManifest_renderBundles, entryName, loadableStats, routeManifest, host, isSpider, responseProxy, query, headers, key, ssrContext, renderBundle, runtimeEnv, ssrResult, cacheStatus, render, cacheModuleName, ssrCache, incomingMessage, cacheControl, _ref, data, status, redirection, headers1, Readable, streamModule, createReadableStreamFromReadable, _tmp, data1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          routeInfo = param.routeInfo, html = param.html, staticGenerate = param.staticGenerate, nonce = param.nonce, metaName = param.metaName, reporter = param.reporter, logger = param.logger, nodeReq = param.nodeReq, serverManifest = param.serverManifest, locals = param.locals, metrics = param.metrics;
+          routeInfo = param.routeInfo, html = param.html, staticGenerate = param.staticGenerate, nonce = param.nonce, metaName = param.metaName, reporter = param.reporter, logger = param.logger, nodeReq = param.nodeReq, serverManifest = param.serverManifest, locals = param.locals, params = param.params, metrics = param.metrics;
           entryName = routeInfo.entryName;
           loadableStats = serverManifest.loadableStats || {};
           routeManifest = serverManifest.routeManifest || {};
@@ -47,7 +47,7 @@ function _ssrRender() {
           ssrContext = {
             request: {
               baseUrl: routeInfo.urlPath,
-              params: {},
+              params,
               pathname: nodeReq ? getPathnameFromNodeReq(nodeReq) : getPathname(request),
               host,
               query,

package/dist/esm-node/base/adapters/node/middlewares/serverPublic.js

@@ -14,6 +14,9 @@ function createPublicMiddleware({ pwd, routes }) {
         if (mimeType) {
           c.header("Content-Type", mimeType);
         }
+        Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
+          c.header(k, v);
+        });
         return c.body(data, 200);
       }
     }
@@ -22,7 +25,7 @@ function createPublicMiddleware({ pwd, routes }) {
 }
 function matchRoute(req, routes) {
   for (const route of routes.sort(sortRoutes)) {
-    if (!route.isSSR && !route.isApi && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
+    if (!route.isSSR && route.entryPath.startsWith("public") && req.path.startsWith(route.urlPath)) {
       return route;
     }
   }

package/dist/esm-node/base/adapters/node/middlewares/serverStatic.js

@@ -2,7 +2,6 @@ import path from "path";
 import { fs } from "@modern-js/utils";
 import { getMimeType } from "hono/utils/mime";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-import { createErrorHtml } from "../../../utils";
 import { createPublicMiddleware } from "./serverPublic";
 function createStaticMiddleware(options) {
   const { pwd, routes } = options;
@@ -36,7 +35,7 @@ function createStaticMiddleware(options) {
     if (hit) {
       const filepath = path.join(pwd, pathname.replace(prefix, () => ""));
       if (!await fs.pathExists(filepath)) {
-        return c.html(createErrorHtml(404), 404);
+        return next();
       }
       const mimeType = getMimeType(filepath);
       if (mimeType) {

package/dist/esm-node/base/middlewares/renderHandler/render.js

@@ -1,11 +1,29 @@
 import { cutNameByHyphen } from "@modern-js/utils/universal";
+import { TrieRouter } from "hono/router/trie-router";
 import { REPLACE_REG } from "../../../base/constants";
 import { createErrorHtml, sortRoutes, parseQuery, transformResponse, getPathname, onError as onErrorFn, ErrorDigest } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
+function getRouter(routes) {
+  const sorted = routes.sort(sortRoutes);
+  const router = new TrieRouter();
+  for (const route of sorted) {
+    const { urlPath: originUrlPath } = route;
+    const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
+    router.add("*", urlPath, route);
+  }
+  return router;
+}
+function matchRoute(router, request) {
+  const pathname = getPathname(request);
+  const matched = router.match("*", pathname);
+  const result = matched[0][0];
+  return result || [];
+}
 async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, nonce, onFallback: onFallbackFn }) {
+  const router = getRouter(routes);
   return async (req, { logger, nodeReq, reporter, templates, serverManifest, locals, metrics }) => {
-    const routeInfo = matchRoute(req, routes);
+    const [routeInfo, params] = matchRoute(router, req);
     const onFallback = async (reason, error) => {
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
         logger,
@@ -46,6 +64,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, forceCSR, n
       nodeReq,
       reporter,
       serverRoutes: routes,
+      params,
       locals,
       serverManifest,
       metrics
@@ -69,7 +88,7 @@ async function renderHandler(request, options, mode, onError) {
   const serverData = {
     router: {
       baseUrl: options.routeInfo.urlPath,
-      params: {}
+      params: options.params
     }
   };
   let response;
@@ -83,17 +102,15 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  return transformResponse(response, injectServerData(serverData));
-}
-function matchRoute(req, routes) {
-  const sorted = routes.sort(sortRoutes);
-  for (const route of sorted) {
-    const pathname = getPathname(req);
-    if (pathname.startsWith(route.urlPath)) {
-      return route;
-    }
+  const newRes = transformResponse(response, injectServerData(serverData));
+  const { routeInfo } = options;
+  applyExtendHeaders(newRes, routeInfo);
+  return newRes;
+  function applyExtendHeaders(r, route) {
+    Object.entries(route.responseHeaders || {}).forEach(([k, v]) => {
+      r.headers.set(k, v);
+    });
   }
-  return void 0;
 }
 async function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
   const query = parseQuery(req);

package/dist/esm-node/base/middlewares/renderHandler/ssrRender.js

@@ -15,7 +15,7 @@ const defaultReporter = {
   reportWarn() {
   }
 };
-async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, metrics }) {
+async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics }) {
   var _serverManifest_renderBundles;
   const { entryName } = routeInfo;
   const loadableStats = serverManifest.loadableStats || {};
@@ -35,7 +35,7 @@ async function ssrRender(request, { routeInfo, html, staticGenerate, nonce, meta
   const ssrContext = {
     request: {
       baseUrl: routeInfo.urlPath,
-      params: {},
+      params,
       pathname: nodeReq ? getPathnameFromNodeReq(nodeReq) : getPathname(request),
       host,
       query,

package/dist/types/base/middlewares/renderHandler/ssrRender.d.ts

@@ -2,6 +2,7 @@
 import type { IncomingMessage } from 'http';
 import type { Logger, Metrics, Reporter, ServerRoute } from '@modern-js/types';
 import { ServerManifest } from '../../../core/server';
+export type Params = Record<string, any>;
 export interface SSRRenderOptions {
     pwd: string;
     html: string;
@@ -10,6 +11,7 @@ export interface SSRRenderOptions {
     metaName: string;
     logger: Logger;
     serverManifest: ServerManifest;
+    params: Params;
     /** Produce by custom server hook */
     locals?: Record<string, any>;
     reporter?: Reporter;
@@ -17,5 +19,5 @@ export interface SSRRenderOptions {
     nodeReq?: IncomingMessage;
     nonce?: string;
 }
-export declare function ssrRender(request: Request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, metrics, }: SSRRenderOptions): Promise<Response>;
+export declare function ssrRender(request: Request, { routeInfo, html, staticGenerate, nonce, metaName, reporter, logger, nodeReq, serverManifest, locals, params, metrics, }: SSRRenderOptions): Promise<Response>;
 export declare function getPathnameFromNodeReq(nodeReq: IncomingMessage): string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.4-alpha.1",
+  "version": "2.49.4-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -70,8 +70,8 @@
     "isbot": "3.8.0",
     "merge-deep": "^3.0.3",
     "@modern-js/runtime-utils": "2.49.3",
-    "@modern-js/utils": "2.49.3",
-    "@modern-js/plugin": "2.49.3"
+    "@modern-js/plugin": "2.49.3",
+    "@modern-js/utils": "2.49.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -81,8 +81,8 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@scripts/build": "2.49.3",
     "@modern-js/types": "2.49.3",
+    "@scripts/build": "2.49.3",
     "@scripts/jest-config": "2.49.3"
   },
   "sideEffects": false,