cleanup code

bot/core/inline.go

@@ -3,6 +3,7 @@ package core
 import (
 	"fmt"
 	"log"
+	"sync"
 
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
@@ -16,7 +17,23 @@ import (
 	"github.com/PaulSonOfLars/gotgbot/v2/ext"
 )
 
-var InlineTasks = make(map[string]*models.DownloadContext)
+var InlineTasks sync.Map
+
+func GetTask(id string) (*models.DownloadContext, bool) {
+	value, ok := InlineTasks.Load(id)
+	if !ok {
+		return nil, false
+	}
+	return value.(*models.DownloadContext), true
+}
+
+func SetTask(id string, task *models.DownloadContext) {
+	InlineTasks.Store(id, task)
+}
+
+func DeleteTask(id string) {
+	InlineTasks.Delete(id)
+}
 
 func HandleInline(
 	bot *gotgbot.Bot,
@@ -183,7 +200,7 @@ func StartInlineTask(
 		log.Println("failed to answer inline query")
 		return nil
 	}
-	InlineTasks[taskID] = dlCtx
+	SetTask(taskID, dlCtx)
 	return nil
 }
 

bot/core/main.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"slices"
@@ -21,6 +22,11 @@ func HandleDownloadRequest(
 	ctx *ext.Context,
 	dlCtx *models.DownloadContext,
 ) error {
+	taskCtx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+	defer cancel()
+
+	dlCtx.Context = taskCtx
+
 	chatID := ctx.EffectiveMessage.Chat.Id
 	if dlCtx.Extractor.Type == enums.ExtractorTypeSingle {
 		TypingEffect(bot, ctx, chatID)

bot/core/util.go

@@ -198,6 +198,16 @@ func HandleErrorMessage(
 	err error,
 ) {
 	currentError := err
+
+	if errors.As(currentError, context.Canceled) ||
+		errors.As(currentError, context.DeadlineExceeded) {
+		SendErrorMessage(
+			bot, ctx,
+			"download request canceled or timed out",
+		)
+		return
+	}
+
 	for currentError != nil {
 		var botError *util.Error
 		if errors.As(currentError, &botError) {

bot/handlers/help.go

@@ -9,7 +9,9 @@ var helpMessage = "usage:\n" +
 	"- you can add the bot to a group " +
 	"to start catching sent links\n" +
 	"- you can send a link to the bot privately " +
-	"to download the media too\n\n" +
+	"to download the media too\n" +
+	"- you can use inline mode " +
+	"to download media from any chat\n\n" +
 	"group commands:\n" +
 	"- /settings = show current settings\n" +
 	"- /captions (true|false) = enable/disable descriptions\n" +

bot/handlers/inline.go

@@ -41,11 +41,12 @@ func InlineDownloadResultHandler(
 	bot *gotgbot.Bot,
 	ctx *ext.Context,
 ) error {
-	dlCtx, ok := core.InlineTasks[ctx.ChosenInlineResult.ResultId]
+	taskID := ctx.ChosenInlineResult.ResultId
+	dlCtx, ok := core.GetTask(taskID)
 	if !ok {
 		return nil
 	}
-	defer delete(core.InlineTasks, ctx.ChosenInlineResult.ResultId)
+	defer core.DeleteTask(taskID)
 
 	mediaChan := make(chan *models.Media, 1)
 	errChan := make(chan error, 1)

models/ctx.go

@@ -1,6 +1,9 @@
 package models
 
+import "context"
+
 type DownloadContext struct {
+	Context           context.Context
 	MatchedContentID  string
 	MatchedContentURL string
 	MatchedGroups     map[string]string

models/download.go

@@ -11,4 +11,5 @@ type DownloadConfig struct {
 	RetryDelay      time.Duration // delay between retries
 	Remux           bool          // whether to remux the downloaded file with ffmpeg
 	ProgressUpdater func(float64) // optional function to report download progress
+	MaxInMemory     int           // maximum file size for in-memory downloads
 }

util/download.go

@@ -29,6 +29,7 @@ func DefaultConfig() *models.DownloadConfig {
 		RetryAttempts: 3,
 		RetryDelay:    2 * time.Second,
 		Remux:         true,
+		MaxInMemory:   50 * 1024 * 1024, // 50MB
 	}
 }
 
@@ -127,7 +128,10 @@ func DownloadFileInMemory(
 		case <-ctx.Done():
 			return nil, ctx.Err()
 		default:
-			data, err := downloadInMemory(ctx, fileURL, config.Timeout)
+			data, err := downloadInMemory(
+				ctx, fileURL,
+				config,
+			)
 			if err != nil {
 				errs = append(errs, err)
 				continue
@@ -142,9 +146,12 @@ func DownloadFileInMemory(
 func downloadInMemory(
 	ctx context.Context,
 	fileURL string,
-	timeout time.Duration,
+	config *models.DownloadConfig,
 ) ([]byte, error) {
-	reqCtx, cancel := context.WithTimeout(ctx, timeout)
+	reqCtx, cancel := context.WithTimeout(
+		ctx,
+		config.Timeout,
+	)
 	defer cancel()
 
 	select {
@@ -169,6 +176,10 @@ func downloadInMemory(
 		return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
 	}
 
+	if resp.ContentLength > int64(config.MaxInMemory) {
+		return nil, fmt.Errorf("file too large for in-memory download: %d bytes", resp.ContentLength)
+	}
+
 	var buf bytes.Buffer
 	if resp.ContentLength > 0 {
 		buf.Grow(int(resp.ContentLength))

util/http.go

@@ -25,13 +25,15 @@ func GetHTTPSession() *http.Client {
 			IdleConnTimeout:       90 * time.Second,
 			TLSHandshakeTimeout:   10 * time.Second,
 			ExpectContinueTimeout: 1 * time.Second,
-			MaxIdleConnsPerHost:   10,
+			MaxIdleConnsPerHost:   20,
-			MaxConnsPerHost:       10,
+			MaxConnsPerHost:       20,
+			ResponseHeaderTimeout: 30 * time.Second,
+			DisableCompression:    false,
 		}
 
 		httpSession = &http.Client{
 			Transport: transport,
-			Timeout:   30 * time.Second,
+			Timeout:   60 * time.Second,
 		}
 	})
 	return httpSession

util/img.go

@@ -105,9 +105,6 @@ func DetectImageFormat(file io.ReadSeeker) (string, error) {
 }
 
 func isHEIF(header []byte) bool {
-	if len(header) < 12 {
-		return false
-	}
 	isHeifHeader := header[0] == 0x00 && header[1] == 0x00 &&
 		header[2] == 0x00 && (header[3] == 0x18 || header[3] == 0x1C) &&
 		bytes.Equal(header[4:8], []byte("ftyp"))