Hikvision: fix delayed events

toxuin · Sep 20, 2022 · a486ef5 · a486ef5
1 parent f485aca
commit a486ef5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/servers/dahua/server.go b/servers/dahua/server.go
@@ -105,14 +105,14 @@ func (camera *DhCamera) readEvents(channel chan<- DhEvent, callback func()) {
 	multipartReader := multipart.NewReader(response.Body, multipartBoundary)
 	for {
 		part, err := multipartReader.NextPart()
-		contentLength, _ := strconv.Atoi(part.Header.Get("Content-Length"))
 		if err == io.EOF {
 			break
 		}
 		if err != nil {
 			fmt.Println(err)
 			continue
 		}
+		contentLength, _ := strconv.Atoi(part.Header.Get("Content-Length"))
 		body := make([]byte, contentLength)
 		_, err = part.Read(body)
 		if err != nil {

diff --git a/servers/hikvision/httpEventReader.go b/servers/hikvision/httpEventReader.go
@@ -9,6 +9,7 @@ import (
 	"mime"
 	"mime/multipart"
 	"net/http"
+	"strconv"
 )
 
 type HttpEventReader struct {
@@ -73,7 +74,9 @@ func (eventReader *HttpEventReader) ReadEvents(camera *HikCamera, channel chan<-
 			fmt.Println(err)
 			continue
 		}
-		body, err := io.ReadAll(part)
+		contentLength, _ := strconv.Atoi(part.Header.Get("Content-Length"))
+		body := make([]byte, contentLength)
+		_, err = part.Read(body)
 		if err != nil {
 			fmt.Println(err)
 			continue