Merge "dev" into "main"

.github/workflows/notify.yml

@@ -19,7 +19,7 @@ jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Notify the commit on Telegram.
         uses: EverythingSuckz/github-telegram-notify@main
         with:

.github/workflows/release.yml

@@ -4,12 +4,12 @@ on:
   workflow_dispatch:
     inputs:
       goReleaserArgs:
-        description: 'Args goreleaser'     
+        description: "Args goreleaser"
         required: false
-        default: '--clean'
+        default: "--clean"
   push:
     tags:
-      - "*"
+      - "v*"
 
 permissions:
   contents: write
@@ -19,26 +19,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - run: git fetch --force --tags
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21
+          go-version: 1.25
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: latest
-          args: release ${{ github.event.inputs.goReleaserArgs }}"
+          args: release ${{ github.event.inputs.goReleaserArgs }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
+          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

.goreleaser.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 project_name: TG-FileStreamBot
 env:
   - GO111MODULE=on
@@ -23,12 +23,39 @@ builds:
       - arm64
     mod_timestamp: '{{ .CommitTimestamp }}'
 
+dockers_v2:
+  - images:
+      - "ghcr.io/everythingsuckz/fsb"
+
+    tags:
+    - "{{ .Tag }}"
+    - "v{{ .Major }}.{{ .Minor }}"
+    - "{{ if not .Prerelease }}latest{{ end }}"
+
+    dockerfile: Dockerfile
+
+    platforms:
+      - linux/amd64
+      - linux/arm64
+    labels:
+      "org.opencontainers.image.name": "{{.ProjectName}}"
+      "org.opencontainers.image.created": "{{.Date}}"
+      "org.opencontainers.image.revision": "{{.FullCommit}}"
+      "org.opencontainers.image.version": "{{.Version}}"
+      "org.opencontainers.image.description": "A high-performance Telegram File Streamer Bot written in Go. Stream files directly from Telegram to your download manager or media player with extreme efficiency."
+      "org.opencontainers.image.source": "{{.GitURL}}"
+
+    retry:
+      attempts: 5
+      delay: 10
+      max_delay: 10
+
 archives:
-  - format: tar.gz
+  - formats: ["tar.gz"]
     name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
     format_overrides:
       - goos: windows
-        format: zip
+        formats: ["zip"]
 
 signs:
   - artifacts: checksum
@@ -50,4 +77,10 @@ changelog:
   filters:
     exclude:
       - "^docs:"
-      - "^test:"
+      - "^test:"
+
+release:
+  github:
+    owner: EverythingSuckz
+    name: TG-FileStreamBot
+  prerelease: auto

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.25-alpine3.21 as builder
 RUN apk update && apk upgrade --available && sync
 WORKDIR /app
 COPY . .

cmd/fsb/main.go

@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const versionString = "3.1.0"
+const versionString = "3.2.0-alpha1"
 
 var rootCmd = &cobra.Command{
 	Use:               "fsb [command]",

cmd/fsb/run.go

@@ -27,22 +27,24 @@ var runCmd = &cobra.Command{
 var startTime time.Time = time.Now()
 
 func runApp(cmd *cobra.Command, args []string) {
+	// initialize logger early so config loading is logged to file
+	utils.InitLogger(false)
+	config.Load(utils.Logger, cmd)
+	// reinitialize with correct dev mode
 	utils.InitLogger(config.ValueOf.Dev)
 	log := utils.Logger
 	mainLogger := log.Named("Main")
 	mainLogger.Info("Starting server")
-	config.Load(log, cmd)
 	router := getRouter(log)
 
 	mainBot, err := bot.StartClient(log)
 	if err != nil {
-		log.Panic("Failed to start main bot", zap.Error(err))
+		log.Sugar().Fatalf("Failed to start main bot: %v", err)
 	}
 	cache.InitCache(log)
 	workers, err := bot.StartWorkers(log)
 	if err != nil {
-		log.Panic("Failed to start workers", zap.Error(err))
-		return
+		log.Sugar().Fatalf("Failed to start workers: %v", err)
 	}
 	workers.AddDefaultClient(mainBot, mainBot.Self)
 	bot.StartUserBot(log)
@@ -51,7 +53,7 @@ func runApp(cmd *cobra.Command, args []string) {
 	mainLogger.Sugar().Infof("Server is running at %s", config.ValueOf.Host)
 	err = router.Run(fmt.Sprintf(":%d", config.ValueOf.Port))
 	if err != nil {
-		mainLogger.Sugar().Fatalln(err)
+		mainLogger.Sugar().Fatalf("Server failed to start: %v", err)
 	}
 }
 

config/config.go

@@ -51,6 +51,12 @@ type config struct {
 	UsePublicIP    bool         `envconfig:"USE_PUBLIC_IP" default:"false"`
 	AllowedUsers   allowedUsers `envconfig:"ALLOWED_USERS"`
 	MultiTokens    []string
+
+	// stream specific config
+	StreamConcurrency int `envconfig:"STREAM_CONCURRENCY" default:"4"`
+	StreamBufferCount int `envconfig:"STREAM_BUFFER_COUNT" default:"8"`
+	StreamTimeoutSec  int `envconfig:"STREAM_TIMEOUT_SEC" default:"30"`
+	StreamMaxRetries  int `envconfig:"STREAM_MAX_RETRIES" default:"3"`
 }
 
 var botTokenRegex = regexp.MustCompile(`MULTI\_TOKEN\d+=(.*)`)
@@ -84,6 +90,10 @@ func SetFlagsFromConfig(cmd *cobra.Command) {
 	cmd.Flags().String("user-session", ValueOf.UserSession, "Pyrogram user session")
 	cmd.Flags().Bool("use-public-ip", ValueOf.UsePublicIP, "Use public IP instead of local IP")
 	cmd.Flags().String("multi-token-txt-file", "", "Multi token txt file (Not implemented)")
+	cmd.Flags().Int("stream-concurrency", ValueOf.StreamConcurrency, "Number of parallel block fetches")
+	cmd.Flags().Int("stream-buffer-count", ValueOf.StreamBufferCount, "Number of blocks to prefetch")
+	cmd.Flags().Int("stream-timeout-sec", ValueOf.StreamTimeoutSec, "Maximum time to wait for a single block (in seconds)")
+	cmd.Flags().Int("stream-max-retries", ValueOf.StreamMaxRetries, "Number of retry attempts for failed fetches")
 }
 
 func (c *config) loadConfigFromArgs(log *zap.Logger, cmd *cobra.Command) {
@@ -136,6 +146,22 @@ func (c *config) loadConfigFromArgs(log *zap.Logger, cmd *cobra.Command) {
 		os.Setenv("MULTI_TOKEN_TXT_FILE", multiTokens)
 		// TODO: Add support for importing tokens from a separate file
 	}
+	streamConcurrency, _ := cmd.Flags().GetInt("stream-concurrency")
+	if streamConcurrency != 0 {
+		os.Setenv("STREAM_CONCURRENCY", strconv.Itoa(streamConcurrency))
+	}
+	streamBufferCount, _ := cmd.Flags().GetInt("stream-buffer-count")
+	if streamBufferCount != 0 {
+		os.Setenv("STREAM_BUFFER_COUNT", strconv.Itoa(streamBufferCount))
+	}
+	streamTimeoutSec, _ := cmd.Flags().GetInt("stream-timeout-sec")
+	if streamTimeoutSec != 0 {
+		os.Setenv("STREAM_TIMEOUT_SEC", strconv.Itoa(streamTimeoutSec))
+	}
+	streamMaxRetries, _ := cmd.Flags().GetInt("stream-max-retries")
+	if streamMaxRetries != 0 {
+		os.Setenv("STREAM_MAX_RETRIES", strconv.Itoa(streamMaxRetries))
+	}
 }
 
 func (c *config) setupEnvVars(log *zap.Logger, cmd *cobra.Command) {
@@ -189,6 +215,22 @@ func Load(log *zap.Logger, cmd *cobra.Command) {
 		log.Sugar().Info("HASH_LENGTH can't be less than 5, defaulting to 6")
 		ValueOf.HashLength = 6
 	}
+	if ValueOf.StreamConcurrency <= 0 {
+		log.Sugar().Info("STREAM_CONCURRENCY must be greater than 0, defaulting to 4")
+		ValueOf.StreamConcurrency = 4
+	}
+	if ValueOf.StreamBufferCount <= 0 {
+		log.Sugar().Info("STREAM_BUFFER_COUNT must be greater than 0, defaulting to 8")
+		ValueOf.StreamBufferCount = 8
+	}
+	if ValueOf.StreamTimeoutSec <= 0 {
+		log.Sugar().Info("STREAM_TIMEOUT_SEC must be greater than 0, defaulting to 30 seconds")
+		ValueOf.StreamTimeoutSec = 30
+	}
+	if ValueOf.StreamMaxRetries <= 0 {
+		log.Sugar().Info("STREAM_MAX_RETRIES must be greater than 0, defaulting to 3")
+		ValueOf.StreamMaxRetries = 3
+	}
 }
 
 func getIP(public bool) (string, error) {

go.mod

@@ -1,51 +1,63 @@
 module EverythingSuckz/fsb
 
-go 1.21.3
+go 1.25.0
 
 require (
-	github.com/celestix/gotgproto v1.0.0-beta18
+	github.com/celestix/gotgproto v1.0.0-beta21
 	github.com/gin-gonic/gin v1.9.1
-	github.com/gotd/td v0.105.0
+	github.com/glebarez/sqlite v1.11.0
+	github.com/gotd/td v0.132.0
 	github.com/joho/godotenv v1.5.1
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/quantumsheep/range-parser v1.1.0
 	github.com/spf13/cobra v1.8.0
 )
 
 require (
-	github.com/AnimeKaizoku/cacher v1.0.1 // indirect
+	github.com/AnimeKaizoku/cacher v1.0.3 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/coder/websocket v1.8.14 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/glebarez/go-sqlite v1.22.0 // indirect
-	github.com/glebarez/sqlite v1.11.0 // indirect
 	github.com/go-faster/errors v0.7.1 // indirect
 	github.com/go-faster/jx v1.1.0 // indirect
 	github.com/go-faster/xor v1.0.0 // indirect
+	github.com/go-faster/yaml v0.4.6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gotd/ige v0.2.2 // indirect
 	github.com/gotd/neo v0.1.5 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/ncruces/go-strftime v1.0.0 // indirect
+	github.com/ogen-go/ogen v1.16.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/segmentio/asm v1.2.0 // indirect
+	github.com/segmentio/asm v1.2.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	gorm.io/gorm v1.25.11 // indirect
-	modernc.org/libc v1.55.2 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
-	modernc.org/sqlite v1.30.2 // indirect
-	nhooyr.io/websocket v1.8.11 // indirect
+	golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gorm.io/gorm v1.31.0 // indirect
+	modernc.org/libc v1.66.10 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.11.0 // indirect
+	modernc.org/sqlite v1.39.1 // indirect
 	rsc.io/qr v0.2.0 // indirect
 )
 
@@ -72,10 +84,10 @@ require (
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/zap v1.27.0
 	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
+	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/time v0.5.0
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1