From d03c63bd5d1db095290dbd6cb43dc0c3a57ab69b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 20 Jun 2026 23:21:11 -0400 Subject: [PATCH 01/24] Flood (#3) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/3 --- .dockerignore.yaml | 6 - .env.docker.sample | 2 +- .gitea/workflows/workflow.yaml | 46 ----- .gitignore | 6 - Dockerfile | 46 ----- Makefile | 22 --- README.md | 8 - cmd/catapult/main.go | 39 ---- docker-compose.taml | 11 -- go.mod | 17 -- go.sum | 49 ----- internal/app/app.go | 81 --------- internal/config/version.go | 12 -- internal/service/auth.go | 98 ---------- internal/service/contact.go | 58 ------ internal/service/core/service.go | 187 -------------------- internal/service/message.go | 58 ------ internal/service/message_event_response.go | 58 ------ internal/service/queue.go | 54 ------ internal/service/scheduled_message_event.go | 58 ------ internal/service/scheduler.go | 69 -------- internal/version/version.go | 17 -- 22 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 .dockerignore.yaml delete mode 100644 .gitea/workflows/workflow.yaml delete mode 100644 .gitignore delete mode 100644 Dockerfile delete mode 100644 Makefile delete mode 100644 README.md delete mode 100644 cmd/catapult/main.go delete mode 100644 docker-compose.taml delete mode 100644 go.mod delete mode 100644 go.sum delete mode 100644 internal/app/app.go delete mode 100644 internal/config/version.go delete mode 100644 internal/service/auth.go delete mode 100644 internal/service/contact.go delete mode 100644 internal/service/core/service.go delete mode 100644 internal/service/message.go delete mode 100644 internal/service/message_event_response.go delete mode 100644 internal/service/queue.go delete mode 100644 internal/service/scheduled_message_event.go delete mode 100644 internal/service/scheduler.go delete mode 100644 internal/version/version.go diff --git a/.dockerignore.yaml b/.dockerignore.yaml deleted file mode 100644 index fb2ce37..0000000 --- a/.dockerignore.yaml +++ /dev/null @@ -1,6 +0,0 @@ -vendor/ - -.git/ -.gitea/ - -.env diff --git a/.env.docker.sample b/.env.docker.sample index e08b415..f86159a 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -4,5 +4,5 @@ SERVICE_USERNAME=suave SERVICE_PASSPHRASE=9238urc9328nr329 TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T -TWILIO_AUTH_TOKEN="f4a1f2b0b79ea3735078c2d8ee9684e1" +TWILIO_AUTH_TOKEN="OJ8mU98U8UUU098u0U08kd9IDKaeoijtritjerDFISFGOS" TWILIO_PHONE_NUMBER=10123456789 diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml deleted file mode 100644 index 6cfc2d9..0000000 --- a/.gitea/workflows/workflow.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: Go - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - runs-on: ubuntu-24.04 # You can change this to macos-latest or windows-latest if needed - - steps: - - uses: actions/checkout@v5 - - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version: '1.26.2' - - - name: Build - run: | - echo "Initializing config" - 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 - - go env -w GOPRIVATE='${{ secrets.GIT_HOST_ROOT }}' - - echo "Creating local .gitconfig" - touch ~/.gitconfig - cat > ~/.gitconfig << "EOF" - [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] - insteadOf = https://${{ secrets.GIT_HOST_ROOT }} - [url "ssh://git@${{ secrets.GIT_HOST_ROOT }}"] - insteadOf = http://${{ secrets.GIT_HOST_ROOT }} - EOF - - make build - - - name: Test - run: go test -v ./... diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 09d314c..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -catapult -/vendor - -.env -.env.local -.env.docker diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8effff8..0000000 --- a/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM golang:1.26.2 AS builder - -WORKDIR /app - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - openssh-client git - -RUN mkdir -p -m 0700 ~/.ssh && \ - ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts - -# Configure Git to use SSH for GitHub -RUN git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/" && \ - git config --global url."git@git.kundeng.us:".insteadOf "http://git.kundeng.us/" - -# Set up the Go environment for private modules -ENV GOPRIVATE=git.kundeng.us - -# Copy go mod and sum files -COPY go.mod go.sum ./ - -RUN --mount=type=ssh mkdir src && \ - go mod download - -# Copy source code -COPY ./cmd ./cmd -COPY ./internal ./internal -COPY ./Makefile . -COPY ./.env . - -# Build the application -RUN CGO_ENABLED=0 GOOS=linux make build - -# Runtime stage -FROM alpine:latest AS production - -RUN apk --no-cache add ca-certificates - -WORKDIR /root/ - -# Copy the pre-built binary file from the previous stage -COPY --from=builder /app/catapult . -COPY --from=builder /app/.env ./ - -# Command to run the executable -CMD ["./catapult"] diff --git a/Makefile b/Makefile deleted file mode 100644 index a189b6c..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -VERSION ?= $(shell git describe --tags 2>/dev/null || echo "dev") -COMMIT ?= $(shell git rev-parse --short HEAD) -BUILD_TIME ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ) -GO_VERSION ?= $(shell go version | awk '{print $$3}') - -.PHONY: build -build: - go build -ldflags="\ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.GoVersion=$(GO_VERSION)'" \ - -o catapult cmd/catapult/main.go - -.PHONY: install -install: - go install -ldflags="\ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Version=$(VERSION)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.BuildTime=$(BUILD_TIME)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.Commit=$(COMMIT)' \ - -X 'git.kundeng.us/phoenix/catapult/internal/version.GoVersion=$(GO_VERSION)'" - -o catapult cmd/catapult/main.go diff --git a/README.md b/README.md deleted file mode 100644 index cd19078..0000000 --- a/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Catapult -A service used to send text messages - - -Building the service -``` -make build -``` diff --git a/cmd/catapult/main.go b/cmd/catapult/main.go deleted file mode 100644 index f5cb847..0000000 --- a/cmd/catapult/main.go +++ /dev/null @@ -1,39 +0,0 @@ -package main - -import ( - "fmt" - "log" - "os" - "os/signal" - "syscall" - - "git.kundeng.us/phoenix/catapult/internal/app" - "git.kundeng.us/phoenix/catapult/internal/config" - "git.kundeng.us/phoenix/catapult/internal/service/core" - "git.kundeng.us/phoenix/catapult/internal/version" -) - -func main() { - log.Println(app.App_Name) - - versionFlag := config.CheckVersionFlag() - if *versionFlag { - fmt.Println(version.String()) - return - } - - myApp, err := app.Load() - if err != nil { - log.Println("Error loading app: %w", err) - return - } - - service := core.NewService(myApp) - sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) - - service.Start() - - <-sigChan - service.Stop() -} diff --git a/docker-compose.taml b/docker-compose.taml deleted file mode 100644 index 40c3e93..0000000 --- a/docker-compose.taml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3.8' # Use a recent version - -services: - catapult_service: - build: # Tells docker-compose to build the Dockerfile in the current directory - context: . - ssh: ["default"] # Uses host's SSH agent - container_name: catapult # Optional: Give the container a specific name - env_file: - - .env - restart: unless-stopped # Optional: Restart policy diff --git a/go.mod b/go.mod deleted file mode 100644 index dfbc149..0000000 --- a/go.mod +++ /dev/null @@ -1,17 +0,0 @@ -module git.kundeng.us/phoenix/catapult - -go 1.26.2 - -require ( - git.kundeng.us/phoenix/swoosh v0.2.1 - git.kundeng.us/phoenix/textsender-models v0.2.1 - github.com/google/uuid v1.6.0 - github.com/joho/godotenv v1.5.1 -) - -require ( - github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/golang/mock v1.6.0 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/twilio/twilio-go v1.30.5 // indirect -) diff --git a/go.sum b/go.sum deleted file mode 100644 index 920c35b..0000000 --- a/go.sum +++ /dev/null @@ -1,49 +0,0 @@ -git.kundeng.us/phoenix/swoosh v0.2.1 h1:mJ/zXBOqzi0YTrSm5kxvahzp2WH7lx4R3iIO0s9VFFI= -git.kundeng.us/phoenix/swoosh v0.2.1/go.mod h1:81XNzmTmDPuDPmXMUmKTLErNSKKBM+hsW5U60Lm78ww= -git.kundeng.us/phoenix/textsender-models v0.2.1 h1:21br4NF58aUFuCx8laKxC5RvZMl4GsSIaMX4bvf5plw= -git.kundeng.us/phoenix/textsender-models v0.2.1/go.mod h1:nu5QWy9o+spx/t9NFipaGmF5qiBJS/0QhxyCjoi3Z3E= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= -github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -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= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275 h1:IZycmTpoUtQK3PD60UYBwjaCUHUP7cML494ao9/O8+Q= -github.com/localtunnel/go-localtunnel v0.0.0-20170326223115-8a804488f275/go.mod h1:zt6UU74K6Z6oMOYJbJzYpYucqdcQwSMPBEdSvGiaUMw= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/twilio/twilio-go v1.30.5 h1:hi6+2kMte29zrFBsw7VSSNtbF30GPMGz/4LRIUgXng8= -github.com/twilio/twilio-go v1.30.5/go.mod h1:QbitvbvtkV77Jn4BABAKVmxabYSjMyQG4tHey9gfPqg= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/app/app.go b/internal/app/app.go deleted file mode 100644 index 10e27aa..0000000 --- a/internal/app/app.go +++ /dev/null @@ -1,81 +0,0 @@ -package app - -import ( - "fmt" - "os" - "path" - - auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary" - "github.com/joho/godotenv" -) - -const App_Name = "catapult" - -type App struct { - ApiUrl string - AuthUrl string - ServiceUsername string - ServicePassphrase string - TwilioConfig *auxcfg.TwilioConfig -} - -func Load() (*App, error) { - err := godotenv.Load() - if err != nil { - cwd, _ := os.Getwd() - envPath := path.Join(cwd, "../..", ".env") - if err = godotenv.Load(envPath); err != nil { - prevPath := path.Join(envPath, "../..", ".env") - if err = godotenv.Load(prevPath); err != nil { - return nil, fmt.Errorf("Error loading .env file: %w", err) - } - } - } - - apiUrl := os.Getenv("API_URL") - authUrl := os.Getenv("AUTH_URL") - serviceUsername := os.Getenv("SERVICE_USERNAME") - servicePassphrase := os.Getenv("SERVICE_PASSPHRASE") - - if len(apiUrl) == 0 { - return nil, fmt.Errorf("Api Url not provided") - } else if len(authUrl) == 0 { - return nil, fmt.Errorf("Auth url not provided") - } else if len(serviceUsername) == 0 { - return nil, fmt.Errorf("Service username not provided") - } else if len(servicePassphrase) == 0 { - return nil, fmt.Errorf("Service passphrase not provided") - } else { - if cfg, err := loadTwilioConfig(); err != nil { - return nil, err - } else { - return &App{ - ApiUrl: apiUrl, AuthUrl: authUrl, ServiceUsername: serviceUsername, ServicePassphrase: servicePassphrase, TwilioConfig: cfg, - }, nil - } - } -} - -func loadTwilioConfig() (*auxcfg.TwilioConfig, error) { - authSid := os.Getenv("TWILIO_AUTH_SID") - serviceSid := os.Getenv("TWILIO_SERVICE_SID") - authToken := os.Getenv("TWILIO_AUTH_TOKEN") - phoneNumber := os.Getenv("TWILIO_PHONE_NUMBER") - - if len(authSid) == 0 { - return nil, fmt.Errorf("Twilio config auth sid not provided") - } else if len(serviceSid) == 0 { - return nil, fmt.Errorf("Twilio config service sid not provided") - } else if len(authToken) == 0 { - return nil, fmt.Errorf("Twilio config token not provided") - } else if len(phoneNumber) == 0 { - return nil, fmt.Errorf("Twilio config phone number not provided") - } else { - cfg := auxcfg.TwilioConfig{} - cfg.AccountSID = authSid - cfg.AuthToken = authToken - cfg.ServiceSID = serviceSid - cfg.Number = phoneNumber - return &cfg, nil - } -} diff --git a/internal/config/version.go b/internal/config/version.go deleted file mode 100644 index 81b9574..0000000 --- a/internal/config/version.go +++ /dev/null @@ -1,12 +0,0 @@ -package config - -import ( - "flag" -) - -func CheckVersionFlag() *bool { - versionFlag := flag.Bool("version", false, "Print version information") - flag.Parse() - - return versionFlag -} diff --git a/internal/service/auth.go b/internal/service/auth.go deleted file mode 100644 index ed128e6..0000000 --- a/internal/service/auth.go +++ /dev/null @@ -1,98 +0,0 @@ -package service - -import ( - "bytes" - "encoding/json" - "fmt" - "net/http" - "time" - - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Auth struct { - Application *app.App -} - -type service struct { - Username string `json:"username"` - Passphrase string `json:"passphrase"` -} - -type tokenResponse struct { - Message string `json:"message"` - Data []*token.Login `json:"data"` -} - -func (a *Auth) GetToken() (*token.Login, error) { - serv := service{ - Username: a.Application.ServiceUsername, - Passphrase: a.Application.ServicePassphrase, - } - - jsonData, err := json.Marshal(serv) - if err != nil { - return nil, err - } - resp, err := http.Post( - fmt.Sprintf("%s/api/v1/service/login", a.Application.AuthUrl), - "application/json", - bytes.NewBuffer(jsonData), - ) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r tokenResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } - - return r.Data[0], nil -} - -type refreshTokenRequest struct { - AccessToken string `json:"access_token"` -} - -func (a *Auth) GetRefreshToken(tok *token.Login) (*token.Login, error) { - req := refreshTokenRequest{AccessToken: tok.AccessToken} - - jsonData, err := json.Marshal(req) - if err != nil { - return nil, err - } - - resp, err := http.Post(fmt.Sprintf("%s/api/v1/token/refresh", a.Application.AuthUrl), "application/json", bytes.NewBuffer(jsonData)) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r tokenResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} - -func (s *Auth) TokenExpired(tok *token.Login) bool { - now := time.Now() - expiredTime := time.Unix(tok.ExpiresIn, 0) - - if now.After(expiredTime) { - return true - } else { - return false - } -} diff --git a/internal/service/contact.go b/internal/service/contact.go deleted file mode 100644 index 988080e..0000000 --- a/internal/service/contact.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/contact" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Contact struct { - Application *app.App - Token *token.Login -} - -type getContactResponse struct { - Message string `json:"message"` - Data []*contact.Contact `json:"data"` -} - -func (c *Contact) GetContact(id uuid.UUID) (*contact.Contact, error) { - params := url.Values{} - params.Add("id", id.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/contact?%s", c.Application.ApiUrl, pm) - fmt.Println("Url:", fullUrl) - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := c.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getContactResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} diff --git a/internal/service/core/service.go b/internal/service/core/service.go deleted file mode 100644 index ac59b56..0000000 --- a/internal/service/core/service.go +++ /dev/null @@ -1,187 +0,0 @@ -package core - -import ( - "context" - "log" - "sync" - "time" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" - "git.kundeng.us/phoenix/catapult/internal/service" -) - -type Service struct { - wg sync.WaitGroup - ctx context.Context - cancel context.CancelFunc - App *app.App - token *token.Login -} - -func NewService(application *app.App) *Service { - ctx, cancel := context.WithCancel(context.Background()) - return &Service{ - ctx: ctx, - cancel: cancel, - App: application, - } -} - -func (s *Service) Start() { - log.Println("Starting service...") - - // Start multiple background workers - s.wg.Add(3) - go s.worker1() - go s.worker2() - go s.healthChecker() -} - -func (s *Service) worker1() { - defer s.wg.Done() - - ticker := time.NewTicker(5 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Worker 1 shutting down...") - return - case <-ticker.C: - // Do some work - now := time.Now() - log.Println("Worker 1: Processing...") - catapultAuth := service.Auth{Application: s.App} - if s.token == nil { - log.Println("Token has not been fetched") - log.Println("Fetching token") - if token, err := catapultAuth.GetToken(); err != nil { - log.Println("Error:", err) - } else { - log.Println("Token fetched") - s.token = token - } - } else if catapultAuth.TokenExpired(s.token) { - // Get refresh token - log.Println("Token expired") - log.Println("Fetching refresh token") - refreshToken, err := catapultAuth.GetRefreshToken(s.token) - if err != nil { - log.Println("Error getting refresh token:", err) - } else { - log.Println("Refresh token fetched") - s.token = refreshToken - } - } - - queue := service.Queue{Application: s.App, Token: s.token} - if item, exists, err := queue.GetQueue(); err != nil { - log.Println("Error:", err) - } else { - if *exists { - log.Println("Scheduled message Id:", item.Id) - log.Println("Created:", item.Created) - log.Println("Scheduled:", item.Scheduled) - log.Println("Status:", item.Status) - log.Println("User Id:", item.UserId) - if scheduledMessageValid(item, now) { - log.Println("Scheduled Message can be sent") - scheduler := service.Scheduler{Application: s.App, Token: s.token} - if events, err := scheduler.GetEvents(item.Id); err != nil { - log.Println("Error getting event:", err) - } else { - for _, event := range events { - if msg, err := scheduler.GetMessage(event.MessageId); err != nil { - log.Println("Error getting message:", err) - } else { - if c, err := scheduler.GetContact(event.ContactId); err != nil { - log.Println("Error getting contact:", err) - } else { - log.Println("Message Id:", msg.Id) - log.Println("Contact Id:", c.Id) - if res, resRaw, sent, err := scheduler.ScheduleMessage(*item, *event, *c, *msg); err != nil { - log.Println("Failure with scheduling the message:", err) - } else { - if res != nil { - if eventResponse, err := scheduler.RecordEventResponse(event, item.UserId, resRaw, sent); err != nil { - log.Println("Failure recording event response:", err) - } else { - if len(eventResponse) == 0 { - log.Println("No event responses") - } else { - eventResponse := eventResponse[0] - log.Println("Event response saved. Id:", eventResponse.Id) - } - } - } else { - log.Println("Result should not be empty") - } - } - } - } - } - } - } else { - log.Println("Invalid scheduled message") - } - } else { - log.Println("Empty queue") - } - } - } - } -} - -func (s *Service) worker2() { - defer s.wg.Done() - - ticker := time.NewTicker(10 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Worker 2 shutting down...") - return - case <-ticker.C: - // Do some work - log.Println("Worker 2: Processing...") - } - } -} - -func (s *Service) healthChecker() { - defer s.wg.Done() - - ticker := time.NewTicker(30 * time.Second) - defer ticker.Stop() - - for { - select { - case <-s.ctx.Done(): - log.Println("Health checker shutting down...") - return - case <-ticker.C: - log.Println("Health check: Service is healthy") - } - } -} - -func (s *Service) Stop() { - log.Println("Shutting down service...") - s.cancel() - s.wg.Wait() - log.Println("Service stopped gracefully") -} - -func scheduledMessageValid(schMsg *scheduling.ScheduledMessage, now time.Time) bool { - if schMsg.Scheduled.Before(now) { - return false - } else { - return true - } -} diff --git a/internal/service/message.go b/internal/service/message.go deleted file mode 100644 index ed32e88..0000000 --- a/internal/service/message.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/message" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Message struct { - Application *app.App - Token *token.Login -} - -type getMessageResponse struct { - Message string `json:"message"` - Data []*message.Message `json:"data"` -} - -func (m *Message) GetMessage(id uuid.UUID) (*message.Message, error) { - params := url.Values{} - params.Add("id", id.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/message?%s", m.Application.ApiUrl, pm) - fmt.Println("Url:", fullUrl) - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := m.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getMessageResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data[0], nil - } - } -} diff --git a/internal/service/message_event_response.go b/internal/service/message_event_response.go deleted file mode 100644 index c4a1c3f..0000000 --- a/internal/service/message_event_response.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "strings" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/event" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type MessageEventResponse struct { - Application *app.App - Token *token.Login -} - -type recordMessageEventResponse struct { - Message string `json:"message"` - Data []*event.MessageEventResponse `json:"data"` -} - -func (m *MessageEventResponse) RecordEventResponse(mer *event.MessageEventResponse) ([]*event.MessageEventResponse, error) { - fullUrl := fmt.Sprintf("%s/api/v1/schedule/message/event/response/record", m.Application.ApiUrl) - jsonData, err := json.Marshal(mer) - if err != nil { - return nil, err - } - - req, err := http.NewRequest("POST", fullUrl, strings.NewReader(string(jsonData))) - if err != nil { - return nil, err - } - - token := m.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r recordMessageEventResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data, nil - } - } -} diff --git a/internal/service/queue.go b/internal/service/queue.go deleted file mode 100644 index 13f60ea..0000000 --- a/internal/service/queue.go +++ /dev/null @@ -1,54 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Queue struct { - Application *app.App - Token *token.Login -} - -type queueResponse struct { - Message string `json:"message"` - Data []*scheduling.ScheduledMessage `json:"data"` -} - -func (q *Queue) GetQueue() (*scheduling.ScheduledMessage, *bool, error) { - req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/schedule/message/fetch", q.Application.ApiUrl), nil) - if err != nil { - return nil, nil, err - } - - token := q.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, nil, err - } - defer resp.Body.Close() - - var r queueResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, nil, err - } else { - var exists bool - if len(r.Data) == 0 { - exists = false - return nil, &exists, nil - } else { - exists = true - return r.Data[0], &exists, nil - } - } -} diff --git a/internal/service/scheduled_message_event.go b/internal/service/scheduled_message_event.go deleted file mode 100644 index a83f57c..0000000 --- a/internal/service/scheduled_message_event.go +++ /dev/null @@ -1,58 +0,0 @@ -package service - -import ( - "encoding/json" - "fmt" - "net/http" - "net/url" - - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type ScheduledMessageEvent struct { - Application *app.App - Token *token.Login -} - -type getScheduledMessageEventResponse struct { - Message string `json:"message"` - Data []*scheduling.ScheduledMessageEvent `json:"data"` -} - -func (s *ScheduledMessageEvent) GetEvents(scheduledMessageId uuid.UUID) ([]*scheduling.ScheduledMessageEvent, error) { - params := url.Values{} - params.Add("scheduled_message_id", scheduledMessageId.String()) - pm := params.Encode() - fullUrl := fmt.Sprintf("%s/api/v1/schedule/message/event?%s", s.Application.ApiUrl, pm) - - req, err := http.NewRequest("GET", fullUrl, nil) - if err != nil { - return nil, err - } - - token := s.Token.AccessToken - req.Header.Set("Authorization", "Bearer "+token) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - return nil, err - } - defer resp.Body.Close() - - var r getScheduledMessageEventResponse - err = json.NewDecoder(resp.Body).Decode(&r) - if err != nil { - return nil, err - } else { - if len(r.Data) == 0 { - return nil, nil - } else { - return r.Data, nil - } - } -} diff --git a/internal/service/scheduler.go b/internal/service/scheduler.go deleted file mode 100644 index 5ad5b0c..0000000 --- a/internal/service/scheduler.go +++ /dev/null @@ -1,69 +0,0 @@ -package service - -import ( - "time" - - "git.kundeng.us/phoenix/swoosh/swoop/send" - "git.kundeng.us/phoenix/swoosh/swoop/types" - "git.kundeng.us/phoenix/textsender-models/tx0/contact" - "git.kundeng.us/phoenix/textsender-models/tx0/message" - evnt "git.kundeng.us/phoenix/textsender-models/tx0/message/event" - "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" - "git.kundeng.us/phoenix/textsender-models/tx0/token" - "github.com/google/uuid" - - "git.kundeng.us/phoenix/catapult/internal/app" -) - -type Scheduler struct { - Application *app.App - Token *token.Login -} - -func (s *Scheduler) GetEvents(scheduledMessageId uuid.UUID) ([]*scheduling.ScheduledMessageEvent, error) { - sme := ScheduledMessageEvent{Application: s.Application, Token: s.Token} - if events, err := sme.GetEvents(scheduledMessageId); err != nil { - return nil, err - } else { - return events, nil - } -} - -func (s *Scheduler) GetMessage(id uuid.UUID) (*message.Message, error) { - msg := Message{Application: s.Application, Token: s.Token} - if letter, err := msg.GetMessage(id); err != nil { - return nil, err - } else { - return letter, nil - } -} - -func (s *Scheduler) GetContact(id uuid.UUID) (*contact.Contact, error) { - ctct := Contact{Application: s.Application, Token: s.Token} - if c, err := ctct.GetContact(id); err != nil { - return nil, err - } else { - return c, nil - } -} - -func (s *Scheduler) ScheduleMessage(schMsg scheduling.ScheduledMessage, event scheduling.ScheduledMessageEvent, c contact.Contact, msg message.Message) (*types.TwilioResult, map[string]any, *time.Time, error) { - msgSender := send.MessageSender{Config: s.Application.TwilioConfig} - if res, resRaw, err := msgSender.Send(msg, c, &schMsg.Scheduled); err != nil { - return nil, nil, nil, err - } else { - sent := time.Now() - return res, resRaw, &sent, nil - } -} - -func (s *Scheduler) RecordEventResponse(schMsgEvent *scheduling.ScheduledMessageEvent, userId uuid.UUID, bytes map[string]any, sent *time.Time) ([]*evnt.MessageEventResponse, error) { - mre := evnt.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent, Status: evnt.Message_Event_Response_Status_Scheduled} - - msgEventResponse := MessageEventResponse{Application: s.Application, Token: s.Token} - if responses, err := msgEventResponse.RecordEventResponse(&mre); err != nil { - return nil, err - } else { - return responses, nil - } -} diff --git a/internal/version/version.go b/internal/version/version.go deleted file mode 100644 index 91e3782..0000000 --- a/internal/version/version.go +++ /dev/null @@ -1,17 +0,0 @@ -package version - -import "fmt" - -var ( - Version = "dev" - BuildTime = "unknown" - Commit = "unknown" - GoVersion = "unknown" -) - -func String() string { - return fmt.Sprintf( - "Version: %s\nBuild Date: %s\nCommit: %s\nGo Version: %s", - Version, BuildTime, Commit, GoVersion, - ) -} -- 2.47.3 From 155c9f4b61f602caa813697e5e0d300c12291ad0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 20 Jun 2026 23:23:20 -0400 Subject: [PATCH 02/24] Adding init rust code --- .gitignore | 1 + Cargo.lock | 7 +++++++ Cargo.toml | 7 +++++++ src/main.rs | 3 +++ 4 files changed, 18 insertions(+) create mode 100644 .gitignore create mode 100644 Cargo.lock create mode 100644 Cargo.toml create mode 100644 src/main.rs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..096e10f --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "catapult" +version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..37e10a1 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "catapult" +version = "0.2.2" +rust-version = "1.96" +edition = "2024" + +[dependencies] diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} -- 2.47.3 From 3adef16d29abb2b64bb8f35c62fda1cae5a0d0ac Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 20 Jun 2026 23:30:01 -0400 Subject: [PATCH 03/24] Init (#4) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/4 --- .gitea/workflows/pr.yml | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .gitea/workflows/pr.yml diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml new file mode 100644 index 0000000..f151df9 --- /dev/null +++ b/.gitea/workflows/pr.yml @@ -0,0 +1,50 @@ +name: catapult PR + +on: + pull_request: + branches: + - v0.3.0 + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + + +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.96 + - uses: Swatinem/rust-cache@v2 + - run: | + cargo check + + fmt: + name: Rustfmt + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.96 + - run: rustup component add rustfmt + - uses: Swatinem/rust-cache@v2 + - run: | + 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.96 + - run: rustup component add clippy + - uses: Swatinem/rust-cache@v2 + - run: | + cargo clippy -- -D warnings -- 2.47.3 From cbd96dd5b2e0b18bef2d5288e891dc932854402e Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 21 Jun 2026 17:18:17 -0400 Subject: [PATCH 04/24] Adding version module (#5) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/5 --- src/lib.rs | 1 + src/version.rs | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/lib.rs create mode 100644 src/version.rs diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..a6db76a --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod version; diff --git a/src/version.rs b/src/version.rs new file mode 100644 index 0000000..22ea1eb --- /dev/null +++ b/src/version.rs @@ -0,0 +1,20 @@ +pub fn print_version() { + let name = env!("CARGO_PKG_NAME"); + let version = env!("CARGO_PKG_VERSION"); + + println!("{name:?} {version:?}"); +} + +pub fn contains_version(args: &Vec) -> bool { + let valid_flags = vec!["-v", "--version"]; + + for arg in args { + for valid_flag in &valid_flags { + if valid_flag == arg { + return true; + } + } + } + + false +} -- 2.47.3 From af2cb3efdc12842518e2b2f6041b3f5b088cb411 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 21 Jun 2026 17:32:17 -0400 Subject: [PATCH 05/24] Async init (#6) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/6 --- Cargo.lock | 1903 +++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 7 + src/main.rs | 11 +- 3 files changed, 1919 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 096e10f..6b03bfe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,1909 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "aws-lc-rs" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bitflags" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" + +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "bytes" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" + [[package]] name = "catapult" version = "0.2.2" +dependencies = [ + "futures", + "reqwest", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "cc" +version = "1.2.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" +dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "displaydoc" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "futures" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-executor" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" + +[[package]] +name = "futures-macro" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + +[[package]] +name = "http" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "system-configuration", + "tokio", + "tower-service", + "tracing", + "windows-registry", +] + +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "ipnet" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" + +[[package]] +name = "itoa" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" +dependencies = [ + "cfg-if", + "futures-util", + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.186" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" + +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + +[[package]] +name = "memchr" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mio" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "once_cell" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" +dependencies = [ + "aws-lc-rs", + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[package]] +name = "reqwest" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_json", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustls" +version = "0.23.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +dependencies = [ + "aws-lc-rs", + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + +[[package]] +name = "rustls-webpki" +version = "0.103.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +dependencies = [ + "aws-lc-rs", + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +dependencies = [ + "bitflags", + "core-foundation 0.10.1", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + +[[package]] +name = "smallvec" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" + +[[package]] +name = "socket2" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.118" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +dependencies = [ + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + +[[package]] +name = "unicode-ident" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.4+wasi-0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.125" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-root-certs" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + +[[package]] +name = "yoke" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" + +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/Cargo.toml b/Cargo.toml index 37e10a1..777b380 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,3 +5,10 @@ rust-version = "1.96" edition = "2024" [dependencies] +tokio = { version = "1.52.3", features = ["full"] } +futures = { version = "0.3.32" } +reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } +serde = { version = "1.0.228", features = ["derive"] } +serde_json = { version = "1.0.150" } + +[dev-dependencies] diff --git a/src/main.rs b/src/main.rs index e7a11a9..5766dfc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,10 @@ -fn main() { - println!("Hello, world!"); +// TODO: Move this somewhere else +pub const SECONDS_TO_SLEEP: u64 = 5; + +#[tokio::main] +async fn main() -> Result<(), Box> { + loop { + println!("Do some work"); + tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await; + } } -- 2.47.3 From 702fead8c8855259a04cd5d37955d8b69ad90e3c Mon Sep 17 00:00:00 2001 From: phoenix Date: Sun, 21 Jun 2026 22:48:09 -0400 Subject: [PATCH 06/24] Huh wuh (#7) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/7 --- .gitea/workflows/pr.yml | 21 + .gitignore | 3 + Cargo.lock | 1347 ++++++++++++++++++++++++++++++++++++++- Cargo.toml | 2 + src/app.rs | 55 ++ src/lib.rs | 2 + src/main.rs | 24 +- src/service.rs | 22 + 8 files changed, 1464 insertions(+), 12 deletions(-) create mode 100644 src/app.rs create mode 100644 src/service.rs diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index f151df9..843f6c4 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -21,6 +21,13 @@ jobs: toolchain: 1.96 - 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 + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key cargo check fmt: @@ -34,6 +41,13 @@ jobs: - run: rustup component add rustfmt - 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 + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key cargo fmt --all -- --check clippy: @@ -47,4 +61,11 @@ jobs: - run: rustup component add clippy - 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 + + eval $(ssh-agent -s) + ssh-add -v ~/.ssh/textsender-models_deploy_key cargo clippy -- -D warnings diff --git a/.gitignore b/.gitignore index ea8c4bf..e424162 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /target +.env +.env.docker +.env.local diff --git a/Cargo.lock b/Cargo.lock index 6b03bfe..1964bbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,54 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + +[[package]] +name = "anyhow" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "autocfg" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" + [[package]] name = "aws-lc-rs" version = "1.17.0" @@ -36,11 +78,35 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64-ng" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9a6fdffd0a02049343b2bde0b86b3f38a8617a316f01de56811bec1fb78659" + +[[package]] +name = "base64ct" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" + [[package]] name = "bitflags" version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +dependencies = [ + "serde_core", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] name = "bumpalo" @@ -48,6 +114,12 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" version = "1.12.0" @@ -62,6 +134,8 @@ dependencies = [ "reqwest", "serde", "serde_json", + "swoosh", + "textsender_models", "tokio", ] @@ -89,6 +163,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] + [[package]] name = "cmake" version = "0.1.58" @@ -108,6 +193,42 @@ dependencies = [ "memchr", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const_format" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" +dependencies = [ + "const_format_proc_macros", + "konst", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -134,6 +255,105 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +dependencies = [ + "serde_core", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + [[package]] name = "displaydoc" version = "0.2.6" @@ -145,12 +365,27 @@ dependencies = [ "syn", ] +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + [[package]] name = "dunce" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "either" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" +dependencies = [ + "serde", +] + [[package]] name = "encoding_rs" version = "0.8.35" @@ -176,18 +411,88 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" + [[package]] name = "find-msvc-tools" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -245,6 +550,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.32" @@ -291,6 +607,16 @@ dependencies = [ "slab", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getrandom" version = "0.2.17" @@ -313,11 +639,23 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "rand_core 0.10.1", +] + [[package]] name = "h2" version = "0.4.15" @@ -337,12 +675,71 @@ dependencies = [ "tracing", ] +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "hashbrown" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown 0.15.5", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "http" version = "1.4.2" @@ -553,7 +950,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.17.1", + "serde", + "serde_core", ] [[package]] @@ -627,6 +1026,23 @@ dependencies = [ "libc", ] +[[package]] +name = "josekit" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a808e078330e6af222eb0044b71d4b1ff981bfef43e7bc8133a88234e0c86a0c" +dependencies = [ + "anyhow", + "base64", + "flate2", + "openssl", + "regex", + "serde", + "serde_json", + "thiserror", + "time", +] + [[package]] name = "js-sys" version = "0.3.102" @@ -638,12 +1054,70 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "konst" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + [[package]] name = "libc" version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + +[[package]] +name = "libredox" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +dependencies = [ + "bitflags", + "libc", + "plain", + "redox_syscall 0.8.1", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" + [[package]] name = "litemap" version = "0.8.2" @@ -671,6 +1145,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.2" @@ -693,6 +1177,16 @@ dependencies = [ "unicase", ] +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "mio" version = "1.2.1" @@ -704,18 +1198,130 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "native-tls" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.6", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + [[package]] name = "once_cell" version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" +[[package]] +name = "openssl" +version = "0.10.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-sys" +version = "0.9.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.5" @@ -734,11 +1340,20 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", "windows-link", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -751,6 +1366,39 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "potential_utf" version = "0.1.5" @@ -760,6 +1408,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -808,7 +1462,7 @@ dependencies = [ "bytes", "getrandom 0.3.4", "lru-slab", - "rand", + "rand 0.9.4", "ring", "rustc-hash", "rustls", @@ -849,14 +1503,52 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + +[[package]] +name = "rand" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ - "rand_chacha", - "rand_core", + "rand_chacha 0.9.0", + "rand_core 0.9.5", +] + +[[package]] +name = "rand" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +dependencies = [ + "chacha20", + "getrandom 0.4.3", + "rand_core 0.10.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", ] [[package]] @@ -866,7 +1558,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.9.5", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", ] [[package]] @@ -878,6 +1579,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "redox_syscall" version = "0.5.18" @@ -887,6 +1594,44 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" + [[package]] name = "reqwest" version = "0.13.4" @@ -896,6 +1641,7 @@ dependencies = [ "base64", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", @@ -917,6 +1663,7 @@ dependencies = [ "rustls-platform-verifier", "serde", "serde_json", + "serde_urlencoded", "sync_wrapper", "tokio", "tokio-rustls", @@ -945,6 +1692,26 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rsa" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rustc-hash" version = "2.1.2" @@ -960,6 +1727,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" version = "0.23.40" @@ -1041,6 +1821,12 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + [[package]] name = "same-file" version = "1.0.6" @@ -1130,6 +1916,7 @@ version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ + "indexmap", "itoa", "memchr", "serde", @@ -1137,6 +1924,40 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest", +] + [[package]] name = "shlex" version = "2.0.1" @@ -1153,6 +1974,22 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + [[package]] name = "simd_cesu8" version = "1.1.1" @@ -1180,6 +2017,9 @@ name = "smallvec" version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -1191,18 +2031,265 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlx" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" +dependencies = [ + "base64", + "bytes", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.15.5", + "hashlink", + "indexmap", + "log", + "memchr", + "native-tls", + "once_cell", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +dependencies = [ + "atoi", + "base64", + "bitflags", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.6", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" +dependencies = [ + "atoi", + "base64", + "bitflags", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.6", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "thiserror", + "time", + "tracing", + "url", + "uuid", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + [[package]] name = "subtle" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "swoosh" +version = "0.4.1" +source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.1-10-6bdec12084-871#6bdec1208499dfa9962efd89b549d1bfa5441d85" +dependencies = [ + "base64-ng", + "const_format", + "futures", + "http", + "josekit", + "rand 0.10.1", + "reqwest", + "serde", + "serde_json", + "textsender_models", + "time", + "tokio", + "uuid", +] + [[package]] name = "syn" version = "2.0.118" @@ -1255,6 +2342,35 @@ dependencies = [ "libc", ] +[[package]] +name = "tempfile" +version = "3.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "textsender_models" +version = "0.4.3" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.3-29-720f3d8f75-111#720f3d8f7515d8cd20a9cd73086bd6c1ab857651" +dependencies = [ + "const_format", + "dotenvy", + "josekit", + "serde", + "serde_json", + "sqlx", + "time", + "utoipa", + "uuid", +] + [[package]] name = "thiserror" version = "2.0.18" @@ -1275,6 +2391,36 @@ dependencies = [ "syn", ] +[[package]] +name = "time" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" + +[[package]] +name = "time-macros" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tinystr" version = "0.8.3" @@ -1338,6 +2484,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.18" @@ -1402,10 +2559,23 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ + "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-core" version = "0.1.36" @@ -1421,18 +2591,51 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typenum" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" + [[package]] name = "unicase" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + [[package]] name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unicode-normalization" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "untrusted" version = "0.9.0" @@ -1457,6 +2660,54 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utoipa" +version = "5.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bde15df68e80b16c7d16b9616e80770ad158988daa56a27dccd1e55558b0160" +dependencies = [ + "indexmap", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "5.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba0b99ee52df3028635d93840c797102da61f8a7bb3cf751032455895b52ef8" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "uuid", +] + +[[package]] +name = "uuid" +version = "1.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" +dependencies = [ + "getrandom 0.4.3", + "js-sys", + "serde_core", + "wasm-bindgen", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "walkdir" version = "2.5.0" @@ -1491,6 +2742,12 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.125" @@ -1588,6 +2845,16 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + [[package]] name = "winapi-util" version = "0.1.11" @@ -1632,6 +2899,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -1659,6 +2935,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -1692,6 +2983,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -1704,6 +3001,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -1716,6 +3019,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -1740,6 +3049,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -1752,6 +3067,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -1764,6 +3085,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -1776,6 +3103,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" diff --git a/Cargo.toml b/Cargo.toml index 777b380..64eae2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,5 +10,7 @@ futures = { version = "0.3.32" } reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-720f3d8f75-111" } +swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.1-10-6bdec12084-871" } [dev-dependencies] diff --git a/src/app.rs b/src/app.rs new file mode 100644 index 0000000..d637aa0 --- /dev/null +++ b/src/app.rs @@ -0,0 +1,55 @@ +/// Seconds to sleep after finising a task +pub const SECONDS_TO_SLEEP: u64 = 5; + +pub const APP_NAME: &str = "catapult"; + +pub struct App { + pub api_url: String, + pub auth_url: String, + pub service_username: String, + pub service_passphrase: String, + pub twilio_config: textsender_models::config::auxiliary::TwilioConfig, +} + +// TODO: Change this to non-async at some point. +// Will require changes in other libraries +pub async fn load_app() -> Result { + use textsender_models::envy; + let auth_url_env = envy::environment::get_env("AUTH_URL").await; + let api_url_env = envy::environment::get_env("API_URL").await; + let service_username_env = envy::environment::get_env("SERVICE_USERNAME").await; + let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE").await; + + let envs = vec![ + auth_url_env, + api_url_env, + service_username_env, + service_passphrase_env, + ]; + + let check_envs = |vs: &Vec| -> (bool, Option) { + for env in vs { + if env.value.is_empty() { + return (false, Some(format!("Key {} is not provided", env.key))); + } + } + (true, None) + }; + + let (envs_valid, reason) = check_envs(&envs); + + if envs_valid { + match textsender_models::config::auxiliary::load_config().await { + Ok(twilio_config) => Ok(App { + api_url: String::new(), + auth_url: String::new(), + service_username: String::new(), + service_passphrase: String::new(), + twilio_config: twilio_config, + }), + Err(err) => Err(err), + } + } else { + Err(std::io::Error::other(reason.unwrap())) + } +} diff --git a/src/lib.rs b/src/lib.rs index a6db76a..53d6e04 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1 +1,3 @@ +pub mod app; +pub mod service; pub mod version; diff --git a/src/main.rs b/src/main.rs index 5766dfc..80bfe63 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,24 @@ -// TODO: Move this somewhere else -pub const SECONDS_TO_SLEEP: u64 = 5; - #[tokio::main] async fn main() -> Result<(), Box> { + let args = std::env::args().collect(); + if catapult::version::contains_version(&args) { + catapult::version::print_version(); + std::process::exit(-1); + } + + let app = match catapult::app::load_app().await { + Ok(app) => app, + Err(err) => { + eprintln!("Error: {err:?}"); + std::process::exit(-1); + } + }; + loop { - println!("Do some work"); - tokio::time::sleep(tokio::time::Duration::from_secs(SECONDS_TO_SLEEP)).await; + catapult::service::do_the_work(&app).await; + tokio::time::sleep(tokio::time::Duration::from_secs( + catapult::app::SECONDS_TO_SLEEP, + )) + .await; } } diff --git a/src/service.rs b/src/service.rs new file mode 100644 index 0000000..93bb630 --- /dev/null +++ b/src/service.rs @@ -0,0 +1,22 @@ +pub async fn do_the_work(_app: &crate::app::App) { + println!("Do some work"); + todo!( + r#" + Need to finish this + + This function should fetch a token, check if the token is valid, and obtain a refresh token if + it has expired. + + Then do the real work. + + 1. Check the queue + 2. If there is an item, get the data, + 3. Evaluate if it is schedulable + 4. Get the events and iterate each one + 5. starting with the message + 6. Get the contact + 7. Send the message + 8. Record the message event response + "# + ); +} -- 2.47.3 From b5bb605361b5be600f42ed6afcafa62c1ffe56f1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 14:50:15 -0400 Subject: [PATCH 07/24] Get token (#8) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/8 --- Cargo.lock | 1 + Cargo.toml | 1 + src/app.rs | 11 ++-- src/main.rs | 37 +++++++++++++- src/service.rs | 22 -------- src/service/core.rs | 29 +++++++++++ src/service/mod.rs | 120 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+), 28 deletions(-) delete mode 100644 src/service.rs create mode 100644 src/service/core.rs create mode 100644 src/service/mod.rs diff --git a/Cargo.lock b/Cargo.lock index 1964bbc..e1898ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,6 +136,7 @@ dependencies = [ "serde_json", "swoosh", "textsender_models", + "time", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 64eae2d..75f702b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ futures = { version = "0.3.32" } reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } +time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-720f3d8f75-111" } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.1-10-6bdec12084-871" } diff --git a/src/app.rs b/src/app.rs index d637aa0..310eab0 100644 --- a/src/app.rs +++ b/src/app.rs @@ -3,6 +3,7 @@ pub const SECONDS_TO_SLEEP: u64 = 5; pub const APP_NAME: &str = "catapult"; +#[derive(Clone, Debug)] pub struct App { pub api_url: String, pub auth_url: String, @@ -21,8 +22,8 @@ pub async fn load_app() -> Result { let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE").await; let envs = vec![ - auth_url_env, api_url_env, + auth_url_env, service_username_env, service_passphrase_env, ]; @@ -41,10 +42,10 @@ pub async fn load_app() -> Result { if envs_valid { match textsender_models::config::auxiliary::load_config().await { Ok(twilio_config) => Ok(App { - api_url: String::new(), - auth_url: String::new(), - service_username: String::new(), - service_passphrase: String::new(), + api_url: envs[0].value.clone(), + auth_url: envs[1].value.clone(), + service_username: envs[2].value.clone(), + service_passphrase: envs[3].value.clone(), twilio_config: twilio_config, }), Err(err) => Err(err), diff --git a/src/main.rs b/src/main.rs index 80bfe63..a1a87c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,8 +14,43 @@ async fn main() -> Result<(), Box> { } }; + println!("App: {app:?}"); + + let auth = catapult::service::auth::Auth { app: app.clone() }; + let token = match auth.get_token().await { + Ok(token) => token, + Err(err) => { + eprintln!("Error getting token"); + eprintln!("Error: {err:?}"); + std::process::exit(-1); + } + }; + + println!("Access token: {}", token.access_token); + + let mut svc = catapult::service::core::Service { + app: app.clone(), + token: token, + }; + loop { - catapult::service::do_the_work(&app).await; + // TODO: Need to update textsender_models. The token module needs updating. + // The LoginResult needs expires_in populated + if catapult::service::auth::has_token_expired(&svc.token).await { + match auth.get_refresh_token(&svc.token).await { + Ok(refresh) => { + println!("Refresh token: {refresh:?}"); + svc.token = refresh; + } + Err(err) => { + eprintln!("Error: {err:?}"); + std::process::exit(-1); + } + } + } + + svc.do_the_work().await; + tokio::time::sleep(tokio::time::Duration::from_secs( catapult::app::SECONDS_TO_SLEEP, )) diff --git a/src/service.rs b/src/service.rs deleted file mode 100644 index 93bb630..0000000 --- a/src/service.rs +++ /dev/null @@ -1,22 +0,0 @@ -pub async fn do_the_work(_app: &crate::app::App) { - println!("Do some work"); - todo!( - r#" - Need to finish this - - This function should fetch a token, check if the token is valid, and obtain a refresh token if - it has expired. - - Then do the real work. - - 1. Check the queue - 2. If there is an item, get the data, - 3. Evaluate if it is schedulable - 4. Get the events and iterate each one - 5. starting with the message - 6. Get the contact - 7. Send the message - 8. Record the message event response - "# - ); -} diff --git a/src/service/core.rs b/src/service/core.rs new file mode 100644 index 0000000..839e38f --- /dev/null +++ b/src/service/core.rs @@ -0,0 +1,29 @@ +pub struct Service { + pub app: crate::app::App, + pub token: textsender_models::token::Login, +} + +impl Service { + pub async fn do_the_work(&mut self) { + println!("Do some work"); + todo!( + r#" + Need to finish this + + This function should fetch a token, check if the token is valid, and obtain a refresh token if + it has expired. + + Then do the real work. + + 1. Check the queue + 2. If there is an item, get the data, + 3. Evaluate if it is schedulable + 4. Get the events and iterate each one + 5. starting with the message + 6. Get the contact + 7. Send the message + 8. Record the message event response + "# + ); + } +} diff --git a/src/service/mod.rs b/src/service/mod.rs new file mode 100644 index 0000000..d3bd740 --- /dev/null +++ b/src/service/mod.rs @@ -0,0 +1,120 @@ +pub mod core; + +pub mod auth { + pub struct Auth { + pub app: crate::app::App, + } + + impl Auth { + pub async fn get_token(&self) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/service/login"); + let api_url = format!("{}/{endpoint}", self.app.auth_url); + + println!("Url: {api_url:?}"); + + let payload = serde_json::json!({ + "username": &self.app.service_username, + "passphrase": &self.app.service_passphrase, + }); + + println!("Payload: {payload:?}"); + + match client.post(api_url).json(&payload).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_token_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } + + pub async fn get_refresh_token( + &self, + login_result: &textsender_models::token::Login, + ) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/token/refresh"); + let api_url = format!("{}/{endpoint}", self.app.auth_url); + + println!("Url: {api_url:?}"); + + let payload = serde_json::json!({ + "access_token": login_result.access_token + }); + + match client.post(api_url).json(&payload).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_token_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } + } + + async fn parse_token_response( + response: &String, + ) -> Result { + match serde_json::from_str::(response) { + Ok(j) => { + println!("Good"); + let message = &j["message"]; + let data = &j["data"]; + + println!("Message: {message:?}"); + println!("Data: {data:?}"); + match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let lr = lrs[0].clone(); + let ll: textsender_models::token::LoginResult = + match serde_json::from_value(lr) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + Ok(ll) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + } + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } + + pub async fn has_token_expired(token: &textsender_models::token::LoginResult) -> bool { + let now = time::OffsetDateTime::now_utc(); + let expire = match time::OffsetDateTime::from_unix_timestamp(token.expires_in) { + Ok(res) => res, + Err(err) => { + eprintln!("Error: {err:?}"); + return false; + } + }; + + now > expire + } +} -- 2.47.3 From 46450a913a611af8f060cefcb3687335afadad41 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 15:33:47 -0400 Subject: [PATCH 08/24] Get queue item (#9) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/9 --- src/app.rs | 2 +- src/main.rs | 2 +- src/service/core.rs | 30 ++++++++++++++++-- src/service/mod.rs | 11 ++++++- src/service/queue.rs | 68 ++++++++++++++++++++++++++++++++++++++++ src/service/scheduler.rs | 0 6 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 src/service/queue.rs create mode 100644 src/service/scheduler.rs diff --git a/src/app.rs b/src/app.rs index 310eab0..3086f50 100644 --- a/src/app.rs +++ b/src/app.rs @@ -46,7 +46,7 @@ pub async fn load_app() -> Result { auth_url: envs[1].value.clone(), service_username: envs[2].value.clone(), service_passphrase: envs[3].value.clone(), - twilio_config: twilio_config, + twilio_config, }), Err(err) => Err(err), } diff --git a/src/main.rs b/src/main.rs index a1a87c3..911720c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -30,7 +30,7 @@ async fn main() -> Result<(), Box> { let mut svc = catapult::service::core::Service { app: app.clone(), - token: token, + token, }; loop { diff --git a/src/service/core.rs b/src/service/core.rs index 839e38f..7a5e042 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -6,17 +6,41 @@ pub struct Service { impl Service { pub async fn do_the_work(&mut self) { println!("Do some work"); + println!("Checking queue"); + + use textsender_models::message::scheduling::ScheduledMessage; + + let queue = super::queue::Queue { + app: self.app.clone(), + token: self.token.clone(), + }; + let queue_item: Option = match queue.get_queue().await { + Ok(item) => Some(item), + Err(err) => { + eprintln!("Error: {err:?}"); + None + } + }; + + if queue_item.is_none() { + println!("No queue item found"); + return; + } + let queue_item = queue_item.unwrap(); + + println!("Queue item Id: {:?}", queue_item.id); + todo!( r#" Need to finish this - This function should fetch a token, check if the token is valid, and obtain a refresh token if + [X] - This function should fetch a token, check if the token is valid, and obtain a refresh token if it has expired. Then do the real work. - 1. Check the queue - 2. If there is an item, get the data, + 1. Check the queue - Done + 2. If there is an item, get the data - Done 3. Evaluate if it is schedulable 4. Get the events and iterate each one 5. starting with the message diff --git a/src/service/mod.rs b/src/service/mod.rs index d3bd740..788f4cc 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,4 +1,5 @@ pub mod core; +pub mod queue; pub mod auth { pub struct Auth { @@ -72,7 +73,7 @@ pub mod auth { } async fn parse_token_response( - response: &String, + response: &str, ) -> Result { match serde_json::from_str::(response) { Ok(j) => { @@ -118,3 +119,11 @@ pub mod auth { now > expire } } + +pub fn auth_header( + access_token: &str, +) -> (reqwest::header::HeaderName, reqwest::header::HeaderValue) { + let bearer = format!("Bearer {}", access_token); + let header_value = reqwest::header::HeaderValue::from_str(&bearer).unwrap(); + (reqwest::header::AUTHORIZATION, header_value) +} diff --git a/src/service/queue.rs b/src/service/queue.rs new file mode 100644 index 0000000..b5c50d2 --- /dev/null +++ b/src/service/queue.rs @@ -0,0 +1,68 @@ +pub struct Queue { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl Queue { + pub async fn get_queue( + &self, + ) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/schedule/message/fetch"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_queue_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_queue_response( + response: &str, +) -> Result { + match serde_json::from_str::(response) { + Ok(j) => { + let message = &j["message"]; + let data = &j["data"]; + + println!("Message: {message:?}"); + println!("Data: {data:?}"); + match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let lr = lrs[0].clone(); + let ll: textsender_models::message::scheduling::ScheduledMessage = + match serde_json::from_value(lr) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + Ok(ll) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + } + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} diff --git a/src/service/scheduler.rs b/src/service/scheduler.rs new file mode 100644 index 0000000..e69de29 -- 2.47.3 From 19e22abf4a594675a8a7763ee7b706462cadf1f1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 21:58:37 -0400 Subject: [PATCH 09/24] Added code to check if queue_item is schedulable (#10) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/10 --- src/service/core.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/service/core.rs b/src/service/core.rs index 7a5e042..9059578 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -30,6 +30,13 @@ impl Service { println!("Queue item Id: {:?}", queue_item.id); + if !self.is_schedulable(&queue_item) { + println!("Not schedulable"); + return; + } + + println!("Can schedule"); + todo!( r#" Need to finish this @@ -50,4 +57,16 @@ impl Service { "# ); } + + fn is_schedulable( + &self, + queue_item: &textsender_models::message::scheduling::ScheduledMessage, + ) -> bool { + let now = time::OffsetDateTime::now_utc(); + + match queue_item.scheduled { + Some(date) => date <= now, + None => false, + } + } } -- 2.47.3 From c3f93cce3c0fa21441de37a885e8602046c8290c Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:44:13 -0400 Subject: [PATCH 10/24] Events (#11) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/11 --- Cargo.lock | 1 + Cargo.toml | 1 + src/service/core.rs | 26 +++++++++++++++-- src/service/event.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++ src/service/mod.rs | 1 + 5 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 src/service/event.rs diff --git a/Cargo.lock b/Cargo.lock index e1898ac..808982d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,6 +138,7 @@ dependencies = [ "textsender_models", "time", "tokio", + "uuid", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 75f702b..7f6f6f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } +uuid = { version = "1.23.3", features = ["v4", "serde"] } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-720f3d8f75-111" } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.1-10-6bdec12084-871" } diff --git a/src/service/core.rs b/src/service/core.rs index 9059578..6de4c83 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -37,6 +37,25 @@ impl Service { println!("Can schedule"); + let events_req = super::event::Event { + app: self.app.clone(), + token: self.token.clone(), + }; + + let scheduled_message_id = queue_item.id; + let events = match events_req.get(&scheduled_message_id).await { + Ok(events) => Some(events), + Err(err) => { + eprintln!("Error: {err:?}"); + None + } + }; + + let events = events.unwrap_or_default(); + for event in events { + println!("Event: {event:?}"); + } + todo!( r#" Need to finish this @@ -48,12 +67,13 @@ impl Service { 1. Check the queue - Done 2. If there is an item, get the data - Done - 3. Evaluate if it is schedulable - 4. Get the events and iterate each one + 3. Evaluate if it is schedulable - Done + 4. Get the events and iterate each one - Done 5. starting with the message 6. Get the contact 7. Send the message 8. Record the message event response + 9. Add to scheduler "# ); } @@ -65,7 +85,7 @@ impl Service { let now = time::OffsetDateTime::now_utc(); match queue_item.scheduled { - Some(date) => date <= now, + Some(date) => date > now, None => false, } } diff --git a/src/service/event.rs b/src/service/event.rs new file mode 100644 index 0000000..2c63a39 --- /dev/null +++ b/src/service/event.rs @@ -0,0 +1,68 @@ +pub struct Event { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl Event { + pub async fn get( + &self, + scheduled_message_id: &uuid::Uuid, + ) -> Result, std::io::Error> + { + let client = reqwest::Client::new(); + let endpoint = + format!("api/v1/schedule/message/event?scheduled_message_id={scheduled_message_id}"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + }, + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_response( + response: &str, +) -> Result, std::io::Error> { + match serde_json::from_str::(response) { + Ok(j) => match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let mut events: Vec< + textsender_models::message::scheduling::ScheduledMessageEvent, + > = Vec::new(); + + for event in lrs.iter() { + let ll: textsender_models::message::scheduling::ScheduledMessageEvent = + match serde_json::from_value(event.clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + events.push(ll); + } + + Ok(events) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} diff --git a/src/service/mod.rs b/src/service/mod.rs index 788f4cc..0095e9d 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,4 +1,5 @@ pub mod core; +pub mod event; pub mod queue; pub mod auth { -- 2.47.3 From d7114942e5374f25d471ca43bcfd828c68cc44e5 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 25 Jun 2026 21:40:02 -0400 Subject: [PATCH 11/24] Adding code for getting contact (#12) Reviewed-on: http://git.kundeng.us/phoenix/catapult/pulls/12 --- src/service/auth.rs | 116 +++++++++++++++++++++++++++++++++++++++ src/service/contact.rs | 64 ++++++++++++++++++++++ src/service/core.rs | 17 +++++- src/service/message.rs | 0 src/service/mod.rs | 121 +---------------------------------------- 5 files changed, 197 insertions(+), 121 deletions(-) create mode 100644 src/service/auth.rs create mode 100644 src/service/contact.rs create mode 100644 src/service/message.rs diff --git a/src/service/auth.rs b/src/service/auth.rs new file mode 100644 index 0000000..52ec5ec --- /dev/null +++ b/src/service/auth.rs @@ -0,0 +1,116 @@ +pub struct Auth { + pub app: crate::app::App, +} + +impl Auth { + pub async fn get_token(&self) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/service/login"); + let api_url = format!("{}/{endpoint}", self.app.auth_url); + + println!("Url: {api_url:?}"); + + let payload = serde_json::json!({ + "username": &self.app.service_username, + "passphrase": &self.app.service_passphrase, + }); + + println!("Payload: {payload:?}"); + + match client.post(api_url).json(&payload).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_token_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } + + pub async fn get_refresh_token( + &self, + login_result: &textsender_models::token::Login, + ) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/token/refresh"); + let api_url = format!("{}/{endpoint}", self.app.auth_url); + + println!("Url: {api_url:?}"); + + let payload = serde_json::json!({ + "access_token": login_result.access_token + }); + + match client.post(api_url).json(&payload).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_token_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_token_response( + response: &str, +) -> Result { + match serde_json::from_str::(response) { + Ok(j) => { + println!("Good"); + let message = &j["message"]; + let data = &j["data"]; + + println!("Message: {message:?}"); + println!("Data: {data:?}"); + match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let lr = lrs[0].clone(); + let ll: textsender_models::token::LoginResult = + match serde_json::from_value(lr) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + Ok(ll) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + } + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} + +pub async fn has_token_expired(token: &textsender_models::token::LoginResult) -> bool { + let now = time::OffsetDateTime::now_utc(); + let expire = match time::OffsetDateTime::from_unix_timestamp(token.expires_in) { + Ok(res) => res, + Err(err) => { + eprintln!("Error: {err:?}"); + return false; + } + }; + + now > expire +} diff --git a/src/service/contact.rs b/src/service/contact.rs new file mode 100644 index 0000000..b452b2e --- /dev/null +++ b/src/service/contact.rs @@ -0,0 +1,64 @@ +pub struct Contact { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl Contact { + pub async fn get( + &self, + contact_id: &uuid::Uuid, + ) -> Result, std::io::Error> { + let client = reqwest::Client::new(); + let endpoint = format!("api/v1/contact?id={contact_id}"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + }, + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_response( + response: &str, +) -> Result, std::io::Error> { + match serde_json::from_str::(response) { + Ok(j) => match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let mut events: Vec = Vec::new(); + + for event in lrs.iter() { + let ll: textsender_models::contact::Contact = + match serde_json::from_value(event.clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + events.push(ll); + } + + Ok(events) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} diff --git a/src/service/core.rs b/src/service/core.rs index 6de4c83..6953bef 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -51,9 +51,22 @@ impl Service { } }; + let contacts = super::contact::Contact { + app: self.app.clone(), + token: self.token.clone(), + }; let events = events.unwrap_or_default(); for event in events { println!("Event: {event:?}"); + let contact = &match contacts.get(&event.contact_id).await { + Ok(contact) => contact, + Err(err) => { + eprintln!("Error: {err:?}"); + continue; + } + }[0]; + + println!("Contact Id: {:?}", contact.id); } todo!( @@ -69,8 +82,8 @@ impl Service { 2. If there is an item, get the data - Done 3. Evaluate if it is schedulable - Done 4. Get the events and iterate each one - Done - 5. starting with the message - 6. Get the contact + 5. Starting with the message + 6. Get the contact - Done 7. Send the message 8. Record the message event response 9. Add to scheduler diff --git a/src/service/message.rs b/src/service/message.rs new file mode 100644 index 0000000..e69de29 diff --git a/src/service/mod.rs b/src/service/mod.rs index 0095e9d..7c8ac02 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,126 +1,9 @@ +pub mod auth; +pub mod contact; pub mod core; pub mod event; pub mod queue; -pub mod auth { - pub struct Auth { - pub app: crate::app::App, - } - - impl Auth { - pub async fn get_token(&self) -> Result { - let client = reqwest::Client::new(); - let endpoint = String::from("api/v1/service/login"); - let api_url = format!("{}/{endpoint}", self.app.auth_url); - - println!("Url: {api_url:?}"); - - let payload = serde_json::json!({ - "username": &self.app.service_username, - "passphrase": &self.app.service_passphrase, - }); - - println!("Payload: {payload:?}"); - - match client.post(api_url).json(&payload).send().await { - Ok(response) => match response.status() { - reqwest::StatusCode::OK => { - println!("Response: {response:?}"); - match response.text().await { - Ok(val) => match parse_token_response(&val).await { - Ok(login_result) => Ok(login_result), - Err(err) => Err(err), - }, - Err(err) => Err(std::io::Error::other(err)), - } - } - _ => Err(std::io::Error::other("Error getting token")), - }, - Err(err) => Err(std::io::Error::other(err.to_string())), - } - } - - pub async fn get_refresh_token( - &self, - login_result: &textsender_models::token::Login, - ) -> Result { - let client = reqwest::Client::new(); - let endpoint = String::from("api/v1/token/refresh"); - let api_url = format!("{}/{endpoint}", self.app.auth_url); - - println!("Url: {api_url:?}"); - - let payload = serde_json::json!({ - "access_token": login_result.access_token - }); - - match client.post(api_url).json(&payload).send().await { - Ok(response) => match response.status() { - reqwest::StatusCode::OK => { - println!("Response: {response:?}"); - match response.text().await { - Ok(val) => match parse_token_response(&val).await { - Ok(login_result) => Ok(login_result), - Err(err) => Err(err), - }, - Err(err) => Err(std::io::Error::other(err)), - } - } - _ => Err(std::io::Error::other("Error getting token")), - }, - Err(err) => Err(std::io::Error::other(err.to_string())), - } - } - } - - async fn parse_token_response( - response: &str, - ) -> Result { - match serde_json::from_str::(response) { - Ok(j) => { - println!("Good"); - let message = &j["message"]; - let data = &j["data"]; - - println!("Message: {message:?}"); - println!("Data: {data:?}"); - match j.get("data") { - Some(serde_json::Value::Array(lrs)) => { - if lrs.is_empty() { - Err(std::io::Error::other("Error response is empty")) - } else { - let lr = lrs[0].clone(); - let ll: textsender_models::token::LoginResult = - match serde_json::from_value(lr) { - Ok(lr) => lr, - Err(err) => { - return Err(std::io::Error::other(err.to_string())); - } - }; - Ok(ll) - } - } - _ => Err(std::io::Error::other("Error parsing response")), - } - } - Err(err) => Err(std::io::Error::other(err.to_string())), - } - } - - pub async fn has_token_expired(token: &textsender_models::token::LoginResult) -> bool { - let now = time::OffsetDateTime::now_utc(); - let expire = match time::OffsetDateTime::from_unix_timestamp(token.expires_in) { - Ok(res) => res, - Err(err) => { - eprintln!("Error: {err:?}"); - return false; - } - }; - - now > expire - } -} - pub fn auth_header( access_token: &str, ) -> (reqwest::header::HeaderName, reqwest::header::HeaderValue) { -- 2.47.3 From 391b3566ad989607a9b2d780da3fa4af213dc7fb Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 25 Jun 2026 21:51:34 -0400 Subject: [PATCH 12/24] Adding code to get message --- src/service/core.rs | 12 ++++++++ src/service/message.rs | 65 ++++++++++++++++++++++++++++++++++++++++++ src/service/mod.rs | 1 + 3 files changed, 78 insertions(+) diff --git a/src/service/core.rs b/src/service/core.rs index 6953bef..b384668 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -55,6 +55,10 @@ impl Service { app: self.app.clone(), token: self.token.clone(), }; + let messages = super::message::Message { + app: self.app.clone(), + token: self.token.clone() + }; let events = events.unwrap_or_default(); for event in events { println!("Event: {event:?}"); @@ -65,8 +69,16 @@ impl Service { continue; } }[0]; + let message = &match messages.get(&event.message_id).await { + Ok(messages) => messages, + Err(err) => { + eprintln!("Error: {err:?}"); + continue; + } + }[0]; println!("Contact Id: {:?}", contact.id); + println!("Message Id: {:?}", message.id); } todo!( diff --git a/src/service/message.rs b/src/service/message.rs index e69de29..67c7150 100644 --- a/src/service/message.rs +++ b/src/service/message.rs @@ -0,0 +1,65 @@ +pub struct Message { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl Message { + pub async fn get( + &self, + message_id: &uuid::Uuid, + ) -> Result, std::io::Error> { + let client = reqwest::Client::new(); + let endpoint = format!("api/v1/message?id={message_id}"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + }, + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_response( + response: &str, +) -> Result, std::io::Error> { + match serde_json::from_str::(response) { + Ok(j) => match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let mut events: Vec = Vec::new(); + + for event in lrs.iter() { + let ll: textsender_models::message::Message = + match serde_json::from_value(event.clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + events.push(ll); + } + + Ok(events) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} + diff --git a/src/service/mod.rs b/src/service/mod.rs index 7c8ac02..91d76d9 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,6 +1,7 @@ pub mod auth; pub mod contact; pub mod core; +pub mod message; pub mod event; pub mod queue; -- 2.47.3 From afbd23bed9b3acf75c3d6d75642eae006fbead00 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 25 Jun 2026 21:59:47 -0400 Subject: [PATCH 13/24] Got it working --- src/main.rs | 4 ---- src/service/core.rs | 4 ++-- src/service/message.rs | 1 - src/service/mod.rs | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 911720c..8b1e200 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,16 +26,12 @@ async fn main() -> Result<(), Box> { } }; - println!("Access token: {}", token.access_token); - let mut svc = catapult::service::core::Service { app: app.clone(), token, }; loop { - // TODO: Need to update textsender_models. The token module needs updating. - // The LoginResult needs expires_in populated if catapult::service::auth::has_token_expired(&svc.token).await { match auth.get_refresh_token(&svc.token).await { Ok(refresh) => { diff --git a/src/service/core.rs b/src/service/core.rs index b384668..5f31188 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -57,7 +57,7 @@ impl Service { }; let messages = super::message::Message { app: self.app.clone(), - token: self.token.clone() + token: self.token.clone(), }; let events = events.unwrap_or_default(); for event in events { @@ -94,7 +94,7 @@ impl Service { 2. If there is an item, get the data - Done 3. Evaluate if it is schedulable - Done 4. Get the events and iterate each one - Done - 5. Starting with the message + 5. Starting with the message - Done 6. Get the contact - Done 7. Send the message 8. Record the message event response diff --git a/src/service/message.rs b/src/service/message.rs index 67c7150..e10d4ae 100644 --- a/src/service/message.rs +++ b/src/service/message.rs @@ -62,4 +62,3 @@ async fn parse_response( Err(err) => Err(std::io::Error::other(err.to_string())), } } - diff --git a/src/service/mod.rs b/src/service/mod.rs index 91d76d9..5779824 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,8 +1,8 @@ pub mod auth; pub mod contact; pub mod core; -pub mod message; pub mod event; +pub mod message; pub mod queue; pub fn auth_header( -- 2.47.3 From 27cca3d9c172dbe08d986d134df6386c75c135dc Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 25 Jun 2026 22:34:14 -0400 Subject: [PATCH 14/24] Adding code to record Message Event Response --- src/service/core.rs | 2 +- src/service/mer.rs | 103 ++++++++++++++++++++++++++++++++++++++++++++ src/service/mod.rs | 1 + 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 src/service/mer.rs diff --git a/src/service/core.rs b/src/service/core.rs index 5f31188..ebd55a2 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -97,7 +97,7 @@ impl Service { 5. Starting with the message - Done 6. Get the contact - Done 7. Send the message - 8. Record the message event response + 8. Record the message event response - Added, not used 9. Add to scheduler "# ); diff --git a/src/service/mer.rs b/src/service/mer.rs new file mode 100644 index 0000000..894edc3 --- /dev/null +++ b/src/service/mer.rs @@ -0,0 +1,103 @@ +pub struct MessageEventResponse { + pub app: crate::app::App, +} + +impl MessageEventResponse { + pub async fn record_message_event_response( + &self, + mer: &textsender_models::message::event::MessageEventResponse, + ) -> Result { + let client = reqwest::Client::new(); + let endpoint = String::from("api/v1/schedule/message/event/response/record"); + let api_url = format!("{}/{endpoint}", self.app.auth_url); + + println!("Url: {api_url:?}"); + + use time::format_description::well_known::Iso8601; + let sent = match mer.sent.unwrap().format(&Iso8601::DEFAULT) { + Ok(converted) => converted, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + + let payload = serde_json::json!({ + "scheduled_message_event_id": mer.scheduled_message_event_id.unwrap(), + "response": mer.response, + "user_id": mer.user_id, + "sent": sent, + "status": textsender_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED, + "contact_id": mer.contact_id, + "message_id": mer.message_id + }); + + println!("Payload: {payload:?}"); + + match client.post(api_url).json(&payload).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::CREATED | reqwest::StatusCode::OK => { + println!("Response: {response:?}"); + match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other( + "Error recording Message Event Response", + )), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } + + /* + * + * { + "scheduled_message_event_id": "{{scheduled_message_event_id}}", + "response": {{text_response_raw}}, + "user_id": "{{user_id}}", + "sent": "2026-06-20T17:10:00Z", + "status": "{{mer_status_scheduled}}", + "contact_id": "{{contact_id}}", + "message_id": "{{message_id}}" + } + * + */ +} + +async fn parse_response( + response: &str, +) -> Result { + match serde_json::from_str::(response) { + Ok(j) => { + println!("Good"); + let message = &j["message"]; + let data = &j["data"]; + + println!("Message: {message:?}"); + println!("Data: {data:?}"); + match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let lr = lrs[0].clone(); + let ll: textsender_models::message::event::MessageEventResponse = + match serde_json::from_value(lr) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + Ok(ll) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + } + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} diff --git a/src/service/mod.rs b/src/service/mod.rs index 5779824..851ce6d 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -2,6 +2,7 @@ pub mod auth; pub mod contact; pub mod core; pub mod event; +pub mod mer; pub mod message; pub mod queue; -- 2.47.3 From 131a4d163edd5e2fda93ca31a6e8140d2831a44b Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 26 Jun 2026 20:45:58 -0400 Subject: [PATCH 15/24] Added code to send the message and record the event --- src/service/core.rs | 52 +++++++++++++++++++++++++++++++++++ src/service/mer.rs | 5 +++- src/service/mod.rs | 1 + src/service/scheduler.rs | 59 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 1 deletion(-) diff --git a/src/service/core.rs b/src/service/core.rs index ebd55a2..60e547b 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -59,6 +59,15 @@ impl Service { app: self.app.clone(), token: self.token.clone(), }; + let sch_msg = super::scheduler::ScheduledMessage { + app: self.app.clone(), + token: self.token.clone() + }; + let mer_req = super::mer::MessageEventResponse { + app: self.app.clone(), + token: self.token.clone() + }; + let events = events.unwrap_or_default(); for event in events { println!("Event: {event:?}"); @@ -76,9 +85,52 @@ impl Service { continue; } }[0]; + let scheduled_message = match sch_msg.get(&event.scheduled_message_id).await { + Ok(sch_msg_here) => sch_msg_here, + Err(err) => { + eprintln!("Error: {err:?}"); + continue; + } + }; println!("Contact Id: {:?}", contact.id); println!("Message Id: {:?}", message.id); + + let param = swoosh::twilio::types::Parameters { + schedule: true, + schedule_at: scheduled_message.scheduled + }; + + let twilio_config = &self.app.twilio_config; + + + match swoosh::twilio::api::send_message(&message, contact, ¶m, twilio_config).await { + Ok(resp) => { + // MER response + let result = swoosh::twilio::api::response_to_json(resp).await; + let mer = textsender_models::message::event::MessageEventResponse { + contact_id: contact.id.unwrap(), + scheduled_message_event_id: Some(event.id), + response: result, + message_id: message.id.unwrap(), + sent: scheduled_message.scheduled, + user_id: scheduled_message.user_id, + ..Default::default() + }; + + match mer_req.record_message_event_response(&mer).await { + Ok(response) => { + println!("Response: {response:?}"); + } + Err(err) => { + eprintln!("Error: {err:?}"); + } + } + } + Err(err) => { + eprintln!("Error: {err:?}"); + } + } } todo!( diff --git a/src/service/mer.rs b/src/service/mer.rs index 894edc3..0ba1660 100644 --- a/src/service/mer.rs +++ b/src/service/mer.rs @@ -1,5 +1,6 @@ pub struct MessageEventResponse { pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, } impl MessageEventResponse { @@ -33,7 +34,9 @@ impl MessageEventResponse { println!("Payload: {payload:?}"); - match client.post(api_url).json(&payload).send().await { + let (key, header) = super::auth_header(&self.token.access_token); + + match client.post(api_url).json(&payload).header(key, header).send().await { Ok(response) => match response.status() { reqwest::StatusCode::CREATED | reqwest::StatusCode::OK => { println!("Response: {response:?}"); diff --git a/src/service/mod.rs b/src/service/mod.rs index 851ce6d..5bedc28 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -5,6 +5,7 @@ pub mod event; pub mod mer; pub mod message; pub mod queue; +pub mod scheduler; pub fn auth_header( access_token: &str, diff --git a/src/service/scheduler.rs b/src/service/scheduler.rs index e69de29..77555fb 100644 --- a/src/service/scheduler.rs +++ b/src/service/scheduler.rs @@ -0,0 +1,59 @@ +pub struct ScheduledMessage { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl ScheduledMessage { + pub async fn get( + &self, + scheduled_message_id: &uuid::Uuid, + ) -> Result { + let client = reqwest::Client::new(); + let endpoint = format!("api/v1/scheduled/message?id={scheduled_message_id}"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + }, + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_response( + response: &str, +) -> Result { + match serde_json::from_str::(response) { + Ok(j) => match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let ll: textsender_models::message::scheduling::ScheduledMessage = + match serde_json::from_value(lrs[0].clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + + Ok(ll) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} -- 2.47.3 From b93ace85cda90ccedc3f70e2eb0f43a5ee89e559 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 26 Jun 2026 20:50:05 -0400 Subject: [PATCH 16/24] Code formatting --- src/service/core.rs | 12 +++++++----- src/service/event.rs | 4 +++- src/service/mer.rs | 10 ++++++++-- src/service/scheduler.rs | 16 ++++++++-------- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/service/core.rs b/src/service/core.rs index 60e547b..3f81580 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -61,11 +61,11 @@ impl Service { }; let sch_msg = super::scheduler::ScheduledMessage { app: self.app.clone(), - token: self.token.clone() + token: self.token.clone(), }; let mer_req = super::mer::MessageEventResponse { app: self.app.clone(), - token: self.token.clone() + token: self.token.clone(), }; let events = events.unwrap_or_default(); @@ -98,13 +98,13 @@ impl Service { let param = swoosh::twilio::types::Parameters { schedule: true, - schedule_at: scheduled_message.scheduled + schedule_at: scheduled_message.scheduled, }; let twilio_config = &self.app.twilio_config; - - match swoosh::twilio::api::send_message(&message, contact, ¶m, twilio_config).await { + match swoosh::twilio::api::send_message(&message, contact, ¶m, twilio_config).await + { Ok(resp) => { // MER response let result = swoosh::twilio::api::response_to_json(resp).await; @@ -133,6 +133,7 @@ impl Service { } } + /* todo!( r#" Need to finish this @@ -153,6 +154,7 @@ impl Service { 9. Add to scheduler "# ); + */ } fn is_schedulable( diff --git a/src/service/event.rs b/src/service/event.rs index 2c63a39..c8f8456 100644 --- a/src/service/event.rs +++ b/src/service/event.rs @@ -27,7 +27,9 @@ impl Event { }, Err(err) => Err(std::io::Error::other(err)), }, - _ => Err(std::io::Error::other("Error getting token")), + _ => Err(std::io::Error::other( + "Error getting Scheduled Message Event", + )), }, Err(err) => Err(std::io::Error::other(err.to_string())), } diff --git a/src/service/mer.rs b/src/service/mer.rs index 0ba1660..1da1e9d 100644 --- a/src/service/mer.rs +++ b/src/service/mer.rs @@ -10,7 +10,7 @@ impl MessageEventResponse { ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v1/schedule/message/event/response/record"); - let api_url = format!("{}/{endpoint}", self.app.auth_url); + let api_url = format!("{}/{endpoint}", self.app.api_url); println!("Url: {api_url:?}"); @@ -36,7 +36,13 @@ impl MessageEventResponse { let (key, header) = super::auth_header(&self.token.access_token); - match client.post(api_url).json(&payload).header(key, header).send().await { + match client + .post(api_url) + .json(&payload) + .header(key, header) + .send() + .await + { Ok(response) => match response.status() { reqwest::StatusCode::CREATED | reqwest::StatusCode::OK => { println!("Response: {response:?}"); diff --git a/src/service/scheduler.rs b/src/service/scheduler.rs index 77555fb..f7ebef9 100644 --- a/src/service/scheduler.rs +++ b/src/service/scheduler.rs @@ -9,7 +9,7 @@ impl ScheduledMessage { scheduled_message_id: &uuid::Uuid, ) -> Result { let client = reqwest::Client::new(); - let endpoint = format!("api/v1/scheduled/message?id={scheduled_message_id}"); + let endpoint = format!("api/v1/schedule/message?id={scheduled_message_id}"); let api_url = format!("{}/{endpoint}", self.app.api_url); println!("Url: {api_url:?}"); @@ -25,7 +25,7 @@ impl ScheduledMessage { }, Err(err) => Err(std::io::Error::other(err)), }, - _ => Err(std::io::Error::other("Error getting token")), + _ => Err(std::io::Error::other("Error getting Scheduled Message")), }, Err(err) => Err(std::io::Error::other(err.to_string())), } @@ -41,12 +41,12 @@ async fn parse_response( if lrs.is_empty() { Err(std::io::Error::other("Error response is empty")) } else { - let ll: textsender_models::message::scheduling::ScheduledMessage = - match serde_json::from_value(lrs[0].clone()) { - Ok(lr) => lr, - Err(err) => { - return Err(std::io::Error::other(err.to_string())); - } + let ll: textsender_models::message::scheduling::ScheduledMessage = + match serde_json::from_value(lrs[0].clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } }; Ok(ll) -- 2.47.3 From fd8e84a0626e860f08ce3010cb51bc47873eec42 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 26 Jun 2026 21:36:52 -0400 Subject: [PATCH 17/24] Not working yet --- src/service/core.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/service/core.rs b/src/service/core.rs index 3f81580..0e70898 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -69,7 +69,7 @@ impl Service { }; let events = events.unwrap_or_default(); - for event in events { + for event in &events { println!("Event: {event:?}"); let contact = &match contacts.get(&event.contact_id).await { Ok(contact) => contact, @@ -95,6 +95,7 @@ impl Service { println!("Contact Id: {:?}", contact.id); println!("Message Id: {:?}", message.id); + println!("Scheduled Message Id: {:?}", scheduled_message.id); let param = swoosh::twilio::types::Parameters { schedule: true, @@ -102,10 +103,13 @@ impl Service { }; let twilio_config = &self.app.twilio_config; + println!("Config: {twilio_config:?}"); + println!("SM: {scheduled_message:?}"); - match swoosh::twilio::api::send_message(&message, contact, ¶m, twilio_config).await + match swoosh::twilio::api::send_message(&message, &contact, ¶m, twilio_config).await { Ok(resp) => { + println!("Message scheduled"); // MER response let result = swoosh::twilio::api::response_to_json(resp).await; let mer = textsender_models::message::event::MessageEventResponse { @@ -120,14 +124,17 @@ impl Service { match mer_req.record_message_event_response(&mer).await { Ok(response) => { + println!("Recording MER"); println!("Response: {response:?}"); } Err(err) => { + eprintln!("Error recording mer"); eprintln!("Error: {err:?}"); } } } Err(err) => { + eprintln!("Message not sent"); eprintln!("Error: {err:?}"); } } -- 2.47.3 From f7f030809519e6a9629101338cf35d20f976cd11 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 26 Jun 2026 21:40:02 -0400 Subject: [PATCH 18/24] bump: swoosh and textsender_models --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 808982d..b8e5f16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2274,8 +2274,8 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swoosh" -version = "0.4.1" -source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.1-10-6bdec12084-871#6bdec1208499dfa9962efd89b549d1bfa5441d85" +version = "0.4.2" +source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.2-10-28de0f61e4-871#28de0f61e4c62eec4352cea8fb23ef76fb2bf9ad" dependencies = [ "base64-ng", "const_format", @@ -2359,8 +2359,8 @@ dependencies = [ [[package]] name = "textsender_models" -version = "0.4.3" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.3-29-720f3d8f75-111#720f3d8f7515d8cd20a9cd73086bd6c1ab857651" +version = "0.4.10" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.10-29-6e91320709-111#6e91320709a369b525e911c51682a0d959a746dc" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 7f6f6f7..6431111 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.3", features = ["v4", "serde"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-720f3d8f75-111" } -swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.1-10-6bdec12084-871" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10-29-6e91320709-111" } +swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2-10-28de0f61e4-871" } [dev-dependencies] -- 2.47.3 From d0d52ab6e9fa61d9c738e5ea7c87c73d71df12d0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 26 Jun 2026 22:23:01 -0400 Subject: [PATCH 19/24] bump: swoosh --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8e5f16..c205fe8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2275,7 +2275,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swoosh" version = "0.4.2" -source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.2-10-28de0f61e4-871#28de0f61e4c62eec4352cea8fb23ef76fb2bf9ad" +source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.2-10-f4150af077-871#f4150af077c4965ecc90c1f18341c96148be936a" dependencies = [ "base64-ng", "const_format", diff --git a/Cargo.toml b/Cargo.toml index 6431111..b76e7a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,6 @@ serde_json = { version = "1.0.150" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.3", features = ["v4", "serde"] } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10-29-6e91320709-111" } -swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2-10-28de0f61e4-871" } +swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2-10-f4150af077-871" } [dev-dependencies] -- 2.47.3 From d56744f09651e1e7f8b1f12325a36826d4afcd37 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 27 Jun 2026 16:32:28 -0400 Subject: [PATCH 20/24] Adding docker files --- .dockerignore.yaml | 8 ++++++ Dockerfile | 61 +++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yaml | 11 ++++++++ 3 files changed, 80 insertions(+) create mode 100644 .dockerignore.yaml create mode 100644 Dockerfile create mode 100644 docker-compose.yaml diff --git a/.dockerignore.yaml b/.dockerignore.yaml new file mode 100644 index 0000000..e36e772 --- /dev/null +++ b/.dockerignore.yaml @@ -0,0 +1,8 @@ +target/ + +.git/ + +.gitea/ +.github/ + +*.DS_Store diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1f9a801 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,61 @@ +# Stage 1: Build the application +FROM rust:1.96 as builder + +# Set the working directory inside the container +WORKDIR /usr/src/app + +# Install build dependencies if needed (e.g., git for cloning) +RUN apt-get update && apt-get install -y --no-install-recommends \ + pkg-config libssl3 \ + ca-certificates \ + openssh-client git \ + && rm -rf /var/lib/apt/lists/* + +# << --- ADD HOST KEY HERE --- >> +# Replace 'yourgithost.com' with the actual hostname (e.g., github.com) +RUN mkdir -p -m 0700 ~/.ssh && \ + ssh-keyscan git.kundeng.us >> ~/.ssh/known_hosts + +# Copy Cargo manifests +COPY Cargo.toml Cargo.lock ./ + +# Build *only* dependencies to leverage Docker cache +# This dummy build caches dependencies as a separate layer +RUN --mount=type=ssh mkdir src && \ + echo "fn main() {println!(\"if you see this, the build broke\")}" > src/main.rs && \ + cargo build --release --quiet && \ + rm -rf src target/release/deps/catapult* + +# Copy the actual source code +COPY src ./src +# If you have other directories like `templates` or `static`, copy them too +COPY .env ./.env + +# << --- SSH MOUNT ADDED HERE --- >> +# Build *only* dependencies to leverage Docker cache +# This dummy build caches dependencies as a separate layer +# Mount the SSH agent socket for this command +RUN --mount=type=ssh \ + cargo build --release --quiet + +# Stage 2: Create the final, smaller runtime image +# Use a minimal base image like debian-slim or even distroless for security/size +FROM debian:trixie-slim + +# Install runtime dependencies if needed (e.g., SSL certificates) +RUN apt-get update && apt-get install -y ca-certificates libssl-dev libssl3 && rm -rf /var/lib/apt/lists/* + +# Set the working directory +WORKDIR /usr/local/bin + +# Copy the compiled binary from the builder stage +# Replace 'catapult' with the actual name of your binary (usually the crate name) +COPY --from=builder /usr/src/app/target/release/catapult . + +# Copy other necessary files like .env (if used for runtime config) or static assets +# It's generally better to configure via environment variables in Docker though +COPY --from=builder /usr/src/app/.env . + +# Set the command to run your application +# Ensure this matches the binary name copied above +CMD ["./catapult"] diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..68c84f6 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,11 @@ +version: '3.8' # Use a recent version + +services: + songparser: + build: + context: . + ssh: ["default"] # Uses host's SSH agent + container_name: catapult + env_file: + - .env + restart: unless-stopped # Optional: Restart policy -- 2.47.3 From e074372c60397764792aaedff1f93b3dce9df5ba Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 27 Jun 2026 17:12:04 -0400 Subject: [PATCH 21/24] Updating workflow --- .gitea/workflows/pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index 843f6c4..e8365a4 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -3,13 +3,12 @@ name: catapult PR on: pull_request: branches: - - v0.3.0 + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - jobs: check: name: Check -- 2.47.3 From 62e482875010db12059e3c5309cc6a628672f1ea Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 27 Jun 2026 17:12:19 -0400 Subject: [PATCH 22/24] bump: catapult --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c205fe8..5431be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,7 +128,7 @@ checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" [[package]] name = "catapult" -version = "0.2.2" +version = "0.3.0" dependencies = [ "futures", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index b76e7a5..7e24c9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "catapult" -version = "0.2.2" +version = "0.3.0" rust-version = "1.96" edition = "2024" -- 2.47.3 From 3c34663767094117cd2601e383e9c0382db8a93f Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 27 Jun 2026 17:31:54 -0400 Subject: [PATCH 23/24] bump: swoosh and textsender_models --- Cargo.lock | 78 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 4 +-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5431be1..ce3c7ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "atoi" @@ -80,9 +80,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-ng" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9a6fdffd0a02049343b2bde0b86b3f38a8617a316f01de56811bec1fb78659" +checksum = "735259e24200bce69feb75fcb2f79f36129e54c3f3139da15880520988cd840c" [[package]] name = "base64ct" @@ -167,9 +167,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", "cpufeatures 0.3.0", @@ -1047,9 +1047,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.102" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", @@ -1436,9 +1436,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.9" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8" dependencies = [ "bytes", "cfg_aliases", @@ -1456,9 +1456,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" +checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e" dependencies = [ "aws-lc-rs", "bytes", @@ -1492,9 +1492,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -1739,14 +1739,14 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "once_cell", @@ -2275,7 +2275,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swoosh" version = "0.4.2" -source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.2-10-f4150af077-871#f4150af077c4965ecc90c1f18341c96148be936a" +source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.4.2.0#e1e730fd1cac720e03f7b1d60ddba992d3b09a9d" dependencies = [ "base64-ng", "const_format", @@ -2351,16 +2351,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "textsender_models" version = "0.4.10" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.10-29-6e91320709-111#6e91320709a369b525e911c51682a0d959a746dc" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.10#c1d391939baf94df09ee405a1f0bf269690f7dec" dependencies = [ "const_format", "dotenvy", @@ -2395,9 +2395,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.49" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469" +checksum = "85c17d80feb7334b40c484e45ed1a5273dfd8bfda537c3be2e74a06a6686f327" dependencies = [ "deranged", "num-conv", @@ -2415,9 +2415,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.29" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d" +checksum = "dcef1a61bdb119096e153208ec5cbec23944ce8bca13be5c7f60c634f7403935" dependencies = [ "num-conv", "time-core", @@ -2688,9 +2688,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.3" +version = "1.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" +checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -2752,9 +2752,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -2765,9 +2765,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.75" +version = "0.4.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" +checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" dependencies = [ "js-sys", "wasm-bindgen", @@ -2775,9 +2775,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2785,9 +2785,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -2798,9 +2798,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.125" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] @@ -2820,9 +2820,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.102" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 7e24c9d..24eda1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.3", features = ["v4", "serde"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10-29-6e91320709-111" } -swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2-10-f4150af077-871" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10" } +swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.2.0" } [dev-dependencies] -- 2.47.3 From dbdfcfabe972c6421004d86d286b1def4f1b1cfd Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 27 Jun 2026 17:35:00 -0400 Subject: [PATCH 24/24] Warning fixes --- src/service/core.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/service/core.rs b/src/service/core.rs index 0e70898..59acfff 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -106,8 +106,7 @@ impl Service { println!("Config: {twilio_config:?}"); println!("SM: {scheduled_message:?}"); - match swoosh::twilio::api::send_message(&message, &contact, ¶m, twilio_config).await - { + match swoosh::twilio::api::send_message(message, contact, ¶m, twilio_config).await { Ok(resp) => { println!("Message scheduled"); // MER response -- 2.47.3