Changed types

.gitea/workflows/pr.yml

@@ -1,73 +0,0 @@
-name: swoosh pr
-
-on:
-  pull_request:
-    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-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo check
-
-  fmt:
-    name: Rustfmt
-    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: rustup component add rustfmt
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    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: rustup component add clippy
-      - run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
-          chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/textsender-models_deploy_key
-
-          cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
+      - v0.3.x
   pull_request:
     branches:
-      - main
+      - v0.3.x
 
 jobs:
   release:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/workflow.yml

@@ -3,11 +3,10 @@ name: swoosh Build
 on:
   push:
     branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - v0.3.x
+  pull_request:
+    branches:
+      - v0.3.x
 
 jobs:
   check:
@@ -17,8 +16,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -37,8 +35,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -57,8 +54,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -78,8 +74,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -99,8 +94,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
+          toolchain: 1.95
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -111,3 +105,4 @@ jobs:
           ssh-add -v ~/.ssh/textsender-models_deploy_key
 
           cargo build
+

Cargo.toml

@@ -1,24 +1,24 @@
 [package]
 name = "swoosh"
-version = "0.4.1"
+version = "0.2.1"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.95"
 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"] }
+serde_json = { version = "1.0.149" }
+tokio = { version = "1.52.2", features = ["full"] }
 futures = { version = "0.3.32" }
-http = { version = "1.4.2" }
-reqwest = { version = "0.13.4", features = ["form", "json", "blocking", "multipart", "stream"] }
+http = { version = "1.4.0" }
+reqwest = { version = "0.13.3", features = ["form", "json", "blocking", "multipart", "stream"] }
 rand = { version = "0.10.1" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
-base64-ng = { version = "1.0.8" }
+time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
+base64-ng = { version = "1.0.6" }
 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.3-29-384dd41690-111", features = ["config", "contact", "message"] }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -1,18 +1,13 @@
-pub mod types;
+// use josekit::jwk::alg::ec::EcCurve::P256;
 
-pub async fn response_to_json(response: reqwest::Response) -> serde_json::Value {
-    match response.json().await {
-        Ok(json_body) => json_body,
-        Err(_err) => serde_json::Value::Null,
-    }
-}
+pub mod types;
 
 pub async fn send_mssage(
     msg: &textsender_models::message::Message,
     contact: &textsender_models::contact::Contact,
     param: crate::twilio::types::Parameters,
     config: &textsender_models::config::auxiliary::TwilioConfig,
-) -> Result<reqwest::Response, std::io::Error> {
+) -> Result<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
     if config.account_sid.is_empty() {
         Err(std::io::Error::other("Account SID is empty"))
     } else if config.auth_token.is_empty() {
@@ -28,18 +23,28 @@ pub async fn send_mssage(
                 );
                 headers.insert("Accept", "application/json".parse().unwrap());
                 let auth = generate_auth(config).unwrap();
+                // headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
                 headers.insert("Authorization", auth.parse().unwrap());
 
                 let mut params = std::collections::HashMap::new();
                 params.insert("To", contact.phone_number.as_str());
+                // params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
+                // params.insert("MaxPrice", "1");
                 params.insert("ProvideFeedback", "true");
+                // params.insert("Attempt", "5");
+                // params.insert("ValidityPeriod", "1537");
                 params.insert("ForceDelivery", "false");
                 params.insert("ContentRetention", "retain");
                 params.insert("AddressRetention", "obfuscate");
                 params.insert("SmartEncoded", "true");
+                // params.insert("PersistentAction", "string");
+                // params.insert("PersistentAction", "string");
                 params.insert("ShortenUrls", "true");
                 let date = match param.schedule_at {
-                    Some(date_value) => date_value.to_string(),
+                    Some(date_value) => {
+                        let converted = date_value.to_string();
+                        converted
+                    }
                     None => String::new(),
                 };
                 if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
@@ -57,14 +62,38 @@ pub async fn send_mssage(
                     config.account_sid
                 );
 
+                // let client = reqwest::Client::new();
+                /*
+                let request = client.request(reqwest::Method::POST, url)
+                    .headers(headers)
+                    .form(&params);
+                        */
                 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:?}"
-                        ))),
-                    },
+                    Ok(response) => {
+                        match response
+                            .json::<crate::twilio::api::types::TwilioAPIMessage>()
+                            .await
+                        {
+                            Ok(resp) => Ok(resp),
+                            Err(err) => Err(std::io::Error::other(err)),
+                        }
+                        /*
+                        match response.text().await {
+                            Ok(body) => {
+                                let mut obj = crate::twilio::api::types::TwilioAPIMessage {
+                                    ..Default::default()
+                                };
+
+                                Ok(obj)
+                            }
+                            Err(err) => {
+                                Err(std::io::Error::other(err))
+                            }
+                        }
+                        */
+                    }
                     Err(err) => Err(std::io::Error::other(err.to_string())),
                 }
             }
@@ -83,7 +112,18 @@ fn generate_auth(
     }
 }
 /*
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let client = reqwest::Client::builder()
+        .build()?;
+
+    let mut headers = reqwest::header::HeaderMap::new();
+    headers.insert("Content-Type", "application/x-www-form-urlencoded".parse()?);
+    headers.insert("Accept", "application/json".parse()?);
+    headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
+
     let mut params = std::collections::HashMap::new();
+    params.insert("To", "16303831708");
     params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
     params.insert("MaxPrice", "1");
     params.insert("ProvideFeedback", "true");
@@ -96,11 +136,74 @@ fn generate_auth(
     params.insert("PersistentAction", "string");
     params.insert("PersistentAction", "string");
     params.insert("ShortenUrls", "true");
+    params.insert("ScheduleType", "fixed");
+    params.insert("SendAt", "2026-06-03T19:50:00.0Z");
     params.insert("SendAsMms", "true");
     params.insert("RiskCheck", "enable");
+    params.insert("From", "12243026041");
+    params.insert("MessagingServiceSid", "MG803f3676706b92eb02e18dd820c447f2");
+    params.insert("Body", "This is a test");
+
+    let request = client.request(reqwest::Method::POST, "https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json")
+        .headers(headers)
+        .form(&params);
+
+    let response = request.send().await?;
+    let body = response.text().await?;
+
+    println!("{}", body);
+
+    Ok(())
+}
 */
 
-const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
+/**
+ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
+    if m.Config == nil {
+        return nil, nil, fmt.Errorf("Config has not been initialized")
+    }
+    now := time.Now()
+    client := twilio.NewRestClientWithParams(twilio.ClientParams{
+        Username: m.Config.AccountSID,
+        Password: m.Config.AuthToken,
+    })
+
+    params := &twilioApi.CreateMessageParams{}
+    params.SetTo(number.PhoneNumber)
+    params.SetFrom(m.Config.Number)
+    params.SetMessagingServiceSid(m.Config.ServiceSID)
+    params.SetBody(msg.Content)
+    if sendTime != nil && isSchedulable(&now, sendTime) {
+        params.SetSendAt(*sendTime)
+        params.SetScheduleType(Schedule_Type)
+    }
+
+    if resp, err := client.Api.CreateMessage(params); err != nil {
+        return nil, nil, fmt.Errorf("Error sending message: %v", err)
+    } else {
+        if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
+            return nil, nil, fmt.Errorf("Error parsing result: %v", err)
+        } else {
+            var rawObject map[string]any
+            if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
+                return resp, nil, err
+            } else {
+                return resp, rawObject, nil
+            }
+        }
+    }
+}
+
+func isSchedulable(now *time.Time, scheduled *time.Time) bool {
+    early := now.Add(Schedulable_Limit_In_Seconds * time.Second)
+
+    if scheduled.After(early) {
+        return true
+    } else {
+        return false
+    }
+}
+*/
 
 fn is_scheduleable(
     now: &Option<time::OffsetDateTime>,
@@ -110,9 +213,9 @@ fn is_scheduleable(
         Some(schedule_at) => {
             let early = now
                 .unwrap()
-                .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
+                .checked_add(time::Duration::seconds(300))
                 .unwrap();
-            *schedule_at > early
+            if *schedule_at > early { true } else { false }
         }
         None => false,
     }

src/twilio/api/types/mod.rs

@@ -36,3 +36,30 @@ pub struct TwilioAPIMessage {
 pub struct SubresourceURI {
     pub media: String,
 }
+
+/*
+{
+    "account_sid": "ACefa1ef516314c9d1a68cbd657de49277",
+    "api_version": "2010-04-01",
+    "body": "This is a test",
+    "date_created": "Wed, 03 Jun 2026 19:40:55 +0000",
+    "date_sent": null,
+    "date_updated": "Wed, 03 Jun 2026 19:40:55 +0000",
+    "direction": "outbound-api",
+    "error_code": null,
+    "error_message": null,
+    "from": "+12243026041",
+    "messaging_service_sid": "MG803f3676706b92eb02e18dd820c447f2",
+    "num_media": "0",
+    "num_segments": "0",
+    "price": null,
+    "price_unit": null,
+    "sid": "SMf5c09c776c931bdb00c6e274da2ce34d",
+    "status": "scheduled",
+    "subresource_uris": {
+        "media": "/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SMf5c09c776c931bdb00c6e274da2ce34d/Media.json"
+    },
+    "to": "+16303831708",
+    "uri": "/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SMf5c09c776c931bdb00c6e274da2ce34d.json"
+}
+*/

src/twilio/types/mod.rs

@@ -1,4 +1,8 @@
-/// Parameters - Controls flow of sending message
+// Things needed to send a message
+// Contact - Receipient to send to (textsender-models)
+// Message - The content to sent (textsender-models)
+// Parameters - Controls flow of sending message
+// Config - Contains info needed to send message (textsender-models)
 pub struct Parameters {
     pub schedule: bool,
     pub schedule_at: Option<time::OffsetDateTime>,