@rpcbase/client 0.310.0 → 0.312.0

package/dist/index.js

@@ -124,7 +124,9 @@ const SsrErrorFallback = ({ state, renderErrorExtra }) => {
     extra ? /* @__PURE__ */ jsx("div", { className: "mt-10 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-center", children: extra }) : null
   ] }) });
 };
+const ROUTER_DEBUG = env.RB_PUBLIC_ROUTER_DEBUG;
 const isProduction = env.MODE === "production";
+const LOADER_TIMEOUT_MS = 8e3;
 const showErrorOverlay = (err) => {
   const ErrorOverlay = customElements.get("vite-error-overlay");
   if (!ErrorOverlay) {
@@ -145,6 +147,40 @@ const handleServerErrors = () => {
     });
   }
 };
+const wrapLoaderWithTimeout = (loader, routeId) => async (...args) => new Promise((resolve, reject) => {
+  const timer = setTimeout(() => {
+    console.error("[rpcbase timeout][client loader]", { routeId, ms: LOADER_TIMEOUT_MS, url: window.location.href });
+    reject(new Response("Loader timeout", { status: 504 }));
+  }, LOADER_TIMEOUT_MS);
+  Promise.resolve(loader(...args)).then((val) => {
+    clearTimeout(timer);
+    resolve(val);
+  }).catch((err) => {
+    clearTimeout(timer);
+    reject(err);
+  });
+});
+const applyLoaderTimeouts = (routes) => {
+  routes.forEach((route) => {
+    if (route.loader) {
+      route.loader = wrapLoaderWithTimeout(route.loader, route.id);
+    }
+    if (route.lazy) {
+      const origLazy = route.lazy;
+      route.lazy = async (...lazyArgs) => {
+        const mod = await origLazy(...lazyArgs);
+        if (mod?.loader) {
+          const origLoader = mod.loader;
+          mod.loader = (...loaderArgs) => wrapLoaderWithTimeout(origLoader, route.id)(...loaderArgs);
+        }
+        return mod;
+      };
+    }
+    if (route.children) {
+      applyLoaderTimeouts(route.children);
+    }
+  });
+};
 const getRootElement = () => {
   const el = document.getElementById("root");
   if (!el) {
@@ -165,7 +201,8 @@ const hydrateSsrFallbackIfPresent = (rootElement, renderErrorExtra) => {
   return true;
 };
 const initWithRoutes = async (routesElement, opts) => {
-  const enableRouterInstrumentation = env.ROUTER_DEBUG === "1" || env.ROUTER_DEBUG === "true" || env.ROUTER_DEBUG === true;
+  const enableRouterInstrumentation = ROUTER_DEBUG === "1" || ROUTER_DEBUG === "true" || ROUTER_DEBUG === true;
+  console.log("Router instrumentation enabled:", enableRouterInstrumentation);
   const rootElement = getRootElement();
   if (hydrateSsrFallbackIfPresent(rootElement, opts?.renderErrorExtra)) {
     return;
@@ -174,6 +211,7 @@ const initWithRoutes = async (routesElement, opts) => {
   cleanupURL();
   handleServerErrors();
   const routes = createRoutesFromElements(routesElement);
+  applyLoaderTimeouts(routes);
   const router = createBrowserRouter(routes, {
     basename: "/",
     ...enableRouterInstrumentation ? {

package/dist/initWithRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initWithRoutes.d.ts","sourceRoot":"","sources":["../src/initWithRoutes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAsB,wBAAwB,EAAiB,MAAM,iBAAiB,CAAA;AAK7F,OAAO,EAGL,oBAAoB,EACrB,MAAM,iBAAiB,CAAA;AAkCxB,KAAK,qBAAqB,GAAG;IAC3B,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,SAAS,CAAA;CAC9D,CAAA;AAED,KAAK,aAAa,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAA;AA8BnE,eAAO,MAAM,cAAc,GACzB,eAAe,aAAa,EAC5B,OAAO,qBAAqB,kBA4I7B,CAAA"}
+{"version":3,"file":"initWithRoutes.d.ts","sourceRoot":"","sources":["../src/initWithRoutes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAE7C,OAAO,EAAsB,wBAAwB,EAAiB,MAAM,iBAAiB,CAAA;AAK7F,OAAO,EAGL,oBAAoB,EACrB,MAAM,iBAAiB,CAAA;AAiFxB,KAAK,qBAAqB,GAAG;IAC3B,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,SAAS,CAAA;CAC9D,CAAA;AAED,KAAK,aAAa,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAA;AA8BnE,eAAO,MAAM,cAAc,GACzB,eAAe,aAAa,EAC5B,OAAO,qBAAqB,kBA+I7B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.310.0",
+  "version": "0.312.0",
   "type": "module",
   "files": [
     "dist"