Update rust (#31)

Reviewed-on: phoenix/textsender_api#31

.env.docker.sample

@@ -10,4 +10,5 @@ TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
 TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
 TWILIO_AUTH_TOKEN="MA08HJp9tYtkfs72m8JIIROofRVm74oR0ixEYBHGYpB9"
 TWILIO_PHONE_NUMBER=+10123456789
-ALLOWED_ORIGINS="http://textsender.com"
+ALLOWED_ORIGINS="http://textsender.com,http://localhost:5173,http://localhost:9080,http://localhost:9081"
+APP_ENV=production

.env.local.sample

@@ -10,4 +10,5 @@ TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
 TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
 TWILIO_AUTH_TOKEN="MA08HJp9tYtkfs72m8JIIROofRVm74oR0ixEYBHGYpB9"
 TWILIO_PHONE_NUMBER=+10123456789
-ALLOWED_ORIGINS="http://textsender.com"
+ALLOWED_ORIGINS="http://textsender.com,http://localhost:5173,http://localhost:9080,http://localhost:9081"
+APP_ENV=production

.gitea/workflows/pr.yml

@@ -5,15 +5,19 @@ on:
     branches:
       - main
 
+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.96
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -30,10 +34,10 @@ jobs:
     name: Rustfmt
     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.96
+          toolchain: 1.96.1
       - run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
       - run: |
@@ -50,10 +54,10 @@ jobs:
     name: Clippy
     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.96
+          toolchain: 1.96.1
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@v2
       - run: |

.gitea/workflows/tests.yml

@@ -32,10 +32,10 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.96.1
       # --- Add this step for explicit verification ---
       - name: Verify Docker Environment
         run: |
@@ -74,10 +74,10 @@ jobs:
     name: Rustfmt
     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.96
+          toolchain: 1.96.1
       - run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
       - run: |

.gitea/workflows/workflow.yml

@@ -15,10 +15,10 @@ jobs:
     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.96
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -52,10 +52,10 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.96.1
       # --- Add this step for explicit verification ---
       - name: Verify Docker Environment
         run: |
@@ -94,10 +94,10 @@ jobs:
     name: Rustfmt
     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.96
+          toolchain: 1.96.1
       - run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
       - run: |
@@ -114,10 +114,10 @@ jobs:
     name: Clippy
     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.96
+          toolchain: 1.96.1
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@v2
       - run: |
@@ -134,10 +134,10 @@ jobs:
     name: build
     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.96
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "textsender_api"
-version = "0.2.0"
+version = "0.2.3"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.96.1"
 
 [dependencies]
 axum = { version = "0.8.9", features = ["multipart"] }
@@ -10,21 +10,18 @@ axum-extra = { version = "0.12.6", features = ["cookie"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
 tokio = { version = "1.52.3", features = ["full"] }
-tokio-util = { version = "0.7.18", features = ["io"] }
+tower-http = { version = "0.7.0", features = ["cors", "timeout"] }
-tower = { version = "0.5.3", features = ["full"] }
-tower-http = { version = "0.6.11", features = ["cors", "timeout"] }
 tracing-subscriber = "0.3.23"
-futures = { version = "0.3.32" }
 uuid = { version = "1.23.3", features = ["v4", "serde"] }
 sqlx = { version = "0.9.0", features = ["runtime-tokio", "tls-native-tls", "postgres", "time", "uuid"] }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"]  }
+time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"]  }
 jsonwebtoken = { version = "10.4.0", features = ["rust_crypto"] }
-josekit = { version = "0.10.3" }
 utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.1" }
-swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2.0" }
+swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.2" }
 
 [dev-dependencies]
+tower = { version = "0.5.3", features = ["full"] }
+josekit = { version = "0.10.3" }
 url = { version = "2.5.8" }
-tempfile = { version = "3.27.0" }

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application
-FROM rust:1.96 as builder
+FROM rust:1.96.1 as builder
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app

src/auth/mod.rs

@@ -36,9 +36,7 @@ pub async fn auth<B>(
         (StatusCode::UNAUTHORIZED, Json(json_error))
     })?;
 
-    let secret_key = textsender_models::envy::environment::get_secret_main_key()
+    let secret_key = textsender_models::envy::environment::get_secret_main_key().value;
-        .await
-        .value;
 
     let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256);
     validation.set_audience(&["textsender"]); // Must match exactly what's in the token

src/caller/instant.rs

@@ -81,18 +81,17 @@ pub mod endpoint {
                 match message_repo::get(&pool, &payload.message_id).await {
                     Ok(message) => {
                         println!("Valid message");
-                        let t_config =
+                        let t_config = match textsender_models::config::auxiliary::load_config() {
-                            match textsender_models::config::auxiliary::load_config().await {
+                            Ok(config) => config,
-                                Ok(config) => config,
+                            Err(err) => {
-                                Err(err) => {
+                                eprintln!("Error: {err:?}");
-                                    eprintln!("Error: {err:?}");
+                                response.message = String::from("Error getting config");
-                                    response.message = String::from("Error getting config");
+                                return (
-                                    return (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response),
-                                        axum::Json(response),
+                                );
-                                    );
+                            }
-                                }
+                        };
-                            };
                         let mut results: Vec<
                             textsender_models::message::event::MessageEventResponse,
                         > = Vec::new();
@@ -101,12 +100,18 @@ pub mod endpoint {
                             schedule_at: None,
                         };
 
+                        let mut sendmsg = swoosh::SendMsg::default();
+                        sendmsg.load_config(
+                            &t_config.auth_token,
+                            &t_config.phone_number,
+                            &t_config.service_sid,
+                            &t_config.account_sid,
+                        );
+
                         for contact in &contacts {
-                            match swoosh::twilio::api::send_message(
+                            sendmsg.load_message(&message.content);
-                                &message, contact, &pp, &t_config,
+                            sendmsg.load_recipient(&contact.phone_number);
-                            )
+                            match sendmsg.send_message(&pp).await {
-                            .await
-                            {
                                 Ok(result) => {
                                     let val = swoosh::twilio::api::response_to_json(result).await;
                                     let mer = textsender_models::message::event::MessageEventResponse {

src/config/mod.rs

@@ -33,6 +33,7 @@ pub mod init {
             let cors = tower_http::cors::CorsLayer::new()
                 .allow_methods([
                     axum::http::Method::GET,
+                    axum::http::Method::PATCH,
                     axum::http::Method::POST,
                     axum::http::Method::PUT,
                     axum::http::Method::DELETE,
@@ -49,7 +50,7 @@ pub mod init {
                 Ok("production") => {
                     // In production, allow only your specific, trusted origins
                     let allowed_origins_env =
-                        textsender_models::envy::environment::get_allowed_origins().await;
+                        textsender_models::envy::environment::get_allowed_origins();
                     match textsender_models::envy::utility::delimitize(&allowed_origins_env) {
                         Ok(alwd) => {
                             let allowed_origins: Vec<axum::http::HeaderValue> = alwd

src/db/mod.rs

@@ -5,9 +5,7 @@ pub mod connection_settings {
 }
 
 pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    let database_url = textsender_models::envy::environment::get_db_url()
+    let database_url = textsender_models::envy::environment::get_db_url().value;
-        .await
-        .value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()

src/repo/message/event.rs

@@ -96,7 +96,9 @@ async fn parse_row(
     let contact_id: uuid::Uuid = row.try_get("contact_id")?;
     let message_id: uuid::Uuid = row.try_get("message_id")?;
     let sent: time::OffsetDateTime = row.try_get("sent")?;
-    let scheduled_message_event_id: uuid::Uuid = row.try_get("scheduled_message_event_id")?;
+    let scheduled_message_event_id: Option<uuid::Uuid> = row
+        .try_get("scheduled_message_event_id")
+        .unwrap_or_default();
     let user_id: uuid::Uuid = row.try_get("user_id")?;
 
     Ok(textsender_models::message::event::MessageEventResponse {
@@ -106,7 +108,7 @@ async fn parse_row(
         message_id,
         status,
         sent: Some(sent),
-        scheduled_message_event_id: Some(scheduled_message_event_id),
+        scheduled_message_event_id,
         user_id,
     })
 }

tests/test.rs

@@ -6,9 +6,7 @@ mod db_mgr {
     pub const LIMIT: usize = 6;
 
     pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-        let tm_db_url = textsender_models::envy::environment::get_db_url()
+        let tm_db_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
         let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
         sqlx::PgPool::connect_with(tm_options).await
     }
@@ -20,9 +18,7 @@ mod db_mgr {
     }
 
     pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-        let db_url = textsender_models::envy::environment::get_db_url()
+        let db_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
         let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
         sqlx::PgPool::connect_with(options).await
     }
@@ -81,9 +77,7 @@ mod db_mgr {
     }
 
     pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-        let database_url = textsender_models::envy::environment::get_db_url()
+        let database_url = textsender_models::envy::environment::get_db_url().value;
-            .await
-            .value;
         let parsed_url = url::Url::parse(&database_url)?;
 
         if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
@@ -191,9 +185,7 @@ pub fn test_mer_response() -> serde_json::Value {
 }
 
 pub async fn test_token() -> Result<String, josekit::JoseError> {
-    let key: String = textsender_models::envy::environment::get_secret_main_key()
+    let key: String = textsender_models::envy::environment::get_secret_main_key().value;
-        .await
-        .value;
     let (message, issuer, audience) = token_fields();
 
     let token_resource = textsender_models::token::TokenResource {
@@ -203,8 +195,8 @@ pub async fn test_token() -> Result<String, josekit::JoseError> {
         user_id: TEST_USER_ID,
     };
 
-    match textsender_models::token::create_token(&key, &token_resource, time::Duration::hours(1)) {
+    match textsender_models::token::create_token(&key, token_resource, time::Duration::hours(1)) {
-        Ok((access_token, _some_time)) => Ok(access_token),
+        Ok(access_token) => Ok(access_token.access_token),
         Err(err) => Err(err),
     }
 }