Skip to content

fix(rivetkit): wire CancellationToken through waitForNamesAvailable to eliminate KV busy-polling #5063

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

Open
abcxff wants to merge 1 commit into
base: 05-14-fix_rivetkit_fix_bigint_serialization_in_inspector_workflow_history_and_state_deserialization
Choose a base branch
from
Open

fix(rivetkit): wire CancellationToken through waitForNamesAvailable to eliminate KV busy-polling #5063

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion rivetkit-typescript/packages/rivetkit-napi/src/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,10 @@ impl Queue {
&self,
names: Vec<String>,
options: Option<JsQueueWaitOptions>,
signal: Option<&CancellationToken>,
) -> napi::Result<()> {
self.inner
.wait_for_names_available(names, queue_wait_opts(options, None)?)
.wait_for_names_available(names, queue_wait_opts(options, signal)?)
.await
.map_err(napi_anyhow_error)
}
Expand Down
3 changes: 2 additions & 1 deletion rivetkit-typescript/packages/rivetkit/src/registry/napi-runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,10 +677,11 @@ export class NapiCoreRuntime implements CoreRuntime {
ctx: ActorContextHandle,
names: string[],
options?: RuntimeQueueWaitOptions | undefined | null,
signal?: CancellationTokenHandle | undefined | null,
): Promise<void> {
await asNativeActorContext(ctx)
.queue()
.waitForNamesAvailable(names, options);
.waitForNamesAvailable(names, options, signal);
}

async actorQueueEnqueueAndWait(
Expand Down
59 changes: 9 additions & 50 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 @@ -1649,65 +1649,24 @@ class NativeQueueAdapter {
signal?: AbortSignal;
},
) {
if (!options?.signal) {
const { token, cleanup } = await createCancellationTokenHandle(
this.#runtime,
options?.signal,
);

try {
await callNative(() =>
this.#runtime.actorQueueWaitForNamesAvailable(
this.#ctx,
[...names],
{
timeoutMs: options?.timeout,
},
token,
),
);
return;
}

const deadline =
options.timeout === undefined
? undefined
: Date.now() + options.timeout;

for (;;) {
if (options.signal.aborted) {
throw actorAbortedError();
}

const remainingTimeout =
deadline === undefined
? undefined
: Math.max(0, deadline - Date.now());
const sliceTimeout =
remainingTimeout === undefined
? 100
: Math.min(remainingTimeout, 100);

try {
await callNative(() =>
this.#runtime.actorQueueWaitForNamesAvailable(
this.#ctx,
[...names],
{
timeoutMs: sliceTimeout,
},
),
);
return;
} catch (error) {
if (
(error as { group?: string; code?: string }).group ===
"queue" &&
(error as { group?: string; code?: string }).code ===
"timed_out"
) {
if (
remainingTimeout === undefined ||
remainingTimeout > 100
) {
continue;
}
}
throw error;
}
} finally {
cleanup?.();
}
}

Expand Down
1 change: 1 addition & 0 deletions rivetkit-typescript/packages/rivetkit/src/registry/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ export interface CoreRuntime {
ctx: ActorContextHandle,
names: string[],
options?: RuntimeQueueWaitOptions | undefined | null,
signal?: CancellationTokenHandle | undefined | null,
): Promise<void>;
actorQueueEnqueueAndWait(
ctx: ActorContextHandle,
Expand Down
3 changes: 2 additions & 1 deletion rivetkit-typescript/packages/rivetkit/src/registry/wasm-runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,10 @@ export class WasmCoreRuntime implements CoreRuntime {
ctx: ActorContextHandle,
names: string[],
options?: RuntimeQueueWaitOptions | undefined | null,
signal?: CancellationTokenHandle | undefined | null,
): Promise<void> {
const queue = childHandle(asWasmActorContext(ctx), "queue");
await callHandleAsync(queue, "waitForNamesAvailable", names, options);
await callHandleAsync(queue, "waitForNamesAvailable", names, options, signal);
}

async actorQueueEnqueueAndWait(
Expand Down
Loading