@finesoft/front 0.1.37 → 0.1.39

package/dist/index.cjs

@@ -395,7 +395,8 @@ var init_router = __esm({
     Router = class {
       routes = [];
       /** 添加路由规则 */
-      add(pattern, intentId, renderMode) {
+      add(pattern, intentId, renderModeOrOptions) {
+        const opts = typeof renderModeOrOptions === "string" ? { renderMode: renderModeOrOptions } : renderModeOrOptions ?? {};
         const paramNames = [];
         const regexStr = pattern.split(/(\/:[\w]+\??)/).map((segment) => {
           const paramMatch = segment.match(/^\/:(\w+)(\?)?$/);
@@ -410,7 +411,9 @@ var init_router = __esm({
           intentId,
           regex: new RegExp(`^${regexStr}/?$`),
           paramNames,
-          renderMode
+          renderMode: opts.renderMode,
+          beforeGuards: opts.beforeGuards,
+          afterGuards: opts.afterGuards
         });
         return this;
       }
@@ -432,7 +435,9 @@ var init_router = __esm({
             return {
               intent: { id: route.intentId, params },
               action: makeFlowAction(urlOrPath),
-              renderMode: route.renderMode
+              renderMode: route.renderMode,
+              beforeGuards: route.beforeGuards,
+              afterGuards: route.afterGuards
             };
           }
         }
@@ -507,6 +512,27 @@ var init_composite = __esm({
   }
 });
 
+// ../core/src/middleware/pipeline.ts
+async function runBeforeLoadGuards(guards, ctx) {
+  for (const guard of guards) {
+    const result = await guard(ctx);
+    if (result.kind !== "next") return result;
+  }
+  return { kind: "next" };
+}
+async function runAfterLoadGuards(guards, ctx) {
+  for (const guard of guards) {
+    const result = await guard(ctx);
+    if (result.kind !== "next") return result;
+  }
+  return { kind: "next" };
+}
+var init_pipeline = __esm({
+  "../core/src/middleware/pipeline.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/prefetched-intents/stable-stringify.ts
 function stableStringify(obj, _seen) {
   if (obj === null || obj === void 0) return String(obj);
@@ -589,6 +615,7 @@ var init_framework = __esm({
     init_container();
     init_make_dependencies();
     init_dispatcher2();
+    init_pipeline();
     init_prefetched_intents();
     init_router();
     Framework = class _Framework {
@@ -597,6 +624,8 @@ var init_framework = __esm({
       actionDispatcher;
       router;
       prefetchedIntents;
+      beforeGuards = [];
+      afterGuards = [];
       constructor(container, prefetchedIntents) {
         this.container = container;
         this.intentDispatcher = new IntentDispatcher();
@@ -660,6 +689,25 @@ var init_framework = __esm({
       registerIntent(controller) {
         this.intentDispatcher.register(controller);
       }
+      // ===== Navigation Middleware =====
+      /** 注册 beforeLoad 守卫（路由匹配后、数据加载前） */
+      beforeLoad(guard) {
+        this.beforeGuards.push(guard);
+      }
+      /** 注册 afterLoad 守卫（数据加载后、渲染前） */
+      afterLoad(guard) {
+        this.afterGuards.push(guard);
+      }
+      /** 执行所有 beforeLoad 守卫（全局 → 路由级） */
+      runBeforeLoad(ctx, routeGuards) {
+        const guards = routeGuards?.length ? [...this.beforeGuards, ...routeGuards] : this.beforeGuards;
+        return runBeforeLoadGuards(guards, ctx);
+      }
+      /** 执行所有 afterLoad 守卫（全局 → 路由级） */
+      runAfterLoad(ctx, routeGuards) {
+        const guards = routeGuards?.length ? [...this.afterGuards, ...routeGuards] : this.afterGuards;
+        return runAfterLoadGuards(guards, ctx);
+      }
       /** 销毁 Framework 实例 */
       dispose() {
         this.container.dispose();
@@ -823,7 +871,11 @@ function defineRoutes(framework, definitions) {
       framework.registerIntent(def.controller);
       registeredIntents.add(def.intentId);
     }
-    framework.router.add(def.path, def.intentId, def.renderMode);
+    framework.router.add(def.path, def.intentId, {
+      renderMode: def.renderMode,
+      beforeGuards: def.beforeLoad,
+      afterGuards: def.afterLoad
+    });
   }
 }
 var init_define_routes = __esm({
@@ -943,6 +995,74 @@ var init_uuid = __esm({
   }
 });
 
+// ../core/src/middleware/context.ts
+function parseCookieString(str) {
+  const map = /* @__PURE__ */ new Map();
+  if (!str) return map;
+  for (const pair of str.split(";")) {
+    const idx = pair.indexOf("=");
+    if (idx === -1) continue;
+    const key = pair.slice(0, idx).trim();
+    const val = pair.slice(idx + 1).trim();
+    if (key) map.set(key, val);
+  }
+  return map;
+}
+function createServerContext(options) {
+  const { url, intent, container, request } = options;
+  const parsed = new URL(url, "http://localhost");
+  const cookieHeader = request?.headers.get("cookie") ?? "";
+  const cookies = parseCookieString(cookieHeader);
+  return {
+    url,
+    path: parsed.pathname,
+    params: intent.params ?? {},
+    intent,
+    isServer: true,
+    container,
+    getCookie: (name) => cookies.get(name),
+    getHeader: (name) => request?.headers.get(name) ?? void 0
+  };
+}
+function createBrowserContext(options) {
+  const { url, intent, container } = options;
+  const parsed = new URL(url, window.location.origin);
+  return {
+    url,
+    path: parsed.pathname,
+    params: intent.params ?? {},
+    intent,
+    isServer: false,
+    container,
+    getCookie: (name) => parseCookieString(document.cookie).get(name),
+    getHeader: () => void 0
+  };
+}
+var init_context = __esm({
+  "../core/src/middleware/context.ts"() {
+    "use strict";
+  }
+});
+
+// ../core/src/middleware/types.ts
+function next() {
+  return { kind: "next" };
+}
+function redirect(url, status = 302) {
+  return { kind: "redirect", url, status };
+}
+function rewrite(url) {
+  return { kind: "rewrite", url };
+}
+function deny(status = 403, message = "Forbidden") {
+  return { kind: "deny", status, message };
+}
+var init_types2 = __esm({
+  "../core/src/middleware/types.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/index.ts
 var init_src = __esm({
   "../core/src/index.ts"() {
@@ -968,6 +1088,9 @@ var init_src = __esm({
     init_optional();
     init_url();
     init_uuid();
+    init_context();
+    init_pipeline();
+    init_types2();
   }
 });
 
@@ -1000,6 +1123,25 @@ async function ssrRender(options) {
     let page;
     let serverData = [];
     if (match) {
+      const navCtx = createServerContext({
+        url: fullPath,
+        intent: match.intent,
+        container: framework.container,
+        request: ssrContext?.request
+      });
+      const beforeResult = await framework.runBeforeLoad(
+        navCtx,
+        match.beforeGuards
+      );
+      if (beforeResult.kind !== "next") {
+        const earlyReturn = handleMiddlewareResult(
+          beforeResult,
+          getErrorPage,
+          renderApp,
+          framework
+        );
+        if (earlyReturn) return earlyReturn;
+      }
       try {
         page = await framework.dispatch(match.intent);
         serverData = [{ intent: match.intent, data: page }];
@@ -1010,6 +1152,23 @@ async function ssrRender(options) {
         );
         page = getErrorPage(500, "Internal error");
       }
+      const postCtx = {
+        ...navCtx,
+        page
+      };
+      const afterResult = await framework.runAfterLoad(
+        postCtx,
+        match.afterGuards
+      );
+      if (afterResult.kind !== "next") {
+        const lateReturn = handleMiddlewareResult(
+          afterResult,
+          getErrorPage,
+          renderApp,
+          framework
+        );
+        if (lateReturn) return lateReturn;
+      }
     } else {
       page = getErrorPage(404, "Page not found");
     }
@@ -1025,6 +1184,38 @@ async function ssrRender(options) {
     framework.dispose();
   }
 }
+function handleMiddlewareResult(result, getErrorPage, renderApp, framework) {
+  switch (result.kind) {
+    case "next":
+      return null;
+    case "redirect":
+      return {
+        html: "",
+        head: "",
+        css: "",
+        serverData: [],
+        redirect: { url: result.url, status: result.status }
+      };
+    case "rewrite":
+      return {
+        html: "",
+        head: "",
+        css: "",
+        serverData: [],
+        redirect: { url: result.url, status: 301 }
+      };
+    case "deny": {
+      const errorPage = getErrorPage(result.status, result.message);
+      const rendered = renderApp(errorPage, framework);
+      return {
+        html: rendered.html,
+        head: rendered.head,
+        css: rendered.css,
+        serverData: []
+      };
+    }
+  }
+}
 var init_render = __esm({
   "../ssr/src/render.ts"() {
     "use strict";
@@ -1294,17 +1485,22 @@ function createSSRApp(options) {
       const cached = isrCache.get(cacheKey);
       if (cached) return c.html(cached);
       const requestFetch = parentFetch ? createInternalFetch(parentFetch, ssrDepth + 1) : void 0;
+      const ssrContext = { request: c.req.raw };
+      if (requestFetch) ssrContext.fetch = requestFetch;
       const {
         html: appHtml,
         head,
         css,
         serverData,
-        renderMode
-      } = await render(
-        url,
-        locale,
-        requestFetch ? { fetch: requestFetch } : void 0
-      );
+        renderMode,
+        redirect: middlewareRedirect
+      } = await render(url, locale, ssrContext);
+      if (middlewareRedirect) {
+        return c.redirect(
+          middlewareRedirect.url,
+          middlewareRedirect.status
+        );
+      }
       if (renderMode === "csr") {
         return c.html(injectCSRShell(template, locale));
       }
@@ -1368,11 +1564,14 @@ __export(index_exports, {
   autoAdapter: () => autoAdapter,
   buildUrl: () => buildUrl,
   cloudflareAdapter: () => cloudflareAdapter,
+  createBrowserContext: () => createBrowserContext,
   createPrefetchedIntentsFromDom: () => createPrefetchedIntentsFromDom,
   createSSRApp: () => createSSRApp,
   createSSRRender: () => createSSRRender,
   createServer: () => createServer,
+  createServerContext: () => createServerContext,
   defineRoutes: () => defineRoutes,
+  deny: () => deny,
   deserializeServerData: () => deserializeServerData,
   detectRuntime: () => detectRuntime,
   finesoftFrontViteConfig: () => finesoftFrontViteConfig,
@@ -1391,10 +1590,12 @@ __export(index_exports, {
   makeFlowAction: () => makeFlowAction,
   mapEach: () => mapEach,
   netlifyAdapter: () => netlifyAdapter,
+  next: () => next,
   nodeAdapter: () => nodeAdapter,
   parseAcceptLanguage: () => parseAcceptLanguage,
   pipe: () => pipe,
   pipeAsync: () => pipeAsync,
+  redirect: () => redirect,
   registerActionHandlers: () => registerActionHandlers,
   registerExternalUrlHandler: () => registerExternalUrlHandler,
   registerFlowActionHandler: () => registerFlowActionHandler,
@@ -1405,6 +1606,9 @@ __export(index_exports, {
   resetFilterCache: () => resetFilterCache,
   resolveAdapter: () => resolveAdapter,
   resolveRoot: () => resolveRoot,
+  rewrite: () => rewrite,
+  runAfterLoadGuards: () => runAfterLoadGuards,
+  runBeforeLoadGuards: () => runBeforeLoadGuards,
   serializeServerData: () => serializeServerData,
   shouldLog: () => shouldLog,
   ssrRender: () => ssrRender,
@@ -1540,6 +1744,22 @@ var History = class {
       tryScroll(this.log, () => this.getScrollablePageElement(), scrollY);
     });
   }
+  /** 仅推入 URL，不缓存页面状态（用于页面加载失败场景） */
+  pushUrl(url) {
+    const id = generateUuid();
+    window.history.pushState({ id }, "", url);
+    this.currentStateId = id;
+    this.scrollTop = 0;
+    this.log.info("pushUrl (no state)", url, id);
+  }
+  /** 仅替换 URL，不缓存页面状态（用于页面加载失败场景） */
+  replaceUrl(url) {
+    const id = generateUuid();
+    window.history.replaceState({ id }, "", url);
+    this.currentStateId = id;
+    this.scrollTop = 0;
+    this.log.info("replaceUrl (no state)", url, id);
+  }
   updateState(update) {
     if (!this.currentStateId) {
       this.log.warn(
@@ -1571,31 +1791,49 @@ function registerFlowActionHandler(deps) {
   const { framework, log, callbacks, updateApp } = deps;
   let isFirstPage = true;
   let navigationId = 0;
+  const MAX_REDIRECTS = 5;
   const defaultGetScrollable = () => document.getElementById("scrollable-page-override") || document.getElementById("scrollable-page") || document.documentElement;
   const history = new History(log, {
     getScrollablePageElement: deps.getScrollablePageElement ?? defaultGetScrollable
   });
-  framework.onAction(ACTION_KINDS.FLOW, async (action) => {
-    const flowAction = action;
-    const url = flowAction.url;
-    log.debug(`FlowAction \u2192 ${url}`);
-    if (flowAction.presentationContext === "modal") {
-      const match2 = framework.routeUrl(url);
-      if (match2) {
-        const page = await framework.dispatch(
-          match2.intent
-        );
-        callbacks.onModal(page);
-      }
+  async function navigateTo(url, redirectCount, thisNav) {
+    if (redirectCount >= MAX_REDIRECTS) {
+      log.error(
+        `Navigation redirect loop detected (${MAX_REDIRECTS} redirects), stopping at: ${url}`
+      );
       return;
     }
-    const thisNav = ++navigationId;
-    const shouldReplace = isFirstPage;
+    const shouldReplace = isFirstPage || url === window.location.pathname + window.location.search;
     const match = framework.routeUrl(url);
     if (!match) {
       log.warn(`FlowAction: no route for ${url}`);
       return;
     }
+    const navCtx = createBrowserContext({
+      url,
+      intent: match.intent,
+      container: framework.container
+    });
+    const beforeResult = await framework.runBeforeLoad(
+      navCtx,
+      match.beforeGuards
+    );
+    if (beforeResult.kind === "redirect") {
+      log.debug(`beforeLoad \u2192 redirect to ${beforeResult.url}`);
+      await navigateTo(beforeResult.url, redirectCount + 1, thisNav);
+      return;
+    }
+    if (beforeResult.kind === "deny") {
+      log.warn(
+        `beforeLoad \u2192 denied (${beforeResult.status}): ${beforeResult.message}`
+      );
+      return;
+    }
+    if (beforeResult.kind === "rewrite") {
+      log.debug(`beforeLoad \u2192 rewrite to ${beforeResult.url}`);
+      await navigateTo(beforeResult.url, redirectCount + 1, thisNav);
+      return;
+    }
     const pagePromise = framework.dispatch(
       match.intent
     );
@@ -1610,26 +1848,80 @@ function registerFlowActionHandler(deps) {
     }
     history.beforeTransition();
     updateApp({
-      page: pagePromise.then((page) => {
-        if (thisNav !== navigationId) {
-          log.info("FlowAction commit superseded", url);
+      page: pagePromise.then(
+        async (page) => {
+          if (thisNav !== navigationId) {
+            log.info("FlowAction commit superseded", url);
+            return page;
+          }
+          const postCtx = {
+            ...navCtx,
+            page
+          };
+          const afterResult = await framework.runAfterLoad(
+            postCtx,
+            match.afterGuards
+          );
+          if (afterResult.kind === "redirect") {
+            log.debug(`afterLoad \u2192 redirect to ${afterResult.url}`);
+            navigateTo(afterResult.url, redirectCount + 1, thisNav);
+            return page;
+          }
+          let canonicalURL = url;
+          if (afterResult.kind === "rewrite") {
+            canonicalURL = afterResult.url;
+            log.debug(`afterLoad \u2192 rewrite URL to ${canonicalURL}`);
+          }
+          if (afterResult.kind === "deny") {
+            log.warn(`afterLoad \u2192 denied (${afterResult.status})`);
+            return page;
+          }
+          if (shouldReplace) {
+            history.replaceState({ page }, canonicalURL);
+          } else {
+            history.pushState({ page }, canonicalURL);
+          }
+          callbacks.onNavigate(
+            new URL(canonicalURL, window.location.origin).pathname
+          );
+          didEnterPage(page);
           return page;
+        },
+        (error) => {
+          if (thisNav === navigationId) {
+            const canonicalURL = url;
+            if (shouldReplace) {
+              history.replaceUrl(canonicalURL);
+            } else {
+              history.pushUrl(canonicalURL);
+            }
+            callbacks.onNavigate(
+              new URL(canonicalURL, window.location.origin).pathname
+            );
+          }
+          throw error;
         }
-        const canonicalURL = url;
-        if (shouldReplace) {
-          history.replaceState({ page }, canonicalURL);
-        } else {
-          history.pushState({ page }, canonicalURL);
-        }
-        callbacks.onNavigate(
-          new URL(canonicalURL, window.location.origin).pathname
-        );
-        didEnterPage(page);
-        return page;
-      }),
+      ),
       isFirstPage
     });
     isFirstPage = false;
+  }
+  framework.onAction(ACTION_KINDS.FLOW, async (action) => {
+    const flowAction = action;
+    const url = flowAction.url;
+    log.debug(`FlowAction \u2192 ${url}`);
+    if (flowAction.presentationContext === "modal") {
+      const match = framework.routeUrl(url);
+      if (match) {
+        const page = await framework.dispatch(
+          match.intent
+        );
+        callbacks.onModal(page);
+      }
+      return;
+    }
+    const thisNav = ++navigationId;
+    await navigateTo(url, 0, thisNav);
   });
   history.onPopState(async (url, cachedState) => {
     log.debug(`popstate \u2192 ${url}, cached=${!!cachedState}`);
@@ -1654,6 +1946,30 @@ function registerFlowActionHandler(deps) {
       });
       return;
     }
+    const navCtx = createBrowserContext({
+      url: parsed.pathname + parsed.search,
+      intent: routeMatch.intent,
+      container: framework.container
+    });
+    const beforeResult = await framework.runBeforeLoad(
+      navCtx,
+      routeMatch.beforeGuards
+    );
+    if (beforeResult.kind === "redirect") {
+      log.debug(`popstate beforeLoad \u2192 redirect to ${beforeResult.url}`);
+      const thisNav = ++navigationId;
+      await navigateTo(beforeResult.url, 0, thisNav);
+      return;
+    }
+    if (beforeResult.kind === "deny" || beforeResult.kind === "rewrite") {
+      if (beforeResult.kind === "deny") {
+        log.warn(`popstate beforeLoad \u2192 denied`);
+      } else {
+        const thisNav = ++navigationId;
+        await navigateTo(beforeResult.url, 0, thisNav);
+      }
+      return;
+    }
     const pagePromise = framework.dispatch(
       routeMatch.intent
     );
@@ -1843,7 +2159,7 @@ function _sanitizeProxyPath(raw) {
     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"';
+    const redirect2 = config.followRedirects ? '"follow"' : '"manual"';
     let authCode = "";
     if (config.auth) {
       const envKey = JSON.stringify(config.auth.envKey);
@@ -1862,7 +2178,7 @@ function _sanitizeProxyPath(raw) {
   _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 _resp = await fetch(_target.toString(), { headers: _headers, redirect: ${redirect2} });
     const _body = await _resp.text();
     const _rh = { "Content-Type": _resp.headers.get("Content-Type") || "application/json" };
     if (${cacheStr}) _rh["Cache-Control"] = ${cacheStr};
@@ -3287,11 +3603,14 @@ function finesoftFrontViteConfig(options = {}) {
   autoAdapter,
   buildUrl,
   cloudflareAdapter,
+  createBrowserContext,
   createPrefetchedIntentsFromDom,
   createSSRApp,
   createSSRRender,
   createServer,
+  createServerContext,
   defineRoutes,
+  deny,
   deserializeServerData,
   detectRuntime,
   finesoftFrontViteConfig,
@@ -3310,10 +3629,12 @@ function finesoftFrontViteConfig(options = {}) {
   makeFlowAction,
   mapEach,
   netlifyAdapter,
+  next,
   nodeAdapter,
   parseAcceptLanguage,
   pipe,
   pipeAsync,
+  redirect,
   registerActionHandlers,
   registerExternalUrlHandler,
   registerFlowActionHandler,
@@ -3324,6 +3645,9 @@ function finesoftFrontViteConfig(options = {}) {
   resetFilterCache,
   resolveAdapter,
   resolveRoot,
+  rewrite,
+  runAfterLoadGuards,
+  runBeforeLoadGuards,
   serializeServerData,
   shouldLog,
   ssrRender,