Merge branch 'AlexxIT:master' into onvif-client

pkg/core/track.go

@@ -98,8 +98,7 @@ func NewSender(media *Media, codec *Codec) *Sender {
 	}
 	s.Input = func(packet *Packet) {
 		s.mu.Lock()
-		if s.buf != nil {
+		// unblock write to nil chan - OK, write to closed chan - panic
-			// unblocked write to channel
 		select {
 		case s.buf <- packet:
 			s.Bytes += len(packet.Payload)
@@ -107,9 +106,6 @@ func NewSender(media *Media, codec *Codec) *Sender {
 		default:
 			s.Drops++
 		}
-		} else {
-			s.Drops++
-		}
 		s.mu.Unlock()
 	}
 	s.Output = func(packet *Packet) {

pkg/nest/api.go

@@ -166,6 +166,11 @@ func (a *API) ExchangeSDP(projectID, deviceID, offer string) (string, error) {
 
 	uri := "https://smartdevicemanagement.googleapis.com/v1/enterprises/" +
 		projectID + "/devices/" + deviceID + ":executeCommand"
+
+	maxRetries := 3
+	retryDelay := time.Second * 30
+
+	for attempt := 0; attempt < maxRetries; attempt++ {
 		req, err := http.NewRequest("POST", uri, bytes.NewReader(b))
 		if err != nil {
 			return "", err
@@ -178,6 +183,21 @@ func (a *API) ExchangeSDP(projectID, deviceID, offer string) (string, error) {
 		if err != nil {
 			return "", err
 		}
+
+		// Handle 409 (Conflict), 429 (Too Many Requests), and 401 (Unauthorized)
+		if res.StatusCode == 409 || res.StatusCode == 429 || res.StatusCode == 401 {
+			res.Body.Close()
+			if attempt < maxRetries-1 {
+				// Get new token from Google
+				if err := a.refreshToken(); err != nil {
+					return "", err
+				}
+				time.Sleep(retryDelay)
+				retryDelay *= 2 // exponential backoff
+				continue
+			}
+		}
+
 		defer res.Body.Close()
 
 		if res.StatusCode != 200 {
@@ -202,6 +222,44 @@ func (a *API) ExchangeSDP(projectID, deviceID, offer string) (string, error) {
 		a.StreamExpiresAt = resv.Results.ExpiresAt
 
 		return resv.Results.Answer, nil
+	}
+
+	return "", errors.New("nest: max retries exceeded")
+}
+
+func (a *API) refreshToken() error {
+	// Get the cached API with matching token to get credentials
+	var refreshKey string
+	cacheMu.Lock()
+	for key, api := range cache {
+		if api.Token == a.Token {
+			refreshKey = key
+			break
+		}
+	}
+	cacheMu.Unlock()
+
+	if refreshKey == "" {
+		return errors.New("nest: unable to find cached credentials")
+	}
+
+	// Parse credentials from cache key
+	parts := strings.Split(refreshKey, ":")
+	if len(parts) != 3 {
+		return errors.New("nest: invalid cache key format")
+	}
+	clientID, clientSecret, refreshToken := parts[0], parts[1], parts[2]
+
+	// Get new API instance which will refresh the token
+	newAPI, err := NewAPI(clientID, clientSecret, refreshToken)
+	if err != nil {
+		return err
+	}
+
+	// Update current API with new token
+	a.Token = newAPI.Token
+	a.ExpiresAt = newAPI.ExpiresAt
+	return nil
 }
 
 func (a *API) ExtendStream() error {
@@ -407,20 +465,22 @@ type Device struct {
 }
 
 func (a *API) StartExtendStreamTimer() {
-	// Calculate the duration until 30 seconds before the stream expires
+	if a.extendTimer != nil {
-	duration := time.Until(a.StreamExpiresAt.Add(-30 * time.Second))
+		return
-	a.extendTimer = time.AfterFunc(duration, func() {
+	}
+
+	a.extendTimer = time.NewTimer(time.Until(a.StreamExpiresAt) - time.Minute)
+	go func() {
+		<-a.extendTimer.C
 		if err := a.ExtendStream(); err != nil {
 			return
 		}
-		duration = time.Until(a.StreamExpiresAt.Add(-30 * time.Second))
+	}()
-		a.extendTimer.Reset(duration)
-	})
 }
 
 func (a *API) StopExtendStreamTimer() {
-	if a.extendTimer == nil {
+	if a.extendTimer != nil {
-		return
-	}
 		a.extendTimer.Stop()
+		a.extendTimer = nil
+	}
 }

pkg/nest/client.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/AlexxIT/go2rtc/pkg/core"
 	"github.com/AlexxIT/go2rtc/pkg/rtsp"
@@ -38,9 +39,26 @@ func Dial(rawURL string) (core.Producer, error) {
 		return nil, errors.New("nest: wrong query")
 	}
 
-	nestAPI, err := NewAPI(cliendID, cliendSecret, refreshToken)
+	maxRetries := 3
-	if err != nil {
+	retryDelay := time.Second * 30
-		return nil, err
+
+	var nestAPI *API
+	var lastErr error
+
+	for attempt := 0; attempt < maxRetries; attempt++ {
+		nestAPI, err = NewAPI(cliendID, cliendSecret, refreshToken)
+		if err == nil {
+			break
+		}
+		lastErr = err
+		if attempt < maxRetries-1 {
+			time.Sleep(retryDelay)
+			retryDelay *= 2 // exponential backoff
+		}
+	}
+
+	if nestAPI == nil {
+		return nil, lastErr
 	}
 
 	protocols := strings.Split(query.Get("protocols"), ",")
@@ -79,6 +97,11 @@ func (c *WebRTCClient) MarshalJSON() ([]byte, error) {
 }
 
 func rtcConn(nestAPI *API, rawURL, projectID, deviceID string) (*WebRTCClient, error) {
+	maxRetries := 3
+	retryDelay := time.Second * 30
+	var lastErr error
+
+	for attempt := 0; attempt < maxRetries; attempt++ {
 		rtcAPI, err := webrtc.NewAPI()
 		if err != nil {
 			return nil, err
@@ -112,6 +135,12 @@ func rtcConn(nestAPI *API, rawURL, projectID, deviceID string) (*WebRTCClient, e
 		// 4. Exchange SDP via Hass
 		answer, err := nestAPI.ExchangeSDP(projectID, deviceID, offer)
 		if err != nil {
+			lastErr = err
+			if attempt < maxRetries-1 {
+				time.Sleep(retryDelay)
+				retryDelay *= 2
+				continue
+			}
 			return nil, err
 		}
 
@@ -121,6 +150,9 @@ func rtcConn(nestAPI *API, rawURL, projectID, deviceID string) (*WebRTCClient, e
 		}
 
 		return &WebRTCClient{conn: conn, api: nestAPI}, nil
+	}
+
+	return nil, lastErr
 }
 
 func rtspConn(nestAPI *API, rawURL, projectID, deviceID string) (*RTSPClient, error) {