Merge pull request #10 from amattu2/battery-device-liveview-fix

fix: Premature livestream timeout for low power devices

Author: amattu2

account/account.go

@@ -81,14 +81,17 @@ getDevice:
 		cancelCtx()
 	}()
 
-	common.Livestream(ctx, common.AccountDetails{
+	accountDetails := common.AccountDetails{
 		Region:     region,
 		Token:      token,
 		DeviceType: device.DeviceType,
 		AccountId:  accountId,
 		NetworkId:  device.NetworkId,
 		CameraId:   device.DeviceId,
-	}, inputPipe)
+	}
+	if err := common.Livestream(ctx, accountDetails, inputPipe); err != nil {
+		log.Println("error starting liveview session", err)
+	}
 
 	inputPipe.Close()
 	if err := ffplayCmd.Wait(); err != nil {

common/livestream.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"log"
 )
 
 type AccountDetails struct {
@@ -40,18 +39,15 @@ func Livestream(ctx context.Context, account AccountDetails, writer io.Writer) e
 	baseUrl := GetApiUrl(account.Region)
 	liveViewPath, err := GetLiveviewPath(account.DeviceType)
 	if err != nil {
-		log.Println("Error getting liveview path", err)
-		return err
+		return fmt.Errorf("error getting liveview path: %w", err)
 	}
 
 	// Tell Blink we want to start a liveview session
 	resp, err := BeginLiveview(fmt.Sprintf(liveViewPath, baseUrl, account.AccountId, account.NetworkId, account.CameraId), account.Token)
 	if err != nil {
-		log.Println("Error starting liveview session", err)
-		return err
+		return fmt.Errorf("error starting liveview session: %w", err)
 	} else if resp == nil || resp.CommandId == 0 {
-		log.Println("Error sending liveview command", resp)
-		return fmt.Errorf("error sending liveview command")
+		return fmt.Errorf("error sending liveview command: %v", resp)
 	}
 
 	// Poll the liveview command to keep the connection alive
@@ -61,14 +57,12 @@ func Livestream(ctx context.Context, account AccountDetails, writer io.Writer) e
 	// Get the connection details
 	connectionDetails, err := ParseConnectionString(resp.Server)
 	if err != nil {
-		log.Println("Error parsing connection string", err)
-		return err
+		return fmt.Errorf("connection string parsing error: %w", err)
 	}
 
 	// Connect to the liveview server
 	if err := TCPStream(ctx, *connectionDetails, writer); err != nil {
-		log.Println("TCPStream error:", err)
-		return err
+		return fmt.Errorf("TCPStream error: %w", err)
 	}
 
 	<-ctx.Done()

common/tcp.go

@@ -12,9 +12,16 @@ import (
 	"time"
 )
 
+// READ_TIMEOUT is the timeout for reading from the TCP connection.
+// Low power devices may take longer than usual before receiving initial data.
+var READ_TIMEOUT = 10 * time.Second
+
+// FRAMES_KEEPALIVE is the keep-alive ping frame sent to the Blink stream server.
 var FRAMES_KEEPALIVE = []byte{
-	0x12, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+	0x12, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00,
+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
 	0x00,
 }
 
@@ -74,7 +81,7 @@ stream:
 			log.Println("Closing stream")
 			break stream
 		default:
-			if err := client.SetReadDeadline(time.Now().Add(2 * time.Second)); err != nil {
+			if err := client.SetReadDeadline(time.Now().Add(READ_TIMEOUT)); err != nil {
 				streamErr = fmt.Errorf("error setting read deadline: %w", err)
 				break stream
 			}

handlers/websocket.go

@@ -73,15 +73,20 @@ func liveviewHandler(ctx context.Context, c *websocket.Conn, data map[string]int
 	}
 	defer ffmpegCmd.Process.Kill()
 
-	// TODO: Handle Livestream errors and propagate them to the client
-	go common.Livestream(ctx, common.AccountDetails{
-		Region:     region,
-		Token:      token,
-		DeviceType: device_type,
-		AccountId:  account_id,
-		NetworkId:  network_id,
-		CameraId:   camera_id,
-	}, inputPipe)
+	go func() {
+		err := common.Livestream(ctx, common.AccountDetails{
+			Region:     region,
+			Token:      token,
+			DeviceType: device_type,
+			AccountId:  account_id,
+			NetworkId:  network_id,
+			CameraId:   camera_id,
+		}, inputPipe)
+		if err != nil {
+			log.Println("error starting liveview session", err)
+			// TODO: Notify the client about the error
+		}
+	}()
 
 	// Tell the client that the liveview has started
 	c.WriteJSON(CommandMessage{

liveview/liveview.go

@@ -35,14 +35,17 @@ func Run(region string, token string, deviceType string, accountId int, networkI
 		cancelCtx()
 	}()
 
-	common.Livestream(ctx, common.AccountDetails{
+	accountDetails := common.AccountDetails{
 		Region:     region,
 		Token:      token,
 		DeviceType: deviceType,
 		AccountId:  accountId,
 		NetworkId:  networkId,
 		CameraId:   cameraId,
-	}, inputPipe)
+	}
+	if err := common.Livestream(ctx, accountDetails, inputPipe); err != nil {
+		log.Println("error during livestream", err)
+	}
 
 	inputPipe.Close()
 	if err := ffplayCmd.Wait(); err != nil {