Drazen Urch
af9f6e5ca0
* feat(db): add SQL query wrapper for PostgreSQL placeholder conversion - Created query_wrapper module with functions to automatically convert SQLite ? placeholders to PostgreSQL $1, $2, ... format - Updated build.rs to handle mutually exclusive feature flags - Modified one query in mixnodes.rs as proof of concept - Added type conversions for PostgreSQL compatibility (u32->i64, u16->i32) This is a checkpoint commit before converting all queries to use the wrapper. * feat(nym-node-status-api): add PostgreSQL database support via feature flags Implement dual database support for SQLite and PostgreSQL through Cargo feature flags. The implementation uses a query wrapper that automatically converts SQLite-style ? placeholders to PostgreSQL-style $1, $2, ... placeholders at runtime. Key changes: - Add query wrapper functions that handle placeholder conversion - Convert all sqlx::query\! macros to use wrapper functions - Handle type conversions between databases (i64 vs i32) - Add feature-gated implementations for database-specific SQL syntax - Update Makefile with clippy targets for both database features - Document database support in README * feat(nym-node-status-agent): add multi-API support with random selection Agents can now connect to multiple APIs and randomly select one for each testrun: - Accept multiple --server arguments in format "address:port:auth_key" - Randomly shuffle server list before attempting connections - Try each server until a testrun is obtained - Submit results back only to the API that provided the testrun - Continue to next server if one is down or has no testruns available * feat(nym-node-status): implement primary/secondary server architecture - Agent now requests testruns only from primary server (first in list) - Results are submitted to all configured servers in parallel - Secondary servers accept external testruns via new v2 endpoint - Added auto-creation of gateway and testrun records on secondary servers - New database queries: get_or_create_gateway, insert_external_testrun - Client library enhanced with submit_results_with_context method * Bump Node status API version * Fix build workdir * Bump to 3.1.4 * Fix types and queries * 3.1.6 * Fix gateway perf, bump 3.1.7 * NodeId -> i32, 3.1.8 * Bump agent version * i64 -> i32 * Use image yq * Migration and more types * Update remaining JSONB columns * Simplify server config * Update build path * Change delimiter * bump agent * Split up pg and sqlite builds * More typing fixes, build-and-push script * Fix Dockerfile-pg * Bump node-status-api * TYping * Agent build script * More logging around testruns * Fail loudly on read errors * Cleanup * Debug get gateways query * Fix get_gateways query * Use pg cert, 3.1.16 * Submit regular results to primary server * Bump freshenss cutoff * Update Cargo.lock * fix: resolve rebase conflicts and compilation errors After rebasing onto develop, fixed several issues: - Fixed borrowed data escapes error by using sqlx::query directly in transaction functions - Removed unused imports and cleaned up code - Maintained database-specific implementations for transaction functions * fmt * Make PG default to make lives easier * Performance improvements for Explorer v2 * Fix sqlite build * Fix PG migration * Tests round 1 * DB tests * More tests * And some more tests * And some more, more tests * cargo fmt * Fix some failing lints * Fix lioness version problems * Clippy in tests --------- Co-authored-by: dynco-nym <173912580+dynco-nym@users.noreply.github.com>
72 lines
2.2 KiB
Rust
72 lines
2.2 KiB
Rust
use anyhow::Result;
|
|
#[cfg(feature = "sqlite")]
|
|
use sqlx::{Connection, SqliteConnection};
|
|
#[cfg(feature = "sqlite")]
|
|
#[cfg(target_family = "unix")]
|
|
use std::fs::Permissions;
|
|
#[cfg(feature = "sqlite")]
|
|
#[cfg(target_family = "unix")]
|
|
use std::os::unix::fs::PermissionsExt;
|
|
#[cfg(feature = "sqlite")]
|
|
use tokio::{fs::File, io::AsyncWriteExt};
|
|
|
|
#[cfg(feature = "sqlite")]
|
|
const SQLITE_DB_FILENAME: &str = "nym-node-status-api.sqlite";
|
|
|
|
#[cfg(feature = "sqlite")]
|
|
async fn init_db() -> Result<()> {
|
|
let out_dir = read_env_var("OUT_DIR")?;
|
|
let database_path = format!("{out_dir}/{SQLITE_DB_FILENAME}?mode=rwc");
|
|
|
|
write_db_path_to_file(&out_dir, SQLITE_DB_FILENAME).await?;
|
|
let mut conn = SqliteConnection::connect(&database_path).await?;
|
|
sqlx::migrate!("./migrations").run(&mut conn).await?;
|
|
|
|
#[cfg(target_family = "unix")]
|
|
println!("cargo::rustc-env=DATABASE_URL=sqlite://{}", &database_path);
|
|
|
|
#[cfg(target_family = "windows")]
|
|
// for some strange reason we need to add a leading `/` to the windows path even though it's
|
|
// not a valid windows path... but hey, it works...
|
|
println!("cargo::rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// If you need to re-run migrations or reset the db, just run
|
|
/// cargo clean -p nym-node-status-api
|
|
#[tokio::main(flavor = "current_thread")]
|
|
async fn main() -> Result<()> {
|
|
#[cfg(feature = "sqlite")]
|
|
init_db().await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(feature = "sqlite")]
|
|
fn read_env_var(var: &str) -> Result<String> {
|
|
std::env::var(var).map_err(|_| anyhow::anyhow!("You need to set {} env var", var))
|
|
}
|
|
|
|
/// use `./enter_db.sh` to inspect DB
|
|
#[cfg(feature = "sqlite")]
|
|
async fn write_db_path_to_file(out_dir: &str, db_filename: &str) -> anyhow::Result<()> {
|
|
let mut file = File::create("settings.sql").await?;
|
|
let settings = ".mode columns
|
|
.headers on";
|
|
file.write_all(settings.as_bytes()).await?;
|
|
|
|
let mut file = File::create("enter_db.sh").await?;
|
|
let contents = format!(
|
|
"#!/bin/bash\n\
|
|
sqlite3 -init settings.sql {out_dir}/{db_filename}",
|
|
);
|
|
file.write_all(contents.as_bytes()).await?;
|
|
|
|
#[cfg(target_family = "unix")]
|
|
file.set_permissions(Permissions::from_mode(0o755))
|
|
.await
|
|
.map_err(anyhow::Error::from)?;
|
|
|
|
Ok(())
|
|
}
|