bump: tokio

Reviewed-on: #1

.env.docker.sample

@@ -1,4 +1,4 @@
 ROOT_DIRECTORY=/usr/local/bin
-ICARUS_BASE_API_URL=http://api:3000
-ICARUS_AUTH_BASE_API_URL=http://auth_api:3000
+ICARUS_BASE_API_URL=http://api:8000
+ICARUS_AUTH_BASE_API_URL=http://auth_api:8001
 SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH

.env.local.sample

@@ -0,0 +1,4 @@
+ROOT_DIRECTORY=/tmp
+ICARUS_BASE_API_URL=http://localhost:8000
+ICARUS_AUTH_BASE_API_URL=http://localhost:8001
+SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH

.gitea/workflows/tag_release.yml

@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/workflow.yml

@@ -1,24 +1,27 @@
-name: Rust Build
+name: songparser
 
 on:
   push:
     branches:
       - main 
-      - devel
   pull_request:
     branches:
       - main 
-      - devel
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -33,10 +36,11 @@ jobs:
     runs-on: ubuntu-24.04
     needs: setup_ssh
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -51,10 +55,11 @@ jobs:
     runs-on: ubuntu-24.04
     needs: setup_ssh
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -70,10 +75,11 @@ jobs:
     runs-on: ubuntu-24.04
     needs: setup_ssh
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -89,10 +95,11 @@ jobs:
     runs-on: ubuntu-24.04
     needs: setup_ssh
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.94
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key

Cargo.toml

@@ -1,18 +1,17 @@
 [package]
 name = "songparser"
-version = "0.5.0"
+version = "0.6.0"
 edition = "2024"
-rust-version = "1.94"
+rust-version = "1.95"
 
 [dependencies]
-tokio = { version = "1.51", features = ["full"] }
+tokio = { version = "1.52.3", features = ["full"] }
 futures = { version = "0.3.32" }
-reqwest = { version = "0.12.28", features = ["json", "stream", "multipart"] }
+reqwest = { version = "0.13.3", features = ["json", "stream", "multipart"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149" }
 time = { version = "0.3.47", features = ["macros", "serde"] }
-uuid = { version = "1.23", features = ["v4", "serde"] }
-rand = { version = "0.10.0" }
-icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.5.0" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.10.0" }
-icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.6.0" }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
+icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.6.0" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.1" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" }

Dockerfile

@@ -1,63 +1,37 @@
-# Stage 1: Build the application
-# Use a specific Rust version for reproducibility. Choose one that matches your development environment.
-# Using slim variant for smaller base image
-FROM rust:1.94 as builder
+FROM rust:1.96.1 as builder
 
-# Set the working directory inside the container
 WORKDIR /usr/src/app
 
-# Install build dependencies if needed (e.g., git for cloning)
 RUN apt-get update && apt-get install -y --no-install-recommends \
     pkg-config libssl3 \
     ca-certificates \
     openssh-client git \
     && rm -rf /var/lib/apt/lists/*
 
-# << --- ADD HOST KEY HERE --- >>
-# Replace 'yourgithost.com' with the actual hostname (e.g., github.com)
 RUN mkdir -p -m 0700 ~/.ssh && \
     ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts
 
-# Copy Cargo manifests
 COPY Cargo.toml Cargo.lock ./
 
-# Build *only* dependencies to leverage Docker cache
-# This dummy build caches dependencies as a separate layer
 RUN --mount=type=ssh mkdir src && \
     echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \
     cargo build --release --quiet && \
-    rm -rf src target/release/deps/songparser* # Clean up dummy build artifacts (replace songparser)
+    rm -rf src target/release/deps/songparser*
 
-# Copy the actual source code
 COPY src ./src
-# If you have other directories like `templates` or `static`, copy them too
 COPY .env ./.env
 
-# << --- SSH MOUNT ADDED HERE --- >>
-# Build *only* dependencies to leverage Docker cache
-# This dummy build caches dependencies as a separate layer
-# Mount the SSH agent socket for this command
 RUN --mount=type=ssh \
     cargo build --release --quiet
 
-# Stage 2: Create the final, smaller runtime image
-# Use a minimal base image like debian-slim or even distroless for security/size
-FROM ubuntu:24.04
+FROM debian:trixie-slim
 
-# Install runtime dependencies if needed (e.g., SSL certificates)
 RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/*
 
-# Set the working directory
 WORKDIR /usr/local/bin
 
-# Copy the compiled binary from the builder stage
-# Replace 'songparser' with the actual name of your binary (usually the crate name)
 COPY --from=builder /usr/src/app/target/release/songparser .
 
-# Copy other necessary files like .env (if used for runtime config) or static assets
-# It's generally better to configure via environment variables in Docker though
 COPY --from=builder /usr/src/app/.env .
 
-# Set the command to run your application
-# Ensure this matches the binary name copied above
 CMD ["./songparser"]

docker-compose.yaml

@@ -1,12 +1,11 @@
 version: '3.8' # Use a recent version
 
 services:
-  # Your Rust Application Service
   songparser:
-    build: # Tells docker-compose to build the Dockerfile in the current directory
+    build:
       context: .
-      ssh: ["default"]  # Uses host's SSH agent
-    container_name: songparser # Optional: Give the container a specific name
+      ssh: ["default"]
+    container_name: songparser
     env_file:
       - .env
-    restart: unless-stopped # Optional: Restart policy
+    restart: unless-stopped

src/api.rs

@@ -75,14 +75,9 @@ pub mod get_metadata_queue {
     ) -> Result<reqwest::Response, reqwest::Error> {
         let client = reqwest::Client::new();
         let endpoint = String::from("api/v2/song/metadata/queue");
-        let api_url = format!("{}/{endpoint}", app.uri);
+        let api_url = format!("{}/{endpoint}?song_queue_id={song_queue_id}", app.uri);
         let (key, header) = super::auth_header(app).await;
-        client
-            .get(api_url)
-            .query(&[("song_queue_id", song_queue_id)])
-            .header(key, header)
-            .send()
-            .await
+        client.get(api_url).header(key, header).send().await
     }
 
     pub mod response {
@@ -128,14 +123,9 @@ pub mod get_coverart_queue {
     ) -> Result<reqwest::Response, reqwest::Error> {
         let client = reqwest::Client::new();
         let endpoint = String::from("api/v2/coverart/queue");
-        let api_url = format!("{}/{endpoint}", app.uri);
+        let api_url = format!("{}/{endpoint}?song_queue_id={song_queue_id}", app.uri);
         let (key, header) = super::auth_header(app).await;
-        client
-            .get(api_url)
-            .query(&[("song_queue_id", song_queue_id)])
-            .header(key, header)
-            .send()
-            .await
+        client.get(api_url).header(key, header).send().await
     }
 
     pub async fn get_data(