@finesoft/front 0.1.31 → 0.1.33

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,44 +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 (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);
-  framework.dispose();
-  return {
-    html: result.html,
-    head: result.head,
-    css: result.css,
-    serverData,
-    renderMode: match?.renderMode
-  };
 }
 var init_render = __esm({
   "../ssr/src/render.ts"() {
@@ -1149,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) {
@@ -1352,6 +1358,7 @@ __export(index_exports, {
   deserializeServerData: () => deserializeServerData,
   detectRuntime: () => detectRuntime,
   finesoftFrontViteConfig: () => finesoftFrontViteConfig,
+  generateProxyCode: () => generateProxyCode,
   generateUuid: () => generateUuid,
   getBaseUrl: () => getBaseUrl,
   injectCSRShell: () => injectCSRShell,
@@ -1373,6 +1380,7 @@ __export(index_exports, {
   registerActionHandlers: () => registerActionHandlers,
   registerExternalUrlHandler: () => registerExternalUrlHandler,
   registerFlowActionHandler: () => registerFlowActionHandler,
+  registerProxyRoutes: () => registerProxyRoutes,
   removeHost: () => removeHost,
   removeQueryParams: () => removeQueryParams,
   removeScheme: () => removeScheme,
@@ -1726,6 +1734,120 @@ init_src();
 // src/index.ts
 init_src2();
 
+// ../server/src/proxy.ts
+function sanitizeProxyPath(raw) {
+  if (raw.startsWith("//")) return null;
+  return raw.startsWith("/") ? raw : `/${raw}`;
+}
+function validateConfig(config) {
+  if (!config.prefix.startsWith("/")) {
+    throw new Error(
+      `[proxy] prefix must start with "/": "${config.prefix}"`
+    );
+  }
+  if (!config.target.startsWith("https://")) {
+    throw new Error(`[proxy] target must use HTTPS: "${config.target}"`);
+  }
+}
+function registerProxyRoutes(app, configs) {
+  for (const config of configs) {
+    validateConfig(config);
+    const methods = config.methods ?? ["all"];
+    const pattern = `${config.prefix}/*`;
+    const handler = async (c) => {
+      const subPath = sanitizeProxyPath(
+        c.req.path.replace(config.prefix, "")
+      );
+      if (!subPath) return c.text("Invalid path", 400);
+      const targetUrl = new URL(subPath, config.target);
+      const reqUrl = new URL(c.req.url);
+      reqUrl.searchParams.forEach(
+        (v, k) => targetUrl.searchParams.set(k, v)
+      );
+      const headers = { ...config.headers };
+      if (config.auth) {
+        const token = process.env[config.auth.envKey] ?? "";
+        if (token) {
+          headers.Authorization = config.auth.type === "bearer" ? `Bearer ${token}` : `Basic ${token}`;
+        }
+      }
+      try {
+        const resp = await fetch(targetUrl.toString(), {
+          headers,
+          redirect: config.followRedirects ? "follow" : "manual"
+        });
+        const body = await resp.text();
+        const respHeaders = {
+          "Content-Type": resp.headers.get("Content-Type") ?? "application/json"
+        };
+        if (config.cache) {
+          respHeaders["Cache-Control"] = config.cache;
+        }
+        return c.newResponse(body, resp.status, respHeaders);
+      } catch (e) {
+        console.error(`[Proxy ${config.prefix}]`, e);
+        return c.json({ error: "Proxy request failed" }, 502);
+      }
+    };
+    for (const method of methods) {
+      app[method](pattern, handler);
+    }
+  }
+}
+function generateProxyCode(configs) {
+  if (!configs || configs.length === 0) return "";
+  for (const config of configs) {
+    validateConfig(config);
+  }
+  const blocks = [];
+  blocks.push(`
+// \u2500\u2500\u2500 \u6846\u67B6\u58F0\u660E\u5F0F\u4EE3\u7406\u8DEF\u7531 \u2500\u2500\u2500
+function _sanitizeProxyPath(raw) {
+  if (raw.startsWith("//")) return null;
+  return raw.startsWith("/") ? raw : "/" + raw;
+}
+`);
+  for (const config of configs) {
+    const methods = config.methods ?? ["all"];
+    const pattern = `"${config.prefix}/*"`;
+    const headersJson = JSON.stringify(config.headers ?? {});
+    const cacheStr = config.cache ? JSON.stringify(config.cache) : "null";
+    const redirect = config.followRedirects ? '"follow"' : '"manual"';
+    let authCode = "";
+    if (config.auth) {
+      const envKey = JSON.stringify(config.auth.envKey);
+      const prefix = config.auth.type === "bearer" ? "Bearer " : "Basic ";
+      authCode = `
+  const _token = (typeof process !== "undefined" && process.env && process.env[${envKey}]) || "";
+  if (_token) _headers.Authorization = "${prefix}" + _token;`;
+    }
+    const handlerCode = `async (c) => {
+  const _sub = _sanitizeProxyPath(c.req.path.replace(${JSON.stringify(
+      config.prefix
+    )}, ""));
+  if (!_sub) return c.text("Invalid path", 400);
+  const _target = new URL(_sub, ${JSON.stringify(config.target)});
+  const _reqUrl = new URL(c.req.url);
+  _reqUrl.searchParams.forEach((v, k) => _target.searchParams.set(k, v));
+  const _headers = ${headersJson};${authCode}
+  try {
+    const _resp = await fetch(_target.toString(), { headers: _headers, redirect: ${redirect} });
+    const _body = await _resp.text();
+    const _rh = { "Content-Type": _resp.headers.get("Content-Type") || "application/json" };
+    if (${cacheStr}) _rh["Cache-Control"] = ${cacheStr};
+    return c.newResponse(_body, _resp.status, _rh);
+  } catch (_e) {
+    console.error("[Proxy ${config.prefix}]", _e);
+    return c.json({ error: "Proxy request failed" }, 502);
+  }
+}`;
+    for (const method of methods) {
+      blocks.push(`app.${method}(${pattern}, ${handlerCode});`);
+    }
+  }
+  return blocks.join("\n");
+}
+
 // ../server/src/adapters/shared.ts
 var BUILD_TOOL_EXTERNALS = [
   "vite",
@@ -1769,7 +1891,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];
@@ -1799,7 +1921,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;
     }
   }
@@ -1807,6 +1930,7 @@ function matchRenderMode(url) {
 }
 
 const app = new Hono();
+${generateProxyCode(ctx.proxies ?? [])}
 ${setupCall}
 ${opts.platformMiddleware ?? ""}
 
@@ -2359,7 +2483,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;
       }
     }
@@ -2665,6 +2790,7 @@ async function createServer(config = {}) {
     defaultLocale,
     port = Number(process.env.PORT) || 3e3,
     setup,
+    proxies,
     ssr
   } = config;
   const root = rootOverride ?? process.cwd();
@@ -2701,6 +2827,9 @@ async function createServer(config = {}) {
     });
   }
   const app = new import_hono3.Hono();
+  if (proxies?.length) {
+    registerProxyRoutes(app, proxies);
+  }
   if (setup) {
     await setup(app);
   }
@@ -2744,7 +2873,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;
     }
   }
@@ -2756,6 +2886,7 @@ function finesoftFrontViteConfig(options = {}) {
   let resolvedCommand;
   let resolvedResolve;
   let resolvedCss;
+  const CSS_EXTENSIONS = /\.(css|scss|less|sass|styl|stylus|pcss|postcss)($|\?)/;
   return {
     name: "finesoft-front",
     config(userConfig, env) {
@@ -2775,6 +2906,82 @@ function finesoftFrontViteConfig(options = {}) {
       resolvedCss = config.css;
       root = config.root;
     },
+    /**
+     * Dev 模式 CSS 内联 — 消除 SSR 首屏布局抖动
+     *
+     * Vite dev 模式下，global.scss 等非组件 CSS 通过 JS 模块系统异步加载，
+     * 导致 SSR HTML 初次渲染缺少布局关键样式（box-sizing、flex 布局、padding-top 等）。
+     *
+     * 此 hook 在 HTML 模板变换阶段（SSR 渲染之前）：
+     * 1. 找到浏览器入口脚本（排除 /@vite/client 等内部脚本）
+     * 2. 编译入口脚本，填充 Vite 模块图
+     * 3. 遍历模块图收集所有 CSS 依赖（排除 .svelte 组件 CSS，由 SSR 渲染自行处理）
+     * 4. 通过 ssrLoadModule 获取编译后 CSS（SCSS→CSS）
+     * 5. 注入 <style data-vite-dev-id> 标签到 <head>
+     *
+     * data-vite-dev-id 确保 Vite HMR 客户端复用已有标签，避免重复注入。
+     */
+    transformIndexHtml: {
+      order: "pre",
+      async handler(html, ctx) {
+        const server = ctx.server;
+        if (!server) return;
+        const urlPath = (ctx.originalUrl || ctx.path || "").split(
+          "?"
+        )[0];
+        if (/\.\w+$/.test(urlPath) && !urlPath.endsWith(".html")) {
+          return;
+        }
+        const scripts = [
+          ...html.matchAll(
+            /<script\b[^>]*\bsrc=["']([^"']+)["'][^>]*>/g
+          )
+        ];
+        const appEntry = scripts.find((m) => !m[1].startsWith("/@"));
+        if (!appEntry) return;
+        const browserEntry = appEntry[1];
+        try {
+          await server.transformRequest(browserEntry);
+        } catch {
+          return;
+        }
+        const cssUrls = [];
+        const visited = /* @__PURE__ */ new Set();
+        function walk(mod) {
+          if (!mod?.url || visited.has(mod.url)) return;
+          visited.add(mod.url);
+          if (CSS_EXTENSIONS.test(mod.url) && !mod.url.includes(".svelte")) {
+            cssUrls.push(mod.url);
+          }
+          if (mod.importedModules) {
+            for (const imported of mod.importedModules) {
+              walk(imported);
+            }
+          }
+        }
+        const mg = server.moduleGraph;
+        const browserMod = await mg.getModuleByUrl(browserEntry);
+        if (browserMod) walk(browserMod);
+        if (cssUrls.length === 0) return;
+        const tags = [];
+        for (const url of cssUrls) {
+          try {
+            const mod = await server.ssrLoadModule(url);
+            const css = mod?.default;
+            if (typeof css === "string" && css.length > 0) {
+              tags.push({
+                tag: "style",
+                attrs: { "data-vite-dev-id": url },
+                children: css,
+                injectTo: "head"
+              });
+            }
+          } catch {
+          }
+        }
+        return tags;
+      }
+    },
     // ─── Dev ───────────────────────────────────────────────
     configureServer(server) {
       return async () => {
@@ -2788,6 +2995,9 @@ function finesoftFrontViteConfig(options = {}) {
           "@hono/node-server"
         );
         const app = new HonoClass();
+        if (options.proxies?.length) {
+          registerProxyRoutes(app, options.proxies);
+        }
         if (typeof options.setup === "function") {
           await options.setup(app);
         } else if (typeof options.setup === "string") {
@@ -2838,6 +3048,9 @@ function finesoftFrontViteConfig(options = {}) {
         );
         const app = new HonoClass();
         const isrCache = /* @__PURE__ */ new Map();
+        if (options.proxies?.length) {
+          registerProxyRoutes(app, options.proxies);
+        }
         if (typeof options.setup === "function") {
           await options.setup(app);
         } else if (typeof options.setup === "string") {
@@ -2992,6 +3205,7 @@ function finesoftFrontViteConfig(options = {}) {
             defaultLocale,
             templateHtml,
             renderModes: options.renderModes,
+            proxies: options.proxies,
             resolvedResolve,
             resolvedCss,
             vite,
@@ -3049,6 +3263,7 @@ function finesoftFrontViteConfig(options = {}) {
   deserializeServerData,
   detectRuntime,
   finesoftFrontViteConfig,
+  generateProxyCode,
   generateUuid,
   getBaseUrl,
   injectCSRShell,
@@ -3070,6 +3285,7 @@ function finesoftFrontViteConfig(options = {}) {
   registerActionHandlers,
   registerExternalUrlHandler,
   registerFlowActionHandler,
+  registerProxyRoutes,
   removeHost,
   removeQueryParams,
   removeScheme,