rivetkit 2.0.24-rc.1 → 2.0.25-rc.1

package/src/test/mod.ts

@@ -17,7 +17,10 @@ import { RunnerConfigSchema } from "@/registry/run-config";
 import { ConfigSchema, type InputConfig } from "./config";
 import { logger } from "./log";
 
-function serve(registry: Registry<any>, inputConfig?: InputConfig): ServerType {
+async function serve(
+	registry: Registry<any>,
+	inputConfig?: InputConfig,
+): Promise<ServerType> {
 	// Configure default configuration
 	inputConfig ??= {};
 
@@ -30,7 +33,8 @@ function serve(registry: Registry<any>, inputConfig?: InputConfig): ServerType {
 
 	// Create router
 	const runConfig = RunnerConfigSchema.parse(inputConfig);
-	const driver = inputConfig.driver ?? createFileSystemOrMemoryDriver(false);
+	const driver =
+		inputConfig.driver ?? (await createFileSystemOrMemoryDriver(false));
 	const managerDriver = driver.manager(registry.config, config);
 	const client = createClientWithDriver(
 		managerDriver,
@@ -92,7 +96,7 @@ export async function setupTest<A extends Registry<any>>(
 
 	// Start server with a random port
 	const port = await getPort();
-	const server = serve(registry, { port });
+	const server = await serve(registry, { port });
 	c.onTestFinished(
 		async () =>
 			await new Promise((resolve) => server.close(() => resolve())),

package/src/utils/node.ts

@@ -0,0 +1,173 @@
+import { createRequire } from "node:module";
+
+// Global variables for Node.js modules.
+//
+// We use synchronous require() instead of async import() for Node.js module loading because:
+// 1. These modules are only needed in Node.js environments (not browser/edge)
+// 2. registry.start() cannot be async and needs immediate access to Node modules
+// 3. The setup process must be synchronous to avoid breaking the API
+//
+// Biome only allows imports of node modules in this file in order to ensure
+// we're forcing the use of dynamic imports.
+let nodeCrypto: typeof import("node:crypto") | undefined;
+let nodeFsSync: typeof import("node:fs") | undefined;
+let nodeFs: typeof import("node:fs/promises") | undefined;
+let nodePath: typeof import("node:path") | undefined;
+let nodeOs: typeof import("node:os") | undefined;
+let nodeChildProcess: typeof import("node:child_process") | undefined;
+let nodeStream: typeof import("node:stream/promises") | undefined;
+
+let hasImportedDependencies = false;
+
+// Helper to get a require function that works in both CommonJS and ESM.
+// We use require() instead of await import() because registry.start() cannot
+// be async and needs immediate access to Node.js modules during setup.
+function getRequireFn() {
+	// TODO: This causes issues in tsup
+	// CommonJS context - use global require
+	// if (typeof require !== "undefined") {
+	// 	console.log("existing require");
+	// 	return require;
+	// }
+
+	// ESM context - use createRequire with import.meta.url
+	// @ts-ignore - import.meta.url is available in ESM
+	return createRequire(import.meta.url);
+}
+
+/**
+ * Dynamically imports all required Node.js dependencies. We do this early in a
+ * single function call in order to surface errors early.
+ *
+ * This function is idempotent and will only import once.
+ *
+ * @throws Error if Node.js modules are not available (e.g., in browser/edge environments)
+ */
+export function importNodeDependencies(): void {
+	// Check if already loaded
+	if (hasImportedDependencies) return;
+
+	try {
+		// Get a require function that works in both CommonJS and ESM
+		const requireFn = getRequireFn();
+
+		// Use requireFn with webpack ignore comment to prevent bundling
+		// @ts-ignore - dynamic require usage
+		nodeCrypto = requireFn(/* webpackIgnore: true */ "node:crypto");
+		// @ts-ignore
+		nodeFsSync = requireFn(/* webpackIgnore: true */ "node:fs");
+		// @ts-ignore
+		nodeFs = requireFn(/* webpackIgnore: true */ "node:fs/promises");
+		// @ts-ignore
+		nodePath = requireFn(/* webpackIgnore: true */ "node:path");
+		// @ts-ignore
+		nodeOs = requireFn(/* webpackIgnore: true */ "node:os");
+		// @ts-ignore
+		nodeChildProcess = requireFn(
+			/* webpackIgnore: true */ "node:child_process",
+		);
+		// @ts-ignore
+		nodeStream = requireFn(
+			/* webpackIgnore: true */ "node:stream/promises",
+		);
+
+		hasImportedDependencies = true;
+	} catch (err) {
+		console.warn(
+			"Node.js modules not available, file system driver will not work",
+			err,
+		);
+		throw err;
+	}
+}
+
+/**
+ * Gets the Node.js crypto module.
+ * @throws Error if crypto module is not loaded
+ */
+export function getNodeCrypto(): typeof import("node:crypto") {
+	if (!nodeCrypto) {
+		throw new Error(
+			"Node crypto module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeCrypto;
+}
+
+/**
+ * Gets the Node.js fs module.
+ * @throws Error if fs module is not loaded
+ */
+export function getNodeFsSync(): typeof import("node:fs") {
+	if (!nodeFsSync) {
+		throw new Error(
+			"Node fs module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeFsSync;
+}
+
+/**
+ * Gets the Node.js fs/promises module.
+ * @throws Error if fs/promises module is not loaded
+ */
+export function getNodeFs(): typeof import("node:fs/promises") {
+	if (!nodeFs) {
+		throw new Error(
+			"Node fs/promises module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeFs;
+}
+
+/**
+ * Gets the Node.js path module.
+ * @throws Error if path module is not loaded
+ */
+export function getNodePath(): typeof import("node:path") {
+	if (!nodePath) {
+		throw new Error(
+			"Node path module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodePath;
+}
+
+/**
+ * Gets the Node.js os module.
+ * @throws Error if os module is not loaded
+ */
+export function getNodeOs(): typeof import("node:os") {
+	if (!nodeOs) {
+		throw new Error(
+			"Node os module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeOs;
+}
+
+/**
+ * Gets the Node.js child_process module.
+ * @throws Error if child_process module is not loaded
+ */
+export function getNodeChildProcess(): typeof import("node:child_process") {
+	if (!nodeChildProcess) {
+		throw new Error(
+			"Node child_process module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeChildProcess;
+}
+
+/**
+ * Gets the Node.js stream/promises module.
+ * @throws Error if stream/promises module is not loaded
+ */
+export function getNodeStream(): typeof import("node:stream/promises") {
+	if (!nodeStream) {
+		throw new Error(
+			"Node stream/promises module not loaded. Ensure importNodeDependencies() has been called.",
+		);
+	}
+	return nodeStream;
+}

package/src/utils.ts

@@ -279,7 +279,3 @@ export const EXTRA_ERROR_LOG = {
 	support: "https://rivet.dev/discord",
 	version: VERSION,
 };
-
-export function idToStr(id: ArrayBuffer): string {
-	return uuidstringify(new Uint8Array(id));
-}