refactor(rivetkit): move devtools to local script

Author: jog1t

.cargo/config.toml

@@ -1,5 +1,22 @@
 [build]
 rustflags = ["--cfg", "tokio_unstable"]
 
+# Target-specific flags must repeat tokio_unstable because target rustflags
+# override [build] rustflags. The link args are required on macOS for native
+# Node.js addons (dynamic_lookup defers symbol resolution to runtime).
+[target.aarch64-apple-darwin]
+rustflags = [
+    "--cfg", "tokio_unstable",
+    "-C", "link-arg=-undefined",
+    "-C", "link-arg=dynamic_lookup",
+]
+
+[target.x86_64-apple-darwin]
+rustflags = [
+    "--cfg", "tokio_unstable",
+    "-C", "link-arg=-undefined",
+    "-C", "link-arg=dynamic_lookup",
+]
+
 [env]
 LIBSQLITE3_FLAGS = "SQLITE_ENABLE_BATCH_ATOMIC_WRITE"

.github/workflows/publish.yaml

@@ -461,16 +461,6 @@ jobs:
             --version ${{ needs.context.outputs.version }} \
             --latest ${{ needs.context.outputs.latest }}
 
-      - name: Upload @rivetkit/devtools to R2
-        if: needs.context.outputs.trigger == 'release'
-        env:
-          R2_RELEASES_ACCESS_KEY_ID: ${{ secrets.R2_RELEASES_ACCESS_KEY_ID }}
-          R2_RELEASES_SECRET_ACCESS_KEY: ${{ secrets.R2_RELEASES_SECRET_ACCESS_KEY }}
-        run: |
-          pnpm --filter=publish exec tsx src/ci/bin.ts upload-devtools \
-            --sha ${{ needs.context.outputs.sha }} \
-            --version ${{ needs.context.outputs.version }} \
-            --latest ${{ needs.context.outputs.latest }}
 
       - name: Retag Docker manifests to version
         if: needs.context.outputs.trigger == 'release'

rivetkit-typescript/packages/devtools/src/mod.tsx

@@ -59,11 +59,11 @@ const openDevtools = () => {
 		console.error("RivetKit Devtools: No client config found");
 		return;
 	}
-	const url = new URL("http://localhost:6420/ui");
 	if (!config.endpoint) {
 		console.error("RivetKit Devtools: No endpoint found in client config");
 		return;
 	}
+	const url = new URL(`${config.endpoint.replace(/\/$/, "")}/ui`);
 	url.searchParams.set("u", config.endpoint);
 	if (config.token) {
 		url.searchParams.set("t", config.token);

rivetkit-typescript/packages/rivetkit/package.json

@@ -317,7 +317,8 @@
 		"dump-asyncapi": "tsx scripts/dump-asyncapi.ts",
 		"registry-config-schema-gen": "tsx scripts/registry-config-schema-gen.ts",
 		"actor-config-schema-gen": "tsx scripts/actor-config-schema-gen.ts",
-		"build:pack-inspector": "tsx scripts/pack-inspector.ts"
+		"build:pack-inspector": "tsx scripts/pack-inspector.ts",
+		"build:pack-devtools": "tsx scripts/pack-devtools.ts"
 	},
 	"dependencies": {
 		"@rivet-dev/agent-os-core": "^0.1.1",

rivetkit-typescript/packages/rivetkit/scripts/pack-devtools.ts

@@ -0,0 +1,19 @@
+import { existsSync } from "node:fs";
+import { copyFile, mkdir } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const src = join(__dirname, "../../devtools/dist/mod.js");
+const destDir = join(__dirname, "../dist/devtools");
+const dest = join(destDir, "mod.js");
+
+if (!existsSync(src)) {
+	throw new Error(
+		`Devtools build not found at: ${src}. Run 'pnpm build -F @rivetkit/devtools' first.`,
+	);
+}
+
+await mkdir(destDir, { recursive: true });
+await copyFile(src, dest);
+console.log(`Packed devtools into ${dest}`);

rivetkit-typescript/packages/rivetkit/src/devtools-loader/index.ts

@@ -1,16 +1,11 @@
 import type { ClientConfigInput } from "@/client/client";
-import { VERSION } from "@/utils";
 import { logger } from "./log";
 
 declare global {
 	// Injected via tsup config
-	// biome-ignore lint/style/noVar: required for global declaration
 	var CUSTOM_RIVETKIT_DEVTOOLS_URL: string | undefined;
 }
 
-const DEFAULT_DEVTOOLS_URL = (version = VERSION) =>
-	`https://releases.rivet.dev/rivet/latest/devtools/mod.js?v=${version}`;
-
 const scriptId = "rivetkit-devtools-script";
 
 export function injectDevtools(config: ClientConfigInput) {
@@ -20,10 +15,12 @@ export function injectDevtools(config: ClientConfigInput) {
 	}
 
 	if (!document.getElementById(scriptId)) {
+		const src =
+			globalThis.CUSTOM_RIVETKIT_DEVTOOLS_URL ||
+			`${config.endpoint?.replace(/\/$/, "")}/devtools/mod.js`;
 		const script = document.createElement("script");
 		script.id = scriptId;
-		script.src =
-			globalThis.CUSTOM_RIVETKIT_DEVTOOLS_URL || DEFAULT_DEVTOOLS_URL();
+		script.src = src;
 		script.async = true;
 		document.head.appendChild(script);
 	}

rivetkit-typescript/packages/rivetkit/src/devtools-loader/serve-devtools.ts

@@ -0,0 +1,26 @@
+import { getNodeFs, getNodePath, getNodeUrl } from "@/utils/node";
+
+export async function getDevtoolsPath(): Promise<string> {
+	const url = getNodeUrl();
+	const path = getNodePath();
+
+	const devtoolsPath = path.join(
+		path.dirname(url.fileURLToPath(import.meta.url)),
+		"../../dist/devtools/mod.js",
+	);
+
+	try {
+		await getNodeFs().access(devtoolsPath);
+	} catch {
+		throw new Error(
+			`Devtools bundle not found at ${devtoolsPath}. Run 'pnpm build:pack-devtools' first.`,
+		);
+	}
+
+	return devtoolsPath;
+}
+
+export async function readDevtoolsBundle(): Promise<Buffer> {
+	const devtoolsPath = await getDevtoolsPath();
+	return getNodeFs().readFile(devtoolsPath);
+}

rivetkit-typescript/packages/rivetkit/src/drivers/engine/actor-driver.ts

@@ -183,6 +183,7 @@ export class EngineActorDriver implements ActorDriver {
 			token: config.token,
 			namespace: config.namespace,
 			poolName: config.envoy.poolName,
+			notGlobal: false,
 			metadata: {
 				rivetkit: { version: VERSION },
 			},

rivetkit-typescript/packages/rivetkit/src/engine-client/api-utils.ts

@@ -21,7 +21,7 @@ export class EngineApiError extends Error {
 export function getEndpoint(config: ClientConfig | RegistryConfig) {
 	// Endpoint is always defined for ClientConfig (has default in schema).
 	// RegistryConfig may not have endpoint before the local runtime is prepared.
-	return config.endpoint ?? "http://127.0.0.1:6420";
+	return config.endpoint ?? "http://127.0.0.1:6423";
 }
 
 // Helper function for making API calls

rivetkit-typescript/packages/rivetkit/src/engine-process/constants.ts

@@ -1,2 +1,5 @@
-export const ENGINE_PORT = 6420;
+// The engine guard (public HTTP API) runs on this internal port.
+// The rivetkit manager runs on port 6420 (managerPort default) and proxies to
+// the engine here, so clients always connect to the manager on 6420.
+export const ENGINE_PORT = 6423;
 export const ENGINE_ENDPOINT = `http://127.0.0.1:${ENGINE_PORT}`;