Skip to content

fix(rivetkit): deserialize actor keys properly in manager router #4063

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
NathanFlurry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(rivetkit): deserialize actor keys properly in manager router #4063

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
15 changes: 10 additions & 5 deletions rivetkit-typescript/packages/rivetkit/src/manager/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import invariant from "invariant";
import { z } from "zod";
import { Forbidden, RestrictedFeature } from "@/actor/errors";

import { serializeActorKey } from "@/actor/keys";
import { deserializeActorKey, serializeActorKey } from "@/actor/keys";

import type { Encoding } from "@/client/mod";
import {
Expand Down Expand Up @@ -171,7 +171,7 @@ export function buildManagerRouter(
const actorOutput = await managerDriver.getWithKey({
c,
name,
key: [key], // Convert string to ActorKey array
key: deserializeActorKey(key),
});
if (actorOutput) {
actors.push(actorOutput);
Expand Down Expand Up @@ -242,10 +242,11 @@ export function buildManagerRouter(
const body = c.req.valid("json");

// Check if actor already exists
const actorKey = deserializeActorKey(body.key);
const existingActor = await managerDriver.getWithKey({
c,
name: body.name,
key: [body.key], // Convert string to ActorKey array
key: actorKey,
});

if (existingActor) {
Expand All @@ -259,7 +260,7 @@ export function buildManagerRouter(
const newActor = await managerDriver.getOrCreateWithKey({
c,
name: body.name,
key: [body.key], // Convert string to ActorKey array
key: actorKey,
input: body.input
? cbor.decode(Buffer.from(body.input, "base64"))
: undefined,
Expand Down Expand Up @@ -288,10 +289,14 @@ export function buildManagerRouter(
const body = c.req.valid("json");

// Create actor using the driver
const key =
body.key === undefined || body.key === null
? [crypto.randomUUID()]
: deserializeActorKey(body.key);
const actorOutput = await managerDriver.createActor({
c,
name: body.name,
key: [body.key || crypto.randomUUID()], // Generate key if not provided, convert to ActorKey array
key,
input: body.input
? cbor.decode(Buffer.from(body.input, "base64"))
: undefined,
Expand Down
Loading