chore(depot-client): split sqlite vfs transports

Author: NathanFlurry

engine/packages/depot-client/Cargo.toml

@@ -12,6 +12,7 @@ crate-type = ["lib"]
 
 [dependencies]
 anyhow.workspace = true
+async-trait.workspace = true
 crossbeam-channel = "0.5"
 libsqlite3-sys = { version = "0.30", features = ["bundled"] }
 rivet-envoy-client = { workspace = true, features = ["native-transport"] }
@@ -25,7 +26,6 @@ moka = { version = "0.12", default-features = false, features = ["sync"] }
 parking_lot.workspace = true
 
 [dev-dependencies]
-async-trait.workspace = true
 depot = { workspace = true, features = ["test-faults"] }
 futures-util.workspace = true
 gas.workspace = true

engine/packages/depot-client/src/database.rs

@@ -7,8 +7,9 @@ use tokio::runtime::Handle;
 use crate::{
 	query::{BindParam, ExecResult, ExecuteResult, QueryResult},
 	vfs::{
-		NativeVfsHandle, SqliteTransport, SqliteVfs, SqliteVfsMetrics, SqliteVfsMetricsSnapshot,
-		VfsConfig, VfsPreloadHintSnapshot, fetch_initial_main_page_for_registration,
+		ConveyerSqliteTransport, EnvoySqliteTransport, NativeVfsHandle, SqliteVfs,
+		SqliteVfsMetrics, SqliteVfsMetricsSnapshot, VfsConfig, VfsPreloadHintSnapshot,
+		fetch_initial_main_page_for_registration,
 	},
 	worker::SqliteWorkerHandle,
 };
@@ -31,8 +32,8 @@ pub async fn open_database_from_envoy(
 	metrics: Option<Arc<dyn SqliteVfsMetrics>>,
 ) -> Result<NativeDatabaseHandle> {
 	let vfs_name = vfs_name_for_actor_database(&actor_id, generation);
-	let transport = SqliteTransport::from_envoy(handle);
-	let initial_main_page = fetch_initial_main_page_for_registration(&transport, &actor_id)
+	let transport = Arc::new(EnvoySqliteTransport::new(handle));
+	let initial_main_page = fetch_initial_main_page_for_registration(transport.clone(), &actor_id)
 		.await
 		.map_err(|e| anyhow!("failed to preload sqlite main page: {e}"))?;
 	let vfs = Arc::new(
@@ -61,8 +62,8 @@ pub async fn open_database_from_conveyer(
 	metrics: Option<Arc<dyn SqliteVfsMetrics>>,
 ) -> Result<NativeDatabaseHandle> {
 	let vfs_name = vfs_name_for_actor_database(&actor_id, generation);
-	let transport = SqliteTransport::from_conveyer(db);
-	let initial_main_page = fetch_initial_main_page_for_registration(&transport, &actor_id)
+	let transport = Arc::new(ConveyerSqliteTransport::new(db));
+	let initial_main_page = fetch_initial_main_page_for_registration(transport.clone(), &actor_id)
 		.await
 		.map_err(|e| anyhow!("failed to preload sqlite main page: {e}"))?;
 	let vfs = Arc::new(