Skip to content

fix(core): strip basePath from routes for actor gateway on manager router #1346

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(core): strip basePath from routes for actor gateway on manager router #1346

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
31 changes: 24 additions & 7 deletions packages/rivetkit/src/manager/gateway.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,28 @@ export async function actorGateway(
return next();
}

// Strip basePath from the request path
let strippedPath = c.req.path;
if (runConfig.basePath && strippedPath.startsWith(runConfig.basePath)) {
strippedPath = strippedPath.slice(runConfig.basePath.length);
// Ensure the path starts with /
if (!strippedPath.startsWith("/")) {
strippedPath = "/" + strippedPath;
}
}

// Check if this is a WebSocket upgrade request
if (c.req.header("upgrade") === "websocket") {
return await handleWebSocketGateway(runConfig, managerDriver, c);
return await handleWebSocketGateway(
runConfig,
managerDriver,
c,
strippedPath,
);
}

// Handle regular HTTP requests
return await handleHttpGateway(managerDriver, c, next);
return await handleHttpGateway(managerDriver, c, next, strippedPath);
}

/**
Expand All @@ -53,6 +68,7 @@ async function handleWebSocketGateway(
runConfig: RunConfig,
managerDriver: ManagerDriver,
c: HonoContext,
strippedPath: string,
) {
const upgradeWebSocket = runConfig.getUpgradeWebSocket?.();
if (!upgradeWebSocket) {
Expand Down Expand Up @@ -100,7 +116,7 @@ async function handleWebSocketGateway(
logger().debug({
msg: "proxying websocket to actor",
actorId,
path: c.req.path,
path: strippedPath,
encoding: encodingRaw,
});

Expand All @@ -109,8 +125,8 @@ async function handleWebSocketGateway(

// Include query string if present
const pathWithQuery = c.req.url.includes("?")
? c.req.path + c.req.url.substring(c.req.url.indexOf("?"))
: c.req.path;
? strippedPath + c.req.url.substring(c.req.url.indexOf("?"))
: strippedPath;

return await managerDriver.proxyWebSocket(
c,
Expand All @@ -130,6 +146,7 @@ async function handleHttpGateway(
managerDriver: ManagerDriver,
c: HonoContext,
next: Next,
strippedPath: string,
) {
const target = c.req.header(HEADER_RIVET_TARGET);
const actorId = c.req.header(HEADER_RIVET_ACTOR);
Expand All @@ -145,7 +162,7 @@ async function handleHttpGateway(
logger().debug({
msg: "proxying request to actor",
actorId,
path: c.req.path,
path: strippedPath,
method: c.req.method,
});

Expand All @@ -156,7 +173,7 @@ async function handleHttpGateway(

// Build the proxy request with the actor URL format
const url = new URL(c.req.url);
const proxyUrl = new URL(`http://actor${url.pathname}${url.search}`);
const proxyUrl = new URL(`http://actor${strippedPath}${url.search}`);

const proxyRequest = new Request(proxyUrl, {
method: c.req.raw.method,
Expand Down
Loading