fix(eventsub): retry deadline subscribe

apps/eventsub/internal/manager/condition.go

@@ -0,0 +1,43 @@
+package manager
+
+import (
+	model "github.com/satont/twir/libs/gomodels"
+)
+
+func getTypeCondition(
+	t model.EventsubConditionType,
+	topic,
+	channelID,
+	botId string,
+) map[string]string {
+	switch t {
+	case model.EventsubConditionTypeBroadcasterUserID:
+		return map[string]string{
+			"broadcaster_user_id": channelID,
+		}
+	case model.EventsubConditionTypeUserID:
+		return map[string]string{
+			"user_id": channelID,
+		}
+	case model.EventsubConditionTypeBroadcasterWithUserID:
+		data := map[string]string{
+			"broadcaster_user_id": channelID,
+			"user_id":             botId,
+		}
+		if topic == "channel.follow" {
+			data["user_id"] = channelID
+		}
+		return data
+	case model.EventsubConditionTypeBroadcasterWithModeratorID:
+		return map[string]string{
+			"broadcaster_user_id": channelID,
+			"moderator_user_id":   botId,
+		}
+	case model.EventsubConditionTypeToBroadcasterID:
+		return map[string]string{
+			"to_broadcaster_user_id": channelID,
+		}
+	default:
+		return nil
+	}
+}

apps/eventsub/internal/manager/manager.go

@@ -186,44 +186,6 @@ func NewManager(opts Opts) (*Manager, error) {
 	return manager, nil
 }
 
-func getTypeCondition(
-	t model.EventsubConditionType,
-	topic,
-	channelID,
-	botId string,
-) map[string]string {
-	switch t {
-	case model.EventsubConditionTypeBroadcasterUserID:
-		return map[string]string{
-			"broadcaster_user_id": channelID,
-		}
-	case model.EventsubConditionTypeUserID:
-		return map[string]string{
-			"user_id": channelID,
-		}
-	case model.EventsubConditionTypeBroadcasterWithUserID:
-		data := map[string]string{
-			"broadcaster_user_id": channelID,
-			"user_id":             botId,
-		}
-		if topic == "channel.follow" {
-			data["user_id"] = channelID
-		}
-		return data
-	case model.EventsubConditionTypeBroadcasterWithModeratorID:
-		return map[string]string{
-			"broadcaster_user_id": channelID,
-			"moderator_user_id":   botId,
-		}
-	case model.EventsubConditionTypeToBroadcasterID:
-		return map[string]string{
-			"to_broadcaster_user_id": channelID,
-		}
-	default:
-		return nil
-	}
-}
-
 var statusesForSkip = []string{
 	"enabled",
 	"webhook_callback_verification_pending",

apps/eventsub/internal/manager/subscribe.go

@@ -3,6 +3,7 @@ package manager
 import (
 	"context"
 	"errors"
+	"strings"
 	"time"
 
 	"github.com/avast/retry-go/v4"
@@ -34,6 +35,10 @@ func (c *Manager) SubscribeWithLimits(
 					return true
 				}
 
+				if strings.Contains(err.Error(), "context deadline exceeded") {
+					return true
+				}
+
 				return false
 			},
 		),