Skip to content

fix(rivetkit): fix duplicate runner key in serverless #3366

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

Closed
wants to merge 1 commit into from
Closed

fix(rivetkit): fix duplicate runner key in serverless #3366

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
10 changes: 5 additions & 5 deletions rivetkit-typescript/packages/rivetkit/src/drivers/engine/actor-driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class EngineActorDriver implements ActorDriver {

// HACK: Override inspector token (which are likely to be
// removed later on) with token from x-rivet-token header
const token = runConfig.token ?? runConfig.token;
const token = runConfig.token;
if (token && runConfig.inspector && runConfig.inspector.enabled) {
runConfig.inspector.token = () => token;
}
Expand All @@ -116,10 +116,10 @@ export class EngineActorDriver implements ActorDriver {
version: this.#version,
endpoint: getEndpoint(runConfig),
token,
namespace: runConfig.namespace ?? runConfig.namespace,
totalSlots: runConfig.totalSlots ?? runConfig.totalSlots,
runnerName: runConfig.runnerName ?? runConfig.runnerName,
runnerKey: runConfig.runnerKey,
namespace: runConfig.namespace,
totalSlots: runConfig.totalSlots,
runnerName: runConfig.runnerName,
runnerKey: runConfig.runnerKey ?? crypto.randomUUID(),
metadata: {
inspectorToken: this.#runConfig.inspector.token(),
},
Expand Down
6 changes: 2 additions & 4 deletions rivetkit-typescript/packages/rivetkit/src/drivers/engine/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ export const EngingConfigSchema = z
/** Unique key for this runner. Runners connecting a given key will replace any other runner connected with the same key. */
runnerKey: z
.string()
.default(
() =>
getEnvUniversal("RIVET_RUNNER_KEY") ?? crypto.randomUUID(),
),
.optional()
.transform((x) => x ?? getEnvUniversal("RIVET_RUNNER_KEY")),

/** How many actors this runner can run. */
totalSlots: z.number().default(100_000),
Expand Down
7 changes: 7 additions & 0 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 @@ -186,6 +186,13 @@ function addServerlessRoutes(
newRunConfig.totalSlots = totalSlots;
newRunConfig.runnerName = runnerName;
newRunConfig.namespace = namespace;
if (newRunConfig.runnerKey) {
logger().warn({
msg: "runner keys are not supported by serverless runners, this will be overwritten with a random runner key",
oldRunnerKey: newRunConfig.runnerKey,
});
newRunConfig.runnerKey = undefined;
}

// Create new actor driver with updated config
const actorDriver = driverConfig.actor(
Expand Down
Loading