From bb73f5e5776314013f82503a0c13952723f3256c Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Tue, 31 Oct 2023 16:40:02 +0100
Subject: [PATCH] feat(backend): disable brotli by default

---
 backend/internal/config/storage/config.go |  1 +
 backend/internal/storage/storage.go       | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/internal/config/storage/config.go b/backend/internal/config/storage/config.go
index facd01153..b8e594a3b 100644
--- a/backend/internal/config/storage/config.go
+++ b/backend/internal/config/storage/config.go
@@ -23,6 +23,7 @@ type Config struct {
 	MaxFileSize          int64         `env:"MAX_FILE_SIZE,default=524288000"`
 	UseSort              bool          `env:"USE_SESSION_SORT,default=true"`
 	UseProfiler          bool          `env:"PROFILER_ENABLED,default=false"`
+	UseBrotli            bool          `env:"USE_BROTLI,default=false"`
 }
 
 func New() *Config {
diff --git a/backend/internal/storage/storage.go b/backend/internal/storage/storage.go
index 9504a2f73..a7060175f 100644
--- a/backend/internal/storage/storage.go
+++ b/backend/internal/storage/storage.go
@@ -45,6 +45,7 @@ type Task struct {
 	dome        *bytes.Buffer
 	dev         *bytes.Buffer
 	isBreakTask bool
+	compression objectstorage.CompressionType
 }
 
 func (t *Task) SetMob(mob []byte, tp FileType) {
@@ -111,8 +112,9 @@ func (s *Storage) Process(msg *messages.SessionEnd) (err error) {
 
 	// Prepare sessions
 	newTask := &Task{
-		id:  sessionID,
-		key: msg.EncryptionKey,
+		id:          sessionID,
+		key:         msg.EncryptionKey,
+		compression: objectstorage.NoCompression,
 	}
 	wg := &sync.WaitGroup{}
 	wg.Add(2)
@@ -197,13 +199,14 @@ func (s *Storage) prepareSession(path string, tp FileType, task *Task) error {
 
 func (s *Storage) packSession(task *Task, tp FileType) {
 	// If encryption key is empty, pack session using better algorithm
-	if task.key == "" {
+	if task.key == "" && s.cfg.UseBrotli {
 		s.packSessionBetter(task, tp)
 		return
 	}
 
 	// Prepare mob file
 	mob := task.Mob(tp)
+	task.compression = objectstorage.Gzip
 
 	if tp == DEV || len(mob) <= s.cfg.FileSplitSize {
 		// Compression
@@ -270,6 +273,7 @@ func (s *Storage) packSession(task *Task, tp FileType) {
 func (s *Storage) packSessionBetter(task *Task, tp FileType) {
 	// Prepare mob file
 	mob := task.Mob(tp)
+	task.compression = objectstorage.Brotli
 
 	if tp == DEV || len(mob) <= s.cfg.FileSplitSize {
 		// Compression
@@ -377,17 +381,13 @@ func (s *Storage) uploadSession(task *Task) {
 		uploadDome int64 = 0
 		uploadDev  int64 = 0
 	)
-	compression := objectstorage.NoCompression
-	if task.key == "" {
-		compression = objectstorage.Brotli
-	}
 	go func() {
 		if task.doms != nil {
 			// Record compression ratio
 			metrics.RecordSessionCompressionRatio(task.domsRawSize/float64(task.doms.Len()), DOM.String())
 			// Upload session to s3
 			start := time.Now()
-			if err := s.objStorage.Upload(task.doms, task.id+string(DOM)+"s", "application/octet-stream", compression); err != nil {
+			if err := s.objStorage.Upload(task.doms, task.id+string(DOM)+"s", "application/octet-stream", task.compression); err != nil {
 				log.Fatalf("Storage: start upload failed.  %s", err)
 			}
 			uploadDoms = time.Now().Sub(start).Milliseconds()
@@ -400,7 +400,7 @@ func (s *Storage) uploadSession(task *Task) {
 			metrics.RecordSessionCompressionRatio(task.domeRawSize/float64(task.dome.Len()), DOM.String())
 			// Upload session to s3
 			start := time.Now()
-			if err := s.objStorage.Upload(task.dome, task.id+string(DOM)+"e", "application/octet-stream", compression); err != nil {
+			if err := s.objStorage.Upload(task.dome, task.id+string(DOM)+"e", "application/octet-stream", task.compression); err != nil {
 				log.Fatalf("Storage: start upload failed.  %s", err)
 			}
 			uploadDome = time.Now().Sub(start).Milliseconds()
@@ -413,7 +413,7 @@ func (s *Storage) uploadSession(task *Task) {
 			metrics.RecordSessionCompressionRatio(task.devRawSize/float64(task.dev.Len()), DEV.String())
 			// Upload session to s3
 			start := time.Now()
-			if err := s.objStorage.Upload(task.dev, task.id+string(DEV), "application/octet-stream", compression); err != nil {
+			if err := s.objStorage.Upload(task.dev, task.id+string(DEV), "application/octet-stream", task.compression); err != nil {
 				log.Fatalf("Storage: start upload failed.  %s", err)
 			}
 			uploadDev = time.Now().Sub(start).Milliseconds()