Fixed variable in workflow

Reviewed-on: #3

.gitea/workflows/release.yml

@@ -0,0 +1,57 @@
+name: Release Tagging
+
+on:
+  push:
+    branches:
+      - v0.3.x
+  pull_request:
+    branches:
+      - v0.3.x
+
+jobs:
+  release:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # Important for git describe --tags
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.95
+          components: cargo
+
+      - name: Extract Version from Cargo.toml
+        id: version
+        run: |
+          VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
+          PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
+          BRANCH_REF="${{ gitea.ref }}"
+          BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-871"
+
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
+
+          echo "Version: $VERSION"
+          echo "Hash: $PROJECT_COMMIT_HASH"
+          echo "Branh ref: $BRANCH_REF"
+          echo "Branch: $BRANCH_NAME"
+          echo "Tag Release: $PROJECT_TAG_RELEASE"
+
+      - name: Print version
+        id: Version
+        run: |
+          echo "Printing version"
+          echo "Version: ${{ steps.version.outputs.project_tag_release }}"
+
+      - name: Create GitHub Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.version.outputs.project_tag_release }}
+          release_name: Release ${{ steps.version.outputs.project_tag_release }}
+          body: |
+           Release of version ${{ steps.version.outputs.project_tag_release }}

.gitea/workflows/workflow.yml

@@ -0,0 +1,108 @@
+name: swoosh Build
+
+on:
+  push:
+    branches:
+      - v0.3.x
+  pull_request:
+    branches:
+      - v0.3.x
+
+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.95
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
+          chmod 600 ~/.ssh/textsender-models_deploy_key
+          ssh-keyscan ${{ secret.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo check
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.95
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
+          chmod 600 ~/.ssh/textsender-models_deploy_key
+          ssh-keyscan ${{ secret.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo test
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.95
+      - 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 ${{ secret.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.95
+      - 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 ${{ secret.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo clippy -- -D warnings
+
+  build:
+    name: build
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.95
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
+          chmod 600 ~/.ssh/textsender-models_deploy_key
+          ssh-keyscan ${{ secret.MY_HOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/textsender-models_deploy_key
+
+          cargo build
+

.gitignore

@@ -1 +1 @@
-/vendor
+target/

Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "swoosh"
+version = "0.2.1"
+edition = "2024"
+rust-version = "1.95"
+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-20-15820d5505-111" }
+
+[dev-dependencies]
+tempfile = { version = "3.27.0" }

README.md

@@ -1,2 +0,0 @@
-# Swoosh
-`swoosh` is a library used to send text messages

go.mod

@@ -1,7 +0,0 @@
-module git.kundeng.us/phoenix/swoosh
-
-go 1.25.3
-
-require git.kundeng.us/phoenix/textsender-models v0.0.6-main-28b29802b9-556
-
-require github.com/google/uuid v1.6.0 // indirect

go.sum

@@ -1,4 +0,0 @@
-git.kundeng.us/phoenix/textsender-models v0.0.6-main-28b29802b9-556 h1:2NI8cXaxt2rsXrhy/rDhgoOzvjLQwbhwr4nv2g35Ah8=
-git.kundeng.us/phoenix/textsender-models v0.0.6-main-28b29802b9-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

src/lib.rs

@@ -0,0 +1 @@
+pub mod twilio;

src/twilio/api/mod.rs

@@ -0,0 +1,229 @@
+// use josekit::jwk::alg::ec::EcCurve::P256;
+
+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<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
+    if config.account_sid.is_nil() {
+        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", "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
+                    }
+                    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 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))
+                            }
+                        }
+                        */
+                    }
+                    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)
+        }
+    }
+}
+/*
+#[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");
+    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("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
+    }
+}
+*/
+
+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(300)).unwrap();
+            if *schedule_at > early {
+                true
+            } else {
+                false
+            }
+        }
+        None => {
+            false
+        }
+    }
+}

src/twilio/api/types/mod.rs

@@ -0,0 +1,57 @@
+#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+pub struct TwilioAPIMessage {
+    pub account_sid: String,
+    pub api_version: String,
+    pub body: String,
+    // pub date_created: time::OffsetDateTime,
+    pub date_sent: Option<time::OffsetDateTime>,
+    pub date_updated: Option<time::OffsetDateTime>,
+    pub direction: String,
+    // Not definite of what type this is
+    pub error_code: Option<String>,
+    // Not definite of what type this is
+    pub error_message: Option<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>,
+    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,
+}
+
+/*
+{
+    "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/mod.rs

@@ -0,0 +1,2 @@
+pub mod api;
+pub mod types;

src/twilio/types/mod.rs

@@ -0,0 +1,9 @@
+// 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>,
+}

swoop/send/sender.go

@@ -1,19 +0,0 @@
-package send
-
-import (
-	"fmt"
-
-	"git.kundeng.us/phoenix/textsender-models/pkg/contact"
-)
-
-type MessageSender struct {
-	Numbers []contact.Contact
-}
-
-
-func (m *MessageSender) Send() error {
-	if len(m.Numbers) == 0 {
-		return fmt.Errorf("No numbers to send")
-	}
-	return nil
-}