Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
IP=0.0.0.0
PORT=8411
RUST_LOG=info
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# Rust build dir
/target

# Environment Variables
.env
180 changes: 179 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ version = "0.1.0"
edition = "2024"

[dependencies]
clap = { version = "4.6.7", features = ["derive"] }
clap = { version = "4.6.7", features = ["derive", "env"] }
datetime = "0.5.2"
env_logger = "0.11.11"
log = "0.4.34"
serde = { version = "1.0.229", features = ["derive"] }
serde_json = "1.0.151"
tokio = { version = "1.53.1", features = ["full"] }
Expand Down
22 changes: 22 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Build
FROM rust:1-slim AS builder
WORKDIR /app
COPY Cargo.toml Cargo.lock* ./
COPY src ./src
RUN cargo build --release

# Run
FROM debian:bookworm-slim
WORKDIR /app

ARG IP
ARG PORT

ENV IP=$IP
ENV PORT=$PORT

COPY --from=builder /app/target/release/ephemeral /usr/local/bin/ephemeral

EXPOSE $PORT

ENTRYPOINT ["/usr/local/bin/ephemeral"]
14 changes: 14 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
services:
ephemeral:
build:
context: .
dockerfile: Dockerfile
args:
- IP=${IP}
- PORT=${PORT}
environment:
- IP=${IP}
- PORT=${PORT}
- RUST_LOG=${RUST_LOG:-info}
ports:
- "${PORT}:${PORT}"
8 changes: 6 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clap::Parser;
use log::info;

mod server;
pub mod session;
Expand All @@ -8,25 +9,28 @@ pub mod utils;
#[derive(Parser)]
struct Args {
/// Host IP Address
#[arg(long, env = "IP")]
ip: String,

/// Server Application Port
#[arg(long, env = "PORT")]
port: Option<u16>,
}
#[tokio::main]
async fn main() {
env_logger::init();
let args = Args::parse();

let address: server::Address = {
let port = match args.port {
Some(port) => {
if port != server::STANDARD_PORT {
println!("Custom port provided: {}", port);
info!("Custom port provided: {}", port);
}
port
}
None => {
println!(
info!(
"No port provided, proceeding with standard: {}",
server::STANDARD_PORT
);
Expand Down
7 changes: 4 additions & 3 deletions src/server/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::session_manager::SessionManager;
use datetime::Instant;
use log::info;

use tokio::io::Result;
use tokio::net::TcpListener;
Expand Down Expand Up @@ -42,14 +43,14 @@ impl Server {

pub async fn run(&self) -> Result<()> {
let listener = TcpListener::bind(&self.address.to_string()).await?;
println!("Server started at: {:?}", self.started);
println!("Ephemeral Server listening on {}", self.address);
info!("Server started at: {:?}", self.started);
info!("Ephemeral Server listening on {}", self.address);

// TODO: Accept connections and redirect them to the session manager

loop {
let (socket, client_addr) = listener.accept().await?;
println!("New connection established with: {}", client_addr);
info!("New connection established with: {}", client_addr);

self.manager.add_socket(socket).await;
}
Expand Down
Loading
Loading