@rivetkit/next-js 2.0.21 → 2.0.22-rc.2

package/dist/client/mod.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/nathan/rivet/rivetkit-typescript/packages/next-js/dist/client/mod.js","../../src/client/mod.ts"],"names":[],"mappings":"AAAA;ACAA,mEAAc","file":"/Users/nathan/rivet/rivetkit-typescript/packages/next-js/dist/client/mod.js","sourcesContent":[null,"export * from \"@rivetkit/react\";\n"]}
+{"version":3,"sources":["/home/runner/work/rivet/rivet/rivetkit-typescript/packages/next-js/dist/client/mod.js","../../src/client/mod.ts"],"names":[],"mappings":"AAAA;ACAA,mEAAc","file":"/home/runner/work/rivet/rivet/rivetkit-typescript/packages/next-js/dist/client/mod.js","sourcesContent":[null,"export * from \"@rivetkit/react\";\n"]}

package/dist/mod.js

@@ -1,4 +1,9 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/log.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/mod.ts
+var _fs = require('fs');
+var _path = require('path');
+var _utils = require('rivetkit/utils');
+
+// src/log.ts
 var _log = require('rivetkit/log');
 function logger() {
   return _log.getLogger.call(void 0, "driver-next-js");
@@ -33,8 +38,12 @@ var toNextHandler = (registry, inputConfig = {}) => {
     const { all } = await params;
     const newUrl = new URL(request.url);
     newUrl.pathname = all.join("/");
-    const newReq = new Request(newUrl, request);
-    return await fetch(newReq);
+    if (process.env.NODE_ENV !== "development") {
+      const newReq = new Request(newUrl, request);
+      return await fetch(newReq);
+    } else {
+      return await handleRequestWithFileWatcher(request, newUrl, fetch);
+    }
   };
   return {
     GET: fetchWrapper,
@@ -45,6 +54,104 @@ var toNextHandler = (registry, inputConfig = {}) => {
     OPTIONS: fetchWrapper
   };
 };
+async function handleRequestWithFileWatcher(request, newUrl, fetch) {
+  var _a;
+  const mergedController = new AbortController();
+  const abortMerged = () => mergedController.abort();
+  (_a = request.signal) == null ? void 0 : _a.addEventListener("abort", abortMerged);
+  const watchIntervalId = watchRouteFile(mergedController);
+  request.signal.addEventListener("abort", () => {
+    logger().debug("clearing file watcher interval: request aborted");
+    clearInterval(watchIntervalId);
+  });
+  const newReq = new Request(newUrl, {
+    // Copy old request properties
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+    credentials: request.credentials,
+    cache: request.cache,
+    redirect: request.redirect,
+    referrer: request.referrer,
+    integrity: request.integrity,
+    // Override with new signal
+    signal: mergedController.signal
+  });
+  const response = await fetch(newReq);
+  if (response.body) {
+    const wrappedStream = waitForStreamFinish(response.body, () => {
+      logger().debug("clearing file watcher interval: stream finished");
+      clearInterval(watchIntervalId);
+    });
+    return new Response(wrappedStream, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
+  } else {
+    logger().debug("clearing file watcher interval: no response body");
+    clearInterval(watchIntervalId);
+    return response;
+  }
+}
+function watchRouteFile(abortController) {
+  logger().debug("starting file watcher");
+  const routePath = _path.join.call(void 0, 
+    process.cwd(),
+    ".next/server/app/api/rivet/[...all]/route.js"
+  );
+  let lastMtime = null;
+  const checkFile = () => {
+    logger().debug({ msg: "checking for file changes", routePath });
+    try {
+      if (!_fs.existsSync.call(void 0, routePath)) {
+        return;
+      }
+      const stats = _fs.statSync.call(void 0, routePath);
+      const mtime = stats.mtimeMs;
+      if (lastMtime !== null && mtime !== lastMtime) {
+        logger().info({ msg: "route file changed", routePath });
+        abortController.abort();
+      }
+      lastMtime = mtime;
+    } catch (err) {
+      logger().info({
+        msg: "failed to check for route file change",
+        err: _utils.stringifyError.call(void 0, err)
+      });
+    }
+  };
+  checkFile();
+  return setInterval(checkFile, 1e3);
+}
+function waitForStreamFinish(body, onFinish) {
+  const reader = body.getReader();
+  return new ReadableStream({
+    async start(controller) {
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            logger().debug("stream completed");
+            onFinish();
+            controller.close();
+            break;
+          }
+          controller.enqueue(value);
+        }
+      } catch (err) {
+        logger().debug("stream errored");
+        onFinish();
+        controller.error(err);
+      }
+    },
+    cancel() {
+      logger().debug("stream cancelled");
+      onFinish();
+      reader.cancel();
+    }
+  });
+}
 
 
 exports.toNextHandler = toNextHandler;

package/dist/mod.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/nathan/rivet/rivetkit-typescript/packages/next-js/dist/mod.js","../src/log.ts","../src/mod.ts"],"names":[],"mappings":"AAAA;ACAA,mCAA0B;AAEnB,SAAS,MAAA,CAAA,EAAS;AACxB,EAAA,OAAO,4BAAA,gBAA0B,CAAA;AAClC;ADCA;AACA;AEHO,IAAM,cAAA,EAAgB,CAC5B,QAAA,EACA,YAAA,EAA8B,CAAC,CAAA,EAAA,GAC3B;AAEJ,EAAA,WAAA,CAAY,qBAAA,EAAuB,IAAA;AAGnC,EAAA,WAAA,CAAY,WAAA,EAAa,YAAA;AAGzB,EAAA,GAAA,CAAI,OAAA,CAAQ,GAAA,CAAI,SAAA,IAAa,YAAA,EAAc;AAC1C,IAAA,MAAA,CAAO,CAAA,CAAE,KAAA;AAAA,MACR;AAAA,IACD,CAAA;AAEA,IAAA,MAAM,UAAA,oCACL,OAAA,CAAQ,GAAA,CAAI,oBAAA,UACZ,OAAA,CAAQ,GAAA,CAAI,wBAAA,UACZ,CAAA,iBAAA,mBAAoB,OAAA,CAAQ,GAAA,CAAI,IAAA,UAAQ,KAAI,CAAA,GAAA;AAErB,IAAA;AACc,IAAA;AACpB,MAAA;AACL,MAAA;AACA,MAAA;AACK,MAAA;AACD,MAAA;AACgB,MAAA;AACjC,IAAA;AACM,EAAA;AACG,IAAA;AACR,MAAA;AACD,IAAA;AACD,EAAA;AAGwB,EAAA;AAEoB,EAAA;AAKvC,EAAA;AACkB,IAAA;AAEY,IAAA;AACJ,IAAA;AACY,IAAA;AAEjB,IAAA;AAC1B,EAAA;AAEO,EAAA;AACD,IAAA;AACC,IAAA;AACD,IAAA;AACE,IAAA;AACD,IAAA;AACG,IAAA;AACV,EAAA;AACD;AFlB4I;AACA;AACA","file":"/Users/nathan/rivet/rivetkit-typescript/packages/next-js/dist/mod.js","sourcesContent":[null,"import { getLogger } from \"rivetkit/log\";\n\nexport function logger() {\n\treturn getLogger(\"driver-next-js\");\n}\n","import type { Registry, RunConfigInput } from \"rivetkit\";\nimport { logger } from \"./log\";\n\nexport const toNextHandler = (\n\tregistry: Registry<any>,\n\tinputConfig: RunConfigInput = {},\n) => {\n\t// Don't run server locally since we're using the fetch handler directly\n\tinputConfig.disableDefaultServer = true;\n\n\t// Configure serverless\n\tinputConfig.runnerKind = \"serverless\";\n\n\t// Auto-configure serverless runner if not in prod\n\tif (process.env.NODE_ENV !== \"production\") {\n\t\tlogger().debug(\n\t\t\t\"detected development environment, auto-starting engine and auto-configuring serverless\",\n\t\t);\n\n\t\tconst publicUrl =\n\t\t\tprocess.env.NEXT_PUBLIC_SITE_URL ??\n\t\t\tprocess.env.NEXT_PUBLIC_VERCEL_URL ??\n\t\t\t`http://127.0.0.1:${process.env.PORT ?? 3000}`;\n\n\t\tinputConfig.runEngine = true;\n\t\tinputConfig.autoConfigureServerless = {\n\t\t\turl: `${publicUrl}/api/rivet`,\n\t\t\tminRunners: 0,\n\t\t\tmaxRunners: 100_000,\n\t\t\trequestLifespan: 300,\n\t\t\tslotsPerRunner: 1,\n\t\t\tmetadata: { provider: \"next-js\" },\n\t\t};\n\t} else {\n\t\tlogger().debug(\n\t\t\t\"detected production environment, will not auto-start engine and auto-configure serverless\",\n\t\t);\n\t}\n\n\t// Next logs this on every request\n\tinputConfig.noWelcome = true;\n\n\tconst { fetch } = registry.start(inputConfig);\n\n\tconst fetchWrapper = async (\n\t\trequest: Request,\n\t\t{ params }: { params: Promise<{ all: string[] }> },\n\t) => {\n\t\tconst { all } = await params;\n\n\t\tconst newUrl = new URL(request.url);\n\t\tnewUrl.pathname = all.join(\"/\");\n\t\tconst newReq = new Request(newUrl, request);\n\n\t\treturn await fetch(newReq);\n\t};\n\n\treturn {\n\t\tGET: fetchWrapper,\n\t\tPOST: fetchWrapper,\n\t\tPUT: fetchWrapper,\n\t\tPATCH: fetchWrapper,\n\t\tHEAD: fetchWrapper,\n\t\tOPTIONS: fetchWrapper,\n\t};\n};\n"]}
+{"version":3,"sources":["/home/runner/work/rivet/rivet/rivetkit-typescript/packages/next-js/dist/mod.js","../src/mod.ts","../src/log.ts"],"names":[],"mappings":"AAAA;ACAA,wBAAqC;AACrC,4BAAqB;AAErB,uCAA+B;ADC/B;AACA;AELA,mCAA0B;AAEnB,SAAS,MAAA,CAAA,EAAS;AACxB,EAAA,OAAO,4BAAA,gBAA0B,CAAA;AAClC;AFMA;AACA;ACLO,IAAM,cAAA,EAAgB,CAC5B,QAAA,EACA,YAAA,EAA8B,CAAC,CAAA,EAAA,GAC3B;AAEJ,EAAA,WAAA,CAAY,qBAAA,EAAuB,IAAA;AAGnC,EAAA,WAAA,CAAY,WAAA,EAAa,YAAA;AAEzB,EAAA,GAAA,CAAI,OAAA,CAAQ,GAAA,CAAI,SAAA,IAAa,YAAA,EAAc;AAE1C,IAAA,MAAA,CAAO,CAAA,CAAE,KAAA;AAAA,MACR;AAAA,IACD,CAAA;AAEA,IAAA,MAAM,UAAA,oCACL,OAAA,CAAQ,GAAA,CAAI,oBAAA,UACZ,OAAA,CAAQ,GAAA,CAAI,wBAAA,UACZ,CAAA,iBAAA,mBAAoB,OAAA,CAAQ,GAAA,CAAI,IAAA,UAAQ,KAAI,CAAA,GAAA;AAErB,IAAA;AACc,IAAA;AACpB,MAAA;AACL,MAAA;AACA,MAAA;AACK,MAAA;AACD,MAAA;AACgB,MAAA;AACjC,IAAA;AACM,EAAA;AACG,IAAA;AACR,MAAA;AACD,IAAA;AACD,EAAA;AAGwB,EAAA;AAEoB,EAAA;AAMpB,EAAA;AACD,IAAA;AAEY,IAAA;AACJ,IAAA;AAEc,IAAA;AAED,MAAA;AACjB,MAAA;AACnB,IAAA;AAE0D,MAAA;AACjE,IAAA;AACD,EAAA;AAEO,EAAA;AACD,IAAA;AACC,IAAA;AACD,IAAA;AACE,IAAA;AACD,IAAA;AACG,IAAA;AACV,EAAA;AACD;AAYqB;AAvFrB,EAAA;AA0F8C,EAAA;AACI,EAAA;AACP,EAAA;AAMa,EAAA;AAGR,EAAA;AACkB,IAAA;AACnC,IAAA;AAC7B,EAAA;AAGkC,EAAA;AAAA;AAElB,IAAA;AACC,IAAA;AACH,IAAA;AACO,IAAA;AACN,IAAA;AACG,IAAA;AACA,IAAA;AACC,IAAA;AAAA;AAEM,IAAA;AACzB,EAAA;AAGkC,EAAA;AAOhB,EAAA;AAC6C,IAAA;AACE,MAAA;AACnC,MAAA;AAC7B,IAAA;AACkC,IAAA;AACjB,MAAA;AACI,MAAA;AACH,MAAA;AAClB,IAAA;AACK,EAAA;AAE2D,IAAA;AACpC,IAAA;AACtB,IAAA;AACR,EAAA;AACD;AAW0E;AACnC,EAAA;AAEpB,EAAA;AACL,IAAA;AACZ,IAAA;AACD,EAAA;AAE+B,EAAA;AACP,EAAA;AACuC,IAAA;AAC1D,IAAA;AACyB,MAAA;AAC3B,QAAA;AACD,MAAA;AAEgC,MAAA;AACZ,MAAA;AAE2B,MAAA;AACQ,QAAA;AAChC,QAAA;AACvB,MAAA;AAEY,MAAA;AACC,IAAA;AACC,MAAA;AACR,QAAA;AACkB,QAAA;AACvB,MAAA;AACF,IAAA;AACD,EAAA;AAEU,EAAA;AAEwB,EAAA;AACnC;AAUkB;AACa,EAAA;AACJ,EAAA;AACD,IAAA;AACnB,MAAA;AACU,QAAA;AAC8B,UAAA;AAChC,UAAA;AACwB,YAAA;AACxB,YAAA;AACQ,YAAA;AACjB,YAAA;AACD,UAAA;AACwB,UAAA;AACzB,QAAA;AACa,MAAA;AACkB,QAAA;AACtB,QAAA;AACW,QAAA;AACrB,MAAA;AACD,IAAA;AACS,IAAA;AACyB,MAAA;AACxB,MAAA;AACK,MAAA;AACf,IAAA;AACA,EAAA;AACF;AD3E4I;AACA;AACA","file":"/home/runner/work/rivet/rivet/rivetkit-typescript/packages/next-js/dist/mod.js","sourcesContent":[null,"import { existsSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { Registry, RunConfigInput } from \"rivetkit\";\nimport { stringifyError } from \"rivetkit/utils\";\nimport { logger } from \"./log\";\n\nexport const toNextHandler = (\n\tregistry: Registry<any>,\n\tinputConfig: RunConfigInput = {},\n) => {\n\t// Don't run server locally since we're using the fetch handler directly\n\tinputConfig.disableDefaultServer = true;\n\n\t// Configure serverless\n\tinputConfig.runnerKind = \"serverless\";\n\n\tif (process.env.NODE_ENV !== \"production\") {\n\t\t// Auto-configure serverless runner if not in prod\n\t\tlogger().debug(\n\t\t\t\"detected development environment, auto-starting engine and auto-configuring serverless\",\n\t\t);\n\n\t\tconst publicUrl =\n\t\t\tprocess.env.NEXT_PUBLIC_SITE_URL ??\n\t\t\tprocess.env.NEXT_PUBLIC_VERCEL_URL ??\n\t\t\t`http://127.0.0.1:${process.env.PORT ?? 3000}`;\n\n\t\tinputConfig.runEngine = true;\n\t\tinputConfig.autoConfigureServerless = {\n\t\t\turl: `${publicUrl}/api/rivet`,\n\t\t\tminRunners: 0,\n\t\t\tmaxRunners: 100_000,\n\t\t\trequestLifespan: 300,\n\t\t\tslotsPerRunner: 1,\n\t\t\tmetadata: { provider: \"next-js\" },\n\t\t};\n\t} else {\n\t\tlogger().debug(\n\t\t\t\"detected production environment, will not auto-start engine and auto-configure serverless\",\n\t\t);\n\t}\n\n\t// Next logs this on every request\n\tinputConfig.noWelcome = true;\n\n\tconst { fetch } = registry.start(inputConfig);\n\n\t// Function that Next will call when handling requests\n\tconst fetchWrapper = async (\n\t\trequest: Request,\n\t\t{ params }: { params: Promise<{ all: string[] }> },\n\t): Promise<Response> => {\n\t\tconst { all } = await params;\n\n\t\tconst newUrl = new URL(request.url);\n\t\tnewUrl.pathname = all.join(\"/\");\n\n\t\tif (process.env.NODE_ENV !== \"development\") {\n\t\t\t// Handle request\n\t\t\tconst newReq = new Request(newUrl, request);\n\t\t\treturn await fetch(newReq);\n\t\t} else {\n\t\t\t// Special request handling for file watching\n\t\t\treturn await handleRequestWithFileWatcher(request, newUrl, fetch);\n\t\t}\n\t};\n\n\treturn {\n\t\tGET: fetchWrapper,\n\t\tPOST: fetchWrapper,\n\t\tPUT: fetchWrapper,\n\t\tPATCH: fetchWrapper,\n\t\tHEAD: fetchWrapper,\n\t\tOPTIONS: fetchWrapper,\n\t};\n};\n\n/**\n * Special request handler that will watch the source file to terminate this\n * request once complete.\n *\n * See docs on watchRouteFile for more information.\n */\nasync function handleRequestWithFileWatcher(\n\trequest: Request,\n\tnewUrl: URL,\n\tfetch: (request: Request, ...args: any) => Response | Promise<Response>,\n): Promise<Response> {\n\t// Create a new abort controller that we can abort, since the signal on\n\t// the request we cannot control\n\tconst mergedController = new AbortController();\n\tconst abortMerged = () => mergedController.abort();\n\trequest.signal?.addEventListener(\"abort\", abortMerged);\n\n\t// Watch for file changes in dev\n\t//\n\t// We spawn one watcher per-request since there is not a clean way of\n\t// cleaning up global watchers when hot reloading in Next\n\tconst watchIntervalId = watchRouteFile(mergedController);\n\n\t// Clear interval if request is aborted\n\trequest.signal.addEventListener(\"abort\", () => {\n\t\tlogger().debug(\"clearing file watcher interval: request aborted\");\n\t\tclearInterval(watchIntervalId);\n\t});\n\n\t// Replace URL and abort signal\n\tconst newReq = new Request(newUrl, {\n\t\t// Copy old request properties\n\t\tmethod: request.method,\n\t\theaders: request.headers,\n\t\tbody: request.body,\n\t\tcredentials: request.credentials,\n\t\tcache: request.cache,\n\t\tredirect: request.redirect,\n\t\treferrer: request.referrer,\n\t\tintegrity: request.integrity,\n\t\t// Override with new signal\n\t\tsignal: mergedController.signal,\n\t});\n\n\t// Handle request\n\tconst response = await fetch(newReq);\n\n\t// HACK: Next.js does not provide a way to detect when a request\n\t// finishes, so we need to tap the response stream\n\t//\n\t// We can't just wait for `await fetch` to finish since SSE streams run\n\t// for longer\n\tif (response.body) {\n\t\tconst wrappedStream = waitForStreamFinish(response.body, () => {\n\t\t\tlogger().debug(\"clearing file watcher interval: stream finished\");\n\t\t\tclearInterval(watchIntervalId);\n\t\t});\n\t\treturn new Response(wrappedStream, {\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\theaders: response.headers,\n\t\t});\n\t} else {\n\t\t// No response body, clear interval immediately\n\t\tlogger().debug(\"clearing file watcher interval: no response body\");\n\t\tclearInterval(watchIntervalId);\n\t\treturn response;\n\t}\n}\n\n/**\n * HACK: Watch for file changes on this route in order to shut down the runner.\n * We do this because Next.js does not terminate long-running requests on file\n * change, so we need to manually shut down the runner in order to trigger a\n * new `/start` request with the new code.\n *\n * We don't use file watchers since those are frequently buggy x-platform and\n * subject to misconfigured inotify limits.\n */\nfunction watchRouteFile(abortController: AbortController): NodeJS.Timeout {\n\tlogger().debug(\"starting file watcher\");\n\n\tconst routePath = join(\n\t\tprocess.cwd(),\n\t\t\".next/server/app/api/rivet/[...all]/route.js\",\n\t);\n\n\tlet lastMtime: number | null = null;\n\tconst checkFile = () => {\n\t\tlogger().debug({ msg: \"checking for file changes\", routePath });\n\t\ttry {\n\t\t\tif (!existsSync(routePath)) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst stats = statSync(routePath);\n\t\t\tconst mtime = stats.mtimeMs;\n\n\t\t\tif (lastMtime !== null && mtime !== lastMtime) {\n\t\t\t\tlogger().info({ msg: \"route file changed\", routePath });\n\t\t\t\tabortController.abort();\n\t\t\t}\n\n\t\t\tlastMtime = mtime;\n\t\t} catch (err) {\n\t\t\tlogger().info({\n\t\t\t\tmsg: \"failed to check for route file change\",\n\t\t\t\terr: stringifyError(err),\n\t\t\t});\n\t\t}\n\t};\n\n\tcheckFile();\n\n\treturn setInterval(checkFile, 1000);\n}\n\n/**\n * Waits for a stream to finish and calls onFinish on complete.\n *\n * Used for cancelling the file watcher.\n */\nfunction waitForStreamFinish(\n\tbody: ReadableStream<Uint8Array>,\n\tonFinish: () => void,\n): ReadableStream {\n\tconst reader = body.getReader();\n\treturn new ReadableStream({\n\t\tasync start(controller) {\n\t\t\ttry {\n\t\t\t\twhile (true) {\n\t\t\t\t\tconst { done, value } = await reader.read();\n\t\t\t\t\tif (done) {\n\t\t\t\t\t\tlogger().debug(\"stream completed\");\n\t\t\t\t\t\tonFinish();\n\t\t\t\t\t\tcontroller.close();\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\tcontroller.enqueue(value);\n\t\t\t\t}\n\t\t\t} catch (err) {\n\t\t\t\tlogger().debug(\"stream errored\");\n\t\t\t\tonFinish();\n\t\t\t\tcontroller.error(err);\n\t\t\t}\n\t\t},\n\t\tcancel() {\n\t\t\tlogger().debug(\"stream cancelled\");\n\t\t\tonFinish();\n\t\t\treader.cancel();\n\t\t},\n\t});\n}\n","import { getLogger } from \"rivetkit/log\";\n\nexport function logger() {\n\treturn getLogger(\"driver-next-js\");\n}\n"]}

package/dist/mod.mjs

@@ -1,3 +1,8 @@
+// src/mod.ts
+import { existsSync, statSync } from "fs";
+import { join } from "path";
+import { stringifyError } from "rivetkit/utils";
+
 // src/log.ts
 import { getLogger } from "rivetkit/log";
 function logger() {
@@ -33,8 +38,12 @@ var toNextHandler = (registry, inputConfig = {}) => {
     const { all } = await params;
     const newUrl = new URL(request.url);
     newUrl.pathname = all.join("/");
-    const newReq = new Request(newUrl, request);
-    return await fetch(newReq);
+    if (process.env.NODE_ENV !== "development") {
+      const newReq = new Request(newUrl, request);
+      return await fetch(newReq);
+    } else {
+      return await handleRequestWithFileWatcher(request, newUrl, fetch);
+    }
   };
   return {
     GET: fetchWrapper,
@@ -45,6 +54,104 @@ var toNextHandler = (registry, inputConfig = {}) => {
     OPTIONS: fetchWrapper
   };
 };
+async function handleRequestWithFileWatcher(request, newUrl, fetch) {
+  var _a;
+  const mergedController = new AbortController();
+  const abortMerged = () => mergedController.abort();
+  (_a = request.signal) == null ? void 0 : _a.addEventListener("abort", abortMerged);
+  const watchIntervalId = watchRouteFile(mergedController);
+  request.signal.addEventListener("abort", () => {
+    logger().debug("clearing file watcher interval: request aborted");
+    clearInterval(watchIntervalId);
+  });
+  const newReq = new Request(newUrl, {
+    // Copy old request properties
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+    credentials: request.credentials,
+    cache: request.cache,
+    redirect: request.redirect,
+    referrer: request.referrer,
+    integrity: request.integrity,
+    // Override with new signal
+    signal: mergedController.signal
+  });
+  const response = await fetch(newReq);
+  if (response.body) {
+    const wrappedStream = waitForStreamFinish(response.body, () => {
+      logger().debug("clearing file watcher interval: stream finished");
+      clearInterval(watchIntervalId);
+    });
+    return new Response(wrappedStream, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
+  } else {
+    logger().debug("clearing file watcher interval: no response body");
+    clearInterval(watchIntervalId);
+    return response;
+  }
+}
+function watchRouteFile(abortController) {
+  logger().debug("starting file watcher");
+  const routePath = join(
+    process.cwd(),
+    ".next/server/app/api/rivet/[...all]/route.js"
+  );
+  let lastMtime = null;
+  const checkFile = () => {
+    logger().debug({ msg: "checking for file changes", routePath });
+    try {
+      if (!existsSync(routePath)) {
+        return;
+      }
+      const stats = statSync(routePath);
+      const mtime = stats.mtimeMs;
+      if (lastMtime !== null && mtime !== lastMtime) {
+        logger().info({ msg: "route file changed", routePath });
+        abortController.abort();
+      }
+      lastMtime = mtime;
+    } catch (err) {
+      logger().info({
+        msg: "failed to check for route file change",
+        err: stringifyError(err)
+      });
+    }
+  };
+  checkFile();
+  return setInterval(checkFile, 1e3);
+}
+function waitForStreamFinish(body, onFinish) {
+  const reader = body.getReader();
+  return new ReadableStream({
+    async start(controller) {
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            logger().debug("stream completed");
+            onFinish();
+            controller.close();
+            break;
+          }
+          controller.enqueue(value);
+        }
+      } catch (err) {
+        logger().debug("stream errored");
+        onFinish();
+        controller.error(err);
+      }
+    },
+    cancel() {
+      logger().debug("stream cancelled");
+      onFinish();
+      reader.cancel();
+    }
+  });
+}
 export {
   toNextHandler
 };

package/dist/mod.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/log.ts","../src/mod.ts"],"sourcesContent":["import { getLogger } from \"rivetkit/log\";\n\nexport function logger() {\n\treturn getLogger(\"driver-next-js\");\n}\n","import type { Registry, RunConfigInput } from \"rivetkit\";\nimport { logger } from \"./log\";\n\nexport const toNextHandler = (\n\tregistry: Registry<any>,\n\tinputConfig: RunConfigInput = {},\n) => {\n\t// Don't run server locally since we're using the fetch handler directly\n\tinputConfig.disableDefaultServer = true;\n\n\t// Configure serverless\n\tinputConfig.runnerKind = \"serverless\";\n\n\t// Auto-configure serverless runner if not in prod\n\tif (process.env.NODE_ENV !== \"production\") {\n\t\tlogger().debug(\n\t\t\t\"detected development environment, auto-starting engine and auto-configuring serverless\",\n\t\t);\n\n\t\tconst publicUrl =\n\t\t\tprocess.env.NEXT_PUBLIC_SITE_URL ??\n\t\t\tprocess.env.NEXT_PUBLIC_VERCEL_URL ??\n\t\t\t`http://127.0.0.1:${process.env.PORT ?? 3000}`;\n\n\t\tinputConfig.runEngine = true;\n\t\tinputConfig.autoConfigureServerless = {\n\t\t\turl: `${publicUrl}/api/rivet`,\n\t\t\tminRunners: 0,\n\t\t\tmaxRunners: 100_000,\n\t\t\trequestLifespan: 300,\n\t\t\tslotsPerRunner: 1,\n\t\t\tmetadata: { provider: \"next-js\" },\n\t\t};\n\t} else {\n\t\tlogger().debug(\n\t\t\t\"detected production environment, will not auto-start engine and auto-configure serverless\",\n\t\t);\n\t}\n\n\t// Next logs this on every request\n\tinputConfig.noWelcome = true;\n\n\tconst { fetch } = registry.start(inputConfig);\n\n\tconst fetchWrapper = async (\n\t\trequest: Request,\n\t\t{ params }: { params: Promise<{ all: string[] }> },\n\t) => {\n\t\tconst { all } = await params;\n\n\t\tconst newUrl = new URL(request.url);\n\t\tnewUrl.pathname = all.join(\"/\");\n\t\tconst newReq = new Request(newUrl, request);\n\n\t\treturn await fetch(newReq);\n\t};\n\n\treturn {\n\t\tGET: fetchWrapper,\n\t\tPOST: fetchWrapper,\n\t\tPUT: fetchWrapper,\n\t\tPATCH: fetchWrapper,\n\t\tHEAD: fetchWrapper,\n\t\tOPTIONS: fetchWrapper,\n\t};\n};\n"],"mappings":";AAAA,SAAS,iBAAiB;AAEnB,SAAS,SAAS;AACxB,SAAO,UAAU,gBAAgB;AAClC;;;ACDO,IAAM,gBAAgB,CAC5B,UACA,cAA8B,CAAC,MAC3B;AAEJ,cAAY,uBAAuB;AAGnC,cAAY,aAAa;AAGzB,MAAI,QAAQ,IAAI,aAAa,cAAc;AAC1C,WAAO,EAAE;AAAA,MACR;AAAA,IACD;AAEA,UAAM,YACL,QAAQ,IAAI,wBACZ,QAAQ,IAAI,0BACZ,oBAAoB,QAAQ,IAAI,QAAQ,GAAI;AAE7C,gBAAY,YAAY;AACxB,gBAAY,0BAA0B;AAAA,MACrC,KAAK,GAAG,SAAS;AAAA,MACjB,YAAY;AAAA,MACZ,YAAY;AAAA,MACZ,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,MAChB,UAAU,EAAE,UAAU,UAAU;AAAA,IACjC;AAAA,EACD,OAAO;AACN,WAAO,EAAE;AAAA,MACR;AAAA,IACD;AAAA,EACD;AAGA,cAAY,YAAY;AAExB,QAAM,EAAE,MAAM,IAAI,SAAS,MAAM,WAAW;AAE5C,QAAM,eAAe,OACpB,SACA,EAAE,OAAO,MACL;AACJ,UAAM,EAAE,IAAI,IAAI,MAAM;AAEtB,UAAM,SAAS,IAAI,IAAI,QAAQ,GAAG;AAClC,WAAO,WAAW,IAAI,KAAK,GAAG;AAC9B,UAAM,SAAS,IAAI,QAAQ,QAAQ,OAAO;AAE1C,WAAO,MAAM,MAAM,MAAM;AAAA,EAC1B;AAEA,SAAO;AAAA,IACN,KAAK;AAAA,IACL,MAAM;AAAA,IACN,KAAK;AAAA,IACL,OAAO;AAAA,IACP,MAAM;AAAA,IACN,SAAS;AAAA,EACV;AACD;","names":[]}
+{"version":3,"sources":["../src/mod.ts","../src/log.ts"],"sourcesContent":["import { existsSync, statSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { Registry, RunConfigInput } from \"rivetkit\";\nimport { stringifyError } from \"rivetkit/utils\";\nimport { logger } from \"./log\";\n\nexport const toNextHandler = (\n\tregistry: Registry<any>,\n\tinputConfig: RunConfigInput = {},\n) => {\n\t// Don't run server locally since we're using the fetch handler directly\n\tinputConfig.disableDefaultServer = true;\n\n\t// Configure serverless\n\tinputConfig.runnerKind = \"serverless\";\n\n\tif (process.env.NODE_ENV !== \"production\") {\n\t\t// Auto-configure serverless runner if not in prod\n\t\tlogger().debug(\n\t\t\t\"detected development environment, auto-starting engine and auto-configuring serverless\",\n\t\t);\n\n\t\tconst publicUrl =\n\t\t\tprocess.env.NEXT_PUBLIC_SITE_URL ??\n\t\t\tprocess.env.NEXT_PUBLIC_VERCEL_URL ??\n\t\t\t`http://127.0.0.1:${process.env.PORT ?? 3000}`;\n\n\t\tinputConfig.runEngine = true;\n\t\tinputConfig.autoConfigureServerless = {\n\t\t\turl: `${publicUrl}/api/rivet`,\n\t\t\tminRunners: 0,\n\t\t\tmaxRunners: 100_000,\n\t\t\trequestLifespan: 300,\n\t\t\tslotsPerRunner: 1,\n\t\t\tmetadata: { provider: \"next-js\" },\n\t\t};\n\t} else {\n\t\tlogger().debug(\n\t\t\t\"detected production environment, will not auto-start engine and auto-configure serverless\",\n\t\t);\n\t}\n\n\t// Next logs this on every request\n\tinputConfig.noWelcome = true;\n\n\tconst { fetch } = registry.start(inputConfig);\n\n\t// Function that Next will call when handling requests\n\tconst fetchWrapper = async (\n\t\trequest: Request,\n\t\t{ params }: { params: Promise<{ all: string[] }> },\n\t): Promise<Response> => {\n\t\tconst { all } = await params;\n\n\t\tconst newUrl = new URL(request.url);\n\t\tnewUrl.pathname = all.join(\"/\");\n\n\t\tif (process.env.NODE_ENV !== \"development\") {\n\t\t\t// Handle request\n\t\t\tconst newReq = new Request(newUrl, request);\n\t\t\treturn await fetch(newReq);\n\t\t} else {\n\t\t\t// Special request handling for file watching\n\t\t\treturn await handleRequestWithFileWatcher(request, newUrl, fetch);\n\t\t}\n\t};\n\n\treturn {\n\t\tGET: fetchWrapper,\n\t\tPOST: fetchWrapper,\n\t\tPUT: fetchWrapper,\n\t\tPATCH: fetchWrapper,\n\t\tHEAD: fetchWrapper,\n\t\tOPTIONS: fetchWrapper,\n\t};\n};\n\n/**\n * Special request handler that will watch the source file to terminate this\n * request once complete.\n *\n * See docs on watchRouteFile for more information.\n */\nasync function handleRequestWithFileWatcher(\n\trequest: Request,\n\tnewUrl: URL,\n\tfetch: (request: Request, ...args: any) => Response | Promise<Response>,\n): Promise<Response> {\n\t// Create a new abort controller that we can abort, since the signal on\n\t// the request we cannot control\n\tconst mergedController = new AbortController();\n\tconst abortMerged = () => mergedController.abort();\n\trequest.signal?.addEventListener(\"abort\", abortMerged);\n\n\t// Watch for file changes in dev\n\t//\n\t// We spawn one watcher per-request since there is not a clean way of\n\t// cleaning up global watchers when hot reloading in Next\n\tconst watchIntervalId = watchRouteFile(mergedController);\n\n\t// Clear interval if request is aborted\n\trequest.signal.addEventListener(\"abort\", () => {\n\t\tlogger().debug(\"clearing file watcher interval: request aborted\");\n\t\tclearInterval(watchIntervalId);\n\t});\n\n\t// Replace URL and abort signal\n\tconst newReq = new Request(newUrl, {\n\t\t// Copy old request properties\n\t\tmethod: request.method,\n\t\theaders: request.headers,\n\t\tbody: request.body,\n\t\tcredentials: request.credentials,\n\t\tcache: request.cache,\n\t\tredirect: request.redirect,\n\t\treferrer: request.referrer,\n\t\tintegrity: request.integrity,\n\t\t// Override with new signal\n\t\tsignal: mergedController.signal,\n\t});\n\n\t// Handle request\n\tconst response = await fetch(newReq);\n\n\t// HACK: Next.js does not provide a way to detect when a request\n\t// finishes, so we need to tap the response stream\n\t//\n\t// We can't just wait for `await fetch` to finish since SSE streams run\n\t// for longer\n\tif (response.body) {\n\t\tconst wrappedStream = waitForStreamFinish(response.body, () => {\n\t\t\tlogger().debug(\"clearing file watcher interval: stream finished\");\n\t\t\tclearInterval(watchIntervalId);\n\t\t});\n\t\treturn new Response(wrappedStream, {\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\theaders: response.headers,\n\t\t});\n\t} else {\n\t\t// No response body, clear interval immediately\n\t\tlogger().debug(\"clearing file watcher interval: no response body\");\n\t\tclearInterval(watchIntervalId);\n\t\treturn response;\n\t}\n}\n\n/**\n * HACK: Watch for file changes on this route in order to shut down the runner.\n * We do this because Next.js does not terminate long-running requests on file\n * change, so we need to manually shut down the runner in order to trigger a\n * new `/start` request with the new code.\n *\n * We don't use file watchers since those are frequently buggy x-platform and\n * subject to misconfigured inotify limits.\n */\nfunction watchRouteFile(abortController: AbortController): NodeJS.Timeout {\n\tlogger().debug(\"starting file watcher\");\n\n\tconst routePath = join(\n\t\tprocess.cwd(),\n\t\t\".next/server/app/api/rivet/[...all]/route.js\",\n\t);\n\n\tlet lastMtime: number | null = null;\n\tconst checkFile = () => {\n\t\tlogger().debug({ msg: \"checking for file changes\", routePath });\n\t\ttry {\n\t\t\tif (!existsSync(routePath)) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst stats = statSync(routePath);\n\t\t\tconst mtime = stats.mtimeMs;\n\n\t\t\tif (lastMtime !== null && mtime !== lastMtime) {\n\t\t\t\tlogger().info({ msg: \"route file changed\", routePath });\n\t\t\t\tabortController.abort();\n\t\t\t}\n\n\t\t\tlastMtime = mtime;\n\t\t} catch (err) {\n\t\t\tlogger().info({\n\t\t\t\tmsg: \"failed to check for route file change\",\n\t\t\t\terr: stringifyError(err),\n\t\t\t});\n\t\t}\n\t};\n\n\tcheckFile();\n\n\treturn setInterval(checkFile, 1000);\n}\n\n/**\n * Waits for a stream to finish and calls onFinish on complete.\n *\n * Used for cancelling the file watcher.\n */\nfunction waitForStreamFinish(\n\tbody: ReadableStream<Uint8Array>,\n\tonFinish: () => void,\n): ReadableStream {\n\tconst reader = body.getReader();\n\treturn new ReadableStream({\n\t\tasync start(controller) {\n\t\t\ttry {\n\t\t\t\twhile (true) {\n\t\t\t\t\tconst { done, value } = await reader.read();\n\t\t\t\t\tif (done) {\n\t\t\t\t\t\tlogger().debug(\"stream completed\");\n\t\t\t\t\t\tonFinish();\n\t\t\t\t\t\tcontroller.close();\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\t\t\t\t\tcontroller.enqueue(value);\n\t\t\t\t}\n\t\t\t} catch (err) {\n\t\t\t\tlogger().debug(\"stream errored\");\n\t\t\t\tonFinish();\n\t\t\t\tcontroller.error(err);\n\t\t\t}\n\t\t},\n\t\tcancel() {\n\t\t\tlogger().debug(\"stream cancelled\");\n\t\t\tonFinish();\n\t\t\treader.cancel();\n\t\t},\n\t});\n}\n","import { getLogger } from \"rivetkit/log\";\n\nexport function logger() {\n\treturn getLogger(\"driver-next-js\");\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivetkit/next-js",
-  "version": "2.0.21",
+  "version": "2.0.22-rc.2",
   "description": "Next.js integration for RivetKit actors and client",
   "license": "Apache-2.0",
   "keywords": [
@@ -49,8 +49,8 @@
   },
   "dependencies": {
     "hono": "^4.8.3",
-    "@rivetkit/react": "2.0.21",
-    "rivetkit": "^2.0.21"
+    "@rivetkit/react": "2.0.22-rc.2",
+    "rivetkit": "^2.0.22-rc.2"
   },
   "peerDependencies": {
     "react": "^18 || ^19",