feat: 18 引擎驱动全家桶 + 驱动管理/离线包 + 设置中心 + 工作台交互打磨
驱动接入（全部本机真实例验收）： - Elasticsearch 原生 SQL API、InfluxDB 原生 HTTP+Flux（官方 JDBC 付费许可，实测弃用） - ZooKeeper/MongoDB JVM agent（连接时自动下载官方驱动 jar，sha256 钉版本到 ~/.opsxdb/drivers/） - 达梦 JDBC agent 桥就绪（待厂商 jar+实例）；TiDB 真实例验收 - 协议族代码审查放行 PolarDB/TDSQL/OceanBase/Kingbase/GaussDB/Oracle - 驱动能力模型：按驱动开关对象树分组/右键菜单/行编辑，NoSQL 树拍平（对象直挂库节点） 驱动管理： - 驱动管理弹框（状态/预装/离线包导入/JDK 检测）+ /api/drivers/* 三接口 - opsxdb-driver 驱动商店仓库（清单/fetch.sh/pack.sh 离线包/import.sh） - 连接时懒加载：DMG 零 Java 产物，首连自动下载（实测 ZK 九件套 1.35s），离线包自动回退 UI/交互： - 设置中心（⚙）：常规/执行/结果/驱动/快捷键/关于，左导航+右面板（对标 opsxshell） - 实例级展开箭头（行首 SVG chevron，替代字体回退失真的 Unicode 三角） - 树内嵌套渲染修复：对象树挂在激活连接下；工具栏窄窗口不断行（按钮 nowrap+整颗换行） - 侧栏连接行精简（图标+连接名）、SQLite SSH 守卫、Oracle 死参数清理 质量： - Go 协议层/离线回退单测、E2E 门控测试（ES/ZK/Influx/Mongo/TiDB/JDBC 桥） - 驱动注册表单一事实来源 connection-types.json，README/BACKLOG/AGENTS 同步
This commit is contained in:
logan committed
1 parent
26f459d1b8
commit
a9510235bb
156 files changed
+17200
-2520
No files matched your search
@@ -126,9 +126,28 @@ async fn ws_close(session_id: String) -> Result<(), String> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 前端启动时拉取后端地址与 token(注入 window.__OPSXDB_API__/__OPSXDB_TOKEN__)。
|
||||
#[tauri::command]
|
||||
fn get_backend_config(
|
||||
state: tauri::State<'_, sidecar::SidecarState>,
|
||||
) -> Result<sidecar::BackendConfig, String> {
|
||||
state
|
||||
.backend_config()
|
||||
.ok_or_else(|| "后端尚未就绪".to_string())
|
||||
}
|
||||
|
||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||
pub fn run() {
|
||||
tauri::Builder::default()
|
||||
.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
|
||||
// 二次启动聚焦已有窗口
|
||||
if let Some(w) = app.get_webview_window("main") {
|
||||
let _ = w.show();
|
||||
let _ = w.unminimize();
|
||||
let _ = w.set_focus();
|
||||
}
|
||||
}))
|
||||
.plugin(tauri_plugin_window_state::Builder::default().build())
|
||||
.manage(sidecar::SidecarState::default())
|
||||
.setup(|app| {
|
||||
let state = app.state::<sidecar::SidecarState>();
|
||||
@@ -139,7 +158,8 @@ pub fn run() {
|
||||
http_send,
|
||||
ws_connect,
|
||||
ws_send,
|
||||
ws_close
|
||||
ws_close,
|
||||
get_backend_config
|
||||
])
|
||||
.build(tauri::generate_context!())
|
||||
.expect("error while building OpsxDB desktop")
|
||||
|
||||
@@ -1,94 +1,198 @@
|
||||
//! 桌面启动时拉起本机 OpsxDB Gin 后端（默认 127.0.0.1:8788）。
|
||||
//! 桌面启动时拉起本机 OpsxDB Gin 后端。
|
||||
//! - 动态端口:TcpListener 绑 127.0.0.1:0 选空闲端口,OPSXDB_ADDR 传子进程;
|
||||
//! - 每次自起生成随机 token,OPSXDB_TOKEN 传子进程,与 addr 一起经 get_backend_config 注入前端;
|
||||
//! - 复用 8788 上已运行后端前先比对 /health 版本主版本,不匹配则换端口自起;
|
||||
//! - 失败时 emit "opsxdb://backend-failed",后端 stdout/stderr 重定向到 app_log_dir/opsxdb-server.log。
|
||||
use std::path::PathBuf;
|
||||
use std::process::{Child, Command, Stdio};
|
||||
use std::sync::Mutex;
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
use tauri::{AppHandle, Manager, RunEvent};
|
||||
use tauri::{AppHandle, Emitter, Manager, RunEvent};
|
||||
|
||||
const HEALTH: &str = "http://127.0.0.1:8788/health";
|
||||
const ADDR: &str = "127.0.0.1:8788";
|
||||
const DEFAULT_ADDR: &str = "127.0.0.1:8788";
|
||||
/// 与服务端 cmd/opsxdb main.go Version 保持一致,复用前比对主版本。
|
||||
const BACKEND_VERSION: &str = "0.1.0";
|
||||
const EVENT_BACKEND_FAILED: &str = "opsxdb://backend-failed";
|
||||
|
||||
#[derive(Clone, serde::Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct BackendConfig {
|
||||
pub addr: String,
|
||||
pub token: String,
|
||||
}
|
||||
|
||||
pub struct SidecarState {
|
||||
child: Mutex<Option<Child>>,
|
||||
config: Mutex<Option<BackendConfig>>,
|
||||
}
|
||||
|
||||
impl Default for SidecarState {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
child: Mutex::new(None),
|
||||
config: Mutex::new(None),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn health_ok() -> bool {
|
||||
ureq_get(HEALTH).is_ok()
|
||||
impl SidecarState {
|
||||
fn set_config(&self, cfg: BackendConfig) {
|
||||
if let Ok(mut g) = self.config.lock() {
|
||||
*g = Some(cfg);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn backend_config(&self) -> Option<BackendConfig> {
|
||||
self.config.lock().ok().and_then(|g| g.clone())
|
||||
}
|
||||
}
|
||||
|
||||
/// 轻量 GET，避免再引 reqwest 阻塞；用 std 即可。
|
||||
fn ureq_get(url: &str) -> Result<(), ()> {
|
||||
let Ok(resp) = reqwest::blocking::Client::builder()
|
||||
fn version_major(v: &str) -> &str {
|
||||
v.split('.').next().unwrap_or("")
|
||||
}
|
||||
|
||||
/// GET /health 并解析版本;失败或非 200 返回 None。
|
||||
fn health_version(addr: &str) -> Option<String> {
|
||||
let resp = reqwest::blocking::Client::builder()
|
||||
.timeout(Duration::from_secs(1))
|
||||
.build()
|
||||
.and_then(|c| c.get(url).send())
|
||||
else {
|
||||
return Err(());
|
||||
};
|
||||
if resp.status().is_success() {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(())
|
||||
.ok()?
|
||||
.get(format!("http://{addr}/health"))
|
||||
.send()
|
||||
.ok()?;
|
||||
if !resp.status().is_success() {
|
||||
return None;
|
||||
}
|
||||
let v: serde_json::Value = resp.json().ok()?;
|
||||
v.get("version")?.as_str().map(|s| s.to_string())
|
||||
}
|
||||
|
||||
fn health_ok(addr: &str) -> bool {
|
||||
health_version(addr).is_some()
|
||||
}
|
||||
|
||||
/// 尝试复用 8788 上已在运行的后端:仅当主版本一致才复用,
|
||||
/// 否则换端口自起而非静默连上旧版本。
|
||||
fn try_reuse_existing(state: &SidecarState) -> bool {
|
||||
match health_version(DEFAULT_ADDR) {
|
||||
Some(v) if version_major(&v) == version_major(BACKEND_VERSION) => {
|
||||
// 复用路径拿不到对方 token,按本机 dev 无鉴权处理
|
||||
state.set_config(BackendConfig {
|
||||
addr: format!("http://{DEFAULT_ADDR}"),
|
||||
token: String::new(),
|
||||
});
|
||||
true
|
||||
}
|
||||
Some(v) => {
|
||||
eprintln!(
|
||||
"opsxdb: 已有后端版本 {v} 与期望 {BACKEND_VERSION} 主版本不匹配,改自动态端口自起"
|
||||
);
|
||||
false
|
||||
}
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 绑 127.0.0.1:0 选一个空闲端口(立即释放,交给子进程绑定)。
|
||||
fn pick_free_port() -> Option<u16> {
|
||||
let ln = std::net::TcpListener::bind("127.0.0.1:0").ok()?;
|
||||
ln.local_addr().ok().map(|a| a.port())
|
||||
}
|
||||
|
||||
fn gen_token() -> String {
|
||||
use rand::RngCore;
|
||||
let mut b = [0u8; 32];
|
||||
rand::thread_rng().fill_bytes(&mut b);
|
||||
b.iter().map(|x| format!("{x:02x}")).collect()
|
||||
}
|
||||
|
||||
fn candidate_bins(app: &AppHandle) -> Vec<PathBuf> {
|
||||
// Windows 产物为 opsxdb-server.exe
|
||||
let bin = format!("opsxdb-server{}", std::env::consts::EXE_EXTENSION);
|
||||
let mut out = Vec::new();
|
||||
// 打包资源：externalBin → 与可执行文件同级的 binaries 或 resource
|
||||
// 打包资源:externalBin → 与可执行文件同级的 binaries 或 resource
|
||||
if let Ok(dir) = app.path().resource_dir() {
|
||||
out.push(dir.join("opsxdb-server"));
|
||||
out.push(dir.join("binaries").join("opsxdb-server"));
|
||||
out.push(dir.join(&bin));
|
||||
out.push(dir.join("binaries").join(&bin));
|
||||
}
|
||||
if let Ok(exe) = app.path().executable_dir() {
|
||||
out.push(exe.join("opsxdb-server"));
|
||||
out.push(exe.join("binaries").join("opsxdb-server"));
|
||||
out.push(exe.join(&bin));
|
||||
out.push(exe.join("binaries").join(&bin));
|
||||
}
|
||||
// 开发态：仓库 apps/server/bin
|
||||
out.push(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../server/bin/opsxdb-server"));
|
||||
out.push(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../../apps/server/bin/opsxdb-server"));
|
||||
// 开发态:仓库 apps/server/bin
|
||||
out.push(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../server/bin").join(&bin));
|
||||
out.push(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../../apps/server/bin").join(&bin));
|
||||
out
|
||||
}
|
||||
|
||||
fn spawn_server(bin: &PathBuf) -> std::io::Result<Child> {
|
||||
Command::new(bin)
|
||||
.env("OPSXDB_ADDR", ADDR)
|
||||
.env("GIN_MODE", "release")
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::null())
|
||||
.spawn()
|
||||
/// 后端 stdout/stderr 重定向到 app_log_dir/opsxdb-server.log。
|
||||
fn server_log_file(app: &AppHandle) -> Option<std::fs::File> {
|
||||
let dir = app.path().app_log_dir().ok()?;
|
||||
std::fs::create_dir_all(&dir).ok()?;
|
||||
std::fs::File::create(dir.join("opsxdb-server.log")).ok()
|
||||
}
|
||||
|
||||
fn spawn_server(
|
||||
bin: &PathBuf,
|
||||
addr: &str,
|
||||
token: &str,
|
||||
log_file: Option<&std::fs::File>,
|
||||
) -> std::io::Result<Child> {
|
||||
let mut cmd = Command::new(bin);
|
||||
cmd.env("OPSXDB_ADDR", addr)
|
||||
.env("OPSXDB_TOKEN", token)
|
||||
.env("GIN_MODE", "release");
|
||||
match log_file {
|
||||
Some(f) => {
|
||||
let err_f = f.try_clone()?;
|
||||
cmd.stdout(Stdio::from(f.try_clone()?)).stderr(Stdio::from(err_f));
|
||||
}
|
||||
None => {
|
||||
cmd.stdout(Stdio::null()).stderr(Stdio::null());
|
||||
}
|
||||
}
|
||||
cmd.spawn()
|
||||
}
|
||||
|
||||
pub fn ensure_backend(app: &AppHandle, state: &SidecarState) {
|
||||
if health_ok() {
|
||||
if try_reuse_existing(state) {
|
||||
return;
|
||||
}
|
||||
let Some(port) = pick_free_port() else {
|
||||
let _ = app.emit(EVENT_BACKEND_FAILED, "无法分配空闲端口");
|
||||
return;
|
||||
};
|
||||
let addr = format!("127.0.0.1:{port}");
|
||||
let token = gen_token();
|
||||
let log_file = server_log_file(app);
|
||||
let mut last_err = String::from("未找到后端二进制");
|
||||
for bin in candidate_bins(app) {
|
||||
if !bin.exists() {
|
||||
continue;
|
||||
}
|
||||
match spawn_server(&bin) {
|
||||
match spawn_server(&bin, &addr, &token, log_file.as_ref()) {
|
||||
Ok(child) => {
|
||||
*state.child.lock().unwrap() = Some(child);
|
||||
for _ in 0..30 {
|
||||
if health_ok() {
|
||||
if health_ok(&addr) {
|
||||
state.set_config(BackendConfig {
|
||||
addr: format!("http://{addr}"),
|
||||
token: token.clone(),
|
||||
});
|
||||
return;
|
||||
}
|
||||
thread::sleep(Duration::from_millis(100));
|
||||
}
|
||||
return;
|
||||
last_err = format!("后端启动后健康检查超时({})", bin.display());
|
||||
}
|
||||
Err(e) => {
|
||||
last_err = format!("启动 {} 失败: {e}", bin.display());
|
||||
continue;
|
||||
}
|
||||
Err(_) => continue,
|
||||
}
|
||||
}
|
||||
let _ = app.emit(EVENT_BACKEND_FAILED, last_err);
|
||||
}
|
||||
|
||||
pub fn stop_backend(state: &SidecarState) {
|
||||
|
||||
Reference in new issue
Block a user