bump: textsender_models

.gitea/workflows/pr.yml

@@ -14,10 +14,10 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -34,10 +34,10 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
@@ -55,10 +55,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |

.gitea/workflows/release.yml

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

.gitea/workflows/workflow.yml

@@ -14,10 +14,10 @@ jobs:
     name: Check
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -34,10 +34,10 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -54,10 +54,10 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
@@ -75,10 +75,10 @@ jobs:
     name: Clippy
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
@@ -96,10 +96,10 @@ jobs:
     name: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96.1
+          toolchain: 1.96
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh

Cargo.toml

@@ -1,16 +1,24 @@
 [package]
 name = "swoosh"
-version = "0.5.2"
+version = "0.4.2"
 edition = "2024"
-rust-version = "1.96.1"
+rust-version = "1.96"
 description = "Library to send text messages"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
+tokio = { version = "1.52.3", features = ["full"] }
+futures = { version = "0.3.32" }
+http = { version = "1.4.2" }
 reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] }
+rand = { version = "0.10.1" }
 time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
-base64-ng = { version = "1.3.5" }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.1", features = ["config", "contact", "message"] }
+uuid = { version = "1.23.3", features = ["v4", "serde"] }
+base64-ng = { version = "1.0.8" }
+const_format = { version = "0.2.36" }
+josekit = { version = "0.10.3" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10", features = ["config", "contact", "message"] }
 
 [dev-dependencies]
+tempfile = { version = "3.27.0" }

src/lib.rs

@@ -1,107 +1 @@
 pub mod twilio;
-
-#[derive(Default, Debug)]
-pub struct SendMsg {
-    config: VendorConfig,
-    message: Message,
-    recipient: Recipient,
-}
-
-impl SendMsg {
-    pub fn load_config(
-        &mut self,
-        auth_token: &str,
-        phone_number: &str,
-        service_sid: &str,
-        account_sid: &str,
-    ) {
-        self.config = VendorConfig {
-            auth_token: auth_token.to_string(),
-            phone_number: phone_number.to_string(),
-            service_sid: service_sid.to_string(),
-            account_sid: account_sid.to_string(),
-        }
-    }
-
-    pub fn load_message(&mut self, content: &str) {
-        self.message = Message {
-            content: content.to_string(),
-        }
-    }
-
-    pub fn load_recipient(&mut self, recpient: &str) {
-        self.recipient = Recipient {
-            phone_number: recpient.to_string(),
-        }
-    }
-
-    pub async fn send_message(
-        &self,
-        param: &crate::twilio::types::Parameters,
-    ) -> Result<reqwest::Response, std::io::Error> {
-        if self.recipient.phone_number.is_empty() {
-            Err(std::io::Error::other("Recipient not provided"))
-        } else if self.message.content.is_empty() {
-            Err(std::io::Error::other("Message not provided"))
-        } else if self.config.phone_number.is_empty()
-            || self.config.service_sid.is_empty()
-            || self.config.auth_token.is_empty()
-            || self.config.account_sid.is_empty()
-        {
-            Err(std::io::Error::other("Config not populated"))
-        } else {
-            let client = match reqwest::Client::builder().build() {
-                Ok(client) => client,
-                Err(err) => {
-                    return Err(std::io::Error::other(err));
-                }
-            };
-
-            let url = twilio::api::twilio_url(&self.config.account_sid);
-            let headers = match twilio::api::init_headers(
-                &self.config.account_sid,
-                &self.config.auth_token,
-            ) {
-                Ok(headers) => headers,
-                Err(err) => {
-                    return Err(std::io::Error::other(err));
-                }
-            };
-            let params = twilio::api::initial_params(
-                &self.recipient.phone_number,
-                &self.message.content,
-                &self.config.phone_number,
-                &self.config.service_sid,
-                param,
-            );
-            let request = client.post(url).headers(headers).form(&params);
-            match request.send().await {
-                Ok(response) => match response.status() {
-                    reqwest::StatusCode::CREATED => Ok(response),
-                    status => Err(std::io::Error::other(format!(
-                        "Unaccounted status: {status:?}"
-                    ))),
-                },
-                Err(err) => Err(std::io::Error::other(err)),
-            }
-        }
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct VendorConfig {
-    pub auth_token: String,
-    pub phone_number: String,
-    pub service_sid: String,
-    pub account_sid: String,
-}
-
-#[derive(Default, Debug)]
-pub struct Message {
-    pub content: String,
-}
-
-#[derive(Default, Debug)]
-pub struct Recipient {
-    pub phone_number: String,
-}

src/twilio/api/mod.rs

@@ -58,92 +58,6 @@ pub async fn send_message(
     }
 }
 
-pub fn twilio_url(account_sid: &str) -> String {
-    format!(
-        "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
-        account_sid
-    )
-}
-
-pub fn init_headers(
-    account_sid: &str,
-    auth_token: &str,
-) -> Result<reqwest::header::HeaderMap, std::io::Error> {
-    let mut headers = reqwest::header::HeaderMap::new();
-    headers.insert(
-        "Content-Type",
-        match "application/x-www-form-urlencoded".parse() {
-            Ok(value) => value,
-            Err(err) => {
-                return Err(std::io::Error::other(err));
-            }
-        },
-    );
-    let auth = match g_auth(account_sid, auth_token) {
-        Ok(auth) => auth,
-        Err(err) => {
-            return Err(std::io::Error::other(err));
-        }
-    };
-    headers.insert(
-        "Authorization",
-        match format!("Basic {auth}").parse() {
-            Ok(auth) => auth,
-            Err(err) => {
-                return Err(std::io::Error::other(err));
-            }
-        },
-    );
-
-    Ok(headers)
-}
-
-pub fn initial_params(
-    recpient: &str,
-    content: &str,
-    config_source_phone_number: &str,
-    config_service_sid: &str,
-    param: &crate::twilio::types::Parameters,
-) -> std::collections::HashMap<String, String> {
-    let now = time::OffsetDateTime::now_utc();
-    let mut params = std::collections::HashMap::new();
-    params.insert(String::from("To"), recpient.to_string());
-    params.insert(String::from("ProvideFeedback"), String::from("true"));
-    params.insert(String::from("ForceDelivery"), String::from("false"));
-    params.insert(String::from("ContentRetention"), String::from("retain"));
-    params.insert(String::from("AddressRetention"), String::from("obfuscate"));
-    params.insert(String::from("SmartEncoded"), String::from("true"));
-    params.insert(String::from("ShortenUrls"), String::from("true"));
-    let date = match param.schedule_at {
-        Some(date_value) => match convert_time_to_iso(date_value) {
-            Ok(converted) => converted,
-            Err(err) => {
-                eprintln!("Error: {err:?}");
-                String::new()
-            }
-        },
-        None => String::new(),
-    };
-    let scheduled_at = match param.schedule_at {
-        Some(s) => s,
-        None => time::OffsetDateTime::now_utc(),
-    };
-    if param.schedule && is_scheduleable(Some(&now), Some(&scheduled_at)) {
-        params.insert(String::from("ScheduleType"), String::from("fixed"));
-        params.insert(String::from("SendAt"), date.clone());
-    }
-    params.insert(String::from("SendAsMms"), String::from("true"));
-    params.insert(String::from("RiskCheck"), String::from("enable"));
-    params.insert(String::from("From"), config_source_phone_number.to_string());
-    params.insert(
-        String::from("MessagingServiceSid"),
-        config_service_sid.to_string(),
-    );
-    params.insert(String::from("Body"), content.to_string());
-
-    params
-}
-
 fn init_params(
     contact: &textsender_models::contact::Contact,
     message: &textsender_models::message::Message,
@@ -222,11 +136,6 @@ fn generate_auth(
     }
 }
 
-fn g_auth(account_sid: &str, auth_token: &str) -> Result<String, base64_ng::EncodeError> {
-    let input = format!("{}:{}", account_sid, auth_token);
-    base64_ng::encode(input.as_bytes())
-}
-
 const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
 
 fn is_scheduleable(