one 1.12.2 → 1.12.4

package/dist/cjs/serve.native.js

@@ -47,38 +47,99 @@ process.on("uncaughtException", function (err) {
 async function serve() {
   var args = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   if (args.cluster) {
-    var cluster = await import("cluster"),
-      {
-        cpus
-      } = await import("os");
-    if (cluster.default.isPrimary) {
-      var numWorkers = typeof args.cluster == "number" ? args.cluster : cpus().length;
-      console.info(`[one] cluster: starting ${numWorkers} workers`);
-      for (var i = 0; i < numWorkers; i++) cluster.default.fork();
-      var recentCrashes = 0,
-        lastCrashTime = 0;
-      cluster.default.on("exit", function (worker, code, signal) {
-        if (!(code === 0 || signal === "SIGTERM" || signal === "SIGINT")) {
-          var now = Date.now();
-          now - lastCrashTime < 5e3 ? recentCrashes++ : recentCrashes = 1, lastCrashTime = now, recentCrashes > numWorkers * 2 && (console.error("[one] too many worker crashes, stopping"), process.exit(1)), console.error(`[one] worker ${worker.process.pid} died (code ${code}, signal ${signal}), restarting`), setTimeout(function () {
-            return cluster.default.fork();
-          }, Math.min(recentCrashes * 500, 5e3));
-        }
-      });
-      var shutdown = function () {
-        for (var id in cluster.default.workers) {
-          var _cluster_default_workers_id;
-          (_cluster_default_workers_id = cluster.default.workers[id]) === null || _cluster_default_workers_id === void 0 || _cluster_default_workers_id.process.kill("SIGTERM");
-        }
-        setTimeout(function () {
-          return process.exit(0);
-        }, 5e3);
-      };
-      process.on("SIGINT", shutdown), process.on("SIGTERM", shutdown);
-      return;
+    var {
+        cpus,
+        platform
+      } = await import("os"),
+      numWorkers = typeof args.cluster == "number" ? args.cluster : cpus().length,
+      [major, minor] = process.versions.node.split(".").map(Number),
+      canReusePort = !["win32", "darwin"].includes(platform()) && (major > 22 || major === 22 && minor >= 12 || major >= 23);
+    return canReusePort ? await serveWithReusePort(args, numWorkers) : await serveWithCluster(args, numWorkers);
+  }
+  return await startWorker(args);
+}
+async function serveWithReusePort(args, numWorkers) {
+  var {
+    fork
+  } = await import("child_process");
+  console.info(`[one] cluster: starting ${numWorkers} workers (SO_REUSEPORT)`);
+  var workers = [],
+    recentCrashes = 0,
+    lastCrashTime = 0;
+  function spawnWorker() {
+    var child = fork(process.argv[1], process.argv.slice(2).filter(function (a) {
+      return !a.startsWith("--cluster");
+    }), {
+      env: {
+        ...process.env,
+        ONE_CLUSTER_WORKER: "1"
+      },
+      stdio: "inherit"
+    });
+    workers.push(child), child.on("exit", function (code, signal) {
+      var idx = workers.indexOf(child);
+      if (idx >= 0 && workers.splice(idx, 1), !(code === 0 || signal === "SIGTERM" || signal === "SIGINT")) {
+        var now = Date.now();
+        now - lastCrashTime < 5e3 ? recentCrashes++ : recentCrashes = 1, lastCrashTime = now, recentCrashes > numWorkers * 2 && (console.error("[one] too many worker crashes, stopping"), process.exit(1)), console.error(`[one] worker ${child.pid} died (code ${code}, signal ${signal}), restarting`), setTimeout(spawnWorker, Math.min(recentCrashes * 500, 5e3));
+      }
+    });
+  }
+  for (var i = 0; i < numWorkers; i++) spawnWorker();
+  var shutdown = function () {
+    var _iteratorNormalCompletion = !0,
+      _didIteratorError = !1,
+      _iteratorError = void 0;
+    try {
+      for (var _iterator = workers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+        var w = _step.value;
+        w.kill("SIGTERM");
+      }
+    } catch (err) {
+      _didIteratorError = !0, _iteratorError = err;
+    } finally {
+      try {
+        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+      } finally {
+        if (_didIteratorError) throw _iteratorError;
+      }
     }
+    setTimeout(function () {
+      return process.exit(0);
+    }, 5e3);
+  };
+  process.on("SIGINT", shutdown), process.on("SIGTERM", shutdown), await new Promise(function () {});
+}
+async function serveWithCluster(args, numWorkers) {
+  var cluster = await import("cluster");
+  if (cluster.default.isPrimary) {
+    console.info(`[one] cluster: starting ${numWorkers} workers (IPC)`);
+    for (var i = 0; i < numWorkers; i++) cluster.default.fork();
+    var recentCrashes = 0,
+      lastCrashTime = 0;
+    cluster.default.on("exit", function (worker, code, signal) {
+      if (!(code === 0 || signal === "SIGTERM" || signal === "SIGINT")) {
+        var now = Date.now();
+        now - lastCrashTime < 5e3 ? recentCrashes++ : recentCrashes = 1, lastCrashTime = now, recentCrashes > numWorkers * 2 && (console.error("[one] too many worker crashes, stopping"), process.exit(1)), console.error(`[one] worker ${worker.process.pid} died (code ${code}, signal ${signal}), restarting`), setTimeout(function () {
+          return cluster.default.fork();
+        }, Math.min(recentCrashes * 500, 5e3));
+      }
+    });
+    var shutdown = function () {
+      for (var id in cluster.default.workers) {
+        var _cluster_default_workers_id;
+        (_cluster_default_workers_id = cluster.default.workers[id]) === null || _cluster_default_workers_id === void 0 || _cluster_default_workers_id.process.kill("SIGTERM");
+      }
+      setTimeout(function () {
+        return process.exit(0);
+      }, 5e3);
+    };
+    process.on("SIGINT", shutdown), process.on("SIGTERM", shutdown);
+    return;
   }
-  var outDir = args.outDir || (import_fs_extra.default.existsSync("buildInfo.json") ? "." : null) || "dist",
+  return await startWorker(args);
+}
+async function startWorker(args) {
+  var outDir = args?.outDir || (import_fs_extra.default.existsSync("buildInfo.json") ? "." : null) || "dist",
     buildInfo = await import_fs_extra.default.readJSON(`${outDir}/buildInfo.json`),
     {
       oneOptions
@@ -98,14 +159,14 @@ async function serve() {
     {
       oneServe
     } = await import("./server/oneServe");
-  return labelProcess("serve"), args.loadEnv && (await loadEnv("production")), await vxrnServe({
+  return labelProcess("serve"), args?.loadEnv && (await loadEnv("production")), await vxrnServe({
     outDir: buildInfo.outDir || outDir,
-    app: args.app,
+    app: args?.app,
     ...oneOptions.server,
     ...removeUndefined({
-      port: args.port ? +args.port : void 0,
-      host: args.host,
-      compress: args.compress
+      port: args?.port ? +args.port : void 0,
+      host: args?.host,
+      compress: args?.compress
     }),
     async beforeRegisterRoutes(options, app) {
       await oneServe(oneOptions, buildInfo, app, {

package/dist/cjs/serve.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","serve_exports","__export","serve","module","exports","import_polyfills_server","require","import_fs_extra","__toESM","import_setServerGlobals","import_setupBuildOptions","import_ensureExists","process","on","err","console","error","stack","args","arguments","length","cluster","cpus","default","isPrimary","numWorkers","info","i","fork","recentCrashes","lastCrashTime","worker","code","signal","now","Date","exit","pid","setTimeout","Math","min","shutdown","id","workers","_cluster_default_workers_id","kill","outDir","existsSync","buildInfo","readJSON","oneOptions","setServerGlobals","setupBuildInfo","ensureExists","labelProcess","removeUndefined","loadEnv","vxrnServe","serveStaticAssets","oneServe","app","server","port","host","compress"],"sources":["../../src/serve.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA;AAAAC,QAAA,CAAAD,aAAA;EAAAE,KAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAOK,aAAA;AAUP,IAAAK,uBAAW,GAAAC,OAAsB,+BAAQ;EAAAC,eAAA,GAAAC,OAAA,CAAAF,OAAA;EAAAG,uBAAA,GAAAH,OAAA;EAAAI,wBAAA,GAAAJ,OAAA;EAAAK,mBAAA,GAAAL,OAAA;AACvCM,OAAA,CAAAC,EAAQ,oBAAM,YAAAC,GAA4B;EAC3CC,OAAA,CAAAC,KAAA,6BAAAF,GAAA,EAAAG,KAAA,IAAAH,GAAA;AAED;AAQE,eAASZ,KAASA,CAAA;EAChB,IAAAgB,IAAM,GAAAC,SAAU,CAAAC,MAAM,IAAO,IAAAD,SAAA,CAAc,OACnC,KAAK,IAAIA,SAAM,EAAO;EAE9B,IAAAD,IAAI,CAAAG,OAAQ;IACV,IAAAA,OAAM,eAAa,UAAY;MAAA;QAAAC;MAAY,UAAW,MAAK;IAE3D,IAAAD,OAAQ,CAAAE,OAAK,CAAAC,SAAA;MAEb,IAAAC,UAAa,GAAG,OAAIP,IAAA,CAAAG,OAAY,eAAAH,IAAA,CAAAG,OAAA,GAAAC,IAAA,GAAAF,MAAA;MAC9BL,OAAA,CAAAW,IAAQ,4BAAaD,UAAA;MAIvB,KAAI,IAAAE,CAAA,MAAAA,CAAA,GAAgBF,UAChB,EAAAE,CAAA,IAEJN,OAAQ,CAAAE,OAAQ,CAAAK,IAAG;MACjB,IAAAC,aAAa,GAAK;QAAAC,aAAW;MAE7BT,OAAA,CAAME,OAAM,CAAAV,EAAA,CAAK,MAAI,YAAAkB,MAAA,EAAAC,IAAA,EAAAC,MAAA;QACjB,MAAMD,IAAA,UAAAC,MAAgB,KACxB,aAAAA,MAEA,aAAgB,GAElB;UAQE,IAAAC,GAAA,GAAAC,IAAA,CAAAD,GAAgB;UAClBA,GACA,GAAAJ,aAAiB,SAAQD,aAAa,EAAG,GAAAA,aAAS,MAAAC,aAA0B,GAAAI,GAAA,EAAAL,aAAA,GAAAJ,UAAA,SAAAV,OAAA,CAAAC,KAAA,6CAAAJ,OAAA,CAAAwB,IAAA,MAAArB,OAAA,CAAAC,KAAA,iBAAAe,MAAA,CAAAnB,OAAA,CAAAyB,GAAA,eAAAL,IAAA,YAAAC,MAAA,kBAAAK,UAAA;YAC7E,OAAAjB,OAAA,CAAAE,OAAA,CAAAK,IAAA;UAED,GAAMW,IAAA,CAAAC,GAAA,CAAAX,aAAiB;QACrB;MACE;MAEF,IAAAY,QAAA,GAAW,SAAAA,CAAA,EAAM;QACnB,SAAAC,EAAA,IAAArB,OAAA,CAAAE,OAAA,CAAAoB,OAAA;UACA,IAAQC,2BACR;UAEA,CAAAA,2BAAA,GAAAvB,OAAA,CAAAE,OAAA,CAAAoB,OAAA,CAAAD,EAAA,eAAAE,2BAAA,eAAAA,2BAAA,CAAAhC,OAAA,CAAAiC,IAAA;QACF;QACFP,UAAA;UAGM,OACJ1B,OAAK,CAAAwB,IAAA;QAIP;MAIA;MAKAxB,OAAA,CAAAC,EAAA,SAAa,EAAA4B,QAET,GAAK7B,OAAA,CAAAC,EACP,UAAM,EAAA4B,QAAQ;MAId;IACA;EAAU;EACI,IACdK,MAAG,GAAA5B,IAAA,CAAA4B,MAAgB,KAAAvC,eAAA,CAAAgB,OAAA,CAAAwB,UAAA;IAAAC,SAAA,SAAAzC,eAAA,CAAAgB,OAAA,CAAA0B,QAAA,IAAAH,MAAA;IAAA;MAAAI;IAAA,IAAAF,SAAA;EAAA,IACjBvC,uBAAmB,CAAK0C,gBAAO,SAAAzC,wBAAA,CAAA0C,cAAA,EAAAJ,SAAA,OAAArC,mBAAA,CAAA0C,YAAA,EAAAH,UAAA;EAAA,IAC/B;MAAAI;IAAW;IAAA;MAAAC;IAAA;IAAA;MAAAC,OAAA;MAAAtD,KAAA,EAAAuD,SAAA;MAAAC;IAAA;IAAA;MAAAC;IAAA;EAAA,OACXL,YAAe,WAAApC,IAAA,CAAAsC,OAAA,WAAAA,OAAA,uBAAAC,SAAA;IACjBX,MAAC,EAAAE,SAAA,CAAAF,MAAA,IAAAA,MAAA;IAEDc,GAAA,EAAA1C,IAAM,CAAA0C,GAAA;IACJ,GAAAV,UAAM,CAAAW,MAAS;IACjB,GAAAN,eAAA;MAEAO,IAAM,EAAA5C,IAAA,CAAA4C,IAAA,IAAA5C,IAAA,CAAoB4C,IAAA,QAAS;MAAMC,IAAA,EAAA7C,IAAA,CAAA6C,IAAA;MAC1CC,QAAA,EAAA9C,IAAA,CAAA8C;IACH","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","serve_exports","__export","serve","module","exports","import_polyfills_server","require","import_fs_extra","__toESM","import_setServerGlobals","import_setupBuildOptions","import_ensureExists","process","on","err","console","error","stack","args","arguments","length","cluster","cpus","platform","numWorkers","major","minor","versions","node","split","map","Number","canReusePort","includes","serveWithReusePort","serveWithCluster","startWorker","fork","info","workers","recentCrashes","lastCrashTime","spawnWorker","child","argv","slice","filter","a","startsWith","env","ONE_CLUSTER_WORKER","stdio","push","code","signal","idx","indexOf","splice","now","Date","exit","pid","setTimeout","Math","min","i","shutdown","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","w","kill","return","Promise","default","isPrimary","worker","id","_cluster_default_workers_id"],"sources":["../../src/serve.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/server/oneServe.cjs

@@ -68,6 +68,9 @@ async function oneServe(oneOptions, buildInfo, app, options) {
     {
       isStatusRedirect
     } = await import("../utils/isStatus"),
+    {
+      withRequestContext
+    } = await import("../vite/resolveResponse"),
     isAPIRequest = /* @__PURE__ */new WeakMap(),
     redirects = oneOptions.web?.redirects;
   if (redirects) for (const redirect of redirects) app.get(redirect.source, context => {
@@ -101,6 +104,14 @@ async function oneServe(oneOptions, buildInfo, app, options) {
       root: "."
     },
     apiCJS = oneOptions.build?.api?.outputFormat === "cjs",
+    useStreaming = !process.env.ONE_BUFFERED_SSR,
+    htmlHeaders = {
+      "content-type": "text/html"
+    },
+    ssrHtmlHeaders = {
+      "content-type": "text/html",
+      "cache-control": "no-cache"
+    },
     loaderCache = /* @__PURE__ */new Map(),
     moduleImportCache = /* @__PURE__ */new Map(),
     loaderCacheFnMap = /* @__PURE__ */new Map(),
@@ -249,14 +260,23 @@ async function oneServe(oneOptions, buildInfo, app, options) {
   `)}`);
           try {
             const layoutRoutes = route.layouts || [],
-              layoutLoaderPromises = layoutRoutes.map(layout => {
-                const serverPath = layout.loaderServerPath || layout.contextKey;
-                return importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps);
-              }),
-              pageLoaderPromise = importAndRunLoader(route.file, buildInfo2.serverJsPath, route.file, loaderProps);
+              layoutLoaderPromises = [],
+              noLoaderResults = [];
+            for (const layout of layoutRoutes) {
+              const serverPath = layout.loaderServerPath || layout.contextKey,
+                cacheKey = layout.contextKey || serverPath || "";
+              loaderCache.get(cacheKey) === null ? noLoaderResults.push({
+                loaderData: void 0,
+                routeId: layout.contextKey
+              }) : layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps));
+            }
+            const pageLoaderPromise = importAndRunLoader(route.file, buildInfo2.serverJsPath, route.file, loaderProps);
             let layoutResults, pageResult;
             try {
-              [layoutResults, pageResult] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]);
+              if (layoutLoaderPromises.length === 0) layoutResults = noLoaderResults, pageResult = await pageLoaderPromise;else {
+                const [asyncLayoutResults, pr] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]);
+                layoutResults = [...noLoaderResults, ...asyncLayoutResults], pageResult = pr;
+              }
             } catch (err) {
               if (isResponse(err)) return err;
               throw err;
@@ -277,18 +297,25 @@ async function oneServe(oneOptions, buildInfo, app, options) {
                 status: 404
               });
             }
-            const matches = [...layoutResults.map(result => ({
+            const matchPathname = loaderProps?.path || "/",
+              matchParams = loaderProps?.params || {},
+              matches = new Array(layoutResults.length + 1);
+            for (let i = 0; i < layoutResults.length; i++) {
+              const result = layoutResults[i];
+              matches[i] = {
                 routeId: result.routeId,
-                pathname: loaderProps?.path || "/",
-                params: loaderProps?.params || {},
+                pathname: matchPathname,
+                params: matchParams,
                 loaderData: result.loaderData
-              })), {
-                routeId: pageResult.routeId,
-                pathname: loaderProps?.path || "/",
-                params: loaderProps?.params || {},
-                loaderData: pageResult.loaderData
-              }],
-              loaderData = pageResult.loaderData;
+              };
+            }
+            matches[layoutResults.length] = {
+              routeId: pageResult.routeId,
+              pathname: matchPathname,
+              params: matchParams,
+              loaderData: pageResult.loaderData
+            };
+            const loaderData = pageResult.loaderData;
             for (const layout of layoutRoutes) {
               const key = layout.contextKey,
                 loaderFn = loaderCache.get(key);
@@ -298,9 +325,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
               }
             }
             const pageLoaderFn = loaderCache.get(route.file);
-            pageLoaderFn && (0, import_ssrLoaderData.setSSRLoaderData)(pageLoaderFn, pageResult.loaderData);
-            const headers = new Headers();
-            headers.set("content-type", "text/html"), globalThis.__vxrnresetState?.();
+            pageLoaderFn && (0, import_ssrLoaderData.setSSRLoaderData)(pageLoaderFn, pageResult.loaderData), globalThis.__vxrnresetState?.();
             const renderProps = {
                 mode: route.type,
                 loaderData,
@@ -314,18 +339,19 @@ async function oneServe(oneOptions, buildInfo, app, options) {
               },
               _rl = ensureRenderLoaded();
             _rl && (await _rl);
-            const streamFn = process.env.ONE_BUFFERED_SSR ? null : renderStream;
-            if (streamFn) {
-              const stream = await streamFn(renderProps);
+            const status = route.isNotFound ? 404 : 200,
+              responseHeaders = route.isNotFound ? htmlHeaders : ssrHtmlHeaders;
+            if (useStreaming) {
+              const stream = await renderStream(renderProps);
               return new Response(stream, {
-                headers,
-                status: route.isNotFound ? 404 : 200
+                headers: responseHeaders,
+                status
               });
             }
             const rendered = await render(renderProps);
             return new Response(rendered, {
-              headers,
-              status: route.isNotFound ? 404 : 200
+              headers: responseHeaders,
+              status
             });
           } catch (err) {
             if (isResponse(err)) return err;
@@ -339,16 +365,15 @@ url: ${url}`);
           const layoutRoutes = route.layouts || [];
           if (route.type === "spa" && layoutRoutes.some(layout => layout.layoutRenderMode === "ssg" || layout.layoutRenderMode === "ssr")) try {
             const matches = (await Promise.all(layoutRoutes.map(layout => {
-                const serverPath = layout.loaderServerPath || layout.contextKey;
-                return importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps);
-              }))).map(result => ({
-                routeId: result.routeId,
-                pathname: loaderProps?.path || "/",
-                params: loaderProps?.params || {},
-                loaderData: result.loaderData
-              })),
-              headers = new Headers();
-            headers.set("content-type", "text/html"), globalThis.__vxrnresetState?.();
+              const serverPath = layout.loaderServerPath || layout.contextKey;
+              return importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps);
+            }))).map(result => ({
+              routeId: result.routeId,
+              pathname: loaderProps?.path || "/",
+              params: loaderProps?.params || {},
+              loaderData: result.loaderData
+            }));
+            globalThis.__vxrnresetState?.();
             const _rl3 = ensureRenderLoaded();
             _rl3 && (await _rl3);
             const rendered = await render({
@@ -365,7 +390,7 @@ url: ${url}`);
               matches
             });
             return new Response(rendered, {
-              headers,
+              headers: htmlHeaders,
               status: route.isNotFound ? 404 : 200
             });
           } catch (err) {
@@ -411,16 +436,64 @@ url: ${url}`);
       }
     };
   function createHonoHandler(route) {
+    const isDynamicOrNotFound = route.page.endsWith("/+not-found") || Object.keys(route.routeKeys).length > 0;
     return async (context, next) => {
       try {
         const request = context.req.raw;
-        if ((route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) && options?.serveStaticAssets) {
+        if (isDynamicOrNotFound && options?.serveStaticAssets) {
           const staticAssetResponse = await options.serveStaticAssets({
             context
           });
           if (staticAssetResponse) return await (0, import_createHandleRequest.runMiddlewares)(requestHandlers, request, route, async () => staticAssetResponse);
         }
-        if ((0, import_node_path.extname)(request.url) === ".js" || (0, import_node_path.extname)(request.url) === ".css") return next();
+        const reqPath = context.req.path;
+        if (reqPath.endsWith(".js") || reqPath.endsWith(".css")) return next();
+        if (route.type === "ssr" && !route.middlewares?.length && !reqPath.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
+          debugRouter && console.info(`[one] \u26A1 ${reqPath} \u2192 matched page route: ${route.page} (ssr)`);
+          const pathname = reqPath,
+            rawUrl = request.url,
+            qIdx = rawUrl.indexOf("?"),
+            search = qIdx >= 0 ? rawUrl.slice(qIdx) : "",
+            params = {},
+            match = route.compiledRegex.exec(pathname);
+          if (match?.groups) for (const [key, value] of Object.entries(match.groups)) {
+            const namedKey = route.routeKeys[key];
+            params[namedKey] = value;
+          }
+          const loaderProps = {
+              path: pathname,
+              search,
+              request,
+              params
+            },
+            url2 = (0, import_createHandleRequest.getURLfromRequestURL)(request),
+            response2 = await withRequestContext(async () => {
+              try {
+                return await requestHandlers.handlePage({
+                  request,
+                  route,
+                  url: url2,
+                  loaderProps
+                });
+              } catch (err) {
+                if (isResponse(err)) return err;
+                throw err;
+              }
+            });
+          if (response2) {
+            if (isResponse(response2)) {
+              if (isStatusRedirect(response2.status)) {
+                const location = `${response2.headers.get("location") || ""}`;
+                return response2.headers.forEach((value, key) => {
+                  context.header(key, value);
+                }), context.redirect(location, response2.status);
+              }
+              return response2;
+            }
+            return next();
+          }
+          return next();
+        }
         const url = (0, import_createHandleRequest.getURLfromRequestURL)(request),
           response = await (() => {
             if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {