fix \x1f on gzip resp

ad · ad · commit abda0a24f313 · 2025-08-16T13:15:21.000+03:00
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
  "name": "Domofon",
- "version": "0.3.5",
+ "version": "0.3.6",
  "slug": "domofon",
  "description": "",
  "startup": "application",
diff --git a/handlers/auth.go b/handlers/auth.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"html/template"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -300,7 +299,7 @@ func (h *Handler) Accounts(username *string) (a []Account, err error) {
 		return nil, fmt.Errorf("token can't be refreshed")
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return nil, err
 	}
 
@@ -369,7 +368,7 @@ func (h *Handler) RequestCode(username *string, account Account) (result bool, e
 		return true, nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return false, err
 	}
 
@@ -445,7 +444,7 @@ func (h *Handler) SendCode(r *http.Request) (authToken, refreshToken string, err
 		return "", "", fmt.Errorf("token can't be refreshed")
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", "", err
 	}
 
diff --git a/handlers/cameras.go b/handlers/cameras.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"context"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -58,7 +57,7 @@ func (h *Handler) Cameras() (string, error) {
 		return "token can't be refreshed", nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", err
 	}
 
diff --git a/handlers/door.go b/handlers/door.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -76,7 +75,7 @@ func (h *Handler) Door(r *http.Request) (string, error) {
 		return "token can't be refreshed", nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", err
 	}
 
diff --git a/handlers/events.go b/handlers/events.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -90,7 +89,7 @@ func (h *Handler) Events(w http.ResponseWriter, r *http.Request) (string, error)
 		return "token can't be refreshed", nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", err
 	}
 
@@ -155,7 +154,7 @@ func (h *Handler) LastEvent(w http.ResponseWriter, r *http.Request) (events Even
 		return events, fmt.Errorf("%s", "token can't be refreshed")
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return events, err
 	}
 
diff --git a/handlers/finances.go b/handlers/finances.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -65,7 +64,7 @@ func (h *Handler) Finances() ([]byte, error) {
 		return []byte("token can't be refreshed"), nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return nil, err
 	}
 
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -1,8 +1,11 @@
 package handlers
 
 import (
+	"compress/gzip"
 	"embed"
+	"io"
 	"net/http"
+	"strings"
 
 	"github.com/ad/domru/config"
 )
@@ -47,3 +50,20 @@ func (h Header) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	return h.rt.RoundTrip(req)
 }
+
+// ReadResponseBody читает тело ответа с поддержкой gzip декомпрессии
+func ReadResponseBody(resp *http.Response) ([]byte, error) {
+	var reader io.Reader = resp.Body
+
+	// Проверяем, сжат ли ответ gzip
+	if strings.Contains(strings.ToLower(resp.Header.Get("Content-Encoding")), "gzip") {
+		gzipReader, err := gzip.NewReader(resp.Body)
+		if err != nil {
+			return nil, err
+		}
+		defer gzipReader.Close()
+		reader = gzipReader
+	}
+
+	return io.ReadAll(reader)
+}
diff --git a/handlers/operators.go b/handlers/operators.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"context"
-	"io"
 	"log"
 	"net/http"
 	"time"
@@ -47,7 +46,7 @@ func (h *Handler) Operators() (string, error) {
 
 	// log.Printf("%#v", resp)
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", err
 	}
 
diff --git a/handlers/places.go b/handlers/places.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"context"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -56,7 +55,7 @@ func (h *Handler) Places() (string, error) {
 		return "token can't be refreshed", nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", err
 	}
 
diff --git a/handlers/snapshot.go b/handlers/snapshot.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	jpeg "image/jpeg"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -68,7 +67,7 @@ func (h *Handler) SnapshotHandler(w http.ResponseWriter, r *http.Request) {
 		}
 	}()
 
-	body, err = io.ReadAll(resp.Body)
+	body, err = ReadResponseBody(resp)
 
 	if err == nil {
 		contentType := http.DetectContentType(body)
diff --git a/handlers/stream.go b/handlers/stream.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -64,7 +63,7 @@ func (h *Handler) Stream(r *http.Request) (string, error) {
 		return "token can't be refreshed", nil
 	}
 
-	if respBody, err = io.ReadAll(resp.Body); err != nil {
+	if respBody, err = ReadResponseBody(resp); err != nil {
 		return string(respBody), err
 	}
 
diff --git a/handlers/token.go b/handlers/token.go
@@ -3,7 +3,6 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -56,7 +55,7 @@ func (h *Handler) Refresh(refreshToken *string) (string, string, error) {
 		return "token can't be refreshed", "", nil
 	}
 
-	if body, err = io.ReadAll(resp.Body); err != nil {
+	if body, err = ReadResponseBody(resp); err != nil {
 		return "", "", err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Domofon",`
`3`		`- "version": "0.3.5",`
	`3`	`+ "version": "0.3.6",`
`4`	`4`	`"slug": "domofon",`
`5`	`5`	`"description": "",`
`6`	`6`	`"startup": "application",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"encoding/json"`
`7`	`7`	`"fmt"`
`8`	`8`	`"html/template"`
`9`		`- "io"`
`10`	`9`	`"log"`
`11`	`10`	`"net/http"`
`12`	`11`	`"strconv"`
`@@ -300,7 +299,7 @@ func (h Handler) Accounts(username string) (a []Account, err error) {`
`300`	`299`	`return nil, fmt.Errorf("token can't be refreshed")`
`301`	`300`	`}`
`302`	`301`
`303`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`302`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`304`	`303`	`return nil, err`
`305`	`304`	`}`
`306`	`305`
`@@ -369,7 +368,7 @@ func (h Handler) RequestCode(username string, account Account) (result bool, e`
`369`	`368`	`return true, nil`
`370`	`369`	`}`
`371`	`370`
`372`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`371`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`373`	`372`	`return false, err`
`374`	`373`	`}`
`375`	`374`
`@@ -445,7 +444,7 @@ func (h Handler) SendCode(r http.Request) (authToken, refreshToken string, err`
`445`	`444`	`return "", "", fmt.Errorf("token can't be refreshed")`
`446`	`445`	`}`
`447`	`446`
`448`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`447`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`449`	`448`	`return "", "", err`
`450`	`449`	`}`
`451`	`450`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package handlers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "io"`
`6`	`5`	`"log"`
`7`	`6`	`"net/http"`
`8`	`7`	`"strconv"`
`@@ -58,7 +57,7 @@ func (h *Handler) Cameras() (string, error) {`
`58`	`57`	`return "token can't be refreshed", nil`
`59`	`58`	`}`
`60`	`59`
`61`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`60`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`62`	`61`	`return "", err`
`63`	`62`	`}`
`64`	`63`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`	`"context"`
`6`	`6`	`"encoding/json"`
`7`	`7`	`"fmt"`
`8`		`- "io"`
`9`	`8`	`"log"`
`10`	`9`	`"net/http"`
`11`	`10`	`"strconv"`
`@@ -76,7 +75,7 @@ func (h Handler) Door(r http.Request) (string, error) {`
`76`	`75`	`return "token can't be refreshed", nil`
`77`	`76`	`}`
`78`	`77`
`79`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`78`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`80`	`79`	`return "", err`
`81`	`80`	`}`
`82`	`81`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`		`- "io"`
`8`	`7`	`"log"`
`9`	`8`	`"net/http"`
`10`	`9`	`"strconv"`
`@@ -90,7 +89,7 @@ func (h Handler) Events(w http.ResponseWriter, r http.Request) (string, error)`
`90`	`89`	`return "token can't be refreshed", nil`
`91`	`90`	`}`
`92`	`91`
`93`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`92`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`94`	`93`	`return "", err`
`95`	`94`	`}`
`96`	`95`
`@@ -155,7 +154,7 @@ func (h Handler) LastEvent(w http.ResponseWriter, r http.Request) (events Even`
`155`	`154`	`return events, fmt.Errorf("%s", "token can't be refreshed")`
`156`	`155`	`}`
`157`	`156`
`158`		`- if body, err = io.ReadAll(resp.Body); err != nil {`
	`157`	`+ if body, err = ReadResponseBody(resp); err != nil {`
`159`	`158`	`return events, err`
`160`	`159`	`}`
`161`	`160`