1.17.5 (#472)

* API support new calling syntax

* finish /{variant} api to improve network logs in browser console

* update roadmap

* configure the shell used to start the pty

* start on ExecuteTerminal api

* Rename resources less hidden - click on name in header

* update deps

* execute terminal

* BatchPullStack

* add Types import to Actions, and don't stringify the error

* add --reload for cached deps

* type execute terminal response as AsyncIterable

* execute terminal client api

* KOMODO_EXIT_CODE

* Early exit without code

* action configurable deno dep reload

* remove ServerTemplate resource

* kept disabled

* rework exec terminal command wrapper

* debug: print lines in start sentinel loop

* edit debug / remove ref

* echo

* line compare

* log lengths

* use printf again

* check char compare

* leading \n

* works with leading \n

* extra \n after START_OF_OUTPUT

* add variables / secrets finders to ui defined stacks / builds

* isolate post-db startup procedures

* clean up server templates

* disable websocket reconnect from core config

* change periphery ssl enabled to default to true

* git provider selector config pass through disable to http/s button

* disable terminals while allowing container exec

* disable_container_exec in default config

* update ws reconnect implementation

* Don't show delete tag non admin and non owner

* 1.17.5 complete

Cargo.toml

@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.17.1"
+version = "1.17.5"
 edition = "2024"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"
@@ -44,19 +44,21 @@ mungos = "3.2.0"
 svi = "1.0.1"
 
 # ASYNC
-reqwest = { version = "0.12.15", default-features = false, features = ["json", "rustls-tls-native-roots"] }
-tokio = { version = "1.44.1", features = ["full"] }
-tokio-util = "0.7.14"
+reqwest = { version = "0.12.15", default-features = false, features = ["json", "stream", "rustls-tls-native-roots"] }
+tokio = { version = "1.44.2", features = ["full"] }
+tokio-util = { version = "0.7.15", features = ["io", "codec"] }
+tokio-stream = { version = "0.1.17", features = ["sync"] }
+pin-project-lite = "0.2.16"
 futures = "0.3.31"
 futures-util = "0.3.31"
 arc-swap = "1.7.1"
 
 # SERVER
-axum-extra = { version = "0.10.0", features = ["typed-header"] }
+tokio-tungstenite = { version = "0.26.2", features = ["rustls-tls-native-roots"] }
+axum-extra = { version = "0.10.1", features = ["typed-header"] }
 tower-http = { version = "0.6.2", features = ["fs", "cors"] }
 axum-server = { version = "0.7.2", features = ["tls-rustls"] }
-axum = { version = "0.8.1", features = ["ws", "json", "macros"] }
-tokio-tungstenite = "0.26.2"
+axum = { version = "0.8.4", features = ["ws", "json", "macros"] }
 
 # SER/DE
 ordered_hash_map = { version = "0.4.0", features = ["serde"] }
@@ -64,10 +66,11 @@ serde = { version = "1.0.219", features = ["derive"] }
 strum = { version = "0.27.1", features = ["derive"] }
 serde_json = "1.0.140"
 serde_yaml = "0.9.34"
-toml = "0.8.20"
+serde_qs = "0.15.0"
+toml = "0.8.22"
 
 # ERROR
-anyhow = "1.0.97"
+anyhow = "1.0.98"
 thiserror = "2.0.12"
 
 # LOGGING
@@ -76,11 +79,11 @@ opentelemetry_sdk = { version = "0.29.0", features = ["rt-tokio"] }
 tracing-subscriber = { version = "0.3.19", features = ["json"] }
 opentelemetry-semantic-conventions = "0.29.0"
 tracing-opentelemetry = "0.30.0"
-opentelemetry = "0.29.0"
+opentelemetry = "0.29.1"
 tracing = "0.1.41"
 
 # CONFIG
-clap = { version = "4.5.36", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }
 dotenvy = "0.15.7"
 envy = "0.4.2"
 
@@ -94,18 +97,25 @@ bcrypt = "0.17.0"
 base64 = "0.22.1"
 rustls = "0.23.26"
 hmac = "0.12.1"
-sha2 = "0.10.8"
-rand = "0.9.0"
+sha2 = "0.10.9"
+rand = "0.9.1"
 hex = "0.4.3"
 
 # SYSTEM
+portable-pty = "0.9.0"
 bollard = "0.18.1"
-sysinfo = "0.34.2"
+sysinfo = "0.35.0"
 
 # CLOUD
-aws-config = "1.6.1"
-aws-sdk-ec2 = "1.121.1"
-aws-credential-types = "1.2.2"
+aws-config = "1.6.2"
+aws-sdk-ec2 = "1.124.0"
+aws-credential-types = "1.2.3"
+
+## CRON
+english-to-cron = "0.1.4"
+chrono-tz = "0.10.3"
+chrono = "0.4.41"
+croner = "2.1.0"
 
 # MISC
 derive_builder = "0.20.2"
@@ -115,4 +125,5 @@ dashmap = "6.1.0"
 wildcard = "0.3.0"
 colored = "3.0.0"
 regex = "1.11.1"
+bytes = "1.10.1"
 bson = "2.14.0"

bin/binaries.Dockerfile

@@ -1,7 +1,7 @@
 ## Builds the Komodo Core and Periphery binaries
 ## for a specific architecture.
 
-FROM rust:1.85.1-bullseye AS builder
+FROM rust:1.86.0-bullseye AS builder
 
 WORKDIR /builder
 COPY Cargo.toml Cargo.lock ./
@@ -23,5 +23,5 @@ COPY --from=builder /builder/target/release/core /core
 COPY --from=builder /builder/target/release/periphery /periphery
 
 LABEL org.opencontainers.image.source=https://github.com/moghtech/komodo
-LABEL org.opencontainers.image.description="Komodo Periphery"
+LABEL org.opencontainers.image.description="Komodo Binaries"
 LABEL org.opencontainers.image.licenses=GPL-3.0

bin/cli/src/exec.rs

@@ -185,6 +185,9 @@ pub async fn run(execution: Execution) -> anyhow::Result<()> {
     Execution::PullStack(data) => {
       println!("{}: {data:?}", "Data".dimmed())
     }
+    Execution::BatchPullStack(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
     Execution::StartStack(data) => {
       println!("{}: {data:?}", "Data".dimmed())
     }
@@ -429,6 +432,10 @@ pub async fn run(execution: Execution) -> anyhow::Result<()> {
       .execute(request)
       .await
       .map(ExecutionResult::Single),
+    Execution::BatchPullStack(request) => komodo_client()
+      .execute(request)
+      .await
+      .map(ExecutionResult::Batch),
     Execution::StartStack(request) => komodo_client()
       .execute(request)
       .await

bin/core/Cargo.toml

@@ -38,8 +38,11 @@ slack.workspace = true
 svi.workspace = true
 # external
 aws-credential-types.workspace = true
+tokio-tungstenite.workspace = true
 ordered_hash_map.workspace = true
+english-to-cron.workspace = true
 openidconnect.workspace = true
+jsonwebtoken.workspace = true
 axum-server.workspace = true
 urlencoding.workspace = true
 aws-sdk-ec2.workspace = true
@@ -50,6 +53,7 @@ tower-http.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
 typeshare.workspace = true
+chrono-tz.workspace = true
 octorust.workspace = true
 wildcard.workspace = true
 arc-swap.workspace = true
@@ -60,6 +64,8 @@ futures.workspace = true
 nom_pem.workspace = true
 dotenvy.workspace = true
 anyhow.workspace = true
+croner.workspace = true
+chrono.workspace = true
 bcrypt.workspace = true
 base64.workspace = true
 rustls.workspace = true
@@ -73,5 +79,4 @@ envy.workspace = true
 rand.workspace = true
 hmac.workspace = true
 sha2.workspace = true
-jsonwebtoken.workspace = true
 hex.workspace = true

bin/core/aio.Dockerfile

@@ -1,7 +1,7 @@
 ## All in one, multi stage compile + runtime Docker build for your architecture.
 
 # Build Core
-FROM rust:1.85.1-bullseye AS core-builder
+FROM rust:1.86.0-bullseye AS core-builder
 
 WORKDIR /builder
 COPY Cargo.toml Cargo.lock ./
@@ -24,10 +24,9 @@ RUN cd frontend && yarn link komodo_client && yarn && yarn build
 # Final Image
 FROM debian:bullseye-slim
 
-# Install Deps
-RUN apt update && \
-  apt install -y git ca-certificates && \
-  rm -rf /var/lib/apt/lists/*
+COPY ./bin/core/starship.toml /config/starship.toml
+COPY ./bin/core/debian-deps.sh .
+RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 
 # Setup an application directory
 WORKDIR /app

bin/core/debian-deps.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+## Core deps installer
+
+apt-get update
+apt-get install -y git curl ca-certificates
+
+rm -rf /var/lib/apt/lists/*
+
+# Starship prompt
+curl -sS https://starship.rs/install.sh | sh -s -- --yes --bin-dir /usr/local/bin
+echo 'export STARSHIP_CONFIG=/config/starship.toml' >> /root/.bashrc
+echo 'eval "$(starship init bash)"' >> /root/.bashrc
+

bin/core/multi-arch.Dockerfile

@@ -15,10 +15,9 @@ FROM ${FRONTEND_IMAGE} AS frontend
 # Final Image
 FROM debian:bullseye-slim
 
-# Install Deps
-RUN apt update && \
-  apt install -y git ca-certificates && \
-  rm -rf /var/lib/apt/lists/*
+COPY ./bin/core/starship.toml /config/starship.toml
+COPY ./bin/core/debian-deps.sh .
+RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 
 WORKDIR /app
 

bin/core/single-arch.Dockerfile

@@ -16,10 +16,9 @@ RUN cd frontend && yarn link komodo_client && yarn && yarn build
 
 FROM debian:bullseye-slim
 
-# Install Deps
-RUN apt update && \
-	apt install -y git ca-certificates && \
-	rm -rf /var/lib/apt/lists/*
+COPY ./bin/core/starship.toml /config/starship.toml
+COPY ./bin/core/debian-deps.sh .
+RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 	
 # Copy
 COPY ./config/core.config.toml /config/config.toml

bin/core/src/alert/discord.rs

@@ -189,6 +189,24 @@ pub async fn send_alert(
       let link = resource_link(ResourceTargetVariant::Repo, id);
       format!("{level} | Repo build for **{name}** failed\n{link}")
     }
+    AlertData::ProcedureFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Procedure, id);
+      format!("{level} | Procedure **{name}** failed\n{link}")
+    }
+    AlertData::ActionFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Action, id);
+      format!("{level} | Action **{name}** failed\n{link}")
+    }
+    AlertData::ScheduleRun {
+      resource_type,
+      id,
+      name,
+    } => {
+      let link = resource_link(*resource_type, id);
+      format!(
+        "{level} | **{name}** ({resource_type}) | Scheduled run started 🕝\n{link}"
+      )
+    }
     AlertData::None {} => Default::default(),
   };
   if !content.is_empty() {

bin/core/src/alert/mod.rs

@@ -18,8 +18,9 @@ use crate::helpers::query::get_variables_and_secrets;
 use crate::{config::core_config, state::db_client};
 
 mod discord;
-mod slack;
 mod ntfy;
+mod pushover;
+mod slack;
 
 #[instrument(level = "debug")]
 pub async fn send_alerts(alerts: &[Alert]) {
@@ -131,7 +132,18 @@ pub async fn send_alert_to_alerter(
     }
     AlerterEndpoint::Ntfy(NtfyAlerterEndpoint { url }) => {
       ntfy::send_alert(url, alert).await.with_context(|| {
-        format!("Failed to send alert to ntfy Alerter {}", alerter.name)
+        format!(
+          "Failed to send alert to ntfy Alerter {}",
+          alerter.name
+        )
+      })
+    }
+    AlerterEndpoint::Pushover(PushoverAlerterEndpoint { url }) => {
+      pushover::send_alert(url, alert).await.with_context(|| {
+        format!(
+          "Failed to send alert to Pushover Alerter {}",
+          alerter.name
+        )
       })
     }
   }
@@ -248,9 +260,6 @@ fn resource_link(
     ResourceTargetVariant::Action => {
       format!("/actions/{id}")
     }
-    ResourceTargetVariant::ServerTemplate => {
-      format!("/server-templates/{id}")
-    }
     ResourceTargetVariant::ResourceSync => {
       format!("/resource-syncs/{id}")
     }

bin/core/src/alert/ntfy.rs

@@ -202,6 +202,24 @@ pub async fn send_alert(
       let link = resource_link(ResourceTargetVariant::Repo, id);
       format!("{level} | Repo build for {} failed\n{link}", name,)
     }
+    AlertData::ProcedureFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Procedure, id);
+      format!("{level} | Procedure {name} failed\n{link}")
+    }
+    AlertData::ActionFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Action, id);
+      format!("{level} | Action {name} failed\n{link}")
+    }
+    AlertData::ScheduleRun {
+      resource_type,
+      id,
+      name,
+    } => {
+      let link = resource_link(*resource_type, id);
+      format!(
+        "{level} | {name} ({resource_type}) | Scheduled run started 🕝\n{link}"
+      )
+    }
     AlertData::None {} => Default::default(),
   };
 

bin/core/src/alert/pushover.rs

@@ -0,0 +1,270 @@
+use std::sync::OnceLock;
+
+use super::*;
+
+#[instrument(level = "debug")]
+pub async fn send_alert(
+  url: &str,
+  alert: &Alert,
+) -> anyhow::Result<()> {
+  let level = fmt_level(alert.level);
+  let content = match &alert.data {
+    AlertData::Test { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Alerter, id);
+      format!(
+        "{level} | If you see this message, then Alerter {} is working\n{link}",
+        name,
+      )
+    }
+    AlertData::ServerUnreachable {
+      id,
+      name,
+      region,
+      err,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      match alert.level {
+        SeverityLevel::Ok => {
+          format!(
+            "{level} | {}{} is now reachable\n{link}",
+            name, region
+          )
+        }
+        SeverityLevel::Critical => {
+          let err = err
+            .as_ref()
+            .map(|e| format!("\nerror: {:#?}", e))
+            .unwrap_or_default();
+          format!(
+            "{level} | {}{} is unreachable ❌\n{link}{err}",
+            name, region
+          )
+        }
+        _ => unreachable!(),
+      }
+    }
+    AlertData::ServerCpu {
+      id,
+      name,
+      region,
+      percentage,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      format!(
+        "{level} | {}{} cpu usage at {percentage:.1}%\n{link}",
+        name, region,
+      )
+    }
+    AlertData::ServerMem {
+      id,
+      name,
+      region,
+      used_gb,
+      total_gb,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      let percentage = 100.0 * used_gb / total_gb;
+      format!(
+        "{level} | {}{} memory usage at {percentage:.1}%💾\n\nUsing {used_gb:.1} GiB / {total_gb:.1} GiB\n{link}",
+        name, region,
+      )
+    }
+    AlertData::ServerDisk {
+      id,
+      name,
+      region,
+      path,
+      used_gb,
+      total_gb,
+    } => {
+      let region = fmt_region(region);
+      let link = resource_link(ResourceTargetVariant::Server, id);
+      let percentage = 100.0 * used_gb / total_gb;
+      format!(
+        "{level} | {}{} disk usage at {percentage:.1}%💿\nmount point: {:?}\nusing {used_gb:.1} GiB / {total_gb:.1} GiB\n{link}",
+        name, region, path,
+      )
+    }
+    AlertData::ContainerStateChange {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      from,
+      to,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Deployment, id);
+      let to_state = fmt_docker_container_state(to);
+      format!(
+        "📦Deployment {} is now {}\nserver: {}\nprevious: {}\n{link}",
+        name, to_state, server_name, from,
+      )
+    }
+    AlertData::DeploymentImageUpdateAvailable {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      image,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Deployment, id);
+      format!(
+        "⬆ Deployment {} has an update available\nserver: {}\nimage: {}\n{link}",
+        name, server_name, image,
+      )
+    }
+    AlertData::DeploymentAutoUpdated {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      image,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Deployment, id);
+      format!(
+        "⬆ Deployment {} was updated automatically\nserver: {}\nimage: {}\n{link}",
+        name, server_name, image,
+      )
+    }
+    AlertData::StackStateChange {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      from,
+      to,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Stack, id);
+      let to_state = fmt_stack_state(to);
+      format!(
+        "🥞 Stack {} is now {}\nserver: {}\nprevious: {}\n{link}",
+        name, to_state, server_name, from,
+      )
+    }
+    AlertData::StackImageUpdateAvailable {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      service,
+      image,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Stack, id);
+      format!(
+        "⬆ Stack {} has an update available\nserver: {}\nservice: {}\nimage: {}\n{link}",
+        name, server_name, service, image,
+      )
+    }
+    AlertData::StackAutoUpdated {
+      id,
+      name,
+      server_id: _server_id,
+      server_name,
+      images,
+    } => {
+      let link = resource_link(ResourceTargetVariant::Stack, id);
+      let images_label =
+        if images.len() > 1 { "images" } else { "image" };
+      let images_str = images.join(", ");
+      format!(
+        "⬆ Stack {} was updated automatically ⏫\nserver: {}\n{}: {}\n{link}",
+        name, server_name, images_label, images_str,
+      )
+    }
+    AlertData::AwsBuilderTerminationFailed {
+      instance_id,
+      message,
+    } => {
+      format!(
+        "{level} | Failed to terminate AWS builder instance\ninstance id: {}\n{}",
+        instance_id, message,
+      )
+    }
+    AlertData::ResourceSyncPendingUpdates { id, name } => {
+      let link =
+        resource_link(ResourceTargetVariant::ResourceSync, id);
+      format!(
+        "{level} | Pending resource sync updates on {}\n{link}",
+        name,
+      )
+    }
+    AlertData::BuildFailed { id, name, version } => {
+      let link = resource_link(ResourceTargetVariant::Build, id);
+      format!(
+        "{level} | Build {name} failed\nversion: v{version}\n{link}",
+      )
+    }
+    AlertData::RepoBuildFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Repo, id);
+      format!("{level} | Repo build for {} failed\n{link}", name,)
+    }
+    AlertData::ProcedureFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Procedure, id);
+      format!("{level} | Procedure {name} failed\n{link}")
+    }
+    AlertData::ActionFailed { id, name } => {
+      let link = resource_link(ResourceTargetVariant::Action, id);
+      format!("{level} | Action {name} failed\n{link}")
+    }
+    AlertData::ScheduleRun {
+      resource_type,
+      id,
+      name,
+    } => {
+      let link = resource_link(*resource_type, id);
+      format!(
+        "{level} | {name} ({resource_type}) | Scheduled run started 🕝\n{link}"
+      )
+    }
+    AlertData::None {} => Default::default(),
+  };
+
+  if !content.is_empty() {
+    send_message(url, content).await?;
+  }
+  Ok(())
+}
+
+async fn send_message(
+  url: &str,
+  content: String,
+) -> anyhow::Result<()> {
+  // pushover needs all information to be encoded in the URL. At minimum they need
+  // the user key, the application token, and the message (url encoded).
+  // other optional params here: https://pushover.net/api (just add them to the
+  // webhook url along with the application token and the user key).
+  let content = [("message", content)];
+
+  let response = http_client()
+    .post(url)
+    .form(&content)
+    .send()
+    .await
+    .context("Failed to send message")?;
+
+  let status = response.status();
+  if status.is_success() {
+    debug!("pushover alert sent successfully: {}", status);
+    Ok(())
+  } else {
+    let text = response.text().await.with_context(|| {
+      format!(
+        "Failed to send message to pushover | {} | failed to get response text",
+        status
+      )
+    })?;
+    Err(anyhow!(
+      "Failed to send message to pushover | {} | {}",
+      status,
+      text
+    ))
+  }
+}
+
+fn http_client() -> &'static reqwest::Client {
+  static CLIENT: OnceLock<reqwest::Client> = OnceLock::new();
+  CLIENT.get_or_init(reqwest::Client::new)
+}

bin/core/src/alert/slack.rs

@@ -373,9 +373,7 @@ pub async fn send_alert(
       let text = format!("{level} | Build {name} has failed");
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!(
-          "build name: *{name}*\nversion: *v{version}*",
-        )),
+        Block::section(format!("version: *v{version}*",)),
         Block::section(resource_link(
           ResourceTargetVariant::Build,
           id,
@@ -388,7 +386,6 @@ pub async fn send_alert(
         format!("{level} | Repo build for *{name}* has *failed*");
       let blocks = vec![
         Block::header(text.clone()),
-        Block::section(format!("repo name: *{name}*",)),
         Block::section(resource_link(
           ResourceTargetVariant::Repo,
           id,
@@ -396,6 +393,42 @@ pub async fn send_alert(
       ];
       (text, blocks.into())
     }
+    AlertData::ProcedureFailed { id, name } => {
+      let text = format!("{level} | Procedure *{name}* has *failed*");
+      let blocks = vec![
+        Block::header(text.clone()),
+        Block::section(resource_link(
+          ResourceTargetVariant::Procedure,
+          id,
+        )),
+      ];
+      (text, blocks.into())
+    }
+    AlertData::ActionFailed { id, name } => {
+      let text = format!("{level} | Action *{name}* has *failed*");
+      let blocks = vec![
+        Block::header(text.clone()),
+        Block::section(resource_link(
+          ResourceTargetVariant::Action,
+          id,
+        )),
+      ];
+      (text, blocks.into())
+    }
+    AlertData::ScheduleRun {
+      resource_type,
+      id,
+      name,
+    } => {
+      let text = format!(
+        "{level} | *{name}* ({resource_type}) | Scheduled run started 🕝"
+      );
+      let blocks = vec![
+        Block::header(text.clone()),
+        Block::section(resource_link(*resource_type, id)),
+      ];
+      (text, blocks.into())
+    }
     AlertData::None {} => Default::default(),
   };
   if !text.is_empty() {
@@ -411,7 +444,7 @@ pub async fn send_alert(
       &mut global_replacers,
       &mut secret_replacers,
     )?;
-    
+
     let slack = ::slack::Client::new(url_interpolated);
     slack.send_message(text, blocks).await.map_err(|e| {
       let replacers =

bin/core/src/api/auth.rs

@@ -1,11 +1,12 @@
 use std::{sync::OnceLock, time::Instant};
 
-use axum::{Router, http::HeaderMap, routing::post};
+use axum::{Router, extract::Path, http::HeaderMap, routing::post};
 use derive_variants::{EnumVariants, ExtractVariant};
 use komodo_client::{api::auth::*, entities::user::User};
 use resolver_api::Resolve;
 use response::Response;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
@@ -22,6 +23,8 @@ use crate::{
   state::jwt_client,
 };
 
+use super::Variant;
+
 pub struct AuthArgs {
   pub headers: HeaderMap,
 }
@@ -45,7 +48,9 @@ pub enum AuthRequest {
 }
 
 pub fn router() -> Router {
-  let mut router = Router::new().route("/", post(handler));
+  let mut router = Router::new()
+    .route("/", post(handler))
+    .route("/{variant}", post(variant_handler));
 
   if core_config().local_auth {
     info!("🔑 Local Login Enabled");
@@ -69,6 +74,18 @@ pub fn router() -> Router {
   router
 }
 
+async fn variant_handler(
+  headers: HeaderMap,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: AuthRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(headers, Json(req)).await
+}
+
 #[instrument(name = "AuthHandler", level = "debug", skip(headers))]
 async fn handler(
   headers: HeaderMap,

bin/core/src/api/execute/action.rs

@@ -13,8 +13,13 @@ use komodo_client::{
     user::{CreateApiKey, CreateApiKeyResponse, DeleteApiKey},
   },
   entities::{
-    action::Action, config::core::CoreConfig,
-    permission::PermissionLevel, update::Update, user::action_user,
+    action::Action,
+    alert::{Alert, AlertData, SeverityLevel},
+    config::core::CoreConfig,
+    komodo_timestamp,
+    permission::PermissionLevel,
+    update::Update,
+    user::action_user,
   },
 };
 use mungos::{by_id::update_one_by_id, mongodb::bson::to_document};
@@ -22,6 +27,7 @@ use resolver_api::Resolve;
 use tokio::fs;
 
 use crate::{
+  alert::send_alerts,
   api::{execute::ExecuteRequest, user::UserArgs},
   config::core_config,
   helpers::{
@@ -128,12 +134,18 @@ impl Resolve<ExecuteArgs> for RunAction {
       ""
     };
 
+    let reload = if action.config.reload_deno_deps {
+      " --reload"
+    } else {
+      ""
+    };
+
     let mut res = run_komodo_command(
       // Keep this stage name as is, the UI will find the latest update log by matching the stage name
       "Execute Action",
       None,
       format!(
-        "deno run --allow-all{https_cert_flag} {}",
+        "deno run --allow-all{https_cert_flag}{reload} {}",
         path.display()
       ),
     )
@@ -178,6 +190,26 @@ impl Resolve<ExecuteArgs> for RunAction {
 
     update_update(update.clone()).await?;
 
+    if !update.success && action.config.failure_alert {
+      warn!("action unsuccessful, alerting...");
+      let target = update.target.clone();
+      tokio::spawn(async move {
+        let alert = Alert {
+          id: Default::default(),
+          target,
+          ts: komodo_timestamp(),
+          resolved_ts: Some(komodo_timestamp()),
+          resolved: true,
+          level: SeverityLevel::Warning,
+          data: AlertData::ActionFailed {
+            id: action.id,
+            name: action.name,
+          },
+        };
+        send_alerts(&[alert]).await
+      });
+    }
+
     Ok(update)
   }
 }
@@ -219,7 +251,7 @@ fn full_contents(contents: &str, key: &str, secret: &str) -> String {
   let protocol = if *ssl_enabled { "https" } else { "http" };
   let base_url = format!("{protocol}://localhost:{port}");
   format!(
-    "import {{ KomodoClient }} from '{base_url}/client/lib.js';
+    "import {{ KomodoClient, Types }} from '{base_url}/client/lib.js';
 import * as __YAML__ from 'jsr:@std/yaml';
 import * as __TOML__ from 'jsr:@std/toml';
 
@@ -255,7 +287,7 @@ main()
     console.error('Status:', error.status);
     console.error(JSON.stringify(error.result, null, 2));
   }} else {{
-    console.error(JSON.stringify(error, null, 2));
+    console.error(error);
   }}
   Deno.exit(1)
 }});"

bin/core/src/api/execute/mod.rs

@@ -1,7 +1,9 @@
 use std::{pin::Pin, time::Instant};
 
 use anyhow::Context;
-use axum::{Extension, Router, middleware, routing::post};
+use axum::{
+  Extension, Router, extract::Path, middleware, routing::post,
+};
 use axum_extra::{TypedHeader, headers::ContentType};
 use derive_variants::{EnumVariants, ExtractVariant};
 use formatting::format_serror;
@@ -18,6 +20,7 @@ use mungos::by_id::find_one_by_id;
 use resolver_api::Resolve;
 use response::JsonString;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
@@ -36,10 +39,11 @@ mod deployment;
 mod procedure;
 mod repo;
 mod server;
-mod server_template;
 mod stack;
 mod sync;
 
+use super::Variant;
+
 pub use {
   deployment::pull_deployment_inner, stack::pull_stack_inner,
 };
@@ -100,6 +104,7 @@ pub enum ExecuteRequest {
   DeployStackIfChanged(DeployStackIfChanged),
   BatchDeployStackIfChanged(BatchDeployStackIfChanged),
   PullStack(PullStack),
+  BatchPullStack(BatchPullStack),
   StartStack(StartStack),
   RestartStack(RestartStack),
   StopStack(StopStack),
@@ -130,9 +135,6 @@ pub enum ExecuteRequest {
   RunAction(RunAction),
   BatchRunAction(BatchRunAction),
 
-  // ==== SERVER TEMPLATE ====
-  LaunchServer(LaunchServer),
-
   // ==== ALERTER ====
   TestAlerter(TestAlerter),
 
@@ -143,9 +145,22 @@ pub enum ExecuteRequest {
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
+    .route("/{variant}", post(variant_handler))
     .layer(middleware::from_fn(auth_request))
 }
 
+async fn variant_handler(
+  user: Extension<User>,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<(TypedHeader<ContentType>, String)> {
+  let req: ExecuteRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(user, Json(req)).await
+}
+
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<ExecuteRequest>,

bin/core/src/api/execute/procedure.rs

@@ -6,8 +6,12 @@ use komodo_client::{
     BatchExecutionResponse, BatchRunProcedure, RunProcedure,
   },
   entities::{
-    permission::PermissionLevel, procedure::Procedure,
-    update::Update, user::User,
+    alert::{Alert, AlertData, SeverityLevel},
+    komodo_timestamp,
+    permission::PermissionLevel,
+    procedure::Procedure,
+    update::Update,
+    user::User,
   },
 };
 use mungos::{by_id::update_one_by_id, mongodb::bson::to_document};
@@ -15,6 +19,7 @@ use resolver_api::Resolve;
 use tokio::sync::Mutex;
 
 use crate::{
+  alert::send_alerts,
   helpers::{procedure::execute_procedure, update::update_update},
   resource::{self, refresh_procedure_state_cache},
   state::{action_states, db_client},
@@ -137,6 +142,26 @@ fn resolve_inner(
 
     update_update(update.clone()).await?;
 
+    if !update.success && procedure.config.failure_alert {
+      warn!("procedure unsuccessful, alerting...");
+      let target = update.target.clone();
+      tokio::spawn(async move {
+        let alert = Alert {
+          id: Default::default(),
+          target,
+          ts: komodo_timestamp(),
+          resolved_ts: Some(komodo_timestamp()),
+          resolved: true,
+          level: SeverityLevel::Warning,
+          data: AlertData::ProcedureFailed {
+            id: procedure.id,
+            name: procedure.name,
+          },
+        };
+        send_alerts(&[alert]).await
+      });
+    }
+
     Ok(update)
   })
 }

bin/core/src/api/execute/server_template.rs

@@ -1,156 +0,0 @@
-use anyhow::{Context, anyhow};
-use formatting::format_serror;
-use komodo_client::{
-  api::{execute::LaunchServer, write::CreateServer},
-  entities::{
-    permission::PermissionLevel,
-    server::PartialServerConfig,
-    server_template::{ServerTemplate, ServerTemplateConfig},
-    update::Update,
-  },
-};
-use mungos::mongodb::bson::doc;
-use resolver_api::Resolve;
-
-use crate::{
-  api::write::WriteArgs,
-  cloud::{
-    aws::ec2::launch_ec2_instance, hetzner::launch_hetzner_server,
-  },
-  helpers::update::update_update,
-  resource,
-  state::db_client,
-};
-
-use super::ExecuteArgs;
-
-impl Resolve<ExecuteArgs> for LaunchServer {
-  #[instrument(name = "LaunchServer", skip(user, update), fields(user_id = user.id, update_id = update.id))]
-  async fn resolve(
-    self,
-    ExecuteArgs { user, update }: &ExecuteArgs,
-  ) -> serror::Result<Update> {
-    // validate name isn't already taken by another server
-    if db_client()
-      .servers
-      .find_one(doc! {
-        "name": &self.name
-      })
-      .await
-      .context("failed to query db for servers")?
-      .is_some()
-    {
-      return Err(anyhow!("name is already taken").into());
-    }
-
-    let template = resource::get_check_permissions::<ServerTemplate>(
-      &self.server_template,
-      user,
-      PermissionLevel::Execute,
-    )
-    .await?;
-
-    let mut update = update.clone();
-
-    update.push_simple_log(
-      "launching server",
-      format!("{:#?}", template.config),
-    );
-    update_update(update.clone()).await?;
-
-    let config = match template.config {
-      ServerTemplateConfig::Aws(config) => {
-        let region = config.region.clone();
-        let use_https = config.use_https;
-        let port = config.port;
-        let instance =
-          match launch_ec2_instance(&self.name, config).await {
-            Ok(instance) => instance,
-            Err(e) => {
-              update.push_error_log(
-                "launch server",
-                format!("failed to launch aws instance\n\n{e:#?}"),
-              );
-              update.finalize();
-              update_update(update.clone()).await?;
-              return Ok(update);
-            }
-          };
-        update.push_simple_log(
-          "launch server",
-          format!(
-            "successfully launched server {} on ip {}",
-            self.name, instance.ip
-          ),
-        );
-        let protocol = if use_https { "https" } else { "http" };
-        PartialServerConfig {
-          address: format!("{protocol}://{}:{port}", instance.ip)
-            .into(),
-          region: region.into(),
-          ..Default::default()
-        }
-      }
-      ServerTemplateConfig::Hetzner(config) => {
-        let datacenter = config.datacenter;
-        let use_https = config.use_https;
-        let port = config.port;
-        let server =
-          match launch_hetzner_server(&self.name, config).await {
-            Ok(server) => server,
-            Err(e) => {
-              update.push_error_log(
-                "launch server",
-                format!("failed to launch hetzner server\n\n{e:#?}"),
-              );
-              update.finalize();
-              update_update(update.clone()).await?;
-              return Ok(update);
-            }
-          };
-        update.push_simple_log(
-          "launch server",
-          format!(
-            "successfully launched server {} on ip {}",
-            self.name, server.ip
-          ),
-        );
-        let protocol = if use_https { "https" } else { "http" };
-        PartialServerConfig {
-          address: format!("{protocol}://{}:{port}", server.ip)
-            .into(),
-          region: datacenter.as_ref().to_string().into(),
-          ..Default::default()
-        }
-      }
-    };
-
-    match (CreateServer {
-      name: self.name,
-      config,
-    })
-    .resolve(&WriteArgs { user: user.clone() })
-    .await
-    {
-      Ok(server) => {
-        update.push_simple_log(
-          "create server",
-          format!("created server {} ({})", server.name, server.id),
-        );
-        update.other_data = server.id;
-      }
-      Err(e) => {
-        update.push_error_log(
-          "create server",
-          format_serror(
-            &e.error.context("failed to create server").into(),
-          ),
-        );
-      }
-    };
-
-    update.finalize();
-    update_update(update.clone()).await?;
-    Ok(update)
-  }
-}

bin/core/src/api/execute/stack.rs

@@ -385,6 +385,32 @@ impl Resolve<ExecuteArgs> for DeployStackIfChanged {
   }
 }
 
+impl super::BatchExecute for BatchPullStack {
+  type Resource = Stack;
+  fn single_request(stack: String) -> ExecuteRequest {
+    ExecuteRequest::PullStack(PullStack {
+      stack,
+      services: Vec::new(),
+    })
+  }
+}
+
+impl Resolve<ExecuteArgs> for BatchPullStack {
+  #[instrument(name = "BatchPullStack", skip(user), fields(user_id = user.id))]
+  async fn resolve(
+    self,
+    ExecuteArgs { user, .. }: &ExecuteArgs,
+  ) -> serror::Result<BatchExecutionResponse> {
+    Ok(
+      super::batch_execute::<BatchPullStack>(
+        &self.pattern,
+        user,
+      )
+      .await?,
+    )
+  }
+}
+
 pub async fn pull_stack_inner(
   mut stack: Stack,
   services: Vec<String>,

bin/core/src/api/execute/sync.rs

@@ -16,7 +16,6 @@ use komodo_client::{
     procedure::Procedure,
     repo::Repo,
     server::Server,
-    server_template::ServerTemplate,
     stack::Stack,
     sync::ResourceSync,
     update::{Log, Update},
@@ -142,10 +141,6 @@ impl Resolve<ExecuteArgs> for RunSync {
                 .servers
                 .get(&name_or_id)
                 .map(|s| s.name.clone()),
-              ResourceTargetVariant::ServerTemplate => all_resources
-                .templates
-                .get(&name_or_id)
-                .map(|t| t.name.clone()),
               ResourceTargetVariant::Stack => all_resources
                 .stacks
                 .get(&name_or_id)
@@ -332,20 +327,6 @@ impl Resolve<ExecuteArgs> for RunSync {
     } else {
       Default::default()
     };
-    let server_template_deltas = if sync.config.include_resources {
-      get_updates_for_execution::<ServerTemplate>(
-        resources.server_templates,
-        delete,
-        &all_resources,
-        match_resource_type,
-        match_resources.as_deref(),
-        &id_to_tags,
-        &sync.config.match_tags,
-      )
-      .await?
-    } else {
-      Default::default()
-    };
     let resource_sync_deltas = if sync.config.include_resources {
       get_updates_for_execution::<entities::sync::ResourceSync>(
         resources.resource_syncs,
@@ -397,7 +378,6 @@ impl Resolve<ExecuteArgs> for RunSync {
 
     if deploy_cache.is_empty()
       && resource_sync_deltas.no_changes()
-      && server_template_deltas.no_changes()
       && server_deltas.no_changes()
       && deployment_deltas.no_changes()
       && stack_deltas.no_changes()
@@ -451,11 +431,6 @@ impl Resolve<ExecuteArgs> for RunSync {
       &mut update.logs,
       ResourceSync::execute_sync_updates(resource_sync_deltas).await,
     );
-    maybe_extend(
-      &mut update.logs,
-      ServerTemplate::execute_sync_updates(server_template_deltas)
-        .await,
-    );
     maybe_extend(
       &mut update.logs,
       Server::execute_sync_updates(server_deltas).await,

bin/core/src/api/mod.rs

@@ -1,5 +1,11 @@
 pub mod auth;
 pub mod execute;
 pub mod read;
+pub mod terminal;
 pub mod user;
 pub mod write;
+
+#[derive(serde::Deserialize)]
+struct Variant {
+  variant: String,
+}

bin/core/src/api/read/mod.rs

@@ -1,7 +1,9 @@
 use std::{collections::HashSet, sync::OnceLock, time::Instant};
 
 use anyhow::{Context, anyhow};
-use axum::{Extension, Router, middleware, routing::post};
+use axum::{
+  Extension, Router, extract::Path, middleware, routing::post,
+};
 use komodo_client::{
   api::read::*,
   entities::{
@@ -18,6 +20,7 @@ use komodo_client::{
 use resolver_api::Resolve;
 use response::Response;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
@@ -27,6 +30,8 @@ use crate::{
   resource,
 };
 
+use super::Variant;
+
 mod action;
 mod alert;
 mod alerter;
@@ -38,7 +43,6 @@ mod procedure;
 mod provider;
 mod repo;
 mod server;
-mod server_template;
 mod stack;
 mod sync;
 mod tag;
@@ -93,12 +97,6 @@ enum ReadRequest {
   ListActions(ListActions),
   ListFullActions(ListFullActions),
 
-  // ==== SERVER TEMPLATE ====
-  GetServerTemplate(GetServerTemplate),
-  GetServerTemplatesSummary(GetServerTemplatesSummary),
-  ListServerTemplates(ListServerTemplates),
-  ListFullServerTemplates(ListFullServerTemplates),
-
   // ==== SERVER ====
   GetServersSummary(GetServersSummary),
   GetServer(GetServer),
@@ -123,6 +121,7 @@ enum ReadRequest {
   ListDockerImages(ListDockerImages),
   ListDockerVolumes(ListDockerVolumes),
   ListComposeProjects(ListComposeProjects),
+  ListTerminals(ListTerminals),
 
   // ==== DEPLOYMENT ====
   GetDeploymentsSummary(GetDeploymentsSummary),
@@ -223,9 +222,22 @@ enum ReadRequest {
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
+    .route("/{variant}", post(variant_handler))
     .layer(middleware::from_fn(auth_request))
 }
 
+async fn variant_handler(
+  user: Extension<User>,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: ReadRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(user, Json(req)).await
+}
+
 #[instrument(name = "ReadHandler", level = "debug", skip(user), fields(user_id = user.id))]
 async fn handler(
   Extension(user): Extension<User>,
@@ -270,6 +282,7 @@ fn core_info() -> &'static GetCoreInfoResponse {
       ui_write_disabled: config.ui_write_disabled,
       disable_confirm_dialog: config.disable_confirm_dialog,
       disable_non_admin_create: config.disable_non_admin_create,
+      disable_websocket_reconnect: config.disable_websocket_reconnect,
       github_webhook_owners: config
         .github_webhook_app
         .installations

bin/core/src/api/read/server.rs

@@ -21,9 +21,11 @@ use komodo_client::{
       network::Network,
       volume::Volume,
     },
+    komodo_timestamp,
     permission::PermissionLevel,
     server::{
       Server, ServerActionState, ServerListItem, ServerState,
+      TerminalInfo,
     },
     stack::{Stack, StackServiceNames},
     stats::{SystemInformation, SystemProcess},
@@ -45,7 +47,10 @@ use resolver_api::Resolve;
 use tokio::sync::Mutex;
 
 use crate::{
-  helpers::{periphery_client, query::get_all_tags},
+  helpers::{
+    periphery_client,
+    query::{get_all_tags, get_system_info},
+  },
   resource,
   stack::compose_container_match_regex,
   state::{action_states, db_client, server_status_cache},
@@ -198,16 +203,6 @@ impl Resolve<ReadArgs> for GetServerActionState {
   }
 }
 
-// This protects the peripheries from spam requests
-const SYSTEM_INFO_EXPIRY: u128 = FIFTEEN_SECONDS_MS;
-type SystemInfoCache =
-  Mutex<HashMap<String, Arc<(SystemInformation, u128)>>>;
-fn system_info_cache() -> &'static SystemInfoCache {
-  static SYSTEM_INFO_CACHE: OnceLock<SystemInfoCache> =
-    OnceLock::new();
-  SYSTEM_INFO_CACHE.get_or_init(Default::default)
-}
-
 impl Resolve<ReadArgs> for GetSystemInformation {
   async fn resolve(
     self,
@@ -219,25 +214,7 @@ impl Resolve<ReadArgs> for GetSystemInformation {
       PermissionLevel::Read,
     )
     .await?;
-
-    let mut lock = system_info_cache().lock().await;
-    let res = match lock.get(&server.id) {
-      Some(cached) if cached.1 > unix_timestamp_ms() => {
-        cached.0.clone()
-      }
-      _ => {
-        let stats = periphery_client(&server)?
-          .request(periphery::stats::GetSystemInformation {})
-          .await?;
-        lock.insert(
-          server.id,
-          (stats.clone(), unix_timestamp_ms() + SYSTEM_INFO_EXPIRY)
-            .into(),
-        );
-        stats
-      }
-    };
-    Ok(res)
+    get_system_info(&server).await.map_err(Into::into)
   }
 }
 
@@ -812,3 +789,66 @@ impl Resolve<ReadArgs> for ListComposeProjects {
     }
   }
 }
+
+#[derive(Default)]
+struct TerminalCacheItem {
+  list: Vec<TerminalInfo>,
+  ttl: i64,
+}
+
+const TERMINAL_CACHE_TIMEOUT: i64 = 30_000;
+
+#[derive(Default)]
+struct TerminalCache(
+  std::sync::Mutex<
+    HashMap<String, Arc<tokio::sync::Mutex<TerminalCacheItem>>>,
+  >,
+);
+
+impl TerminalCache {
+  fn get_or_insert(
+    &self,
+    server_id: String,
+  ) -> Arc<tokio::sync::Mutex<TerminalCacheItem>> {
+    if let Some(cached) =
+      self.0.lock().unwrap().get(&server_id).cloned()
+    {
+      return cached;
+    }
+    let to_cache =
+      Arc::new(tokio::sync::Mutex::new(TerminalCacheItem::default()));
+    self.0.lock().unwrap().insert(server_id, to_cache.clone());
+    to_cache
+  }
+}
+
+fn terminals_cache() -> &'static TerminalCache {
+  static TERMINALS: OnceLock<TerminalCache> = OnceLock::new();
+  TERMINALS.get_or_init(Default::default)
+}
+
+impl Resolve<ReadArgs> for ListTerminals {
+  async fn resolve(
+    self,
+    ReadArgs { user }: &ReadArgs,
+  ) -> serror::Result<ListTerminalsResponse> {
+    let server = resource::get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Read,
+    )
+    .await?;
+    let cache = terminals_cache().get_or_insert(server.id.clone());
+    let mut cache = cache.lock().await;
+    if self.fresh || komodo_timestamp() > cache.ttl {
+      cache.list = periphery_client(&server)?
+        .request(periphery_client::api::terminal::ListTerminals {})
+        .await
+        .context("Failed to get fresh terminal list")?;
+      cache.ttl = komodo_timestamp() + TERMINAL_CACHE_TIMEOUT;
+      Ok(cache.list.clone())
+    } else {
+      Ok(cache.list.clone())
+    }
+  }
+}

bin/core/src/api/read/server_template.rs

@@ -1,97 +0,0 @@
-use anyhow::Context;
-use komodo_client::{
-  api::read::*,
-  entities::{
-    permission::PermissionLevel, server_template::ServerTemplate,
-  },
-};
-use mongo_indexed::Document;
-use mungos::mongodb::bson::doc;
-use resolver_api::Resolve;
-
-use crate::{
-  helpers::query::get_all_tags, resource, state::db_client,
-};
-
-use super::ReadArgs;
-
-impl Resolve<ReadArgs> for GetServerTemplate {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> serror::Result<GetServerTemplateResponse> {
-    Ok(
-      resource::get_check_permissions::<ServerTemplate>(
-        &self.server_template,
-        user,
-        PermissionLevel::Read,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for ListServerTemplates {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> serror::Result<ListServerTemplatesResponse> {
-    let all_tags = if self.query.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    Ok(
-      resource::list_for_user::<ServerTemplate>(
-        self.query, user, &all_tags,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for ListFullServerTemplates {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> serror::Result<ListFullServerTemplatesResponse> {
-    let all_tags = if self.query.tags.is_empty() {
-      vec![]
-    } else {
-      get_all_tags(None).await?
-    };
-    Ok(
-      resource::list_full_for_user::<ServerTemplate>(
-        self.query, user, &all_tags,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<ReadArgs> for GetServerTemplatesSummary {
-  async fn resolve(
-    self,
-    ReadArgs { user }: &ReadArgs,
-  ) -> serror::Result<GetServerTemplatesSummaryResponse> {
-    let query = match resource::get_resource_object_ids_for_user::<
-      ServerTemplate,
-    >(user)
-    .await?
-    {
-      Some(ids) => doc! {
-        "_id": { "$in": ids }
-      },
-      None => Document::new(),
-    };
-    let total = db_client()
-      .server_templates
-      .count_documents(query)
-      .await
-      .context("failed to count all server template documents")?;
-    let res = GetServerTemplatesSummaryResponse {
-      total: total as u32,
-    };
-    Ok(res)
-  }
-}

bin/core/src/api/read/toml.rs

@@ -9,8 +9,7 @@ use komodo_client::{
     ResourceTarget, action::Action, alerter::Alerter, build::Build,
     builder::Builder, deployment::Deployment,
     permission::PermissionLevel, procedure::Procedure, repo::Repo,
-    resource::ResourceQuery, server::Server,
-    server_template::ServerTemplate, stack::Stack,
+    resource::ResourceQuery, server::Server, stack::Stack,
     sync::ResourceSync, toml::ResourcesToml, user::User,
   },
 };
@@ -132,16 +131,6 @@ async fn get_all_targets(
     .into_iter()
     .map(|resource| ResourceTarget::Action(resource.id)),
   );
-  targets.extend(
-    resource::list_for_user::<ServerTemplate>(
-      ResourceQuery::builder().tags(tags).build(),
-      user,
-      &all_tags,
-    )
-    .await?
-    .into_iter()
-    .map(|resource| ResourceTarget::ServerTemplate(resource.id)),
-  );
   targets.extend(
     resource::list_full_for_user::<ResourceSync>(
       ResourceQuery::builder().tags(tags).build(),
@@ -241,20 +230,6 @@ impl Resolve<ReadArgs> for ExportResourcesToToml {
             ))
           }
         }
-        ResourceTarget::ServerTemplate(id) => {
-          let template = resource::get_check_permissions::<
-            ServerTemplate,
-          >(&id, user, PermissionLevel::Read)
-          .await?;
-          res.server_templates.push(
-            convert_resource::<ServerTemplate>(
-              template,
-              false,
-              vec![],
-              &id_to_tags,
-            ),
-          )
-        }
         ResourceTarget::Server(id) => {
           let server = resource::get_check_permissions::<Server>(
             &id,
@@ -503,14 +478,6 @@ fn serialize_resources_toml(
     Builder::push_to_toml_string(builder, &mut toml)?;
   }
 
-  for server_template in resources.server_templates {
-    if !toml.is_empty() {
-      toml.push_str("\n\n##\n\n");
-    }
-    toml.push_str("[[server_template]]\n");
-    ServerTemplate::push_to_toml_string(server_template, &mut toml)?;
-  }
-
   for resource_sync in resources.resource_syncs {
     if !toml.is_empty() {
       toml.push_str("\n\n##\n\n");

bin/core/src/api/read/update.rs

@@ -14,7 +14,6 @@ use komodo_client::{
     procedure::Procedure,
     repo::Repo,
     server::Server,
-    server_template::ServerTemplate,
     stack::Stack,
     sync::ResourceSync,
     update::{Update, UpdateListItem},
@@ -132,16 +131,6 @@ impl Resolve<ReadArgs> for ListUpdates {
           })
           .unwrap_or_else(|| doc! { "target.type": "Alerter" });
 
-      let server_template_query =
-        resource::get_resource_ids_for_user::<ServerTemplate>(user)
-          .await?
-          .map(|ids| {
-            doc! {
-              "target.type": "ServerTemplate", "target.id": { "$in": ids }
-            }
-          })
-          .unwrap_or_else(|| doc! { "target.type": "ServerTemplate" });
-
       let resource_sync_query =
         resource::get_resource_ids_for_user::<ResourceSync>(
           user,
@@ -166,7 +155,6 @@ impl Resolve<ReadArgs> for ListUpdates {
           action_query,
           alerter_query,
           builder_query,
-          server_template_query,
           resource_sync_query,
         ]
       });
@@ -308,14 +296,6 @@ impl Resolve<ReadArgs> for GetUpdate {
         )
         .await?;
       }
-      ResourceTarget::ServerTemplate(id) => {
-        resource::get_check_permissions::<ServerTemplate>(
-          id,
-          user,
-          PermissionLevel::Read,
-        )
-        .await?;
-      }
       ResourceTarget::ResourceSync(id) => {
         resource::get_check_permissions::<ResourceSync>(
           id,

bin/core/src/api/terminal.rs

@@ -0,0 +1,75 @@
+use anyhow::Context;
+use axum::{Extension, Router, middleware, routing::post};
+use komodo_client::{
+  api::terminal::ExecuteTerminalBody,
+  entities::{
+    permission::PermissionLevel, server::Server, user::User,
+  },
+};
+use serror::Json;
+use uuid::Uuid;
+
+use crate::{
+  auth::auth_request, helpers::periphery_client, resource,
+};
+
+pub fn router() -> Router {
+  Router::new()
+    .route("/execute", post(execute))
+    .layer(middleware::from_fn(auth_request))
+}
+
+async fn execute(
+  Extension(user): Extension<User>,
+  Json(request): Json<ExecuteTerminalBody>,
+) -> serror::Result<axum::body::Body> {
+  execute_inner(Uuid::new_v4(), request, user).await
+}
+
+#[instrument(
+  name = "ExecuteTerminal",
+  skip(user),
+  fields(
+    user_id = user.id,
+  )
+)]
+async fn execute_inner(
+  req_id: Uuid,
+  ExecuteTerminalBody {
+    server,
+    terminal,
+    command,
+  }: ExecuteTerminalBody,
+  user: User,
+) -> serror::Result<axum::body::Body> {
+  info!("/terminal request | user: {}", user.username);
+
+  let res = async {
+    let server = resource::get_check_permissions::<Server>(
+      &server,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    let periphery = periphery_client(&server)?;
+
+    let stream = periphery
+      .execute_terminal(terminal, command)
+      .await
+      .context("Failed to execute command on periphery")?;
+
+    anyhow::Ok(stream)
+  }
+  .await;
+
+  let stream = match res {
+    Ok(stream) => stream,
+    Err(e) => {
+      warn!("/terminal request {req_id} error: {e:#}");
+      return Err(e.into());
+    }
+  };
+
+  Ok(axum::body::Body::from_stream(stream.into_line_stream()))
+}

bin/core/src/api/user.rs

@@ -1,7 +1,9 @@
 use std::{collections::VecDeque, time::Instant};
 
 use anyhow::{Context, anyhow};
-use axum::{Extension, Json, Router, middleware, routing::post};
+use axum::{
+  Extension, Json, Router, extract::Path, middleware, routing::post,
+};
 use derive_variants::EnumVariants;
 use komodo_client::{
   api::user::*,
@@ -12,6 +14,7 @@ use mungos::{by_id::update_one_by_id, mongodb::bson::to_bson};
 use resolver_api::Resolve;
 use response::Response;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
@@ -21,6 +24,8 @@ use crate::{
   state::db_client,
 };
 
+use super::Variant;
+
 pub struct UserArgs {
   pub user: User,
 }
@@ -43,9 +48,22 @@ enum UserRequest {
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
+    .route("/{variant}", post(variant_handler))
     .layer(middleware::from_fn(auth_request))
 }
 
+async fn variant_handler(
+  user: Extension<User>,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: UserRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(user, Json(req)).await
+}
+
 #[instrument(name = "UserHandler", level = "debug", skip(user))]
 async fn handler(
   Extension(user): Extension<User>,

bin/core/src/api/write/build.rs

@@ -432,9 +432,7 @@ async fn get_on_host_periphery(
 
   match builder.config {
     BuilderConfig::Aws(_) => {
-      return Err(anyhow!(
-        "Files on host doesn't work with AWS builder"
-      ));
+      Err(anyhow!("Files on host doesn't work with AWS builder"))
     }
     BuilderConfig::Url(config) => {
       let periphery = PeripheryClient::new(

bin/core/src/api/write/description.rs

@@ -4,8 +4,7 @@ use komodo_client::{
   entities::{
     ResourceTarget, action::Action, alerter::Alerter, build::Build,
     builder::Builder, deployment::Deployment, procedure::Procedure,
-    repo::Repo, server::Server, server_template::ServerTemplate,
-    stack::Stack, sync::ResourceSync,
+    repo::Repo, server::Server, stack::Stack, sync::ResourceSync,
   },
 };
 use resolver_api::Resolve;
@@ -93,14 +92,6 @@ impl Resolve<WriteArgs> for UpdateDescription {
         )
         .await?;
       }
-      ResourceTarget::ServerTemplate(id) => {
-        resource::update_description::<ServerTemplate>(
-          &id,
-          &self.description,
-          user,
-        )
-        .await?;
-      }
       ResourceTarget::ResourceSync(id) => {
         resource::update_description::<ResourceSync>(
           &id,

bin/core/src/api/write/mod.rs

@@ -1,18 +1,23 @@
 use std::time::Instant;
 
 use anyhow::Context;
-use axum::{Extension, Router, middleware, routing::post};
+use axum::{
+  Extension, Router, extract::Path, middleware, routing::post,
+};
 use derive_variants::{EnumVariants, ExtractVariant};
 use komodo_client::{api::write::*, entities::user::User};
 use resolver_api::Resolve;
 use response::Response;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
 use crate::auth::auth_request;
 
+use super::Variant;
+
 mod action;
 mod alerter;
 mod build;
@@ -24,7 +29,6 @@ mod procedure;
 mod provider;
 mod repo;
 mod server;
-mod server_template;
 mod service_user;
 mod stack;
 mod sync;
@@ -81,6 +85,9 @@ pub enum WriteRequest {
   UpdateServer(UpdateServer),
   RenameServer(RenameServer),
   CreateNetwork(CreateNetwork),
+  CreateTerminal(CreateTerminal),
+  DeleteTerminal(DeleteTerminal),
+  DeleteAllTerminals(DeleteAllTerminals),
 
   // ==== DEPLOYMENT ====
   CreateDeployment(CreateDeployment),
@@ -108,13 +115,6 @@ pub enum WriteRequest {
   UpdateBuilder(UpdateBuilder),
   RenameBuilder(RenameBuilder),
 
-  // ==== SERVER TEMPLATE ====
-  CreateServerTemplate(CreateServerTemplate),
-  CopyServerTemplate(CopyServerTemplate),
-  DeleteServerTemplate(DeleteServerTemplate),
-  UpdateServerTemplate(UpdateServerTemplate),
-  RenameServerTemplate(RenameServerTemplate),
-
   // ==== REPO ====
   CreateRepo(CreateRepo),
   CopyRepo(CopyRepo),
@@ -195,9 +195,22 @@ pub enum WriteRequest {
 pub fn router() -> Router {
   Router::new()
     .route("/", post(handler))
+    .route("/{variant}", post(variant_handler))
     .layer(middleware::from_fn(auth_request))
 }
 
+async fn variant_handler(
+  user: Extension<User>,
+  Path(Variant { variant }): Path<Variant>,
+  Json(params): Json<serde_json::Value>,
+) -> serror::Result<axum::response::Response> {
+  let req: WriteRequest = serde_json::from_value(json!({
+    "type": variant,
+    "params": params,
+  }))?;
+  handler(user, Json(req)).await
+}
+
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<WriteRequest>,
@@ -208,10 +221,6 @@ async fn handler(
     .await
     .context("failure in spawned task");
 
-  if let Err(e) = &res {
-    warn!("/write request {req_id} spawn error: {e:#}");
-  }
-
   res?
 }
 

bin/core/src/api/write/permissions.rs

@@ -406,20 +406,6 @@ async fn extract_resource_target_with_validation(
         .id;
       Ok((ResourceTargetVariant::Action, id))
     }
-    ResourceTarget::ServerTemplate(ident) => {
-      let filter = match ObjectId::from_str(ident) {
-        Ok(id) => doc! { "_id": id },
-        Err(_) => doc! { "name": ident },
-      };
-      let id = db_client()
-        .server_templates
-        .find_one(filter)
-        .await
-        .context("failed to query db for server templates")?
-        .context("no matching server template found")?
-        .id;
-      Ok((ResourceTargetVariant::ServerTemplate, id))
-    }
     ResourceTarget::ResourceSync(ident) => {
       let filter = match ObjectId::from_str(ident) {
         Ok(id) => doc! { "_id": id },

bin/core/src/api/write/server.rs

@@ -1,8 +1,9 @@
+use anyhow::Context;
 use formatting::format_serror;
 use komodo_client::{
   api::write::*,
   entities::{
-    Operation,
+    NoData, Operation,
     permission::PermissionLevel,
     server::Server,
     update::{Update, UpdateStatus},
@@ -101,3 +102,81 @@ impl Resolve<WriteArgs> for CreateNetwork {
     Ok(update)
   }
 }
+
+impl Resolve<WriteArgs> for CreateTerminal {
+  #[instrument(name = "CreateTerminal", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = resource::get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    let periphery = periphery_client(&server)?;
+
+    periphery
+      .request(api::terminal::CreateTerminal {
+        name: self.name,
+        command: self.command,
+        recreate: self.recreate,
+      })
+      .await
+      .context("Failed to create terminal on periphery")?;
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteTerminal {
+  #[instrument(name = "DeleteTerminal", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = resource::get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    let periphery = periphery_client(&server)?;
+
+    periphery
+      .request(api::terminal::DeleteTerminal {
+        terminal: self.terminal,
+      })
+      .await
+      .context("Failed to delete terminal on periphery")?;
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<WriteArgs> for DeleteAllTerminals {
+  #[instrument(name = "DeleteAllTerminals", skip(user))]
+  async fn resolve(
+    self,
+    WriteArgs { user }: &WriteArgs,
+  ) -> serror::Result<NoData> {
+    let server = resource::get_check_permissions::<Server>(
+      &self.server,
+      user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    let periphery = periphery_client(&server)?;
+
+    periphery
+      .request(api::terminal::DeleteAllTerminals {})
+      .await
+      .context("Failed to delete all terminals on periphery")?;
+
+    Ok(NoData {})
+  }
+}

bin/core/src/api/write/server_template.rs

@@ -1,92 +0,0 @@
-use komodo_client::{
-  api::write::{
-    CopyServerTemplate, CreateServerTemplate, DeleteServerTemplate,
-    RenameServerTemplate, UpdateServerTemplate,
-  },
-  entities::{
-    permission::PermissionLevel, server_template::ServerTemplate,
-    update::Update,
-  },
-};
-use resolver_api::Resolve;
-
-use crate::resource;
-
-use super::WriteArgs;
-
-impl Resolve<WriteArgs> for CreateServerTemplate {
-  #[instrument(name = "CreateServerTemplate", skip(user))]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> serror::Result<ServerTemplate> {
-    Ok(
-      resource::create::<ServerTemplate>(
-        &self.name,
-        self.config,
-        user,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<WriteArgs> for CopyServerTemplate {
-  #[instrument(name = "CopyServerTemplate", skip(user))]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> serror::Result<ServerTemplate> {
-    let ServerTemplate { config, .. } =
-      resource::get_check_permissions::<ServerTemplate>(
-        &self.id,
-        user,
-        PermissionLevel::Write,
-      )
-      .await?;
-    Ok(
-      resource::create::<ServerTemplate>(
-        &self.name,
-        config.into(),
-        user,
-      )
-      .await?,
-    )
-  }
-}
-
-impl Resolve<WriteArgs> for DeleteServerTemplate {
-  #[instrument(name = "DeleteServerTemplate", skip(args))]
-  async fn resolve(
-    self,
-    args: &WriteArgs,
-  ) -> serror::Result<ServerTemplate> {
-    Ok(resource::delete::<ServerTemplate>(&self.id, args).await?)
-  }
-}
-
-impl Resolve<WriteArgs> for UpdateServerTemplate {
-  #[instrument(name = "UpdateServerTemplate", skip(user))]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> serror::Result<ServerTemplate> {
-    Ok(
-      resource::update::<ServerTemplate>(&self.id, self.config, user)
-        .await?,
-    )
-  }
-}
-
-impl Resolve<WriteArgs> for RenameServerTemplate {
-  #[instrument(name = "RenameServerTemplate", skip(user))]
-  async fn resolve(
-    self,
-    WriteArgs { user }: &WriteArgs,
-  ) -> serror::Result<Update> {
-    Ok(
-      resource::rename::<ServerTemplate>(&self.id, &self.name, user)
-        .await?,
-    )
-  }
-}

bin/core/src/api/write/sync.rs

@@ -19,7 +19,6 @@ use komodo_client::{
     procedure::Procedure,
     repo::Repo,
     server::Server,
-    server_template::ServerTemplate,
     stack::Stack,
     sync::{
       PartialResourceSyncConfig, ResourceSync, ResourceSyncInfo,
@@ -686,17 +685,6 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
             &mut diffs,
           )
           .await?;
-          push_updates_for_view::<ServerTemplate>(
-            resources.server_templates,
-            delete,
-            &all_resources,
-            None,
-            None,
-            &id_to_tags,
-            &sync.config.match_tags,
-            &mut diffs,
-          )
-          .await?;
           push_updates_for_view::<ResourceSync>(
             resources.resource_syncs,
             delete,
@@ -829,7 +817,9 @@ impl Resolve<WriteArgs> for RefreshResourceSyncPending {
             .context("failed to open existing pending resource sync updates alert")
             .inspect_err(|e| warn!("{e:#}"))
             .ok();
-          send_alerts(&[alert]).await;
+          if sync.config.pending_alert {
+            send_alerts(&[alert]).await;
+          }
         }
         // CLOSE ALERT
         (Some(existing), false) => {

bin/core/src/api/write/tag.rs

@@ -17,7 +17,6 @@ use komodo_client::{
     procedure::Procedure,
     repo::Repo,
     server::Server,
-    server_template::ServerTemplate,
     stack::Stack,
     sync::ResourceSync,
     tag::{Tag, TagColor},
@@ -131,7 +130,6 @@ impl Resolve<WriteArgs> for DeleteTag {
       resource::remove_tag_from_all::<Builder>(&self.id),
       resource::remove_tag_from_all::<Alerter>(&self.id),
       resource::remove_tag_from_all::<Procedure>(&self.id),
-      resource::remove_tag_from_all::<ServerTemplate>(&self.id),
     )?;
 
     delete_one_by_id(&db_client().tags, &self.id, None).await?;
@@ -225,16 +223,6 @@ impl Resolve<WriteArgs> for UpdateTagsOnResource {
         .await?;
         resource::update_tags::<Action>(&id, self.tags, args).await?
       }
-      ResourceTarget::ServerTemplate(id) => {
-        resource::get_check_permissions::<ServerTemplate>(
-          &id,
-          user,
-          PermissionLevel::Write,
-        )
-        .await?;
-        resource::update_tags::<ServerTemplate>(&id, self.tags, args)
-          .await?
-      }
       ResourceTarget::ResourceSync(id) => {
         resource::get_check_permissions::<ResourceSync>(
           &id,

bin/core/src/cloud/aws/ec2.rs

@@ -1,4 +1,4 @@
-use std::{str::FromStr, time::Duration};
+use std::time::Duration;
 
 use anyhow::{Context, anyhow};
 use aws_config::{BehaviorVersion, Region};
@@ -8,15 +8,15 @@ use aws_sdk_ec2::{
     BlockDeviceMapping, EbsBlockDevice,
     InstanceNetworkInterfaceSpecification, InstanceStateChange,
     InstanceStateName, InstanceStatus, InstanceType, ResourceType,
-    Tag, TagSpecification, VolumeType,
+    Tag, TagSpecification,
   },
 };
 use base64::Engine;
 use komodo_client::entities::{
   ResourceTarget,
   alert::{Alert, AlertData, SeverityLevel},
+  builder::AwsBuilderConfig,
   komodo_timestamp,
-  server_template::aws::AwsServerTemplateConfig,
 };
 
 use crate::{alert::send_alerts, config::core_config};
@@ -71,12 +71,12 @@ async fn create_ec2_client(region: String) -> Client {
 #[instrument]
 pub async fn launch_ec2_instance(
   name: &str,
-  config: AwsServerTemplateConfig,
+  config: &AwsBuilderConfig,
 ) -> anyhow::Result<Ec2Instance> {
-  let AwsServerTemplateConfig {
+  let AwsBuilderConfig {
     region,
     instance_type,
-    volumes,
+    volume_gb,
     ami_id,
     subnet_id,
     security_group_ids,
@@ -86,19 +86,22 @@ pub async fn launch_ec2_instance(
     user_data,
     port: _,
     use_https: _,
+    git_providers: _,
+    docker_registries: _,
+    secrets: _,
   } = config;
   let instance_type = handle_unknown_instance_type(
     InstanceType::from(instance_type.as_str()),
   )?;
   let client = create_ec2_client(region.clone()).await;
-  let mut req = client
+  let req = client
     .run_instances()
     .image_id(ami_id)
     .instance_type(instance_type)
     .network_interfaces(
       InstanceNetworkInterfaceSpecification::builder()
         .subnet_id(subnet_id)
-        .associate_public_ip_address(assign_public_ip)
+        .associate_public_ip_address(*assign_public_ip)
         .set_groups(security_group_ids.to_vec().into())
         .device_index(0)
         .build(),
@@ -110,6 +113,17 @@ pub async fn launch_ec2_instance(
         .resource_type(ResourceType::Instance)
         .build(),
     )
+    .block_device_mappings(
+      BlockDeviceMapping::builder()
+        .set_device_name("/dev/sda1".to_string().into())
+        .set_ebs(
+          EbsBlockDevice::builder()
+            .volume_size(*volume_gb)
+            .build()
+            .into(),
+        )
+        .build(),
+    )
     .min_count(1)
     .max_count(1)
     .user_data(
@@ -117,26 +131,6 @@ pub async fn launch_ec2_instance(
         .encode(user_data),
     );
 
-  for volume in volumes {
-    let ebs = EbsBlockDevice::builder()
-      .volume_size(volume.size_gb)
-      .volume_type(
-        VolumeType::from_str(volume.volume_type.as_ref())
-          .context("invalid volume type")?,
-      )
-      .set_iops((volume.iops != 0).then_some(volume.iops))
-      .set_throughput(
-        (volume.throughput != 0).then_some(volume.throughput),
-      )
-      .build();
-    req = req.block_device_mappings(
-      BlockDeviceMapping::builder()
-        .set_device_name(volume.device_name.into())
-        .set_ebs(ebs.into())
-        .build(),
-    )
-  }
-
   let res = req
     .send()
     .await
@@ -156,7 +150,7 @@ pub async fn launch_ec2_instance(
     let state_name =
       get_ec2_instance_state_name(&client, &instance_id).await?;
     if state_name == Some(InstanceStateName::Running) {
-      let ip = if use_public_ip {
+      let ip = if *use_public_ip {
         get_ec2_instance_public_ip(&client, &instance_id).await?
       } else {
         instance

bin/core/src/cloud/hetzner/client.rs

@@ -1,157 +0,0 @@
-use anyhow::{Context, anyhow};
-use axum::http::{HeaderName, HeaderValue};
-use reqwest::{RequestBuilder, StatusCode};
-use serde::{Serialize, de::DeserializeOwned};
-
-use super::{
-  common::{
-    HetznerActionResponse, HetznerDatacenterResponse,
-    HetznerServerResponse, HetznerVolumeResponse,
-  },
-  create_server::{CreateServerBody, CreateServerResponse},
-  create_volume::{CreateVolumeBody, CreateVolumeResponse},
-};
-
-const BASE_URL: &str = "https://api.hetzner.cloud/v1";
-
-pub struct HetznerClient(reqwest::Client);
-
-impl HetznerClient {
-  pub fn new(token: &str) -> HetznerClient {
-    HetznerClient(
-      reqwest::ClientBuilder::new()
-        .default_headers(
-          [(
-            HeaderName::from_static("authorization"),
-            HeaderValue::from_str(&format!("Bearer {token}"))
-              .unwrap(),
-          )]
-          .into_iter()
-          .collect(),
-        )
-        .build()
-        .context("failed to build Hetzner request client")
-        .unwrap(),
-    )
-  }
-
-  pub async fn get_server(
-    &self,
-    id: i64,
-  ) -> anyhow::Result<HetznerServerResponse> {
-    self.get(&format!("/servers/{id}")).await
-  }
-
-  pub async fn create_server(
-    &self,
-    body: &CreateServerBody,
-  ) -> anyhow::Result<CreateServerResponse> {
-    self.post("/servers", body).await
-  }
-
-  #[allow(unused)]
-  pub async fn delete_server(
-    &self,
-    id: i64,
-  ) -> anyhow::Result<HetznerActionResponse> {
-    self.delete(&format!("/servers/{id}")).await
-  }
-
-  pub async fn get_volume(
-    &self,
-    id: i64,
-  ) -> anyhow::Result<HetznerVolumeResponse> {
-    self.get(&format!("/volumes/{id}")).await
-  }
-
-  pub async fn create_volume(
-    &self,
-    body: &CreateVolumeBody,
-  ) -> anyhow::Result<CreateVolumeResponse> {
-    self.post("/volumes", body).await
-  }
-
-  #[allow(unused)]
-  pub async fn delete_volume(&self, id: i64) -> anyhow::Result<()> {
-    let res = self
-      .0
-      .delete(format!("{BASE_URL}/volumes/{id}"))
-      .send()
-      .await
-      .context("failed at request to delete volume")?;
-
-    let status = res.status();
-
-    if status == StatusCode::NO_CONTENT {
-      Ok(())
-    } else {
-      let text = res
-        .text()
-        .await
-        .context("failed to get response body as text")?;
-      Err(anyhow!("{status} | {text}"))
-    }
-  }
-
-  #[allow(unused)]
-  pub async fn list_datacenters(
-    &self,
-  ) -> anyhow::Result<HetznerDatacenterResponse> {
-    self.get("/datacenters").await
-  }
-
-  async fn get<Res: DeserializeOwned>(
-    &self,
-    path: &str,
-  ) -> anyhow::Result<Res> {
-    let req = self.0.get(format!("{BASE_URL}{path}"));
-    handle_req(req).await.with_context(|| {
-      format!("failed at GET request to Hetzner | path: {path}")
-    })
-  }
-
-  async fn post<Body: Serialize, Res: DeserializeOwned>(
-    &self,
-    path: &str,
-    body: &Body,
-  ) -> anyhow::Result<Res> {
-    let req = self.0.post(format!("{BASE_URL}{path}")).json(&body);
-    handle_req(req).await.with_context(|| {
-      format!("failed at POST request to Hetzner | path: {path}")
-    })
-  }
-
-  #[allow(unused)]
-  async fn delete<Res: DeserializeOwned>(
-    &self,
-    path: &str,
-  ) -> anyhow::Result<Res> {
-    let req = self.0.delete(format!("{BASE_URL}{path}"));
-    handle_req(req).await.with_context(|| {
-      format!("failed at DELETE request to Hetzner | path: {path}")
-    })
-  }
-}
-
-async fn handle_req<Res: DeserializeOwned>(
-  req: RequestBuilder,
-) -> anyhow::Result<Res> {
-  let res = req.send().await?;
-
-  let status = res.status();
-
-  if status.is_success() {
-    res.json().await.context("failed to parse response to json")
-  } else {
-    let text = res
-      .text()
-      .await
-      .context("failed to get response body as text")?;
-    if let Ok(json_error) =
-      serde_json::from_str::<serde_json::Value>(&text)
-    {
-      return Err(anyhow!("{status} | {json_error:?}"));
-    }
-    Err(anyhow!("{status} | {text}"))
-  }
-}

bin/core/src/cloud/hetzner/common.rs

@@ -1,280 +0,0 @@
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerServerResponse {
-  pub server: HetznerServer,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerServer {
-  pub id: i64,
-  pub name: String,
-  pub primary_disk_size: f64,
-  pub image: Option<HetznerImage>,
-  pub private_net: Vec<HetznerPrivateNet>,
-  pub public_net: HetznerPublicNet,
-  pub server_type: HetznerServerTypeDetails,
-  pub status: HetznerServerStatus,
-  #[serde(default)]
-  pub volumes: Vec<i64>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerServerTypeDetails {
-  pub architecture: String,
-  pub cores: i64,
-  pub cpu_type: String,
-  pub description: String,
-  pub disk: f64,
-  pub id: i64,
-  pub memory: f64,
-  pub name: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerPrivateNet {
-  pub alias_ips: Vec<String>,
-  pub ip: String,
-  pub mac_address: String,
-  pub network: i64,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerPublicNet {
-  #[serde(default)]
-  pub firewalls: Vec<HetznerFirewall>,
-  pub floating_ips: Vec<i64>,
-  pub ipv4: Option<HetznerIpv4>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerFirewall {
-  pub id: i64,
-  pub status: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerIpv4 {
-  pub id: Option<i64>,
-  pub blocked: bool,
-  pub dns_ptr: String,
-  pub ip: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerImage {
-  pub id: i64,
-  pub description: String,
-  pub name: Option<String>,
-  pub os_flavor: String,
-  pub os_version: Option<String>,
-  pub rapid_deploy: Option<bool>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerActionResponse {
-  pub action: HetznerAction,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerAction {
-  pub command: String,
-  pub error: Option<HetznerError>,
-  pub finished: Option<String>,
-  pub id: i64,
-  pub progress: i32,
-  pub resources: Vec<HetznerResource>,
-  pub started: String,
-  pub status: HetznerActionStatus,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerError {
-  pub code: String,
-  pub message: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerResource {
-  pub id: i64,
-  #[serde(rename = "type")]
-  pub ty: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerVolumeResponse {
-  pub volume: HetznerVolume,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerVolume {
-  /// Name of the Resource. Must be unique per Project.
-  pub name: String,
-  /// Point in time when the Resource was created (in ISO-8601 format).
-  pub created: String,
-  /// Filesystem of the Volume if formatted on creation, null if not formatted on creation
-  pub format: Option<HetznerVolumeFormat>,
-  /// ID of the Volume.
-  pub id: i64,
-  /// User-defined labels ( key/value pairs) for the Resource
-  pub labels: HashMap<String, String>,
-  /// Device path on the file system for the Volume
-  pub linux_device: String,
-  /// Protection configuration for the Resource.
-  pub protection: HetznerProtection,
-  /// ID of the Server the Volume is attached to, null if it is not attached at all
-  pub server: Option<i64>,
-  /// Size in GB of the  Volume
-  pub size: i64,
-  /// Current status of the Volume. Allowed: `creating`, `available`
-  pub status: HetznerVolumeStatus,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerProtection {
-  /// Prevent the Resource from being deleted.
-  pub delete: bool,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerDatacenterResponse {
-  pub datacenters: Vec<HetznerDatacenterDetails>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct HetznerDatacenterDetails {
-  pub id: i64,
-  pub name: String,
-  pub location: serde_json::Map<String, serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum HetznerLocation {
-  #[serde(rename = "nbg1")]
-  Nuremberg1,
-  #[serde(rename = "hel1")]
-  Helsinki1,
-  #[serde(rename = "fsn1")]
-  Falkenstein1,
-  #[serde(rename = "ash")]
-  Ashburn,
-  #[serde(rename = "hil")]
-  Hillsboro,
-  #[serde(rename = "sin")]
-  Singapore,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub enum HetznerDatacenter {
-  #[serde(rename = "nbg1-dc3")]
-  Nuremberg1Dc3,
-  #[serde(rename = "hel1-dc2")]
-  Helsinki1Dc2,
-  #[serde(rename = "fsn1-dc14")]
-  Falkenstein1Dc14,
-  #[serde(rename = "ash-dc1")]
-  AshburnDc1,
-  #[serde(rename = "hil-dc1")]
-  HillsboroDc1,
-  #[serde(rename = "sin-dc1")]
-  SingaporeDc1,
-}
-
-impl From<HetznerDatacenter> for HetznerLocation {
-  fn from(value: HetznerDatacenter) -> Self {
-    match value {
-      HetznerDatacenter::Nuremberg1Dc3 => HetznerLocation::Nuremberg1,
-      HetznerDatacenter::Helsinki1Dc2 => HetznerLocation::Helsinki1,
-      HetznerDatacenter::Falkenstein1Dc14 => {
-        HetznerLocation::Falkenstein1
-      }
-      HetznerDatacenter::AshburnDc1 => HetznerLocation::Ashburn,
-      HetznerDatacenter::HillsboroDc1 => HetznerLocation::Hillsboro,
-      HetznerDatacenter::SingaporeDc1 => HetznerLocation::Singapore,
-    }
-  }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum HetznerVolumeFormat {
-  Xfs,
-  Ext4,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum HetznerVolumeStatus {
-  Creating,
-  Available,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum HetznerServerStatus {
-  Running,
-  Initializing,
-  Starting,
-  Stopping,
-  Off,
-  Deleting,
-  Migrating,
-  Rebuilding,
-  Unknown,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum HetznerActionStatus {
-  Running,
-  Success,
-  Error,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "UPPERCASE")]
-#[allow(clippy::enum_variant_names)]
-pub enum HetznerServerType {
-  // Shared
-  #[serde(rename = "cpx11")]
-  SharedAmd2Core2Ram40Disk,
-  #[serde(rename = "cax11")]
-  SharedArm2Core4Ram40Disk,
-  #[serde(rename = "cx22")]
-  SharedIntel2Core4Ram40Disk,
-  #[serde(rename = "cpx21")]
-  SharedAmd3Core4Ram80Disk,
-  #[serde(rename = "cax21")]
-  SharedArm4Core8Ram80Disk,
-  #[serde(rename = "cx32")]
-  SharedIntel4Core8Ram80Disk,
-  #[serde(rename = "cpx31")]
-  SharedAmd4Core8Ram160Disk,
-  #[serde(rename = "cax31")]
-  SharedArm8Core16Ram160Disk,
-  #[serde(rename = "cx42")]
-  SharedIntel8Core16Ram160Disk,
-  #[serde(rename = "cpx41")]
-  SharedAmd8Core16Ram240Disk,
-  #[serde(rename = "cax41")]
-  SharedArm16Core32Ram320Disk,
-  #[serde(rename = "cx52")]
-  SharedIntel16Core32Ram320Disk,
-  #[serde(rename = "cpx51")]
-  SharedAmd16Core32Ram360Disk,
-  // Dedicated
-  #[serde(rename = "ccx13")]
-  DedicatedAmd2Core8Ram80Disk,
-  #[serde(rename = "ccx23")]
-  DedicatedAmd4Core16Ram160Disk,
-  #[serde(rename = "ccx33")]
-  DedicatedAmd8Core32Ram240Disk,
-  #[serde(rename = "ccx43")]
-  DedicatedAmd16Core64Ram360Disk,
-  #[serde(rename = "ccx53")]
-  DedicatedAmd32Core128Ram600Disk,
-  #[serde(rename = "ccx63")]
-  DedicatedAmd48Core192Ram960Disk,
-}

bin/core/src/cloud/hetzner/create_server.rs

@@ -1,75 +0,0 @@
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-use super::common::{
-  HetznerAction, HetznerDatacenter, HetznerLocation, HetznerServer,
-  HetznerServerType,
-};
-
-#[derive(Debug, Clone, Serialize)]
-pub struct CreateServerBody {
-  /// Name of the Server to create (must be unique per Project and a valid hostname as per RFC 1123)
-  pub name: String,
-  /// Auto-mount Volumes after attach
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub automount: Option<bool>,
-  /// ID or name of Datacenter to create Server in (must not be used together with location)
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub datacenter: Option<HetznerDatacenter>,
-  /// ID or name of Location to create Server in (must not be used together with datacenter)
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub location: Option<HetznerLocation>,
-  /// Firewalls which should be applied on the Server's public network interface at creation time
-  pub firewalls: Vec<Firewall>,
-  /// ID or name of the Image the Server is created from
-  pub image: String,
-  /// User-defined labels (key-value pairs) for the Resource
-  pub labels: HashMap<String, String>,
-  /// Network IDs which should be attached to the Server private network interface at the creation time
-  pub networks: Vec<i64>,
-  /// ID of the Placement Group the server should be in
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub placement_group: Option<i64>,
-  /// Public Network options
-  pub public_net: PublicNet,
-  /// ID or name of the Server type this Server should be created with
-  pub server_type: HetznerServerType,
-  /// SSH key IDs ( integer ) or names ( string ) which should be injected into the Server at creation time
-  pub ssh_keys: Vec<String>,
-  /// This automatically triggers a Power on a Server-Server Action after the creation is finished and is returned in the next_actions response object.
-  pub start_after_create: bool,
-  /// Cloud-Init user data to use during Server creation. This field is limited to 32KiB.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub user_data: Option<String>,
-  /// Volume IDs which should be attached to the Server at the creation time. Volumes must be in the same Location.
-  pub volumes: Vec<i64>,
-}
-
-#[derive(Debug, Clone, Copy, Serialize)]
-pub struct Firewall {
-  /// ID of the Firewall
-  pub firewall: i64,
-}
-
-#[derive(Debug, Clone, Copy, Serialize)]
-pub struct PublicNet {
-  /// Attach an IPv4 on the public NIC. If false, no IPv4 address will be attached.
-  pub enable_ipv4: bool,
-  /// Attach an IPv6 on the public NIC. If false, no IPv6 address will be attached.
-  pub enable_ipv6: bool,
-  /// ID of the ipv4 Primary IP to use. If omitted and enable_ipv4 is true, a new ipv4 Primary IP will automatically be created.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub ipv4: Option<i64>,
-  /// ID of the ipv6 Primary IP to use. If omitted and enable_ipv6 is true, a new ipv6 Primary IP will automatically be created.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub ipv6: Option<i64>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct CreateServerResponse {
-  pub action: HetznerAction,
-  pub next_actions: Vec<HetznerAction>,
-  pub root_password: Option<String>,
-  pub server: HetznerServer,
-}

bin/core/src/cloud/hetzner/create_volume.rs

@@ -1,36 +0,0 @@
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-use super::common::{
-  HetznerAction, HetznerLocation, HetznerVolume, HetznerVolumeFormat,
-};
-
-#[derive(Debug, Clone, Serialize)]
-pub struct CreateVolumeBody {
-  /// Name of the volume
-  pub name: String,
-  /// Auto-mount Volume after attach. server must be provided.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub automount: Option<bool>,
-  /// Format Volume after creation. One of: xfs, ext4
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub format: Option<HetznerVolumeFormat>,
-  /// User-defined labels (key-value pairs) for the Resource
-  pub labels: HashMap<String, String>,
-  /// Location to create the Volume in (can be omitted if Server is specified)
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub location: Option<HetznerLocation>,
-  /// Server to which to attach the Volume once it's created (Volume will be created in the same Location as the server)
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub server: Option<i64>,
-  /// Size of the Volume in GB
-  pub size: i64,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct CreateVolumeResponse {
-  pub action: HetznerAction,
-  pub next_actions: Vec<HetznerAction>,
-  pub volume: HetznerVolume,
-}

bin/core/src/cloud/hetzner/mod.rs

@@ -1,281 +0,0 @@
-use std::{
-  sync::{Arc, Mutex, OnceLock},
-  time::Duration,
-};
-
-use anyhow::{Context, anyhow};
-use futures::future::join_all;
-use komodo_client::entities::server_template::hetzner::{
-  HetznerDatacenter, HetznerServerTemplateConfig, HetznerServerType,
-  HetznerVolumeFormat,
-};
-
-use crate::{
-  cloud::hetzner::{
-    common::HetznerServerStatus, create_server::CreateServerBody,
-    create_volume::CreateVolumeBody,
-  },
-  config::core_config,
-};
-
-use self::{client::HetznerClient, common::HetznerVolumeStatus};
-
-mod client;
-mod common;
-mod create_server;
-mod create_volume;
-
-fn hetzner() -> Option<&'static HetznerClient> {
-  static HETZNER_CLIENT: OnceLock<Option<HetznerClient>> =
-    OnceLock::new();
-  HETZNER_CLIENT
-    .get_or_init(|| {
-      let token = &core_config().hetzner.token;
-      (!token.is_empty()).then(|| HetznerClient::new(token))
-    })
-    .as_ref()
-}
-
-pub struct HetznerServerMinimal {
-  pub id: i64,
-  pub ip: String,
-}
-
-const POLL_RATE_SECS: u64 = 3;
-const MAX_POLL_TRIES: usize = 100;
-
-#[instrument]
-pub async fn launch_hetzner_server(
-  name: &str,
-  config: HetznerServerTemplateConfig,
-) -> anyhow::Result<HetznerServerMinimal> {
-  let hetzner =
-    *hetzner().as_ref().context("Hetzner token not configured")?;
-  let HetznerServerTemplateConfig {
-    image,
-    datacenter,
-    private_network_ids,
-    placement_group,
-    enable_public_ipv4,
-    enable_public_ipv6,
-    firewall_ids,
-    server_type,
-    ssh_keys,
-    user_data,
-    use_public_ip,
-    labels,
-    volumes,
-    port: _,
-    use_https: _,
-  } = config;
-  let datacenter = hetzner_datacenter(datacenter);
-
-  // Create volumes and get their ids
-  let mut volume_ids = Vec::new();
-  for volume in volumes {
-    let body = CreateVolumeBody {
-      name: volume.name,
-      format: Some(hetzner_format(volume.format)),
-      location: Some(datacenter.into()),
-      labels: volume.labels,
-      size: volume.size_gb,
-      automount: None,
-      server: None,
-    };
-    let id = hetzner
-      .create_volume(&body)
-      .await
-      .context("failed to create hetzner volume")?
-      .volume
-      .id;
-    volume_ids.push(id);
-  }
-
-  // Make sure volumes are available before continue
-  let vol_ids_poll = Arc::new(Mutex::new(volume_ids.clone()));
-  for _ in 0..MAX_POLL_TRIES {
-    if vol_ids_poll.lock().unwrap().is_empty() {
-      break;
-    }
-    tokio::time::sleep(Duration::from_secs(POLL_RATE_SECS)).await;
-    let ids = vol_ids_poll.lock().unwrap().clone();
-    let futures = ids.into_iter().map(|id| {
-      let vol_ids = vol_ids_poll.clone();
-      async move {
-        let Ok(res) = hetzner.get_volume(id).await else {
-          return;
-        };
-        if matches!(res.volume.status, HetznerVolumeStatus::Available)
-        {
-          vol_ids.lock().unwrap().retain(|_id| *_id != id);
-        }
-      }
-    });
-    join_all(futures).await;
-  }
-  if !vol_ids_poll.lock().unwrap().is_empty() {
-    return Err(anyhow!("Volumes not ready after poll"));
-  }
-
-  let body = CreateServerBody {
-    name: name.to_string(),
-    automount: None,
-    datacenter: Some(datacenter),
-    location: None,
-    firewalls: firewall_ids
-      .into_iter()
-      .map(|firewall| create_server::Firewall { firewall })
-      .collect(),
-    image,
-    labels,
-    networks: private_network_ids,
-    placement_group: (placement_group > 0).then_some(placement_group),
-    public_net: create_server::PublicNet {
-      enable_ipv4: enable_public_ipv4,
-      enable_ipv6: enable_public_ipv6,
-      ipv4: None,
-      ipv6: None,
-    },
-    server_type: hetzner_server_type(server_type),
-    ssh_keys,
-    start_after_create: true,
-    user_data: (!user_data.is_empty()).then_some(user_data),
-    volumes: volume_ids,
-  };
-
-  let server_id = hetzner
-    .create_server(&body)
-    .await
-    .context("failed to create hetnzer server")?
-    .server
-    .id;
-
-  for _ in 0..MAX_POLL_TRIES {
-    tokio::time::sleep(Duration::from_secs(POLL_RATE_SECS)).await;
-    let Ok(res) = hetzner.get_server(server_id).await else {
-      continue;
-    };
-    if matches!(res.server.status, HetznerServerStatus::Running) {
-      let ip = if use_public_ip {
-        res
-          .server
-          .public_net
-          .ipv4
-          .context("instance does not have public ipv4 attached")?
-          .ip
-      } else {
-        res
-          .server
-          .private_net
-          .first()
-          .context("no private networks attached")?
-          .ip
-          .to_string()
-      };
-      let server = HetznerServerMinimal { id: server_id, ip };
-      return Ok(server);
-    }
-  }
-
-  Err(anyhow!(
-    "failed to verify server running after polling status"
-  ))
-}
-
-fn hetzner_format(
-  format: HetznerVolumeFormat,
-) -> common::HetznerVolumeFormat {
-  match format {
-    HetznerVolumeFormat::Xfs => common::HetznerVolumeFormat::Xfs,
-    HetznerVolumeFormat::Ext4 => common::HetznerVolumeFormat::Ext4,
-  }
-}
-
-fn hetzner_datacenter(
-  datacenter: HetznerDatacenter,
-) -> common::HetznerDatacenter {
-  match datacenter {
-    HetznerDatacenter::Nuremberg1Dc3 => {
-      common::HetznerDatacenter::Nuremberg1Dc3
-    }
-    HetznerDatacenter::Helsinki1Dc2 => {
-      common::HetznerDatacenter::Helsinki1Dc2
-    }
-    HetznerDatacenter::Falkenstein1Dc14 => {
-      common::HetznerDatacenter::Falkenstein1Dc14
-    }
-    HetznerDatacenter::AshburnDc1 => {
-      common::HetznerDatacenter::AshburnDc1
-    }
-    HetznerDatacenter::HillsboroDc1 => {
-      common::HetznerDatacenter::HillsboroDc1
-    }
-    HetznerDatacenter::SingaporeDc1 => {
-      common::HetznerDatacenter::SingaporeDc1
-    }
-  }
-}
-
-fn hetzner_server_type(
-  server_type: HetznerServerType,
-) -> common::HetznerServerType {
-  match server_type {
-    HetznerServerType::SharedAmd2Core2Ram40Disk => {
-      common::HetznerServerType::SharedAmd2Core2Ram40Disk
-    }
-    HetznerServerType::SharedArm2Core4Ram40Disk => {
-      common::HetznerServerType::SharedArm2Core4Ram40Disk
-    }
-    HetznerServerType::SharedIntel2Core4Ram40Disk => {
-      common::HetznerServerType::SharedIntel2Core4Ram40Disk
-    }
-    HetznerServerType::SharedAmd3Core4Ram80Disk => {
-      common::HetznerServerType::SharedAmd3Core4Ram80Disk
-    }
-    HetznerServerType::SharedArm4Core8Ram80Disk => {
-      common::HetznerServerType::SharedArm4Core8Ram80Disk
-    }
-    HetznerServerType::SharedIntel4Core8Ram80Disk => {
-      common::HetznerServerType::SharedIntel4Core8Ram80Disk
-    }
-    HetznerServerType::SharedAmd4Core8Ram160Disk => {
-      common::HetznerServerType::SharedAmd4Core8Ram160Disk
-    }
-    HetznerServerType::SharedArm8Core16Ram160Disk => {
-      common::HetznerServerType::SharedArm8Core16Ram160Disk
-    }
-    HetznerServerType::SharedIntel8Core16Ram160Disk => {
-      common::HetznerServerType::SharedIntel8Core16Ram160Disk
-    }
-    HetznerServerType::SharedAmd8Core16Ram240Disk => {
-      common::HetznerServerType::SharedAmd8Core16Ram240Disk
-    }
-    HetznerServerType::SharedArm16Core32Ram320Disk => {
-      common::HetznerServerType::SharedArm16Core32Ram320Disk
-    }
-    HetznerServerType::SharedIntel16Core32Ram320Disk => {
-      common::HetznerServerType::SharedIntel16Core32Ram320Disk
-    }
-    HetznerServerType::SharedAmd16Core32Ram360Disk => {
-      common::HetznerServerType::SharedAmd16Core32Ram360Disk
-    }
-    HetznerServerType::DedicatedAmd2Core8Ram80Disk => {
-      common::HetznerServerType::DedicatedAmd2Core8Ram80Disk
-    }
-    HetznerServerType::DedicatedAmd4Core16Ram160Disk => {
-      common::HetznerServerType::DedicatedAmd4Core16Ram160Disk
-    }
-    HetznerServerType::DedicatedAmd8Core32Ram240Disk => {
-      common::HetznerServerType::DedicatedAmd8Core32Ram240Disk
-    }
-    HetznerServerType::DedicatedAmd16Core64Ram360Disk => {
-      common::HetznerServerType::DedicatedAmd16Core64Ram360Disk
-    }
-    HetznerServerType::DedicatedAmd32Core128Ram600Disk => {
-      common::HetznerServerType::DedicatedAmd32Core128Ram600Disk
-    }
-    HetznerServerType::DedicatedAmd48Core192Ram960Disk => {
-      common::HetznerServerType::DedicatedAmd48Core192Ram960Disk
-    }
-  }
-}

bin/core/src/cloud/mod.rs

@@ -1,8 +1,5 @@
 pub mod aws;
 
-#[allow(unused)]
-pub mod hetzner;
-
 #[derive(Debug)]
 pub enum BuildCleanupData {
   /// Nothing to clean up

bin/core/src/config.rs

@@ -8,7 +8,7 @@ use komodo_client::entities::{
   config::core::{
     AwsCredentials, CoreConfig, DatabaseConfig, Env,
     GithubWebhookAppConfig, GithubWebhookAppInstallationConfig,
-    HetznerCredentials, OauthCredentials,
+    OauthCredentials,
   },
   logger::LogConfig,
 };
@@ -120,11 +120,6 @@ pub fn core_config() -> &'static CoreConfig {
           .komodo_aws_secret_access_key)
           .unwrap_or(config.aws.secret_access_key),
       },
-      hetzner: HetznerCredentials {
-        token: maybe_read_item_from_file(env.komodo_hetzner_token_file, env
-          .komodo_hetzner_token)
-          .unwrap_or(config.hetzner.token),
-      },
       github_webhook_app: GithubWebhookAppConfig {
         app_id: maybe_read_item_from_file(env.komodo_github_webhook_app_app_id_file, env
           .komodo_github_webhook_app_app_id)
@@ -177,6 +172,8 @@ pub fn core_config() -> &'static CoreConfig {
         .unwrap_or(config.ui_write_disabled),
       disable_confirm_dialog: env.komodo_disable_confirm_dialog
         .unwrap_or(config.disable_confirm_dialog),
+      disable_websocket_reconnect: env.komodo_disable_websocket_reconnect
+        .unwrap_or(config.disable_websocket_reconnect),
       enable_new_users: env.komodo_enable_new_users
         .unwrap_or(config.enable_new_users),
       disable_user_registration: env.komodo_disable_user_registration
@@ -194,6 +191,7 @@ pub fn core_config() -> &'static CoreConfig {
         stdio: env
           .komodo_logging_stdio
           .unwrap_or(config.logging.stdio),
+        pretty: env.komodo_logging_pretty.unwrap_or(config.logging.pretty),
         otlp_endpoint: env
           .komodo_logging_otlp_endpoint
           .unwrap_or(config.logging.otlp_endpoint),

bin/core/src/db.rs

@@ -12,7 +12,6 @@ use komodo_client::entities::{
   provider::{DockerRegistryAccount, GitProviderAccount},
   repo::Repo,
   server::Server,
-  server_template::ServerTemplate,
   stack::Stack,
   stats::SystemStatsRecord,
   sync::ResourceSync,
@@ -50,7 +49,6 @@ pub struct DbClient {
   pub procedures: Collection<Procedure>,
   pub actions: Collection<Action>,
   pub alerters: Collection<Alerter>,
-  pub server_templates: Collection<ServerTemplate>,
   pub resource_syncs: Collection<ResourceSync>,
   pub stacks: Collection<Stack>,
   //
@@ -120,8 +118,6 @@ impl DbClient {
       alerters: resource_collection(&db, "Alerter").await?,
       procedures: resource_collection(&db, "Procedure").await?,
       actions: resource_collection(&db, "Action").await?,
-      server_templates: resource_collection(&db, "ServerTemplate")
-        .await?,
       resource_syncs: resource_collection(&db, "ResourceSync")
         .await?,
       stacks: resource_collection(&db, "Stack").await?,

bin/core/src/helpers/builder.rs

@@ -7,7 +7,6 @@ use komodo_client::entities::{
   builder::{AwsBuilderConfig, Builder, BuilderConfig},
   komodo_timestamp,
   server::Server,
-  server_template::aws::AwsServerTemplateConfig,
   update::{Log, Update},
 };
 use periphery_client::{
@@ -88,11 +87,8 @@ async fn get_aws_builder(
 
   let version = version.map(|v| format!("-v{v}")).unwrap_or_default();
   let instance_name = format!("BUILDER-{resource_name}{version}");
-  let Ec2Instance { instance_id, ip } = launch_ec2_instance(
-    &instance_name,
-    AwsServerTemplateConfig::from_builder_config(&config),
-  )
-  .await?;
+  let Ec2Instance { instance_id, ip } =
+    launch_ec2_instance(&instance_name, &config).await?;
 
   info!("ec2 instance launched");
 

bin/core/src/helpers/mod.rs

@@ -1,33 +1,18 @@
-use std::{str::FromStr, time::Duration};
+use std::time::Duration;
 
 use anyhow::{Context, anyhow};
-use futures::future::join_all;
-use komodo_client::{
-  api::write::{CreateBuilder, CreateServer},
-  entities::{
-    ResourceTarget,
-    builder::{PartialBuilderConfig, PartialServerBuilderConfig},
-    komodo_timestamp,
-    permission::{Permission, PermissionLevel, UserTarget},
-    server::{PartialServerConfig, Server},
-    sync::ResourceSync,
-    update::Log,
-    user::{User, system_user},
-  },
+use komodo_client::entities::{
+  ResourceTarget,
+  permission::{Permission, PermissionLevel, UserTarget},
+  server::Server,
+  user::User,
 };
 use mongo_indexed::Document;
-use mungos::{
-  find::find_collect,
-  mongodb::bson::{Bson, doc, oid::ObjectId, to_document},
-};
+use mungos::mongodb::bson::{Bson, doc};
 use periphery_client::PeripheryClient;
 use rand::Rng;
-use resolver_api::Resolve;
 
-use crate::{
-  api::write::WriteArgs, config::core_config, resource,
-  state::db_client,
-};
+use crate::{config::core_config, state::db_client};
 
 pub mod action_state;
 pub mod builder;
@@ -203,160 +188,3 @@ pub fn flatten_document(doc: Document) -> Document {
 
   target
 }
-
-pub async fn startup_cleanup() {
-  tokio::join!(
-    startup_in_progress_update_cleanup(),
-    startup_open_alert_cleanup(),
-  );
-}
-
-/// Run on startup, as no updates should be in progress on startup
-async fn startup_in_progress_update_cleanup() {
-  let log = Log::error(
-    "Komodo shutdown",
-    String::from(
-      "Komodo shutdown during execution. If this is a build, the builder may not have been terminated.",
-    ),
-  );
-  // This static log won't fail to serialize, unwrap ok.
-  let log = to_document(&log).unwrap();
-  if let Err(e) = db_client()
-    .updates
-    .update_many(
-      doc! { "status": "InProgress" },
-      doc! {
-        "$set": {
-          "status": "Complete",
-          "success": false,
-        },
-        "$push": {
-          "logs": log
-        }
-      },
-    )
-    .await
-  {
-    error!("failed to cleanup in progress updates on startup | {e:#}")
-  }
-}
-
-/// Run on startup, ensure open alerts pointing to invalid resources are closed.
-async fn startup_open_alert_cleanup() {
-  let db = db_client();
-  let Ok(alerts) =
-    find_collect(&db.alerts, doc! { "resolved": false }, None)
-      .await
-      .inspect_err(|e| {
-        error!(
-          "failed to list all alerts for startup open alert cleanup | {e:?}"
-        )
-      })
-  else {
-    return;
-  };
-  let futures = alerts.into_iter().map(|alert| async move {
-    match alert.target {
-      ResourceTarget::Server(id) => {
-        resource::get::<Server>(&id)
-          .await
-          .is_err()
-          .then(|| ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok()).flatten()
-      }
-      ResourceTarget::ResourceSync(id) => {
-        resource::get::<ResourceSync>(&id)
-          .await
-          .is_err()
-          .then(|| ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok()).flatten()
-      }
-      // No other resources should have open alerts.
-      _ => ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok(),
-    }
-  });
-  let to_update_ids = join_all(futures)
-    .await
-    .into_iter()
-    .flatten()
-    .collect::<Vec<_>>();
-  if let Err(e) = db
-    .alerts
-    .update_many(
-      doc! { "_id": { "$in": to_update_ids } },
-      doc! { "$set": {
-        "resolved": true,
-        "resolved_ts": komodo_timestamp()
-      } },
-    )
-    .await
-  {
-    error!(
-      "failed to clean up invalid open alerts on startup | {e:#}"
-    )
-  }
-}
-
-/// Ensures a default server / builder exists with the defined address
-pub async fn ensure_first_server_and_builder() {
-  let first_server = &core_config().first_server;
-  if first_server.is_empty() {
-    return;
-  }
-  let db = db_client();
-  let Ok(server) = db
-    .servers
-    .find_one(Document::new())
-    .await
-    .inspect_err(|e| error!("Failed to initialize 'first_server'. Failed to query db. {e:?}"))
-  else {
-    return;
-  };
-  let server = if let Some(server) = server {
-    server
-  } else {
-    match (CreateServer {
-      name: format!("server-{}", random_string(5)),
-      config: PartialServerConfig {
-        address: Some(first_server.to_string()),
-        enabled: Some(true),
-        ..Default::default()
-      },
-    })
-    .resolve(&WriteArgs {
-      user: system_user().to_owned(),
-    })
-    .await
-    {
-      Ok(server) => server,
-      Err(e) => {
-        error!(
-          "Failed to initialize 'first_server'. Failed to CreateServer. {:#}",
-          e.error
-        );
-        return;
-      }
-    }
-  };
-  let Ok(None) = db.builders
-    .find_one(Document::new()).await
-    .inspect_err(|e| error!("Failed to initialize 'first_builder' | Failed to query db | {e:?}")) else {
-      return;
-    };
-  if let Err(e) = (CreateBuilder {
-    name: String::from("local"),
-    config: PartialBuilderConfig::Server(
-      PartialServerBuilderConfig {
-        server_id: Some(server.id),
-      },
-    ),
-  })
-  .resolve(&WriteArgs {
-    user: system_user().to_owned(),
-  })
-  .await
-  {
-    error!(
-      "Failed to initialize 'first_builder' | Failed to CreateBuilder | {:#}",
-      e.error
-    );
-  }
-}

bin/core/src/helpers/procedure.rs

@@ -166,6 +166,13 @@ async fn execute_stage(
         )
         .await?;
       }
+      Execution::BatchPullStack(exec) => {
+        extend_batch_exection::<BatchPullStack>(
+          &exec.pattern,
+          &mut executions,
+        )
+        .await?;
+      }
       Execution::BatchDestroyStack(exec) => {
         extend_batch_exection::<BatchDestroyStack>(
           &exec.pattern,
@@ -985,6 +992,12 @@ async fn execute_execution(
       )
       .await?
     }
+    Execution::BatchPullStack(_) => {
+      // All batch executions must be expanded in `execute_stage`
+      return Err(anyhow!(
+        "Batch method BatchPullStack not implemented correctly"
+      ));
+    }
     Execution::StartStack(req) => {
       let req = ExecuteRequest::StartStack(req);
       let update = init_execution_update(&req, &user).await?;
@@ -1275,6 +1288,16 @@ impl ExtendBatch for BatchDeployStackIfChanged {
   }
 }
 
+impl ExtendBatch for BatchPullStack {
+  type Resource = Stack;
+  fn single_execution(stack: String) -> Execution {
+    Execution::PullStack(PullStack {
+      stack,
+      services: Vec::new(),
+    })
+  }
+}
+
 impl ExtendBatch for BatchDestroyStack {
   type Resource = Stack;
   fn single_execution(stack: String) -> Execution {

bin/core/src/helpers/query.rs

@@ -1,6 +1,11 @@
-use std::{collections::HashMap, str::FromStr};
+use std::{
+  collections::HashMap,
+  str::FromStr,
+  sync::{Arc, OnceLock},
+};
 
 use anyhow::{Context, anyhow};
+use async_timing_util::{ONE_MIN_MS, unix_timestamp_ms};
 use komodo_client::entities::{
   Operation, ResourceTarget, ResourceTargetVariant,
   action::Action,
@@ -13,8 +18,8 @@ use komodo_client::entities::{
   procedure::Procedure,
   repo::Repo,
   server::{Server, ServerState},
-  server_template::ServerTemplate,
   stack::{Stack, StackServiceNames, StackState},
+  stats::SystemInformation,
   sync::ResourceSync,
   tag::Tag,
   update::Update,
@@ -29,6 +34,8 @@ use mungos::{
     options::FindOneOptions,
   },
 };
+use periphery_client::api::stats;
+use tokio::sync::Mutex;
 
 use crate::{
   config::core_config,
@@ -37,6 +44,8 @@ use crate::{
   state::{db_client, deployment_status_cache, stack_status_cache},
 };
 
+use super::periphery_client;
+
 // user: Id or username
 #[instrument(level = "debug")]
 pub async fn get_user(user: &str) -> anyhow::Result<User> {
@@ -295,10 +304,6 @@ pub async fn get_user_permission_on_target(
     ResourceTarget::Action(id) => {
       get_user_permission_on_resource::<Action>(user, id).await
     }
-    ResourceTarget::ServerTemplate(id) => {
-      get_user_permission_on_resource::<ServerTemplate>(user, id)
-        .await
-    }
     ResourceTarget::ResourceSync(id) => {
       get_user_permission_on_resource::<ResourceSync>(user, id).await
     }
@@ -382,3 +387,36 @@ pub async fn get_variables_and_secrets()
 
   Ok(VariablesAndSecrets { variables, secrets })
 }
+
+// This protects the peripheries from spam requests
+const SYSTEM_INFO_EXPIRY: u128 = ONE_MIN_MS;
+type SystemInfoCache =
+  Mutex<HashMap<String, Arc<(SystemInformation, u128)>>>;
+fn system_info_cache() -> &'static SystemInfoCache {
+  static SYSTEM_INFO_CACHE: OnceLock<SystemInfoCache> =
+    OnceLock::new();
+  SYSTEM_INFO_CACHE.get_or_init(Default::default)
+}
+
+pub async fn get_system_info(
+  server: &Server,
+) -> anyhow::Result<SystemInformation> {
+  let mut lock = system_info_cache().lock().await;
+  let res = match lock.get(&server.id) {
+    Some(cached) if cached.1 > unix_timestamp_ms() => {
+      cached.0.clone()
+    }
+    _ => {
+      let stats = periphery_client(server)?
+        .request(stats::GetSystemInformation {})
+        .await?;
+      lock.insert(
+        server.id.clone(),
+        (stats.clone(), unix_timestamp_ms() + SYSTEM_INFO_EXPIRY)
+          .into(),
+      );
+      stats
+    }
+  };
+  Ok(res)
+}

bin/core/src/helpers/update.rs

@@ -9,7 +9,6 @@ use komodo_client::entities::{
   procedure::Procedure,
   repo::Repo,
   server::Server,
-  server_template::ServerTemplate,
   stack::Stack,
   sync::ResourceSync,
   update::{Update, UpdateListItem},
@@ -385,16 +384,6 @@ pub async fn init_execution_update(
       return Ok(Default::default());
     }
 
-    // Server template
-    ExecuteRequest::LaunchServer(data) => (
-      Operation::LaunchServer,
-      ResourceTarget::ServerTemplate(
-        resource::get::<ServerTemplate>(&data.server_template)
-          .await?
-          .id,
-      ),
-    ),
-
     // Resource Sync
     ExecuteRequest::RunSync(data) => (
       Operation::RunSync,
@@ -446,6 +435,9 @@ pub async fn init_execution_update(
         resource::get::<Stack>(&data.stack).await?.id,
       ),
     ),
+    ExecuteRequest::BatchPullStack(_data) => {
+      return Ok(Default::default());
+    }
     ExecuteRequest::RestartStack(data) => (
       if !data.services.is_empty() {
         Operation::RestartStackService

bin/core/src/main.rs

@@ -23,7 +23,9 @@ mod helpers;
 mod listener;
 mod monitor;
 mod resource;
+mod schedule;
 mod stack;
+mod startup;
 mod state;
 mod sync;
 mod ts_client;
@@ -33,32 +35,35 @@ async fn app() -> anyhow::Result<()> {
   dotenvy::dotenv().ok();
   let config = core_config();
   logger::init(&config.logging)?;
+  if let Err(e) =
+    rustls::crypto::aws_lc_rs::default_provider().install_default()
+  {
+    error!("Failed to install default crypto provider | {e:?}");
+    std::process::exit(1);
+  };
 
   info!("Komodo Core version: v{}", env!("CARGO_PKG_VERSION"));
   info!("{:?}", config.sanitized());
 
+  // Init jwt client to crash on failure
+  state::jwt_client();
   tokio::join!(
     // Init db_client check to crash on db init failure
     state::init_db_client(),
     // Manage OIDC client (defined in config / env vars / compose secret file)
     auth::oidc::client::spawn_oidc_client_management()
   );
-  tokio::join!(
-    // Maybe initialize first server
-    helpers::ensure_first_server_and_builder(),
-    // Cleanup open updates / invalid alerts
-    helpers::startup_cleanup(),
-  );
-  // init jwt client to crash on failure
-  state::jwt_client();
-
-  // Spawn tasks
+  // Run after db connection.
+  startup::on_startup().await;
+  
+  // Spawn background tasks
   monitor::spawn_monitor_loop();
   resource::spawn_resource_refresh_loop();
   resource::spawn_build_state_refresh_loop();
   resource::spawn_repo_state_refresh_loop();
   resource::spawn_procedure_state_refresh_loop();
   resource::spawn_action_state_refresh_loop();
+  schedule::spawn_schedule_executor();
   helpers::prune::spawn_prune_loop();
 
   // Setup static frontend services
@@ -74,6 +79,7 @@ async fn app() -> anyhow::Result<()> {
     .nest("/read", api::read::router())
     .nest("/write", api::write::router())
     .nest("/execute", api::execute::router())
+    .nest("/terminal", api::terminal::router())
     .nest("/listener", listener::router())
     .nest("/ws", ws::router())
     .nest("/client", ts_client::router())
@@ -86,9 +92,9 @@ async fn app() -> anyhow::Result<()> {
     )
     .into_make_service();
 
-  let addr = format!("{}:{}", core_config().bind_ip, core_config().port);
-  let socket_addr =
-    SocketAddr::from_str(&addr)
+  let addr =
+    format!("{}:{}", core_config().bind_ip, core_config().port);
+  let socket_addr = SocketAddr::from_str(&addr)
     .context("failed to parse listen address")?;
 
   if config.ssl_enabled {

bin/core/src/resource/action.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::Context;
 use komodo_client::entities::{
-  Operation, ResourceTargetVariant,
+  Operation, ResourceTarget, ResourceTargetVariant,
   action::{
     Action, ActionConfig, ActionConfigDiff, ActionInfo,
     ActionListItem, ActionListItemInfo, ActionQuerySpecifics,
@@ -17,7 +17,12 @@ use mungos::{
   mongodb::{Collection, bson::doc, options::FindOneOptions},
 };
 
-use crate::state::{action_state_cache, action_states, db_client};
+use crate::{
+  schedule::{
+    cancel_schedule, get_schedule_item_info, update_schedule,
+  },
+  state::{action_state_cache, action_states, db_client},
+};
 
 impl super::KomodoResource for Action {
   type Config = ActionConfig;
@@ -31,6 +36,10 @@ impl super::KomodoResource for Action {
     ResourceTargetVariant::Action
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Action(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().actions
@@ -40,6 +49,9 @@ impl super::KomodoResource for Action {
     action: Resource<Self::Config, Self::Info>,
   ) -> Self::ListItem {
     let state = get_action_state(&action.id).await;
+    let (next_scheduled_run, schedule_error) = get_schedule_item_info(
+      &ResourceTarget::Action(action.id.clone()),
+    );
     ActionListItem {
       name: action.name,
       id: action.id,
@@ -48,6 +60,8 @@ impl super::KomodoResource for Action {
       info: ActionListItemInfo {
         state,
         last_run_at: action.info.last_run_at,
+        next_scheduled_run,
+        schedule_error,
       },
     }
   }
@@ -83,9 +97,10 @@ impl super::KomodoResource for Action {
   }
 
   async fn post_create(
-    _created: &Resource<Self::Config, Self::Info>,
+    created: &Resource<Self::Config, Self::Info>,
     _update: &mut Update,
   ) -> anyhow::Result<()> {
+    update_schedule(created);
     refresh_action_state_cache().await;
     Ok(())
   }
@@ -131,9 +146,10 @@ impl super::KomodoResource for Action {
   }
 
   async fn post_delete(
-    _resource: &Resource<Self::Config, Self::Info>,
+    resource: &Resource<Self::Config, Self::Info>,
     _update: &mut Update,
   ) -> anyhow::Result<()> {
+    cancel_schedule(&ResourceTarget::Action(resource.id.clone()));
     Ok(())
   }
 }

bin/core/src/resource/alerter.rs

@@ -1,6 +1,6 @@
 use derive_variants::ExtractVariant;
 use komodo_client::entities::{
-  Operation, ResourceTargetVariant,
+  Operation, ResourceTarget, ResourceTargetVariant,
   alerter::{
     Alerter, AlerterConfig, AlerterConfigDiff, AlerterListItem,
     AlerterListItemInfo, AlerterQuerySpecifics, PartialAlerterConfig,
@@ -25,6 +25,10 @@ impl super::KomodoResource for Alerter {
     ResourceTargetVariant::Alerter
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Alerter(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().alerters

bin/core/src/resource/build.rs

@@ -5,7 +5,7 @@ use formatting::format_serror;
 use komodo_client::{
   api::write::RefreshBuildCache,
   entities::{
-    Operation, ResourceTargetVariant,
+    Operation, ResourceTarget, ResourceTargetVariant,
     build::{
       Build, BuildConfig, BuildConfigDiff, BuildInfo, BuildListItem,
       BuildListItemInfo, BuildQuerySpecifics, BuildState,
@@ -44,6 +44,10 @@ impl super::KomodoResource for Build {
     ResourceTargetVariant::Build
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Build(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().builds

bin/core/src/resource/builder.rs

@@ -1,6 +1,6 @@
 use anyhow::Context;
 use komodo_client::entities::{
-  MergePartial, Operation, ResourceTargetVariant,
+  MergePartial, Operation, ResourceTarget, ResourceTargetVariant,
   builder::{
     Builder, BuilderConfig, BuilderConfigDiff, BuilderConfigVariant,
     BuilderListItem, BuilderListItemInfo, BuilderQuerySpecifics,
@@ -31,6 +31,10 @@ impl super::KomodoResource for Builder {
     ResourceTargetVariant::Builder
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Builder(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().builders

bin/core/src/resource/deployment.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use formatting::format_serror;
 use komodo_client::entities::{
-  Operation, ResourceTargetVariant,
+  Operation, ResourceTarget, ResourceTargetVariant,
   build::Build,
   deployment::{
     Deployment, DeploymentConfig, DeploymentConfigDiff,
@@ -43,6 +43,10 @@ impl super::KomodoResource for Deployment {
     ResourceTargetVariant::Deployment
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Deployment(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().deployments

bin/core/src/resource/mod.rs

@@ -29,7 +29,7 @@ use mungos::{
     options::FindOptions,
   },
 };
-use partial_derive2::{Diff, FieldDiff, MaybeNone, PartialDiff};
+use partial_derive2::{Diff, MaybeNone, PartialDiff};
 use resolver_api::Resolve;
 use serde::{Serialize, de::DeserializeOwned};
 
@@ -56,7 +56,6 @@ mod procedure;
 mod refresh;
 mod repo;
 mod server;
-mod server_template;
 mod stack;
 mod sync;
 
@@ -107,6 +106,7 @@ pub trait KomodoResource {
   type QuerySpecifics: AddFilters + Default + std::fmt::Debug;
 
   fn resource_type() -> ResourceTargetVariant;
+  fn resource_target(id: impl Into<String>) -> ResourceTarget;
 
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>;
 
@@ -693,13 +693,17 @@ pub async fn update<T: KomodoResource>(
     return Ok(resource);
   }
 
-  let mut diff_log = String::from("diff");
-
-  for FieldDiff { field, from, to } in diff.iter_field_diffs() {
-    diff_log.push_str(&format!(
-      "\n\n<span class=\"text-muted-foreground\">field</span>: '{field}'\n<span class=\"text-muted-foreground\">from</span>:  <span class=\"text-red-700 dark:text-red-400\">{from}</span>\n<span class=\"text-muted-foreground\">to</span>:    <span class=\"text-green-700 dark:text-green-400\">{to}</span>",
-    ));
+  // Leave this Result unhandled for now
+  let prev_toml = ExportResourcesToToml {
+    targets: vec![T::resource_target(&resource.id)],
+    ..Default::default()
   }
+  .resolve(&ReadArgs {
+    user: system_user().to_owned(),
+  })
+  .await
+  .map_err(|e| e.error)
+  .context("Failed to export resource toml before update");
 
   // This minimizes the update against the existing config
   let config: T::PartialConfig = diff.into();
@@ -715,13 +719,35 @@ pub async fn update<T: KomodoResource>(
     .await
     .context("failed to update resource on database")?;
 
+  let curr_toml = ExportResourcesToToml {
+    targets: vec![T::resource_target(&id)],
+    ..Default::default()
+  }
+  .resolve(&ReadArgs {
+    user: system_user().to_owned(),
+  })
+  .await
+  .map_err(|e| e.error)
+  .context("Failed to export resource toml after update");
+
   let mut update = make_update(
     resource_target::<T>(id),
     T::update_operation(),
     user,
   );
 
-  update.push_simple_log("update config", diff_log);
+  match prev_toml {
+    Ok(res) => update.prev_toml = res.toml,
+    Err(e) => update
+      // These logs are pushed with success == true, so user still knows the update was succesful.
+      .push_simple_log("Failed export", format_serror(&e.into())),
+  }
+  match curr_toml {
+    Ok(res) => update.current_toml = res.toml,
+    Err(e) => update
+      // These logs are pushed with success == true, so user still knows the update was succesful.
+      .push_simple_log("Failed export", format_serror(&e.into())),
+  }
 
   let updated = get::<T>(id_or_name).await?;
 
@@ -746,9 +772,6 @@ fn resource_target<T: KomodoResource>(id: String) -> ResourceTarget {
     ResourceTargetVariant::Repo => ResourceTarget::Repo(id),
     ResourceTargetVariant::Alerter => ResourceTarget::Alerter(id),
     ResourceTargetVariant::Procedure => ResourceTarget::Procedure(id),
-    ResourceTargetVariant::ServerTemplate => {
-      ResourceTarget::ServerTemplate(id)
-    }
     ResourceTargetVariant::ResourceSync => {
       ResourceTarget::ResourceSync(id)
     }
@@ -993,9 +1016,6 @@ where
     ResourceTarget::Stack(id) => ("recents.Stack", id),
     ResourceTarget::Builder(id) => ("recents.Builder", id),
     ResourceTarget::Alerter(id) => ("recents.Alerter", id),
-    ResourceTarget::ServerTemplate(id) => {
-      ("recents.ServerTemplate", id)
-    }
     ResourceTarget::ResourceSync(id) => ("recents.ResourceSync", id),
     ResourceTarget::System(_) => return,
   };

bin/core/src/resource/procedure.rs

@@ -4,7 +4,7 @@ use anyhow::{Context, anyhow};
 use komodo_client::{
   api::execute::Execution,
   entities::{
-    Operation, ResourceTargetVariant,
+    Operation, ResourceTarget, ResourceTargetVariant,
     action::Action,
     alerter::Alerter,
     build::Build,
@@ -31,6 +31,9 @@ use mungos::{
 
 use crate::{
   config::core_config,
+  schedule::{
+    cancel_schedule, get_schedule_item_info, update_schedule,
+  },
   state::{action_states, db_client, procedure_state_cache},
 };
 
@@ -46,6 +49,10 @@ impl super::KomodoResource for Procedure {
     ResourceTargetVariant::Procedure
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Procedure(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().procedures
@@ -55,6 +62,9 @@ impl super::KomodoResource for Procedure {
     procedure: Resource<Self::Config, Self::Info>,
   ) -> Self::ListItem {
     let state = get_procedure_state(&procedure.id).await;
+    let (next_scheduled_run, schedule_error) = get_schedule_item_info(
+      &ResourceTarget::Procedure(procedure.id.clone()),
+    );
     ProcedureListItem {
       name: procedure.name,
       id: procedure.id,
@@ -63,6 +73,8 @@ impl super::KomodoResource for Procedure {
       info: ProcedureListItemInfo {
         stages: procedure.config.stages.len() as i64,
         state,
+        next_scheduled_run,
+        schedule_error,
       },
     }
   }
@@ -94,9 +106,10 @@ impl super::KomodoResource for Procedure {
   }
 
   async fn post_create(
-    _created: &Resource<Self::Config, Self::Info>,
+    created: &Resource<Self::Config, Self::Info>,
     _update: &mut Update,
   ) -> anyhow::Result<()> {
+    update_schedule(created);
     refresh_procedure_state_cache().await;
     Ok(())
   }
@@ -142,9 +155,10 @@ impl super::KomodoResource for Procedure {
   }
 
   async fn post_delete(
-    _resource: &Resource<Self::Config, Self::Info>,
+    resource: &Resource<Self::Config, Self::Info>,
     _update: &mut Update,
   ) -> anyhow::Result<()> {
+    cancel_schedule(&ResourceTarget::Procedure(resource.id.clone()));
     Ok(())
   }
 }
@@ -627,6 +641,13 @@ async fn validate_config(
           .await?;
           params.stack = stack.id;
         }
+        Execution::BatchPullStack(_params) => {
+          if !user.admin {
+            return Err(anyhow!(
+              "Non admin user cannot configure Batch executions"
+            ));
+          }
+        }
         Execution::StartStack(params) => {
           let stack = super::get_check_permissions::<Stack>(
             &params.stack,

bin/core/src/resource/repo.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 use anyhow::Context;
 use formatting::format_serror;
 use komodo_client::entities::{
-  Operation, ResourceTargetVariant,
+  Operation, ResourceTarget, ResourceTargetVariant,
   builder::Builder,
   permission::PermissionLevel,
   repo::{
@@ -44,6 +44,10 @@ impl super::KomodoResource for Repo {
     ResourceTargetVariant::Repo
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Repo(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().repos

bin/core/src/resource/server.rs

@@ -1,6 +1,6 @@
 use anyhow::Context;
 use komodo_client::entities::{
-  Operation, ResourceTargetVariant, komodo_timestamp,
+  Operation, ResourceTarget, ResourceTargetVariant, komodo_timestamp,
   resource::Resource,
   server::{
     PartialServerConfig, Server, ServerConfig, ServerConfigDiff,
@@ -13,6 +13,7 @@ use mungos::mongodb::{Collection, bson::doc};
 
 use crate::{
   config::core_config,
+  helpers::query::get_system_info,
   monitor::update_cache_for_server,
   state::{action_states, db_client, server_status_cache},
 };
@@ -29,6 +30,10 @@ impl super::KomodoResource for Server {
     ResourceTargetVariant::Server
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Server(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().servers
@@ -38,6 +43,11 @@ impl super::KomodoResource for Server {
     server: Resource<Self::Config, Self::Info>,
   ) -> Self::ListItem {
     let status = server_status_cache().get(&server.id).await;
+    let (terminals_disabled, container_exec_disabled) =
+      get_system_info(&server)
+        .await
+        .map(|i| (i.terminals_disabled, i.container_exec_disabled))
+        .unwrap_or((true, true));
     ServerListItem {
       name: server.name,
       id: server.id,
@@ -53,6 +63,8 @@ impl super::KomodoResource for Server {
         send_cpu_alerts: server.config.send_cpu_alerts,
         send_mem_alerts: server.config.send_mem_alerts,
         send_disk_alerts: server.config.send_disk_alerts,
+        terminals_disabled,
+        container_exec_disabled,
       },
     }
   }

bin/core/src/resource/server_template.rs

@@ -1,145 +0,0 @@
-use komodo_client::entities::{
-  MergePartial, Operation, ResourceTargetVariant,
-  resource::Resource,
-  server_template::{
-    PartialServerTemplateConfig, ServerTemplate,
-    ServerTemplateConfig, ServerTemplateConfigDiff,
-    ServerTemplateConfigVariant, ServerTemplateListItem,
-    ServerTemplateListItemInfo, ServerTemplateQuerySpecifics,
-  },
-  update::Update,
-  user::User,
-};
-use mungos::mongodb::{
-  Collection,
-  bson::{Document, to_document},
-};
-
-use crate::state::db_client;
-
-impl super::KomodoResource for ServerTemplate {
-  type Config = ServerTemplateConfig;
-  type PartialConfig = PartialServerTemplateConfig;
-  type ConfigDiff = ServerTemplateConfigDiff;
-  type Info = ();
-  type ListItem = ServerTemplateListItem;
-  type QuerySpecifics = ServerTemplateQuerySpecifics;
-
-  fn resource_type() -> ResourceTargetVariant {
-    ResourceTargetVariant::ServerTemplate
-  }
-
-  fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
-  {
-    &db_client().server_templates
-  }
-
-  async fn to_list_item(
-    server_template: Resource<Self::Config, Self::Info>,
-  ) -> Self::ListItem {
-    let (template_type, instance_type) = match server_template.config
-    {
-      ServerTemplateConfig::Aws(config) => (
-        ServerTemplateConfigVariant::Aws.to_string(),
-        Some(config.instance_type),
-      ),
-      ServerTemplateConfig::Hetzner(config) => (
-        ServerTemplateConfigVariant::Hetzner.to_string(),
-        Some(config.server_type.as_ref().to_string()),
-      ),
-    };
-    ServerTemplateListItem {
-      name: server_template.name,
-      id: server_template.id,
-      tags: server_template.tags,
-      resource_type: ResourceTargetVariant::ServerTemplate,
-      info: ServerTemplateListItemInfo {
-        provider: template_type.to_string(),
-        instance_type,
-      },
-    }
-  }
-
-  async fn busy(_id: &String) -> anyhow::Result<bool> {
-    Ok(false)
-  }
-
-  // CREATE
-
-  fn create_operation() -> Operation {
-    Operation::CreateServerTemplate
-  }
-
-  fn user_can_create(user: &User) -> bool {
-    user.admin
-  }
-
-  async fn validate_create_config(
-    _config: &mut Self::PartialConfig,
-    _user: &User,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-
-  async fn post_create(
-    _created: &Resource<Self::Config, Self::Info>,
-    _update: &mut Update,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-
-  // UPDATE
-
-  fn update_operation() -> Operation {
-    Operation::UpdateServerTemplate
-  }
-
-  async fn validate_update_config(
-    _id: &str,
-    _config: &mut Self::PartialConfig,
-    _user: &User,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-
-  fn update_document(
-    original: Resource<Self::Config, Self::Info>,
-    config: Self::PartialConfig,
-  ) -> Result<Document, mungos::mongodb::bson::ser::Error> {
-    let config = original.config.merge_partial(config);
-    to_document(&config)
-  }
-
-  async fn post_update(
-    _updated: &Self,
-    _update: &mut Update,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-
-  // RENAME
-
-  fn rename_operation() -> Operation {
-    Operation::RenameServerTemplate
-  }
-
-  // DELETE
-
-  fn delete_operation() -> Operation {
-    Operation::DeleteServerTemplate
-  }
-
-  async fn pre_delete(
-    _resource: &Resource<Self::Config, Self::Info>,
-    _update: &mut Update,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-
-  async fn post_delete(
-    _resource: &Resource<Self::Config, Self::Info>,
-    _update: &mut Update,
-  ) -> anyhow::Result<()> {
-    Ok(())
-  }
-}

bin/core/src/resource/stack.rs

@@ -3,7 +3,7 @@ use formatting::format_serror;
 use komodo_client::{
   api::write::RefreshStackCache,
   entities::{
-    Operation, ResourceTargetVariant,
+    Operation, ResourceTarget, ResourceTargetVariant,
     permission::PermissionLevel,
     resource::Resource,
     server::Server,
@@ -44,6 +44,10 @@ impl super::KomodoResource for Stack {
     ResourceTargetVariant::Stack
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::Stack(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().stacks

bin/core/src/resource/sync.rs

@@ -3,7 +3,8 @@ use formatting::format_serror;
 use komodo_client::{
   api::write::RefreshResourceSyncPending,
   entities::{
-    Operation, ResourceTargetVariant, komodo_timestamp,
+    Operation, ResourceTarget, ResourceTargetVariant,
+    komodo_timestamp,
     resource::Resource,
     sync::{
       PartialResourceSyncConfig, ResourceSync, ResourceSyncConfig,
@@ -36,6 +37,10 @@ impl super::KomodoResource for ResourceSync {
     ResourceTargetVariant::ResourceSync
   }
 
+  fn resource_target(id: impl Into<String>) -> ResourceTarget {
+    ResourceTarget::ResourceSync(id.into())
+  }
+
   fn coll() -> &'static Collection<Resource<Self::Config, Self::Info>>
   {
     &db_client().resource_syncs

bin/core/src/schedule.rs

@@ -0,0 +1,378 @@
+use std::{
+  collections::HashMap,
+  sync::{OnceLock, RwLock},
+};
+
+use anyhow::{Context, anyhow};
+use async_timing_util::Timelength;
+use chrono::Local;
+use formatting::format_serror;
+use komodo_client::{
+  api::execute::{RunAction, RunProcedure},
+  entities::{
+    ResourceTarget, ResourceTargetVariant, ScheduleFormat,
+    action::Action,
+    alert::{Alert, AlertData, SeverityLevel},
+    komodo_timestamp,
+    procedure::Procedure,
+    user::{action_user, procedure_user},
+  },
+};
+use mungos::find::find_collect;
+use resolver_api::Resolve;
+
+use crate::{
+  alert::send_alerts,
+  api::execute::{ExecuteArgs, ExecuteRequest},
+  helpers::update::init_execution_update,
+  state::db_client,
+};
+
+pub fn spawn_schedule_executor() {
+  // Executor thread
+  tokio::spawn(async move {
+    loop {
+      let current_time = async_timing_util::wait_until_timelength(
+        Timelength::OneSecond,
+        0,
+      )
+      .await as i64;
+      let mut lock = schedules().write().unwrap();
+      let drained = lock.drain().collect::<Vec<_>>();
+      for (target, next_run) in drained {
+        match next_run {
+          Ok(next_run_time) if current_time >= next_run_time => {
+            tokio::spawn(async move {
+              match &target {
+                ResourceTarget::Action(id) => {
+                  let action = match crate::resource::get::<Action>(
+                    id,
+                  )
+                  .await
+                  {
+                    Ok(action) => action,
+                    Err(e) => {
+                      warn!(
+                        "Scheduled action run on {id} failed | failed to get procedure | {e:?}"
+                      );
+                      return;
+                    }
+                  };
+                  let request =
+                    ExecuteRequest::RunAction(RunAction {
+                      action: id.clone(),
+                    });
+                  let update = match init_execution_update(
+                    &request,
+                    action_user(),
+                  )
+                  .await
+                  {
+                    Ok(update) => update,
+                    Err(e) => {
+                      error!(
+                        "Failed to make update for scheduled action run, action {id} is not being run | {e:#}"
+                      );
+                      return;
+                    }
+                  };
+                  let ExecuteRequest::RunAction(request) = request
+                  else {
+                    unreachable!()
+                  };
+                  if let Err(e) = request
+                    .resolve(&ExecuteArgs {
+                      user: action_user().to_owned(),
+                      update,
+                    })
+                    .await
+                  {
+                    warn!(
+                      "Scheduled action run on {id} failed | {e:?}"
+                    );
+                  }
+                  update_schedule(&action);
+                  if action.config.schedule_alert {
+                    let alert = Alert {
+                      id: Default::default(),
+                      target,
+                      ts: komodo_timestamp(),
+                      resolved_ts: Some(komodo_timestamp()),
+                      resolved: true,
+                      level: SeverityLevel::Ok,
+                      data: AlertData::ScheduleRun {
+                        resource_type: ResourceTargetVariant::Action,
+                        id: action.id,
+                        name: action.name,
+                      },
+                    };
+                    send_alerts(&[alert]).await
+                  }
+                }
+                ResourceTarget::Procedure(id) => {
+                  let procedure = match crate::resource::get::<
+                    Procedure,
+                  >(id)
+                  .await
+                  {
+                    Ok(procedure) => procedure,
+                    Err(e) => {
+                      warn!(
+                        "Scheduled procedure run on {id} failed | failed to get procedure | {e:?}"
+                      );
+                      return;
+                    }
+                  };
+                  let request =
+                    ExecuteRequest::RunProcedure(RunProcedure {
+                      procedure: id.clone(),
+                    });
+                  let update = match init_execution_update(
+                    &request,
+                    procedure_user(),
+                  )
+                  .await
+                  {
+                    Ok(update) => update,
+                    Err(e) => {
+                      error!(
+                        "Failed to make update for scheduled procedure run, procedure {id} is not being run | {e:#}"
+                      );
+                      return;
+                    }
+                  };
+                  let ExecuteRequest::RunProcedure(request) = request
+                  else {
+                    unreachable!()
+                  };
+                  if let Err(e) = request
+                    .resolve(&ExecuteArgs {
+                      user: procedure_user().to_owned(),
+                      update,
+                    })
+                    .await
+                  {
+                    warn!(
+                      "Scheduled procedure run on {id} failed | {e:?}"
+                    );
+                  }
+                  update_schedule(&procedure);
+                  if procedure.config.schedule_alert {
+                    let alert = Alert {
+                      id: Default::default(),
+                      target,
+                      ts: komodo_timestamp(),
+                      resolved_ts: Some(komodo_timestamp()),
+                      resolved: true,
+                      level: SeverityLevel::Ok,
+                      data: AlertData::ScheduleRun {
+                        resource_type:
+                          ResourceTargetVariant::Procedure,
+                        id: procedure.id,
+                        name: procedure.name,
+                      },
+                    };
+                    send_alerts(&[alert]).await
+                  }
+                }
+                _ => unreachable!(),
+              }
+            });
+          }
+          other => {
+            lock.insert(target, other);
+            continue;
+          }
+        };
+      }
+    }
+  });
+  // Updater thread
+  tokio::spawn(async move {
+    update_schedules().await;
+    loop {
+      async_timing_util::wait_until_timelength(
+        Timelength::FiveMinutes,
+        500,
+      )
+      .await;
+      update_schedules().await
+    }
+  });
+}
+
+type UnixTimestampMs = i64;
+type Schedules =
+  HashMap<ResourceTarget, Result<UnixTimestampMs, String>>;
+
+fn schedules() -> &'static RwLock<Schedules> {
+  static SCHEDULES: OnceLock<RwLock<Schedules>> = OnceLock::new();
+  SCHEDULES.get_or_init(Default::default)
+}
+
+pub fn get_schedule_item_info(
+  target: &ResourceTarget,
+) -> (Option<i64>, Option<String>) {
+  match schedules().read().unwrap().get(target) {
+    Some(Ok(time)) => (Some(*time), None),
+    Some(Err(e)) => (None, Some(e.clone())),
+    None => (None, None),
+  }
+}
+
+pub fn cancel_schedule(target: &ResourceTarget) {
+  schedules().write().unwrap().remove(target);
+}
+
+pub async fn update_schedules() {
+  let (procedures, actions) = tokio::join!(
+    find_collect(&db_client().procedures, None, None),
+    find_collect(&db_client().actions, None, None),
+  );
+  let procedures = match procedures
+    .context("failed to get all procedures from db")
+  {
+    Ok(procedures) => procedures,
+    Err(e) => {
+      error!("failed to get procedures for schedule update | {e:#}");
+      Vec::new()
+    }
+  };
+  let actions =
+    match actions.context("failed to get all actions from db") {
+      Ok(actions) => actions,
+      Err(e) => {
+        error!("failed to get actions for schedule update | {e:#}");
+        Vec::new()
+      }
+    };
+  // clear out any schedules which don't match to existing resources
+  {
+    let mut lock = schedules().write().unwrap();
+    lock.retain(|target, _| match target {
+      ResourceTarget::Action(id) => {
+        actions.iter().any(|action| &action.id == id)
+      }
+      ResourceTarget::Procedure(id) => {
+        procedures.iter().any(|procedure| &procedure.id == id)
+      }
+      _ => unreachable!(),
+    });
+  }
+  for procedure in procedures {
+    update_schedule(&procedure);
+  }
+  for action in actions {
+    update_schedule(&action);
+  }
+}
+
+/// Re/spawns the schedule for the given procedure
+pub fn update_schedule(schedule: impl HasSchedule) {
+  // Cancel any existing schedule for the procedure
+  cancel_schedule(&schedule.target());
+
+  if !schedule.enabled() || schedule.schedule().is_empty() {
+    return;
+  }
+
+  schedules().write().unwrap().insert(
+    schedule.target(),
+    find_next_occurrence(schedule)
+      .map_err(|e| format_serror(&e.into())),
+  );
+}
+
+/// Finds the next run occurence in UTC ms.
+fn find_next_occurrence(
+  schedule: impl HasSchedule,
+) -> anyhow::Result<i64> {
+  let cron = match schedule.format() {
+    ScheduleFormat::Cron => croner::Cron::new(schedule.schedule())
+      .with_seconds_required()
+      .with_dom_and_dow()
+      .parse()
+      .context("Failed to parse schedule CRON")?,
+    ScheduleFormat::English => {
+      let cron =
+        english_to_cron::str_cron_syntax(schedule.schedule())
+          .map_err(|e| {
+            anyhow!("Failed to parse english to cron | {e:?}")
+          })?
+          .split(' ')
+          // croner does not accept year
+          .take(6)
+          .collect::<Vec<_>>()
+          .join(" ");
+      croner::Cron::new(&cron)
+        .with_seconds_required()
+        .with_dom_and_dow()
+        .parse()
+        .with_context(|| {
+          format!("Failed to parse schedule CRON: {cron}")
+        })?
+    }
+  };
+  let next = if schedule.timezone().is_empty() {
+    let tz_time = chrono::Local::now().with_timezone(&Local);
+    cron
+      .find_next_occurrence(&tz_time, false)
+      .context("Failed to find next run time")?
+      .timestamp_millis()
+  } else {
+    let tz: chrono_tz::Tz = schedule
+      .timezone()
+      .parse()
+      .context("Failed to parse schedule timezone")?;
+    let tz_time = chrono::Local::now().with_timezone(&tz);
+    cron
+      .find_next_occurrence(&tz_time, false)
+      .context("Failed to find next run time")?
+      .timestamp_millis()
+  };
+  Ok(next)
+}
+
+pub trait HasSchedule {
+  fn target(&self) -> ResourceTarget;
+  fn enabled(&self) -> bool;
+  fn format(&self) -> ScheduleFormat;
+  fn schedule(&self) -> &str;
+  fn timezone(&self) -> &str;
+}
+
+impl HasSchedule for &Procedure {
+  fn target(&self) -> ResourceTarget {
+    ResourceTarget::Procedure(self.id.clone())
+  }
+  fn enabled(&self) -> bool {
+    self.config.schedule_enabled
+  }
+  fn format(&self) -> ScheduleFormat {
+    self.config.schedule_format
+  }
+  fn schedule(&self) -> &str {
+    &self.config.schedule
+  }
+  fn timezone(&self) -> &str {
+    &self.config.schedule_timezone
+  }
+}
+
+impl HasSchedule for &Action {
+  fn target(&self) -> ResourceTarget {
+    ResourceTarget::Action(self.id.clone())
+  }
+  fn enabled(&self) -> bool {
+    self.config.schedule_enabled
+  }
+  fn format(&self) -> ScheduleFormat {
+    self.config.schedule_format
+  }
+  fn schedule(&self) -> &str {
+    &self.config.schedule
+  }
+  fn timezone(&self) -> &str {
+    &self.config.schedule_timezone
+  }
+}

bin/core/src/startup.rs

@@ -0,0 +1,228 @@
+use std::str::FromStr;
+
+use futures::future::join_all;
+use komodo_client::{
+  api::write::{CreateBuilder, CreateServer},
+  entities::{
+    ResourceTarget,
+    builder::{PartialBuilderConfig, PartialServerBuilderConfig},
+    komodo_timestamp,
+    server::{PartialServerConfig, Server},
+    sync::ResourceSync,
+    update::Log,
+    user::system_user,
+  },
+};
+use mungos::{
+  find::find_collect,
+  mongodb::bson::{Document, doc, oid::ObjectId, to_document},
+};
+use resolver_api::Resolve;
+
+use crate::{
+  api::write::WriteArgs, config::core_config, helpers::random_string,
+  resource, state::db_client,
+};
+
+/// This function should be run on startup,
+/// after the db client has been initialized
+pub async fn on_startup() {
+  tokio::join!(
+    in_progress_update_cleanup(),
+    open_alert_cleanup(),
+    ensure_first_server_and_builder(),
+    clean_up_server_templates(),
+  );
+}
+
+async fn in_progress_update_cleanup() {
+  let log = Log::error(
+    "Komodo shutdown",
+    String::from(
+      "Komodo shutdown during execution. If this is a build, the builder may not have been terminated.",
+    ),
+  );
+  // This static log won't fail to serialize, unwrap ok.
+  let log = to_document(&log).unwrap();
+  if let Err(e) = db_client()
+    .updates
+    .update_many(
+      doc! { "status": "InProgress" },
+      doc! {
+        "$set": {
+          "status": "Complete",
+          "success": false,
+        },
+        "$push": {
+          "logs": log
+        }
+      },
+    )
+    .await
+  {
+    error!("failed to cleanup in progress updates on startup | {e:#}")
+  }
+}
+
+/// Run on startup, ensure open alerts pointing to invalid resources are closed.
+async fn open_alert_cleanup() {
+  let db = db_client();
+  let Ok(alerts) =
+    find_collect(&db.alerts, doc! { "resolved": false }, None)
+      .await
+      .inspect_err(|e| {
+        error!(
+          "failed to list all alerts for startup open alert cleanup | {e:?}"
+        )
+      })
+  else {
+    return;
+  };
+  let futures = alerts.into_iter().map(|alert| async move {
+    match alert.target {
+      ResourceTarget::Server(id) => {
+        resource::get::<Server>(&id)
+          .await
+          .is_err()
+          .then(|| ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok()).flatten()
+      }
+      ResourceTarget::ResourceSync(id) => {
+        resource::get::<ResourceSync>(&id)
+          .await
+          .is_err()
+          .then(|| ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok()).flatten()
+      }
+      // No other resources should have open alerts.
+      _ => ObjectId::from_str(&alert.id).inspect_err(|e| warn!("failed to clean up alert - id is invalid ObjectId | {e:?}")).ok(),
+    }
+  });
+  let to_update_ids = join_all(futures)
+    .await
+    .into_iter()
+    .flatten()
+    .collect::<Vec<_>>();
+  if let Err(e) = db
+    .alerts
+    .update_many(
+      doc! { "_id": { "$in": to_update_ids } },
+      doc! { "$set": {
+        "resolved": true,
+        "resolved_ts": komodo_timestamp()
+      } },
+    )
+    .await
+  {
+    error!(
+      "failed to clean up invalid open alerts on startup | {e:#}"
+    )
+  }
+}
+
+/// Ensures a default server / builder exists with the defined address
+async fn ensure_first_server_and_builder() {
+  let first_server = &core_config().first_server;
+  if first_server.is_empty() {
+    return;
+  }
+  let db = db_client();
+  let Ok(server) = db
+    .servers
+    .find_one(Document::new())
+    .await
+    .inspect_err(|e| error!("Failed to initialize 'first_server'. Failed to query db. {e:?}"))
+  else {
+    return;
+  };
+  let server = if let Some(server) = server {
+    server
+  } else {
+    match (CreateServer {
+      name: format!("server-{}", random_string(5)),
+      config: PartialServerConfig {
+        address: Some(first_server.to_string()),
+        enabled: Some(true),
+        ..Default::default()
+      },
+    })
+    .resolve(&WriteArgs {
+      user: system_user().to_owned(),
+    })
+    .await
+    {
+      Ok(server) => server,
+      Err(e) => {
+        error!(
+          "Failed to initialize 'first_server'. Failed to CreateServer. {:#}",
+          e.error
+        );
+        return;
+      }
+    }
+  };
+  let Ok(None) = db.builders
+    .find_one(Document::new()).await
+    .inspect_err(|e| error!("Failed to initialize 'first_builder' | Failed to query db | {e:?}")) else {
+      return;
+    };
+  if let Err(e) = (CreateBuilder {
+    name: String::from("local"),
+    config: PartialBuilderConfig::Server(
+      PartialServerBuilderConfig {
+        server_id: Some(server.id),
+      },
+    ),
+  })
+  .resolve(&WriteArgs {
+    user: system_user().to_owned(),
+  })
+  .await
+  {
+    error!(
+      "Failed to initialize 'first_builder' | Failed to CreateBuilder | {:#}",
+      e.error
+    );
+  }
+}
+
+/// v1.17.5 removes the ServerTemplate resource.
+/// References to this resource type need to be cleaned up
+/// to avoid type errors reading from the database.
+async fn clean_up_server_templates() {
+  let db = db_client();
+  tokio::join!(
+    async {
+      db.permissions
+        .delete_many(doc! {
+          "resource_target.type": "ServerTemplate",
+        })
+        .await
+        .expect(
+          "Failed to clean up server template permissions on db",
+        );
+    },
+    async {
+      db.updates
+        .delete_many(doc! { "target.type": "ServerTemplate" })
+        .await
+        .expect("Failed to clean up server template updates on db");
+    },
+    async {
+      db.users
+        .update_many(
+          Document::new(),
+          doc! { "$unset": { "recents.ServerTemplate": 1, "all.ServerTemplate": 1 } }
+        )
+        .await
+        .expect("Failed to clean up server template updates on db");
+    },
+    async {
+      db.user_groups
+        .update_many(
+          Document::new(),
+          doc! { "$unset": { "all.ServerTemplate": 1 } },
+        )
+        .await
+        .expect("Failed to clean up server template updates on db");
+    },
+  );
+}

bin/core/src/sync/deploy.rs

@@ -424,7 +424,7 @@ fn build_cache_for_deployment<'a>(
         let deployed_version = status
           .container
           .as_ref()
-          .and_then(|c| c.image.as_ref()?.split(':').last())
+          .and_then(|c| c.image.as_ref()?.split(':').next_back())
           .unwrap_or("0.0.0");
         match build_version_cache.get(build_id) {
           Some(version) if deployed_version != version => {

bin/core/src/sync/file.rs

@@ -270,9 +270,6 @@ pub fn extend_resources(
   resources
     .builders
     .extend(filter_by_tag(more.builders, match_tags));
-  resources
-    .server_templates
-    .extend(filter_by_tag(more.server_templates, match_tags));
   resources
     .resource_syncs
     .extend(filter_by_tag(more.resource_syncs, match_tags));

bin/core/src/sync/mod.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, str::FromStr};
 
 use anyhow::anyhow;
 use komodo_client::entities::{
-  ResourceTarget, ResourceTargetVariant,
+  ResourceTargetVariant,
   action::Action,
   alerter::Alerter,
   build::Build,
@@ -11,7 +11,6 @@ use komodo_client::entities::{
   procedure::Procedure,
   repo::Repo,
   server::Server,
-  server_template::ServerTemplate,
   stack::Stack,
   sync::ResourceSync,
   tag::Tag,
@@ -55,8 +54,6 @@ pub struct ToUpdateItem<T: Default> {
 }
 
 pub trait ResourceSyncTrait: ToToml + Sized {
-  fn resource_target(id: String) -> ResourceTarget;
-
   /// To exclude resource syncs with "file_contents" (they aren't compatible)
   fn include_resource(
     name: &String,
@@ -168,7 +165,6 @@ pub struct AllResourcesById {
   pub actions: HashMap<String, Action>,
   pub builders: HashMap<String, Builder>,
   pub alerters: HashMap<String, Alerter>,
-  pub templates: HashMap<String, ServerTemplate>,
   pub syncs: HashMap<String, ResourceSync>,
 }
 
@@ -212,10 +208,6 @@ impl AllResourcesById {
         id_to_tags, match_tags,
       )
       .await?,
-      templates: crate::resource::get_id_to_resource_map::<
-        ServerTemplate,
-      >(id_to_tags, match_tags)
-      .await?,
       syncs: crate::resource::get_id_to_resource_map::<ResourceSync>(
         id_to_tags, match_tags,
       )

bin/core/src/sync/resources.rs

@@ -4,7 +4,7 @@ use formatting::{Color, bold, colored, muted};
 use komodo_client::{
   api::execute::Execution,
   entities::{
-    ResourceTarget, ResourceTargetVariant,
+    ResourceTargetVariant,
     action::Action,
     alerter::Alerter,
     build::Build,
@@ -13,7 +13,6 @@ use komodo_client::{
     procedure::Procedure,
     repo::Repo,
     server::Server,
-    server_template::ServerTemplate,
     stack::Stack,
     sync::ResourceSync,
     tag::Tag,
@@ -40,10 +39,6 @@ use super::{
 };
 
 impl ResourceSyncTrait for Server {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Server(id)
-  }
-
   fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
@@ -56,10 +51,6 @@ impl ResourceSyncTrait for Server {
 impl ExecuteResourceSync for Server {}
 
 impl ResourceSyncTrait for Deployment {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Deployment(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -93,10 +84,6 @@ impl ResourceSyncTrait for Deployment {
 impl ExecuteResourceSync for Deployment {}
 
 impl ResourceSyncTrait for Stack {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Stack(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -116,10 +103,6 @@ impl ResourceSyncTrait for Stack {
 impl ExecuteResourceSync for Stack {}
 
 impl ResourceSyncTrait for Build {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Build(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -149,10 +132,6 @@ impl ResourceSyncTrait for Build {
 impl ExecuteResourceSync for Build {}
 
 impl ResourceSyncTrait for Repo {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Repo(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -179,10 +158,6 @@ impl ResourceSyncTrait for Repo {
 impl ExecuteResourceSync for Repo {}
 
 impl ResourceSyncTrait for Alerter {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Alerter(id)
-  }
-
   fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
@@ -195,10 +170,6 @@ impl ResourceSyncTrait for Alerter {
 impl ExecuteResourceSync for Alerter {}
 
 impl ResourceSyncTrait for Builder {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Builder(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -219,27 +190,7 @@ impl ResourceSyncTrait for Builder {
 
 impl ExecuteResourceSync for Builder {}
 
-impl ResourceSyncTrait for ServerTemplate {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::ServerTemplate(id)
-  }
-
-  fn get_diff(
-    original: Self::Config,
-    update: Self::PartialConfig,
-    _resources: &AllResourcesById,
-  ) -> anyhow::Result<Self::ConfigDiff> {
-    Ok(original.partial_diff(update))
-  }
-}
-
-impl ExecuteResourceSync for ServerTemplate {}
-
 impl ResourceSyncTrait for Action {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Action(id)
-  }
-
   fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
@@ -252,10 +203,6 @@ impl ResourceSyncTrait for Action {
 impl ExecuteResourceSync for Action {}
 
 impl ResourceSyncTrait for ResourceSync {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::ResourceSync(id)
-  }
-
   fn include_resource(
     name: &String,
     config: &Self::Config,
@@ -341,10 +288,6 @@ impl ResourceSyncTrait for ResourceSync {
 impl ExecuteResourceSync for ResourceSync {}
 
 impl ResourceSyncTrait for Procedure {
-  fn resource_target(id: String) -> ResourceTarget {
-    ResourceTarget::Procedure(id)
-  }
-
   fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
@@ -658,6 +601,7 @@ impl ResourceSyncTrait for Procedure {
               .map(|s| s.name.clone())
               .unwrap_or_default();
           }
+          Execution::BatchPullStack(_config) => {}
           Execution::StartStack(config) => {
             config.stack = resources
               .stacks

bin/core/src/sync/toml.rs

@@ -13,7 +13,6 @@ use komodo_client::{
     repo::Repo,
     resource::Resource,
     server::Server,
-    server_template::{PartialServerTemplateConfig, ServerTemplate},
     stack::Stack,
     sync::ResourceSync,
     tag::Tag,
@@ -349,25 +348,6 @@ impl ToToml for Repo {
   }
 }
 
-impl ToToml for ServerTemplate {
-  fn push_additional(
-    resource: ResourceToml<Self::PartialConfig>,
-    toml: &mut String,
-  ) {
-    let empty_params = match resource.config {
-      PartialServerTemplateConfig::Aws(config) => config.is_none(),
-      PartialServerTemplateConfig::Hetzner(config) => {
-        config.is_none()
-      }
-    };
-    if empty_params {
-      // toml_pretty will remove empty map
-      // but in this case its needed to deserialize the enums.
-      toml.push_str("\nparams = {}");
-    }
-  }
-}
-
 impl ToToml for Builder {
   fn replace_ids(
     resource: &mut Resource<Self::Config, Self::Info>,
@@ -747,6 +727,7 @@ impl ToToml for Procedure {
               .map(|r| &r.name)
               .unwrap_or(&String::new()),
           ),
+          Execution::BatchPullStack(_exec) => {}
           Execution::StartStack(exec) => exec.stack.clone_from(
             all
               .stacks

bin/core/src/sync/user_groups.rs

@@ -285,13 +285,6 @@ pub async fn get_updates_for_execution(
             .map(|b| b.name.clone())
             .unwrap_or_default()
         }
-        ResourceTarget::ServerTemplate(id) => {
-          *id = all_resources
-            .templates
-            .get(id)
-            .map(|b| b.name.clone())
-            .unwrap_or_default()
-        }
         ResourceTarget::ResourceSync(id) => {
           *id = all_resources
             .syncs
@@ -737,19 +730,6 @@ async fn expand_user_group_permissions(
             });
           expanded.extend(permissions);
         }
-        ResourceTargetVariant::ServerTemplate => {
-          let permissions = all_resources
-            .templates
-            .values()
-            .filter(|resource| regex.is_match(&resource.name))
-            .map(|resource| PermissionToml {
-              target: ResourceTarget::ServerTemplate(
-                resource.name.clone(),
-              ),
-              level: permission.level,
-            });
-          expanded.extend(permissions);
-        }
         ResourceTargetVariant::ResourceSync => {
           let permissions = all_resources
             .syncs
@@ -903,13 +883,6 @@ pub async fn convert_user_groups(
             .map(|r| r.name.clone())
             .unwrap_or_default()
         }
-        ResourceTarget::ServerTemplate(id) => {
-          *id = all
-            .templates
-            .get(id)
-            .map(|r| r.name.clone())
-            .unwrap_or_default()
-        }
         ResourceTarget::ResourceSync(id) => {
           *id = all
             .syncs

bin/core/src/ws.rs

@@ -1,209 +0,0 @@
-use anyhow::anyhow;
-use axum::{
-  Router,
-  extract::{
-    WebSocketUpgrade,
-    ws::{Message, WebSocket},
-  },
-  response::IntoResponse,
-  routing::get,
-};
-use futures::{SinkExt, StreamExt};
-use komodo_client::{
-  entities::{
-    ResourceTarget, permission::PermissionLevel, user::User,
-  },
-  ws::WsLoginMessage,
-};
-use serde_json::json;
-use serror::serialize_error;
-use tokio::select;
-use tokio_util::sync::CancellationToken;
-
-use crate::{
-  auth::{auth_api_key_check_enabled, auth_jwt_check_enabled},
-  helpers::{
-    channel::update_channel,
-    query::{get_user, get_user_permission_on_target},
-  },
-};
-
-pub fn router() -> Router {
-  Router::new().route("/update", get(ws_handler))
-}
-
-#[instrument(level = "debug")]
-async fn ws_handler(ws: WebSocketUpgrade) -> impl IntoResponse {
-  // get a reveiver for internal update messages.
-  let mut receiver = update_channel().receiver.resubscribe();
-
-  // handle http -> ws updgrade
-  ws.on_upgrade(|socket| async move {
-    let Some((socket, user)) = ws_login(socket).await else {
-      return
-    };
-
-    let (mut ws_sender, mut ws_reciever) = socket.split();
-
-    let cancel = CancellationToken::new();
-    let cancel_clone = cancel.clone();
-
-    tokio::spawn(async move {
-      loop {
-        // poll for updates off the receiver / await cancel.
-        let update = select! {
-          _ = cancel_clone.cancelled() => break,
-          update = receiver.recv() => {update.expect("failed to recv update msg")}
-        };
-
-        // before sending every update, verify user is still valid.
-        // kill the connection is user if found to be invalid.
-        let user = check_user_valid(&user.id).await;
-        let user = match user {
-          Err(e) => {
-            let _ = ws_sender
-              .send(Message::text(json!({ "type": "INVALID_USER", "msg": serialize_error(&e) }).to_string()))
-              .await;
-            let _ = ws_sender.close().await;
-            return;
-          },
-          Ok(user) => user,
-        };
-
-        // Only send if user has permission on the target resource.
-        if user_can_see_update(&user, &update.target).await.is_ok() {
-          let _ = ws_sender
-            .send(Message::text(serde_json::to_string(&update).unwrap()))
-            .await;
-        }
-      }
-    });
-
-    // Handle messages from the client.
-    // After login, only handles close message.
-    while let Some(msg) = ws_reciever.next().await {
-      match msg {
-        Ok(msg) => {
-          if let Message::Close(_) = msg {
-            cancel.cancel();
-            return;
-          }
-        }
-        Err(_) => {
-          cancel.cancel();
-          return;
-        }
-      }
-    }
-    })
-}
-
-#[instrument(level = "debug")]
-async fn ws_login(
-  mut socket: WebSocket,
-) -> Option<(WebSocket, User)> {
-  let login_msg = match socket.recv().await {
-    Some(Ok(Message::Text(login_msg))) => {
-      LoginMessage::Ok(login_msg.to_string())
-    }
-    Some(Ok(msg)) => {
-      LoginMessage::Err(format!("invalid login message: {msg:?}"))
-    }
-    Some(Err(e)) => {
-      LoginMessage::Err(format!("failed to get login message: {e:?}"))
-    }
-    None => {
-      LoginMessage::Err("failed to get login message".to_string())
-    }
-  };
-  let login_msg = match login_msg {
-    LoginMessage::Ok(login_msg) => login_msg,
-    LoginMessage::Err(msg) => {
-      let _ = socket.send(Message::text(msg)).await;
-      let _ = socket.close().await;
-      return None;
-    }
-  };
-  match WsLoginMessage::from_json_str(&login_msg) {
-    // Login using a jwt
-    Ok(WsLoginMessage::Jwt { jwt }) => {
-      match auth_jwt_check_enabled(&jwt).await {
-        Ok(user) => {
-          let _ = socket.send(Message::text("LOGGED_IN")).await;
-          Some((socket, user))
-        }
-        Err(e) => {
-          let _ = socket
-            .send(Message::text(format!(
-              "failed to authenticate user using jwt | {e:#}"
-            )))
-            .await;
-          let _ = socket.close().await;
-          None
-        }
-      }
-    }
-    // login using api keys
-    Ok(WsLoginMessage::ApiKeys { key, secret }) => {
-      match auth_api_key_check_enabled(&key, &secret).await {
-        Ok(user) => {
-          let _ = socket.send(Message::text("LOGGED_IN")).await;
-          Some((socket, user))
-        }
-        Err(e) => {
-          let _ = socket
-            .send(Message::text(format!(
-              "failed to authenticate user using api keys | {e:#}"
-            )))
-            .await;
-          let _ = socket.close().await;
-          None
-        }
-      }
-    }
-    Err(e) => {
-      let _ = socket
-        .send(Message::text(format!(
-          "failed to parse login message: {e:#}"
-        )))
-        .await;
-      let _ = socket.close().await;
-      None
-    }
-  }
-}
-
-enum LoginMessage {
-  /// The text message
-  Ok(String),
-  /// The err message
-  Err(String),
-}
-
-#[instrument(level = "debug")]
-async fn check_user_valid(user_id: &str) -> anyhow::Result<User> {
-  let user = get_user(user_id).await?;
-  if !user.enabled {
-    return Err(anyhow!("user not enabled"));
-  }
-  Ok(user)
-}
-
-#[instrument(level = "debug")]
-async fn user_can_see_update(
-  user: &User,
-  update_target: &ResourceTarget,
-) -> anyhow::Result<()> {
-  if user.admin {
-    return Ok(());
-  }
-  let permissions =
-    get_user_permission_on_target(user, update_target).await?;
-  if permissions > PermissionLevel::None {
-    Ok(())
-  } else {
-    Err(anyhow!(
-      "user does not have permissions on {update_target:?}"
-    ))
-  }
-}

bin/core/src/ws/container.rs

@@ -0,0 +1,81 @@
+use axum::{
+  extract::{Query, WebSocketUpgrade, ws::Message},
+  response::IntoResponse,
+};
+use futures::SinkExt;
+use komodo_client::{
+  api::terminal::ConnectContainerExecQuery,
+  entities::{permission::PermissionLevel, server::Server},
+};
+
+use crate::{
+  helpers::periphery_client, resource, ws::core_periphery_forward_ws,
+};
+
+#[instrument(name = "ConnectContainerExec", skip(ws))]
+pub async fn handler(
+  Query(ConnectContainerExecQuery {
+    server,
+    container,
+    shell,
+  }): Query<ConnectContainerExecQuery>,
+  ws: WebSocketUpgrade,
+) -> impl IntoResponse {
+  ws.on_upgrade(|socket| async move {
+    let Some((mut client_socket, user)) = super::ws_login(socket).await
+    else {
+      return;
+    };
+
+    let server = match resource::get_check_permissions::<Server>(
+      &server,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await
+    {
+      Ok(server) => server,
+      Err(e) => {
+        debug!("could not get server | {e:#}");
+        let _ =
+          client_socket.send(Message::text(format!("ERROR: {e:#}"))).await;
+        let _ = client_socket.close().await;
+        return;
+      }
+    };
+
+    let periphery = match periphery_client(&server) {
+      Ok(periphery) => periphery,
+      Err(e) => {
+        debug!("couldn't get periphery | {e:#}");
+        let _ =
+          client_socket.send(Message::text(format!("ERROR: {e:#}"))).await;
+        let _ = client_socket.close().await;
+        return;
+      }
+    };
+
+    trace!("connecting to periphery container exec websocket");
+
+    let periphery_socket = match periphery
+      .connect_container_exec(
+        container,
+        shell
+      )
+      .await
+    {
+      Ok(ws) => ws,
+      Err(e) => {
+        debug!("Failed connect to periphery container exec websocket | {e:#}");
+        let _ =
+          client_socket.send(Message::text(format!("ERROR: {e:#}"))).await;
+        let _ = client_socket.close().await;
+        return;
+      }
+    };
+
+    trace!("connected to periphery container exec websocket");
+
+    core_periphery_forward_ws(client_socket, periphery_socket).await
+  })
+}

bin/core/src/ws/mod.rs

@@ -0,0 +1,243 @@
+use crate::{
+  auth::{auth_api_key_check_enabled, auth_jwt_check_enabled},
+  helpers::query::get_user,
+};
+use anyhow::anyhow;
+use axum::{
+  Router,
+  extract::ws::{CloseFrame, Message, Utf8Bytes, WebSocket},
+  routing::get,
+};
+use futures::{SinkExt, StreamExt};
+use komodo_client::{entities::user::User, ws::WsLoginMessage};
+use tokio::net::TcpStream;
+use tokio_tungstenite::{
+  MaybeTlsStream, WebSocketStream, tungstenite,
+};
+use tokio_util::sync::CancellationToken;
+
+mod container;
+mod terminal;
+mod update;
+
+pub fn router() -> Router {
+  Router::new()
+    .route("/update", get(update::handler))
+    .route("/terminal", get(terminal::handler))
+    .route("/container", get(container::handler))
+}
+
+#[instrument(level = "debug")]
+async fn ws_login(
+  mut socket: WebSocket,
+) -> Option<(WebSocket, User)> {
+  let login_msg = match socket.recv().await {
+    Some(Ok(Message::Text(login_msg))) => {
+      LoginMessage::Ok(login_msg.to_string())
+    }
+    Some(Ok(msg)) => {
+      LoginMessage::Err(format!("invalid login message: {msg:?}"))
+    }
+    Some(Err(e)) => {
+      LoginMessage::Err(format!("failed to get login message: {e:?}"))
+    }
+    None => {
+      LoginMessage::Err("failed to get login message".to_string())
+    }
+  };
+  let login_msg = match login_msg {
+    LoginMessage::Ok(login_msg) => login_msg,
+    LoginMessage::Err(msg) => {
+      let _ = socket.send(Message::text(msg)).await;
+      let _ = socket.close().await;
+      return None;
+    }
+  };
+  match WsLoginMessage::from_json_str(&login_msg) {
+    // Login using a jwt
+    Ok(WsLoginMessage::Jwt { jwt }) => {
+      match auth_jwt_check_enabled(&jwt).await {
+        Ok(user) => {
+          let _ = socket.send(Message::text("LOGGED_IN")).await;
+          Some((socket, user))
+        }
+        Err(e) => {
+          let _ = socket
+            .send(Message::text(format!(
+              "failed to authenticate user using jwt | {e:#}"
+            )))
+            .await;
+          let _ = socket.close().await;
+          None
+        }
+      }
+    }
+    // login using api keys
+    Ok(WsLoginMessage::ApiKeys { key, secret }) => {
+      match auth_api_key_check_enabled(&key, &secret).await {
+        Ok(user) => {
+          let _ = socket.send(Message::text("LOGGED_IN")).await;
+          Some((socket, user))
+        }
+        Err(e) => {
+          let _ = socket
+            .send(Message::text(format!(
+              "failed to authenticate user using api keys | {e:#}"
+            )))
+            .await;
+          let _ = socket.close().await;
+          None
+        }
+      }
+    }
+    Err(e) => {
+      let _ = socket
+        .send(Message::text(format!(
+          "failed to parse login message: {e:#}"
+        )))
+        .await;
+      let _ = socket.close().await;
+      None
+    }
+  }
+}
+
+enum LoginMessage {
+  /// The text message
+  Ok(String),
+  /// The err message
+  Err(String),
+}
+
+#[instrument(level = "debug")]
+async fn check_user_valid(user_id: &str) -> anyhow::Result<User> {
+  let user = get_user(user_id).await?;
+  if !user.enabled {
+    return Err(anyhow!("user not enabled"));
+  }
+  Ok(user)
+}
+
+async fn core_periphery_forward_ws(
+  client_socket: axum::extract::ws::WebSocket,
+  periphery_socket: WebSocketStream<MaybeTlsStream<TcpStream>>,
+) {
+  let (mut periphery_send, mut periphery_receive) =
+    periphery_socket.split();
+  let (mut core_send, mut core_receive) = client_socket.split();
+  let cancel = CancellationToken::new();
+
+  trace!("starting ws exchange");
+
+  let core_to_periphery = async {
+    loop {
+      let res = tokio::select! {
+        res = core_receive.next() => res,
+        _ = cancel.cancelled() => {
+          trace!("core to periphery read: cancelled from inside");
+          break;
+        }
+      };
+      match res {
+        Some(Ok(msg)) => {
+          if let Err(e) =
+            periphery_send.send(axum_to_tungstenite(msg)).await
+          {
+            debug!(
+              "Failed to send terminal message | {e:?}",
+            );
+            cancel.cancel();
+            break;
+          };
+        }
+        Some(Err(_e)) => {
+          cancel.cancel();
+          break;
+        }
+        None => {
+          cancel.cancel();
+          break;
+        }
+      }
+    }
+  };
+
+  let periphery_to_core = async {
+    loop {
+      let res = tokio::select! {
+        res = periphery_receive.next() => res,
+        _ = cancel.cancelled() => {
+          trace!("periphery to core read: cancelled from inside");
+          break;
+        }
+      };
+      match res {
+        Some(Ok(msg)) => {
+          if let Err(e) =
+            core_send.send(tungstenite_to_axum(msg)).await
+          {
+            debug!("{e:?}");
+            cancel.cancel();
+            break;
+          };
+        }
+        Some(Err(e)) => {
+          let _ = core_send
+              .send(Message::text(format!(
+                "ERROR: Failed to receive message from periphery | {e:?}"
+              )))
+              .await;
+          cancel.cancel();
+          break;
+        }
+        None => {
+          let _ = core_send.send(Message::text("STREAM EOF")).await;
+          cancel.cancel();
+          break;
+        }
+      }
+    }
+  };
+
+  tokio::join!(core_to_periphery, periphery_to_core);
+}
+
+fn axum_to_tungstenite(msg: Message) -> tungstenite::Message {
+  match msg {
+    Message::Text(text) => tungstenite::Message::Text(
+      // TODO: improve this conversion cost from axum ws library
+      tungstenite::Utf8Bytes::from(text.to_string()),
+    ),
+    Message::Binary(bytes) => tungstenite::Message::Binary(bytes),
+    Message::Ping(bytes) => tungstenite::Message::Ping(bytes),
+    Message::Pong(bytes) => tungstenite::Message::Pong(bytes),
+    Message::Close(close_frame) => {
+      tungstenite::Message::Close(close_frame.map(|cf| {
+        tungstenite::protocol::CloseFrame {
+          code: cf.code.into(),
+          reason: tungstenite::Utf8Bytes::from(cf.reason.to_string()),
+        }
+      }))
+    }
+  }
+}
+
+fn tungstenite_to_axum(msg: tungstenite::Message) -> Message {
+  match msg {
+    tungstenite::Message::Text(text) => {
+      Message::Text(Utf8Bytes::from(text.to_string()))
+    }
+    tungstenite::Message::Binary(bytes) => Message::Binary(bytes),
+    tungstenite::Message::Ping(bytes) => Message::Ping(bytes),
+    tungstenite::Message::Pong(bytes) => Message::Pong(bytes),
+    tungstenite::Message::Close(close_frame) => {
+      Message::Close(close_frame.map(|cf| CloseFrame {
+        code: cf.code.into(),
+        reason: Utf8Bytes::from(cf.reason.to_string()),
+      }))
+    }
+    tungstenite::Message::Frame(_) => {
+      unreachable!()
+    }
+  }
+}

bin/core/src/ws/terminal.rs

@@ -0,0 +1,78 @@
+use axum::{
+  extract::{Query, WebSocketUpgrade, ws::Message},
+  response::IntoResponse,
+};
+use futures::SinkExt;
+use komodo_client::{
+  api::terminal::ConnectTerminalQuery,
+  entities::{permission::PermissionLevel, server::Server},
+};
+
+use crate::{
+  helpers::periphery_client, resource, ws::core_periphery_forward_ws,
+};
+
+#[instrument(name = "ConnectTerminal", skip(ws))]
+pub async fn handler(
+  Query(ConnectTerminalQuery { server, terminal }): Query<
+    ConnectTerminalQuery,
+  >,
+  ws: WebSocketUpgrade,
+) -> impl IntoResponse {
+  ws.on_upgrade(|socket| async move {
+    let Some((mut client_socket, user)) =
+      super::ws_login(socket).await
+    else {
+      return;
+    };
+
+    let server = match resource::get_check_permissions::<Server>(
+      &server,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await
+    {
+      Ok(server) => server,
+      Err(e) => {
+        debug!("could not get server | {e:#}");
+        let _ = client_socket
+          .send(Message::text(format!("ERROR: {e:#}")))
+          .await;
+        let _ = client_socket.close().await;
+        return;
+      }
+    };
+
+    let periphery = match periphery_client(&server) {
+      Ok(periphery) => periphery,
+      Err(e) => {
+        debug!("couldn't get periphery | {e:#}");
+        let _ = client_socket
+          .send(Message::text(format!("ERROR: {e:#}")))
+          .await;
+        let _ = client_socket.close().await;
+        return;
+      }
+    };
+
+    trace!("connecting to periphery terminal websocket");
+
+    let periphery_socket =
+      match periphery.connect_terminal(terminal).await {
+        Ok(ws) => ws,
+        Err(e) => {
+          debug!("Failed connect to periphery terminal | {e:#}");
+          let _ = client_socket
+            .send(Message::text(format!("ERROR: {e:#}")))
+            .await;
+          let _ = client_socket.close().await;
+          return;
+        }
+      };
+
+    trace!("connected to periphery terminal websocket");
+
+    core_periphery_forward_ws(client_socket, periphery_socket).await
+  })
+}

bin/core/src/ws/update.rs

@@ -0,0 +1,102 @@
+use anyhow::anyhow;
+use axum::{
+  extract::{WebSocketUpgrade, ws::Message},
+  response::IntoResponse,
+};
+use futures::{SinkExt, StreamExt};
+use komodo_client::entities::{
+  ResourceTarget, permission::PermissionLevel, user::User,
+};
+use serde_json::json;
+use serror::serialize_error;
+use tokio::select;
+use tokio_util::sync::CancellationToken;
+
+use crate::helpers::{
+  channel::update_channel, query::get_user_permission_on_target,
+};
+
+#[instrument(level = "debug")]
+pub async fn handler(ws: WebSocketUpgrade) -> impl IntoResponse {
+  // get a reveiver for internal update messages.
+  let mut receiver = update_channel().receiver.resubscribe();
+
+  // handle http -> ws updgrade
+  ws.on_upgrade(|socket| async move {
+    let Some((socket, user)) = super::ws_login(socket).await else {
+      return
+    };
+
+    let (mut ws_sender, mut ws_reciever) = socket.split();
+
+    let cancel = CancellationToken::new();
+    let cancel_clone = cancel.clone();
+
+    tokio::spawn(async move {
+      loop {
+        // poll for updates off the receiver / await cancel.
+        let update = select! {
+          _ = cancel_clone.cancelled() => break,
+          update = receiver.recv() => {update.expect("failed to recv update msg")}
+        };
+
+        // before sending every update, verify user is still valid.
+        // kill the connection is user if found to be invalid.
+        let user = super::check_user_valid(&user.id).await;
+        let user = match user {
+          Err(e) => {
+            let _ = ws_sender
+              .send(Message::text(json!({ "type": "INVALID_USER", "msg": serialize_error(&e) }).to_string()))
+              .await;
+            let _ = ws_sender.close().await;
+            return;
+          },
+          Ok(user) => user,
+        };
+
+        // Only send if user has permission on the target resource.
+        if user_can_see_update(&user, &update.target).await.is_ok() {
+          let _ = ws_sender
+            .send(Message::text(serde_json::to_string(&update).unwrap()))
+            .await;
+        }
+      }
+    });
+
+    // Handle messages from the client.
+    // After login, only handles close message.
+    while let Some(msg) = ws_reciever.next().await {
+      match msg {
+        Ok(msg) => {
+          if let Message::Close(_) = msg {
+            cancel.cancel();
+            return;
+          }
+        }
+        Err(_) => {
+          cancel.cancel();
+          return;
+        }
+      }
+    }
+    })
+}
+
+#[instrument(level = "debug")]
+async fn user_can_see_update(
+  user: &User,
+  update_target: &ResourceTarget,
+) -> anyhow::Result<()> {
+  if user.admin {
+    return Ok(());
+  }
+  let permissions =
+    get_user_permission_on_target(user, update_target).await?;
+  if permissions > PermissionLevel::None {
+    Ok(())
+  } else {
+    Err(anyhow!(
+      "user does not have permissions on {update_target:?}"
+    ))
+  }
+}

bin/core/starship.toml

@@ -0,0 +1,67 @@
+## This is used to customize the shell prompt in Periphery container for Terminals
+
+"$schema" = 'https://starship.rs/config-schema.json'
+
+add_newline = true
+
+format = "$time$hostname$container$memory_usage$all"
+
+[character]
+success_symbol = "[❯](bright-blue bold)"
+error_symbol = "[❯](bright-red bold)"
+
+[package]
+disabled = true
+
+[time]
+format = "[❯$time](white dimmed) "
+time_format = "%l:%M %p"
+utc_time_offset = '-5'
+disabled = true
+
+[username]
+format = "[❯ $user]($style) "
+style_user = "bright-green"
+show_always = true
+
+[hostname]
+format = "[❯ $hostname]($style) "
+style = "bright-blue"
+ssh_only = false
+
+[directory]
+format = "[❯ $path]($style)[$read_only]($read_only_style) "
+style = "bright-cyan"
+
+[git_branch]
+format = "[❯ $symbol$branch(:$remote_branch)]($style) "
+style = "bright-purple"
+
+[git_status]
+style = "bright-purple"
+
+[rust]
+format = "[❯ $symbol($version )]($style)"
+symbol = "rustc "
+style = "bright-red"
+
+[nodejs]
+format = "[❯ $symbol($version )]($style)"
+symbol = "nodejs "
+style = "bright-red"
+
+[memory_usage]
+format = "[❯ mem ${ram} ${ram_pct}]($style) "
+threshold = -1
+style = "white"
+
+[cmd_duration]
+format = "[❯ $duration]($style)"
+style = "bright-yellow"
+
+[container]
+format = "[❯ 🦎 core container ]($style)"
+style = "bright-green"
+
+[aws]
+disabled = true

bin/periphery/Cargo.toml

@@ -33,9 +33,13 @@ resolver_api.workspace = true
 run_command.workspace = true
 svi.workspace = true
 # external
+pin-project-lite.workspace = true
+tokio-stream.workspace = true
+portable-pty.workspace = true
 axum-server.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
+tokio-util.workspace = true
 futures.workspace = true
 tracing.workspace = true
 bollard.workspace = true
@@ -45,7 +49,9 @@ anyhow.workspace = true
 rustls.workspace = true
 tokio.workspace = true
 serde.workspace = true
+bytes.workspace = true
 axum.workspace = true
 clap.workspace = true
 envy.workspace = true
 uuid.workspace = true
+rand.workspace = true

bin/periphery/aio.Dockerfile

@@ -1,6 +1,6 @@
 ## All in one, multi stage compile + runtime Docker build for your architecture.
 
-FROM rust:1.85.1-bullseye AS builder
+FROM rust:1.86.0-bullseye AS builder
 
 WORKDIR /builder
 COPY Cargo.toml Cargo.lock ./
@@ -15,6 +15,7 @@ RUN cargo build -p komodo_periphery --release
 # Final Image
 FROM debian:bullseye-slim
 
+COPY ./bin/periphery/starship.toml /config/starship.toml
 COPY ./bin/periphery/debian-deps.sh .
 RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 

bin/periphery/debian-deps.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
+
+## Periphery deps installer
+
 apt-get update
 apt-get install -y git curl wget ca-certificates
+
 install -m 0755 -d /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
 chmod a+r /etc/apt/keyrings/docker.asc
@@ -15,4 +19,10 @@ apt-get update
 # apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 apt-get install -y docker-ce-cli docker-buildx-plugin docker-compose-plugin
 
-rm -rf /var/lib/apt/lists/*
+rm -rf /var/lib/apt/lists/*
+
+# Starship prompt
+curl -sS https://starship.rs/install.sh | sh -s -- --yes --bin-dir /usr/local/bin
+echo 'export STARSHIP_CONFIG=/config/starship.toml' >> /root/.bashrc
+echo 'eval "$(starship init bash)"' >> /root/.bashrc
+

bin/periphery/multi-arch.Dockerfile

@@ -12,6 +12,7 @@ FROM ${AARCH64_BINARIES} AS aarch64
 
 FROM debian:bullseye-slim
 
+COPY ./bin/periphery/starship.toml /config/starship.toml
 COPY ./bin/periphery/debian-deps.sh .
 RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 

bin/periphery/single-arch.Dockerfile

@@ -8,10 +8,10 @@ FROM ${BINARIES_IMAGE} AS binaries
 
 FROM debian:bullseye-slim
 
+COPY ./bin/periphery/starship.toml /config/starship.toml
 COPY ./bin/periphery/debian-deps.sh .
 RUN sh ./debian-deps.sh && rm ./debian-deps.sh
 
-WORKDIR /app
 COPY --from=binaries /periphery /usr/local/bin/periphery
 
 EXPOSE 8120

bin/periphery/src/api/build.rs

@@ -46,7 +46,7 @@ impl Resolve<super::Args> for GetDockerfileContentsOnHost {
     } = self;
 
     let root =
-      periphery_config().build_dir.join(to_komodo_name(&name));
+      periphery_config().build_dir().join(to_komodo_name(&name));
     let build_dir =
       root.join(&build_path).components().collect::<PathBuf>();
 
@@ -91,7 +91,7 @@ impl Resolve<super::Args> for WriteDockerfileContentsToHost {
       contents,
     } = self;
     let full_path = periphery_config()
-      .build_dir
+      .build_dir()
       .join(to_komodo_name(&name))
       .join(&build_path)
       .join(dockerfile_path)
@@ -180,7 +180,7 @@ impl Resolve<super::Args> for build::Build {
     let name = to_komodo_name(name);
 
     let build_path =
-      periphery_config().build_dir.join(&name).join(build_path);
+      periphery_config().build_dir().join(&name).join(build_path);
     let dockerfile_path = optional_string(dockerfile_path)
       .unwrap_or("Dockerfile".to_owned());
 
@@ -248,7 +248,7 @@ impl Resolve<super::Args> for build::Build {
       } {
         let success = log.success;
         logs.push(log);
-        if success {
+        if !success {
           return Ok(logs);
         }
       };

bin/periphery/src/api/compose.rs

@@ -138,7 +138,7 @@ impl Resolve<super::Args> for GetComposeContentsOnHost {
       file_paths,
     } = self;
     let root =
-      periphery_config().stack_dir.join(to_komodo_name(&name));
+      periphery_config().stack_dir().join(to_komodo_name(&name));
     let run_directory =
       root.join(&run_directory).components().collect::<PathBuf>();
 
@@ -196,7 +196,7 @@ impl Resolve<super::Args> for WriteComposeContentsToHost {
       contents,
     } = self;
     let file_path = periphery_config()
-      .stack_dir
+      .stack_dir()
       .join(to_komodo_name(&name))
       .join(&run_directory)
       .join(file_path)

bin/periphery/src/api/git.rs

@@ -20,7 +20,7 @@ impl Resolve<super::Args> for GetLatestCommit {
   ) -> serror::Result<LatestCommit> {
     let repo_path = match self.path {
       Some(p) => PathBuf::from(p),
-      None => periphery_config().repo_dir.join(self.name),
+      None => periphery_config().repo_dir().join(self.name),
     };
     if !repo_path.is_dir() {
       return Err(
@@ -70,13 +70,13 @@ impl Resolve<super::Args> for CloneRepo {
       ),
     };
     let parent_dir = if args.is_build {
-      &periphery_config().build_dir
+      periphery_config().build_dir()
     } else {
-      &periphery_config().repo_dir
+      periphery_config().repo_dir()
     };
     git::clone(
       args,
-      parent_dir,
+      &parent_dir,
       token,
       &environment,
       &env_file_path,
@@ -140,13 +140,13 @@ impl Resolve<super::Args> for PullRepo {
       ),
     };
     let parent_dir = if args.is_build {
-      &periphery_config().build_dir
+      periphery_config().build_dir()
     } else {
-      &periphery_config().repo_dir
+      periphery_config().repo_dir()
     };
     git::pull(
       args,
-      parent_dir,
+      &parent_dir,
       token,
       &environment,
       &env_file_path,
@@ -210,13 +210,13 @@ impl Resolve<super::Args> for PullOrCloneRepo {
       ),
     };
     let parent_dir = if args.is_build {
-      &periphery_config().build_dir
+      periphery_config().build_dir()
     } else {
-      &periphery_config().repo_dir
+      periphery_config().repo_dir()
     };
     git::pull_or_clone(
       args,
-      parent_dir,
+      &parent_dir,
       token,
       &environment,
       &env_file_path,
@@ -252,11 +252,10 @@ impl Resolve<super::Args> for RenameRepo {
       curr_name,
       new_name,
     } = self;
-    let renamed = fs::rename(
-      periphery_config().repo_dir.join(&curr_name),
-      periphery_config().repo_dir.join(&new_name),
-    )
-    .await;
+    let repo_dir = periphery_config().repo_dir();
+    let renamed =
+      fs::rename(repo_dir.join(&curr_name), repo_dir.join(&new_name))
+        .await;
     let msg = match renamed {
       Ok(_) => String::from("Renamed Repo directory on Server"),
       Err(_) => format!("No Repo cloned at {curr_name} to rename"),
@@ -274,9 +273,9 @@ impl Resolve<super::Args> for DeleteRepo {
     // If using custom clone path, it will be passed by core instead of name.
     // So the join will resolve to just the absolute path.
     let root = if is_build {
-      &periphery_config().build_dir
+      periphery_config().build_dir()
     } else {
-      &periphery_config().repo_dir
+      periphery_config().repo_dir()
     };
     let full_path = root.join(&name);
     let deleted =

bin/periphery/src/api/mod.rs

@@ -8,11 +8,8 @@ use komodo_client::entities::{
   update::Log,
 };
 use periphery_client::api::{
-  GetDockerLists, GetDockerListsResponse, GetHealth,
-  GetHealthResponse, GetVersion, GetVersionResponse,
-  ListDockerRegistries, ListGitProviders, ListSecrets, PruneSystem,
-  RunCommand, build::*, compose::*, container::*, git::*, image::*,
-  network::*, stats::*, volume::*,
+  build::*, compose::*, container::*, git::*, image::*, network::*,
+  stats::*, terminal::*, volume::*, *,
 };
 use resolver_api::Resolve;
 use response::Response;
@@ -27,9 +24,13 @@ mod deploy;
 mod git;
 mod image;
 mod network;
+mod router;
 mod stats;
+mod terminal;
 mod volume;
 
+pub use router::router;
+
 pub struct Args;
 
 #[derive(
@@ -136,6 +137,13 @@ pub enum PeripheryRequest {
 
   // All in one (Write)
   PruneSystem(PruneSystem),
+
+  // Terminal
+  ListTerminals(ListTerminals),
+  CreateTerminal(CreateTerminal),
+  DeleteTerminal(DeleteTerminal),
+  DeleteAllTerminals(DeleteAllTerminals),
+  CreateTerminalAuthToken(CreateTerminalAuthToken),
 }
 
 //

bin/periphery/src/api/router.rs

@@ -8,7 +8,7 @@ use axum::{
   http::{Request, StatusCode},
   middleware::{self, Next},
   response::Response,
-  routing::post,
+  routing::{get, post},
 };
 use derive_variants::ExtractVariant;
 use resolver_api::Resolve;
@@ -19,9 +19,27 @@ use crate::config::periphery_config;
 
 pub fn router() -> Router {
   Router::new()
-    .route("/", post(handler))
+    .merge(
+      Router::new()
+        .route("/", post(handler))
+        .layer(middleware::from_fn(guard_request_by_passkey)),
+    )
+    .nest(
+      "/terminal",
+      Router::new()
+        .route("/", get(super::terminal::connect_terminal))
+        .route(
+          "/container",
+          get(super::terminal::connect_container_exec),
+        )
+        .nest(
+          "/execute",
+          Router::new()
+            .route("/", post(super::terminal::execute_terminal))
+            .layer(middleware::from_fn(guard_request_by_passkey)),
+        ),
+    )
     .layer(middleware::from_fn(guard_request_by_ip))
-    .layer(middleware::from_fn(guard_request_by_passkey))
 }
 
 async fn handler(

bin/periphery/src/api/terminal.rs

@@ -0,0 +1,441 @@
+use std::{collections::HashMap, sync::OnceLock, task::Poll};
+
+use anyhow::{Context, anyhow};
+use axum::{
+  extract::{
+    Query, WebSocketUpgrade,
+    ws::{Message, Utf8Bytes},
+  },
+  http::StatusCode,
+  response::Response,
+};
+use bytes::Bytes;
+use futures::{SinkExt, Stream, StreamExt, TryStreamExt};
+use komodo_client::{
+  api::write::TerminalRecreateMode,
+  entities::{
+    KOMODO_EXIT_CODE, NoData, komodo_timestamp, server::TerminalInfo,
+  },
+};
+use periphery_client::api::terminal::*;
+use pin_project_lite::pin_project;
+use rand::Rng;
+use resolver_api::Resolve;
+use serror::{AddStatusCodeError, Json};
+use tokio_util::sync::CancellationToken;
+
+use crate::{config::periphery_config, terminal::*};
+
+impl Resolve<super::Args> for ListTerminals {
+  #[instrument(name = "ListTerminals", level = "debug")]
+  async fn resolve(
+    self,
+    _: &super::Args,
+  ) -> serror::Result<Vec<TerminalInfo>> {
+    clean_up_terminals().await;
+    Ok(list_terminals().await)
+  }
+}
+
+impl Resolve<super::Args> for CreateTerminal {
+  #[instrument(name = "CreateTerminal", level = "debug")]
+  async fn resolve(self, _: &super::Args) -> serror::Result<NoData> {
+    if periphery_config().disable_terminals {
+      return Err(
+        anyhow!("Terminals are disabled in the periphery config")
+          .status_code(StatusCode::FORBIDDEN),
+      );
+    }
+    create_terminal(self.name, self.command, self.recreate)
+      .await
+      .map(|_| NoData {})
+      .map_err(Into::into)
+  }
+}
+
+impl Resolve<super::Args> for DeleteTerminal {
+  #[instrument(name = "DeleteTerminal", level = "debug")]
+  async fn resolve(self, _: &super::Args) -> serror::Result<NoData> {
+    delete_terminal(&self.terminal).await;
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<super::Args> for DeleteAllTerminals {
+  #[instrument(name = "DeleteAllTerminals", level = "debug")]
+  async fn resolve(self, _: &super::Args) -> serror::Result<NoData> {
+    delete_all_terminals().await;
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<super::Args> for CreateTerminalAuthToken {
+  #[instrument(name = "CreateTerminalAuthToken", level = "debug")]
+  async fn resolve(
+    self,
+    _: &super::Args,
+  ) -> serror::Result<CreateTerminalAuthTokenResponse> {
+    Ok(CreateTerminalAuthTokenResponse {
+      token: auth_tokens().create_auth_token(),
+    })
+  }
+}
+
+/// Tokens valid for 3 seconds
+const TOKEN_VALID_FOR_MS: i64 = 3_000;
+
+fn auth_tokens() -> &'static AuthTokens {
+  static AUTH_TOKENS: OnceLock<AuthTokens> = OnceLock::new();
+  AUTH_TOKENS.get_or_init(Default::default)
+}
+
+#[derive(Default)]
+struct AuthTokens {
+  map: std::sync::Mutex<HashMap<String, i64>>,
+}
+
+impl AuthTokens {
+  pub fn create_auth_token(&self) -> String {
+    let mut lock = self.map.lock().unwrap();
+    // clear out any old tokens here (prevent unbounded growth)
+    let ts = komodo_timestamp();
+    lock.retain(|_, valid_until| *valid_until > ts);
+    let token: String = rand::rng()
+      .sample_iter(&rand::distr::Alphanumeric)
+      .take(30)
+      .map(char::from)
+      .collect();
+    lock.insert(token.clone(), ts + TOKEN_VALID_FOR_MS);
+    token
+  }
+
+  pub fn check_token(&self, token: String) -> serror::Result<()> {
+    let Some(valid_until) = self.map.lock().unwrap().remove(&token)
+    else {
+      return Err(
+        anyhow!("Terminal auth token not found")
+          .status_code(StatusCode::UNAUTHORIZED),
+      );
+    };
+    if komodo_timestamp() <= valid_until {
+      Ok(())
+    } else {
+      Err(
+        anyhow!("Terminal token is expired")
+          .status_code(StatusCode::UNAUTHORIZED),
+      )
+    }
+  }
+}
+
+pub async fn connect_terminal(
+  Query(query): Query<ConnectTerminalQuery>,
+  ws: WebSocketUpgrade,
+) -> serror::Result<Response> {
+  if periphery_config().disable_terminals {
+    return Err(
+      anyhow!("Terminals are disabled in the periphery config")
+        .status_code(StatusCode::FORBIDDEN),
+    );
+  }
+  handle_terminal_websocket(query, ws).await
+}
+
+pub async fn connect_container_exec(
+  Query(ConnectContainerExecQuery {
+    token,
+    container,
+    shell,
+  }): Query<ConnectContainerExecQuery>,
+  ws: WebSocketUpgrade,
+) -> serror::Result<Response> {
+  if periphery_config().disable_container_exec {
+    return Err(
+      anyhow!("Container exec is disabled in the periphery config")
+        .into(),
+    );
+  }
+  if container.contains("&&") || shell.contains("&&") {
+    return Err(
+      anyhow!(
+        "The use of '&&' is forbidden in the container name or shell"
+      )
+      .into(),
+    );
+  }
+  // Create (recreate if shell changed)
+  create_terminal(
+    container.clone(),
+    format!("docker exec -it {container} {shell}"),
+    TerminalRecreateMode::DifferentCommand,
+  )
+  .await
+  .context("Failed to create terminal for container exec")?;
+
+  handle_terminal_websocket(
+    ConnectTerminalQuery {
+      token,
+      terminal: container,
+    },
+    ws,
+  )
+  .await
+}
+
+async fn handle_terminal_websocket(
+  ConnectTerminalQuery { token, terminal }: ConnectTerminalQuery,
+  ws: WebSocketUpgrade,
+) -> serror::Result<Response> {
+  // Auth the connection with single use token
+  auth_tokens().check_token(token)?;
+
+  clean_up_terminals().await;
+  let terminal = get_terminal(&terminal).await?;
+
+  Ok(ws.on_upgrade(|mut socket| async move {
+    let init_res = async {
+      let (a, b) = terminal.history.bytes_parts();
+      if !a.is_empty() {
+        socket.send(Message::Binary(a)).await.context("Failed to send history part a")?;
+      }
+      if !b.is_empty() {
+        socket.send(Message::Binary(b)).await.context("Failed to send history part b")?;
+      }
+      anyhow::Ok(())
+    }.await;
+
+    if let Err(e) = init_res {
+      let _ = socket.send(Message::Text(format!("ERROR: {e:#}").into())).await;
+      let _ = socket.close().await;
+      return;
+    }
+
+    let (mut ws_write, mut ws_read) = socket.split();
+
+    let cancel = CancellationToken::new();
+
+    let ws_read = async {
+      loop {
+        let res = tokio::select! {
+          res = ws_read.next() => res,
+          _ = terminal.cancel.cancelled() => {
+            trace!("ws read: cancelled from outside");
+            break
+          },
+          _ = cancel.cancelled() => {
+            trace!("ws read: cancelled from inside");
+            break;
+          }
+        };
+        match res {
+          Some(Ok(Message::Binary(bytes)))
+            if bytes.first() == Some(&0x00) =>
+          {
+            // println!("Got ws read bytes - for stdin");
+            if let Err(e) = terminal.stdin.send(StdinMsg::Bytes(
+              Bytes::copy_from_slice(&bytes[1..]),
+            )).await {
+              debug!("WS -> PTY channel send error: {e:}");
+              terminal.cancel();
+              break;
+            };
+          }
+          Some(Ok(Message::Binary(bytes)))
+            if bytes.first() == Some(&0xFF) =>
+          {
+            // println!("Got ws read bytes - for resize");
+            if let Ok(dimensions) =
+              serde_json::from_slice::<ResizeDimensions>(&bytes[1..])
+            {
+              if let Err(e) =
+                terminal.stdin.send(StdinMsg::Resize(dimensions)).await
+              {
+                debug!("WS -> PTY channel send error: {e:}");
+                terminal.cancel();
+                break;
+              };
+            }
+          }
+          Some(Ok(Message::Text(text))) => {
+            trace!("Got ws read text");
+            if let Err(e) =
+              terminal.stdin.send(StdinMsg::Bytes(Bytes::from(text))).await
+            {
+              debug!("WS -> PTY channel send error: {e:?}");
+              terminal.cancel();
+              break;
+            };
+          }
+          Some(Ok(Message::Close(_))) => {
+            debug!("got ws read close");
+            cancel.cancel();
+            break;
+          }
+          Some(Ok(_)) => {
+            // Do nothing (ping, non-prefixed bytes, etc.)
+          }
+          Some(Err(e)) => {
+            debug!("Got ws read error: {e:?}");
+            cancel.cancel();
+            break;
+          }
+          None => {
+            debug!("Got ws read none");
+            cancel.cancel();
+            break;
+          }
+        }
+      }
+    };
+
+    let ws_write = async {
+      let mut stdout = terminal.stdout.resubscribe();
+      loop {
+        let res = tokio::select! {
+          res = stdout.recv() => res.context("Failed to get message over stdout receiver"),
+          _ = terminal.cancel.cancelled() => {
+            trace!("ws write: cancelled from outside");
+            let _ = ws_write.send(Message::Text(Utf8Bytes::from_static("PTY KILLED"))).await;
+            if let Err(e) = ws_write.close().await {
+              debug!("Failed to close ws: {e:?}");
+            };
+            break
+          },
+          _ = cancel.cancelled() => {
+            let _ = ws_write.send(Message::Text(Utf8Bytes::from_static("WS KILLED"))).await;
+            if let Err(e) = ws_write.close().await {
+              debug!("Failed to close ws: {e:?}");
+            };
+            break
+          }
+        };
+        match res {
+          Ok(bytes) => {
+            if let Err(e) =
+              ws_write.send(Message::Binary(bytes)).await
+            {
+              debug!("Failed to send to WS: {e:?}");
+              cancel.cancel();
+              break;
+            }
+          }
+          Err(e) => {
+            debug!("PTY -> WS channel read error: {e:?}");
+            let _ = ws_write.send(Message::Text(Utf8Bytes::from(format!("ERROR: {e:#}")))).await;
+            let _ = ws_write.close().await;
+            terminal.cancel();
+            break;
+          }
+        }
+      }
+    };
+
+    tokio::join!(ws_read, ws_write);
+
+    clean_up_terminals().await;
+  }))
+}
+
+/// Sentinels
+const START_OF_OUTPUT: &str = "__KOMODO_START_OF_OUTPUT__";
+const END_OF_OUTPUT: &str = "__KOMODO_END_OF_OUTPUT__";
+
+pub async fn execute_terminal(
+  Json(ExecuteTerminalBody { terminal, command }): Json<
+    ExecuteTerminalBody,
+  >,
+) -> serror::Result<axum::body::Body> {
+  if periphery_config().disable_terminals {
+    return Err(
+      anyhow!("Terminals are disabled in the periphery config")
+        .status_code(StatusCode::FORBIDDEN),
+    );
+  }
+
+  let terminal = get_terminal(&terminal).await?;
+
+  // Read the bytes into lines
+  // This is done to check the lines for the EOF sentinal
+  let mut stdout = tokio_util::codec::FramedRead::new(
+    tokio_util::io::StreamReader::new(
+      tokio_stream::wrappers::BroadcastStream::new(
+        terminal.stdout.resubscribe(),
+      )
+      .map(|res| res.map_err(std::io::Error::other)),
+    ),
+    tokio_util::codec::LinesCodec::new(),
+  );
+
+  let full_command = format!(
+    "printf '\n{START_OF_OUTPUT}\n\n'; {command}; rc=$? printf '\n{KOMODO_EXIT_CODE}%d\n{END_OF_OUTPUT}\n' \"$rc\"\n"
+  );
+
+  terminal
+    .stdin
+    .send(StdinMsg::Bytes(Bytes::from(full_command)))
+    .await
+    .context("Failed to send command to terminal stdin")?;
+
+  // Only start the response AFTER the start sentinel is printed
+  loop {
+    match stdout
+      .try_next()
+      .await
+      .context("Failed to read stdout line")?
+    {
+      Some(line) if line == START_OF_OUTPUT => break,
+      // Keep looping until the start sentinel received.
+      Some(_) => {}
+      None => {
+        return Err(
+          anyhow!(
+            "Stdout stream terminated before start sentinel received"
+          )
+          .into(),
+        );
+      }
+    }
+  }
+
+  Ok(axum::body::Body::from_stream(TerminalStream { stdout }))
+}
+
+pin_project! {
+  struct TerminalStream<S> { #[pin] stdout: S }
+}
+
+impl<S> Stream for TerminalStream<S>
+where
+  S:
+    Stream<Item = Result<String, tokio_util::codec::LinesCodecError>>,
+{
+  // Axum expects a stream of results
+  type Item = Result<String, String>;
+
+  fn poll_next(
+    self: std::pin::Pin<&mut Self>,
+    cx: &mut std::task::Context<'_>,
+  ) -> std::task::Poll<Option<Self::Item>> {
+    let this = self.project();
+    match this.stdout.poll_next(cx) {
+      Poll::Ready(None) => {
+        // This is if a None comes in before END_OF_OUTPUT.
+        // This probably means the terminal has exited early,
+        // and needs to be cleaned up
+        tokio::spawn(async move { clean_up_terminals().await });
+        Poll::Ready(None)
+      }
+      Poll::Ready(Some(line)) => {
+        match line {
+          Ok(line) if line.as_str() == END_OF_OUTPUT => {
+            // Stop the stream on end sentinel
+            Poll::Ready(None)
+          }
+          Ok(line) => Poll::Ready(Some(Ok(line + "\n"))),
+          Err(e) => Poll::Ready(Some(Err(format!("{e:?}")))),
+        }
+      }
+      Poll::Pending => Poll::Pending,
+    }
+  }
+}

bin/periphery/src/compose.rs

@@ -430,7 +430,7 @@ pub async fn write_stack(
   Option<Vec<(String, String)>>,
 )> {
   let root = periphery_config()
-    .stack_dir
+    .stack_dir()
     .join(to_komodo_name(&stack.name));
   let run_directory = root.join(&stack.config.run_directory);
   // This will remove any intermediate '/./' in the path, which is a problem for some OS.

bin/periphery/src/config.rs

@@ -36,9 +36,18 @@ pub fn periphery_config() -> &'static PeripheryConfig {
     PeripheryConfig {
       port: env.periphery_port.unwrap_or(config.port),
       bind_ip: env.periphery_bind_ip.unwrap_or(config.bind_ip),
-      repo_dir: env.periphery_repo_dir.unwrap_or(config.repo_dir),
-      stack_dir: env.periphery_stack_dir.unwrap_or(config.stack_dir),
-      build_dir: env.periphery_build_dir.unwrap_or(config.build_dir),
+      root_directory: env
+        .periphery_root_directory
+        .unwrap_or(config.root_directory),
+      repo_dir: env.periphery_repo_dir.or(config.repo_dir),
+      stack_dir: env.periphery_stack_dir.or(config.stack_dir),
+      build_dir: env.periphery_build_dir.or(config.build_dir),
+      disable_terminals: env
+        .periphery_disable_terminals
+        .unwrap_or(config.disable_terminals),
+      disable_container_exec: env
+        .periphery_disable_container_exec
+        .unwrap_or(config.disable_container_exec),
       stats_polling_rate: env
         .periphery_stats_polling_rate
         .unwrap_or(config.stats_polling_rate),
@@ -54,6 +63,9 @@ pub fn periphery_config() -> &'static PeripheryConfig {
         stdio: env
           .periphery_logging_stdio
           .unwrap_or(config.logging.stdio),
+        pretty: env
+          .periphery_logging_pretty
+          .unwrap_or(config.logging.pretty),
         otlp_endpoint: env
           .periphery_logging_otlp_endpoint
           .unwrap_or(config.logging.otlp_endpoint),
@@ -80,10 +92,10 @@ pub fn periphery_config() -> &'static PeripheryConfig {
         .unwrap_or(config.ssl_enabled),
       ssl_key_file: env
         .periphery_ssl_key_file
-        .unwrap_or(config.ssl_key_file),
+        .or(config.ssl_key_file),
       ssl_cert_file: env
         .periphery_ssl_cert_file
-        .unwrap_or(config.ssl_cert_file),
+        .or(config.ssl_cert_file),
       secrets: config.secrets,
       git_providers: config.git_providers,
       docker_registries: config.docker_registries,

bin/periphery/src/helpers.rs

@@ -101,7 +101,7 @@ pub async fn pull_or_clone_stack(
   }
 
   let root = periphery_config()
-    .stack_dir
+    .stack_dir()
     .join(to_komodo_name(&stack.name));
 
   let mut args: CloneArgs = stack.into();

bin/periphery/src/main.rs

@@ -12,9 +12,9 @@ mod compose;
 mod config;
 mod docker;
 mod helpers;
-mod router;
 mod ssl;
 mod stats;
+mod terminal;
 
 async fn app() -> anyhow::Result<()> {
   dotenvy::dotenv().ok();
@@ -26,14 +26,17 @@ async fn app() -> anyhow::Result<()> {
 
   stats::spawn_system_stats_polling_thread();
 
-  let addr = format!("{}:{}", config::periphery_config().bind_ip, config::periphery_config().port);
+  let addr = format!(
+    "{}:{}",
+    config::periphery_config().bind_ip,
+    config::periphery_config().port
+  );
 
-  let socket_addr = 
-    SocketAddr::from_str(&addr)
+  let socket_addr = SocketAddr::from_str(&addr)
     .context("failed to parse listen address")?;
 
-  let app = router::router()
-    .into_make_service_with_connect_info::<SocketAddr>();
+  let app =
+    api::router().into_make_service_with_connect_info::<SocketAddr>();
 
   if config.ssl_enabled {
     info!("🔒 Periphery SSL Enabled");
@@ -43,8 +46,8 @@ async fn app() -> anyhow::Result<()> {
     ssl::ensure_certs().await;
     info!("Komodo Periphery starting on https://{}", socket_addr);
     let ssl_config = RustlsConfig::from_pem_file(
-      &config.ssl_cert_file,
-      &config.ssl_key_file,
+      config.ssl_cert_file(),
+      config.ssl_key_file(),
     )
     .await
     .context("Invalid ssl cert / key")?;
@@ -70,7 +73,10 @@ async fn main() -> anyhow::Result<()> {
 
   tokio::select! {
     res = app => return res?,
-    _ = term_signal.recv() => {},
+    _ = term_signal.recv() => {
+      info!("Exiting all active Terminals for shutdown");
+      terminal::delete_all_terminals().await;
+    },
   }
 
   Ok(())

bin/periphery/src/ssl.rs

@@ -2,7 +2,8 @@ use crate::config::periphery_config;
 
 pub async fn ensure_certs() {
   let config = periphery_config();
-  if !config.ssl_cert_file.is_file() || !config.ssl_key_file.is_file()
+  if !config.ssl_cert_file().is_file()
+    || !config.ssl_key_file().is_file()
   {
     generate_self_signed_ssl_certs().await
   }
@@ -14,16 +15,19 @@ async fn generate_self_signed_ssl_certs() {
 
   let config = periphery_config();
 
+  let ssl_key_file = config.ssl_key_file();
+  let ssl_cert_file = config.ssl_cert_file();
+
   // ensure cert folders exist
-  if let Some(parent) = config.ssl_key_file.parent() {
+  if let Some(parent) = ssl_key_file.parent() {
     let _ = std::fs::create_dir_all(parent);
   }
-  if let Some(parent) = config.ssl_cert_file.parent() {
+  if let Some(parent) = ssl_cert_file.parent() {
     let _ = std::fs::create_dir_all(parent);
   }
 
-  let key_path = &config.ssl_key_file.display();
-  let cert_path = &config.ssl_cert_file.display();
+  let key_path = ssl_key_file.display();
+  let cert_path = ssl_cert_file.display();
 
   let command = format!(
     "openssl req -x509 -newkey rsa:4096 -keyout {key_path} -out {cert_path} -sha256 -days 3650 -nodes -subj \"/C=XX/CN=periphery\""

bin/periphery/src/stats.rs

@@ -189,6 +189,7 @@ impl StatsClient {
 fn get_system_information(
   sys: &sysinfo::System,
 ) -> SystemInformation {
+  let config = periphery_config();
   SystemInformation {
     name: System::name(),
     os: System::long_os_version(),
@@ -201,5 +202,7 @@ fn get_system_information(
       .next()
       .map(|cpu| cpu.brand().to_string())
       .unwrap_or_default(),
+    terminals_disabled: config.disable_terminals,
+    container_exec_disabled: config.disable_container_exec,
   }
 }

bin/periphery/src/terminal.rs

@@ -0,0 +1,346 @@
+use std::{
+  collections::{HashMap, VecDeque},
+  sync::{Arc, OnceLock},
+  time::Duration,
+};
+
+use anyhow::{Context, anyhow};
+use bytes::Bytes;
+use komodo_client::{
+  api::write::TerminalRecreateMode, entities::server::TerminalInfo,
+};
+use portable_pty::{CommandBuilder, PtySize, native_pty_system};
+use tokio::sync::{broadcast, mpsc};
+use tokio_util::sync::CancellationToken;
+
+type PtyName = String;
+type PtyMap = tokio::sync::RwLock<HashMap<PtyName, Arc<Terminal>>>;
+type StdinSender = mpsc::Sender<StdinMsg>;
+type StdoutReceiver = broadcast::Receiver<Bytes>;
+
+pub async fn create_terminal(
+  name: String,
+  command: String,
+  recreate: TerminalRecreateMode,
+) -> anyhow::Result<()> {
+  trace!(
+    "CreateTerminal: {name} | command: {command} | recreate: {recreate:?}"
+  );
+  let mut terminals = terminals().write().await;
+  use TerminalRecreateMode::*;
+  if matches!(recreate, Never | DifferentCommand) {
+    if let Some(terminal) = terminals.get(&name) {
+      if terminal.command == command {
+        return Ok(());
+      } else if matches!(recreate, Never) {
+        return Err(anyhow!(
+          "Terminal {name} already exists, but has command {} instead of {command}",
+          terminal.command
+        ));
+      }
+    }
+  }
+  if let Some(prev) = terminals.insert(
+    name,
+    Terminal::new(command)
+      .await
+      .context("Failed to init terminal")?
+      .into(),
+  ) {
+    prev.cancel();
+  }
+  Ok(())
+}
+
+pub async fn delete_terminal(name: &str) {
+  if let Some(terminal) = terminals().write().await.remove(name) {
+    terminal.cancel.cancel();
+  }
+}
+
+pub async fn list_terminals() -> Vec<TerminalInfo> {
+  let mut terminals = terminals()
+    .read()
+    .await
+    .iter()
+    .map(|(name, terminal)| TerminalInfo {
+      name: name.to_string(),
+      command: terminal.command.clone(),
+      stored_size_kb: terminal.history.size_kb(),
+    })
+    .collect::<Vec<_>>();
+  terminals.sort_by(|a, b| a.name.cmp(&b.name));
+  terminals
+}
+
+pub async fn get_terminal(
+  name: &str,
+) -> anyhow::Result<Arc<Terminal>> {
+  terminals()
+    .read()
+    .await
+    .get(name)
+    .cloned()
+    .with_context(|| format!("No terminal at {name}"))
+}
+
+pub async fn clean_up_terminals() {
+  terminals()
+    .write()
+    .await
+    .retain(|_, terminal| !terminal.cancel.is_cancelled());
+}
+
+pub async fn delete_all_terminals() {
+  terminals()
+    .write()
+    .await
+    .drain()
+    .for_each(|(_, terminal)| terminal.cancel());
+  // The terminals poll cancel every 500 millis, need to wait for them
+  // to finish cancelling.
+  tokio::time::sleep(Duration::from_millis(100)).await;
+}
+
+fn terminals() -> &'static PtyMap {
+  static TERMINALS: OnceLock<PtyMap> = OnceLock::new();
+  TERMINALS.get_or_init(Default::default)
+}
+
+#[derive(Clone, serde::Deserialize)]
+pub struct ResizeDimensions {
+  rows: u16,
+  cols: u16,
+}
+
+#[derive(Clone)]
+pub enum StdinMsg {
+  Bytes(Bytes),
+  Resize(ResizeDimensions),
+}
+
+pub struct Terminal {
+  /// The command that was used as the root command, eg `shell`
+  command: String,
+
+  pub cancel: CancellationToken,
+
+  pub stdin: StdinSender,
+  pub stdout: StdoutReceiver,
+
+  pub history: Arc<History>,
+}
+
+impl Terminal {
+  async fn new(command: String) -> anyhow::Result<Terminal> {
+    trace!("Creating terminal with command: {command}");
+
+    let terminal = native_pty_system()
+      .openpty(PtySize::default())
+      .context("Failed to open terminal")?;
+
+    let mut command_split = command.split(' ').map(|arg| arg.trim());
+    let cmd =
+      command_split.next().context("Command cannot be empty")?;
+
+    let mut cmd = CommandBuilder::new(cmd);
+
+    for arg in command_split {
+      cmd.arg(arg);
+    }
+
+    cmd.env("TERM", "xterm-256color");
+    cmd.env("COLORTERM", "truecolor");
+
+    let mut child = terminal
+      .slave
+      .spawn_command(cmd)
+      .context("Failed to spawn child command")?;
+
+    // Check the child didn't stop immediately (after a little wait) with error
+    tokio::time::sleep(Duration::from_millis(100)).await;
+    if let Some(status) = child
+      .try_wait()
+      .context("Failed to check child process exit status")?
+    {
+      return Err(anyhow!(
+        "Child process exited immediately with code {}",
+        status.exit_code()
+      ));
+    }
+
+    let mut terminal_write = terminal
+      .master
+      .take_writer()
+      .context("Failed to take terminal writer")?;
+    let mut terminal_read = terminal
+      .master
+      .try_clone_reader()
+      .context("Failed to clone terminal reader")?;
+
+    let cancel = CancellationToken::new();
+
+    // CHILD WAIT TASK
+    let _cancel = cancel.clone();
+    tokio::task::spawn_blocking(move || {
+      loop {
+        if _cancel.is_cancelled() {
+          trace!("child wait handle cancelled from outside");
+          if let Err(e) = child.kill() {
+            debug!("Failed to kill child | {e:?}");
+          }
+          break;
+        }
+        match child.try_wait() {
+          Ok(Some(code)) => {
+            debug!("child exited with code {code}");
+            _cancel.cancel();
+            break;
+          }
+          Ok(None) => {
+            std::thread::sleep(Duration::from_millis(500));
+          }
+          Err(e) => {
+            debug!("failed to wait for child | {e:?}");
+            _cancel.cancel();
+            break;
+          }
+        }
+      }
+    });
+
+    // WS (channel) -> STDIN TASK
+    // Theres only one consumer here, so use mpsc
+    let (stdin, mut channel_read) =
+      tokio::sync::mpsc::channel::<StdinMsg>(8192);
+    let _cancel = cancel.clone();
+    tokio::task::spawn_blocking(move || {
+      loop {
+        if _cancel.is_cancelled() {
+          trace!("terminal write: cancelled from outside");
+          break;
+        }
+        match channel_read.blocking_recv() {
+          Some(StdinMsg::Bytes(bytes)) => {
+            if let Err(e) = terminal_write.write_all(&bytes) {
+              debug!("Failed to write to PTY: {e:?}");
+              _cancel.cancel();
+              break;
+            }
+          }
+          Some(StdinMsg::Resize(dimensions)) => {
+            if let Err(e) = terminal.master.resize(PtySize {
+              cols: dimensions.cols,
+              rows: dimensions.rows,
+              pixel_width: 0,
+              pixel_height: 0,
+            }) {
+              debug!("Failed to resize | {e:?}");
+              _cancel.cancel();
+              break;
+            };
+          }
+          None => {
+            debug!("WS -> PTY channel read error: Disconnected");
+            _cancel.cancel();
+            break;
+          }
+        }
+      }
+    });
+
+    let history = Arc::new(History::default());
+
+    // PTY -> WS (channel) TASK
+    // Uses broadcast to output to multiple client simultaneously
+    let (write, stdout) =
+      tokio::sync::broadcast::channel::<Bytes>(8192);
+    let _cancel = cancel.clone();
+    let _history = history.clone();
+    tokio::task::spawn_blocking(move || {
+      let mut buf = [0u8; 8192];
+      loop {
+        if _cancel.is_cancelled() {
+          trace!("terminal read: cancelled from outside");
+          break;
+        }
+        match terminal_read.read(&mut buf) {
+          Ok(0) => {
+            // EOF
+            trace!("Got PTY read EOF");
+            _cancel.cancel();
+            break;
+          }
+          Ok(n) => {
+            _history.push(&buf[..n]);
+            if let Err(e) =
+              write.send(Bytes::copy_from_slice(&buf[..n]))
+            {
+              debug!("PTY -> WS channel send error: {e:?}");
+              _cancel.cancel();
+              break;
+            }
+          }
+          Err(e) => {
+            debug!("Failed to read for PTY: {e:?}");
+            _cancel.cancel();
+            break;
+          }
+        }
+      }
+    });
+
+    trace!("terminal tasks spawned");
+
+    Ok(Terminal {
+      command,
+      cancel,
+      stdin,
+      stdout,
+      history,
+    })
+  }
+
+  pub fn cancel(&self) {
+    trace!("Cancel called");
+    self.cancel.cancel();
+  }
+}
+
+/// 1 MiB max history size per terminal
+const MAX_BYTES: usize = 1024 * 1024;
+
+pub struct History {
+  buf: std::sync::RwLock<VecDeque<u8>>,
+}
+
+impl Default for History {
+  fn default() -> Self {
+    History {
+      buf: VecDeque::with_capacity(MAX_BYTES).into(),
+    }
+  }
+}
+
+impl History {
+  /// Push some bytes, evicting the oldest when full.
+  fn push(&self, bytes: &[u8]) {
+    let mut buf = self.buf.write().unwrap();
+    for byte in bytes {
+      if buf.len() == MAX_BYTES {
+        buf.pop_front();
+      }
+      buf.push_back(*byte);
+    }
+  }
+
+  pub fn bytes_parts(&self) -> (Bytes, Bytes) {
+    let buf = self.buf.read().unwrap();
+    let (a, b) = buf.as_slices();
+    (Bytes::copy_from_slice(a), Bytes::copy_from_slice(b))
+  }
+
+  pub fn size_kb(&self) -> f64 {
+    self.buf.read().unwrap().len() as f64 / 1024.0
+  }
+}

bin/periphery/starship.toml

@@ -0,0 +1,67 @@
+## This is used to customize the shell prompt in Periphery container for Terminals
+
+"$schema" = 'https://starship.rs/config-schema.json'
+
+add_newline = true
+
+format = "$time$hostname$container$memory_usage$all"
+
+[character]
+success_symbol = "[❯](bright-blue bold)"
+error_symbol = "[❯](bright-red bold)"
+
+[package]
+disabled = true
+
+[time]
+format = "[❯$time](white dimmed) "
+time_format = "%l:%M %p"
+utc_time_offset = '-5'
+disabled = true
+
+[username]
+format = "[❯ $user]($style) "
+style_user = "bright-green"
+show_always = true
+
+[hostname]
+format = "[❯ $hostname]($style) "
+style = "bright-blue"
+ssh_only = false
+
+[directory]
+format = "[❯ $path]($style)[$read_only]($read_only_style) "
+style = "bright-cyan"
+
+[git_branch]
+format = "[❯ $symbol$branch(:$remote_branch)]($style) "
+style = "bright-purple"
+
+[git_status]
+style = "bright-purple"
+
+[rust]
+format = "[❯ $symbol($version )]($style)"
+symbol = "rustc "
+style = "bright-red"
+
+[nodejs]
+format = "[❯ $symbol($version )]($style)"
+symbol = "nodejs "
+style = "bright-red"
+
+[memory_usage]
+format = "[❯ mem ${ram} ${ram_pct}]($style) "
+threshold = -1
+style = "white"
+
+[cmd_duration]
+format = "[❯ $duration]($style)"
+style = "bright-yellow"
+
+[container]
+format = "[❯ 🦎 periphery container ]($style)"
+style = "bright-green"
+
+[aws]
+disabled = true

client/core/rs/src/api/execute/mod.rs

@@ -12,7 +12,6 @@ mod deployment;
 mod procedure;
 mod repo;
 mod server;
-mod server_template;
 mod stack;
 mod sync;
 
@@ -23,7 +22,6 @@ pub use deployment::*;
 pub use procedure::*;
 pub use repo::*;
 pub use server::*;
-pub use server_template::*;
 pub use stack::*;
 pub use sync::*;
 
@@ -128,6 +126,7 @@ pub enum Execution {
   DeployStackIfChanged(DeployStackIfChanged),
   BatchDeployStackIfChanged(BatchDeployStackIfChanged),
   PullStack(PullStack),
+  BatchPullStack(BatchPullStack),
   StartStack(StartStack),
   RestartStack(RestartStack),
   PauseStack(PauseStack),

client/core/rs/src/api/execute/server_template.rs

@@ -1,24 +0,0 @@
-use derive_empty_traits::EmptyTraits;
-use resolver_api::Resolve;
-use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
-
-use crate::entities::update::Update;
-
-use super::KomodoExecuteRequest;
-
-/// Launch an EC2 instance with the specified config.
-/// Response: [Update].
-#[typeshare]
-#[derive(
-  Serialize, Deserialize, Debug, Clone, Resolve, EmptyTraits,
-)]
-#[empty_traits(KomodoExecuteRequest)]
-#[response(Update)]
-#[error(serror::Error)]
-pub struct LaunchServer {
-  /// The name of the created server.
-  pub name: String,
-  /// The server template used to define the config.
-  pub server_template: String,
-}

client/core/rs/src/api/execute/stack.rs

@@ -152,6 +152,37 @@ pub struct PullStack {
 
 //
 
+/// Pulls multiple Stacks in parallel that match pattern. Response: [BatchExecutionResponse].
+#[typeshare]
+#[derive(
+  Serialize,
+  Deserialize,
+  Debug,
+  Clone,
+  PartialEq,
+  Resolve,
+  EmptyTraits,
+  Parser,
+)]
+#[empty_traits(KomodoExecuteRequest)]
+#[response(BatchExecutionResponse)]
+#[error(serror::Error)]
+pub struct BatchPullStack {
+  /// Id or name or wildcard pattern or regex.
+  /// Supports multiline and comma delineated combinations of the above.
+  ///
+  /// Example:
+  /// ```
+  /// # match all foo-* stacks
+  /// foo-*
+  /// # add some more
+  /// extra-stack-1, extra-stack-2
+  /// ```
+  pub pattern: String,
+}
+
+//
+
 /// Starts the target stack. `docker compose start`. Response: [Update]
 #[typeshare]
 #[derive(