Fix(bluesky): run in a loop to catch connection errors

Author: till

cmd/bot/main.go

@@ -14,6 +14,7 @@ import (
 	bk "github.com/tailscale/go-bluesky"
 	"github.com/till/golangoss-bluesky/internal/bluesky"
 	"github.com/till/golangoss-bluesky/internal/content"
+	"github.com/till/golangoss-bluesky/internal/utils"
 	"github.com/urfave/cli/v2"
 )
 
@@ -34,6 +35,8 @@ var (
 	githubToken string = ""
 
 	checkInterval time.Duration = 15 * time.Minute
+	// How long to wait before retrying after a connection failure
+	reconnectDelay time.Duration = 2 * time.Minute
 )
 
 func init() {
@@ -44,6 +47,75 @@ func init() {
 	ctx = context.Background()
 }
 
+// connectBluesky establishes a connection to Bluesky and logs in
+func connectBluesky(ctx context.Context) (*bk.Client, error) {
+	client, err := bk.Dial(ctx, bk.ServerBskySocial)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open connection: %v", err)
+	}
+
+	if err := client.Login(ctx, blueskyHandle, blueskyAppKey); err != nil {
+		client.Close()
+		switch {
+		case errors.Is(err, bk.ErrMasterCredentials):
+			return nil, fmt.Errorf("you're not allowed to use your full-access credentials, please create an appkey")
+		case errors.Is(err, bk.ErrLoginUnauthorized):
+			return nil, fmt.Errorf("username of application password seems incorrect, please double check")
+		default:
+			return nil, fmt.Errorf("login failed: %v", err)
+		}
+	}
+
+	return client, nil
+}
+
+// runWithReconnect attempts to run the bot with automatic reconnection on failure
+func runWithReconnect(ctx context.Context, mc *minio.Client) error {
+	for {
+		client, err := connectBluesky(ctx)
+		if err != nil {
+			slog.Error("failed to connect to Bluesky", "error", err)
+			slog.Info("retrying connection", "delay", reconnectDelay)
+			time.Sleep(reconnectDelay)
+			continue
+		}
+
+		c := bluesky.Client{
+			Client: client,
+		}
+
+		cacheClient := content.NewCacheClientS3(ctx, mc, cacheBucket)
+
+		// Initialize and start the cleanup handler
+		cleanup := content.NewS3Cleanup(mc, cacheBucket)
+		cleanup.Start(ctx)
+		defer cleanup.Stop()
+
+		if err := content.Start(githubToken, cacheClient); err != nil {
+			slog.Error("failed to start service", "error", err)
+			client.Close()
+			time.Sleep(reconnectDelay)
+			continue
+		}
+
+		// Run the main loop
+		for {
+			slog.DebugContext(ctx, "checking...")
+			if err := content.Do(ctx, c); err != nil {
+				if !errors.Is(err, content.ErrCouldNotContent) {
+					slog.Error("error during content check", "error", err)
+					client.Close()
+					time.Sleep(reconnectDelay)
+					break
+				}
+				slog.DebugContext(ctx, "backing off...")
+			}
+
+			time.Sleep(checkInterval)
+		}
+	}
+}
+
 func main() {
 	bot := cli.App{
 		Name:        "golangoss-bluesky",
@@ -88,25 +160,7 @@ func main() {
 		},
 
 		Action: func(cCtx *cli.Context) error {
-			// FIXME: run this in a control loop; or we crash the app
-			client, err := bk.Dial(ctx, bk.ServerBskySocial)
-			if err != nil {
-				return fmt.Errorf("failed to open connection: %v", err)
-			}
-			defer client.Close()
-
-			if err := client.Login(ctx, blueskyHandle, blueskyAppKey); err != nil {
-				switch {
-				case errors.Is(err, bk.ErrMasterCredentials):
-					return fmt.Errorf("you're not allowed to use your full-access credentials, please create an appkey")
-				case errors.Is(err, bk.ErrLoginUnauthorized):
-					return fmt.Errorf("username of application password seems incorrect, please double check")
-				default:
-					return fmt.Errorf("something else went wrong, please look at the returned error")
-				}
-			}
-
-			// init s3 client
+			// Initialize S3 client
 			mc, err := minio.New(awsEndpoint, &minio.Options{
 				Creds:  credentials.NewStaticV4(awsAccessKeyId, awsSecretKey, ""),
 				Secure: true,
@@ -115,47 +169,17 @@ func main() {
 				return fmt.Errorf("failed to initialize minio client: %v", err)
 			}
 
-			// ensure the bucket exists
+			// Ensure the bucket exists
 			if err := mc.MakeBucket(ctx, cacheBucket, minio.MakeBucketOptions{}); err != nil {
 				return fmt.Errorf("failed to create bucket: %v", err)
 			}
 
-			c := bluesky.Client{
-				Client: client,
-			}
-
-			cacheClient := content.NewCacheClientS3(ctx, mc, cacheBucket)
-
-			// Initialize and start the cleanup handler
-			cleanup := content.NewS3Cleanup(ctx, mc, cacheBucket)
-			cleanup.Start()
-			defer cleanup.Stop()
-
-			if err := content.Start(githubToken, cacheClient); err != nil {
-				return fmt.Errorf("failed to start service: %v", err)
-			}
-
-			var runErr error
-
-			for {
-				slog.DebugContext(ctx, "checking...")
-				if err := content.Do(ctx, c); err != nil {
-					if !errors.Is(err, content.ErrCouldNotContent) {
-						runErr = err
-						break
-					}
-					slog.DebugContext(ctx, "backing off...")
-				}
-
-				time.Sleep(checkInterval)
-			}
-			return runErr
+			return runWithReconnect(ctx, mc)
 		},
 	}
 
 	if err := bot.Run(os.Args); err != nil {
-		slog.ErrorContext(ctx, err.Error())
+		utils.LogErrorWithContext(ctx, err)
 		os.Exit(1)
 	}
-
 }