refactor: convert to bun-workspaces monorepo (desktop/ + www/)

- Move the Tauri app (React frontend + Rust backend) into desktop/ via
  git mv — configs unchanged (relative paths: tauri.conf.json, vite.config.ts)
- Root package.json becomes a private bun workspace container with
  orchestration scripts; desktop package renamed gridline-desktop
- Scaffold www/ with Astro 7 + Tailwind v4 (hand-wired vite plugin,
  static output, ready for Dokploy)
- Update release.yml for the new layout: projectPath: desktop,
  desktop/src-tauri resource paths, rust-cache workspace path
- Update README + AGENTS.md structure trees and dev commands
- Verified: vitest (1074), cargo test (354), desktop build, tauri dev
  (window launches), tauri build (dmg + app bundles), Astro build
This commit is contained in:
2026-08-16 19:31:53 +08:00
parent d752642b4d
commit 6854d889c5
400 changed files with 857 additions and 149 deletions
+164
View File
@@ -0,0 +1,164 @@
//! Per-connection cancellation handles, stored independently of the pool
//! lock so `cancel_query` can dispatch while a long query holds the pool mutex.
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use rusqlite::InterruptHandle;
use sqlx::mysql::MySqlConnectOptions;
use tokio_postgres::CancelToken;
use crate::db::tls::TlsDecision;
/// PostgreSQL cancel data. `cancel_token` stores the socket address (incl.
/// SSH tunnel endpoint) so `cancel_query` needs no host. `tls_config` is the
/// rustls config used to **build** the connection (or `None` for NoTls) so the
/// cancel connection reuses the exact same TLS decision.
#[derive(Clone)]
pub struct PgCancel {
pub cancel_token: CancelToken,
pub tls_decision: TlsDecision,
pub tls_config: Option<std::sync::Arc<rustls::ClientConfig>>,
}
/// MySQL cancel data. `conn_id` is the `CONNECTION_ID()` of the dedicated
/// connection currently running a query (one active per connection because the
/// pool lock serializes queries). `connect_options` lets `cancel` open a
/// brand-new connection (bypassing the pool) to run `KILL QUERY ?`.
#[derive(Clone)]
pub struct MySqlCancel {
pub conn_id: Option<i64>,
pub connect_options: MySqlConnectOptions,
}
/// SQLite cancel data — a cloneable, thread-safe interrupt handle.
/// (`InterruptHandle` itself is not `Clone` in rusqlite 0.31, so it's kept
/// behind an `Arc`.)
#[derive(Clone)]
pub struct SqliteCancel {
handle: Arc<InterruptHandle>,
}
impl SqliteCancel {
pub fn new(handle: InterruptHandle) -> Self {
Self { handle: Arc::new(handle) }
}
pub fn interrupt(&self) {
self.handle.interrupt();
}
}
#[derive(Clone)]
pub enum CancelHandle {
Pg(PgCancel),
MySql(MySqlCancel),
Sqlite(SqliteCancel),
}
/// Send + Sync registry keyed by connection id. `cancel_query` takes only
/// this `Mutex` (NOT the pool lock).
#[derive(Default)]
pub struct CancelRegistry {
map: Mutex<HashMap<String, CancelHandle>>,
}
impl CancelRegistry {
pub fn new() -> Self {
Self::default()
}
pub fn set_pg(&self, id: &str, c: PgCancel) {
self.set(id, CancelHandle::Pg(c));
}
pub fn set_mysql(&self, id: &str, c: MySqlCancel) {
self.set(id, CancelHandle::MySql(c));
}
pub fn set_sqlite(&self, id: &str, c: SqliteCancel) {
self.set(id, CancelHandle::Sqlite(c));
}
pub fn set_mysql_conn_id(&self, id: &str, conn_id: Option<i64>) {
let mut g = self.map.lock().unwrap();
if let Some(CancelHandle::MySql(m)) = g.get_mut(id) {
m.conn_id = conn_id;
}
}
fn set(&self, id: &str, h: CancelHandle) {
self.map.lock().unwrap().insert(id.to_string(), h);
}
pub fn get(&self, id: &str) -> Option<CancelHandle> {
self.map.lock().unwrap().get(id).cloned()
}
pub fn remove(&self, id: &str) {
self.map.lock().unwrap().remove(id);
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn sqlite_insert_and_drain() {
let reg = CancelRegistry::new();
let conn = rusqlite::Connection::open_in_memory().unwrap();
let handle = conn.get_interrupt_handle();
reg.set_sqlite("c1", SqliteCancel::new(handle));
assert!(matches!(reg.get("c1"), Some(CancelHandle::Sqlite(_))));
reg.remove("c1");
assert!(reg.get("c1").is_none());
}
#[test]
fn sqlite_interrupt_aborts_running_query() {
use std::sync::{Arc, Mutex};
let conn = rusqlite::Connection::open_in_memory().unwrap();
conn.execute_batch("CREATE TABLE t(n); INSERT INTO t VALUES (0);")
.unwrap();
let handle = conn.get_interrupt_handle();
let conn2 = Arc::new(Mutex::new(conn));
let c = conn2.clone();
let done = Arc::new(Mutex::new(None::<Result<usize, String>>));
let d = done.clone();
let worker = std::thread::spawn(move || {
let l = c.lock().unwrap();
// `query()` binds params only — the first sqlite3_step (where the
// interrupt lands) happens in `rs.next()`, so errors must be
// propagated with `?` rather than swallowed by `is_ok()`.
let r = l
.prepare("WITH RECURSIVE c(x) AS (SELECT 1 UNION ALL SELECT x+1 FROM c LIMIT 200000000) SELECT count(*) FROM c")
.unwrap()
.query([])
.and_then(|mut rs| {
let mut n = 0;
while rs.next()?.is_some() {
n += 1;
}
Ok(n)
});
*d.lock().unwrap() = Some(r.map_err(|e| e.to_string()));
});
std::thread::sleep(std::time::Duration::from_millis(50));
handle.interrupt();
worker.join().unwrap();
let outcome = done.lock().unwrap().clone();
assert!(
matches!(&outcome, Some(Err(e)) if e.to_lowercase().contains("interrupted")),
"cancelled query must report interrupted; got {outcome:?}"
);
}
#[test]
fn mysql_overwrites_single_active_slot() {
let reg = CancelRegistry::new();
reg.set_mysql("c1", MySqlCancel { conn_id: Some(1), connect_options: fake_opts() });
reg.set_mysql("c1", MySqlCancel { conn_id: Some(2), connect_options: fake_opts() });
match reg.get("c1") {
Some(CancelHandle::MySql(m)) => assert_eq!(m.conn_id, Some(2)),
_ => panic!("expected MySql"),
}
}
fn fake_opts() -> sqlx::mysql::MySqlConnectOptions {
sqlx::mysql::MySqlConnectOptions::new()
.host("127.0.0.1").port(1).username("u").password("p").database("d")
}
}