@finesoft/front 0.1.30 → 0.1.32

package/dist/index.cjs

@@ -397,13 +397,14 @@ var init_router = __esm({
       /** 添加路由规则 */
       add(pattern, intentId, renderMode) {
         const paramNames = [];
-        const regexStr = pattern.replace(
-          /\/:([\w]+)(\?)?/g,
-          (_, name, optional) => {
-            paramNames.push(name);
-            return optional ? "(?:/([^/]+))?" : "/([^/]+)";
+        const regexStr = pattern.split(/(\/:[\w]+\??)/).map((segment) => {
+          const paramMatch = segment.match(/^\/:(\w+)(\?)?$/);
+          if (paramMatch) {
+            paramNames.push(paramMatch[1]);
+            return paramMatch[2] ? "(?:/([^/]+))?" : "/([^/]+)";
           }
-        );
+          return segment.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+        }).join("");
         this.routes.push({
           pattern,
           intentId,
@@ -507,15 +508,18 @@ var init_composite = __esm({
 });
 
 // ../core/src/prefetched-intents/stable-stringify.ts
-function stableStringify(obj) {
+function stableStringify(obj, _seen) {
   if (obj === null || obj === void 0) return String(obj);
   if (typeof obj !== "object") return JSON.stringify(obj);
+  const seen = _seen ?? /* @__PURE__ */ new Set();
+  if (seen.has(obj)) return '"[Circular]"';
+  seen.add(obj);
   if (Array.isArray(obj)) {
-    return "[" + obj.map(stableStringify).join(",") + "]";
+    return "[" + obj.map((v) => stableStringify(v, seen)).join(",") + "]";
   }
   const keys = Object.keys(obj).sort();
   const parts = keys.filter((k) => obj[k] !== void 0).map(
-    (k) => JSON.stringify(k) + ":" + stableStringify(obj[k])
+    (k) => JSON.stringify(k) + ":" + stableStringify(obj[k], seen)
   );
   return "{" + parts.join(",") + "}";
 }
@@ -980,40 +984,46 @@ async function ssrRender(options) {
   const mergedConfig = ssrContext?.fetch ? { ...frameworkConfig, fetch: ssrContext.fetch } : frameworkConfig;
   const framework = Framework.create(mergedConfig);
   bootstrap(framework);
-  const parsed = new URL(url, "http://localhost");
-  const fullPath = parsed.pathname + parsed.search;
-  const match = framework.routeUrl(fullPath);
-  if (match?.renderMode === "csr") {
-    framework.dispose();
+  try {
+    const parsed = new URL(url, "http://localhost");
+    const fullPath = parsed.pathname + parsed.search;
+    const match = framework.routeUrl(fullPath);
+    if (match?.renderMode === "csr") {
+      return {
+        html: "",
+        head: "",
+        css: "",
+        serverData: [],
+        renderMode: "csr"
+      };
+    }
+    let page;
+    let serverData = [];
+    if (match) {
+      try {
+        page = await framework.dispatch(match.intent);
+        serverData = [{ intent: match.intent, data: page }];
+      } catch (e) {
+        console.error(
+          `[SSR] dispatch failed for intent "${match.intent.id}":`,
+          e
+        );
+        page = getErrorPage(500, "Internal error");
+      }
+    } else {
+      page = getErrorPage(404, "Page not found");
+    }
+    const result = renderApp(page, framework);
     return {
-      html: "",
-      head: "",
-      css: "",
-      serverData: [],
-      renderMode: "csr"
+      html: result.html,
+      head: result.head,
+      css: result.css,
+      serverData,
+      renderMode: match?.renderMode
     };
+  } finally {
+    framework.dispose();
   }
-  let page;
-  let serverData = [];
-  if (match) {
-    try {
-      page = await framework.dispatch(match.intent);
-      serverData = [{ intent: match.intent, data: page }];
-    } catch {
-      page = getErrorPage(500, "Internal error");
-    }
-  } else {
-    page = getErrorPage(404, "Page not found");
-  }
-  const result = renderApp(page, framework);
-  framework.dispose();
-  return {
-    html: result.html,
-    head: result.head,
-    css: result.css,
-    serverData,
-    renderMode: match?.renderMode
-  };
 }
 var init_render = __esm({
   "../ssr/src/render.ts"() {
@@ -1113,32 +1123,22 @@ var init_src2 = __esm({
 });
 
 // ../server/src/internal-fetch.ts
-function createInternalFetch(appFetch) {
-  let depth = 0;
+function createInternalFetch(appFetch, depth = 1) {
   return ((input, init) => {
     if (typeof input === "string" && input.startsWith("/")) {
-      if (depth >= MAX_INTERNAL_FETCH_DEPTH) {
-        return Promise.resolve(
-          new Response("Internal fetch loop detected", {
-            status: 508
-          })
-        );
-      }
-      depth++;
-      return Promise.resolve(
-        appFetch(new Request(`http://localhost${input}`, init))
-      ).finally(() => {
-        depth--;
-      });
+      const request = new Request(`http://localhost${input}`, init);
+      request.headers.set(SSR_DEPTH_HEADER, String(depth));
+      return Promise.resolve(appFetch(request));
     }
     return globalThis.fetch(input, init);
   });
 }
-var MAX_INTERNAL_FETCH_DEPTH;
+var SSR_DEPTH_HEADER, MAX_SSR_DEPTH;
 var init_internal_fetch = __esm({
   "../server/src/internal-fetch.ts"() {
     "use strict";
-    MAX_INTERNAL_FETCH_DEPTH = 5;
+    SSR_DEPTH_HEADER = "x-ssr-depth";
+    MAX_SSR_DEPTH = 5;
   }
 });
 
@@ -1155,7 +1155,7 @@ function parseAcceptLanguage(header, supported, fallback) {
     const [lang, q] = part.trim().split(";q=");
     return {
       lang: lang.trim().toLowerCase(),
-      q: q ? parseFloat(q) : 1
+      q: q ? parseFloat(q) || 0 : 1
     };
   }).sort((a, b) => b.q - a.q);
   for (const { lang } of langs) {
@@ -1189,7 +1189,6 @@ function createSSRApp(options) {
     parentFetch
   } = options;
   const app = new import_hono.Hono();
-  const internalFetch = parentFetch ? createInternalFetch(parentFetch) : void 0;
   const ISR_CACHE_MAX = 1e3;
   const isrCache = /* @__PURE__ */ new Map();
   function isrSet(key, val) {
@@ -1199,6 +1198,7 @@ function createSSRApp(options) {
     }
     isrCache.set(key, val);
   }
+  let templateCache;
   async function readTemplate(url) {
     if (!isProduction && vite) {
       const { readFileSync: readFileSync2 } = await import(
@@ -1212,11 +1212,13 @@ function createSSRApp(options) {
       const raw = readFileSync2(resolve2(root, "index.html"), "utf-8");
       return vite.transformIndexHtml(url, raw);
     }
+    if (templateCache) return templateCache;
     const isDeno = typeof globalThis.Deno !== "undefined";
     if (isDeno) {
-      return globalThis.Deno.readTextFileSync(
+      templateCache = globalThis.Deno.readTextFileSync(
         new URL("../dist/client/index.html", import_meta.url)
       );
+      return templateCache;
     }
     const { readFileSync } = await import(
       /* @vite-ignore */
@@ -1226,7 +1228,11 @@ function createSSRApp(options) {
       /* @vite-ignore */
       "path"
     );
-    return readFileSync(resolve(root, "dist/client/index.html"), "utf-8");
+    templateCache = readFileSync(
+      resolve(root, "dist/client/index.html"),
+      "utf-8"
+    );
+    return templateCache;
   }
   async function loadSSRModule() {
     if (!isProduction && vite) {
@@ -1253,11 +1259,12 @@ function createSSRApp(options) {
     );
   }
   app.get("*", async (c) => {
+    const ssrDepth = parseInt(c.req.header(SSR_DEPTH_HEADER) ?? "0", 10);
+    if (ssrDepth >= MAX_SSR_DEPTH) {
+      return c.text("SSR recursion loop detected", 508);
+    }
     const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
     try {
-      const cacheKey = url;
-      const cached = isrCache.get(cacheKey);
-      if (cached) return c.html(cached);
       const template = await readTemplate(url);
       const { render, serializeServerData: serializeServerData2 } = await loadSSRModule();
       const locale = parseAcceptLanguage(
@@ -1265,6 +1272,10 @@ function createSSRApp(options) {
         supportedLocales,
         defaultLocale
       );
+      const cacheKey = `${locale}:${url}`;
+      const cached = isrCache.get(cacheKey);
+      if (cached) return c.html(cached);
+      const requestFetch = parentFetch ? createInternalFetch(parentFetch, ssrDepth + 1) : void 0;
       const {
         html: appHtml,
         head,
@@ -1274,7 +1285,7 @@ function createSSRApp(options) {
       } = await render(
         url,
         locale,
-        internalFetch ? { fetch: internalFetch } : void 0
+        requestFetch ? { fetch: requestFetch } : void 0
       );
       if (renderMode === "csr") {
         return c.html(injectCSRShell(template, locale));
@@ -1764,7 +1775,7 @@ function parseAcceptLanguage(header) {
   if (!header) return DEFAULT_LOCALE;
   const langs = header.split(",").map(p => {
     const [l, q] = p.trim().split(";q=");
-    return { l: l.trim().toLowerCase(), q: q ? +q : 1 };
+    return { l: l.trim().toLowerCase(), q: q ? (+q || 0) : 1 };
   }).sort((a, b) => b.q - a.q);
   for (const { l } of langs) {
     const prefix = l.split("-")[0];
@@ -1794,7 +1805,8 @@ function matchRenderMode(url) {
   if (RENDER_MODES[path]) return RENDER_MODES[path];
   for (const [pattern, mode] of Object.entries(RENDER_MODES)) {
     if (pattern.includes("*")) {
-      const re = new RegExp("^" + pattern.replace(/\\*/g, ".*") + "$");
+      const escaped = pattern.replace(/[.+?^\${}()|[\\]\\\\]/g, "\\\\$&");
+      const re = new RegExp("^" + escaped.replace(/\\*/g, ".*") + "$");
       if (re.test(path)) return mode;
     }
   }
@@ -1806,20 +1818,28 @@ ${setupCall}
 ${opts.platformMiddleware ?? ""}
 
 // \u5185\u90E8 fetch \u56DE\u73AF\uFF1ASSR \u63A7\u5236\u5668\u7684 fetch \u8BF7\u6C42\u76F4\u63A5\u8D70 Hono \u5185\u5B58\u8DEF\u7531
-// \u53EA\u62E6\u622A\u76F8\u5BF9\u8DEF\u5F84\uFF08/api/* \u7B49\uFF09\uFF0C\u7EDD\u5BF9 URL \u8D70\u6B63\u5E38\u7F51\u7EDC\uFF1B\u542B\u9012\u5F52\u4FDD\u62A4
-let _fetchDepth = 0;
-function _internalFetch(input, init) {
-  if (typeof input === "string" && input.startsWith("/")) {
-    if (_fetchDepth >= 5) {
-      return Promise.resolve(new Response("Internal fetch loop detected", { status: 508 }));
+// \u6DF1\u5EA6\u901A\u8FC7\u8BF7\u6C42\u5934\u4F20\u9012\uFF0C\u5E76\u53D1\u5B89\u5168\u4E14\u80FD\u8DE8\u6E32\u67D3\u6B63\u786E\u8FFD\u8E2A\u9012\u5F52
+const _SSR_DEPTH_HEADER = "x-ssr-depth";
+const _MAX_SSR_DEPTH = 5;
+
+function _createInternalFetch(depth) {
+  return function(input, init) {
+    if (typeof input === "string" && input.startsWith("/")) {
+      const req = new Request("http://localhost" + input, init);
+      req.headers.set(_SSR_DEPTH_HEADER, String(depth));
+      return app.fetch(req);
     }
-    _fetchDepth++;
-    return app.fetch(new Request("http://localhost" + input, init)).finally(() => { _fetchDepth--; });
-  }
-  return globalThis.fetch(input, init);
+    return globalThis.fetch(input, init);
+  };
 }
 
 app.get("*", async (c) => {
+  // \u9012\u5F52\u6DF1\u5EA6\u4FDD\u62A4\uFF1A\u4ECE\u8BF7\u6C42\u5934\u8BFB\u53D6 SSR \u6DF1\u5EA6
+  const _ssrDepth = parseInt(c.req.header(_SSR_DEPTH_HEADER) || "0", 10);
+  if (_ssrDepth >= _MAX_SSR_DEPTH) {
+    return c.text("SSR recursion loop detected", 508);
+  }
+
   const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
   try {
     const locale = parseAcceptLanguage(c.req.header("accept-language"));
@@ -1830,11 +1850,12 @@ app.get("*", async (c) => {
       return c.html(injectCSRShell(TEMPLATE, locale));
     }
 
-    // ISR \u7F13\u5B58\u547D\u4E2D
-    const cached = await platformCacheGet(url);
+    // ISR \u7F13\u5B58\u547D\u4E2D\uFF08key \u542B locale\uFF0C\u907F\u514D\u8DE8\u8BED\u8A00\u7F13\u5B58\u6C61\u67D3\uFF09
+    const _cacheKey = locale + ":" + url;
+    const cached = await platformCacheGet(_cacheKey);
     if (cached) return c.html(cached);
 
-    const { html: appHtml, head, css, serverData, renderMode } = await render(url, locale, { fetch: _internalFetch });
+    const { html: appHtml, head, css, serverData, renderMode } = await render(url, locale, { fetch: _createInternalFetch(_ssrDepth + 1) });
 
     // \u8DEF\u7531\u7EA7 CSR
     if (renderMode === "csr") {
@@ -1846,7 +1867,7 @@ app.get("*", async (c) => {
 
     // Prerender ISR \u7F13\u5B58\uFF08\u5305\u62EC Vite \u914D\u7F6E\u8986\u76D6\u548C\u8DEF\u7531\u7EA7\uFF09
     if (renderMode === "prerender" || overrideMode === "prerender") {
-      await platformCacheSet(url, finalHtml);
+      await platformCacheSet(_cacheKey, finalHtml);
       ${opts.platformPrerenderResponseHook ?? ""}
     }
 
@@ -2345,7 +2366,8 @@ function resolveRenderMode(routePath, routeRenderMode, renderModes) {
     if (renderModes[routePath]) return renderModes[routePath];
     for (const [pattern, mode] of Object.entries(renderModes)) {
       if (pattern.includes("*")) {
-        const re = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
+        const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+        const re = new RegExp("^" + escaped.replace(/\*/g, ".*") + "$");
         if (re.test(routePath)) return mode;
       }
     }
@@ -2730,7 +2752,8 @@ function matchRenderModeConfig(url, renderModes) {
   if (renderModes[path]) return renderModes[path];
   for (const [pattern, mode] of Object.entries(renderModes)) {
     if (pattern.includes("*")) {
-      const re = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
+      const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+      const re = new RegExp("^" + escaped.replace(/\*/g, ".*") + "$");
       if (re.test(path)) return mode;
     }
   }
@@ -2855,6 +2878,13 @@ function finesoftFrontViteConfig(options = {}) {
           ssrPath
         );
         app.get("*", async (c) => {
+          const ssrDepth = parseInt(
+            c.req.header(SSR_DEPTH_HEADER) ?? "0",
+            10
+          );
+          if (ssrDepth >= MAX_SSR_DEPTH) {
+            return c.text("SSR recursion loop detected", 508);
+          }
           const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
           try {
             const locale = parseAcceptLanguage2(
@@ -2869,7 +2899,8 @@ function finesoftFrontViteConfig(options = {}) {
             if (overrideMode === "csr") {
               return c.html(injectCSRShell2(template, locale));
             }
-            const cached = isrCache.get(url);
+            const cacheKey = `${locale}:${url}`;
+            const cached = isrCache.get(cacheKey);
             if (cached) return c.html(cached);
             const {
               html: appHtml,
@@ -2878,7 +2909,10 @@ function finesoftFrontViteConfig(options = {}) {
               serverData,
               renderMode
             } = await ssrModule.render(url, locale, {
-              fetch: createInternalFetch(app.fetch.bind(app))
+              fetch: createInternalFetch(
+                app.fetch.bind(app),
+                ssrDepth + 1
+              )
             });
             if (renderMode === "csr") {
               return c.html(injectCSRShell2(template, locale));
@@ -2893,7 +2927,7 @@ function finesoftFrontViteConfig(options = {}) {
               serializedData
             });
             if (renderMode === "prerender" || overrideMode === "prerender") {
-              isrCache.set(url, finalHtml);
+              isrCache.set(cacheKey, finalHtml);
             }
             return c.html(finalHtml);
           } catch (e) {