feat: update main.rs

Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
2025-09-11 11:22:43 +02:00
parent a83e7ea2a8
commit e71ad29ee1
12 changed files with 117 additions and 107 deletions

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-empty-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-empty-plan.git"
vars:
service: "%%name%%"
@@ -12,5 +12,5 @@ please:
repository: "%%name%%"
branch: main
settings:
api_url: https://git.front.kjuulh.io
api_url: https://git.kjuulh.io

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-infrastructure-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-infrastructure-plan.git"
vars:
service: "%%name%%"
@@ -13,7 +13,7 @@ vars:
deployment:
registry: git@git.front.kjuulh.io:kjuulh/clank-clusters
registry: git@git.kjuulh.io:kjuulh/clank-clusters
env:
prod:
clusters:

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-leptos-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-rust-leptos-plan.git"
vars:
service: "%%name%%"

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-node-service-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-node-service-plan.git"
vars:
service: "%%name%%"
@@ -13,7 +13,7 @@ vars:
deployment:
registry: git@git.front.kjuulh.io:kjuulh/clank-clusters
registry: git@git.kjuulh.io:kjuulh/clank-clusters
env:
prod:
clusters:

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-cli-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-rust-cli-plan.git"
vars:
service: "%%name%%"
@@ -12,6 +12,6 @@ please:
repository: "%%name%%"
branch: "main"
settings:
api_url: "https://git.front.kjuulh.io"
api_url: "https://git.kjuulh.io"
actions:
rust:

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-lib-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-rust-lib-plan.git"
vars:
service: "%%name%%"
@@ -12,6 +12,6 @@ please:
repository: "%%name%%"
branch: main
settings:
api_url: "https://git.front.kjuulh.io"
api_url: "https://git.kjuulh.io"
actions:
rust:

View File

@@ -1,40 +1,36 @@
use std::{net::SocketAddr, ops::Deref, sync::Arc};
mod state {
#[derive(Clone)]
pub struct State {}
use anyhow::Context;
use axum::extract::MatchedPath;
use axum::http::Request;
use axum::Router;
use axum::routing::get;
use clap::{Parser, Subcommand};
use tower_http::trace::TraceLayer;
#[derive(Parser)]
#[command(author, version, about, long_about = None, subcommand_required = true)]
struct Command {
#[command(subcommand)]
command: Option<Commands>,
impl State {
pub async fn new() -> anyhow::Result<Self> {
Ok(Self {})
}
}
}
pub use state::*;
#[derive(Subcommand)]
enum Commands {
Serve {
pub mod cli {
use clap::{Parser, Subcommand};
use crate::{State, cli::serve::ServeCommand};
mod serve {
use std::net::SocketAddr;
use axum::{Router, extract::MatchedPath, http::Request, routing::get};
use tower_http::trace::TraceLayer;
use crate::State;
#[derive(clap::Parser)]
pub struct ServeCommand {
#[arg(env = "SERVICE_HOST", long, default_value = "127.0.0.1:3000")]
host: SocketAddr,
},
}
#[tokio::main]
async fn main() -> anyhow::Result<()> {
dotenv::dotenv().ok();
tracing_subscriber::fmt::init();
let cli = Command::parse();
if let Some(Commands::Serve { host }) = cli.command {
tracing::info!("Starting service");
let state = SharedState(Arc::new(State::new().await?));
}
impl ServeCommand {
pub async fn execute(&self, state: &State) -> anyhow::Result<()> {
let app = Router::new()
.route("/", get(root))
.with_state(state.clone())
@@ -56,36 +52,50 @@ async fn main() -> anyhow::Result<()> {
}), // ...
);
tracing::info!("listening on {}", host);
let listener = tokio::net::TcpListener::bind(host).await.unwrap();
tracing::info!("listening on {}", self.host);
let listener = tokio::net::TcpListener::bind(self.host).await.unwrap();
axum::serve(listener, app.into_make_service())
.await
.unwrap();
Ok(())
}
}
async fn root() -> &'static str {
"Hello, nostore!"
}
}
#[derive(Parser)]
#[command(author, version, about, long_about = None, subcommand_required = true)]
struct Command {
#[command(subcommand)]
command: Option<Commands>,
}
#[derive(Subcommand)]
enum Commands {
Serve(ServeCommand),
}
pub async fn execute() -> anyhow::Result<()> {
let cli = Command::parse();
let state = State::new().await?;
match cli.command.expect("a subcommand") {
Commands::Serve(cmd) => cmd.execute(&state).await,
}
}
}
#[tokio::main]
async fn main() -> anyhow::Result<()> {
dotenv::dotenv().ok();
tracing_subscriber::fmt::init();
cli::execute().await?;
Ok(())
}
async fn root() -> &'static str {
"Hello, %%name%%!"
}
#[derive(Clone)]
pub struct SharedState(Arc<State>);
impl Deref for SharedState {
type Target = Arc<State>;
fn deref(&self) -> &Self::Target {
&self.0
}
}
pub struct State {}
impl State {
pub async fn new() -> anyhow::Result<Self> {
Ok(Self {})
}
}

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-rust-service-plan.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-rust-service-plan.git"
vars:
service: "%%name%%"

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
vars:
service: "%%name%%"

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
vars:
service: "%%name%%"
@@ -12,4 +12,4 @@ please:
repository: "%%name%%"
branch: "main"
settings:
api_url: "https://git.front.kjuulh.io"
api_url: "https://git.kjuulh.io"

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
vars:
service: "%%name%%"
@@ -12,4 +12,4 @@ please:
repository: "%%name%%"
branch: main
settings:
api_url: "https://git.front.kjuulh.io"
api_url: "https://git.kjuulh.io"

View File

@@ -1,6 +1,6 @@
# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
# yaml-language-server: $schema=https://git.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
base: "git@git.kjuulh.io:kjuulh/cuddle-base.git"
vars:
service: "%%name%%"