message_event_response-changes (#19 )

Reviewed-on: #19 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
tsk-11: Obtain refresh token (#18 )
2025-12-22 22:35:48 +00:00 · 2025-12-04 03:13:13 +00:00 · 2025-12-02 22:02:33 +00:00
11 changed files with 156 additions and 35 deletions
@@ -0,0 +1,6 @@
+vendor/
+
+.git/
+.gitea/
+
+.env
@@ -0,0 +1,8 @@
+AUTH_URL=https://auth.txt.com
+API_URL=https://txt.com
+SERVICE_USERNAME=suave
+SERVICE_PASSPHRASE=9238urc9328nr329
+TWILIO_AUTH_SID=9M438C93R943U4329MCU43C34U
+TWILIO_SERVICE_SID=9M4J3X8439U398NUVT3342MC349C348T
+TWILIO_AUTH_TOKEN="f4a1f2b0b79ea3735078c2d8ee9684e1"
+TWILIO_PHONE_NUMBER=10123456789
@@ -3,3 +3,4 @@ catapult

 .env
 .env.local
+.env.docker
@@ -0,0 +1,45 @@
+FROM golang:1.25.4 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."ssh://git@git.kundeng.us".insteadOf "https://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"]
@@ -0,0 +1,11 @@
+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
@@ -3,8 +3,8 @@ module git.kundeng.us/phoenix/catapult
 go 1.25.4

 require (
-	git.kundeng.us/phoenix/swoosh v0.0.6
-	git.kundeng.us/phoenix/textsender-models v0.0.11
+	git.kundeng.us/phoenix/swoosh v0.0.12
+	git.kundeng.us/phoenix/textsender-models v0.0.12
 	github.com/google/uuid v1.6.0
 	github.com/joho/godotenv v1.5.1
 )
@@ -13,5 +13,5 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/twilio/twilio-go v1.28.7 // indirect
+	github.com/twilio/twilio-go v1.28.8 // indirect
 )
@@ -1,7 +1,7 @@
-git.kundeng.us/phoenix/swoosh v0.0.6 h1:9+BFsmuxufEPJErMJUioyRGb0KoIPdwW+PSbEva5UuU=
-git.kundeng.us/phoenix/swoosh v0.0.6/go.mod h1:czsMdVpt7HKkaP1HOl5+j9ePOQCA0r9UW4uAxwAbTPk=
-git.kundeng.us/phoenix/textsender-models v0.0.11 h1:kd2FdeZJhJJAXBm8MoyadtgNGyzC+puU1oR8B8N+MfE=
-git.kundeng.us/phoenix/textsender-models v0.0.11/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
+git.kundeng.us/phoenix/swoosh v0.0.12 h1:OtGUYJzakpzJ0fF2BP/z+maCtEfG+avQUJiCY9LMix8=
+git.kundeng.us/phoenix/swoosh v0.0.12/go.mod h1:5J/URwiWcjksaPmczelvBEeLdwB1mACFuhUdtWTheDg=
+git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4=
+git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -29,8 +29,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 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.28.7 h1:WzzQDR/rqmNkVs1TwtcHFPYGTdSdPnx/eAZf5UIXzr4=
-github.com/twilio/twilio-go v1.28.7/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
+github.com/twilio/twilio-go v1.28.8 h1:wbFz7Wt4S5mCEaes6FcM/ddcJGIhdjwp/9CHb9e+4fk=
+github.com/twilio/twilio-go v1.28.8/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
 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=
@@ -16,7 +16,7 @@ type App struct {
 	AuthUrl           string
 	ServiceUsername   string
 	ServicePassphrase string
-	TwilioConfig      *config.TwiloConfig
+	TwilioConfig      *config.TwilioConfig
 }

 func Load() (*App, error) {
@@ -56,7 +56,7 @@ func Load() (*App, error) {
 	}
 }

-func loadTwilioConfig() (*config.TwiloConfig, error) {
+func loadTwilioConfig() (*config.TwilioConfig, error) {
 	authSid := os.Getenv("TWILIO_AUTH_SID")
 	serviceSid := os.Getenv("TWILIO_SERVICE_SID")
 	authToken := os.Getenv("TWILIO_AUTH_TOKEN")
@@ -71,7 +71,7 @@ func loadTwilioConfig() (*config.TwiloConfig, error) {
 	} else if len(phoneNumber) == 0 {
 		return nil, fmt.Errorf("Twilio config phone number not provided")
 	} else {
-		cfg := config.TwiloConfig{}
+		cfg := config.TwilioConfig{}
 		cfg.AccountSID = authSid
 		cfg.AuthToken = authToken
 		cfg.ServiceSID = serviceSid
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"time"

 	"git.kundeng.us/phoenix/textsender-models/tx0/token"

@@ -53,3 +54,45 @@ func (a *Auth) GetToken() (*token.Login, error) {

 	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
+	}
+}
@@ -3,7 +3,6 @@ package core
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"log"
 	"sync"
 	"time"
@@ -57,46 +56,54 @@ func (s *Service) worker1() {
 			// Do some work
 			now := time.Now()
 			log.Println("Worker 1: Processing...")
+			catapultAuth := service.Auth{Application: s.App}
 			if s.token == nil {
-				catapultAuth := service.Auth{Application: s.App}
+				log.Println("Token has not been fetched")
+				log.Println("Fetching token")
 				if token, err := catapultAuth.GetToken(); err != nil {
-					fmt.Println("Error:", err)
+					log.Println("Error:", err)
 				} else {
-					fmt.Println("Access token:", token.AccessToken)
+					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
+				}
 			}

-			log.Println("Twilio config account sid:", s.App.TwilioConfig.AccountSID)
-			log.Println("Twilio config auth token:", s.App.TwilioConfig.AuthToken)
-			log.Println("Twilio config service sid:", s.App.TwilioConfig.ServiceSID)
-			log.Println("Twilio config number:", s.App.TwilioConfig.Number)
-
 			queue := service.Queue{Application: s.App, Token: s.token}
 			if item, exists, err := queue.GetQueue(); err != nil {
-				fmt.Println("Error:", err)
+				log.Println("Error:", err)
 			} else {
 				if *exists {
-					fmt.Println("Scheduled message Id:", item.Id)
-					fmt.Println("Created:", item.Created)
-					fmt.Println("Scheduled:", item.Scheduled)
-					fmt.Println("Status:", item.Status)
+					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) {
-						fmt.Println("Scheduled Message can be sent")
+						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 {
-							fmt.Println("Error getting event:", err)
+							log.Println("Error getting event:", err)
 						} else {
 							for _, event := range events {
 								if msg, err := scheduler.GetMessage(event.MessageId); err != nil {
-									fmt.Println("Error getting message:", err)
+									log.Println("Error getting message:", err)
 								} else {
 									if c, err := scheduler.GetContact(event.RecipientId); err != nil {
-										fmt.Println("Error getting contact:", err)
+										log.Println("Error getting contact:", err)
 									} else {
-										fmt.Println("Message Id:", msg.Id)
-										fmt.Println("Contact Id:", c.Id)
+										log.Println("Message Id:", msg.Id)
+										log.Println("Contact Id:", c.Id)
 										if res, sent, err := scheduler.ScheduleMessage(*item, *event, *c, *msg); err != nil {
 											log.Println("Failure with scheduling the message:", err)
 										} else {
@@ -139,10 +146,10 @@ func (s *Service) worker1() {
 							}
 						}
 					} else {
-						fmt.Println("Invalid scheduled message")
+						log.Println("Invalid scheduled message")
 					}
 				} else {
-					fmt.Println("Empty queue")
+					log.Println("Empty queue")
 				}
 			}
 		}
@@ -57,7 +57,7 @@ func (s *Scheduler) ScheduleMessage(schMsg scheduling.ScheduledMessage, event sc
 }

 func (s *Scheduler) RecordEventResponse(schMsgEvent *scheduling.ScheduledMessageEvent, userId uuid.UUID, bytes []byte, sent *time.Time) ([]*message.MessageEventResponse, error) {
-	mre := message.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent}
+	mre := message.MessageEventResponse{ScheduledMessageEventId: schMsgEvent.Id, UserId: userId, Response: bytes, Sent: *sent, Status: message.Message_Event_Response_Status_Scheduled}

 	msgEventResponse := MessageEventResponse{Application: s.Application, Token: s.Token}
 	if responses, err := msgEventResponse.RecordEventResponse(&mre); err != nil {