diff --git a/api/sse.go b/api/sse.go index 5600fc9..8fe77a9 100644 --- a/api/sse.go +++ b/api/sse.go @@ -3,7 +3,6 @@ package api import ( "errors" "fmt" - "time" "atri.dad/lib" "atri.dad/lib/pubsub" @@ -30,10 +29,6 @@ func SSE(c echo.Context, pubSub pubsub.PubSub) error { lib.SetSSEHeaders(c) - // Create a ticker that fires every 15 seconds - ticker := lib.CreateTickerAndKeepAlive(c, 30*time.Second) - defer ticker.Stop() - // Create a client channel and add it to the SSE server client := make(chan string) lib.SSEServer.AddClient(channel, client) diff --git a/go.mod b/go.mod index 67ad6f7..85ed033 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( ) require ( - github.com/aws/aws-sdk-go v1.51.17 + github.com/aws/aws-sdk-go v1.51.21 github.com/clerkinc/clerk-sdk-go v1.49.0 github.com/disintegration/imaging v1.6.2 github.com/fatih/color v1.16.0 @@ -37,7 +37,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/redis/go-redis/v9 v9.5.1 - github.com/stripe/stripe-go/v76 v76.24.0 + github.com/stripe/stripe-go/v76 v76.25.0 github.com/svix/svix-webhooks v1.21.0 github.com/yuin/goldmark v1.7.1 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc diff --git a/go.sum b/go.sum index 976bd33..ba6f96f 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= -github.com/aws/aws-sdk-go v1.51.17 h1:Cfa40lCdjv9OxC3X1Ks3a6O1Tu3gOANSyKHOSw/zuWU= -github.com/aws/aws-sdk-go v1.51.17/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.51.21 h1:UrT6JC9R9PkYYXDZBV0qDKTualMr+bfK2eboTknMgbs= +github.com/aws/aws-sdk-go v1.51.21/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/brianvoe/gofakeit/v6 v6.19.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= @@ -76,8 +76,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stripe/stripe-go/v76 v76.24.0 h1:WRPB0LO4VHB+AOlysK/Ewd+j3FoFoiMPMIC/+pqKlrU= -github.com/stripe/stripe-go/v76 v76.24.0/go.mod h1:rw1MxjlAKKcZ+3FOXgTHgwiOa2ya6CPq6ykpJ0Q6Po4= +github.com/stripe/stripe-go/v76 v76.25.0 h1:kmDoOTvdQSTQssQzWZQQkgbAR2Q8eXdMWbN/ylNalWA= +github.com/stripe/stripe-go/v76 v76.25.0/go.mod h1:rw1MxjlAKKcZ+3FOXgTHgwiOa2ya6CPq6ykpJ0Q6Po4= github.com/svix/svix-webhooks v1.21.0 h1:ZxoPU2SJGjmRy1qMaeHY1VdZhTaEkHuh3ruy4CrxW3Y= github.com/svix/svix-webhooks v1.21.0/go.mod h1:qGeiECF5WRQElyfF0i2CqUtWk2GQJTgL+EJZ/WRCxok= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= diff --git a/lib/sse.go b/lib/sse.go index c7a4a2d..5b145c6 100644 --- a/lib/sse.go +++ b/lib/sse.go @@ -6,7 +6,6 @@ import ( "log" "net/http" "sync" - "time" "atri.dad/lib/pubsub" "github.com/labstack/echo/v4" @@ -90,19 +89,6 @@ func SetSSEHeaders(c echo.Context) { c.Response().Header().Set(echo.HeaderCacheControl, "no-cache") } -func CreateTickerAndKeepAlive(c echo.Context, duration time.Duration) *time.Ticker { - ticker := time.NewTicker(duration) - go func() { - for range ticker.C { - if _, err := c.Response().Write([]byte(": keep-alive\n\n")); err != nil { - log.Printf("Failed to write keep-alive: %v", err) - } - c.Response().Flush() - } - }() - return ticker -} - func HandleIncomingMessages(c echo.Context, pubsub pubsub.PubSubMessage, client chan string) { for { select {