@rpcbase/server 0.448.0 → 0.449.0

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;AAoExB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAqH/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;AAqExB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAsI/B"}

package/dist/index.js

@@ -363,6 +363,7 @@ function getShortCircuitMatches(routes) {
   };
 }
 const NOT_FOUND_STATUS = 404;
+const LOADER_TIMEOUT_MS = 4e3;
 const getErrorStatus = (error) => {
   if (!error) return void 0;
   const candidate = error?.reason ?? error;
@@ -408,22 +409,36 @@ async function applyRouteLoaders(req, dataRoutes) {
       statusCode: 200
     };
   }
-  const loaderPromisesResults = await Promise.allSettled(
-    matches.map(async (match) => {
-      const { route, params } = match;
-      if (!route.loader) return null;
+  const runLoaderWithTimeout = async (route, params) => {
+    if (!route.loader) return null;
+    let timeoutId;
+    const timeoutPromise = new Promise((_, reject) => {
+      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 });
+      }, LOADER_TIMEOUT_MS);
+    });
+    const loaderPromise = (async () => {
       try {
-        return {
-          id: route.id,
-          data: await route.loader({
-            params,
-            ctx: { req }
-          })
-        };
+        const data = await route.loader({
+          params,
+          ctx: { req }
+        });
+        return { id: route.id, data };
       } catch (error) {
         throw { id: route.id, reason: error };
+      } finally {
+        if (timeoutId) {
+          clearTimeout(timeoutId);
+        }
       }
-    })
+    })();
+    return Promise.race([loaderPromise, timeoutPromise]);
+  };
+  const loaderPromisesResults = await Promise.allSettled(
+    matches.map((match) => runLoaderWithTimeout(match.route, match.params))
   );
   const loaderData = {};
   let errors = null;

package/package.json

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