Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/tauri/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ redis = { version = "0.27", features = ["aio", "tokio-comp"] }
mongodb = "3.10.1"
russh = { version = "0.65.1", features = ["default"] }
rand = "0.10.4"
rmcp = { version = "3.10.0", features = ["server", "transport-async-rw"] }
rmcp = { version = "3.10.0", features = ["macros", "schemars", "server", "transport-async-rw"] }

[profile.release]
codegen-units = 1
Expand Down
64 changes: 32 additions & 32 deletions apps/tauri/src-tauri/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub struct ConnectMongoRequest {
pub fn db_connect_sqlite(
path: String,
id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionId, ConnectionError> {
registry.connect(ConnectionConfig::Sqlite { path, id })
}
Expand All @@ -73,7 +73,7 @@ pub fn db_connect_postgres(
user: String,
password: Option<String>,
id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionId, ConnectionError> {
registry.connect(ConnectionConfig::Postgres {
host,
Expand All @@ -93,7 +93,7 @@ pub fn db_connect_mysql(
user: String,
password: Option<String>,
id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionId, ConnectionError> {
registry.connect(ConnectionConfig::Mysql {
host,
Expand All @@ -113,7 +113,7 @@ pub fn db_connect_redis(
username: Option<String>,
db: Option<u8>,
id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionId, ConnectionError> {
registry.connect(ConnectionConfig::Redis {
host,
Expand All @@ -134,7 +134,7 @@ pub fn db_connect_mongo(
password: Option<String>,
auth_source: Option<String>,
id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionId, ConnectionError> {
registry.connect(ConnectionConfig::Mongo {
host,
Expand All @@ -150,15 +150,15 @@ pub fn db_connect_mongo(
#[tauri::command]
pub fn mongo_ping(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<String, ConnectionError> {
registry.with_mongo(&id, |s| s.ping())
}

#[tauri::command]
pub fn mongo_list_databases(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<String>, ConnectionError> {
registry.with_mongo(&id, |s| s.list_databases())
}
Expand All @@ -167,7 +167,7 @@ pub fn mongo_list_databases(
pub fn mongo_list_collections(
id: ConnectionId,
database: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<String>, ConnectionError> {
registry.with_mongo(&id, |s| s.list_collections(&database))
}
Expand All @@ -179,7 +179,7 @@ pub fn mongo_find(
collection: String,
filter_json: Option<String>,
limit: Option<i64>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<MongoFindResult, ConnectionError> {
registry.with_mongo(&id, |s| {
s.find(
Expand All @@ -194,7 +194,7 @@ pub fn mongo_find(
#[tauri::command]
pub fn redis_ping(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<String, ConnectionError> {
registry.with_redis(&id, |s| s.ping())
}
Expand All @@ -205,7 +205,7 @@ pub fn redis_scan(
cursor: Option<u64>,
pattern: Option<String>,
count: Option<u32>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<RedisScanPage, ConnectionError> {
registry.with_redis(&id, |s| {
s.scan(
Expand All @@ -220,7 +220,7 @@ pub fn redis_scan(
pub fn redis_get(
id: ConnectionId,
key: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Option<String>, ConnectionError> {
registry.with_redis(&id, |s| s.get(&key))
}
Expand All @@ -230,7 +230,7 @@ pub fn redis_set(
id: ConnectionId,
key: String,
value: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<(), ConnectionError> {
registry.with_redis(&id, |s| s.set(&key, &value))
}
Expand All @@ -239,7 +239,7 @@ pub fn redis_set(
pub fn redis_key_metas(
id: ConnectionId,
keys: Vec<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<RedisKeyMeta>, ConnectionError> {
registry.with_redis(&id, |s| s.types_and_ttls(&keys))
}
Expand All @@ -248,7 +248,7 @@ pub fn redis_key_metas(
pub fn redis_read_key(
id: ConnectionId,
key: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<RedisKeyView, ConnectionError> {
registry.with_redis(&id, |s| s.read_key(&key))
}
Expand Down Expand Up @@ -296,7 +296,7 @@ pub fn profiles_connect_sqlite(
folder_id: Option<String>,
id: Option<String>,
store: State<'_, ProfileStore>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionProfile, ConnectionError> {
let display_name = {
let t = name.trim();
Expand Down Expand Up @@ -350,7 +350,7 @@ pub fn profiles_connect_postgres(
request: ConnectPostgresRequest,
store: State<'_, ProfileStore>,
secrets: State<'_, SharedSecretStore>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionProfile, ConnectionError> {
let ConnectPostgresRequest {
name,
Expand Down Expand Up @@ -448,7 +448,7 @@ pub fn profiles_connect_mysql(
request: ConnectMysqlRequest,
store: State<'_, ProfileStore>,
secrets: State<'_, SharedSecretStore>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionProfile, ConnectionError> {
let ConnectMysqlRequest {
name,
Expand Down Expand Up @@ -545,7 +545,7 @@ pub fn profiles_connect_redis(
request: ConnectRedisRequest,
store: State<'_, ProfileStore>,
secrets: State<'_, SharedSecretStore>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionProfile, ConnectionError> {
let ConnectRedisRequest {
name,
Expand Down Expand Up @@ -649,7 +649,7 @@ pub fn profiles_connect_mongo(
request: ConnectMongoRequest,
store: State<'_, ProfileStore>,
secrets: State<'_, SharedSecretStore>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ConnectionProfile, ConnectionError> {
let ConnectMongoRequest {
name,
Expand Down Expand Up @@ -764,13 +764,13 @@ pub fn profiles_connect_mongo(
#[tauri::command]
pub fn db_disconnect(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<(), ConnectionError> {
registry.disconnect(&id)
}

#[tauri::command]
pub fn db_is_connected(id: ConnectionId, registry: State<'_, ConnectionRegistry>) -> bool {
pub fn db_is_connected(id: ConnectionId, registry: State<'_, std::sync::Arc<ConnectionRegistry>>) -> bool {
registry.is_connected(&id)
}

Expand All @@ -779,7 +779,7 @@ pub fn db_is_connected(id: ConnectionId, registry: State<'_, ConnectionRegistry>
pub fn db_list_children(
id: ConnectionId,
parent_id: Option<String>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<SqlObjectNode>, ConnectionError> {
registry.list_children(&id, parent_id.as_deref())
}
Expand All @@ -789,7 +789,7 @@ pub fn db_list_children(
pub fn db_describe_object(
id: ConnectionId,
object_id: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<TableSchema, ConnectionError> {
registry.describe_object(&id, &object_id)
}
Expand All @@ -799,7 +799,7 @@ pub fn db_describe_object(
pub fn db_postgres_object_detail(
id: ConnectionId,
object_id: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<PostgresObjectDetail, ConnectionError> {
registry.postgres_object_detail(&id, &object_id)
}
Expand All @@ -808,7 +808,7 @@ pub fn db_postgres_object_detail(
#[tauri::command]
pub fn db_list_schemas(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<String>, ConnectionError> {
Ok(registry
.list_children(&id, None)?
Expand All @@ -821,7 +821,7 @@ pub fn db_list_schemas(
#[tauri::command]
pub fn db_list_tables(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<Vec<SchemaObject>, ConnectionError> {
let main = registry
.list_children(&id, None)?
Expand Down Expand Up @@ -851,7 +851,7 @@ pub fn db_list_tables(
pub fn db_list_columns(
id: ConnectionId,
table: String,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<TableSchema, ConnectionError> {
registry.with_sqlite(&id, |s| s.list_columns(&table))
}
Expand All @@ -860,7 +860,7 @@ pub fn db_list_columns(
#[tauri::command]
pub fn db_sqlite_overview(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<SqliteOverview, ConnectionError> {
registry.with_sqlite(&id, |s| s.database_overview())
}
Expand All @@ -872,7 +872,7 @@ pub fn db_erd_schema(
schema: Option<String>,
focus: Option<String>,
depth: Option<u32>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ErdSchema, ConnectionError> {
registry.erd_schema(
&id,
Expand All @@ -895,7 +895,7 @@ pub fn db_execute_query(
limit: Option<u32>,
confirmed: Option<bool>,
on_event: Channel<crate::connection::QueryEvent>,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<(), ConnectionError> {
let limit = limit.map(|n| n as usize);
let confirmed = confirmed.unwrap_or(false);
Expand All @@ -910,7 +910,7 @@ pub fn db_execute_query(
#[tauri::command]
pub fn db_apply_staging(
request: StagingApplyRequest,
registry: State<'_, ConnectionRegistry>,
registry: State<'_, std::sync::Arc<ConnectionRegistry>>,
) -> Result<ApplyResult, ConnectionError> {
apply_staging_request(&registry, request)
}
Expand Down
9 changes: 9 additions & 0 deletions apps/tauri/src-tauri/src/connection/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,15 @@ impl ConnectionRegistry {
}
}

/// Live sessions currently open in the registry (id + driver).
pub fn list_sessions(&self) -> ConnectionResult<Vec<(ConnectionId, DriverKind)>> {
let guard = self.lock()?;
Ok(guard
.iter()
.map(|(id, session)| (id.clone(), session.driver()))
.collect())
}

pub fn list_children(
&self,
id: &ConnectionId,
Expand Down
5 changes: 3 additions & 2 deletions apps/tauri/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,14 @@ fn open_main_window(app: &tauri::App) -> tauri::Result<()> {

#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
let registry = std::sync::Arc::new(ConnectionRegistry::new());
tauri::Builder::default()
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_dialog::init())
.manage(ConnectionRegistry::new())
.manage(std::sync::Arc::clone(&registry))
.manage(KeyringSecretStore::shared())
.manage(SshTunnelRegistry::new())
.manage(McpController::new())
.manage(McpController::new(registry))
.setup(|app| {
use tauri::Manager;
let store = ProfileStore::open_default().map_err(|e| {
Expand Down
Loading
Loading