Handle canceled update polling without shutdown delay

bot.go

@@ -2,11 +2,11 @@ package laniakea
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sort"
 	"strings"
 	"sync"
-	"time"
 
 	"git.nix13.pw/scuroneko/extypes"
 	"git.nix13.pw/scuroneko/laniakea/tgapi"
@@ -174,7 +174,7 @@ func NewBot[T any](opts *BotOpts) *Bot[T] {
 	return bot
 }
 
-// Close gracefully shuts down the bot.
+// Close gracefully shuts down bot-owned resources.
 //
 // Closes:
 //   - Uploader (waits for pending uploads)
@@ -182,36 +182,31 @@ func NewBot[T any](opts *BotOpts) *Bot[T] {
 //   - RequestLogger (if enabled)
 //   - Main logger
 //
-// Returns the first error encountered, if any.
+// RunWithContext does not call Close automatically. The caller is responsible
+// for invoking Close after RunWithContext returns to release these resources.
+//
+// Returns a joined error containing all shutdown failures, if any.
 func (bot *Bot[T]) Close() error {
-	var firstErr error
+	var e []error
 
 	if err := bot.uploader.Close(); err != nil {
 		bot.logger.Errorln(err)
-		if firstErr == nil {
+		e = append(e, err)
-			firstErr = err
-		}
 	}
 	if err := bot.api.CloseApi(); err != nil {
 		bot.logger.Errorln(err)
-		if firstErr == nil {
+		e = append(e, err)
-			firstErr = err
-		}
 	}
 	if bot.RequestLogger != nil {
 		if err := bot.RequestLogger.Close(); err != nil {
 			bot.logger.Errorln(err)
-			if firstErr == nil {
+			e = append(e, err)
-				firstErr = err
-			}
 		}
 	}
 	if err := bot.logger.Close(); err != nil {
-		if firstErr == nil {
+		e = append(e, err)
-			firstErr = err
-		}
 	}
-	return firstErr
+	return errors.Join(e...)
 }
 
 // initLoggers configures the main and optional request loggers.
@@ -466,7 +461,10 @@ func (bot *Bot[T]) AddDatabaseLoggerWriter(writer DbLogger[T]) *Bot[T] {
 // The context controls graceful shutdown. When canceled, the bot:
 //   - Stops polling for new updates
 //   - Finishes processing currently queued updates
-//   - Closes all resources (API, uploader, loggers)
+//   - Waits for registered runners to exit
+//
+// RunWithContext does not close API, uploader, or logger resources on return.
+// The caller must invoke Close after RunWithContext finishes.
 //
 // Example:
 //
@@ -474,13 +472,8 @@ func (bot *Bot[T]) AddDatabaseLoggerWriter(writer DbLogger[T]) *Bot[T] {
 //	go bot.RunWithContext(ctx)
 //	// ... later ...
 //	cancel() // triggers graceful shutdown
+//	_ = bot.Close()
 func (bot *Bot[T]) RunWithContext(ctx context.Context) {
-	defer func() {
-		if err := bot.Close(); err != nil {
-			bot.logger.Errorln(err)
-		}
-	}()
-
 	if len(bot.prefixes) == 0 {
 		bot.logger.Fatalln("no prefixes defined")
 		return
@@ -508,15 +501,17 @@ func (bot *Bot[T]) RunWithContext(ctx context.Context) {
 			case <-ctx.Done():
 				return
 			default:
-				updates, err := bot.Updates()
+				updates, err := bot.Updates(ctx)
 				if err != nil {
+					if errors.Is(err, context.Canceled) {
+						return
+					}
 					bot.logger.Errorln("failed to fetch updates:", err)
-					time.Sleep(2 * time.Second) // exponential backoff
 					continue
 				}
 
-				for _, u := range updates {
+				for _, update := range updates {
-					u := u // copy loop variable to avoid race condition
+					u := update // copy loop variable to avoid race condition
 					select {
 					case bot.updateQueue <- &u:
 					case <-ctx.Done():

methods.go

@@ -1,6 +1,7 @@
 package laniakea
 
 import (
+	"context"
 	"encoding/json"
 
 	"git.nix13.pw/scuroneko/laniakea/tgapi"
@@ -12,7 +13,7 @@ import (
 // through AllowedUpdates and includes optional request logging.
 //
 // Parameters:
-//   - None (uses bot's internal state for offset and allowed updates)
+//   - ctx: request context used to cancel the in-flight long polling request
 //
 // Returns:
 //   - []tgapi.Update: slice of received updates (empty if none available)
@@ -26,19 +27,20 @@ import (
 //  5. Automatically updates the offset to the last received update ID + 1
 //  6. Returns all received updates (empty slice if none)
 //
-// Note: This is a blocking call that waits up to 30 seconds for new updates.
+// Note: This is a blocking call that waits up to 30 seconds for new updates,
-// For non-blocking behavior, consider using webhooks instead.
+// unless ctx is canceled earlier. For non-blocking behavior, consider using
+// webhooks instead.
 //
 // Example:
 //
-//	updates, err := bot.Updates()
+//	updates, err := bot.Updates(ctx)
 //	if err != nil {
 //	    log.Fatal(err)
 //	}
 //	for _, update := range updates {
 //	    // process update
 //	}
-func (bot *Bot[T]) Updates() ([]tgapi.Update, error) {
+func (bot *Bot[T]) Updates(ctx context.Context) ([]tgapi.Update, error) {
 	offset := bot.GetUpdateOffset()
 	params := tgapi.UpdateParams{
 		Offset:         Ptr(offset),
@@ -46,7 +48,7 @@ func (bot *Bot[T]) Updates() ([]tgapi.Update, error) {
 		AllowedUpdates: bot.GetUpdateTypes(),
 	}
 
-	updates, err := bot.api.GetUpdates(params)
+	updates, err := bot.api.GetUpdatesWithContext(ctx, params)
 	if err != nil {
 		return nil, err
 	}

tgapi/methods.go

@@ -48,6 +48,11 @@ func (api *API) GetUpdates(params UpdateParams) ([]Update, error) {
 	return req.Do(api)
 }
 
+func (api *API) GetUpdatesWithContext(ctx context.Context, params UpdateParams) ([]Update, error) {
+	req := NewRequest[[]Update]("getUpdates", params)
+	return req.DoWithContext(ctx, api)
+}
+
 // SetWebhookP holds parameters for the setWebhook method.
 // See https://core.telegram.org/bots/api#setwebhook
 type SetWebhookP struct {

utils/version.go

@@ -1,9 +1,9 @@
 package utils
 
 const (
-	VersionString = "1.0.0-beta.22"
+	VersionString = "1.0.0-rc.3"
 	VersionMajor  = 1
 	VersionMinor  = 0
 	VersionPatch  = 0
-	VersionBeta   = 22
+	VersionBeta   = 3
 )