Added release workflow

.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:

.gitea/workflows/workflow.yml

@@ -3,10 +3,10 @@ name: swoosh Build
 on:
   push:
     branches:
-      - main
+      - v0.3.x
   pull_request:
     branches:
-      - main
+      - v0.3.x
 
 jobs:
   check:
@@ -17,12 +17,11 @@ 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
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -37,12 +36,11 @@ 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
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -57,13 +55,12 @@ 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
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -78,13 +75,12 @@ 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
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
@@ -99,14 +95,14 @@ 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
           chmod 600 ~/.ssh/textsender-models_deploy_key
-          ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
+          ssh-keyscan ${{ secret.MYHOST }} >> ~/.ssh/known_hosts
 
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/textsender-models_deploy_key
 
           cargo build
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swoosh"
-version = "0.3.2"
+version = "0.2.1"
 edition = "2024"
 rust-version = "1.95"
 description = "Library to send text messages"
@@ -8,17 +8,12 @@ description = "Library to send text messages"
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.149" }
-tokio = { version = "1.52.2", features = ["full"] }
-futures = { version = "0.3.32" }
-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.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.3.0" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0-20-15820d5505-111" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -1,119 +1 @@
 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<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() {
-        Err(std::io::Error::other(" Auth token is empty"))
-    } else {
-        let now = time::OffsetDateTime::now_utc();
-        match reqwest::Client::builder().build() {
-            Ok(client) => {
-                let mut headers = reqwest::header::HeaderMap::new();
-                headers.insert(
-                    "Content-Type",
-                    "application/x-www-form-urlencoded".parse().unwrap(),
-                );
-                headers.insert("Accept", "application/json".parse().unwrap());
-                let auth = generate_auth(config).unwrap();
-                headers.insert("Authorization", auth.parse().unwrap());
-
-                let mut params = std::collections::HashMap::new();
-                params.insert("To", contact.phone_number.as_str());
-                params.insert("ProvideFeedback", "true");
-                params.insert("ForceDelivery", "false");
-                params.insert("ContentRetention", "retain");
-                params.insert("AddressRetention", "obfuscate");
-                params.insert("SmartEncoded", "true");
-                params.insert("ShortenUrls", "true");
-                let date = match param.schedule_at {
-                    Some(date_value) => date_value.to_string(),
-                    None => String::new(),
-                };
-                if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
-                    params.insert("ScheduleType", "fixed");
-                    params.insert("SendAt", date.as_str());
-                }
-                params.insert("SendAsMms", "true");
-                params.insert("RiskCheck", "enable");
-                params.insert("From", config.phone_number.as_str());
-                params.insert("MessagingServiceSid", config.service_sid.as_str());
-                params.insert("Body", msg.content.as_str());
-
-                let url = format!(
-                    "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
-                    config.account_sid
-                );
-
-                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.to_string())),
-                }
-            }
-            Err(err) => Err(std::io::Error::other(err.to_string())),
-        }
-    }
-}
-
-fn generate_auth(
-    config: &textsender_models::config::auxiliary::TwilioConfig,
-) -> Result<String, base64_ng::EncodeError> {
-    let input = format!("{}:{}", config.account_sid, config.auth_token);
-    match base64_ng::encode(input.as_bytes()) {
-        Ok(encoded) => Ok(format!("Basic {encoded}")),
-        Err(err) => Err(err),
-    }
-}
-/*
-    let mut params = std::collections::HashMap::new();
-    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");
-    params.insert("SendAsMms", "true");
-    params.insert("RiskCheck", "enable");
-*/
-
-const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
-
-fn is_scheduleable(
-    now: &Option<time::OffsetDateTime>,
-    scheduled: &Option<time::OffsetDateTime>,
-) -> bool {
-    match scheduled {
-        Some(schedule_at) => {
-            let early = now
-                .unwrap()
-                .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
-                .unwrap();
-            *schedule_at > early
-        }
-        None => false,
-    }
-}

src/twilio/api/types/mod.rs

@@ -1,38 +0,0 @@
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
-pub struct TwilioAPIMessage {
-    pub account_sid: String,
-    pub api_version: String,
-    pub body: String,
-    #[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
-    #[serde(skip_serializing_if = "String::is_empty")]
-    pub error_code: String,
-    // Not definite of what type this is
-    #[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,
-    #[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,
-    pub to: String,
-    pub uri: String,
-}
-
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
-pub struct SubresourceURI {
-    pub media: String,
-}

src/twilio/types/mod.rs

@@ -1,5 +0,0 @@
-/// Parameters - Controls flow of sending message
-pub struct Parameters {
-    pub schedule: bool,
-    pub schedule_at: Option<time::OffsetDateTime>,
-}