2026-01-24 22:59:20 +00:00
|
|
|
|
use anyhow::{Context, Result};
|
|
|
|
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
|
|
use tokio::fs;
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
|
|
|
|
pub enum ContainerRuntime {
|
|
|
|
|
|
Podman,
|
|
|
|
|
|
Docker,
|
|
|
|
|
|
Auto,
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl ContainerRuntime {
|
|
|
|
|
|
pub fn from_str(s: &str) -> Self {
|
|
|
|
|
|
match s.to_lowercase().as_str() {
|
|
|
|
|
|
"podman" => ContainerRuntime::Podman,
|
|
|
|
|
|
"docker" => ContainerRuntime::Docker,
|
|
|
|
|
|
"auto" | _ => ContainerRuntime::Auto,
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
|
|
|
|
pub enum BitcoinSimulation {
|
|
|
|
|
|
Mock,
|
|
|
|
|
|
Testnet,
|
|
|
|
|
|
Mainnet,
|
|
|
|
|
|
None,
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl BitcoinSimulation {
|
|
|
|
|
|
pub fn from_str(s: &str) -> Self {
|
|
|
|
|
|
match s.to_lowercase().as_str() {
|
|
|
|
|
|
"mock" => BitcoinSimulation::Mock,
|
|
|
|
|
|
"testnet" => BitcoinSimulation::Testnet,
|
|
|
|
|
|
"mainnet" => BitcoinSimulation::Mainnet,
|
|
|
|
|
|
"none" | _ => BitcoinSimulation::None,
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
|
|
|
|
pub struct Config {
|
|
|
|
|
|
pub data_dir: PathBuf,
|
|
|
|
|
|
pub bind_host: String,
|
|
|
|
|
|
pub bind_port: u16,
|
|
|
|
|
|
pub log_level: String,
|
2026-02-17 15:03:34 +00:00
|
|
|
|
/// Host IP for container env vars (FM_API_URL, BACKEND_MAINNET_HTTP_HOST, etc.)
|
|
|
|
|
|
pub host_ip: String,
|
2026-01-24 22:59:20 +00:00
|
|
|
|
// Dev mode configuration
|
|
|
|
|
|
pub dev_mode: bool,
|
|
|
|
|
|
pub container_runtime: ContainerRuntime,
|
|
|
|
|
|
pub port_offset: u16,
|
|
|
|
|
|
pub bitcoin_simulation: BitcoinSimulation,
|
|
|
|
|
|
pub dev_data_dir: PathBuf,
|
2026-02-17 15:03:34 +00:00
|
|
|
|
/// Nostr discovery: opt-in only. When true + relays non-empty, publish node to relays.
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
pub nostr_discovery_enabled: bool,
|
|
|
|
|
|
/// Nostr relay URLs (comma-separated). Only used when nostr_discovery_enabled.
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
pub nostr_relays: Vec<String>,
|
|
|
|
|
|
/// Tor SOCKS5 proxy (e.g. 127.0.0.1:9050). When set, ALL Nostr traffic routes through Tor.
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
pub nostr_tor_proxy: Option<String>,
|
feat(orchestrator): Phase 3.2 — wire Quadlet path behind feature flag
prod_orchestrator::install_fresh now branches on the new
Config::use_quadlet_backends flag (default false):
* off (today's production behavior) — unchanged: runtime.create_container
+ start_container, container parented under archipelago.service's
cgroup, FM3 cascade SIGKILL on every archipelago restart.
* on — install_via_quadlet renders the manifest as a Quadlet unit via
QuadletUnit::from_manifest, writes it atomically into
~/.config/containers/systemd/, calls daemon-reload, and starts the
generated <name>.service. Container ends up under user.slice — no
more cgroup parented under archipelago, so archipelago restarts
don't touch the container's lifetime.
Default off so this commit is structurally safe to ship: nothing
changes at runtime until an operator opts in. Flip the default once
tests/lifecycle/run-20x.sh has gone green against the new path on
.228 + .198 (the v1.7.52 release gate).
Plumbing:
* config.rs — `use_quadlet_backends: bool` w/ Default false
* prod_orchestrator.rs — flag stored on the struct, threaded through
new(), with set_use_quadlet_backends(bool) test setter
* prod_orchestrator.rs — install_via_quadlet helper
* dropped the Phase-3.1 #[allow(dead_code)] markers on from_manifest /
parse_memory_mib / RestartPolicy::OnFailure now that the call path
exists; if a future revert removes the wiring, the warnings come back.
Tests: 624 passing, cargo check clean (0 warnings). Existing companion
behavior unaffected — render_skips_backend_directives_when_default
still passes byte-equal to before quadlet.rs grew the new fields.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-01 17:22:10 -04:00
|
|
|
|
/// Phase 3.2 of v1.7.52: route orchestrator-managed backend installs
|
|
|
|
|
|
/// through Quadlet (`.container` units in ~/.config/containers/systemd
|
|
|
|
|
|
/// + systemctl --user start) instead of `podman create + start`. Default
|
|
|
|
|
|
/// off so the legacy path stays the production path until the harness
|
|
|
|
|
|
/// at tests/lifecycle/run-20x.sh has gone green against the new path
|
|
|
|
|
|
/// on .228 + .198. See `project_v1_7_52_phase3_quadlet_design`.
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
pub use_quadlet_backends: bool,
|
2026-06-17 04:47:18 -04:00
|
|
|
|
/// DHT swarm-assist (Phase 3): when true AND the binary was built with the
|
|
|
|
|
|
/// `iroh-swarm` feature, stand up an iroh-blobs provider that fetches release
|
|
|
|
|
|
/// blobs peer-to-peer (origin always wins) and seeds them via signed Nostr
|
|
|
|
|
|
/// adverts. Off by default; with the feature absent this is inert. Reuses
|
|
|
|
|
|
/// `nostr_relays` + `nostr_tor_proxy` for discovery transport.
|
|
|
|
|
|
#[serde(default)]
|
|
|
|
|
|
pub swarm_enabled: bool,
|
2026-01-24 22:59:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Config {
|
2026-02-17 15:03:34 +00:00
|
|
|
|
/// Detect primary host IP (first non-loopback IPv4)
|
|
|
|
|
|
fn detect_host_ip() -> Result<String> {
|
|
|
|
|
|
let output = std::process::Command::new("hostname")
|
|
|
|
|
|
.args(["-I"])
|
|
|
|
|
|
.output()
|
|
|
|
|
|
.context("Failed to run hostname -I")?;
|
|
|
|
|
|
let s = String::from_utf8_lossy(&output.stdout);
|
|
|
|
|
|
let ip = s
|
|
|
|
|
|
.split_whitespace()
|
|
|
|
|
|
.find(|s| !s.starts_with("127.") && s.contains('.'))
|
|
|
|
|
|
.unwrap_or("127.0.0.1");
|
|
|
|
|
|
Ok(ip.to_string())
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-01-24 22:59:20 +00:00
|
|
|
|
pub async fn load() -> Result<Self> {
|
|
|
|
|
|
// Default configuration
|
|
|
|
|
|
let mut config = Self::default();
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
|
2026-01-28 11:12:19 +00:00
|
|
|
|
// Detect if running from macOS app bundle
|
|
|
|
|
|
if let Ok(exe_path) = std::env::current_exe() {
|
|
|
|
|
|
if let Some(exe_str) = exe_path.to_str() {
|
|
|
|
|
|
if exe_str.contains(".app/Contents/MacOS") {
|
|
|
|
|
|
// Running from macOS bundle - use user's Library directory
|
|
|
|
|
|
if let Some(home) = std::env::var_os("HOME") {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
let app_support =
|
|
|
|
|
|
PathBuf::from(home).join("Library/Application Support/Archipelago");
|
2026-01-28 11:12:19 +00:00
|
|
|
|
config.data_dir = app_support.join("data");
|
|
|
|
|
|
config.dev_data_dir = app_support.join("data");
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
tracing::info!(
|
|
|
|
|
|
"🍎 Detected macOS bundle, using: {}",
|
|
|
|
|
|
app_support.display()
|
|
|
|
|
|
);
|
2026-01-28 11:12:19 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-01-24 22:59:20 +00:00
|
|
|
|
|
|
|
|
|
|
// Try to load from config file
|
|
|
|
|
|
let config_path = Path::new("/etc/archipelago/config.toml");
|
|
|
|
|
|
if config_path.exists() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
let content = fs::read_to_string(config_path)
|
|
|
|
|
|
.await
|
2026-01-24 22:59:20 +00:00
|
|
|
|
.context("Failed to read config file")?;
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
let file_config: Config =
|
|
|
|
|
|
toml::de::from_str(&content).context("Failed to parse config file")?;
|
2026-01-24 22:59:20 +00:00
|
|
|
|
config = file_config;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Override with environment variables
|
|
|
|
|
|
if let Ok(data_dir) = std::env::var("ARCHIPELAGO_DATA_DIR") {
|
|
|
|
|
|
config.data_dir = PathBuf::from(data_dir);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(bind) = std::env::var("ARCHIPELAGO_BIND") {
|
|
|
|
|
|
let parts: Vec<&str> = bind.split(':').collect();
|
|
|
|
|
|
if parts.len() == 2 {
|
|
|
|
|
|
config.bind_host = parts[0].to_string();
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
config.bind_port = parts[1]
|
|
|
|
|
|
.parse()
|
2026-01-24 22:59:20 +00:00
|
|
|
|
.context("Invalid port in ARCHIPELAGO_BIND")?;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(level) = std::env::var("ARCHIPELAGO_LOG_LEVEL") {
|
|
|
|
|
|
config.log_level = level;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-05-01 08:52:29 -04:00
|
|
|
|
// Production binaries must not be switched into dev orchestration by
|
|
|
|
|
|
// host environment. Several live nodes carried a stale systemd
|
|
|
|
|
|
// ARCHIPELAGO_DEV_MODE override, which rewrote production volume
|
|
|
|
|
|
// mounts into /tmp and prevented real installs from starting.
|
|
|
|
|
|
if std::env::var("ARCHIPELAGO_DEV_MODE").is_ok() {
|
|
|
|
|
|
tracing::warn!("Ignoring ARCHIPELAGO_DEV_MODE in production config");
|
2026-01-24 22:59:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(runtime) = std::env::var("ARCHIPELAGO_CONTAINER_RUNTIME") {
|
|
|
|
|
|
config.container_runtime = ContainerRuntime::from_str(&runtime);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(offset) = std::env::var("ARCHIPELAGO_PORT_OFFSET") {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
config.port_offset = offset
|
|
|
|
|
|
.parse()
|
2026-01-24 22:59:20 +00:00
|
|
|
|
.context("Invalid port offset in ARCHIPELAGO_PORT_OFFSET")?;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(sim) = std::env::var("ARCHIPELAGO_BITCOIN_SIMULATION") {
|
|
|
|
|
|
config.bitcoin_simulation = BitcoinSimulation::from_str(&sim);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if let Ok(dev_data_dir) = std::env::var("ARCHIPELAGO_DEV_DATA_DIR") {
|
|
|
|
|
|
config.dev_data_dir = PathBuf::from(dev_data_dir);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-02-17 15:03:34 +00:00
|
|
|
|
// Nostr discovery (opt-in, secure by default)
|
|
|
|
|
|
if let Ok(v) = std::env::var("ARCHIPELAGO_NOSTR_DISCOVERY_ENABLED") {
|
|
|
|
|
|
config.nostr_discovery_enabled = v.parse().unwrap_or(false);
|
|
|
|
|
|
}
|
|
|
|
|
|
if let Ok(v) = std::env::var("ARCHIPELAGO_NOSTR_RELAYS") {
|
|
|
|
|
|
config.nostr_relays = v
|
|
|
|
|
|
.split(',')
|
|
|
|
|
|
.map(|s| s.trim().to_string())
|
|
|
|
|
|
.filter(|s| !s.is_empty())
|
|
|
|
|
|
.collect();
|
|
|
|
|
|
}
|
|
|
|
|
|
if let Ok(v) = std::env::var("ARCHIPELAGO_NOSTR_TOR_PROXY") {
|
|
|
|
|
|
let s = v.trim().to_string();
|
|
|
|
|
|
config.nostr_tor_proxy = if s.is_empty() { None } else { Some(s) };
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-06-17 04:47:18 -04:00
|
|
|
|
// DHT swarm-assist (Phase 3). Opt-in: only takes effect when the binary
|
|
|
|
|
|
// was also built with the `iroh-swarm` feature; otherwise inert.
|
|
|
|
|
|
if let Ok(v) = std::env::var("ARCHIPELAGO_SWARM_ENABLED") {
|
|
|
|
|
|
config.swarm_enabled = parse_truthy_env(&v);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-05-02 05:44:09 -04:00
|
|
|
|
// Phase 3.2 of v1.7.52. Truthy values (1, true, yes, on — case-insensitive)
|
|
|
|
|
|
// route backend installs through the Quadlet path without requiring a
|
|
|
|
|
|
// config.json edit + archipelago.service restart (which would trigger
|
|
|
|
|
|
// FM3 cgroup cascade until 3.5 ships). Anything else (or unset) leaves
|
|
|
|
|
|
// the config.json value untouched.
|
|
|
|
|
|
if let Ok(v) = std::env::var("ARCHIPELAGO_USE_QUADLET_BACKENDS") {
|
|
|
|
|
|
if parse_truthy_env(&v) {
|
|
|
|
|
|
config.use_quadlet_backends = true;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-02-17 15:03:34 +00:00
|
|
|
|
// Host IP for container env vars (detect if not set)
|
|
|
|
|
|
if let Ok(ip) = std::env::var("ARCHIPELAGO_HOST_IP") {
|
|
|
|
|
|
config.host_ip = ip;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
config.host_ip = Self::detect_host_ip().unwrap_or_else(|_| "127.0.0.1".to_string());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-01-24 22:59:20 +00:00
|
|
|
|
// Ensure data directory exists
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
fs::create_dir_all(&config.data_dir)
|
|
|
|
|
|
.await
|
2026-01-24 22:59:20 +00:00
|
|
|
|
.context("Failed to create data directory")?;
|
|
|
|
|
|
|
|
|
|
|
|
// Ensure dev data directory exists if in dev mode
|
|
|
|
|
|
if config.dev_mode {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
fs::create_dir_all(&config.dev_data_dir)
|
|
|
|
|
|
.await
|
2026-01-24 22:59:20 +00:00
|
|
|
|
.context("Failed to create dev data directory")?;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Ok(config)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Default for Config {
|
|
|
|
|
|
fn default() -> Self {
|
|
|
|
|
|
Self {
|
|
|
|
|
|
data_dir: PathBuf::from("/var/lib/archipelago"),
|
2026-03-18 22:05:21 +00:00
|
|
|
|
bind_host: "127.0.0.1".to_string(),
|
2026-02-01 05:42:05 +00:00
|
|
|
|
bind_port: 5678,
|
2026-01-24 22:59:20 +00:00
|
|
|
|
log_level: "info".to_string(),
|
2026-02-17 15:03:34 +00:00
|
|
|
|
host_ip: "127.0.0.1".to_string(),
|
2026-01-24 22:59:20 +00:00
|
|
|
|
dev_mode: false,
|
|
|
|
|
|
container_runtime: ContainerRuntime::Auto,
|
|
|
|
|
|
port_offset: 10000,
|
|
|
|
|
|
bitcoin_simulation: BitcoinSimulation::Mock,
|
|
|
|
|
|
dev_data_dir: PathBuf::from("/tmp/archipelago-dev"),
|
2026-04-18 11:07:08 -04:00
|
|
|
|
// Discoverability is opt-in. Until the user explicitly enables it
|
|
|
|
|
|
// (Settings UI / `nostr_discovery_enabled = true` in config), no
|
|
|
|
|
|
// presence event is ever published and `handshake.poll` never
|
|
|
|
|
|
// contacts a relay. This is the sole knob that controls whether
|
|
|
|
|
|
// we leak our DID + npub to the public Nostr relays.
|
|
|
|
|
|
nostr_discovery_enabled: false,
|
2026-02-17 15:03:34 +00:00
|
|
|
|
nostr_relays: vec![
|
|
|
|
|
|
"wss://relay.damus.io".into(),
|
|
|
|
|
|
"wss://relay.nostr.info".into(),
|
|
|
|
|
|
],
|
|
|
|
|
|
nostr_tor_proxy: Some("127.0.0.1:9050".into()),
|
feat(orchestrator): Phase 3.2 — wire Quadlet path behind feature flag
prod_orchestrator::install_fresh now branches on the new
Config::use_quadlet_backends flag (default false):
* off (today's production behavior) — unchanged: runtime.create_container
+ start_container, container parented under archipelago.service's
cgroup, FM3 cascade SIGKILL on every archipelago restart.
* on — install_via_quadlet renders the manifest as a Quadlet unit via
QuadletUnit::from_manifest, writes it atomically into
~/.config/containers/systemd/, calls daemon-reload, and starts the
generated <name>.service. Container ends up under user.slice — no
more cgroup parented under archipelago, so archipelago restarts
don't touch the container's lifetime.
Default off so this commit is structurally safe to ship: nothing
changes at runtime until an operator opts in. Flip the default once
tests/lifecycle/run-20x.sh has gone green against the new path on
.228 + .198 (the v1.7.52 release gate).
Plumbing:
* config.rs — `use_quadlet_backends: bool` w/ Default false
* prod_orchestrator.rs — flag stored on the struct, threaded through
new(), with set_use_quadlet_backends(bool) test setter
* prod_orchestrator.rs — install_via_quadlet helper
* dropped the Phase-3.1 #[allow(dead_code)] markers on from_manifest /
parse_memory_mib / RestartPolicy::OnFailure now that the call path
exists; if a future revert removes the wiring, the warnings come back.
Tests: 624 passing, cargo check clean (0 warnings). Existing companion
behavior unaffected — render_skips_backend_directives_when_default
still passes byte-equal to before quadlet.rs grew the new fields.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-01 17:22:10 -04:00
|
|
|
|
use_quadlet_backends: false,
|
2026-06-17 04:47:18 -04:00
|
|
|
|
swarm_enabled: false,
|
2026-01-24 22:59:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-03-12 00:19:30 +00:00
|
|
|
|
|
2026-05-02 05:44:09 -04:00
|
|
|
|
/// Recognise the canonical "the user meant true" forms for boolean env
|
|
|
|
|
|
/// vars: 1, true, yes, on (case-insensitive, surrounding whitespace
|
|
|
|
|
|
/// trimmed). Anything else — including the typo'd "ture" or the empty
|
|
|
|
|
|
/// string — counts as false. Centralised so future env flags stay
|
|
|
|
|
|
/// consistent with each other.
|
|
|
|
|
|
fn parse_truthy_env(raw: &str) -> bool {
|
|
|
|
|
|
matches!(
|
|
|
|
|
|
raw.trim().to_ascii_lowercase().as_str(),
|
|
|
|
|
|
"1" | "true" | "yes" | "on"
|
|
|
|
|
|
)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-03-12 00:19:30 +00:00
|
|
|
|
#[cfg(test)]
|
|
|
|
|
|
mod tests {
|
|
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_default_config_values() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert_eq!(config.data_dir, PathBuf::from("/var/lib/archipelago"));
|
security+feat: v1.3.0 — pentest remediation, container reliability, UI overhaul
Security (33 pentest findings addressed):
- CRITICAL: backend binds 127.0.0.1, path traversal in tor.rs/dwn fixed
- HIGH: federation requires signatures, XSS login redirect, RBAC viewer restricted
- HIGH: tar slip prevention, S3 SSRF validation, backup ID validation
- MEDIUM: remember-me random secret, TOTP session rotation, password re-auth
- LOW: CSP unsafe-inline removed, CORS dev-only, onion/webhook validation
Container reliability:
- Memory limits on all 37 containers (OOM prevention)
- Exited vs stopped state distinction with health-aware status badges
- Crash recovery coordination (no more restart cascade)
- User-stopped tracking survives reboots
- Tiered boot recovery (databases → core → services → apps)
UI:
- Wallet TransactionsModal, health-aware app status badges
- Restart button on containers, exited/crashed red state
- Mesh view overhaul, glass button updates, BaseModal/ToggleSwitch
- Apps sticky header removed, dev faucet, mutable mock wallet
Infrastructure:
- LND REST port 8080 exposed over Tor (LND Connect fix)
- Nginx cookie_session fix, deploy script Tor config updated
- Dev environment: podman auto-start, boot mode simulation
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-19 12:44:31 +00:00
|
|
|
|
assert_eq!(config.bind_host, "127.0.0.1");
|
2026-03-12 00:19:30 +00:00
|
|
|
|
assert_eq!(config.bind_port, 5678);
|
|
|
|
|
|
assert_eq!(config.log_level, "info");
|
|
|
|
|
|
assert_eq!(config.host_ip, "127.0.0.1");
|
|
|
|
|
|
assert!(!config.dev_mode);
|
|
|
|
|
|
assert_eq!(config.port_offset, 10000);
|
2026-04-18 11:07:08 -04:00
|
|
|
|
assert!(!config.nostr_discovery_enabled);
|
2026-03-12 00:19:30 +00:00
|
|
|
|
assert_eq!(config.nostr_relays.len(), 2);
|
|
|
|
|
|
assert_eq!(config.nostr_tor_proxy, Some("127.0.0.1:9050".to_string()));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_container_runtime_from_str_podman() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("podman"),
|
|
|
|
|
|
ContainerRuntime::Podman
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("Podman"),
|
|
|
|
|
|
ContainerRuntime::Podman
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("PODMAN"),
|
|
|
|
|
|
ContainerRuntime::Podman
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_container_runtime_from_str_docker() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("docker"),
|
|
|
|
|
|
ContainerRuntime::Docker
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("Docker"),
|
|
|
|
|
|
ContainerRuntime::Docker
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("DOCKER"),
|
|
|
|
|
|
ContainerRuntime::Docker
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_container_runtime_from_str_auto() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("auto"),
|
|
|
|
|
|
ContainerRuntime::Auto
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("Auto"),
|
|
|
|
|
|
ContainerRuntime::Auto
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
// Unknown strings default to Auto
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str("unknown"),
|
|
|
|
|
|
ContainerRuntime::Auto
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
ContainerRuntime::from_str(""),
|
|
|
|
|
|
ContainerRuntime::Auto
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_bitcoin_simulation_from_str() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("mock"),
|
|
|
|
|
|
BitcoinSimulation::Mock
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("Mock"),
|
|
|
|
|
|
BitcoinSimulation::Mock
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("testnet"),
|
|
|
|
|
|
BitcoinSimulation::Testnet
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("Testnet"),
|
|
|
|
|
|
BitcoinSimulation::Testnet
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("mainnet"),
|
|
|
|
|
|
BitcoinSimulation::Mainnet
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("Mainnet"),
|
|
|
|
|
|
BitcoinSimulation::Mainnet
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("none"),
|
|
|
|
|
|
BitcoinSimulation::None
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_bitcoin_simulation_unknown_defaults_to_none() {
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str(""),
|
|
|
|
|
|
BitcoinSimulation::None
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("signet"),
|
|
|
|
|
|
BitcoinSimulation::None
|
|
|
|
|
|
));
|
|
|
|
|
|
assert!(matches!(
|
|
|
|
|
|
BitcoinSimulation::from_str("garbage"),
|
|
|
|
|
|
BitcoinSimulation::None
|
|
|
|
|
|
));
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_serialization_roundtrip() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
let json = serde_json::to_string(&config).unwrap();
|
|
|
|
|
|
let deserialized: Config = serde_json::from_str(&json).unwrap();
|
|
|
|
|
|
assert_eq!(deserialized.bind_host, config.bind_host);
|
|
|
|
|
|
assert_eq!(deserialized.bind_port, config.bind_port);
|
|
|
|
|
|
assert_eq!(deserialized.data_dir, config.data_dir);
|
|
|
|
|
|
assert_eq!(deserialized.log_level, config.log_level);
|
|
|
|
|
|
assert_eq!(deserialized.dev_mode, config.dev_mode);
|
|
|
|
|
|
assert_eq!(deserialized.port_offset, config.port_offset);
|
chore(ci): rustfmt + clippy clean-up to unblock the Rust CI job
The .github/workflows/ci.yml Rust job runs cargo fmt --check, clippy
with -D warnings, and tests. All three were failing. This commit:
- Applies rustfmt across the tree (the bulk of the diff — untouched
since the last toolchain bump, so a wide sweep was unavoidable).
- Fixes the correctness-level clippy errors:
container/bitcoin_simulator.rs wildcard-in-or-pattern
container/manifest.rs from_str rename to parse (reserved name)
container/podman_client.rs .get(0) -> .first()
container/runtime.rs manual += collapse
archipelago/src/constants.rs doc-comment → module-doc
api/rpc/package/install.rs stray /// comment above a non-item
container/docker_packages.rs redundant field init
streaming/advertisement.rs missing Metric import in tests
tests/orchestration_tests.rs `vec!` in non-Vec contexts
mesh/listener/dispatch.rs unused store_plain_message import
api/rpc/tor/mod.rs and mesh/steganography.rs: push-after-new → vec!
- Quiets wide legacy surfaces with crate-level allows in main.rs for
stylistic lints (too_many_arguments, type_complexity, doc indent,
enum variant prefix, wildcard-in-or, assertions-on-constants,
drop_non_drop, unused_io_amount, ptr_arg) — these fired in dozens
of places with no correctness payoff and have been churning every
toolchain bump.
- Tags intentional-dead-code helpers: wallet/ and streaming/ modules
are WIP, mesh::send_chunked_payload and DM_V1_MARKER are kept for
rollback compatibility, vpn::get_nostr_vpn_status is surface-area
for a not-yet-landed RPC.
cargo fmt --check, cargo clippy --all-targets --all-features
-- -D warnings, and cargo test --all-features now all pass locally.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 17:23:46 -04:00
|
|
|
|
assert_eq!(
|
|
|
|
|
|
deserialized.nostr_discovery_enabled,
|
|
|
|
|
|
config.nostr_discovery_enabled
|
|
|
|
|
|
);
|
2026-03-12 00:19:30 +00:00
|
|
|
|
assert_eq!(deserialized.nostr_relays, config.nostr_relays);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_toml_parsing() {
|
|
|
|
|
|
let toml_str = r#"
|
|
|
|
|
|
data_dir = "/tmp/test-data"
|
|
|
|
|
|
bind_host = "127.0.0.1"
|
|
|
|
|
|
bind_port = 9999
|
|
|
|
|
|
log_level = "debug"
|
|
|
|
|
|
host_ip = "192.168.1.100"
|
|
|
|
|
|
dev_mode = true
|
|
|
|
|
|
container_runtime = "Podman"
|
|
|
|
|
|
port_offset = 20000
|
|
|
|
|
|
bitcoin_simulation = "Testnet"
|
|
|
|
|
|
dev_data_dir = "/tmp/dev-test"
|
|
|
|
|
|
nostr_discovery_enabled = false
|
|
|
|
|
|
nostr_relays = ["wss://example.com"]
|
|
|
|
|
|
"#;
|
|
|
|
|
|
let config: Config = toml::de::from_str(toml_str).unwrap();
|
|
|
|
|
|
assert_eq!(config.data_dir, PathBuf::from("/tmp/test-data"));
|
|
|
|
|
|
assert_eq!(config.bind_host, "127.0.0.1");
|
|
|
|
|
|
assert_eq!(config.bind_port, 9999);
|
|
|
|
|
|
assert_eq!(config.log_level, "debug");
|
|
|
|
|
|
assert_eq!(config.host_ip, "192.168.1.100");
|
|
|
|
|
|
assert!(config.dev_mode);
|
|
|
|
|
|
assert_eq!(config.port_offset, 20000);
|
|
|
|
|
|
assert!(!config.nostr_discovery_enabled);
|
|
|
|
|
|
assert_eq!(config.nostr_relays, vec!["wss://example.com"]);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_data_dir_is_pathbuf() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert!(config.data_dir.is_absolute());
|
|
|
|
|
|
assert_eq!(config.data_dir, PathBuf::from("/var/lib/archipelago"));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_host_ip_default() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert_eq!(config.host_ip, "127.0.0.1");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_dev_mode_defaults_off() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert!(!config.dev_mode);
|
|
|
|
|
|
assert_eq!(config.dev_data_dir, PathBuf::from("/tmp/archipelago-dev"));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
2026-04-18 11:07:08 -04:00
|
|
|
|
fn test_config_nostr_discovery_disabled_by_default() {
|
|
|
|
|
|
// Discoverability is opt-in: nothing is published to public relays
|
|
|
|
|
|
// until the user explicitly turns it on. Flipping this back to
|
|
|
|
|
|
// `true` would silently start leaking the local DID + npub on every
|
|
|
|
|
|
// boot — guard rail.
|
2026-03-12 00:19:30 +00:00
|
|
|
|
let config = Config::default();
|
2026-04-18 11:07:08 -04:00
|
|
|
|
assert!(!config.nostr_discovery_enabled);
|
2026-03-12 00:19:30 +00:00
|
|
|
|
assert!(config.nostr_tor_proxy.is_some());
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_nostr_relays_default_not_empty() {
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert!(!config.nostr_relays.is_empty());
|
|
|
|
|
|
assert!(config.nostr_relays.iter().all(|r| r.starts_with("wss://")));
|
|
|
|
|
|
}
|
2026-05-02 05:44:09 -04:00
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn parse_truthy_env_recognises_canonical_forms() {
|
|
|
|
|
|
for t in ["1", "true", "TRUE", "yes", "Yes", "on", "ON", " true "] {
|
|
|
|
|
|
assert!(parse_truthy_env(t), "{t:?} should parse truthy");
|
|
|
|
|
|
}
|
|
|
|
|
|
for f in ["", "0", "false", "no", "off", "ture", "anything else", " "] {
|
|
|
|
|
|
assert!(!parse_truthy_env(f), "{f:?} should NOT parse truthy");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
|
fn test_config_use_quadlet_backends_defaults_off() {
|
|
|
|
|
|
// Phase 3.2 of v1.7.52 — the new path stays gated until the 20×
|
|
|
|
|
|
// harness goes green on .228 and .198. Flipping this default
|
|
|
|
|
|
// ahead of that would route every backend install through code
|
|
|
|
|
|
// we haven't fleet-validated yet.
|
|
|
|
|
|
let config = Config::default();
|
|
|
|
|
|
assert!(!config.use_quadlet_backends);
|
|
|
|
|
|
}
|
2026-03-12 00:19:30 +00:00
|
|
|
|
}
|