@rpcbase/server 0.462.0 → 0.463.0

package/dist/applyRouteLoaders.d.ts

@@ -1,4 +1,9 @@
 import { Request } from 'express';
 import { StaticHandlerContext } from '../../router/src';
-export declare function applyRouteLoaders(req: Request, dataRoutes: any[]): Promise<StaticHandlerContext>;
+export type RouterContextWithRedirect = StaticHandlerContext & {
+    redirectResponse?: Response;
+    redirectRouteId?: string | null;
+    redirectRoutePath?: string | null;
+};
+export declare function applyRouteLoaders(req: Request, dataRoutes: any[]): Promise<RouterContextWithRedirect>;
 //# sourceMappingURL=applyRouteLoaders.d.ts.map

package/dist/applyRouteLoaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAA;AAqExB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAsI/B"}
+{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,iBAAiB,CAAA;AAuFxB,MAAM,MAAM,yBAAyB,GAAG,oBAAoB,GAAG;IAC7D,gBAAgB,CAAC,EAAE,QAAQ,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAA;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,yBAAyB,CAAC,CA6KpC"}

package/dist/index.js

@@ -3615,6 +3615,15 @@ const getErrorStatus = (error) => {
   if (typeof candidate?.response?.status === "number") return candidate.response.status;
   return void 0;
 };
+const isResponseLike = (value) => {
+  return Boolean(
+    value && typeof value === "object" && typeof value.status === "number" && value.headers && typeof value.headers.get === "function"
+  );
+};
+const isRedirectResponse = (value) => {
+  if (!isResponseLike(value)) return false;
+  return value.status >= 300 && value.status < 400 && Boolean(value.headers.get("Location"));
+};
 async function applyRouteLoaders(req, dataRoutes) {
   const baseUrl = `${req.protocol}://${req.get("host")}`;
   const url = new URL(req.originalUrl, baseUrl);
@@ -3659,8 +3668,12 @@ async function applyRouteLoaders(req, dataRoutes) {
       timeoutId = setTimeout(() => {
         const err = new Error(`Loader timeout after ${LOADER_TIMEOUT_MS}ms`);
         err.status = 504;
-        console.error("[rpcbase timeout][server loader]", { routeId: route.id, ms: LOADER_TIMEOUT_MS, url: req.originalUrl });
-        reject({ id: route.id, reason: err });
+        console.error("[rpcbase timeout][server loader]", {
+          routeId: route.id,
+          ms: LOADER_TIMEOUT_MS,
+          url: req.originalUrl
+        });
+        reject({ id: route.id, path: route.path, reason: err });
       }, LOADER_TIMEOUT_MS);
     });
     const loaderPromise = (async () => {
@@ -3669,9 +3682,9 @@ async function applyRouteLoaders(req, dataRoutes) {
           params,
           ctx: { req }
         });
-        return { id: route.id, data };
+        return { id: route.id, path: route.path, data };
       } catch (error) {
-        throw { id: route.id, reason: error };
+        throw { id: route.id, path: route.path, reason: error };
       } finally {
         if (timeoutId) {
           clearTimeout(timeoutId);
@@ -3687,15 +3700,33 @@ async function applyRouteLoaders(req, dataRoutes) {
   let errors = null;
   let hasNotFoundError = false;
   let hasNonNotFoundError = false;
+  let redirectResponse = null;
+  let redirectRouteId = null;
+  let redirectRoutePath = null;
   for (const result of loaderPromisesResults) {
     if (result.status === "fulfilled") {
       if (result.value) {
-        loaderData[result.value.id] = result.value.data;
+        if (isRedirectResponse(result.value.data)) {
+          redirectResponse = result.value.data;
+          redirectRouteId = result.value.id;
+          redirectRoutePath = result.value.path ?? null;
+        } else {
+          loaderData[result.value.id] = result.value.data;
+        }
       }
     } else if (result.status === "rejected") {
       const id = result.reason?.id;
       if (!id) {
-        throw new Error(`missing route ID in error: ${result.reason}`);
+        throw new Error(
+          `missing route ID in error: ${result.reason}`
+        );
+      }
+      const reasonCandidate = result.reason?.reason ?? result.reason;
+      if (isRedirectResponse(reasonCandidate)) {
+        redirectResponse = reasonCandidate;
+        redirectRouteId = id;
+        redirectRoutePath = result.reason?.path ?? null;
+        continue;
       }
       if (!errors) {
         errors = {};
@@ -3709,6 +3740,19 @@ async function applyRouteLoaders(req, dataRoutes) {
       errors[id] = result.reason;
     }
   }
+  if (redirectResponse) {
+    return {
+      ...baseContext,
+      matches,
+      loaderData,
+      actionData: null,
+      errors: null,
+      statusCode: redirectResponse.status,
+      redirectResponse,
+      redirectRouteId,
+      redirectRoutePath
+    };
+  }
   let statusCode = 200;
   if (errors) {
     if (hasNonNotFoundError) {
@@ -3729,19 +3773,46 @@ async function applyRouteLoaders(req, dataRoutes) {
   };
 }
 async function renderSSR(req, dataRoutes) {
-  let routerContext;
-  try {
-    routerContext = await applyRouteLoaders(req, dataRoutes);
-  } catch (err) {
-    console.log(err);
-    throw err;
+  const routerContext = await applyRouteLoaders(req, dataRoutes);
+  const isMatched = routerContext.matches.length > 0;
+  if (routerContext.redirectResponse) {
+    return {
+      element: null,
+      isMatched,
+      statusCode: routerContext.statusCode ?? routerContext.redirectResponse.status ?? 302,
+      redirectResponse: routerContext.redirectResponse,
+      redirectRouteId: routerContext.redirectRouteId,
+      redirectRoutePath: routerContext.redirectRoutePath
+    };
   }
   if (routerContext.errors) {
     if (routerContext.statusCode === 404) {
-      console.warn(`SSR 404 ${req.method} ${req.originalUrl}`, { errors: routerContext.errors });
+      console.warn(`SSR 404 ${req.method} ${req.originalUrl}`, {
+        errors: routerContext.errors
+      });
     } else {
-      console.error(`SSR ${routerContext.statusCode || 500} ${req.method} ${req.originalUrl}`, routerContext.errors);
-      const error = new Error("SSR loader error");
+      const matchesSummary = routerContext.matches?.map((m) => ({
+        routeId: m.route.id,
+        routePath: m.route.path,
+        pathname: m.pathname,
+        pathnameBase: m.pathnameBase
+      }));
+      console.error(
+        `SSR ${routerContext.statusCode || 500} ${req.method} ${req.originalUrl}`,
+        {
+          errors: routerContext.errors,
+          matches: matchesSummary
+        }
+      );
+      const errorEntries = Object.entries(routerContext.errors || {});
+      const firstErrorEntry = errorEntries[0]?.[1];
+      const firstReason = firstErrorEntry?.reason ?? firstErrorEntry;
+      if (errorEntries.length === 1 && firstReason instanceof Error) {
+        firstReason.details = routerContext.errors;
+        throw firstReason;
+      }
+      const extra = firstErrorEntry?.id ? ` (route ${firstErrorEntry.id}${firstErrorEntry?.path ? ` ${firstErrorEntry.path}` : ""})` : "";
+      const error = new Error(`SSR loader error${extra}`);
       error.details = routerContext.errors;
       throw error;
     }
@@ -3754,8 +3825,11 @@ async function renderSSR(req, dataRoutes) {
       context: routerContext
     }
   ) });
-  const isMatched = routerContext.matches.length > 0;
-  return { element, isMatched, statusCode: routerContext.statusCode ?? (routerContext.errors ? 500 : 200) };
+  return {
+    element,
+    isMatched,
+    statusCode: routerContext.statusCode ?? (routerContext.errors ? 500 : 200)
+  };
 }
 const ABORT_DELAY_MS = 1e4;
 const APP_HTML_PLACEHOLDER = "<!--app-html-->";
@@ -3764,6 +3838,33 @@ const FALLBACK_ERROR_TEMPLATE_START = `<!doctype html><html lang="en"><head><met
 const FALLBACK_ERROR_TEMPLATE_END = "</main></body></html>";
 const isProduction = env.NODE_ENV === "production";
 const templateHtml = isProduction ? readFileSync("./build/dist/client/src/client/index.html", "utf-8") : "";
+const handleRedirectionResponse = (res, redirectResponse, location) => {
+  res.status(redirectResponse.status || 302);
+  try {
+    const headers = redirectResponse.headers;
+    const setCookies = headers.getSetCookie?.();
+    const fallbackSetCookies = [];
+    for (const [key, value] of headers) {
+      if (key.toLowerCase() === "set-cookie") {
+        if (!setCookies?.length) {
+          fallbackSetCookies.push(value);
+        }
+        continue;
+      }
+      res.setHeader(key, value);
+    }
+    if (setCookies?.length) {
+      res.setHeader("Set-Cookie", setCookies);
+    } else if (fallbackSetCookies.length === 1) {
+      res.setHeader("Set-Cookie", fallbackSetCookies[0]);
+    } else if (fallbackSetCookies.length > 1) {
+      res.setHeader("Set-Cookie", fallbackSetCookies);
+    }
+  } catch {
+  }
+  if (location) res.setHeader("Location", location);
+  res.end();
+};
 const formatErrorDetails = (error) => {
   if (isProduction) return void 0;
   if (!error) return void 0;
@@ -3874,7 +3975,32 @@ const ssrMiddleware = ({
       htmlStart = templateStart;
     }
     htmlEnd = template.slice(placeholderIndex + APP_HTML_PLACEHOLDER.length);
-    const { element, isMatched, statusCode } = await renderSSR(req, dataRoutes);
+    const {
+      element,
+      isMatched,
+      statusCode,
+      redirectResponse,
+      redirectRouteId,
+      redirectRoutePath
+    } = await renderSSR(req, dataRoutes);
+    if (redirectResponse) {
+      if (!responseCommitted) {
+        const location = redirectResponse.headers?.get?.("Location");
+        if (!isProduction) {
+          console.info("SSR redirect", {
+            method: req.method,
+            url: req.originalUrl,
+            status: redirectResponse.status,
+            location,
+            routeId: redirectRouteId ?? void 0,
+            routePath: redirectRoutePath ?? void 0
+          });
+        }
+        responseCommitted = true;
+        handleRedirectionResponse(res, redirectResponse, location);
+      }
+      return;
+    }
     if (!isMatched) {
       next();
       return;

package/dist/renderSSR.d.ts

@@ -2,8 +2,11 @@ import { ReactNode } from 'react';
 import { StaticHandler } from '../../router/src';
 import * as express from "express";
 export declare function renderSSR(req: express.Request, dataRoutes: StaticHandler["dataRoutes"]): Promise<{
-    element: ReactNode;
+    element: ReactNode | null;
     isMatched: boolean;
     statusCode: number;
+    redirectResponse?: Response;
+    redirectRouteId?: string | null;
+    redirectRoutePath?: string | null;
 }>;
 //# sourceMappingURL=renderSSR.d.ts.map

package/dist/renderSSR.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAC,CAAC,CAuCvE"}
+{"version":3,"file":"renderSSR.d.ts","sourceRoot":"","sources":["../src/renderSSR.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAC7C,OAAO,EAGL,aAAa,EACd,MAAM,iBAAiB,CAAA;AAOxB,wBAAsB,SAAS,CAC7B,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,GACtC,OAAO,CAAC;IACT,OAAO,EAAE,SAAS,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,CAAC,EAAE,QAAQ,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAClC,CAAC,CAwED"}

package/dist/ssrMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssrMiddleware.d.ts","sourceRoot":"","sources":["../src/ssrMiddleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACjI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAErE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAM3C,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC;AAwF9D,eAAO,MAAM,aAAa,GAAI,kFAM3B;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAC;QAAE,KAAK,CAAC,EAAE,oBAAoB,CAAA;KAAE,CAAC,CAAC;IACtE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B,MAAW,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA8I1D,CAAA"}
+{"version":3,"file":"ssrMiddleware.d.ts","sourceRoot":"","sources":["../src/ssrMiddleware.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AACjI,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,OAAO,CAAA;AAErE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAM3C,KAAK,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC;AAkI9D,eAAO,MAAM,aAAa,GAAI,kFAM3B;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACxC,mBAAmB,CAAC,EAAE,aAAa,CAAC;QAAE,KAAK,CAAC,EAAE,oBAAoB,CAAA;KAAE,CAAC,CAAC;IACtE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/E,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B,MAAW,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBA0K1D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.462.0",
+  "version": "0.463.0",
   "type": "module",
   "files": [
     "dist"