Add structured container-friendly logging

cmd/main.go

@@ -10,11 +10,11 @@ import (
 	"gitea.tbdevent.eu/ilbinek/reforger_utils"
 )
 
-const DEBUG = false
+const DEBUG = true
 
 func main() {
-	addonID := "61EB463A41FE5274"
-	version := "0.1.166"
+	addonID := "BADC0DEDABBEDA5E"
+	version := "0.12.4573"
 
 	assetsReply, err := reforger_utils.DoAssetsRequest(addonID, version)
 	if err != nil {
@@ -64,6 +64,10 @@ func main() {
 			if err != nil {
 				panic(err)
 			}
+
+			if err := os.WriteFile(filepath.Join(downloadDir, file.Name), downedFile, os.ModePerm); err != nil {
+				panic(err)
+			}
 			
 			fmt.Println("Downloaded", file.Name, len(downedFile), "bytes")
 

go.mod

@@ -1,3 +1,5 @@
 module gitea.tbdevent.eu/ilbinek/reforger_utils
 
 go 1.25.0
+
+require golang.org/x/net v0.44.0 // indirect

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
+golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=

logger.go

@@ -0,0 +1,36 @@
+package reforger_utils
+
+import (
+	"log/slog"
+	"os"
+	"sync"
+)
+
+var (
+	loggerMu sync.RWMutex
+	logger   = newDefaultLogger()
+)
+
+func newDefaultLogger() *slog.Logger {
+	return slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo}))
+}
+
+// SetLogger configures the package logger.
+// Passing nil resets it to the default JSON logger writing to stdout.
+func SetLogger(l *slog.Logger) {
+	loggerMu.Lock()
+	defer loggerMu.Unlock()
+
+	if l == nil {
+		logger = newDefaultLogger()
+		return
+	}
+
+	logger = l
+}
+
+func getLogger() *slog.Logger {
+	loggerMu.RLock()
+	defer loggerMu.RUnlock()
+	return logger
+}

util.go

@@ -9,11 +9,25 @@ import (
 	"path/filepath"
 	"slices"
 	"strings"
-	"sync"
+
+	"golang.org/x/net/proxy"
 )
 
 var Debug = false
-var DownThreads = 8
+var Tor = false
+var Socks5Address = "127.0.0.1:9050"
+
+func getHttpClient() (*http.Client, error) {
+	if Tor {
+		dialer, err := proxy.SOCKS5("tcp", Socks5Address, nil, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		transport := &http.Transport{Dial: dialer.Dial}
+		return &http.Client{Transport: transport}, nil
+	}
+	return http.DefaultClient, nil
+}
 
 func DoAssetsRequest(addonID, version string) (AssetsReply, error) {
 	url := "https://api-ar-workshop.bistudio.com/workshop-api/api/v3.0/s2s/assets/download-list"
@@ -29,16 +43,19 @@ func DoAssetsRequest(addonID, version string) (AssetsReply, error) {
 	req.Header.Add("user-agent", "Arma Reforger/1.4.0.53 (Headless; Windows)")
 	req.Header.Add("content-length", fmt.Sprintf("%d", len(body)))
 
-	res, err := http.DefaultClient.Do(req)
+	client, err := getHttpClient()
+	if err != nil {
+		return AssetsReply{}, err
+	}
+	res, err := client.Do(req)
 	if err != nil {
 		return AssetsReply{}, err
 	}
 	defer res.Body.Close()
 
 	if res.StatusCode != 200 {
-		// print entire body
 		body, _ := io.ReadAll(res.Body)
-		fmt.Println(string(body))
+		getLogger().Error("assets request failed", "status", res.Status, "addon_id", addonID, "version", version, "body", string(body))
 		return AssetsReply{}, fmt.Errorf("bad status: %s", res.Status)
 	}
 
@@ -46,7 +63,7 @@ func DoAssetsRequest(addonID, version string) (AssetsReply, error) {
 	decoder := json.NewDecoder(res.Body)
 	var assetsReply AssetsReply
 	if err := decoder.Decode(&assetsReply); err != nil {
-		panic(err)
+		return AssetsReply{}, fmt.Errorf("failed to decode assets response: %w", err)
 	}
 
 	return assetsReply, nil
@@ -59,7 +76,11 @@ func GetManifest(manifestUrl string) (Manifest, error) {
 		return Manifest{}, err
 	}
 
-	res, err := http.DefaultClient.Do(req)
+	client, err := getHttpClient()
+	if err != nil {
+		return Manifest{}, err
+	}
+	res, err := client.Do(req)
 	if err != nil {
 		return Manifest{}, err
 	}
@@ -72,7 +93,7 @@ func GetManifest(manifestUrl string) (Manifest, error) {
 	// Decode the JSON response
 	var manifest Manifest
 	if err := json.NewDecoder(res.Body).Decode(&manifest); err != nil {
-		panic(err)
+		return Manifest{}, fmt.Errorf("failed to decode manifest response: %w", err)
 	}
 
 	return manifest, nil
@@ -97,8 +118,8 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 		if err != nil {
 			return nil, err
 		}
-		remContent = content
-		downloaded += len(content)
+		remContent = *content
+		downloaded += len(*content)
 
 		if Debug {
 			// save remainder to file in the fragments/ directory, prefix with gap
@@ -113,75 +134,30 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 	// start downloading chunks
 	ret := make([]byte, manifest.Size)
 	totalMB := float32(manifest.Size) / 1024.0 / 1024.0
+	lastLoggedPercent := float32(-1)
+	log := getLogger().With("file", filen)
+	log.Info("download started", "size_bytes", manifest.Size)
 
-	var wg sync.WaitGroup
-	var mu sync.Mutex
-
-	fragmentsChan := make(chan Fragment, len(manifest.Fragments))
-	errChan := make(chan error, DownThreads)
-
-	// Start worker goroutines
-	for i := 0; i < DownThreads; i++ {
-		wg.Go(func() {
-			for fragment := range fragmentsChan {
-				url := transformShaToURL(fragment.Sha512, fragment.Size)
-				content, err := getContent(url)
-				if err != nil {
-					// Handle error, maybe by sending it to an error channel
-					// For now, we'll just skip and print.
-					fmt.Printf("Error downloading fragment %s: %v\n", fragment.Sha512, err)
-					errChan <- err
-				}
-
-				mu.Lock()
-				// Safely write to the shared slice and update progress
-				for _, offset := range fragment.Offsets {
-					copy(ret[offset:offset+len(content)], content)
-				}
-				downloaded += len(content) * len(fragment.Offsets)
-
-				// Track downloaded fragments
-				for _, offset := range fragment.Offsets {
-					trackFrag = append(trackFrag, Frag{
-						Offset: offset,
-						Size:   len(content),
-					})
-				}
-
-				// Print progress
-				downedMB := float32(downloaded) / 1024.0 / 1024.0
-				percent := float32(downloaded) / float32(manifest.Size) * 100.0
-				fmt.Printf("\r\033[32mDownloaded\033[0m %.2fMB/%.2fMB (\033[36m%.2f%%\033[0m) of \033[33m%s\033[0m", downedMB, totalMB, percent, filen)
-
-				mu.Unlock()
-
-				// The Debug section can be safely moved here as well
-				if os.Getenv("DEBUG") == "true" { // Using env var for a cleaner check
-					mu.Lock() // Re-lock for file write
-					if err := os.WriteFile(filepath.Join(downloadDir, "fragments", filen, fmt.Sprintf("%d.%s.%d.bytes", fragment.Offsets[0], fragment.Sha512, fragment.Size)), content, os.ModePerm); err != nil {
-						fmt.Printf("Error saving file: %v\n", err)
-					}
-					mu.Unlock()
-				}
-			}
-		})
+	// Download all fragments serially to keep execution simple and deterministic.
+	for idx, fragment := range manifest.Fragments {
+		url := transformShaToURL(fragment.Sha512, fragment.Size)
+		content, err := getContent(url)
+		if err != nil {
+			return nil, err
+		}
+		downloaded += len(*content) * len(fragment.Offsets)
+		for _, offset := range fragment.Offsets {
+			trackFrag = append(trackFrag, Frag{Offset: offset, Size: len(*content)})
+			copy(ret[offset:offset+len(*content)], *content)
+		}
+		percent := float32(downloaded) / float32(manifest.Size) * 100.0
+		downedMB := float32(downloaded) / 1024.0 / 1024.0
+		if percent-lastLoggedPercent >= 5 || idx == len(manifest.Fragments)-1 {
+			log.Info("download progress", "downloaded_mb", downedMB, "total_mb", totalMB, "percent", percent)
+			lastLoggedPercent = percent
+		}
 	}
 
-	// Send fragments to the channel
-	for _, fragment := range manifest.Fragments {
-		fragmentsChan <- fragment
-	}
-	close(fragmentsChan) // Close the channel to signal workers no more tasks are coming
-
-	// Wait for all workers to finish
-	wg.Wait()
-
-	// Check for errors
-	if len(errChan) > 0 {
-		return nil, <-errChan // Return the first error encountered
-	}
-	close(errChan)
-
 	// sort trackFrag by Offset
 	slices.SortFunc(trackFrag, func(a, b Frag) int {
 		return a.Offset - b.Offset
@@ -195,7 +171,7 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 			// gap detected
 			gapSize := frag.Offset - curPos
 			if currentRem+gapSize > len(remContent) {
-				panic("not enough remainder content to fill gap")
+				return nil, fmt.Errorf("not enough remainder content to fill gap in %s", filen)
 			}
 			copy(ret[curPos:curPos+gapSize], remContent[currentRem:currentRem+gapSize])
 			remContent = remContent[gapSize:]
@@ -205,19 +181,24 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 
 	// Append rest of remainder content
 	copy(ret[curPos:], remContent)
-	fmt.Println()
+	log.Info("download completed", "size_bytes", len(ret))
 
 	return ret, nil
 }
 
-func getContent(url string) ([]byte, error) {
-	resp, err := http.Get(url)
+func getContent(url string) (*[]byte, error) {
+	client, err := getHttpClient()
+	if err != nil {
+		return nil, err
+	}
+	resp, err := client.Get(url)
 	if err != nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
+		getLogger().Error("content request failed", "status", resp.Status, "url", url)
 		return nil, fmt.Errorf("bad status: %s", resp.Status)
 	}
 
@@ -226,7 +207,7 @@ func getContent(url string) ([]byte, error) {
 		return nil, err
 	}
 
-	return body, nil
+	return &body, nil
 }
 
 func transformShaToURL(sha512s string, size int) string {