Bump dependencies, version

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs-aggregator"
 description = "A simple image aggregation service for pict-rs"
-version = "0.2.0-alpha.5"
+version = "0.2.0-beta.1"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
@@ -15,16 +15,16 @@ build = "src/build.rs"
 default = []
 
 [dependencies]
-actix-rt = "2.6.0"
+actix-rt = "2.7.0"
 actix-web = { version = "4.0.0", default-features = false }
 awc = { version = "3.0.0", default-features = false }
 bcrypt = "0.13"
-clap = { version = "3.1.18", features = ["derive", "env"] }
+clap = { version = "4.0.2", features = ["derive", "env"] }
 console-subscriber = "0.1"
 mime = "0.3"
-minify-html = "0.9.0"
+minify-html = "0.10.0"
-opentelemetry = { version = "0.17", features = ["rt-tokio"] }
+opentelemetry = { version = "0.18", features = ["rt-tokio"] }
-opentelemetry-otlp = "0.10"
+opentelemetry-otlp = "0.11"
 qrcodegen = "1.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -35,7 +35,7 @@ tracing = "0.1"
 tracing-error = "0.2"
 tracing-futures = "0.2"
 tracing-log = "0.1"
-tracing-opentelemetry = "0.17"
+tracing-opentelemetry = "0.18"
 tracing-subscriber = { version = "0.3", features = [
   "ansi",
   "env-filter",
@@ -46,18 +46,18 @@ uuid = { version = "1", features = ["serde", "v4"] }
 
 
 [dependencies.tracing-actix-web]
-version = "0.6.0"
+version = "0.6.1"
 default-features = false
-features = ["emit_event_on_error", "opentelemetry_0_17"]
+features = ["emit_event_on_error", "opentelemetry_0_18"]
 
 [dependencies.tracing-awc]
-version = "0.1.0"
+version = "0.1.6"
 default-features = false
-features = ["emit_event_on_error", "opentelemetry_0_17"]
+features = ["emit_event_on_error", "opentelemetry_0_18"]
 
 [dev-dependencies]
-ructe = "0.14.0"
+ructe = "0.15.0"
 
 [build-dependencies]
 dotenv = "0.15.0"
-ructe = { version = "0.14.0", features = ["sass", "mime03"] }
+ructe = { version = "0.15.0", features = ["sass", "mime03"] }

README.md

@@ -4,36 +4,28 @@ _a simple image aggregator for pict-rs_
 ## Usage
 ### Running
 ```
-pict-rs-aggregator 
+$ pict-rs-aggregator -h
+A simple image aggregation service for pict-rs
 
-USAGE:
+Usage: pict-rs-aggregator [OPTIONS]
-    pict-rs-aggregator [OPTIONS]
 
-OPTIONS:
+Options:
-    -a, --addr <ADDR>
+  -a, --addr <ADDR>
-            The address and port the server binds to [env: PICTRS_AGGREGATOR_ADDR=] [default:
+          The address and port the server binds to [env: PICTRS_AGGREGATOR_ADDR=] [default: 0.0.0.0:8082]
-            0.0.0.0:8082]
+  -u, --upstream <UPSTREAM>
-
+          The url of the upstream pict-rs server [env: PICTRS_AGGREGATOR_UPSTREAM=] [default: http://localhost:8080]
-    -c, --console-event-buffer-size <CONSOLE_EVENT_BUFFER_SIZE>
+  -d, --database-path <DATABASE_PATH>
-            The number of events to buffer in console. When unset, console is disabled [env:
+          The path to the database [env: PICTRS_AGGREGATOR_DATABASE=] [default: sled/db-0-34]
-            PICTRS_AGGREGATOR_CONSOLE_EVENT_BUFFER_SIZE=]
+  -s, --sled-cache-capacity <SLED_CACHE_CAPACITY>
-
+          The amount of RAM, in bytes, that sled is allowed to consume. Increasing this value can improve performance [env: PICTRS_AGGREGATOR_SLED_CACHE_CAPACITY=] [default: 67108864]
-    -d, --database-path <DATABASE_PATH>
+  -c, --console-event-buffer-size <CONSOLE_EVENT_BUFFER_SIZE>
-            The path to the database [env: PICTRS_AGGREGATOR_DATABASE=] [default: sled/db-0-34]
+          The number of events to buffer in console. When unset, console is disabled [env: PICTRS_AGGREGATOR_CONSOLE_EVENT_BUFFER_SIZE=]
-
+  -o, --opentelemetry-url <OPENTELEMETRY_URL>
-    -h, --help
+          URL for the OpenTelemetry Colletor [env: PICTRS_AGGREGATOR_OPENTELEMETRY_URL=]
-            Print help information
+  -h, --help
-
+          Print help information
-    -o, --opentelemetry-url <OPENTELEMETRY_URL>
+  -V, --version
-            URL for the OpenTelemetry Colletor [env: PICTRS_AGGREGATOR_OPENTELEMETRY_URL=]
+          Print version information
-
-    -s, --sled-cache-capacity <SLED_CACHE_CAPACITY>
-            The amount of RAM, in bytes, that sled is allowed to consume. Increasing this value can
-            improve performance [env: PICTRS_AGGREGATOR_SLED_CACHE_CAPACITY=] [default: 67108864]
-
-    -u, --upstream <UPSTREAM>
-            The url of the upstream pict-rs server [env: PICTRS_AGGREGATOR_UPSTREAM=] [default:
-            http://localhost:8080]
 ```
 
 #### Examples

docker/prod/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - ./volumes/pictrs:/mnt
 
   pictrs-aggregator:
-    image: asonix/pictrs-aggregator:v0.1.16
+    image: asonix/pictrs-aggregator:v0.2.0-beta.1
     ports:
       - "8082:8082"
     restart: always

src/lib.rs

@@ -35,9 +35,11 @@ mod ui;
 
 use self::{connection::Connection, middleware::ValidToken, optional::Optional, store::Store};
 
+/// A simple image collection service backed by pict-rs
 #[derive(Clone, Debug, Parser)]
+#[command(author, version, about, long_about = None)]
 pub struct Config {
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_ADDR",
@@ -46,7 +48,7 @@ pub struct Config {
     )]
     addr: SocketAddr,
 
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_UPSTREAM",
@@ -55,7 +57,7 @@ pub struct Config {
     )]
     upstream: Url,
 
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_DATABASE",
@@ -64,7 +66,7 @@ pub struct Config {
     )]
     database_path: PathBuf,
 
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_SLED_CACHE_CAPACITY",
@@ -73,7 +75,7 @@ pub struct Config {
     )]
     sled_cache_capacity: u64,
 
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_CONSOLE_EVENT_BUFFER_SIZE",
@@ -81,7 +83,7 @@ pub struct Config {
     )]
     console_event_buffer_size: Option<usize>,
 
-    #[clap(
+    #[arg(
         short,
         long,
         env = "PICTRS_AGGREGATOR_OPENTELEMETRY_URL",