Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

feat(services): add rate-based dispatch delay and ExactSendTime to SendMessage

Acho Arnold5351ef979011
diff --git a/api/pkg/services/message_service.go b/api/pkg/services/message_service.go
index 131c3520..929998bd 100644
--- a/api/pkg/services/message_service.go
+++ b/api/pkg/services/message_service.go
@@ -461,6 +461,7 @@ type MessageSendParams struct {
RequestID *string
UserID entities.UserID
RequestReceivedAt time.Time
+ Index int
}
// SendMessage a new message
@@ -470,7 +471,7 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
ctxLogger := service.tracer.CtxLogger(service.logger, span)
- sendAttempts, sim := service.phoneSettings(ctx, params.UserID, phonenumbers.Format(params.Owner, phonenumbers.E164))
+ sendAttempts, sim, messagesPerMinute := service.phoneSettings(ctx, params.UserID, phonenumbers.Format(params.Owner, phonenumbers.E164))
eventPayload := events.MessageAPISentPayload{
MessageID: uuid.New(),
@@ -484,6 +485,7 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
Content: params.Content,
Attachments: params.Attachments,
ScheduledSendTime: params.SendAt,
+ ExactSendTime: params.SendAt != nil,
SIM: sim,
}
@@ -500,7 +502,7 @@ func (service *MessageService) SendMessage(ctx context.Context, params MessageSe
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
}
- timeout := service.getSendDelay(ctxLogger, eventPayload, params.SendAt)
+ timeout := service.getSendDelay(ctxLogger, eventPayload, params, messagesPerMinute)
if _, err = service.eventDispatcher.DispatchWithTimeout(ctx, event, timeout); err != nil {
msg := fmt.Sprintf("cannot dispatch event type [%s] and id [%s]", event.Type(), event.ID())
return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
@@ -559,18 +561,24 @@ func (service *MessageService) RegisterMissedCall(ctx context.Context, params *M
return message, err
}
-func (service *MessageService) getSendDelay(ctxLogger telemetry.Logger, eventPayload events.MessageAPISentPayload, sendAt *time.Time) time.Duration {
- if sendAt == nil {
- return time.Duration(0)
+func (service *MessageService) getSendDelay(ctxLogger telemetry.Logger, eventPayload events.MessageAPISentPayload, params MessageSendParams, messagesPerMinute uint) time.Duration {
+ if params.SendAt != nil {
+ delay := params.SendAt.Sub(time.Now().UTC())
+ if delay < 0 {
+ ctxLogger.Info(fmt.Sprintf("message [%s] has send time [%s] in the past. sending immediately", eventPayload.MessageID, params.SendAt.String()))
+ return time.Duration(0)
+ }
+ return delay
}
- delay := sendAt.Sub(time.Now().UTC())
- if delay < 0 {
- ctxLogger.Info(fmt.Sprintf("message [%s] has send time [%s] in the past. sending immediately", eventPayload.MessageID, sendAt.String()))
- return time.Duration(0)
+ if params.Index > 0 && messagesPerMinute > 0 {
+ interval := time.Minute / time.Duration(messagesPerMinute)
+ delay := time.Duration(params.Index) * interval
+ ctxLogger.Info(fmt.Sprintf("message [%s] bulk index [%d] rate-based delay [%s]", eventPayload.MessageID, params.Index, delay))
+ return delay
}
- return delay
+ return time.Duration(0)
}
// StoreReceivedMessage a new message
@@ -1011,7 +1019,7 @@ func (service *MessageService) SearchMessages(ctx context.Context, params *Messa
return messages, nil
}
-func (service *MessageService) phoneSettings(ctx context.Context, userID entities.UserID, owner string) (uint, entities.SIM) {
+func (service *MessageService) phoneSettings(ctx context.Context, userID entities.UserID, owner string) (uint, entities.SIM, uint) {
ctx, span := service.tracer.Start(ctx)
defer span.End()
@@ -1021,10 +1029,10 @@ func (service *MessageService) phoneSettings(ctx context.Context, userID entitie
if err != nil {
msg := fmt.Sprintf("cannot load phone for userID [%s] and owner [%s]. using default max send attempt of 2", userID, owner)
ctxLogger.Error(stacktrace.Propagate(err, msg))
- return 2, entities.SIM1
+ return 2, entities.SIM1, 0
}
- return phone.MaxSendAttemptsSanitized(), phone.SIM
+ return phone.MaxSendAttemptsSanitized(), phone.SIM, phone.MessagesPerMinute
}
// storeSentMessage a new message