Skip to content

fix(rivetkit): remove async drizzle db proxy #4984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abcxff merged 1 commit into from
May 13, 2026
Merged

fix(rivetkit): remove async drizzle db proxy #4984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions rivetkit-typescript/packages/rivetkit/src/registry/native.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,15 @@ function databaseNotConfiguredError(): RivetError {
);
}

function databaseClientNotReadyError(): RivetError {
return new RivetError(
"actor",
"database_client_not_ready",
"actor database client was not initialized before user code ran. this is an internal lifecycle error; the migration callback should have pre-warmed the client. file an issue if you can reproduce.",
{ public: true },
);
}

function stateNotEnabledError(): RivetError {
return new RivetError(
"actor",
Expand Down Expand Up @@ -2325,7 +2334,6 @@ export class ActorContextHandleAdapter {
#clientFactory?: () => AnyClient;
#databaseProvider?: Exclude<AnyDatabaseProvider, undefined>;
#db?: unknown;
#dbProxy?: unknown;
#dispatchCancelToken?: CancellationTokenHandle;
#kv?: NativeKvAdapter;
#queue?: NativeQueueAdapter;
Expand Down Expand Up @@ -2388,32 +2396,18 @@ export class ActorContextHandleAdapter {
throw databaseNotConfiguredError();
}

if (!this.#dbProxy) {
this.#dbProxy = new Proxy(
{},
{
get: (_target, property) => {
if (property === "then") {
return undefined;
}
if (this.#db) {
return this.#db;
}

return async (...args: Array<unknown>) => {
const client = await this.ensureDatabaseClient();
const value = Reflect.get(
client as object,
property,
);
if (typeof value !== "function") {
return value;
}
return await value.apply(client, args);
};
},
},
);
const runtimeState = getNativeRuntimeState(this.#runtime, this.#ctx);
const cachedClient = runtimeState.databaseClient;
if (cachedClient) {
this.#db = cachedClient.client;
return this.#db;
}

return this.#dbProxy;
throw databaseClientNotReadyError();
}

get state(): unknown {
Expand Down
Loading