chore: restructure server binaries

packages/common/chirp-workflow/core/src/db/fdb_sqlite_nats/mod.rs

@@ -677,7 +677,7 @@ impl Database for DatabaseFdbSqliteNats {
 		// Set up sqlite
 		let pulled_workflows = futures_util::stream::iter(partial_workflows)
 			.map(|partial| async move {
-				let pool = self.pools.sqlite(partial.workflow_id).await?;
+				let pool = self.pools.sqlite(db_name(partial.workflow_id)).await?;
 				sqlite::init(partial.workflow_id, &pool).await?;
 
 				// Fetch all events
@@ -1170,7 +1170,7 @@ impl Database for DatabaseFdbSqliteNats {
 		version: usize,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<Option<SignalData>> {
-		let pool = self.pools.sqlite(workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(workflow_id)).await?;
 
 		let owned_filter = filter
 			.into_iter()
@@ -1840,7 +1840,7 @@ impl Database for DatabaseFdbSqliteNats {
 		body: &serde_json::value::RawValue,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		// Insert history event
 		self.query(|| async {
@@ -1901,7 +1901,7 @@ impl Database for DatabaseFdbSqliteNats {
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
 		if TAGGED_SIGNALS_ENABLED {
-			let pool = self.pools.sqlite(from_workflow_id).await?;
+			let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 			// Insert history event
 			self.query(|| async {
@@ -1965,7 +1965,7 @@ impl Database for DatabaseFdbSqliteNats {
 		loop_location: Option<&Location>,
 		unique: bool,
 	) -> WorkflowResult<Uuid> {
-		let pool = self.pools.sqlite(workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(workflow_id)).await?;
 
 		// Insert history event
 		self.query(|| async {
@@ -2127,7 +2127,7 @@ impl Database for DatabaseFdbSqliteNats {
 		res: Result<&serde_json::value::RawValue, &str>,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(workflow_id)).await?;
 		let input_hash = event_id.input_hash.to_be_bytes();
 
 		match res {
@@ -2233,7 +2233,7 @@ impl Database for DatabaseFdbSqliteNats {
 		body: &serde_json::value::RawValue,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2269,7 +2269,7 @@ impl Database for DatabaseFdbSqliteNats {
 		output: Option<&serde_json::value::RawValue>,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(workflow_id)).await?;
 
 		self.query(|| async {
 			// Attempt to use an existing connection
@@ -2443,7 +2443,7 @@ impl Database for DatabaseFdbSqliteNats {
 		deadline_ts: i64,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2474,7 +2474,7 @@ impl Database for DatabaseFdbSqliteNats {
 		location: &Location,
 		state: SleepState,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2501,7 +2501,7 @@ impl Database for DatabaseFdbSqliteNats {
 		version: usize,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2532,7 +2532,7 @@ impl Database for DatabaseFdbSqliteNats {
 		event_name: Option<&str>,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2563,7 +2563,7 @@ impl Database for DatabaseFdbSqliteNats {
 		version: usize,
 		loop_location: Option<&Location>,
 	) -> WorkflowResult<()> {
-		let pool = self.pools.sqlite(from_workflow_id).await?;
+		let pool = self.pools.sqlite(db_name(from_workflow_id)).await?;
 
 		self.query(|| async {
 			sql_execute!(
@@ -2594,3 +2594,7 @@ struct PartialWorkflow {
 	pub ray_id: Uuid,
 	pub input: Box<serde_json::value::RawValue>,
 }
+
+fn db_name(workflow_id: Uuid) -> String {
+	format!("{workflow_id}-internal")
+}

packages/common/chirp-workflow/core/src/prelude.rs

@@ -17,7 +17,7 @@ pub use crate::{
 	activity::Activity as ActivityTrait,
 	ctx::workflow::Loop,
 	ctx::*,
-	db,
+	db::{self, Database},
 	error::{WorkflowError, WorkflowResult},
 	executable::Executable,
 	history::removed::*,

packages/common/chirp-workflow/core/tests/integration.rs

@@ -1,4 +1,3 @@
-use chirp_workflow::db::Database;
 use chirp_workflow::prelude::*;
 use serde_json::json;
 use uuid::Uuid;

packages/common/migrate/src/migrate.rs

@@ -22,8 +22,8 @@ pub async fn up(config: rivet_config::Config, services: &[SqlService]) -> Result
 	tracing::info!(sql_services = ?services.len(), "running sql migrations");
 
 	let server_config = config.server.as_ref().context("missing server")?;
-	let is_development = server_config.rivet.auth.access_kind
-		== rivet_config::config::rivet::AccessKind::Development;
+	// let is_development = server_config.rivet.auth.access_kind
+	// 	== rivet_config::config::rivet::AccessKind::Development;
 
 	let crdb = rivet_pools::db::crdb::setup(config.clone())
 		.await

packages/common/pools/src/db/sqlite.rs

@@ -7,7 +7,6 @@ use sqlx::{
 	Sqlite,
 };
 use tokio::sync::Mutex;
-use uuid::Uuid;
 
 use crate::Error;
 
@@ -16,7 +15,7 @@ pub type SqlitePool = sqlx::SqlitePool;
 #[derive(Clone)]
 pub struct SqlitePoolManager {
 	// TODO: Somehow remove old pools
-	pools: Arc<Mutex<HashMap<Uuid, SqlitePool>>>,
+	pools: Arc<Mutex<HashMap<String, SqlitePool>>>,
 }
 
 impl SqlitePoolManager {
@@ -27,10 +26,10 @@ impl SqlitePoolManager {
 	}
 
 	/// Get or creates an sqlite pool for the given key
-	pub async fn get(&self, key: Uuid) -> Result<SqlitePool, Error> {
+	pub async fn get(&self, key: &str) -> Result<SqlitePool, Error> {
 		let mut pools_guard = self.pools.lock().await;
 
-		let pool = if let Some(pool) = pools_guard.get(&key) {
+		let pool = if let Some(pool) = pools_guard.get(key) {
 			pool.clone()
 		} else {
 			// TODO: Hardcoded for testing
@@ -61,7 +60,7 @@ impl SqlitePoolManager {
 			// Run at the start of every connection
 			setup_pragma(&pool).await.map_err(Error::BuildSqlx)?;
 
-			pools_guard.insert(key, pool.clone());
+			pools_guard.insert(key.to_string(), pool.clone());
 
 			tracing::debug!(?key, "sqlite connected");
 

packages/common/pools/src/pools.rs

@@ -3,7 +3,6 @@ use std::{collections::HashMap, sync::Arc, time::Duration};
 use global_error::{ensure_with, prelude::*, GlobalResult};
 use rivet_config::Config;
 use tokio_util::sync::{CancellationToken, DropGuard};
-use uuid::Uuid;
 
 use crate::{
 	db::sqlite::SqlitePoolManager, ClickHousePool, CrdbPool, Error, FdbPool, NatsPool, RedisPool,
@@ -168,8 +167,8 @@ impl Pools {
 		self.0.fdb.clone().ok_or(Error::MissingFdbPool)
 	}
 
-	pub async fn sqlite(&self, key: Uuid) -> Result<SqlitePool, Error> {
-		self.0.sqlite.get(key).await
+	pub async fn sqlite(&self, key: impl AsRef<str>) -> Result<SqlitePool, Error> {
+		self.0.sqlite.get(key.as_ref()).await
 	}
 
 	#[tracing::instrument(skip_all)]

packages/common/server-cli/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+name = "rivet-server-cli"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+
+[dependencies]
+anyhow = "1.0"
+chirp-workflow.workspace = true
+chrono = "0.4.38"
+clap = { version = "4.3", features = ["derive"] }
+colored_json = "5.0.0"
+global-error.workspace = true
+include_dir = "0.7.4"
+indoc = "2.0.5"
+reqwest = "0.12.9"
+rivet-api.workspace = true
+rivet-config.workspace = true
+rivet-migrate.workspace = true
+rivet-pools.workspace = true
+rivet-runtime.workspace = true
+rivet-service-manager.workspace = true
+rivet-term.workspace = true
+s3-util.workspace = true
+serde = { version = "1.0.210", features = ["derive"] }
+serde_json = "1.0.128"
+serde_yaml = "0.9.34"
+strum = "0.26.3"
+tabled = "0.17.0"
+tempfile = "3.13.0"
+thiserror = "1.0.64"
+tokio = { version = "1.40", features = ["full", "tracing"] }
+tracing = "0.1"
+url = "2.4"
+uuid = "1.10.0"
+
+[dependencies.sqlx]
+workspace = true
+features = ["runtime-tokio", "postgres"]
+

packages/infra/server/src/commands/db/migrate.rs → packages/common/server-cli/src/commands/db/migrate.rs

@@ -1,7 +1,7 @@
 use anyhow::*;
 use clap::Parser;
 
-use crate::run_config::RunConfig;
+use rivet_service_manager::RunConfig;
 
 #[derive(Parser)]
 pub enum SubCommand {

packages/infra/server/src/commands/db/mod.rs → packages/common/server-cli/src/commands/db/mod.rs

@@ -1,7 +1,7 @@
 use anyhow::*;
 use clap::{Parser, ValueEnum};
 
-use crate::run_config::RunConfig;
+use rivet_service_manager::RunConfig;
 
 mod migrate;
 

packages/infra/server/src/commands/provision.rs → packages/common/server-cli/src/commands/provision.rs

@@ -1,7 +1,7 @@
 use anyhow::*;
 use clap::Parser;
 
-use crate::run_config::RunConfig;
+use rivet_service_manager::RunConfig;
 
 #[derive(Parser)]
 pub struct Opts {}

packages/infra/server/src/commands/start.rs → packages/common/server-cli/src/commands/start.rs

@@ -1,8 +1,6 @@
 use anyhow::*;
 use clap::Parser;
-use rivet_service_manager::CronConfig;
-
-use crate::run_config::RunConfig;
+use rivet_service_manager::{CronConfig, RunConfig};
 
 #[derive(Parser)]
 pub struct Opts {

packages/infra/server/src/commands/storage/mod.rs → packages/common/server-cli/src/commands/storage/mod.rs

@@ -1,7 +1,7 @@
 use anyhow::*;
 use clap::Parser;
 
-use crate::run_config::RunConfig;
+use rivet_service_manager::RunConfig;
 
 mod provision;
 

packages/infra/server/src/commands/storage/provision.rs → packages/common/server-cli/src/commands/storage/provision.rs

@@ -1,7 +1,7 @@
 use anyhow::*;
 use clap::Parser;
 
-use crate::run_config::RunConfig;
+use rivet_service_manager::RunConfig;
 
 #[derive(Parser)]
 pub struct Opts {}

packages/common/server-cli/src/lib.rs

@@ -0,0 +1,53 @@
+use anyhow::*;
+use clap::Parser;
+use commands::*;
+use rivet_service_manager::RunConfig;
+
+pub mod commands;
+pub mod util;
+
+#[derive(Parser)]
+pub enum SubCommand {
+	/// Starts the Rivet server
+	Start(start::Opts),
+	/// Provisions all of the required resources to run Rivet.
+	///
+	/// If you need to provision specific parts, use the `rivet db migrate up` and `rivet storage
+	/// provision` commands.
+	Provision(provision::Opts),
+	/// Manages databases
+	#[clap(alias = "db")]
+	Database {
+		#[clap(subcommand)]
+		command: db::SubCommand,
+	},
+	/// Manages buckets
+	Storage {
+		#[clap(subcommand)]
+		command: storage::SubCommand,
+	},
+	/// Manages workflows
+	#[clap(alias = "wf")]
+	Workflow {
+		#[clap(subcommand)]
+		command: wf::SubCommand,
+	},
+	/// Manage the Rivet config
+	Config {
+		#[clap(subcommand)]
+		command: config::SubCommand,
+	},
+}
+
+impl SubCommand {
+	pub async fn execute(self, config: rivet_config::Config, run_config: RunConfig) -> Result<()> {
+		match self {
+			SubCommand::Start(opts) => opts.execute(config, &run_config).await,
+			SubCommand::Provision(opts) => opts.execute(config, &run_config).await,
+			SubCommand::Database { command } => command.execute(config, &run_config).await,
+			SubCommand::Storage { command } => command.execute(config, &run_config).await,
+			SubCommand::Workflow { command } => command.execute(config).await,
+			SubCommand::Config { command } => command.execute(config).await,
+		}
+	}
+}

packages/common/service-manager/Cargo.toml

@@ -7,14 +7,15 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.89"
+chrono = "0.4.38"
 global-error.workspace = true
-tokio = { version = "1.40", features = ["full", "tracing"] }
+include_dir = "0.7.4"
+rivet-config.workspace = true
 rivet-health-checks.workspace = true
 rivet-metrics.workspace = true
+rivet-migrate.workspace = true
 rivet-pools.workspace = true
-tracing = "0.1.40"
-include_dir = "0.7.4"
-rivet-config.workspace = true
+s3-util.workspace = true
+tokio = { version = "1.40", features = ["full", "tracing"] }
 tokio-cron-scheduler = "0.13.0"
-chrono = "0.4.38"
-
+tracing = "0.1.40"