chore(core): simplify appending paths (#1254)

Author: NathanFlurry

packages/rivetkit/src/remote-manager-driver/actor-http-client.ts

@@ -1,4 +1,5 @@
 import type { ClientConfig } from "@/client/config";
+import { combineUrlPath } from "@/utils";
 import { getEndpoint } from "./api-utils";
 
 export async function sendHttpRequestToActor(
@@ -9,7 +10,7 @@ export async function sendHttpRequestToActor(
 	// Route through guard port
 	const url = new URL(actorRequest.url);
 	const endpoint = getEndpoint(runConfig);
-	const guardUrl = `${endpoint}${url.pathname}${url.search}`;
+	const guardUrl = combineUrlPath(endpoint, url.pathname + url.search);
 
 	// Handle body properly based on method and presence
 	let bodyToSend: ArrayBuffer | null = null;

packages/rivetkit/src/remote-manager-driver/actor-websocket-client.ts

@@ -6,6 +6,7 @@ import {
 import type { ClientConfig } from "@/client/config";
 import { importWebSocket } from "@/common/websocket";
 import type { Encoding, UniversalWebSocket } from "@/mod";
+import { combineUrlPath } from "@/utils";
 import { getEndpoint } from "./api-utils";
 import { logger } from "./log";
 
@@ -20,7 +21,7 @@ export async function openWebSocketToActor(
 
 	// WebSocket connections go through guard
 	const endpoint = getEndpoint(runConfig);
-	const guardUrl = `${endpoint}${path}`;
+	const guardUrl = combineUrlPath(endpoint, path);
 
 	logger().debug({
 		msg: "opening websocket to actor via guard",

packages/rivetkit/src/remote-manager-driver/api-utils.ts

@@ -1,5 +1,6 @@
 import type { ClientConfig } from "@/client/config";
 import { sendHttpRequest } from "@/client/utils";
+import { combineUrlPath } from "@/utils";
 import { logger } from "./log";
 
 // Error class for Engine API errors
@@ -26,7 +27,9 @@ export async function apiCall<TInput = unknown, TOutput = unknown>(
 	body?: TInput,
 ): Promise<TOutput> {
 	const endpoint = getEndpoint(config);
-	const url = `${endpoint}${path}${path.includes("?") ? "&" : "?"}namespace=${encodeURIComponent(config.namespace)}`;
+	const url = combineUrlPath(endpoint, path, {
+		namespace: config.namespace,
+	});
 
 	logger().debug({ msg: "making api call", method, url });
 

packages/rivetkit/src/remote-manager-driver/mod.ts

@@ -17,6 +17,7 @@ import type {
 import type { ManagerInspector } from "@/inspector/manager";
 import type { Encoding, RegistryConfig, UniversalWebSocket } from "@/mod";
 import type { RunConfig } from "@/registry/run-config";
+import { combineUrlPath } from "@/utils";
 import { sendHttpRequestToActor } from "./actor-http-client";
 import {
 	buildGuardHeadersForWebSocket,
@@ -246,7 +247,7 @@ export class RemoteManagerDriver implements ManagerDriver {
 		invariant(upgradeWebSocket, "missing getUpgradeWebSocket");
 
 		const endpoint = getEndpoint(this.#config);
-		const guardUrl = `${endpoint}${path}`;
+		const guardUrl = combineUrlPath(endpoint, path);
 		const wsGuardUrl = guardUrl.replace("http://", "ws://");
 
 		logger().debug({

packages/rivetkit/src/utils.ts

@@ -170,3 +170,56 @@ export function bufferToArrayBuffer(buf: Buffer | Uint8Array): ArrayBuffer {
 		buf.byteOffset + buf.byteLength,
 	) as ArrayBuffer;
 }
+
+/**
+ * Properly combines a base URL endpoint with a path, preserving any base path in the endpoint.
+ *
+ * @example
+ * combineUrlPath("http://localhost:8787/rivet", "/actors/action")
+ * // Returns: "http://localhost:8787/rivet/actors/action"
+ *
+ * @example
+ * combineUrlPath("http://localhost:8787/rivet", "/actors?type=foo", { namespace: "test" })
+ * // Returns: "http://localhost:8787/rivet/actors?type=foo&namespace=test"
+ *
+ * @param endpoint The base URL endpoint that may contain a path component
+ * @param path The path to append to the endpoint (may include query parameters)
+ * @param queryParams Optional additional query parameters to append
+ * @returns The properly combined URL string
+ */
+export function combineUrlPath(
+	endpoint: string,
+	path: string,
+	queryParams?: Record<string, string | undefined>,
+): string {
+	const baseUrl = new URL(endpoint);
+
+	// Extract path and query from the provided path
+	const pathParts = path.split("?");
+	const pathOnly = pathParts[0];
+	const existingQuery = pathParts[1] || "";
+
+	// Remove trailing slash from base path and ensure path starts with /
+	const basePath = baseUrl.pathname.replace(/\/$/, "");
+	const cleanPath = pathOnly.startsWith("/") ? pathOnly : `/${pathOnly}`;
+	// Combine paths and remove any double slashes
+	const fullPath = (basePath + cleanPath).replace(/\/\//g, "/");
+
+	// Build query string
+	const queryParts: string[] = [];
+	if (existingQuery) {
+		queryParts.push(existingQuery);
+	}
+	if (queryParams) {
+		for (const [key, value] of Object.entries(queryParams)) {
+			if (value !== undefined) {
+				queryParts.push(
+					`${encodeURIComponent(key)}=${encodeURIComponent(value)}`,
+				);
+			}
+		}
+	}
+
+	const fullQuery = queryParts.length > 0 ? `?${queryParts.join("&")}` : "";
+	return `${baseUrl.protocol}//${baseUrl.host}${fullPath}${fullQuery}`;
+}