refactor(agent): consolidate driver architecture
This commit is contained in:
1 parent
cd87d2a4e4
commit
b6ac1f177b
13 files changed
+1179
-894
No files matched your search
@@ -2,14 +2,11 @@ use std::sync::Arc;
|
||||
|
||||
use tauri::{Emitter, State};
|
||||
|
||||
use dbx_core::agent_manager::{
|
||||
AgentDriverInfo, AgentManager, DriverStoreUsage, InstalledDriver, JavaRuntimeConfig, JavaRuntimeMode,
|
||||
DEFAULT_JRE_KEY,
|
||||
};
|
||||
use dbx_core::agent_manager::{AgentDriverInfo, DriverStoreUsage, JavaRuntimeConfig, JavaRuntimeMode, DEFAULT_JRE_KEY};
|
||||
use dbx_core::agent_service::{
|
||||
build_agent_list, download_temp_path, fetch_registry, find_local_agent_jar, github_url_to_r2_path,
|
||||
import_agent_jar, import_offline_zip, install_local_agent, invalidate_registry_cache, jre_needs_install,
|
||||
replace_download, OfflineImportProgress,
|
||||
build_agent_list, fetch_registry, import_agent_jar, import_agents_from_zip as import_agents_from_zip_core,
|
||||
install_agent_driver, invalidate_registry_cache, reinstall_agent_jre, uninstall_agent_driver, uninstall_agent_jre,
|
||||
upgrade_all_agent_drivers, AgentProgressEvent,
|
||||
};
|
||||
use dbx_core::connection::AppState;
|
||||
|
||||
@@ -35,212 +32,19 @@ pub async fn install_agent(
|
||||
state: State<'_, Arc<AppState>>,
|
||||
db_type: String,
|
||||
) -> Result<(), String> {
|
||||
let am = &state.agent_manager;
|
||||
let registry = match fetch_registry().await {
|
||||
Ok(registry) => registry,
|
||||
Err(registry_err) => {
|
||||
if let Some(local_jar) = find_local_agent_jar(&db_type) {
|
||||
install_local_agent(am, &db_type, local_jar)?;
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "done" }));
|
||||
return Ok(());
|
||||
}
|
||||
return Err(registry_err);
|
||||
}
|
||||
};
|
||||
|
||||
let Some(driver) = registry.drivers.get(&db_type) else {
|
||||
if let Some(local_jar) = find_local_agent_jar(&db_type) {
|
||||
install_local_agent(am, &db_type, local_jar)?;
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "done" }));
|
||||
return Ok(());
|
||||
}
|
||||
return Err(format!("Unknown driver type: {db_type}"));
|
||||
};
|
||||
let jre_key = &driver.jre;
|
||||
let needs_jre = jre_needs_install(am, ®istry, jre_key);
|
||||
|
||||
if needs_jre {
|
||||
let jre_info =
|
||||
registry.resolve_jre(jre_key).ok_or_else(|| format!("No JRE definition for version: {jre_key}"))?;
|
||||
let platform = AgentManager::current_platform();
|
||||
let platform_jre = jre_info
|
||||
.platforms
|
||||
.get(platform)
|
||||
.ok_or_else(|| format!("No JRE {jre_key} available for platform: {platform}"))?;
|
||||
let jre_archive = am.base_dir().join("jre-download.tar.gz");
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "jre", "downloaded": 0u64, "total": platform_jre.size,
|
||||
}),
|
||||
);
|
||||
download_with_progress(
|
||||
&app,
|
||||
"jre",
|
||||
&platform_jre.url,
|
||||
&github_url_to_r2_path(&platform_jre.url, "jre"),
|
||||
&jre_archive,
|
||||
platform_jre.size,
|
||||
)
|
||||
.await?;
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "jre-extract", "downloaded": 0u64, "total": 0u64,
|
||||
}),
|
||||
);
|
||||
let jre_dir = am.jre_dir(jre_key);
|
||||
if jre_dir.exists() {
|
||||
std::fs::remove_dir_all(&jre_dir).map_err(|e| format!("Failed to remove old JRE: {e}"))?;
|
||||
}
|
||||
extract_archive(&jre_archive, &jre_dir)?;
|
||||
std::fs::remove_file(&jre_archive).ok();
|
||||
}
|
||||
|
||||
let jar_path = am.driver_jar_path(&db_type);
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "driver", "downloaded": 0u64, "total": driver.jar.size,
|
||||
}),
|
||||
);
|
||||
download_with_progress(
|
||||
&app,
|
||||
"driver",
|
||||
&driver.jar.url,
|
||||
&github_url_to_r2_path(&driver.jar.url, "driver"),
|
||||
&jar_path,
|
||||
driver.jar.size,
|
||||
)
|
||||
.await?;
|
||||
|
||||
let mut local_state = am.load_state();
|
||||
if let Some(jre_info) = registry.resolve_jre(jre_key) {
|
||||
local_state.jre_versions.insert(jre_key.clone(), jre_info.version.clone());
|
||||
}
|
||||
local_state.installed_drivers.insert(
|
||||
db_type,
|
||||
InstalledDriver {
|
||||
version: driver.version.clone(),
|
||||
installed_at: chrono::Utc::now().to_rfc3339(),
|
||||
jre: jre_key.clone(),
|
||||
},
|
||||
);
|
||||
am.save_state(&local_state)?;
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "done" }));
|
||||
Ok(())
|
||||
let app_handle = app.clone();
|
||||
install_agent_driver(&state.agent_manager, &db_type, move |event| emit_agent_progress(&app_handle, event)).await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn upgrade_all_agents(app: tauri::AppHandle, state: State<'_, Arc<AppState>>) -> Result<u32, String> {
|
||||
let am = &state.agent_manager;
|
||||
let registry = fetch_registry().await?;
|
||||
let agents = build_agent_list(am, Some(®istry));
|
||||
let updatable: Vec<&AgentDriverInfo> = agents.iter().filter(|a| a.update_available).collect();
|
||||
let total_drivers = updatable.len() as u32;
|
||||
if total_drivers == 0 {
|
||||
return Ok(0);
|
||||
}
|
||||
|
||||
for (i, agent) in updatable.iter().enumerate() {
|
||||
let current = (i + 1) as u32;
|
||||
let db_type = &agent.db_type;
|
||||
let driver = registry.drivers.get(db_type).ok_or_else(|| format!("Unknown driver type: {db_type}"))?;
|
||||
let jre_key = &driver.jre;
|
||||
let needs_jre = jre_needs_install(am, ®istry, jre_key);
|
||||
|
||||
if needs_jre {
|
||||
let jre_info =
|
||||
registry.resolve_jre(jre_key).ok_or_else(|| format!("No JRE definition for version: {jre_key}"))?;
|
||||
let platform = AgentManager::current_platform();
|
||||
let platform_jre = jre_info
|
||||
.platforms
|
||||
.get(platform)
|
||||
.ok_or_else(|| format!("No JRE {jre_key} available for platform: {platform}"))?;
|
||||
let jre_archive = am.base_dir().join("jre-download.tar.gz");
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "jre", "downloaded": 0u64, "total": platform_jre.size,
|
||||
"db_type": db_type, "current": current, "total_drivers": total_drivers,
|
||||
}),
|
||||
);
|
||||
download_with_progress(
|
||||
&app,
|
||||
"jre",
|
||||
&platform_jre.url,
|
||||
&github_url_to_r2_path(&platform_jre.url, "jre"),
|
||||
&jre_archive,
|
||||
platform_jre.size,
|
||||
)
|
||||
.await?;
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "jre-extract", "downloaded": 0u64, "total": 0u64,
|
||||
"db_type": db_type, "current": current, "total_drivers": total_drivers,
|
||||
}),
|
||||
);
|
||||
let jre_dir = am.jre_dir(jre_key);
|
||||
if jre_dir.exists() {
|
||||
std::fs::remove_dir_all(&jre_dir).map_err(|e| format!("Failed to remove old JRE: {e}"))?;
|
||||
}
|
||||
extract_archive(&jre_archive, &jre_dir)?;
|
||||
std::fs::remove_file(&jre_archive).ok();
|
||||
}
|
||||
|
||||
let jar_path = am.driver_jar_path(db_type);
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": "driver", "downloaded": 0u64, "total": driver.jar.size,
|
||||
"db_type": db_type, "current": current, "total_drivers": total_drivers,
|
||||
}),
|
||||
);
|
||||
download_with_progress(
|
||||
&app,
|
||||
"driver",
|
||||
&driver.jar.url,
|
||||
&github_url_to_r2_path(&driver.jar.url, "driver"),
|
||||
&jar_path,
|
||||
driver.jar.size,
|
||||
)
|
||||
.await?;
|
||||
|
||||
let mut local_state = am.load_state();
|
||||
if let Some(jre_info) = registry.resolve_jre(jre_key) {
|
||||
local_state.jre_versions.insert(jre_key.clone(), jre_info.version.clone());
|
||||
}
|
||||
local_state.installed_drivers.insert(
|
||||
db_type.clone(),
|
||||
InstalledDriver {
|
||||
version: driver.version.clone(),
|
||||
installed_at: chrono::Utc::now().to_rfc3339(),
|
||||
jre: jre_key.clone(),
|
||||
},
|
||||
);
|
||||
am.save_state(&local_state)?;
|
||||
}
|
||||
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "all-done" }));
|
||||
Ok(total_drivers)
|
||||
let app_handle = app.clone();
|
||||
upgrade_all_agent_drivers(&state.agent_manager, move |event| emit_agent_progress(&app_handle, event)).await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn uninstall_agent(state: State<'_, Arc<AppState>>, db_type: String) -> Result<(), String> {
|
||||
let am = &state.agent_manager;
|
||||
let jar_path = am.driver_jar_path(&db_type);
|
||||
if jar_path.exists() {
|
||||
std::fs::remove_file(&jar_path).map_err(|e| e.to_string())?;
|
||||
}
|
||||
let driver_dir = jar_path.parent().unwrap();
|
||||
if driver_dir.exists() {
|
||||
std::fs::remove_dir_all(driver_dir).map_err(|e| e.to_string())?;
|
||||
}
|
||||
let mut local_state = am.load_state();
|
||||
local_state.installed_drivers.remove(&db_type);
|
||||
am.save_state(&local_state)?;
|
||||
Ok(())
|
||||
uninstall_agent_driver(&state.agent_manager, &db_type).await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
@@ -280,21 +84,7 @@ pub async fn set_agent_java_runtime_config(
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn uninstall_jre(state: State<'_, Arc<AppState>>, jre_key: String) -> Result<(), String> {
|
||||
let am = &state.agent_manager;
|
||||
let local_state = am.load_state();
|
||||
let dependents: Vec<&str> =
|
||||
local_state.installed_drivers.iter().filter(|(_, d)| d.jre == jre_key).map(|(k, _)| k.as_str()).collect();
|
||||
if !dependents.is_empty() {
|
||||
return Err(format!("JRE {} 正在被以下驱动使用: {},请先卸载这些驱动", jre_key, dependents.join(", ")));
|
||||
}
|
||||
let jre_dir = am.jre_dir(&jre_key);
|
||||
if jre_dir.exists() {
|
||||
std::fs::remove_dir_all(&jre_dir).map_err(|e| format!("Failed to remove JRE: {e}"))?;
|
||||
}
|
||||
let mut local_state = am.load_state();
|
||||
local_state.jre_versions.remove(&jre_key);
|
||||
am.save_state(&local_state)?;
|
||||
Ok(())
|
||||
uninstall_agent_jre(&state.agent_manager, &jre_key).await
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
@@ -312,21 +102,9 @@ pub async fn import_agents_from_zip(
|
||||
let am = &state.agent_manager;
|
||||
let zip_path = std::path::PathBuf::from(&path);
|
||||
let app_handle = app.clone();
|
||||
let result = import_offline_zip(am, &zip_path, |p: OfflineImportProgress| {
|
||||
let _ = app_handle.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({
|
||||
"step": p.step,
|
||||
"downloaded": p.current as u64,
|
||||
"total": p.total as u64,
|
||||
"db_type": p.label,
|
||||
"current": p.current,
|
||||
"total_drivers": p.total,
|
||||
}),
|
||||
);
|
||||
})?;
|
||||
let result = import_agents_from_zip_core(am, &zip_path, |event| emit_agent_progress(&app_handle, event))?;
|
||||
let count = result.drivers_installed.len() as u32;
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "done" }));
|
||||
emit_agent_progress(&app, AgentProgressEvent::step("done"));
|
||||
Ok(count)
|
||||
}
|
||||
|
||||
@@ -345,83 +123,11 @@ pub async fn reinstall_jre(
|
||||
state: State<'_, Arc<AppState>>,
|
||||
jre_key: Option<String>,
|
||||
) -> Result<(), String> {
|
||||
let am = &state.agent_manager;
|
||||
let key = jre_key.as_deref().unwrap_or(DEFAULT_JRE_KEY);
|
||||
let registry = fetch_registry().await?;
|
||||
let jre_info = registry.resolve_jre(key).ok_or_else(|| format!("No JRE definition for version: {key}"))?;
|
||||
let platform = AgentManager::current_platform();
|
||||
let platform_jre =
|
||||
jre_info.platforms.get(platform).ok_or_else(|| format!("No JRE {key} available for platform: {platform}"))?;
|
||||
let jre_archive = am.base_dir().join("jre-download.tar.gz");
|
||||
download_with_progress(
|
||||
&app,
|
||||
"jre",
|
||||
&platform_jre.url,
|
||||
&github_url_to_r2_path(&platform_jre.url, "jre"),
|
||||
&jre_archive,
|
||||
platform_jre.size,
|
||||
)
|
||||
.await?;
|
||||
let jre_dir = am.jre_dir(key);
|
||||
if jre_dir.exists() {
|
||||
std::fs::remove_dir_all(&jre_dir).map_err(|e| format!("Failed to remove old JRE: {e}"))?;
|
||||
}
|
||||
extract_archive(&jre_archive, &jre_dir)?;
|
||||
std::fs::remove_file(&jre_archive).ok();
|
||||
let mut local_state = am.load_state();
|
||||
local_state.jre_versions.insert(key.to_string(), jre_info.version.clone());
|
||||
am.save_state(&local_state)?;
|
||||
let _ = app.emit("agent-install-progress", serde_json::json!({ "step": "done" }));
|
||||
Ok(())
|
||||
let app_handle = app.clone();
|
||||
reinstall_agent_jre(&state.agent_manager, key, move |event| emit_agent_progress(&app_handle, event)).await
|
||||
}
|
||||
|
||||
async fn download_with_progress(
|
||||
app: &tauri::AppHandle,
|
||||
step: &str,
|
||||
url: &str,
|
||||
r2_path: &str,
|
||||
dest: &std::path::Path,
|
||||
total_size: u64,
|
||||
) -> Result<(), String> {
|
||||
if let Some(parent) = dest.parent() {
|
||||
std::fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||
}
|
||||
let tmp = download_temp_path(dest);
|
||||
let client = reqwest::Client::builder()
|
||||
.timeout(std::time::Duration::from_secs(300))
|
||||
.build()
|
||||
.map_err(|e| format!("Failed to create HTTP client: {e}"))?;
|
||||
|
||||
let resp = dbx_core::race_download(&client, url, r2_path, "dbx-agent-manager")
|
||||
.await
|
||||
.map_err(|e| format!("Failed to download {url}: {e}"))?;
|
||||
|
||||
let content_length = resp.content_length().unwrap_or(total_size);
|
||||
let mut file = std::fs::File::create(&tmp).map_err(|e| format!("Failed to create temp file: {e}"))?;
|
||||
let mut downloaded: u64 = 0;
|
||||
let mut bytes = resp;
|
||||
while let Some(chunk) = bytes.chunk().await.map_err(|e| format!("Download stream error: {e}"))? {
|
||||
std::io::Write::write_all(&mut file, &chunk).map_err(|e| format!("Failed to write chunk: {e}"))?;
|
||||
downloaded += chunk.len() as u64;
|
||||
let _ = app.emit(
|
||||
"agent-install-progress",
|
||||
serde_json::json!({ "step": step, "downloaded": downloaded, "total": content_length }),
|
||||
);
|
||||
}
|
||||
std::io::Write::flush(&mut file).map_err(|e| format!("Failed to flush temp file: {e}"))?;
|
||||
drop(file);
|
||||
replace_download(&tmp, dest)
|
||||
}
|
||||
|
||||
fn extract_archive(archive: &std::path::Path, dest: &std::path::Path) -> Result<(), String> {
|
||||
use std::process::Command;
|
||||
std::fs::create_dir_all(dest).map_err(|e| e.to_string())?;
|
||||
let status = Command::new("tar")
|
||||
.args(["xzf", &archive.to_string_lossy(), "-C", &dest.to_string_lossy(), "--strip-components=1"])
|
||||
.status()
|
||||
.map_err(|e| format!("Failed to extract archive: {e}"))?;
|
||||
if !status.success() {
|
||||
return Err("Failed to extract JRE archive".to_string());
|
||||
}
|
||||
Ok(())
|
||||
fn emit_agent_progress(app: &tauri::AppHandle, event: AgentProgressEvent) {
|
||||
let _ = app.emit("agent-install-progress", event);
|
||||
}
|
||||
@@ -1,10 +1,13 @@
|
||||
use std::sync::Arc;
|
||||
use tauri::State;
|
||||
|
||||
pub use dbx_core::agent_connection::{
|
||||
agent_connect_params, mongo_legacy_error_with_auth_hint, oracle_alternate_connect_config,
|
||||
should_retry_oracle_with_10g_driver,
|
||||
};
|
||||
pub use dbx_core::connection::{
|
||||
agent_connect_params, connection_url_for_endpoint, expand_tilde, metadata_connection_config,
|
||||
mongo_legacy_error_with_auth_hint, oracle_alternate_connect_config, probe_connection_endpoint,
|
||||
redacted_connection_url_for_endpoint, should_retry_oracle_with_10g_driver, AppState, MysqlMode, PoolKind,
|
||||
connection_url_for_endpoint, expand_tilde, metadata_connection_config, probe_connection_endpoint,
|
||||
redacted_connection_url_for_endpoint, AppState, MysqlMode, PoolKind,
|
||||
};
|
||||
use dbx_core::database_capabilities;
|
||||
use dbx_core::db;
|
||||
|
||||
Reference in new issue
Block a user