@rivetkit/cloudflare-workers 2.1.6 → 2.1.7

package/src/actor-driver.ts

@@ -6,7 +6,6 @@ import type {
 	RegistryConfig,
 } from "rivetkit";
 import { lookupInRegistry } from "rivetkit";
-import type { Client } from "rivetkit/client";
 import type {
 	ActorDriver,
 	AnyActorInstance,
@@ -14,7 +13,14 @@ import type {
 } from "rivetkit/driver-helpers";
 import { promiseWithResolvers } from "rivetkit/utils";
 import { logger } from "./log";
-import { kvDelete, kvGet, kvListPrefix, kvPut } from "./actor-kv";
+import {
+	kvDelete,
+	kvDeleteRange,
+	kvGet,
+	kvListPrefix,
+	kvListRange,
+	kvPut,
+} from "./actor-kv";
 import { GLOBAL_KV_KEYS } from "./global-kv";
 import { getCloudflareAmbientEnv } from "./handler";
 import { parseActorId } from "./actor-id";
@@ -105,13 +111,13 @@ export class ActorGlobalState {
 export class CloudflareActorsActorDriver implements ActorDriver {
 	#registryConfig: RegistryConfig;
 	#managerDriver: ManagerDriver;
-	#inlineClient: Client<any>;
+	#inlineClient: any;
 	#globalState: CloudflareDurableObjectGlobalState;
 
 	constructor(
 		registryConfig: RegistryConfig,
 		managerDriver: ManagerDriver,
-		inlineClient: Client<any>,
+		inlineClient: any,
 		globalState: CloudflareDurableObjectGlobalState,
 	) {
 		this.#registryConfig = registryConfig;
@@ -143,7 +149,12 @@ export class CloudflareActorsActorDriver implements ActorDriver {
 		// Create new actor state if it doesn't exist
 		if (!actorState) {
 			actorState = new ActorGlobalState();
-			actorState.actorPromise = promiseWithResolvers((reason) => logger().warn({ msg: "unhandled actor promise rejection", reason }));
+			actorState.actorPromise = promiseWithResolvers((reason) =>
+				logger().warn({
+					msg: "unhandled actor promise rejection",
+					reason,
+				}),
+			);
 			this.#globalState.setActorState(doState.ctx, actorState);
 		} else if (actorState.actorPromise) {
 			// Another request is already loading this actor, wait for it
@@ -191,7 +202,8 @@ export class CloudflareActorsActorDriver implements ActorDriver {
 		actorState.actorInstance = definition.instantiate();
 
 		// Start actor
-		await actorState.actorInstance.start(
+		const actorInstance = actorState.actorInstance as any;
+		await actorInstance.start(
 			this,
 			this.#inlineClient,
 			actorId,
@@ -256,13 +268,39 @@ export class CloudflareActorsActorDriver implements ActorDriver {
 		}
 	}
 
+	async kvDeleteRange(
+		actorId: string,
+		start: Uint8Array,
+		end: Uint8Array,
+	): Promise<void> {
+		const sql = this.#getDOCtx(actorId).storage.sql;
+		kvDeleteRange(sql, start, end);
+	}
+
 	async kvListPrefix(
 		actorId: string,
 		prefix: Uint8Array,
+		options?: {
+			reverse?: boolean;
+			limit?: number;
+		},
 	): Promise<[Uint8Array, Uint8Array][]> {
 		const sql = this.#getDOCtx(actorId).storage.sql;
 
-		return kvListPrefix(sql, prefix);
+		return kvListPrefix(sql, prefix, options);
+	}
+
+	async kvListRange(
+		actorId: string,
+		start: Uint8Array,
+		end: Uint8Array,
+		options?: {
+			reverse?: boolean;
+			limit?: number;
+		},
+	): Promise<[Uint8Array, Uint8Array][]> {
+		const sql = this.#getDOCtx(actorId).storage.sql;
+		return kvListRange(sql, start, end, options);
 	}
 
 	startDestroy(actorId: string): void {
@@ -323,7 +361,7 @@ export function createCloudflareActorsActorDriverBuilder(
 	return (
 		config: RegistryConfig,
 		managerDriver: ManagerDriver,
-		inlineClient: Client<any>,
+		inlineClient: any,
 	) => {
 		return new CloudflareActorsActorDriver(
 			config,

package/src/actor-handler-do.ts

@@ -175,7 +175,10 @@ export function createActorDurableObject(
 			const managerDriver = new CloudflareActorsManagerDriver();
 
 			// Create inline client
-			const inlineClient = createClientWithDriver(managerDriver);
+			// Avoid expensive type expansion in downstream DTS generation.
+			const inlineClient: any = (createClientWithDriver as any)(
+				managerDriver,
+			);
 
 			// Create actor driver builder
 			const actorDriverBuilder =

package/src/actor-kv.ts

@@ -1,3 +1,5 @@
+const DEFAULT_LIST_LIMIT = 16_384;
+
 export function kvGet(sql: SqlStorage, key: Uint8Array): Uint8Array | null {
 	const cursor = sql.exec(
 		"SELECT value FROM _rivetkit_kv_storage WHERE key = ?",
@@ -27,27 +29,61 @@ export function kvDelete(sql: SqlStorage, key: Uint8Array): void {
 	sql.exec("DELETE FROM _rivetkit_kv_storage WHERE key = ?", key);
 }
 
+export function kvDeleteRange(
+	sql: SqlStorage,
+	start: Uint8Array,
+	end: Uint8Array,
+): void {
+	sql.exec(
+		"DELETE FROM _rivetkit_kv_storage WHERE key >= ? AND key < ?",
+		start,
+		end,
+	);
+}
+
 export function kvListPrefix(
 	sql: SqlStorage,
 	prefix: Uint8Array,
+	options?: {
+		reverse?: boolean;
+		limit?: number;
+	},
 ): [Uint8Array, Uint8Array][] {
-	const cursor = sql.exec("SELECT key, value FROM _rivetkit_kv_storage");
-	const entries: [Uint8Array, Uint8Array][] = [];
-
-	for (const row of cursor.raw()) {
-		const key = toUint8Array(row[0]);
-		const value = toUint8Array(row[1]);
-
-		// Check if key starts with prefix
-		if (hasPrefix(key, prefix)) {
-			entries.push([key, value]);
-		}
+	const upperBound = computePrefixUpperBound(prefix);
+	if (upperBound) {
+		return kvListRange(sql, prefix, upperBound, options);
 	}
 
-	return entries;
+	const direction = options?.reverse ? "DESC" : "ASC";
+	const limit = options?.limit ?? DEFAULT_LIST_LIMIT;
+	const cursor = sql.exec(
+		`SELECT key, value FROM _rivetkit_kv_storage WHERE key >= ? ORDER BY key ${direction} LIMIT ?`,
+		prefix,
+		limit,
+	);
+	return readEntries(cursor);
+}
+
+export function kvListRange(
+	sql: SqlStorage,
+	start: Uint8Array,
+	end: Uint8Array,
+	options?: {
+		reverse?: boolean;
+		limit?: number;
+	},
+): [Uint8Array, Uint8Array][] {
+	const direction = options?.reverse ? "DESC" : "ASC";
+	const limit = options?.limit ?? DEFAULT_LIST_LIMIT;
+	const cursor = sql.exec(
+		`SELECT key, value FROM _rivetkit_kv_storage WHERE key >= ? AND key < ? ORDER BY key ${direction} LIMIT ?`,
+		start,
+		end,
+		limit,
+	);
+	return readEntries(cursor);
 }
 
-// Helper function to convert SqlStorageValue to Uint8Array
 function toUint8Array(
 	value: string | number | ArrayBuffer | Uint8Array | null,
 ): Uint8Array {
@@ -62,10 +98,23 @@ function toUint8Array(
 	);
 }
 
-function hasPrefix(arr: Uint8Array, prefix: Uint8Array): boolean {
-	if (prefix.length > arr.length) return false;
-	for (let i = 0; i < prefix.length; i++) {
-		if (arr[i] !== prefix[i]) return false;
+function readEntries(
+	cursor: ReturnType<SqlStorage["exec"]>,
+): [Uint8Array, Uint8Array][] {
+	const entries: [Uint8Array, Uint8Array][] = [];
+	for (const row of cursor.raw()) {
+		entries.push([toUint8Array(row[0]), toUint8Array(row[1])]);
 	}
-	return true;
+	return entries;
+}
+
+function computePrefixUpperBound(prefix: Uint8Array): Uint8Array | null {
+	const upperBound = prefix.slice();
+	for (let i = upperBound.length - 1; i >= 0; i--) {
+		if (upperBound[i] !== 0xff) {
+			upperBound[i]++;
+			return upperBound.slice(0, i + 1);
+		}
+	}
+	return null;
 }

package/src/config.ts

@@ -5,16 +5,14 @@ const ConfigSchemaBase = z.object({
 	/** Path that the Rivet manager API will be mounted. */
 	managerPath: z.string().optional().default("/api/rivet"),
 
-	/** Runner key for authentication. */
+	/** Deprecated. Runner key for authentication. */
 	runnerKey: z.string().optional(),
 
 	/** Disable the welcome message. */
 	noWelcome: z.boolean().optional().default(false),
 
 	fetch: z
-		.custom<
-			ExportedHandlerFetchHandler<{ RIVET: Client<any> }, unknown>
-		>()
+		.custom<ExportedHandlerFetchHandler<{ RIVET: Client<any> }, unknown>>()
 		.optional(),
 });
 export const ConfigSchema = ConfigSchemaBase.default(() =>

package/src/handler.ts

@@ -91,7 +91,8 @@ export function createInlineClient<R extends Registry<any>>(
 	);
 
 	// Create client using the manager driver
-	const client = createClientWithDriver<R>(managerDriver);
+	// Avoid excessive generic expansion in DTS generation.
+	const client = (createClientWithDriver as any)(managerDriver) as Client<R>;
 
 	return { client, fetch: router.fetch.bind(router), config, ActorHandler };
 }
@@ -103,14 +104,18 @@ export function createInlineClient<R extends Registry<any>>(
  *
  * This includes a `fetch` handler and `ActorHandler` Durable Object.
  */
-export function createHandler<R extends Registry<any>>(
-	registry: R,
+export function createHandler(
+	registry: Registry<any>,
 	inputConfig?: InputConfig,
 ): HandlerOutput {
-	const { client, fetch, config, ActorHandler } = createInlineClient(
-		registry,
-		inputConfig,
-	);
+	const inline = (createInlineClient as any)(registry, inputConfig);
+	const client = inline.client as any;
+	const fetch = inline.fetch as (
+		request: Request,
+		...args: any
+	) => Response | Promise<Response>;
+	const config = inline.config as Config;
+	const ActorHandler = inline.ActorHandler as DurableObjectConstructor;
 
 	// Create Cloudflare handler
 	const handler = {