Skip to content

Commit 1a38ad5

Browse files
committed
fix: fix connection dead
1 parent c101706 commit 1a38ad5

File tree

8 files changed

+113
-33
lines changed

8 files changed

+113
-33
lines changed

clients/openapi/openapi.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@
2424
"schema": {
2525
"type": "string"
2626
},
27-
"required": true,
27+
"required": false,
28+
"name": "actor_ids",
29+
"in": "query"
30+
},
31+
{
32+
"schema": {
33+
"type": "string"
34+
},
35+
"required": false,
2836
"name": "key",
2937
"in": "query"
3038
}

packages/rivetkit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"@bare-ts/lib": "~0.3.0",
164164
"@hono/standard-validator": "^0.1.3",
165165
"@hono/zod-openapi": "^0.19.10",
166-
"@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/engine/@rivetkit/engine-runner@b72b232",
166+
"@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/engine/@rivetkit/engine-runner@9676fe4",
167167
"@rivetkit/fast-json-patch": "^3.1.2",
168168
"cbor-x": "^1.6.0",
169169
"hono": "^4.9.8",
@@ -211,4 +211,4 @@
211211
}
212212
},
213213
"stableVersion": "0.8.0"
214-
}
214+
}

packages/rivetkit/src/actor/instance.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ export type ExtractActorState<A extends AnyActorInstance> =
8484
// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
8585
any
8686
>
87-
? State
88-
: never;
87+
? State
88+
: never;
8989

9090
export type ExtractActorConnParams<A extends AnyActorInstance> =
9191
A extends ActorInstance<
@@ -101,8 +101,8 @@ export type ExtractActorConnParams<A extends AnyActorInstance> =
101101
// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
102102
any
103103
>
104-
? ConnParams
105-
: never;
104+
? ConnParams
105+
: never;
106106

107107
export type ExtractActorConnState<A extends AnyActorInstance> =
108108
A extends ActorInstance<
@@ -118,8 +118,8 @@ export type ExtractActorConnState<A extends AnyActorInstance> =
118118
// biome-ignore lint/suspicious/noExplicitAny: Must be used for `extends`
119119
any
120120
>
121-
? ConnState
122-
: never;
121+
? ConnState
122+
: never;
123123

124124
export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
125125
// Shared actor context for this instance
@@ -1367,14 +1367,14 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
13671367
try {
13681368
websocket.removeEventListener("close", onSocketClosed);
13691369
websocket.removeEventListener("error", onSocketClosed);
1370-
} catch {}
1370+
} catch { }
13711371
this.#activeRawWebSockets.delete(websocket);
13721372
this.#resetSleepTimer();
13731373
};
13741374
try {
13751375
websocket.addEventListener("close", onSocketClosed);
13761376
websocket.addEventListener("error", onSocketClosed);
1377-
} catch {}
1377+
} catch { }
13781378

13791379
// Handle WebSocket
13801380
await this.#config.onWebSocket(this.actorContext, websocket, opts);
@@ -1672,7 +1672,7 @@ export class ActorInstance<S, CP, CS, V, I, DB extends AnyDatabaseProvider> {
16721672
// Abort any listeners waiting for shutdown
16731673
try {
16741674
this.#abortController.abort();
1675-
} catch {}
1675+
} catch { }
16761676

16771677
// Call onStop lifecycle hook if defined
16781678
if (this.#config.onStop) {

packages/rivetkit/src/common/logfmt.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export function castToLogValue(v: unknown): any {
112112
return v;
113113
}
114114
if (v instanceof Error) {
115+
console.log(v.stack, "--------------------");
115116
//args.push(...errorToLogEntries(k, v));
116117
return String(v);
117118
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export class EngineActorDriver implements ActorDriver {
8585
totalSlots: config.totalSlots,
8686
runnerName: config.runnerName,
8787
runnerKey: config.runnerKey,
88+
token: config.token,
8889
metadata: {
8990
inspectorToken: this.#runConfig.inspector.token(),
9091
},
@@ -117,7 +118,7 @@ export class EngineActorDriver implements ActorDriver {
117118
});
118119
hasDisconnected = true;
119120
},
120-
onShutdown: () => {},
121+
onShutdown: () => { },
121122
fetch: this.#runnerFetch.bind(this),
122123
websocket: this.#runnerWebSocket.bind(this),
123124
onActorStart: this.#runnerOnActorStart.bind(this),

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ export const ConfigSchema = z
2323
.default(
2424
() => getEnvUniversal("RIVET_RUNNER_KEY") ?? crypto.randomUUID(),
2525
),
26+
token: z
27+
.string()
28+
.default(
29+
() => getEnvUniversal("RIVET_TOKEN") ?? "dev",
30+
),
2631
totalSlots: z.number().default(100_000),
2732
})
2833
.default({});

pnpm-lock.yaml

Lines changed: 11 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/nuke-cache.sh

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#!/bin/bash
2+
3+
# Clear JavaScript-related cache folders recursively
4+
# Usage: ./clear_js_cache.sh [directory]
5+
6+
# Set the target directory (default to current directory)
7+
TARGET_DIR="${1:-.}"
8+
9+
# Colors for output
10+
RED='\033[0;31m'
11+
GREEN='\033[0;32m'
12+
YELLOW='\033[1;33m'
13+
NC='\033[0m' # No Color
14+
15+
echo -e "${YELLOW}Clearing JavaScript cache folders in: $TARGET_DIR${NC}"
16+
17+
# Counter for removed folders
18+
removed_count=0
19+
20+
# Function to safely remove directory
21+
remove_dir() {
22+
local dir="$1"
23+
if [ -d "$dir" ]; then
24+
echo -e "Removing: ${RED}$dir${NC}"
25+
rm -rf "$dir"
26+
((removed_count++))
27+
fi
28+
}
29+
30+
# Find and remove cache folders
31+
while IFS= read -r -d '' dir; do
32+
remove_dir "$dir"
33+
done < <(find "$TARGET_DIR" -type d \( \
34+
-name "node_modules" -o \
35+
-name ".next" -o \
36+
-name ".nuxt" -o \
37+
-name "dist" -o \
38+
-name "build" -o \
39+
-name ".cache" -o \
40+
-name ".parcel-cache" -o \
41+
-name ".webpack" -o \
42+
-name ".rollup.cache" -o \
43+
-name ".vite" -o \
44+
-name ".turbo" -o \
45+
-name ".nx" -o \
46+
-name "coverage" -o \
47+
-name ".nyc_output" -o \
48+
-name "out" -o \
49+
-name ".output" -o \
50+
-name ".vercel" -o \
51+
-name ".netlify" -o \
52+
-name "storybook-static" \
53+
\) -print0)
54+
55+
# Also remove common cache files
56+
echo -e "${YELLOW}Removing cache files...${NC}"
57+
find "$TARGET_DIR" -type f \( \
58+
-name "*.log" -o \
59+
-name ".DS_Store" -o \
60+
-name "Thumbs.db" -o \
61+
-name "*.tmp" -o \
62+
-name "*.temp" \
63+
\) -delete 2>/dev/null
64+
65+
# Remove package-lock.json and yarn.lock (optional - uncomment if needed)
66+
# find "$TARGET_DIR" -name "package-lock.json" -delete 2>/dev/null
67+
# find "$TARGET_DIR" -name "yarn.lock" -delete 2>/dev/null
68+
69+
echo -e "${GREEN}✓ Cleanup complete! Removed $removed_count cache folders.${NC}"
70+
71+
# Optional: Show disk space freed (requires du command)
72+
if command -v du >/dev/null 2>&1; then
73+
echo -e "${YELLOW}Disk space check completed.${NC}"
74+
fi

0 commit comments

Comments
 (0)