[messages] add messages priority

Author: capcom6

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.2
 
 require (
 	firebase.google.com/go/v4 v4.12.1
-	github.com/android-sms-gateway/client-go v1.5.6
+	github.com/android-sms-gateway/client-go v1.5.7-0.20250329004203-446171f5cfa2
 	github.com/ansrivas/fiberprometheus/v2 v2.6.1
 	github.com/capcom6/go-helpers v0.2.0
 	github.com/capcom6/go-infra-fx v0.2.1

go.sum

@@ -26,12 +26,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
-github.com/android-sms-gateway/client-go v1.5.4 h1:sFMqu+Lc+YtkasesmerckVV8KKL8Qcx/VPEUWvcfbyA=
-github.com/android-sms-gateway/client-go v1.5.4/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
-github.com/android-sms-gateway/client-go v1.5.6-0.20250326025946-2625b20dcccd h1:VuSsDc7HeRllPmVrFCmMi0ksFDWEDoUEHFuua4ccJ0s=
-github.com/android-sms-gateway/client-go v1.5.6-0.20250326025946-2625b20dcccd/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
-github.com/android-sms-gateway/client-go v1.5.6 h1:sCiBT1Fn7QBaTlX7Z3eBGDcG+u+3sADmp+rxb0HWuaA=
-github.com/android-sms-gateway/client-go v1.5.6/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
+github.com/android-sms-gateway/client-go v1.5.7-0.20250329004203-446171f5cfa2 h1:olxI6g/dAUFUMcgKV8Dq+wRE4rJuUmRk1v0NsAUV+oA=
+github.com/android-sms-gateway/client-go v1.5.7-0.20250329004203-446171f5cfa2/go.mod h1:DQsReciU1xcaVW3T5Z2bqslNdsAwCFCtghawmA6g6L4=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/ansrivas/fiberprometheus/v2 v2.6.1 h1:wac3pXaE6BYYTF04AC6K0ktk6vCD+MnDOJZ3SK66kXM=
@@ -41,10 +37,6 @@ github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/capcom6/go-helpers v0.1.1 h1:kcpK1+VUwo94MZlZX+0Gab4gf78egHTPzW9sOQXLfFE=
-github.com/capcom6/go-helpers v0.1.1/go.mod h1:WDqc7HZNqHxUTisArkYIBZtqUfJBVyPWeQI+FMwEzAw=
-github.com/capcom6/go-helpers v0.1.2-0.20250326030929-5d1f34b4936b h1:grbupORuCS6EJV/IMdEijRwmW7M91bpgqqex/TRKg38=
-github.com/capcom6/go-helpers v0.1.2-0.20250326030929-5d1f34b4936b/go.mod h1:WDqc7HZNqHxUTisArkYIBZtqUfJBVyPWeQI+FMwEzAw=
 github.com/capcom6/go-helpers v0.2.0 h1:OUcUnVbjBiwaTzvyaxkxqRKtrOXv1ifYalQ1NXzFBNM=
 github.com/capcom6/go-helpers v0.2.0/go.mod h1:WDqc7HZNqHxUTisArkYIBZtqUfJBVyPWeQI+FMwEzAw=
 github.com/capcom6/go-infra-fx v0.2.1 h1:8rqr2ZV+YC2R07amHMdlE1XKLUhMe5yO+ffCJ/xXlNY=

internal/sms-gateway/handlers/mobile.go

@@ -16,6 +16,7 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices"
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
 	"github.com/capcom6/go-helpers/anys"
+	"github.com/capcom6/go-helpers/slices"
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/keyauth"
@@ -163,7 +164,11 @@ func (h *mobileHandler) getMessage(device models.Device, c *fiber.Ctx) error {
 		return fmt.Errorf("can't get messages: %w", err)
 	}
 
-	return c.JSON(messages)
+	return c.JSON(
+		smsgateway.MobileGetMessagesReponse(
+			slices.Map(messages, func(m smsgateway.Message) smsgateway.MobileMessage { return smsgateway.MobileMessage(m) }),
+		),
+	)
 }
 
 //	@Summary		Update message state

internal/sms-gateway/modules/messages/converters.go

@@ -0,0 +1,38 @@
+package messages
+
+import (
+	"time"
+
+	"github.com/android-sms-gateway/client-go/smsgateway"
+	"github.com/android-sms-gateway/server/internal/sms-gateway/models"
+	"github.com/capcom6/go-helpers/anys"
+	"github.com/capcom6/go-helpers/slices"
+)
+
+func messageToDTO(input *models.Message) smsgateway.Message {
+	var ttl *uint64 = nil
+	if input.ValidUntil != nil {
+		delta := time.Until(*input.ValidUntil).Seconds()
+		if delta > 0 {
+			deltaInt := uint64(delta)
+			ttl = &deltaInt
+		} else {
+			deltaInt := uint64(0)
+			ttl = &deltaInt
+		}
+	}
+
+	return smsgateway.Message{
+		ID:           input.ExtID,
+		Message:      input.Message,
+		PhoneNumbers: slices.Map(input.Recipients, func(r models.MessageRecipient) string { return r.PhoneNumber }),
+
+		SimNumber:          input.SimNumber,
+		WithDeliveryReport: anys.AsPointer(input.WithDeliveryReport),
+		IsEncrypted:        input.IsEncrypted,
+		TTL:                ttl,
+		ValidUntil:         input.ValidUntil,
+
+		CreatedAt: input.CreatedAt,
+	}
+}

internal/sms-gateway/modules/messages/service.go

@@ -103,28 +103,7 @@ func (s *Service) SelectPending(deviceID string) ([]smsgateway.Message, error) {
 
 	result := make([]smsgateway.Message, len(messages))
 	for i, v := range messages {
-		var ttl *uint64 = nil
-		if v.ValidUntil != nil {
-			delta := time.Until(*v.ValidUntil).Seconds()
-			if delta > 0 {
-				deltaInt := uint64(delta)
-				ttl = &deltaInt
-			} else {
-				deltaInt := uint64(0)
-				ttl = &deltaInt
-			}
-		}
-
-		result[i] = smsgateway.Message{
-			ID:                 v.ExtID,
-			Message:            v.Message,
-			SimNumber:          v.SimNumber,
-			WithDeliveryReport: anys.AsPointer[bool](v.WithDeliveryReport),
-			IsEncrypted:        v.IsEncrypted,
-			PhoneNumbers:       s.recipientsToDomain(v.Recipients),
-			TTL:                ttl,
-			ValidUntil:         v.ValidUntil,
-		}
+		result[i] = messageToDTO(&v)
 	}
 
 	return result, nil
@@ -265,16 +244,6 @@ func (s *Service) Clean(ctx context.Context) error {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-func (s *Service) recipientsToDomain(input []models.MessageRecipient) []string {
-	output := make([]string, len(input))
-
-	for i, v := range input {
-		output[i] = v.PhoneNumber
-	}
-
-	return output
-}
-
 func (s *Service) recipientsToModel(input []string) []models.MessageRecipient {
 	output := make([]models.MessageRecipient, len(input))