Update rust (#8)

Reviewed-on: #8

.github/workflows/pr.yml

@@ -0,0 +1,65 @@
+name: sender pr
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/deploy_key
+          cargo check
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add rustfmt
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/deploy_key
+          cargo fmt --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add clippy
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/deploy_key
+          cargo clippy -- -D warnings

.github/workflows/workflow.yml

@@ -3,10 +3,7 @@ name: sender Build
 on:
   push:
     branches:
-      - v0.1.x
+      - main
-  pull_request:
-    branches:
-      - v0.1.x
 
 jobs:
   check:
@@ -16,7 +13,8 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key
@@ -34,7 +32,8 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
         env:
           AUTH_SID: 'n9c43yr3f2c4743f7y4329dnq238f7'
           AUTH_TOKEN: '9nmc4820qf4cor838r4fy3o84rfy348fyr'
@@ -59,7 +58,8 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -78,7 +78,8 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -97,7 +98,8 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.95
+          toolchain: 1.96
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/deploy_key

Cargo.toml

@@ -1,17 +1,13 @@
 [package]
 name = "sender"
-version = "0.1.0"
+version = "0.1.4"
 edition = "2024"
-rust-version = "1.95"
+rust-version = "1.96.1"
 
 [dependencies]
-# uuid = { version = "1.23.1", features = ["v4", "serde"] }
+serde_json = { version = "1.0.150" }
-# serde = { version = "1.0.228", features = ["derive"] }
+tokio = { version = "1.52.3", features = ["full"] }
-serde_json = { version = "1.0.149" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.1", features = ["config", "contact", "envy", "message"] }
-tokio = { version = "1.52.2", features = ["full"] }
+swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.2" }
-futures = { version = "0.3.32" }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" }
-swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.3.1-main-ab01daafea-871" }
 
 [dev-dependencies]
-async-std = { version = "1.13.2" }

src/config/mod.rs

@@ -20,14 +20,14 @@ fn path_exists(path: &str) -> bool {
     file.exists()
 }
 
-pub async fn parse_config() -> (textsender_models::config::auxiliary::TwilioConfig, bool) {
+pub fn parse_config() -> (textsender_models::config::auxiliary::TwilioConfig, bool) {
     let mut config = textsender_models::config::auxiliary::TwilioConfig {
         ..Default::default()
     };
-    let auth_sid_var = textsender_models::envy::environment::get_env("AUTH_SID").await;
+    let auth_sid_var = textsender_models::envy::environment::get_env("AUTH_SID");
-    let auth_token_var = textsender_models::envy::environment::get_env("AUTH_TOKEN").await;
+    let auth_token_var = textsender_models::envy::environment::get_env("AUTH_TOKEN");
-    let phone_number_var = textsender_models::envy::environment::get_env("PHONE_NUMBER").await;
+    let phone_number_var = textsender_models::envy::environment::get_env("PHONE_NUMBER");
-    let service_sid_var = textsender_models::envy::environment::get_env("SERVICE_SID").await;
+    let service_sid_var = textsender_models::envy::environment::get_env("SERVICE_SID");
     config.account_sid = auth_sid_var.value;
     config.auth_token = auth_token_var.value;
     config.phone_number = phone_number_var.value;
@@ -46,7 +46,7 @@ pub async fn parse_config() -> (textsender_models::config::auxiliary::TwilioConf
 mod tests {
     #[test]
     fn test_parse_config() {
-        let (config, success) = async_std::task::block_on(super::parse_config());
+        let (config, success) = super::parse_config();
         assert!(success, "Config was not parsed");
         assert_eq!(
             false,

src/main.rs

@@ -17,7 +17,7 @@ async fn main() {
             println!("Message path: {m_path:?}");
             println!("Phone Number path: {n_path:?}");
 
-            let (config, success) = config::parse_config().await;
+            let (config, success) = config::parse_config();
             if !success {
                 eprintln!("Error parsing config");
             } else {

src/messaging/mod.rs

@@ -4,20 +4,28 @@ use textsender_models::message::Message;
 
 pub async fn send_messages(
     config: &TwilioConfig,
-    contacts: &Vec<Contact>,
+    contacts: &[Contact],
     message: &Message,
     second_interval: u64,
 ) {
     let long_sleep_limit: i64 = 5;
-    let mut count: i64 = 0;
 
-    for contact in contacts.iter() {
+    for (text_count, contact) in (0_i64..).zip(contacts.iter()) {
         println!("Sending to: {:?}", contact.phone_number);
         let param = swoosh::twilio::types::Parameters {
             schedule: false,
             schedule_at: None,
         };
-        match swoosh::twilio::api::send_mssage(message, contact, param, config).await {
+        let mut sendmsg = swoosh::SendMsg::default();
+        sendmsg.load_config(
+            &config.auth_token,
+            &config.phone_number,
+            &config.service_sid,
+            &config.account_sid,
+        );
+        sendmsg.load_recipient(&contact.phone_number);
+        sendmsg.load_message(&message.content);
+        match sendmsg.send_message(&param).await {
             Ok(response) => {
                 println!("Raw response: {response:?}");
                 let val = swoosh::twilio::api::response_to_json(response).await;
@@ -28,7 +36,7 @@ pub async fn send_messages(
             }
         }
 
-        if count % long_sleep_limit == 0 {
+        if text_count % long_sleep_limit == 0 {
             // Sleep for X seconds
             let wait_time = second_interval;
             std::thread::sleep(std::time::Duration::from_secs(wait_time));
@@ -36,8 +44,6 @@ pub async fn send_messages(
             // Sleep for a second
             std::thread::sleep(std::time::Duration::from_secs(1));
         }
-
-        count += 1;
     }
 }