Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Add pusher websocket listener for phone updated events
Acho Arnolde3cac34e03f2
diff --git a/android/build.gradle b/android/build.gradleindex e234c71a..bb5e2f77 100644--- a/android/build.gradle+++ b/android/build.gradle@@ -17,8 +17,8 @@ buildscript {}plugins {- id 'com.android.application' version '8.7.3' apply false- id 'com.android.library' version '8.7.3' apply false+ id 'com.android.application' version '8.8.0' apply false+ id 'com.android.library' version '8.8.0' apply falseid 'org.jetbrains.kotlin.android' version '1.6.21' apply false}diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.propertiesindex c9d1c8d8..e0e32b56 100644--- a/android/gradle/wrapper/gradle-wrapper.properties+++ b/android/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@#Thu Jun 23 15:32:32 EEST 2022distributionBase=GRADLE_USER_HOME-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zipdistributionPath=wrapper/distszipStorePath=wrapper/distszipStoreBase=GRADLE_USER_HOMEdiff --git a/api/.env.docker b/api/.env.dockerindex 2a54701a..9dc43fdb 100644--- a/api/.env.docker+++ b/api/.env.docker@@ -51,3 +51,10 @@ REDIS_URL=redis://@redis:6379# [optional] If you would like to use uptrace.dev for distributed tracing, you can set the DSN here.# This is optional and you can leave it empty if you don't want to use uptraceUPTRACE_DSN=+++# [optional] Websocket configuration for https://pusher.com if you will like to frontend to update in real time+PUSHER_APP_ID=+PUSHER_KEY=+PUSHER_SECRET=+PUSHER_CLUSTER=diff --git a/api/go.mod b/api/go.modindex 43d90927..47b7497d 100644--- a/api/go.mod+++ b/api/go.mod@@ -35,6 +35,7 @@ require (github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177github.com/patrickmn/go-cache v2.1.0+incompatiblegithub.com/pkg/errors v0.9.1+ github.com/pusher/pusher-http-go/v5 v5.1.1github.com/redis/go-redis/extra/redisotel/v9 v9.7.1github.com/redis/go-redis/v9 v9.7.3github.com/rs/zerolog v1.34.0@@ -151,13 +152,13 @@ require (go.opentelemetry.io/proto/otlp v1.5.0 // indirectgo.uber.org/multierr v1.11.0 // indirectgo.uber.org/zap v1.27.0 // indirect- golang.org/x/crypto v0.36.0 // indirect+ golang.org/x/crypto v0.37.0 // indirectgolang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirectgolang.org/x/net v0.38.0 // indirectgolang.org/x/oauth2 v0.27.0 // indirect- golang.org/x/sync v0.12.0 // indirect- golang.org/x/sys v0.31.0 // indirect- golang.org/x/text v0.23.0 // indirect+ golang.org/x/sync v0.13.0 // indirect+ golang.org/x/sys v0.32.0 // indirect+ golang.org/x/text v0.24.0 // indirectgolang.org/x/time v0.10.0 // indirectgolang.org/x/tools v0.31.0 // indirectgoogle.golang.org/appengine v1.6.8 // indirectdiff --git a/api/go.sum b/api/go.sumindex a5501cf9..faecefdb 100644--- a/api/go.sum+++ b/api/go.sum@@ -246,6 +246,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmgithub.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=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/pusher/pusher-http-go/v5 v5.1.1 h1:ZLUGdLA8yXMvByafIkS47nvuXOHrYmlh4bsQvuZnYVQ=+github.com/pusher/pusher-http-go/v5 v5.1.1/go.mod h1:Ibji4SGoUDtOy7CVRhCiEpgy+n5Xv6hSL/QqYOhmWW8=github.com/redis/go-redis/extra/rediscmd/v9 v9.7.1 h1:+o7rrBoj54t8fqQSmnwRLdLzp5rps7bW4xiYZp2MBjs=github.com/redis/go-redis/extra/rediscmd/v9 v9.7.1/go.mod h1:bWIjbxmrAk9eKGg9LSko3oQefoYGyWV4xzNS55PgL60=github.com/redis/go-redis/extra/redisotel/v9 v9.7.1 h1:LJF39lvUagUpKfL2/gZIp5vHv3AwXt9zOZ/Xual/CzI=@@ -363,11 +365,12 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=golang.org/x/crypto v0.0.0-20181029175232-7e6ffbd03851/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=+golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=@@ -378,6 +381,7 @@ golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=+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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=@@ -393,10 +397,11 @@ golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWTgolang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190225065934-cc5685c2db12/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-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=@@ -409,8 +414,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=@@ -425,8 +430,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=@@ -457,6 +462,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=+gopkg.in/stretchr/testify.v1 v1.2.2 h1:yhQC6Uy5CqibAIlk1wlusa/MJ3iAN49/BsR/dCCKz3M=+gopkg.in/stretchr/testify.v1 v1.2.2/go.mod h1:QI5V/q6UbPmuhtm10CaFZxED9NreB8PnFYN9JcR6TxU=gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=diff --git a/api/pkg/di/container.go b/api/pkg/di/container.goindex 51a0b303..cd21e074 100644--- a/api/pkg/di/container.go+++ b/api/pkg/di/container.go@@ -9,6 +9,8 @@ import ("strconv""time"+ "github.com/pusher/pusher-http-go/v5"+"github.com/NdoleStudio/httpsms/docs"otelMetric "go.opentelemetry.io/otel/metric"@@ -149,6 +151,7 @@ func NewContainer(projectID string, version string) (container *Container) {container.RegisterPhoneAPIKeyListeners()container.RegisterMarketingListeners()+ container.RegisterWebsocketListeners()// this has to be last since it registers the /* routecontainer.RegisterSwaggerRoutes()@@ -1142,6 +1145,18 @@ func (container *Container) LemonsqueezyClient() (client *lemonsqueezy.Client) {)}+// PusherClient creates a new instance of pusher.Client+func (container *Container) PusherClient() (client *pusher.Client) {+ container.logger.Debug(fmt.Sprintf("creating %T", client))+ return &pusher.Client{+ AppID: os.Getenv("PUSHER_APP_ID"),+ Key: os.Getenv("PUSHER_KEY"),+ Secret: os.Getenv("PUSHER_SECRET"),+ Cluster: os.Getenv("PUSHER_CLUSTER"),+ Secure: true,+ }+}+// DiscordClient creates a new instance of discord.Clientfunc (container *Container) DiscordClient() (client *discord.Client) {container.logger.Debug(fmt.Sprintf("creating %T", client))@@ -1316,6 +1331,26 @@ func (container *Container) RegisterPhoneAPIKeyListeners() {}}+// RegisterWebsocketListeners registers event listeners for listeners.WebsocketListener+func (container *Container) RegisterWebsocketListeners() {+ container.logger.Debug(fmt.Sprintf("registering listeners for %T", listeners.WebsocketListener{}))++ if os.Getenv("PUSHER_SECRET") == "" {+ container.logger.Warn(stacktrace.NewError("skipping websocket listeners because the PUSHER_SECRET env variable is not set"))+ return+ }++ _, routes := listeners.NewWebsocketListener(+ container.Logger(),+ container.Tracer(),+ container.PusherClient(),+ )++ for event, handler := range routes {+ container.EventDispatcher().Subscribe(event, handler)+ }+}+// RegisterWebhookListeners registers event listeners for listeners.WebhookListenerfunc (container *Container) RegisterWebhookListeners() {container.logger.Debug(fmt.Sprintf("registering listeners for %T", listeners.WebhookListener{}))diff --git a/api/pkg/handlers/phone_api_key_handler.go b/api/pkg/handlers/phone_api_key_handler.goindex 40b8aa1c..c52033af 100644--- a/api/pkg/handlers/phone_api_key_handler.go+++ b/api/pkg/handlers/phone_api_key_handler.go@@ -103,7 +103,7 @@ func (h *PhoneAPIKeyHandler) Store(c *fiber.Ctx) error {// @Failure 404 {object} responses.NotFound// @Failure 422 {object} responses.UnprocessableEntity// @Failure 500 {object} responses.InternalServerError-// @Router /messages/{phoneAPIKeyID} [delete]+// @Router /api-keys/{phoneAPIKeyID} [delete]func (h *PhoneAPIKeyHandler) Delete(c *fiber.Ctx) error {ctx, span, ctxLogger := h.tracer.StartFromFiberCtxWithLogger(c, h.logger)defer span.End()@@ -144,7 +144,7 @@ func (h *PhoneAPIKeyHandler) Delete(c *fiber.Ctx) error {// @Failure 404 {object} responses.NotFound// @Failure 422 {object} responses.UnprocessableEntity// @Failure 500 {object} responses.InternalServerError-// @Router /messages/{phoneAPIKeyID}/phones/{phoneID} [delete]+// @Router /api-keys/{phoneAPIKeyID}/phones/{phoneID} [delete]func (h *PhoneAPIKeyHandler) DeletePhone(c *fiber.Ctx) error {ctx, span, ctxLogger := h.tracer.StartFromFiberCtxWithLogger(c, h.logger)defer span.End()diff --git a/api/pkg/listeners/websocket_listener.go b/api/pkg/listeners/websocket_listener.gonew file mode 100644index 00000000..e7682969--- /dev/null+++ b/api/pkg/listeners/websocket_listener.go@@ -0,0 +1,56 @@+package listeners++import (+ "context"+ "fmt"++ cloudevents "github.com/cloudevents/sdk-go/v2"+ "github.com/palantir/stacktrace"++ "github.com/NdoleStudio/httpsms/pkg/events"+ "github.com/NdoleStudio/httpsms/pkg/telemetry"+ "github.com/pusher/pusher-http-go/v5"+)++// WebsocketListener handles cloud events that send a websocket event to the frontend+type WebsocketListener struct {+ logger telemetry.Logger+ tracer telemetry.Tracer+ client *pusher.Client+}++// NewWebsocketListener creates a new instance of WebsocketListener+func NewWebsocketListener(+ logger telemetry.Logger,+ tracer telemetry.Tracer,+ client *pusher.Client,+) (l *WebsocketListener, routes map[string]events.EventListener) {+ l = &WebsocketListener{+ logger: logger.WithService(fmt.Sprintf("%T", l)),+ tracer: tracer,+ client: client,+ }++ return l, map[string]events.EventListener{+ events.EventTypePhoneUpdated: l.onPhoneUpdated,+ }+}++// onPhoneUpdated handles the events.EventTypePhoneUpdated event+func (listener *WebsocketListener) onPhoneUpdated(ctx context.Context, event cloudevents.Event) error {+ ctx, span, _ := listener.tracer.StartWithLogger(ctx, listener.logger)+ defer span.End()++ var payload events.PhoneUpdatedPayload+ if err := event.DataAs(&payload); err != nil {+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ if err := listener.client.Trigger(payload.UserID.String(), event.Type(), event); err != nil {+ msg := fmt.Sprintf("cannot trigger websocket [%s] event with ID [%s] for user with ID [%s]", event.Type(), event.ID(), payload.UserID)+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }++ return nil+}