diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f744a0f..5290fd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6.0.3 + - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version: 24.18.0 + - run: npm install --global @nubjs/nub@0.7.5 - uses: jdx/mise-action@v4.2.3 - run: mise run openspec-check - run: mise run docs-check + - run: mise run npm-check coverage: name: Coverage (Windows MSVC) diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml new file mode 100644 index 0000000..6368dd0 --- /dev/null +++ b/.github/workflows/npm.yml @@ -0,0 +1,157 @@ +name: npm distribution + +on: + release: + types: [published] + workflow_dispatch: + inputs: + release_tag: + description: Existing GitHub Release tag to verify + required: true + type: string + stage: + description: Stage the verified packages for maintainer approval + required: true + default: false + type: boolean + +permissions: + contents: read + +concurrency: + group: npm-${{ github.event.release.tag_name || inputs.release_tag }} + cancel-in-progress: false + +jobs: + prepare: + name: Prepare verified npm tarballs + runs-on: ubuntu-22.04 + timeout-minutes: 20 + outputs: + version: ${{ steps.release.outputs.version }} + env: + RELEASE_TAG: ${{ github.event.release.tag_name || inputs.release_tag }} + GH_TOKEN: ${{ github.token }} + steps: + - name: Check out repository + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.0.3 + with: + persist-credentials: false + - name: Set up Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version: 24.18.0 + - name: Install Nub CLI + run: npm install --global @nubjs/nub@0.7.5 + - name: Pin npm CLI + run: npm install --global npm@12.0.2 --ignore-scripts + - name: Verify toolchain + run: | + test "$(node --version)" = "v24.18.0" + nub --version | grep -Fx "v0.7.5" + test "$(npm --version)" = "12.0.2" + - name: Validate release tag + id: release + shell: bash + run: | + if [[ ! "$RELEASE_TAG" =~ ^v([0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z.-]+)?)$ ]]; then + echo "Invalid Cadder release tag: $RELEASE_TAG" >&2 + exit 1 + fi + echo "version=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT" + - name: Install package workspace + working-directory: npm + run: nub ci + - name: Check package sources and workflow + working-directory: npm + run: nub run check + - name: Download exact GitHub Release assets + run: gh release download "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY" --dir "$RUNNER_TEMP/cadder-assets" + - name: Assemble packages from attested release archives + run: >- + node npm/scripts/assemble-release.js + --assets "$RUNNER_TEMP/cadder-assets" + --output "$RUNNER_TEMP/cadder-npm-stage" + --version "${{ steps.release.outputs.version }}" + - name: Pack deterministic npm tarballs + run: >- + node npm/scripts/pack-release.js + --stage "$RUNNER_TEMP/cadder-npm-stage" + --output "$RUNNER_TEMP/cadder-npm-tarballs" + - name: Upload verified npm tarballs + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: cadder-npm-${{ steps.release.outputs.version }} + path: ${{ runner.temp }}/cadder-npm-tarballs + if-no-files-found: error + retention-days: 14 + + verify-native: + name: Verify npm consumer (${{ matrix.target }}) + needs: prepare + timeout-minutes: 15 + strategy: + fail-fast: false + matrix: + include: + - target: win32-x64 + runner: windows-2022 + - target: linux-x64-gnu + runner: ubuntu-22.04 + - target: darwin-x64 + runner: macos-15-intel + - target: darwin-arm64 + runner: macos-15 + runs-on: ${{ matrix.runner }} + steps: + - name: Check out repository + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.0.3 + with: + persist-credentials: false + - name: Set up Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version: 24.18.0 + - name: Pin npm CLI + run: npm install --global npm@12.0.2 --ignore-scripts + - name: Download npm tarballs + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v7.0.0 + with: + name: cadder-npm-${{ needs.prepare.outputs.version }} + path: ${{ runner.temp }}/cadder-npm-tarballs + - name: Verify isolated native installation + run: node npm/scripts/verify-consumer.js --tarballs "${{ runner.temp }}/cadder-npm-tarballs" + + stage: + name: Stage npm packages for 2FA approval + needs: [prepare, verify-native] + if: github.event_name == 'release' || inputs.stage == true + runs-on: ubuntu-22.04 + timeout-minutes: 15 + environment: npm-production + permissions: + contents: read + id-token: write + steps: + - name: Check out repository + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.0.3 + with: + persist-credentials: false + - name: Set up Node.js + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 + with: + node-version: 24.18.0 + - name: Pin npm CLI + run: npm install --global npm@12.0.2 --ignore-scripts + - name: Download verified npm tarballs + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v7.0.0 + with: + name: cadder-npm-${{ needs.prepare.outputs.version }} + path: ${{ runner.temp }}/cadder-npm-tarballs + - name: Stage platform packages and root package + run: node npm/scripts/stage-release.js --tarballs "${{ runner.temp }}/cadder-npm-tarballs" + - name: Show approval command + run: | + echo 'Review the five entries in npm Staged Packages.' >> "$GITHUB_STEP_SUMMARY" + echo 'Approve the four @maxiedev platform packages before approving cadder.' >> "$GITHUB_STEP_SUMMARY" + echo 'CLI alternative: npm stage approve ' >> "$GITHUB_STEP_SUMMARY" diff --git a/.gitignore b/.gitignore index c7cd270..c6d0892 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ target/ artifacts/ dist/ publish/ +node_modules/ *.log *.tmp diff --git a/CHANGELOG.md b/CHANGELOG.md index a7bcb2c..6d1c9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,15 +10,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 -## [1.0.0] - 2026-09-14 +## [1.0.0] - 2026-09-15 ### Added + +#### Install Cadder through npm + +Run `npx cadder` for one-off operator access or install `cadder` globally to place the version-matched `cadder`, `cadderd`, and Cadder `caddy` shim commands on PATH. npm packages use the same verified native binaries as the portable GitHub archives; the upstream Caddy server remains a separate installation. + #### Inspect and control the local Cadder runtime Use focused terminal commands to inspect projects, domains, Caddyfiles, upstream ports, daemon state, diagnostics, and bounded redacted logs. Cadder can also stop a known local port owner after the process identity is explicitly supplied and revalidated. The TUI remains the overview for interactive work. + +#### Start Cadder when opening the TUI + +Run `cadder tui --start-daemon` to start or attach to the Cadder daemon in the background and open the interactive operator without an additional key press. Plain `cadder tui` keeps its existing read-first behavior. + #### Run project Caddyfiles together diff --git a/Cargo.lock b/Cargo.lock index 5be9562..b387262 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -530,6 +530,7 @@ dependencies = [ "tracing-subscriber", "which", "widestring", + "windows", "windows-sys 0.61.2", ] diff --git a/arcantry.toml b/arcantry.toml index 098e78a..de5a5ea 100644 --- a/arcantry.toml +++ b/arcantry.toml @@ -33,3 +33,23 @@ repository_url = "https://github.com/MrMaxie/cadder" [[release.version_sources]] path = "Cargo.toml" adapter = "cargo-workspace@1" + +[[release.version_sources]] +path = "npm/package.json" +adapter = "json-package@1" + +[[release.version_sources]] +path = "npm/packages/win32-x64/package.json" +adapter = "json-package@1" + +[[release.version_sources]] +path = "npm/packages/linux-x64-gnu/package.json" +adapter = "json-package@1" + +[[release.version_sources]] +path = "npm/packages/darwin-x64/package.json" +adapter = "json-package@1" + +[[release.version_sources]] +path = "npm/packages/darwin-arm64/package.json" +adapter = "json-package@1" diff --git a/crates/cadder-api/src/error.rs b/crates/cadder-api/src/error.rs index 10d1b46..608f73c 100644 --- a/crates/cadder-api/src/error.rs +++ b/crates/cadder-api/src/error.rs @@ -250,7 +250,7 @@ pub fn error_indicates_permission(error: &Error) -> bool { } pub fn start_guidance(_paths: &Path) -> String { - "Run `cadder tui` and press Enter to start cadderd, then retry.".to_string() + "Run `cadder tui --start-daemon` to start cadderd and open the operator, then retry.".to_string() } #[cfg(test)] diff --git a/crates/cadder-api/src/error/tests.rs b/crates/cadder-api/src/error/tests.rs index 5ba2185..3d84d7b 100644 --- a/crates/cadder-api/src/error/tests.rs +++ b/crates/cadder-api/src/error/tests.rs @@ -30,7 +30,7 @@ async fn typed_error_daemon_unavailable_maps_to_stable_exit_code() { assert_eq!(mapped.kind, AppExit::DaemonUnavailable); assert_eq!( mapped.guidance.as_deref(), - Some("Run `cadder tui` and press Enter to start cadderd, then retry.") + Some("Run `cadder tui --start-daemon` to start cadderd and open the operator, then retry.") ); } diff --git a/crates/cadder-api/src/service/tests.rs b/crates/cadder-api/src/service/tests.rs index 285c2f1..6b77068 100644 --- a/crates/cadder-api/src/service/tests.rs +++ b/crates/cadder-api/src/service/tests.rs @@ -241,7 +241,8 @@ async fn connected_and_unavailable_statuses_include_operator_context() { assert_eq!(status.connection_state, ConnectionStateView::NotRunning); assert!(status.message.contains("is not running")); assert!(status.guidance.as_deref().is_some_and(|guidance| { - guidance == "Run `cadder tui` and press Enter to start cadderd, then retry." + guidance + == "Run `cadder tui --start-daemon` to start cadderd and open the operator, then retry." })); let failed = IpcClientError::Daemon(ProtocolError::new( diff --git a/crates/cadder-client/src/app.rs b/crates/cadder-client/src/app.rs index eddd5e8..f3483cd 100644 --- a/crates/cadder-client/src/app.rs +++ b/crates/cadder-client/src/app.rs @@ -15,6 +15,7 @@ pub struct App { confirmation: Option, notice: Option, pending_message: Option<&'static str>, + pending_frame: usize, last_start_failed: bool, should_quit: bool, } @@ -79,6 +80,7 @@ impl App { confirmation: None, notice: None, pending_message: None, + pending_frame: 0, last_start_failed: false, should_quit: false, }; @@ -88,22 +90,6 @@ impl App { } impl RuntimeStatus { - pub const fn daemon_label(self) -> &'static str { - if self.daemon_is_running() { - "running" - } else { - "not running" - } - } - - pub const fn caddy_label(self) -> &'static str { - if self.caddy_is_running() { - "running" - } else { - "not running" - } - } - pub const fn daemon_is_running(self) -> bool { matches!(self.connection, ConnectionStatus::Connected) } @@ -111,6 +97,10 @@ impl RuntimeStatus { pub const fn caddy_is_running(self) -> bool { self.daemon_is_running() && matches!(self.caddy_status, ProtocolRuntimeStatus::Running) } + + pub const fn daemon_is_offline(self) -> bool { + matches!(self.connection, ConnectionStatus::Offline) + } } impl ConnectionStatus { diff --git a/crates/cadder-client/src/app/lifecycle.rs b/crates/cadder-client/src/app/lifecycle.rs index a29f10b..ad326df 100644 --- a/crates/cadder-client/src/app/lifecycle.rs +++ b/crates/cadder-client/src/app/lifecycle.rs @@ -2,10 +2,15 @@ use crate::data::MutationTarget; use super::*; +const PENDING_FRAMES: [&str; 10] = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]; + impl App { pub fn apply_refresh(&mut self, outcome: RefreshOutcome) { match outcome { RefreshOutcome::Connected { snapshot } => { + if self.last_start_failed { + self.notice = None; + } self.last_start_failed = false; self.runtime_status = RuntimeStatus { connection: ConnectionStatus::Connected, @@ -45,7 +50,7 @@ impl App { return false; } self.last_start_failed = false; - self.begin_action("Starting Cadder..."); + self.begin_action("Starting cadderd..."); true } @@ -82,13 +87,28 @@ impl App { self.pending_message.is_some() } + pub fn pending_marker(&self) -> Option<&'static str> { + self + .pending_message + .map(|_| PENDING_FRAMES[self.pending_frame % PENDING_FRAMES.len()]) + } + + pub fn advance_pending_animation(&mut self) { + if self.is_pending() { + self.pending_frame = (self.pending_frame + 1) % PENDING_FRAMES.len(); + } + } + pub fn complete_daemon_start(&mut self, result: Result<(), ActionFailure>) -> bool { if let Err(error) = &result { self.last_start_failed = true; self.connection_message.clone_from(&error.message); self.connection_guidance.clone_from(&error.guidance); } - self.finish_action(result) + self.finish_action(result.map_err(|_| ActionFailure { + message: "Could not start cadderd.".to_string(), + guidance: None, + })) } pub fn complete_lifecycle(&mut self, result: Result<(), ActionFailure>) -> bool { @@ -109,6 +129,9 @@ impl App { if let Some(notice) = &self.notice { return Some(notice.clone()); } + if self.runtime_status.connection == ConnectionStatus::Offline { + return None; + } if self.runtime_status.connection != ConnectionStatus::Connected { return Some(self.connection_guidance.as_deref().map_or_else( || self.connection_message.clone(), @@ -131,6 +154,7 @@ impl App { fn begin_action(&mut self, message: &'static str) { self.notice = None; self.pending_message = Some(message); + self.pending_frame = 0; } fn finish_action(&mut self, result: Result<(), ActionFailure>) -> bool { diff --git a/crates/cadder-client/src/app/tests.rs b/crates/cadder-client/src/app/tests.rs index 3dd7a12..645e78c 100644 --- a/crates/cadder-client/src/app/tests.rs +++ b/crates/cadder-client/src/app/tests.rs @@ -26,19 +26,17 @@ fn runtime_status_reports_daemon_and_caddy_independently() { connection: ConnectionStatus::Connected, caddy_status: ProtocolRuntimeStatus::Running, }; - assert_eq!(running.daemon_label(), "running"); - assert_eq!(running.caddy_label(), "running"); assert!(running.daemon_is_running()); assert!(running.caddy_is_running()); + assert!(!running.daemon_is_offline()); let offline = RuntimeStatus { connection: ConnectionStatus::Offline, caddy_status: ProtocolRuntimeStatus::Unknown, }; - assert_eq!(offline.daemon_label(), "not running"); - assert_eq!(offline.caddy_label(), "not running"); assert!(!offline.daemon_is_running()); assert!(!offline.caddy_is_running()); + assert!(offline.daemon_is_offline()); } #[test] @@ -47,18 +45,38 @@ fn offline_state_exposes_start_without_a_separate_status_view() { app.apply_refresh(RefreshOutcome::Unavailable { connection: ConnectionStatus::Offline, message: "Cadder is not running.".to_string(), - guidance: Some("Press Enter to start it.".to_string()), + guidance: Some("Run `cadder tui --start-daemon`.".to_string()), }); assert!(app.can_start_daemon()); - assert_eq!( - app.notice().as_deref(), - Some("Cadder is not running. Press Enter to start it.") - ); + assert!(app.notice().is_none()); assert!(app.prepare_start_daemon()); assert!(app.is_pending()); } +#[test] +fn daemon_start_animates_without_repeating_failures_above_shortcuts() { + let mut app = App::new(); + app.apply_refresh(RefreshOutcome::Unavailable { + connection: ConnectionStatus::Offline, + message: "Cadder is not running.".to_string(), + guidance: None, + }); + + assert!(app.prepare_start_daemon()); + assert_eq!(app.pending_marker(), Some("⠋")); + assert_eq!(app.notice().as_deref(), Some("Starting cadderd...")); + app.advance_pending_animation(); + assert_eq!(app.pending_marker(), Some("⠙")); + + assert!(!app.complete_daemon_start(Err(ActionFailure { + message: "Could not start cadderd.".to_string(), + guidance: Some("Check the daemon status, then retry.".to_string()), + }))); + assert!(app.pending_marker().is_none()); + assert_eq!(app.notice().as_deref(), Some("Could not start cadderd.")); +} + #[test] fn lifecycle_confirmation_stays_inline_and_explicit() { let mut app = connected_app(); diff --git a/crates/cadder-client/src/cli/commands.rs b/crates/cadder-client/src/cli/commands.rs index 11702bc..e14dab9 100644 --- a/crates/cadder-client/src/cli/commands.rs +++ b/crates/cadder-client/src/cli/commands.rs @@ -18,14 +18,12 @@ use crate::{ HostProcessInspector, PortOwner, ProcessInspector, ProcessSignalError, RegistrationIndex, RouteMatch, local_upstream, }, - run_tui, + tui, }; pub(super) async fn execute(command: Command) -> Result<(), CommandFailure> { match command { - Command::Tui => run_tui() - .await - .map_err(|error| CommandFailure::ipc(format!("Could not run the Cadder TUI: {error}"))), + Command::Tui { start_daemon } => open_tui(start_daemon).await, Command::Status => status().await, Command::Daemon { command } => daemon(command).await, Command::Projects { command } => projects(command).await, @@ -37,6 +35,16 @@ pub(super) async fn execute(command: Command) -> Result<(), CommandFailure> { } } +async fn open_tui(start_daemon: bool) -> Result<(), CommandFailure> { + let context = context("tui")?; + if start_daemon { + context.ensure_daemon_running("tui").await?; + } + tui::run(context) + .await + .map_err(|error| CommandFailure::ipc(format!("Could not run the Cadder TUI: {error}"))) +} + async fn status() -> Result<(), CommandFailure> { let context = context("status")?; let snapshot = context diff --git a/crates/cadder-client/src/cli/mod.rs b/crates/cadder-client/src/cli/mod.rs index 9ad01c6..b302fc8 100644 --- a/crates/cadder-client/src/cli/mod.rs +++ b/crates/cadder-client/src/cli/mod.rs @@ -56,7 +56,11 @@ pub(crate) enum Command { command: LogsCommand, }, /// Open the full-screen operator. - Tui, + Tui { + /// Start or attach to cadderd before opening the operator. + #[arg(long)] + start_daemon: bool, + }, } #[derive(Debug, Subcommand)] diff --git a/crates/cadder-client/src/main.rs b/crates/cadder-client/src/main.rs index 864f352..0afc6b8 100644 --- a/crates/cadder-client/src/main.rs +++ b/crates/cadder-client/src/main.rs @@ -5,10 +5,9 @@ mod inspection; mod tui; mod widgets; -use cadder_api::{AppExit, DaemonLaunchOptions, OperatorContext}; +use cadder_api::AppExit; use clap::{Parser, error::ErrorKind}; use cli::Cli; -use color_eyre::Result; #[tokio::main(flavor = "current_thread")] async fn main() -> AppExit { @@ -35,10 +34,5 @@ fn cli_exit(error: &clap::Error) -> AppExit { } } -pub(crate) async fn run_tui() -> Result<()> { - let context = OperatorContext::new("tui", None, DaemonLaunchOptions::default())?; - tui::run(context).await -} - #[cfg(test)] mod tests; diff --git a/crates/cadder-client/src/tests.rs b/crates/cadder-client/src/tests.rs index 9fbd139..115949c 100644 --- a/crates/cadder-client/src/tests.rs +++ b/crates/cadder-client/src/tests.rs @@ -30,10 +30,35 @@ fn version_returns_success() { } #[test] -fn tui_command_is_preserved() { +fn tui_command_preserves_read_first_default() { let cli = Cli::try_parse_from(["cadder", "tui"]).expect("TUI should parse"); - assert!(matches!(cli.command, Command::Tui)); + assert!(matches!( + cli.command, + Command::Tui { + start_daemon: false + } + )); +} + +#[test] +fn tui_command_accepts_explicit_daemon_start() { + let cli = Cli::try_parse_from(["cadder", "tui", "--start-daemon"]) + .expect("TUI daemon startup should parse"); + + assert!(matches!(cli.command, Command::Tui { start_daemon: true })); +} + +#[test] +fn tui_help_explains_daemon_start() { + let help = Cli::command() + .find_subcommand_mut("tui") + .expect("TUI command should exist") + .render_help() + .to_string(); + + assert!(help.contains("--start-daemon")); + assert!(help.contains("Start or attach to cadderd before opening the operator")); } #[test] diff --git a/crates/cadder-client/src/tui.rs b/crates/cadder-client/src/tui.rs index afb07c9..3ebe989 100644 --- a/crates/cadder-client/src/tui.rs +++ b/crates/cadder-client/src/tui.rs @@ -16,6 +16,7 @@ use self::view::render; use crate::app::App; const REFRESH_INTERVAL: Duration = Duration::from_secs(1); +const ANIMATION_INTERVAL: Duration = Duration::from_millis(80); pub async fn run(context: OperatorContext) -> Result<()> { let mut terminal = ratatui::try_init()?; @@ -32,6 +33,8 @@ async fn run_event_loop( let mut events = EventStream::new(); let mut refresh = tokio::time::interval(REFRESH_INTERVAL); refresh.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); + let mut animation = tokio::time::interval(ANIMATION_INTERVAL); + animation.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); let mut effects = tokio::task::JoinSet::new(); let mut refresh_in_flight = true; spawn_effect(&mut effects, context.clone(), Effect::Refresh); @@ -44,6 +47,9 @@ async fn run_event_loop( refresh_in_flight = true; spawn_effect(&mut effects, context.clone(), Effect::Refresh); }, + _ = animation.tick(), if app.is_pending() => { + app.advance_pending_animation(); + }, event = events.next() => { match event.transpose()? { Some(event) => { @@ -124,12 +130,27 @@ mod tests { app.apply_refresh(crate::app::RefreshOutcome::Unavailable { connection: crate::app::ConnectionStatus::Offline, message: "Cadder is not running.".to_string(), - guidance: Some("Press Enter to start it.".to_string()), + guidance: Some("Run `cadder tui --start-daemon`.".to_string()), }); let mut terminal = Terminal::new(TestBackend::new(100, 32)).unwrap(); terminal.draw(|frame| render(frame, &mut app)).unwrap(); - assert!(format!("{}", terminal.backend()).contains("Press Enter to start it")); + let screen = format!("{}", terminal.backend()); + assert!(screen.contains("Cadder is not running.")); + assert!(screen.contains("enter start cadderd · r retry · q quit")); + assert!(!screen.contains("--start-daemon")); + assert!(!screen.contains("No registered routes")); + assert!(screen.contains("○ cadderd · ○ Caddy")); + + assert!(app.prepare_start_daemon()); + terminal.draw(|frame| render(frame, &mut app)).unwrap(); + let screen = format!("{}", terminal.backend()); + assert!( + screen + .lines() + .nth(1) + .is_some_and(|line| line.contains("⠋ Starting cadderd...")) + ); let mut connected = App::new(); connected.apply_refresh(crate::app::RefreshOutcome::Connected { @@ -145,7 +166,10 @@ mod tests { terminal .draw(|frame| render(frame, &mut connected)) .unwrap(); - assert!(format!("{}", terminal.backend()).contains("Restart Cadder")); + let screen = format!("{}", terminal.backend()); + assert!(screen.contains("Restart Cadder")); + assert!(screen.contains("● cadderd · ○ Caddy")); + assert!(screen.contains("enter confirm · esc cancel · q quit")); let mut tiny = Terminal::new(TestBackend::new(1, 1)).unwrap(); tiny.draw(|frame| render(frame, &mut App::new())).unwrap(); diff --git a/crates/cadder-client/src/tui/events.rs b/crates/cadder-client/src/tui/events.rs index 1ea9e79..2e4c653 100644 --- a/crates/cadder-client/src/tui/events.rs +++ b/crates/cadder-client/src/tui/events.rs @@ -36,7 +36,7 @@ fn handle_key(code: KeyCode, modifiers: KeyModifiers, app: &mut App) -> Option app.select_previous(), KeyCode::Down => app.select_next(), KeyCode::Enter if app.prepare_start_daemon() => return Some(UiAction::StartDaemon), - KeyCode::Enter | KeyCode::Char(' ') => { + KeyCode::Enter => { return app.prepare_toggle_current().map(UiAction::Mutate); } KeyCode::Char('r') => return Some(UiAction::Refresh), @@ -133,6 +133,8 @@ mod tests { storage: None, }), }); + assert!(handle_key(KeyCode::Char(' '), KeyModifiers::NONE, &mut toggle).is_none()); + assert!(!toggle.is_pending()); assert!(matches!( handle_key(KeyCode::Enter, KeyModifiers::NONE, &mut toggle), Some(UiAction::Mutate(_)) diff --git a/crates/cadder-client/src/tui/view.rs b/crates/cadder-client/src/tui/view.rs index 02af0a8..0ca7620 100644 --- a/crates/cadder-client/src/tui/view.rs +++ b/crates/cadder-client/src/tui/view.rs @@ -1,6 +1,6 @@ use ratatui::Frame; use ratatui::layout::{Constraint, Layout, Rect}; -use ratatui::text::Line; +use ratatui::text::{Line, Span}; use ratatui::widgets::{Paragraph, StatefulWidget, Widget}; use crate::app::App; @@ -44,15 +44,28 @@ fn render_main(frame: &mut Frame<'_>, area: Rect, app: &mut App) { ); let rows = app.domain_rows(); + let empty_message = if app.runtime_status().daemon_is_offline() { + "Cadder is not running." + } else { + "No registered routes. Run caddy run in a project." + }; StatefulWidget::render( - RoutesTable::new(rows), + RoutesTable::new(rows, empty_message), areas.routes, frame.buffer_mut(), app.table_state_mut(), ); if let (Some(notice_area), Some(notice)) = (areas.notice, notice) { - Paragraph::new(Line::from(notice)) + let line = if let Some(marker) = app.pending_marker() { + Line::from(vec![ + Span::styled(format!(" {marker} "), THEME.pending_indicator()), + Span::raw(notice), + ]) + } else { + Line::from(format!(" {notice}")) + }; + Paragraph::new(line) .style(THEME.notice()) .render(notice_area, frame.buffer_mut()); } @@ -83,10 +96,10 @@ fn root_areas(root: Rect) -> (Rect, Rect) { fn main_areas(area: Rect, has_notice: bool) -> MainAreas { let notice_height = u16::from(has_notice); - let [header, routes, notice] = area.layout(&Layout::vertical([ + let [header, notice, routes] = area.layout(&Layout::vertical([ Constraint::Length(1), - Constraint::Fill(1), Constraint::Length(notice_height), + Constraint::Fill(1), ])); MainAreas { diff --git a/crates/cadder-client/src/widgets/header.rs b/crates/cadder-client/src/widgets/header.rs index 9cf1c78..0257fe6 100644 --- a/crates/cadder-client/src/widgets/header.rs +++ b/crates/cadder-client/src/widgets/header.rs @@ -29,19 +29,17 @@ impl Widget for HeaderBar { buf.set_style(area, THEME.header()); let status = Line::from(vec![ - Span::styled("cadderd", THEME.status_name()), - Span::raw(" "), Span::styled( - self.runtime_status.daemon_label(), + status_marker(self.runtime_status.daemon_is_running()), status_state(self.runtime_status.daemon_is_running()), ), - Span::styled(" | ", THEME.status_separator()), - Span::styled("Caddy", THEME.status_name()), - Span::raw(" "), + Span::styled(" cadderd", THEME.status_name()), + Span::styled(" · ", THEME.status_separator()), Span::styled( - self.runtime_status.caddy_label(), + status_marker(self.runtime_status.caddy_is_running()), status_state(self.runtime_status.caddy_is_running()), ), + Span::styled(" Caddy", THEME.status_name()), Span::raw(" "), ]); let status_width = u16::try_from(status.width()).unwrap_or(u16::MAX); @@ -65,6 +63,10 @@ impl Widget for HeaderBar { } } +const fn status_marker(running: bool) -> &'static str { + if running { "●" } else { "○" } +} + fn status_state(running: bool) -> ratatui::style::Style { if running { THEME.status_running() diff --git a/crates/cadder-client/src/widgets/shortcuts.rs b/crates/cadder-client/src/widgets/shortcuts.rs index 1cc535c..91f66f3 100644 --- a/crates/cadder-client/src/widgets/shortcuts.rs +++ b/crates/cadder-client/src/widgets/shortcuts.rs @@ -6,16 +6,16 @@ use ratatui::widgets::{Paragraph, Widget}; use crate::widgets::theme::THEME; pub const MAIN_SHORTCUTS: [Shortcut; 6] = [ - Shortcut::new("Up/Down", "select"), - Shortcut::new("Space/Enter", "enable/disable"), + Shortcut::new("↑ ↓", "select"), + Shortcut::new("enter", "enable/disable"), Shortcut::new("r", "refresh"), Shortcut::new("x", "stop"), - Shortcut::new("R", "restart"), + Shortcut::new("shift+r", "restart"), Shortcut::new("q", "quit"), ]; pub const OFFLINE_SHORTCUTS: [Shortcut; 3] = [ - Shortcut::new("Enter", "start cadderd"), + Shortcut::new("enter", "start cadderd"), Shortcut::new("r", "retry"), Shortcut::new("q", "quit"), ]; @@ -23,8 +23,8 @@ pub const OFFLINE_SHORTCUTS: [Shortcut; 3] = [ pub const PENDING_SHORTCUTS: [Shortcut; 1] = [Shortcut::new("q", "quit")]; pub const CONFIRMATION_SHORTCUTS: [Shortcut; 3] = [ - Shortcut::new("Enter", "confirm"), - Shortcut::new("Esc", "cancel"), + Shortcut::new("enter", "confirm"), + Shortcut::new("esc", "cancel"), Shortcut::new("q", "quit"), ]; @@ -52,19 +52,17 @@ impl<'a> ShortcutsBar<'a> { impl Widget for ShortcutsBar<'_> { fn render(self, area: Rect, buf: &mut Buffer) { - let shortcut_spans = self - .shortcuts - .iter() - .flat_map(|shortcut| { - [ - Span::styled(shortcut.key, THEME.shortcut_key()), - Span::styled( - format!(" {} ", shortcut.description), - THEME.shortcut_description(), - ), - ] - }) - .collect::>(); + let mut shortcut_spans = Vec::with_capacity(self.shortcuts.len().saturating_mul(3)); + for (index, shortcut) in self.shortcuts.iter().enumerate() { + if index > 0 { + shortcut_spans.push(Span::styled(" · ", THEME.shortcut_separator())); + } + shortcut_spans.push(Span::styled(shortcut.key, THEME.shortcut_key())); + shortcut_spans.push(Span::styled( + format!(" {}", shortcut.description), + THEME.shortcut_description(), + )); + } Paragraph::new(Line::from(shortcut_spans)) .style(THEME.footer()) .render(area, buf); diff --git a/crates/cadder-client/src/widgets/tabs_content/body.rs b/crates/cadder-client/src/widgets/tabs_content/body.rs index 7f800fa..545f6ff 100644 --- a/crates/cadder-client/src/widgets/tabs_content/body.rs +++ b/crates/cadder-client/src/widgets/tabs_content/body.rs @@ -17,11 +17,15 @@ const COLUMN_SPACING: u16 = 1; pub(crate) struct TableBody { rows: Vec, + empty_message: &'static str, } impl TableBody { - pub const fn new(rows: Vec) -> Self { - Self { rows } + pub const fn new(rows: Vec, empty_message: &'static str) -> Self { + Self { + rows, + empty_message, + } } } @@ -48,7 +52,7 @@ impl StatefulWidget for TableBody { trailing_available_width, ); let table = Table::new( - into_rows(self.rows), + into_rows(self.rows, self.empty_message), [ Constraint::Length(SELECTOR_COLUMN_WIDTH), Constraint::Min(PRIMARY_COLUMN_MIN_WIDTH), @@ -57,7 +61,7 @@ impl StatefulWidget for TableBody { ) .column_spacing(COLUMN_SPACING) .row_highlight_style(THEME.table_highlight()) - .highlight_symbol("> ") + .highlight_symbol("› ") .header( Row::new(["", "Project / domain", "Target"]) .style(THEME.table_header()) @@ -93,12 +97,9 @@ fn trailing_column_content_width(rows: &[DomainTableRow]) -> usize { .max(Line::from("Target").width()) } -fn into_rows(rows: Vec) -> Vec> { +fn into_rows(rows: Vec, empty_message: &'static str) -> Vec> { if rows.is_empty() { - return vec![ - Row::new(["", "No registered routes. Run caddy run in a project.", ""]) - .style(THEME.table_disabled_row()), - ]; + return vec![Row::new(["", empty_message, ""]).style(THEME.table_disabled_row())]; } rows.into_iter().map(domain_row).collect() } @@ -350,9 +351,14 @@ mod tests { let area = Rect::new(0, 0, 80, 12); let mut buffer = Buffer::empty(area); let mut state = TableState::default().with_selected(Some(0)); - TableBody::new(model.domain_rows()).render(area, &mut buffer, &mut state); + TableBody::new( + model.domain_rows(), + "No registered routes. Run caddy run in a project.", + ) + .render(area, &mut buffer, &mut state); let text = buffer_text(&buffer); assert!(text.contains("Project / domain")); + assert!(text.contains('›'), "rendered table:\n{text}"); assert!(text.contains("├─ ○"), "rendered table:\n{text}"); assert!(text.contains("└─ ●"), "rendered table:\n{text}"); assert!(text.contains('●')); @@ -366,7 +372,11 @@ mod tests { let small_area = Rect::new(0, 0, 80, 8); let mut small_buffer = Buffer::empty(small_area); let mut state = TableState::default().with_selected(Some(4)); - TableBody::new(model.domain_rows()).render(small_area, &mut small_buffer, &mut state); + TableBody::new( + model.domain_rows(), + "No registered routes. Run caddy run in a project.", + ) + .render(small_area, &mut small_buffer, &mut state); assert!(state.offset() > 0); } diff --git a/crates/cadder-client/src/widgets/tabs_content/domains.rs b/crates/cadder-client/src/widgets/tabs_content/domains.rs index ba30a62..a236c57 100644 --- a/crates/cadder-client/src/widgets/tabs_content/domains.rs +++ b/crates/cadder-client/src/widgets/tabs_content/domains.rs @@ -7,11 +7,15 @@ use crate::widgets::tabs_content::TableBody; pub struct RoutesTable { rows: Vec, + empty_message: &'static str, } impl RoutesTable { - pub const fn new(rows: Vec) -> Self { - Self { rows } + pub const fn new(rows: Vec, empty_message: &'static str) -> Self { + Self { + rows, + empty_message, + } } } @@ -19,6 +23,6 @@ impl StatefulWidget for RoutesTable { type State = TableState; fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) { - TableBody::new(self.rows).render(area, buf, state); + TableBody::new(self.rows, self.empty_message).render(area, buf, state); } } diff --git a/crates/cadder-client/src/widgets/theme.rs b/crates/cadder-client/src/widgets/theme.rs index 8814368..3d8a71a 100644 --- a/crates/cadder-client/src/widgets/theme.rs +++ b/crates/cadder-client/src/widgets/theme.rs @@ -47,6 +47,10 @@ impl Theme { Style::new().fg(self.colors.text_muted) } + pub fn shortcut_separator(self) -> Style { + Style::new().fg(self.colors.dim) + } + pub fn footer(self) -> Style { Style::new().bg(self.colors.backdrop) } @@ -57,7 +61,7 @@ impl Theme { pub fn header_title(self) -> Style { Style::new() - .fg(self.colors.text) + .fg(self.colors.mint_soft) .bg(self.colors.backdrop) .add_modifier(Modifier::BOLD) } @@ -135,6 +139,13 @@ impl Theme { .bg(self.colors.surface_selected) } + pub fn pending_indicator(self) -> Style { + self + .notice() + .fg(self.colors.mint_soft) + .add_modifier(Modifier::BOLD) + } + pub fn project_name(self) -> Style { Style::new() .fg(self.colors.text) @@ -154,9 +165,10 @@ mod tests { theme.shortcut_description().fg, Some(theme.colors.text_muted) ); + assert_eq!(theme.shortcut_separator().fg, Some(theme.colors.dim)); assert_eq!(theme.footer().bg, Some(theme.colors.backdrop)); assert_eq!(theme.header().bg, Some(theme.colors.backdrop)); - assert_eq!(theme.header_title().fg, Some(theme.colors.text)); + assert_eq!(theme.header_title().fg, Some(theme.colors.mint_soft)); assert_eq!(theme.status_name().fg, Some(theme.colors.text)); assert_eq!(theme.status_running().fg, Some(theme.colors.mint_soft)); assert_eq!(theme.status_stopped().fg, Some(theme.colors.dim)); @@ -176,6 +188,7 @@ mod tests { assert_eq!(theme.disabled_marker().fg, Some(theme.colors.text_muted)); assert_eq!(theme.tree_branch().fg, Some(theme.colors.dim)); assert_eq!(theme.notice().bg, Some(theme.colors.surface_selected)); + assert_eq!(theme.pending_indicator().fg, Some(theme.colors.mint_soft)); assert_eq!(theme.project_name().fg, Some(theme.colors.text)); } } diff --git a/crates/cadder-daemon/Cargo.toml b/crates/cadder-daemon/Cargo.toml index daf8ba1..9667458 100644 --- a/crates/cadder-daemon/Cargo.toml +++ b/crates/cadder-daemon/Cargo.toml @@ -43,7 +43,7 @@ futures-util = "=0.3.32" getrandom = "=0.4.2" hex = "=0.4.3" interprocess = { version = "=2.4.2", features = ["tokio"] } -process-wrap = { version = "=9.1.0", default-features = false, features = ["tokio1", "process-group", "kill-on-drop", "job-object"] } +process-wrap = { version = "=9.1.0", default-features = false, features = ["tokio1", "process-group", "kill-on-drop", "job-object", "creation-flags"] } same-file = "=1.0.6" semver = "=1.0.28" serde = { version = "=1.0.229", features = ["derive"] } @@ -64,6 +64,7 @@ testcontainers = "=0.27.3" [target."cfg(windows)".dependencies] is_elevated = "=0.1.2" widestring = "=1.2.1" +windows = { version = "=0.62.2", features = ["Win32_System_Threading"] } windows-sys = { version = "=0.61.2", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Pipes", "Win32_System_Threading", "Win32_UI_Shell"] } [target."cfg(unix)".dependencies] diff --git a/crates/cadder-daemon/src/ipc/daemon_launch.rs b/crates/cadder-daemon/src/ipc/daemon_launch.rs index eb7a8bc..7afcfdc 100644 --- a/crates/cadder-daemon/src/ipc/daemon_launch.rs +++ b/crates/cadder-daemon/src/ipc/daemon_launch.rs @@ -79,17 +79,32 @@ impl DaemonProcessConfig { } } -#[cfg(windows)] -pub(super) const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200; -#[cfg(windows)] -pub(super) const DETACHED_PROCESS: u32 = 0x0000_0008; #[cfg(windows)] pub(super) const CREATE_NO_WINDOW: u32 = 0x0800_0000; #[cfg(windows)] -const BACKGROUND_DAEMON_CREATION_FLAGS: u32 = - CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS | CREATE_NO_WINDOW; +// Windows ignores CREATE_NO_WINDOW when DETACHED_PROCESS is also set. +const BACKGROUND_DAEMON_CREATION_FLAGS: u32 = CREATE_NO_WINDOW; + +#[cfg(all(test, windows))] +mod background_creation_flags_tests { + use super::{BACKGROUND_DAEMON_CREATION_FLAGS, CREATE_NO_WINDOW}; + + const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200; + const DETACHED_PROCESS: u32 = 0x0000_0008; + + #[test] + fn background_daemon_flags_request_no_window_without_detaching() { + assert_ne!(BACKGROUND_DAEMON_CREATION_FLAGS & CREATE_NO_WINDOW, 0); + assert_eq!( + BACKGROUND_DAEMON_CREATION_FLAGS & CREATE_NEW_PROCESS_GROUP, + 0 + ); + assert_eq!(BACKGROUND_DAEMON_CREATION_FLAGS & DETACHED_PROCESS, 0); + } +} const DAEMON_READY_ATTEMPTS: usize = 300; const DAEMON_READY_POLL_INTERVAL: Duration = Duration::from_millis(100); +const DAEMON_READY_CONNECT_TIMEOUT: Duration = Duration::from_millis(100); #[cfg(unix)] fn start_new_unix_session() -> io::Result<()> { @@ -124,7 +139,7 @@ pub async fn ensure_daemon_running_with_options( paths: &RuntimePaths, options: DaemonLaunchOptions, ) -> IpcClientResult<()> { - if daemon_is_ready(paths).await? { + if daemon_is_ready_for_launch(paths).await? { return Ok(()); } @@ -194,7 +209,7 @@ async fn wait_for_daemon_ready( child: &mut tokio::process::Child, ) -> IpcClientResult<()> { for _ in 0..DAEMON_READY_ATTEMPTS { - if daemon_is_ready(paths).await? { + if daemon_is_ready_for_launch(paths).await? { return Ok(()); } if child @@ -238,17 +253,36 @@ pub(super) async fn daemon_is_ready(paths: &RuntimePaths) -> IpcClientResult IpcClientResult { + daemon_is_ready_with_deadlines( + paths, + IpcClientDeadlines { + connect: DAEMON_READY_CONNECT_TIMEOUT, + ..IpcClientDeadlines::default() + }, + ) + .await +} + pub(super) async fn daemon_is_ready_with_deadlines( paths: &RuntimePaths, deadlines: IpcClientDeadlines, ) -> IpcClientResult { match CadderSession::connect_with_deadlines(paths, deadlines).await { Ok(_) => Ok(true), - Err(error) if error.is_stale_instance() || error.is_daemon_unavailable() => Ok(false), + Err(error) if daemon_not_ready_yet(&error) => Ok(false), Err(error) => Err(error), } } +fn daemon_not_ready_yet(error: &IpcClientError) -> bool { + error.is_stale_instance() + || error.is_daemon_unavailable() + || error.local_error().is_some_and(|error| { + error.phase() == IpcClientPhase::Connect && error.code() == LocalIpcErrorCode::Timeout + }) +} + fn sibling_binary(name: &str) -> Option { let current = env::current_exe().ok()?; let dir = current.parent()?; @@ -283,3 +317,17 @@ fn prepend_path_dir(command: &mut Command, dir: &std::path::Path) { command.env("PATH", joined); } } + +#[cfg(test)] +mod readiness_tests { + use super::*; + + #[test] + fn launch_readiness_retries_connection_timeouts() { + let timeout = super::super::client::connection_timeout_error(); + assert!(daemon_not_ready_yet(&timeout)); + + let permanent = super::super::client::connection_error(io::Error::other("connect failed")); + assert!(!daemon_not_ready_yet(&permanent)); + } +} diff --git a/crates/cadder-daemon/src/process_tree.rs b/crates/cadder-daemon/src/process_tree.rs index 796768a..1de0dbb 100644 --- a/crates/cadder-daemon/src/process_tree.rs +++ b/crates/cadder-daemon/src/process_tree.rs @@ -1,15 +1,17 @@ use anyhow::{Context, Result}; -#[cfg(windows)] -use process_wrap::tokio::JobObject; #[cfg(unix)] use process_wrap::tokio::ProcessGroup; use process_wrap::tokio::{ChildWrapper, CommandWrap, KillOnDrop}; +#[cfg(windows)] +use process_wrap::tokio::{CreationFlags, JobObject}; use std::{io, process::Output, time::Duration}; use tokio::{ io::AsyncReadExt, process::{ChildStderr, ChildStdout, Command}, time::timeout, }; +#[cfg(windows)] +use windows::Win32::System::Threading::CREATE_NO_WINDOW; const CLEANUP_TIMEOUT: Duration = Duration::from_secs(5); @@ -24,7 +26,10 @@ impl ProcessTreeChild { #[cfg(unix)] command.wrap(ProcessGroup::leader()); #[cfg(windows)] - command.wrap(JobObject); + { + command.wrap(CreationFlags(CREATE_NO_WINDOW)); + command.wrap(JobObject); + } command.wrap(KillOnDrop); Ok(Self { inner: command.spawn()?, diff --git a/crates/cadder-daemon/src/runtime/process.rs b/crates/cadder-daemon/src/runtime/process.rs index a3a7c92..97f1964 100644 --- a/crates/cadder-daemon/src/runtime/process.rs +++ b/crates/cadder-daemon/src/runtime/process.rs @@ -298,7 +298,10 @@ impl ProcessRuntime { yield_now().await; match timeout(self.timeouts.start_check, child.wait()).await { Ok(Ok(status)) => { - anyhow::bail!("real Caddy runtime exited immediately with status {status}"); + let exit = status + .code() + .map_or_else(|| status.to_string(), |code| format!("exit code {code}")); + anyhow::bail!("real Caddy runtime exited immediately with {exit}"); } Ok(Err(error)) => return Err(error).context("inspect started real Caddy runtime"), Err(_) => {} diff --git a/crates/cadder-daemon/src/runtime/tests.rs b/crates/cadder-daemon/src/runtime/tests.rs index f72fce5..746940f 100644 --- a/crates/cadder-daemon/src/runtime/tests.rs +++ b/crates/cadder-daemon/src/runtime/tests.rs @@ -243,7 +243,11 @@ async fn apply_config_reports_start_failure_without_publishing_candidate() { .await .unwrap_err(); - assert!(error.to_string().contains("exited immediately")); + let error_chain = format!("{error:#}"); + assert!( + error_chain.contains("real Caddy runtime exited immediately with exit code 7"), + "{error_chain}" + ); assert_eq!(std_fs::read(effective_path).unwrap(), b"previous"); assert!(!has_runtime_config_candidate( fixture.runtime.paths.runtime_dir() diff --git a/crates/cadder-daemon/src/state/registrations.rs b/crates/cadder-daemon/src/state/registrations.rs index c36fe87..e4fceb5 100644 --- a/crates/cadder-daemon/src/state/registrations.rs +++ b/crates/cadder-daemon/src/state/registrations.rs @@ -608,11 +608,12 @@ async fn rollback_runtime_transition( }; if let Err(error) = receipt.rollback(&state.logs).await { state.begin_operation_drain(); + state.request_shutdown(); state.logs.append( LogStreamIdentity::runtime_control(), LogSeverity::Error, format!( - "runtime transition rollback failed after rejected registration; Cadder entered read-only drain: {error:#}" + "runtime transition rollback failed after rejected registration; Cadder requested shutdown: {error:#}" ), LogAttributionKind::RuntimeControl, Some("registration-rollback".to_string()), @@ -909,6 +910,26 @@ mod tests { assert!(!registration_mutation_domain_conflict(conflict).accepted); } + #[tokio::test] + async fn failed_runtime_rollback_requests_daemon_shutdown() { + let temp = tempfile::tempdir().unwrap(); + let paths = RuntimePaths::resolve(Some(temp.path().join("runtime"))).unwrap(); + let coordinator = CaddyConfigCoordinator::new_mock(paths.clone()); + let runtime = coordinator.runtime(); + let state = DaemonState::new(coordinator); + let attempt = runtime + .begin_apply_config(br#"{"apps":{}}"#, &state.logs) + .await + .unwrap(); + let (receipt, outcome) = attempt.into_parts(); + outcome.unwrap(); + std::fs::create_dir(paths.effective_config_path()).unwrap(); + + rollback_runtime_transition(&state, Some(RuntimeTransitionReceipt::Apply(receipt))).await; + + assert!(state.shutdown_signal().started_at().is_some()); + } + #[test] fn owner_comparison_distinguishes_matching_missing_and_replaced_sessions() { let existing = registration("entry-1", "nonce-1", "app.localhost", true, true); diff --git a/docs/site/astro.config.mjs b/docs/site/astro.config.mjs index 34553f8..b651010 100644 --- a/docs/site/astro.config.mjs +++ b/docs/site/astro.config.mjs @@ -12,7 +12,7 @@ export default defineConfig({ integrations: [ starlight({ title: 'Cadder', - description: 'Cadder coordinates Caddy routes across local repositories so their apps can use stable addresses through one shared web server and reverse proxy.', + description: 'Cadder coordinates Caddy routes across local repositories so their apps can use stable addresses through one shared reverse proxy.', favicon: 'favicon.ico', logo: { src: './src/assets/logo.png', diff --git a/docs/site/src/components/CadderFooter.astro b/docs/site/src/components/CadderFooter.astro index 2b89ca7..2fd264f 100644 --- a/docs/site/src/components/CadderFooter.astro +++ b/docs/site/src/components/CadderFooter.astro @@ -20,6 +20,9 @@ const heartPathData = Array.isArray(heartPath) ? heartPath[0] : heartPath; )} {hasSidebar && } +

+ Caddy is a registered trademark of Stack Holdings GmbH; its logo identifies the upstream Caddy project. +