Skip to content

Commit 89b58dd

Browse files
committed
fix(serverless): read x-rivet-token from start endpoint (#1315)
1 parent c5a0d7f commit 89b58dd

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

packages/rivetkit/src/manager/router.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export function createManagerRouter(
105105
}
106106

107107
function addServerlessRoutes(
108-
serverlessActorDriverBuilder: () => ActorDriver,
108+
serverlessActorDriverBuilder: (token: string | undefined) => ActorDriver,
109109
router: OpenAPIHono,
110110
cors: MiddlewareHandler,
111111
) {
@@ -118,7 +118,7 @@ function addServerlessRoutes(
118118

119119
// Serverless start endpoint
120120
router.get("/start", cors, async (c) => {
121-
const actorDriver = serverlessActorDriverBuilder();
121+
const actorDriver = serverlessActorDriverBuilder(c.req.header("x-rivet-token"));
122122
invariant(
123123
actorDriver.serverlessHandleStart,
124124
"missing serverlessHandleStart on ActorDriver",
@@ -169,9 +169,9 @@ function addManagerRoutes(
169169

170170
const actorIdsParsed = actor_ids
171171
? actor_ids
172-
.split(",")
173-
.map((id) => id.trim())
174-
.filter((id) => id.length > 0)
172+
.split(",")
173+
.map((id) => id.trim())
174+
.filter((id) => id.length > 0)
175175
: undefined;
176176

177177
const actors: ActorOutput[] = [];

packages/rivetkit/src/registry/mod.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ export class Registry<A extends RegistryActors> {
215215
console.log();
216216
}
217217

218-
let serverlessActorDriverBuilder: (() => ActorDriver) | undefined = () => {
218+
let serverlessActorDriverBuilder: ((token?: string) => ActorDriver) | undefined = (token: string | undefined) => {
219+
// Override config token if one was set
220+
if (token) config.token = token;
221+
219222
return driver.actor(this.#config, config, managerDriver, client);
220223
};
221224

0 commit comments

Comments
 (0)