@finesoft/front 0.1.27 → 0.1.29

package/dist/index.d.cts

@@ -24,6 +24,13 @@ interface SSRRenderOptions {
     getErrorPage: (status: number, message: string) => BasePage;
     /** 应用层渲染函数（如 Svelte SSR render） */
     renderApp: (page: BasePage, framework: Framework) => SSRAppResult;
+    /** 可选的 SSR 请求上下文（如自定义 fetch） */
+    ssrContext?: SSRContext;
+}
+/** SSR 请求级上下文 */
+interface SSRContext {
+    /** 自定义 fetch（如 Hono 内部路由回环） */
+    fetch?: typeof globalThis.fetch;
 }
 interface SSRAppResult {
     html: string;
@@ -67,9 +74,9 @@ interface SSRRenderConfig {
 /**
  * 创建 render 函数
  *
- * @returns `render(url, locale)` — 供 @finesoft/server SSRModule 使用
+ * @returns `render(url, locale, ssrContext?)` — 供 @finesoft/server SSRModule 使用
  */
-declare function createSSRRender(config: SSRRenderConfig): (url: string, locale: string) => Promise<SSRRenderResult>;
+declare function createSSRRender(config: SSRRenderConfig): (url: string, locale: string, ssrContext?: SSRContext) => Promise<SSRRenderResult>;
 
 /**
  * injectSSRContent — 将 SSR 渲染结果注入 HTML 模板
@@ -292,7 +299,9 @@ declare function vercelAdapter(): Adapter;
  */
 
 interface SSRModule {
-    render: (url: string, locale: string) => Promise<{
+    render: (url: string, locale: string, ssrContext?: {
+        fetch?: typeof globalThis.fetch;
+    }) => Promise<{
         html: string;
         head: string;
         css: string;
@@ -316,6 +325,12 @@ interface SSRAppOptions {
     supportedLocales?: string[];
     /** 默认语言 */
     defaultLocale?: string;
+    /**
+     * 父级 Hono app 的 fetch 函数，用于 SSR 内部路由回环。
+     * SSR 渲染时，控制器的 fetch 请求（如 /api/apple/*）会通过此函数
+     * 直接在进程内路由到代理 handler，避免网络自请求死锁。
+     */
+    parentFetch?: (request: Request) => Promise<Response>;
 }
 declare function createSSRApp(options: SSRAppOptions): Hono;
 
@@ -478,4 +493,4 @@ declare function finesoftFrontViteConfig(options?: FinesoftFrontViteOptions): {
     closeBundle(): Promise<void>;
 };
 
-export { type Adapter, type AdapterContext, BasePage, type FinesoftFrontViteOptions, Framework, FrameworkConfig, type InjectSSROptions, PrefetchedIntent, type RuntimeInfo, type SSRAppOptions, type SSRModule, type SSRRenderConfig, type SSRRenderOptions, type SSRRenderResult, SSR_PLACEHOLDERS, type ServerConfig, type ServerInstance, type StartServerOptions, autoAdapter, cloudflareAdapter, createSSRApp, createSSRRender, createServer, detectRuntime, finesoftFrontViteConfig, injectCSRShell, injectSSRContent, netlifyAdapter, nodeAdapter, parseAcceptLanguage, resolveAdapter, resolveRoot, serializeServerData, ssrRender, startServer, staticAdapter, vercelAdapter };
+export { type Adapter, type AdapterContext, BasePage, type FinesoftFrontViteOptions, Framework, FrameworkConfig, type InjectSSROptions, PrefetchedIntent, type RuntimeInfo, type SSRAppOptions, type SSRContext, type SSRModule, type SSRRenderConfig, type SSRRenderOptions, type SSRRenderResult, SSR_PLACEHOLDERS, type ServerConfig, type ServerInstance, type StartServerOptions, autoAdapter, cloudflareAdapter, createSSRApp, createSSRRender, createServer, detectRuntime, finesoftFrontViteConfig, injectCSRShell, injectSSRContent, netlifyAdapter, nodeAdapter, parseAcceptLanguage, resolveAdapter, resolveRoot, serializeServerData, ssrRender, startServer, staticAdapter, vercelAdapter };

package/dist/index.d.ts

@@ -24,6 +24,13 @@ interface SSRRenderOptions {
     getErrorPage: (status: number, message: string) => BasePage;
     /** 应用层渲染函数（如 Svelte SSR render） */
     renderApp: (page: BasePage, framework: Framework) => SSRAppResult;
+    /** 可选的 SSR 请求上下文（如自定义 fetch） */
+    ssrContext?: SSRContext;
+}
+/** SSR 请求级上下文 */
+interface SSRContext {
+    /** 自定义 fetch（如 Hono 内部路由回环） */
+    fetch?: typeof globalThis.fetch;
 }
 interface SSRAppResult {
     html: string;
@@ -67,9 +74,9 @@ interface SSRRenderConfig {
 /**
  * 创建 render 函数
  *
- * @returns `render(url, locale)` — 供 @finesoft/server SSRModule 使用
+ * @returns `render(url, locale, ssrContext?)` — 供 @finesoft/server SSRModule 使用
  */
-declare function createSSRRender(config: SSRRenderConfig): (url: string, locale: string) => Promise<SSRRenderResult>;
+declare function createSSRRender(config: SSRRenderConfig): (url: string, locale: string, ssrContext?: SSRContext) => Promise<SSRRenderResult>;
 
 /**
  * injectSSRContent — 将 SSR 渲染结果注入 HTML 模板
@@ -292,7 +299,9 @@ declare function vercelAdapter(): Adapter;
  */
 
 interface SSRModule {
-    render: (url: string, locale: string) => Promise<{
+    render: (url: string, locale: string, ssrContext?: {
+        fetch?: typeof globalThis.fetch;
+    }) => Promise<{
         html: string;
         head: string;
         css: string;
@@ -316,6 +325,12 @@ interface SSRAppOptions {
     supportedLocales?: string[];
     /** 默认语言 */
     defaultLocale?: string;
+    /**
+     * 父级 Hono app 的 fetch 函数，用于 SSR 内部路由回环。
+     * SSR 渲染时，控制器的 fetch 请求（如 /api/apple/*）会通过此函数
+     * 直接在进程内路由到代理 handler，避免网络自请求死锁。
+     */
+    parentFetch?: (request: Request) => Promise<Response>;
 }
 declare function createSSRApp(options: SSRAppOptions): Hono;
 
@@ -478,4 +493,4 @@ declare function finesoftFrontViteConfig(options?: FinesoftFrontViteOptions): {
     closeBundle(): Promise<void>;
 };
 
-export { type Adapter, type AdapterContext, BasePage, type FinesoftFrontViteOptions, Framework, FrameworkConfig, type InjectSSROptions, PrefetchedIntent, type RuntimeInfo, type SSRAppOptions, type SSRModule, type SSRRenderConfig, type SSRRenderOptions, type SSRRenderResult, SSR_PLACEHOLDERS, type ServerConfig, type ServerInstance, type StartServerOptions, autoAdapter, cloudflareAdapter, createSSRApp, createSSRRender, createServer, detectRuntime, finesoftFrontViteConfig, injectCSRShell, injectSSRContent, netlifyAdapter, nodeAdapter, parseAcceptLanguage, resolveAdapter, resolveRoot, serializeServerData, ssrRender, startServer, staticAdapter, vercelAdapter };
+export { type Adapter, type AdapterContext, BasePage, type FinesoftFrontViteOptions, Framework, FrameworkConfig, type InjectSSROptions, PrefetchedIntent, type RuntimeInfo, type SSRAppOptions, type SSRContext, type SSRModule, type SSRRenderConfig, type SSRRenderOptions, type SSRRenderResult, SSR_PLACEHOLDERS, type ServerConfig, type ServerInstance, type StartServerOptions, autoAdapter, cloudflareAdapter, createSSRApp, createSSRRender, createServer, detectRuntime, finesoftFrontViteConfig, injectCSRShell, injectSSRContent, netlifyAdapter, nodeAdapter, parseAcceptLanguage, resolveAdapter, resolveRoot, serializeServerData, ssrRender, startServer, staticAdapter, vercelAdapter };

package/dist/index.js

@@ -9,8 +9,9 @@ import {
   tryScroll
 } from "./chunk-H3RNYNSD.js";
 import {
+  createInternalFetch,
   createSSRApp
-} from "./chunk-IITKGRCO.js";
+} from "./chunk-WD72JAMS.js";
 import {
   SSR_PLACEHOLDERS,
   createSSRRender,
@@ -18,7 +19,7 @@ import {
   injectSSRContent,
   serializeServerData,
   ssrRender
-} from "./chunk-5ZECBECP.js";
+} from "./chunk-N4AEOYUR.js";
 import {
   ACTION_KINDS,
   ActionDispatcher,
@@ -147,6 +148,20 @@ const app = new Hono();
 ${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 }));
+    }
+    _fetchDepth++;
+    return app.fetch(new Request("http://localhost" + input, init)).finally(() => { _fetchDepth--; });
+  }
+  return globalThis.fetch(input, init);
+}
+
 app.get("*", async (c) => {
   const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
   try {
@@ -162,7 +177,7 @@ app.get("*", async (c) => {
     const cached = await platformCacheGet(url);
     if (cached) return c.html(cached);
 
-    const { html: appHtml, head, css, serverData, renderMode } = await render(url, locale);
+    const { html: appHtml, head, css, serverData, renderMode } = await render(url, locale, { fetch: _internalFetch });
 
     // \u8DEF\u7531\u7EA7 CSR
     if (renderMode === "csr") {
@@ -691,14 +706,31 @@ function vercelAdapter() {
       fs.rmSync(outputDir, { recursive: true, force: true });
       const entrySource = generateSSREntry(ctx, {
         platformImport: `import { getRequestListener } from "@hono/node-server";`,
-        platformExport: `export default getRequestListener(app.fetch);`
+        platformExport: [
+          `const _listener = getRequestListener(app.fetch);`,
+          `export default (req, res) => {`,
+          `  const m = req.headers["x-now-route-matches"];`,
+          `  if (typeof m === "string") {`,
+          `    try {`,
+          `      const p = new URLSearchParams(m);`,
+          `      const c = p.get("1");`,
+          `      if (c != null) {`,
+          `        const qi = (req.url || "").indexOf("?");`,
+          `        const qs = qi !== -1 ? req.url.slice(qi) : "";`,
+          `        req.url = "/" + decodeURIComponent(c) + qs;`,
+          `      }`,
+          `    } catch {}`,
+          `  }`,
+          `  return _listener(req, res);`,
+          `};`
+        ].join("\n")
       });
       const tempEntry = path.resolve(root, ".vercel-entry.tmp.mjs");
       fs.writeFileSync(tempEntry, entrySource);
       try {
         const funcDir = path.resolve(
           root,
-          ".vercel/output/functions/[[...path]].func"
+          ".vercel/output/functions/ssr.func"
         );
         await buildBundle(ctx, {
           entry: ".vercel-entry.tmp.mjs",
@@ -728,7 +760,7 @@ function vercelAdapter() {
               version: 3,
               routes: [
                 { handle: "filesystem" },
-                { src: "/(.*)", dest: "/functions/[[...path]]" }
+                { src: "/(.*)", dest: "/ssr" }
               ]
             },
             null,
@@ -1003,6 +1035,7 @@ async function createServer(config = {}) {
     isProduction: runtime.isProduction,
     supportedLocales: locales,
     defaultLocale,
+    parentFetch: app.fetch.bind(app),
     ...ssr
   });
   app.route("/", ssrApp);
@@ -1070,7 +1103,7 @@ function finesoftFrontViteConfig(options = {}) {
           /* @vite-ignore */
           "hono"
         );
-        const { createSSRApp: createSSRApp2 } = await import("./app-BPO26FAD.js");
+        const { createSSRApp: createSSRApp2 } = await import("./app-QERC5VUP.js");
         const { getRequestListener } = await import(
           /* @vite-ignore */
           "@hono/node-server"
@@ -1089,7 +1122,8 @@ function finesoftFrontViteConfig(options = {}) {
           isProduction: false,
           ssrEntryPath: "/" + ssrEntry,
           supportedLocales: options.locales,
-          defaultLocale: options.defaultLocale
+          defaultLocale: options.defaultLocale,
+          parentFetch: app.fetch.bind(app)
         });
         app.route("/", ssrApp);
         const listener = getRequestListener(app.fetch);
@@ -1119,7 +1153,7 @@ function finesoftFrontViteConfig(options = {}) {
         );
         const { injectSSRContent: injectSSRContent2, injectCSRShell: injectCSRShell2 } = await import(
           /* @vite-ignore */
-          "./src-KUWACLPD.js"
+          "./src-LYKZSLF7.js"
         );
         const { parseAcceptLanguage: parseAcceptLanguage2 } = await import("./locale-YK3THSI6.js");
         const { getRequestListener } = await import(
@@ -1181,7 +1215,9 @@ function finesoftFrontViteConfig(options = {}) {
               css,
               serverData,
               renderMode
-            } = await ssrModule.render(url, locale);
+            } = await ssrModule.render(url, locale, {
+              fetch: createInternalFetch(app.fetch.bind(app))
+            });
             if (renderMode === "csr") {
               return c.html(injectCSRShell2(template, locale));
             }