From c40c936bcbc90e4cf5e9422eb3acc11fa3f785ec Mon Sep 17 00:00:00 2001
From: MasterPtato <maxpopkov.contact@gmail.com>
Date: Fri, 19 Jun 2026 14:25:58 -0700
Subject: [PATCH] [SLOP(claude-opus-4-8-medium)] chore: add profiling cargo
 profile for heaptrack leak investigation

---
 Cargo.toml                                    | 10 ++++
 .../rivetkit-napi/src/napi_actor_events.rs    | 47 +++++++++++++------
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3f544252f3..511aec200f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -672,6 +672,16 @@ lto = "fat"
 codegen-units = 1
 opt-level = 3
 
+# Release-grade optimization with DWARF line info and no symbol stripping so
+# heaptrack can resolve native allocation backtraces during leak investigation.
+# Uses thin LTO and more codegen units to keep frames un-inlined and builds fast.
+[profile.profiling]
+inherits = "release"
+debug = 1
+lto = "thin"
+codegen-units = 16
+strip = false
+
 [profile.quick]
 inherits = "dev"
 debug = false          # no debug info → faster link, smaller binary
diff --git a/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs b/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
index bb2e91a6f1..9da9f0847e 100644
--- a/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
+++ b/rivetkit-typescript/packages/rivetkit-napi/src/napi_actor_events.rs
@@ -173,21 +173,40 @@ async fn run_event_loop(
 	dirty: &Arc<AtomicBool>,
 	events: &mut ActorEvents,
 ) {
-	while let Some(event) = events.recv().await {
+	loop {
 		pump_registered_tasks(tasks, registered_task_rx);
-		dispatch_event(
-			event,
-			bindings,
-			config,
-			ctx,
-			abort,
-			tasks,
-			registered_task_rx,
-			dirty,
-		)
-		.await;
-		if ctx.has_end_reason() {
-			break;
+
+		tokio::select! {
+			// Reap completed background tasks as they finish. A tokio JoinSet
+			// retains each finished task's allocation until it is joined, so
+			// without this the set grows for the entire actor lifetime and
+			// shows up as native (non-V8) RSS growth.
+			Some(result) = tasks.join_next(), if !tasks.is_empty() => {
+				if let Err(error) = result {
+					if !error.is_cancelled() {
+						tracing::error!(?error, "napi background task failed to join");
+					}
+				}
+			}
+			event = events.recv() => {
+				let Some(event) = event else {
+					break;
+				};
+				dispatch_event(
+					event,
+					bindings,
+					config,
+					ctx,
+					abort,
+					tasks,
+					registered_task_rx,
+					dirty,
+				)
+				.await;
+				if ctx.has_end_reason() {
+					break;
+				}
+			}
 		}
 	}
 }