tsk-11: New code to send message (#13)

Closes #11

Reviewed-on: #13

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swoosh"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2024"
 rust-version = "1.96"
 description = "Library to send text messages"
@@ -8,17 +8,9 @@ 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"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
 base64-ng = { version = "1.0.8" }
-const_format = { version = "0.2.36" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.0", features = ["config", "contact", "message"] }
-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 +1,105 @@
 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,
+        auth_sid: &str,
+    ) {
+        self.config = VendorConfig {
+            auth_token: auth_token.to_string(),
+            phone_number: phone_number.to_string(),
+            service_sid: service_sid.to_string(),
+            auth_sid: auth_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.auth_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.auth_sid);
+            let headers =
+                match twilio::api::init_headers(&self.config.auth_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 auth_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,6 +58,92 @@ 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 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,
@@ -136,6 +222,11 @@ 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(