Refactor SSR strategy. Redirect before bundling any page component. Additional bugfixes for dev environment

src/functions/server/web-pages/grab-page-component.tsx

@@ -6,6 +6,7 @@ import { log } from "../../../utils/log";
 import grabPageModules from "./grab-page-modules";
 import grabPageCombinedServerRes from "./grab-page-combined-server-res";
 import fullRebuild from "../full-rebuild";
+import serverPostBuildFn from "../server-post-build-fn";
 
 class NotFoundError extends Error {
     status = 404;
@@ -28,7 +29,7 @@ type Params = {
 
 export default async function grabPageComponent(
     params: Params,
-): Promise<GrabPageComponentRes> {
+): Promise<GrabPageComponentRes | Response> {
     const {
         req,
         file_path: passed_file_path,
@@ -77,7 +78,6 @@ export default async function grabPageComponent(
         const bundledMap = global.BUNDLER_CTX_MAP[file_path];
 
         if (!bundledMap?.path) {
-            console.log(global.BUNDLER_CTX_MAP);
             const errMsg = `No Bundled File Path for this request path!`;
             log.error(errMsg);
             throw new Error(errMsg);
@@ -103,17 +103,20 @@ export default async function grabPageComponent(
             return { serverRes };
         }
 
-        const { component, module, serverRes, root_module } =
-            await grabPageModules({
-                file_path,
-                debug,
-                query: match?.query,
-                routeParams,
-                url,
-                skip_server_res,
-            });
+        const page_modules = await grabPageModules({
+            file_path,
+            debug,
+            query: match?.query,
+            routeParams,
+            url,
+            skip_server_res,
+        });
 
-        global.IS_404_PAGE = false;
+        if (page_modules instanceof Response) {
+            return page_modules;
+        }
+
+        const { component, module, serverRes, root_module } = page_modules;
 
         return {
             component,
@@ -141,8 +144,12 @@ export default async function grabPageComponent(
                     retry: true,
                 });
 
-                if (component_retried.success) {
+                if (
+                    component_retried instanceof Response ||
+                    component_retried.success
+                ) {
                     global.REBUILD_RETRIES = 0;
+                    await serverPostBuildFn();
                     return component_retried;
                 }
             }

src/functions/server/web-pages/grab-page-error-component.tsx

@@ -20,7 +20,7 @@ export default async function grabPageErrorComponent({
     routeParams,
     is404,
     url,
-}: Params): Promise<GrabPageComponentRes> {
+}: Params): Promise<GrabPageComponentRes | Response> {
     const router = global.ROUTER;
 
     const { BUNX_ROOT_500_PRESET_COMPONENT, BUNX_ROOT_404_PRESET_COMPONENT } =
@@ -61,13 +61,18 @@ export default async function grabPageErrorComponent({
 
         const bundledMap = global.BUNDLER_CTX_MAP?.[file_path];
 
-        const { component, module, serverRes, root_module } =
-            await grabPageModules({
-                file_path: file_path,
-                query: match?.query,
-                routeParams,
-                url,
-            });
+        const page_component = await grabPageModules({
+            file_path: file_path,
+            query: match?.query,
+            routeParams,
+            url,
+        });
+
+        if (page_component instanceof Response) {
+            return page_component;
+        }
+
+        const { component, module, serverRes, root_module } = page_component;
 
         return {
             component,

src/functions/server/web-pages/grab-page-modules.tsx

@@ -1,5 +1,6 @@
 import type {
     BunextPageModule,
+    BunextPageModuleServerReturn,
     BunextRootModule,
     BunxRouteParams,
 } from "../../../types";
@@ -8,6 +9,7 @@ import _ from "lodash";
 import { log } from "../../../utils/log";
 import grabRootFilePath from "./grab-root-file-path";
 import grabPageCombinedServerRes from "./grab-page-combined-server-res";
+import type { FC } from "react";
 
 type Params = {
     file_path: string;
@@ -18,6 +20,13 @@ type Params = {
     skip_server_res?: boolean;
 };
 
+type Return = {
+    component: FC;
+    serverRes: BunextPageModuleServerReturn | undefined;
+    module: BunextPageModule;
+    root_module: BunextPageModule | undefined;
+};
+
 export default async function grabPageModules({
     file_path,
     debug,
@@ -25,9 +34,28 @@ export default async function grabPageModules({
     query,
     routeParams,
     skip_server_res,
-}: Params) {
+}: Params): Promise<Return | Response> {
     const now = Date.now();
 
+    const { serverRes } = skip_server_res
+        ? {}
+        : await grabPageCombinedServerRes({
+              file_path,
+              debug,
+              query,
+              routeParams,
+              url,
+          });
+
+    if (serverRes?.redirect?.destination) {
+        return Response.redirect(
+            serverRes.redirect.destination,
+            serverRes.redirect.permanent
+                ? 301
+                : serverRes.redirect.status_code || 302,
+        );
+    }
+
     const { root_file_path } = grabRootFilePath();
     const root_module: BunextRootModule | undefined = root_file_path
         ? await import(`${root_file_path}?t=${now}`)
@@ -39,16 +67,6 @@ export default async function grabPageModules({
         log.info(`module:`, module);
     }
 
-    const { serverRes } = skip_server_res
-        ? {}
-        : await grabPageCombinedServerRes({
-              file_path,
-              debug,
-              query,
-              routeParams,
-              url,
-          });
-
     const { component } =
         (await grabPageBundledReactComponent({
             file_path,

src/functions/server/web-pages/handle-web-pages.tsx

@@ -35,6 +35,10 @@ export default async function handleWebPages({
             req,
         });
 
+        if (componentRes instanceof Response) {
+            return componentRes;
+        }
+
         return await generateWebPageResponseFromComponentReturn({
             ...componentRes,
         });
@@ -45,6 +49,10 @@ export default async function handleWebPages({
             error,
         });
 
+        if (componentRes instanceof Response) {
+            return componentRes;
+        }
+
         return await generateWebPageResponseFromComponentReturn(componentRes);
     }
 }