apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-09-26 20:31:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Carry protocol info in stream URL

Browse Source
This commit is contained in:
Jamal Fanaian
2024-07-11 18:47:05 -07:00
parent e1021a96af
commit 13dd3084c2
3 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/nest/init.go
View File

@@ -2,6 +2,7 @@ package nest
import (
"net/http"
"strings"
"github.com/AlexxIT/go2rtc/internal/api"
"github.com/AlexxIT/go2rtc/internal/streams"
@@ -38,11 +39,12 @@ func apiNest(w http.ResponseWriter, r *http.Request) {
var items []*api.Source
for name, deviceID := range devices {
query.Set("device_id", deviceID)
for _, device := range devices {
query.Set("device_id", device.DeviceID)
query.Set("protocols", strings.Join(device.Protocols, ","))
items = append(items, &api.Source{
Name: name, URL: "nest:?" + query.Encode(),
Name: device.Name, URL: "nest:?" + query.Encode(),
})
}

41
pkg/nest/api.go
View File

@@ -33,6 +33,12 @@ type Auth struct {
AccessToken string
}
type DeviceInfo struct {
Name string
DeviceID string
Protocols []string
}
var cache = map[string]*API{}
var cacheMu sync.Mutex
@@ -84,7 +90,7 @@ func NewAPI(clientID, clientSecret, refreshToken string) (*API, error) {
return api, nil
}
func (a *API) GetDevices(projectID string) (map[string]string, error) {
func (a *API) GetDevices(projectID string) ([]DeviceInfo, error) {
uri := "https://smartdevicemanagement.googleapis.com/v1/enterprises/" + projectID + "/devices"
req, err := http.NewRequest("GET", uri, nil)
if err != nil {
@@ -111,7 +117,7 @@ func (a *API) GetDevices(projectID string) (map[string]string, error) {
return nil, err
}
devices := map[string]string{}
devices := make([]DeviceInfo, 0, len(resv.Devices))
for _, device := range resv.Devices {
if len(device.Traits.SdmDevicesTraitsCameraLiveStream.SupportedProtocols) == 0 {
@@ -139,40 +145,13 @@ func (a *API) GetDevices(projectID string) (map[string]string, error) {
if name == "" && len(device.ParentRelations) > 0 {
name = device.ParentRelations[0].DisplayName
}
devices[name] = device.Name[i+1:]
devices = append(devices, DeviceInfo{Name: name, DeviceID: device.Name[i+1:], Protocols: device.Traits.SdmDevicesTraitsCameraLiveStream.SupportedProtocols})
}
return devices, nil
}
func (a *API) GetDevice(projectID, deviceID string) (Device, error) {
uri := "https://smartdevicemanagement.googleapis.com/v1/enterprises/" + projectID + "/devices/" + deviceID
req, err := http.NewRequest("GET", uri, nil)
if err != nil {
return Device{}, err
}
req.Header.Set("Authorization", "Bearer "+a.Token)
client := &http.Client{Timeout: time.Second * 5000}
res, err := client.Do(req)
if err != nil {
return Device{}, err
}
if res.StatusCode != 200 {
return Device{}, errors.New("nest: wrong status: " + res.Status)
}
var device Device
if err = json.NewDecoder(res.Body).Decode(&device); err != nil {
return Device{}, err
}
return device, nil
}
func (a *API) ExchangeSDP(projectID, deviceID, offer string) (string, error) {
var reqv struct {
Command string `json:"command"`

15
pkg/nest/client.go
View File

@@ -3,6 +3,7 @@ package nest
import (
"errors"
"net/url"
"strings"
"github.com/AlexxIT/go2rtc/pkg/core"
"github.com/AlexxIT/go2rtc/pkg/rtsp"
@@ -32,6 +33,12 @@ func Dial(rawURL string) (core.Producer, error) {
refreshToken := query.Get("refresh_token")
projectID := query.Get("project_id")
deviceID := query.Get("device_id")
protocols := strings.Split(query.Get("protocols"), ",")
// Default to WEB_RTC for backwards compataiility
if len(protocols) == 0 {
protocols = append(protocols, "WEB_RTC")
}
if cliendID == "" || cliendSecret == "" || refreshToken == "" || projectID == "" || deviceID == "" {
return nil, errors.New("nest: wrong query")
@@ -42,12 +49,8 @@ func Dial(rawURL string) (core.Producer, error) {
return nil, err
}
device, err := nestAPI.GetDevice(projectID, deviceID)
if err != nil {
return nil, err
}
for _, proto := range device.Traits.SdmDevicesTraitsCameraLiveStream.SupportedProtocols {
// Pick the first supported protocol in order of priority (WEB_RTC, RTSP)
for _, proto := range protocols {
if proto == "WEB_RTC" {
return rtcConn(nestAPI, rawURL, projectID, deviceID)
} else if proto == "RTSP" {