Send and receive SMS messages using your Android phone programmatically via a simple HTTP API
Add retry for SQLite DB operations
Acho Arnoldabf54daa3990
diff --git a/api/pkg/di/container.go b/api/pkg/di/container.goindex d2b48b33..7f88251a 100644--- a/api/pkg/di/container.go+++ b/api/pkg/di/container.go@@ -266,7 +266,7 @@ func (container *Container) DedicatedDB() (db *gorm.DB) {sqlDB.SetMaxOpenConns(1)sqlDB.SetMaxIdleConns(0)- sqlDB.SetConnMaxLifetime(-1)+ sqlDB.SetConnMaxLifetime(10 * time.Second)if err = db.Use(tracing.NewPlugin()); err != nil {container.logger.Fatal(stacktrace.Propagate(err, "cannot use GORM tracing plugin"))diff --git a/api/pkg/repositories/gorm_heartbeat_monitor_repository.go b/api/pkg/repositories/gorm_heartbeat_monitor_repository.goindex b88c15e2..fb892d87 100644--- a/api/pkg/repositories/gorm_heartbeat_monitor_repository.go+++ b/api/pkg/repositories/gorm_heartbeat_monitor_repository.go@@ -22,16 +22,30 @@ type gormHeartbeatMonitorRepository struct {db *gorm.DB}+// NewGormHeartbeatMonitorRepository creates the GORM version of the HeartbeatMonitorRepository+func NewGormHeartbeatMonitorRepository(+ logger telemetry.Logger,+ tracer telemetry.Tracer,+ db *gorm.DB,+) HeartbeatMonitorRepository {+ return &gormHeartbeatMonitorRepository{+ logger: logger.WithService(fmt.Sprintf("%T", &gormHeartbeatRepository{})),+ tracer: tracer,+ db: db,+ }+}+func (repository *gormHeartbeatMonitorRepository) DeleteAllForUser(ctx context.Context, userID entities.UserID) error {ctx, span := repository.tracer.Start(ctx)defer span.End()- if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.HeartbeatMonitor{}).Error; err != nil {- msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.HeartbeatMonitor{}, userID)- return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))- }-- return nil+ return executeWithRetry(func() error {+ if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.HeartbeatMonitor{}).Error; err != nil {+ msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.HeartbeatMonitor{}, userID)+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))+ }+ return nil+ })}// UpdatePhoneOnline updates the online status of a phone@@ -42,14 +56,16 @@ func (repository *gormHeartbeatMonitorRepository) UpdatePhoneOnline(ctx context.ctx, cancel := context.WithTimeout(ctx, dbOperationDuration)defer cancel()- err := repository.db.- Model(&entities.HeartbeatMonitor{}).- Where("id = ?", monitorID).- Where("user_id = ?", userID).- Updates(map[string]any{- "phone_online": isOnline,- "updated_at": time.Now().UTC(),- }).Error+ err := executeWithRetry(func() error {+ return repository.db.+ Model(&entities.HeartbeatMonitor{}).+ Where("id = ?", monitorID).+ Where("user_id = ?", userID).+ Updates(map[string]any{+ "phone_online": isOnline,+ "updated_at": time.Now().UTC(),+ }).Error+ })if err != nil {msg := fmt.Sprintf("cannot update heartbeat monitor ID [%s] for user [%s]", monitorID, userID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))@@ -65,13 +81,15 @@ func (repository *gormHeartbeatMonitorRepository) UpdateQueueID(ctx context.Contctx, cancel := context.WithTimeout(ctx, dbOperationDuration)defer cancel()- err := repository.db.- Model(&entities.HeartbeatMonitor{}).- Where("id = ?", monitorID).- Updates(map[string]any{- "queue_id": queueID,- "updated_at": time.Now().UTC(),- }).Error+ err := executeWithRetry(func() error {+ return repository.db.+ Model(&entities.HeartbeatMonitor{}).+ Where("id = ?", monitorID).+ Updates(map[string]any{+ "queue_id": queueID,+ "updated_at": time.Now().UTC(),+ }).Error+ })if err != nil {msg := fmt.Sprintf("cannot update heartbeat monitor ID [%s]", monitorID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))@@ -86,10 +104,12 @@ func (repository *gormHeartbeatMonitorRepository) Delete(ctx context.Context, usctx, cancel := context.WithTimeout(ctx, dbOperationDuration)defer cancel()- err := repository.db.WithContext(ctx).- Where("user_id = ?", userID).- Where("owner = ?", owner).- Delete(&entities.HeartbeatMonitor{}).Error+ err := executeWithRetry(func() error {+ return repository.db.WithContext(ctx).+ Where("user_id = ?", userID).+ Where("owner = ?", owner).+ Delete(&entities.HeartbeatMonitor{}).Error+ })if err != nil {msg := fmt.Sprintf("cannot delete heartbeat monitor with owner [%s] and userID [%s]", owner, userID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))@@ -98,19 +118,6 @@ func (repository *gormHeartbeatMonitorRepository) Delete(ctx context.Context, usreturn nil}-// NewGormHeartbeatMonitorRepository creates the GORM version of the HeartbeatMonitorRepository-func NewGormHeartbeatMonitorRepository(- logger telemetry.Logger,- tracer telemetry.Tracer,- db *gorm.DB,-) HeartbeatMonitorRepository {- return &gormHeartbeatMonitorRepository{- logger: logger.WithService(fmt.Sprintf("%T", &gormHeartbeatRepository{})),- tracer: tracer,- db: db,- }-}-// Index entities.Message between 2 partiesfunc (repository *gormHeartbeatMonitorRepository) Index(ctx context.Context, userID entities.UserID, owner string, params IndexParams) (*[]entities.Heartbeat, error) {ctx, span := repository.tracer.Start(ctx)@@ -121,7 +128,9 @@ func (repository *gormHeartbeatMonitorRepository) Index(ctx context.Context, usequery := repository.db.WithContext(ctx).Where("user_id = ?", userID).Where("owner = ?", owner)heartbeats := new([]entities.Heartbeat)- if err := query.Order("timestamp DESC").Limit(params.Limit).Offset(params.Skip).Find(&heartbeats).Error; err != nil {+ if err := executeWithRetry(func() error {+ return query.Order("timestamp DESC").Limit(params.Limit).Offset(params.Skip).Find(&heartbeats).Error+ }); err != nil {msg := fmt.Sprintf("cannot fetch heartbeats with owner [%s] and params [%+#v]", owner, params)return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}@@ -137,7 +146,7 @@ func (repository *gormHeartbeatMonitorRepository) Store(ctx context.Context, heactx, cancel := context.WithTimeout(ctx, dbOperationDuration)defer cancel()- if err := repository.db.WithContext(ctx).Create(heartbeatMonitor).Error; err != nil {+ if err := executeWithRetry(func() error { return repository.db.WithContext(ctx).Create(heartbeatMonitor).Error }); err != nil {msg := fmt.Sprintf("cannot save heartbeatMonitor monitor with ID [%s]", heartbeatMonitor.ID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}@@ -154,11 +163,12 @@ func (repository *gormHeartbeatMonitorRepository) Load(ctx context.Context, userdefer cancel()phone := new(entities.HeartbeatMonitor)- err := repository.db.WithContext(ctx).- Where("user_id = ?", userID).- Where("owner = ?", owner).- First(&phone).Error-+ err := executeWithRetry(func() error {+ return repository.db.WithContext(ctx).+ Where("user_id = ?", userID).+ Where("owner = ?", owner).+ First(&phone).Error+ })if errors.Is(err, gorm.ErrRecordNotFound) {msg := fmt.Sprintf("heartbeat monitor with userID [%s] and owner [%s] does not exist", userID, owner)return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))@@ -181,14 +191,16 @@ func (repository *gormHeartbeatMonitorRepository) Exists(ctx context.Context, usdefer cancel()var exists bool- err := repository.db.WithContext(ctx).- Model(&entities.HeartbeatMonitor{}).- Select("count(*) > 0").- Where("user_id = ?", userID).- Where("id = ?", monitorID).- Find(&exists).Error+ err := executeWithRetry(func() error {+ return repository.db.WithContext(ctx).+ Model(&entities.HeartbeatMonitor{}).+ Select("count(*) > 0").+ Where("user_id = ?", userID).+ Where("id = ?", monitorID).+ Find(&exists).Error+ })if err != nil {- msg := fmt.Sprintf("cannot check if heartbeat monitor exists with userID [%s] and montiorID [%s]", userID, monitorID)+ msg := fmt.Sprintf("cannot check if heartbeat monitor exists with userID [%s] and montior ID [%s]", userID, monitorID)return exists, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}diff --git a/api/pkg/repositories/gorm_heartbeat_repository.go b/api/pkg/repositories/gorm_heartbeat_repository.goindex 8e763f60..5b7794e9 100644--- a/api/pkg/repositories/gorm_heartbeat_repository.go+++ b/api/pkg/repositories/gorm_heartbeat_repository.go@@ -36,7 +36,10 @@ func (repository *gormHeartbeatRepository) DeleteAllForUser(ctx context.Context,ctx, span := repository.tracer.Start(ctx)defer span.End()- if err := repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Heartbeat{}).Error; err != nil {+ err := executeWithRetry(func() error {+ return repository.db.WithContext(ctx).Where("user_id = ?", userID).Delete(&entities.Heartbeat{}).Error+ })+ if err != nil {msg := fmt.Sprintf("cannot delete all [%T] for user with ID [%s]", &entities.Heartbeat{}, userID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}@@ -52,11 +55,13 @@ func (repository *gormHeartbeatRepository) Last(ctx context.Context, userID entidefer cancel()heartbeat := new(entities.Heartbeat)- err := repository.db.WithContext(ctx).- Where("user_id = ?", userID).- Where("owner = ?", owner).- Order("timestamp DESC").- First(&heartbeat).Error+ err := executeWithRetry(func() error {+ return repository.db.WithContext(ctx).+ Where("user_id = ?", userID).+ Where("owner = ?", owner).+ Order("timestamp DESC").+ First(&heartbeat).Error+ })if errors.Is(err, gorm.ErrRecordNotFound) {msg := fmt.Sprintf("heartbeat with userID [%s] and owner [%s] does not exist", userID, owner)return nil, repository.tracer.WrapErrorSpan(span, stacktrace.PropagateWithCode(err, ErrCodeNotFound, msg))@@ -85,7 +90,10 @@ func (repository *gormHeartbeatRepository) Index(ctx context.Context, userID ent}heartbeats := new([]entities.Heartbeat)- if err := query.Order("timestamp DESC").Limit(params.Limit).Offset(params.Skip).Find(&heartbeats).Error; err != nil {+ err := executeWithRetry(func() error {+ return query.Order("timestamp DESC").Limit(params.Limit).Offset(params.Skip).Find(&heartbeats).Error+ })+ if err != nil {msg := fmt.Sprintf("cannot fetch heartbeats with owner [%s] and params [%+#v]", owner, params)return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}@@ -101,7 +109,7 @@ func (repository *gormHeartbeatRepository) Store(ctx context.Context, heartbeatctx, cancel := context.WithTimeout(ctx, dbOperationDuration)defer cancel()- if err := repository.db.WithContext(ctx).Create(heartbeat).Error; err != nil {+ if err := executeWithRetry(func() error { return repository.db.WithContext(ctx).Create(heartbeat).Error }); err != nil {msg := fmt.Sprintf("cannot save heartbeat with ID [%s]", heartbeat.ID)return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))}diff --git a/api/pkg/repositories/repository.go b/api/pkg/repositories/repository.goindex 32ba4337..558e5249 100644--- a/api/pkg/repositories/repository.go+++ b/api/pkg/repositories/repository.go@@ -1,8 +1,10 @@package repositoriesimport (+ "strings""time"+ "github.com/avast/retry-go""github.com/palantir/stacktrace")@@ -21,3 +23,21 @@ const (dbOperationDuration = 5 * time.Second)++// isRetryableError checks if the error is a retryable connection error+func isRetryableError(err error) bool {+ msg := err.Error()+ return strings.Contains(msg, "bad connection") ||+ strings.Contains(msg, "stream is closed") ||+ strings.Contains(msg, "driver: bad connection")+}++// executeWithRetry executes a GORM query with retry logic for transient connection errors+func executeWithRetry(fn func() error) (err error) {+ return retry.Do(+ fn,+ retry.Attempts(3),+ retry.Delay(100*time.Millisecond),+ retry.RetryIf(isRetryableError),+ )+}