fix: fix connection dead

Author: MasterPtato

clients/openapi/openapi.json

@@ -24,7 +24,15 @@
             "schema": {
               "type": "string"
             },
-            "required": true,
+            "required": false,
+            "name": "actor_ids",
+            "in": "query"
+          },
+          {
+            "schema": {
+              "type": "string"
+            },
+            "required": false,
             "name": "key",
             "in": "query"
           }

packages/rivetkit/package.json

@@ -163,7 +163,7 @@
     "@bare-ts/lib": "~0.3.0",
     "@hono/standard-validator": "^0.1.3",
     "@hono/zod-openapi": "^0.19.10",
-    "@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/engine/@rivetkit/engine-runner@b72b232",
+    "@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/engine/@rivetkit/engine-runner@9676fe4",
     "@rivetkit/fast-json-patch": "^3.1.2",
     "cbor-x": "^1.6.0",
     "hono": "^4.9.8",
@@ -211,4 +211,4 @@
     }
   },
   "stableVersion": "0.8.0"
-}
+}

packages/rivetkit/src/actor/instance.ts

@@ -84,8 +84,8 @@ export type ExtractActorState<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
-		? State
-		: never;
+	? State
+	: never;
 
 export type ExtractActorConnParams<A extends AnyActorInstance> =
 	A extends ActorInstance<
@@ -101,8 +101,8 @@ export type ExtractActorConnParams<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
-		? ConnParams
-		: never;
+	? ConnParams
+	: never;
 
 export type ExtractActorConnState<A extends AnyActorInstance> =
 	A extends ActorInstance<
@@ -118,8 +118,8 @@ export type ExtractActorConnState<A extends AnyActorInstance> =
 		// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
 		any
 	>
-		? ConnState
-		: never;
+	? ConnState
+	: never;
 
 export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 	// Shared actor context for this instance
@@ -1367,14 +1367,14 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 				try {
 					websocket.removeEventListener("close", onSocketClosed);
 					websocket.removeEventListener("error", onSocketClosed);
-				} catch {}
+				} catch { }
 				this.#activeRawWebSockets.delete(websocket);
 				this.#resetSleepTimer();
 			};
 			try {
 				websocket.addEventListener("close", onSocketClosed);
 				websocket.addEventListener("error", onSocketClosed);
-			} catch {}
+			} catch { }
 
 			// Handle WebSocket
 			await this.#config.onWebSocket(this.actorContext, websocket, opts);
@@ -1672,7 +1672,7 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
 		// Abort any listeners waiting for shutdown
 		try {
 			this.#abortController.abort();
-		} catch {}
+		} catch { }
 
 		// Call onStop lifecycle hook if defined
 		if (this.#config.onStop) {

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

@@ -22,6 +22,8 @@ import type { Client } from "@/client/client";
 import {
 	PATH_CONNECT_WEBSOCKET,
 	PATH_RAW_WEBSOCKET_PREFIX,
+	WS_PROTOCOL_CONN_PARAMS,
+	WS_PROTOCOL_ENCODING,
 } from "@/common/actor-router-consts";
 import type { UpgradeWebSocketArgs } from "@/common/inline-websocket-adapter2";
 import { getLogger } from "@/common/log";
@@ -85,6 +87,7 @@ export class EngineActorDriver implements ActorDriver {
 			totalSlots: config.totalSlots,
 			runnerName: config.runnerName,
 			runnerKey: config.runnerKey,
+			token: config.token,
 			metadata: {
 				inspectorToken: this.#runConfig.inspector.token(),
 			},
@@ -117,7 +120,7 @@ export class EngineActorDriver implements ActorDriver {
 				});
 				hasDisconnected = true;
 			},
-			onShutdown: () => {},
+			onShutdown: () => { },
 			fetch: this.#runnerFetch.bind(this),
 			websocket: this.#runnerWebSocket.bind(this),
 			onActorStart: this.#runnerOnActorStart.bind(this),
@@ -293,9 +296,23 @@ export class EngineActorDriver implements ActorDriver {
 
 		const url = new URL(request.url);
 
-		// Parse headers
-		const encodingRaw = request.headers.get(HEADER_ENCODING);
-		const connParamsRaw = request.headers.get(HEADER_CONN_PARAMS);
+		const protocols = request.headers.get("sec-websocket-protocol");
+		if (protocols == undefined) throw new Error(`Missing sec-websocket-protocol header`);
+
+		let encodingRaw: string | undefined;
+		let connParamsRaw: string | undefined;
+
+		// Parse protocols
+		const protocolList = protocols.split(",").map((p) => p.trim());
+		for (const protocol of protocolList) {
+			if (protocol.startsWith(WS_PROTOCOL_ENCODING)) {
+				encodingRaw = protocol.substring(WS_PROTOCOL_ENCODING.length);
+			} else if (protocol.startsWith(WS_PROTOCOL_CONN_PARAMS)) {
+				connParamsRaw = decodeURIComponent(
+					protocol.substring(WS_PROTOCOL_CONN_PARAMS.length),
+				);
+			}
+		}
 
 		const encoding = EncodingSchema.parse(encodingRaw);
 		const connParams = connParamsRaw ? JSON.parse(connParamsRaw) : undefined;

packages/rivetkit/src/drivers/engine/config.ts

@@ -23,6 +23,11 @@ export const ConfigSchema = z
 			.default(
 				() => getEnvUniversal("RIVET_RUNNER_KEY") ?? crypto.randomUUID(),
 			),
+		token: z
+			.string()
+			.default(
+				() => getEnvUniversal("RIVET_TOKEN") ?? "dev",
+			),
 		totalSlots: z.number().default(100_000),
 	})
 	.default({});

pnpm-lock.yaml

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Clear JavaScript-related cache folders recursively
+# Usage: ./clear_js_cache.sh [directory]
+
+# Set the target directory (default to current directory)
+TARGET_DIR="${1:-.}"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${YELLOW}Clearing JavaScript cache folders in: $TARGET_DIR${NC}"
+
+# Counter for removed folders
+removed_count=0
+
+# Function to safely remove directory
+remove_dir() {
+    local dir="$1"
+    if [ -d "$dir" ]; then
+        echo -e "Removing: ${RED}$dir${NC}"
+        rm -rf "$dir"
+        ((removed_count++))
+    fi
+}
+
+# Find and remove cache folders
+while IFS= read -r -d '' dir; do
+    remove_dir "$dir"
+done < <(find "$TARGET_DIR" -type d \( \
+    -name "node_modules" -o \
+    -name ".next" -o \
+    -name ".nuxt" -o \
+    -name "dist" -o \
+    -name "build" -o \
+    -name ".cache" -o \
+    -name ".parcel-cache" -o \
+    -name ".webpack" -o \
+    -name ".rollup.cache" -o \
+    -name ".vite" -o \
+    -name ".turbo" -o \
+    -name ".nx" -o \
+    -name "coverage" -o \
+    -name ".nyc_output" -o \
+    -name "out" -o \
+    -name ".output" -o \
+    -name ".vercel" -o \
+    -name ".netlify" -o \
+    -name "storybook-static" \
+\) -print0)
+
+# Also remove common cache files
+echo -e "${YELLOW}Removing cache files...${NC}"
+find "$TARGET_DIR" -type f \( \
+    -name "*.log" -o \
+    -name ".DS_Store" -o \
+    -name "Thumbs.db" -o \
+    -name "*.tmp" -o \
+    -name "*.temp" \
+\) -delete 2>/dev/null
+
+# Remove package-lock.json and yarn.lock (optional - uncomment if needed)
+# find "$TARGET_DIR" -name "package-lock.json" -delete 2>/dev/null
+# find "$TARGET_DIR" -name "yarn.lock" -delete 2>/dev/null
+
+echo -e "${GREEN}✓ Cleanup complete! Removed $removed_count cache folders.${NC}"
+
+# Optional: Show disk space freed (requires du command)
+if command -v du >/dev/null 2>&1; then
+    echo -e "${YELLOW}Disk space check completed.${NC}"
+fi