Updating package name (#7)

Reviewed-on: #7

.gitea/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - v0.3.x
+      - main
   pull_request:
     branches:
-      - v0.3.x
+      - main
 
 jobs:
   release:

.gitea/workflows/workflow.yml

@@ -3,10 +3,10 @@ name: swoosh Build
 on:
   push:
     branches:
-      - v0.3.x
+      - main
   pull_request:
     branches:
-      - v0.3.x
+      - main
 
 jobs:
   check:
@@ -17,6 +17,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -36,6 +37,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -55,6 +57,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -75,6 +78,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
+      - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -95,6 +99,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
+      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -105,4 +110,3 @@ jobs:
           ssh-add -v ~/.ssh/textsender-models_deploy_key
 
           cargo build
-

Cargo.lock

@@ -59,15 +59,15 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64-ng"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452b0c98385f31f08318109d6e06a859f89e0c5e38aad6103f095443b063052"
+checksum = "8992e20e420add1e6e31c6c548a4ba698ed9339bb0863b37478427179c56f05d"
 
 [[package]]
 name = "bitflags"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
 [[package]]
 name = "bumpalo"
@@ -862,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "lru-slab"
@@ -1573,7 +1573,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "swoosh"
-version = "0.2.1"
+version = "0.3.3"
 dependencies = [
  "base64-ng",
  "const_format",
@@ -1658,13 +1658,12 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.2.5"
-source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.2.5-v0.3.0-migrate-38dbcb09f7-111#38dbcb09f7c2c572f429ec382c01e14b72b1d615"
+version = "0.3.0"
+source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b"
 dependencies = [
  "const_format",
  "dotenvy",
  "josekit",
- "rand 0.10.1",
  "serde",
  "serde_json",
  "time",
@@ -2429,9 +2428,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "yoke"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swoosh"
-version = "0.2.1"
+version = "0.3.3"
 edition = "2024"
 rust-version = "1.95"
 description = "Library to send text messages"
@@ -18,7 +18,7 @@ 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.2.5-v0.3.0-migrate-38dbcb09f7-111" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.0" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -1,13 +1,18 @@
-// use josekit::jwk::alg::ec::EcCurve::P256;
-
 pub mod types;
 
+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 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<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
+) -> Result<reqwest::Response, 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() {
@@ -23,28 +28,18 @@ 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) => {
-                        let converted = date_value.to_string();
-                        converted
-                    }
+                    Some(date_value) => date_value.to_string(),
                     None => String::new(),
                 };
                 if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
@@ -62,38 +57,14 @@ 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
-                            .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))
-                            }
-                        }
-                        */
-                    }
+                    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.to_string())),
                 }
             }
@@ -112,18 +83,7 @@ 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");
@@ -136,74 +96,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     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(())
-}
 */
 
-/**
- 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
-    }
-}
-*/
+const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
 
 fn is_scheduleable(
     now: &Option<time::OffsetDateTime>,
@@ -213,9 +110,9 @@ fn is_scheduleable(
         Some(schedule_at) => {
             let early = now
                 .unwrap()
-                .checked_add(time::Duration::seconds(300))
+                .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
                 .unwrap();
-            if *schedule_at > early { true } else { false }
+            *schedule_at > early
         }
         None => false,
     }

src/twilio/api/types/mod.rs

@@ -3,20 +3,28 @@ pub struct TwilioAPIMessage {
     pub account_sid: String,
     pub api_version: String,
     pub body: String,
-    // pub date_created: time::OffsetDateTime,
+    #[serde(with = "time::serde::rfc3339::option")]
+    pub date_created: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
     pub date_sent: Option<time::OffsetDateTime>,
+    #[serde(with = "time::serde::rfc3339::option")]
     pub date_updated: Option<time::OffsetDateTime>,
     pub direction: String,
     // Not definite of what type this is
-    pub error_code: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_code: String,
     // Not definite of what type this is
-    pub error_message: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub error_message: String,
     pub from: String,
     pub messaging_service_sid: String,
     pub num_media: String,
     pub num_segments: String,
-    pub price: Option<String>,
-    pub price_unit: Option<String>,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub price: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub price_unit: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub sid: String,
     pub status: String,
     pub subresource_uris: SubresourceURI,
@@ -28,30 +36,3 @@ 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,8 +1,4 @@
-// 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)
+/// Parameters - Controls flow of sending message
 pub struct Parameters {
     pub schedule: bool,
     pub schedule_at: Option<time::OffsetDateTime>,