Merge pull request #3 from coreyja/ca/main/checkin-duration

Record Duration and Rebrand as UpGuradian

.gitignore

@@ -1,2 +1,4 @@
 /target
 .envrc
+
+/public/frontend

Cargo.toml

@@ -1,8 +1,9 @@
 [package]
-name = "status"
+name = "up_guardian"
 version = "0.1.0"
 edition = "2021"
 license = "private"
+build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -53,3 +54,6 @@ futures = "0.3.30"
 sqlx = "0.7.3"
 uuid = { version = "1.6.1", features = ["v4"] }
 tower-cookies = { version = "0.10.0", features = ["private", "signed"] }
+mime_guess = "2.0.4"
+include_dir = { version = "0.7.3", features = ["metadata", "glob"] }
+humantime = "2.1.0"

Dockerfile

@@ -20,7 +20,11 @@ COPY . .
 COPY tailwind.config.js .
 RUN ./tailwindcss -i src/tailwind.css -o target/tailwind.css
 
-RUN cargo build --release --locked --bin status
+RUN curl -fsSL https://bun.sh/install | BUN_INSTALL=/app bash
+
+ENV PATH="/app/bin:${PATH}"
+
+RUN cargo build --release --locked --bin up_guardian
 
 # Start building the final image
 FROM debian:stable-slim as final
@@ -31,8 +35,8 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/* \
   && update-ca-certificates
 
-COPY --from=builder /app/target/release/status .
+COPY --from=builder /app/target/release/up_guardian .
 
 EXPOSE 3001
 
-ENTRYPOINT ["./status"]
+ENTRYPOINT ["./up_guardian"]

build.rs

@@ -0,0 +1,9 @@
+use std::process::Command;
+
+fn main() {
+    println!("cargo:rerun-if-changed=frontend/**/*");
+    Command::new("bun")
+        .args(["build", "frontend/index.ts", "--outdir", "public/frontend/"])
+        .status()
+        .expect("Failed to build frontend");
+}

frontend/index.ts

@@ -0,0 +1,19 @@
+document.addEventListener("click", function (e) {
+  if (!e.target) return;
+
+  const clickedElement = (e.target as HTMLElement).closest(
+    "[data-app='ToggleClass']"
+  );
+  if (clickedElement) {
+    const className = clickedElement.getAttribute("data-class")!;
+    const targetSelector = clickedElement.getAttribute("data-target")!;
+
+    const targetElement =
+      clickedElement.closest(targetSelector) ||
+      document.querySelector(targetSelector);
+
+    if (targetElement) {
+      targetElement.classList.toggle(className);
+    }
+  }
+});

migrations/20240313231211_CreateCron.down.sql

@@ -0,0 +1 @@
+DROP TABLE Crons;

migrations/20240313231211_CreateCron.up.sql

@@ -0,0 +1,16 @@
+CREATE TABLE
+  Crons (
+    cron_id UUID PRIMARY KEY,
+    name TEXT NOT NULL,
+    last_run_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL,
+      created_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL,
+      updated_at TIMESTAMP
+    WITH
+      TIME ZONE NOT NULL
+  );
+
+CREATE UNIQUE INDEX idx_crons_name ON Crons (name);

migrations/20240314020654_AddDurationToCheckin.down.sql

@@ -0,0 +1,5 @@
+-- Add migration script here
+-- Add a new column to the checkin table
+-- `duration_ms` stores the duration of the checkin in milliseconds
+ALTER TABLE Checkins
+DROP COLUMN duration_nanos;

migrations/20240314020654_AddDurationToCheckin.up.sql

@@ -0,0 +1,5 @@
+-- Add migration script here
+-- Add a new column to the checkin table
+-- `duration_ms` stores the duration of the checkin in milliseconds
+ALTER TABLE Checkins
+ADD COLUMN duration_nanos BIGINT;

src/jobs/create_checkin.rs

@@ -1,6 +1,9 @@
+
 use cja::{app_state::AppState as _, jobs::Job};
 use miette::IntoDiagnostic;
 use serde::{Deserialize, Serialize};
+
+use tokio::time::Instant;
 use uuid::Uuid;
 
 use crate::app_state::AppState;
@@ -32,30 +35,33 @@ impl Job<AppState> for CreateCheckin {
         let path = page.path;
 
         let url = format!("https://{domain}{path}");
+        let now = Instant::now();
         let resp = reqwest::get(&url).await;
 
         let (status, outcome) = match resp {
             Err(_) => (None, "error"),
-            Ok(resp) => (
-                Some(resp.status()),
+            Ok(resp) => (Some(resp.status()), {
                 if resp.status().is_success() {
                     "success"
                 } else {
                     "failure"
-                },
-            ),
+                }
+            }),
         };
+        let duration = now.elapsed();
+        let duration: i64 = duration.as_nanos().try_into().unwrap();
 
         let status: Option<i32> = status.map(|s| s.as_u16().into());
 
         sqlx::query!(
             r#"
-        INSERT INTO Checkins (page_id, status_code, outcome)
-        VALUES ($1, $2, $3)
+        INSERT INTO Checkins (page_id, status_code, outcome, duration_nanos)
+        VALUES ($1, $2, $3, $4)
       "#,
             self.page_id,
             status,
-            outcome
+            outcome,
+            duration
         )
         .execute(app_state.db())
         .await

src/routes/current_user/pages.rs

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use axum::{
     extract::{Path, State},
     response::{IntoResponse, Redirect},
@@ -125,10 +127,14 @@ pub async fn show(
       ul {
         @for checkin in checkins {
           li {
-            (checkin.created_at) " - " (checkin.outcome)
+            (checkin.created_at.format("%d/%m/%Y %H:%M:%S")) " - " (checkin.outcome)
             @if let Some(status) = checkin.status_code {
               " - " (status)
             }
+            @if let Some(duration) = checkin.duration_nanos {
+              @let duration = Duration::from_nanos(duration as u64);
+              " - " (humantime::format_duration(duration))
+            }
           }
         }
       }