Send message (#4)

Reviewed-on: #4

.gitea/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Go Release
+name: Release Tagging
 
 on:
   push:
@@ -9,27 +9,28 @@ on:
       - main
 
 jobs:
-  build-and-release:
+  release:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
         with:
-          go-version: '1.25.3'
+          fetch-depth: 0 # Important for git describe --tags
 
-      - name: Create version
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.95
+          components: cargo
+
+      - name: Extract Version from Cargo.toml
         id: version
         run: |
-          echo "Creating version"
-
-          VERSION="0.0.1"
+          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-556"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-871"
 
           echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
 

.gitea/workflows/workflow.yaml

@@ -1,42 +0,0 @@
-name: Go CI
-
-on: [push, pull_request] # Triggers on push or pull request events
-
-jobs:
-  test:
-    name: Test and Lint
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v5
-
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.25.3'
-      - name: Configure Git for SSH
-        run: |
-          git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/"
-          go env -w GOPRIVATE=git.kundeng.us/phoenix/*
-
-      - name: Download dependencies
-        run: |
-          echo "Initializing config"
-          mkdir -p ~/.ssh
-          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/swoosh_deploy_key
-          chmod 600 ~/.ssh/swoosh_deploy_key
-          ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
-
-          eval $(ssh-agent -s)
-          ssh-add -v ~/.ssh/swoosh_deploy_key
-
-          go mod download
-
-      - name: Run tests
-        run: go test -v ./... # Runs all tests in the project
-
-      - name: Run linter
-        uses: https://github.com/golangci/golangci-lint-action@v8
-        with:
-          go-version: '1.25.3'
-          version: latest

.gitea/workflows/workflow.yml

@@ -0,0 +1,108 @@
+name: swoosh Build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+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 ${{ secrets.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 ${{ secrets.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 ${{ 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.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 ${{ secrets.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 ${{ secrets.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.3.0"
+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.2.5-v0.3.0-migrate-38dbcb09f7-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,123 @@
+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> {
+    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("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(),
+                    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::OK => 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");
+
+    let response = request.send().await?;
+    let body = response.text().await?;
+    println!("{}", body);
+
+    Ok(())
+}
+*/
+
+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();
+            *schedule_at > early
+        }
+        None => false,
+    }
+}

src/twilio/api/types/mod.rs

@@ -0,0 +1,38 @@
+#[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/mod.rs

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

src/twilio/types/mod.rs

@@ -0,0 +1,5 @@
+/// Parameters - Controls flow of sending message
+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
-}