gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring for HomeKit client

Browse Source
This commit is contained in:
Alexey Khit
2022-11-08 12:24:26 +03:00
parent 149d1bf235
commit f77db44529
6 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/homekit/api.go
+17 -21
View File
@@ -62,10 +62,10 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
id := r.URL.Query().Get("id") id := r.URL.Query().Get("id")
pin := r.URL.Query().Get("pin") pin := r.URL.Query().Get("pin")
client, err := homekit.Pair(id, pin) conn, err := homekit.Pair(id, pin)
if err != nil { if err != nil {
// log error // log error
log.Error().Err(err).Msg("[api.homekit] pair") log.Error().Err(err).Caller().Send()
// response error // response error
_, err = w.Write([]byte(err.Error())) _, err = w.Write([]byte(err.Error()))
return return
@@ -73,15 +73,15 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
name := r.URL.Query().Get("name") name := r.URL.Query().Get("name")
dict := store.GetDict("streams") dict := store.GetDict("streams")
dict[name] = client.URL() dict[name] = conn.URL()
if err = store.Set("streams", dict); err != nil { if err = store.Set("streams", dict); err != nil {
// log error // log error
log.Error().Err(err).Msg("[api.homekit] save to store") log.Error().Err(err).Caller().Send()
// response error // response error
_, err = w.Write([]byte(err.Error())) _, err = w.Write([]byte(err.Error()))
} }
streams.New(name, client.URL()) streams.New(name, conn.URL())
case "DELETE": case "DELETE":
src := r.URL.Query().Get("src") src := r.URL.Query().Get("src")
@@ -91,36 +91,32 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
continue continue
} }
client, err := homekit.NewClient(rawURL.(string)) conn, err := homekit.Dial(rawURL.(string))
if err != nil { if err != nil {
// log error // log error
log.Error().Err(err).Msg("[api.homekit] new client") log.Error().Err(err).Caller().Send()
// response error // response error
_, err = w.Write([]byte(err.Error())) _, err = w.Write([]byte(err.Error()))
return return
} }
if err = client.Dial(); err != nil { go func() {
if err = conn.Handle(); err != nil {
log.Warn().Err(err).Caller().Send()
}
}()
if err = conn.ListPairings(); err != nil {
// log error // log error
log.Error().Err(err).Msg("[api.homekit] client dial") log.Error().Err(err).Caller().Send()
// response error // response error
_, err = w.Write([]byte(err.Error())) _, err = w.Write([]byte(err.Error()))
return return
} }
go client.Handle() if err = conn.DeletePairing(conn.ClientID); err != nil {
if err = client.ListPairings(); err != nil {
// log error // log error
log.Error().Err(err).Msg("[api.homekit] unpair") log.Error().Err(err).Caller().Send()
// response error
_, err = w.Write([]byte(err.Error()))
return
}
if err = client.DeletePairing(client.ClientID); err != nil {
// log error
log.Error().Err(err).Msg("[api.homekit] unpair")
// response error // response error
_, err = w.Write([]byte(err.Error())) _, err = w.Write([]byte(err.Error()))
} }
cmd/homekit/producer.go → cmd/homekit/client.go
+13 -12
View File
@@ -14,17 +14,18 @@ import (
"strconv" "strconv"
) )
type Producer struct { type Client struct {
streamer.Element streamer.Element
client *homekit.Client conn *homekit.Conn
exit chan error
medias []*streamer.Media medias []*streamer.Media
tracks []*streamer.Track tracks []*streamer.Track
sessions []*pkg.Session sessions []*pkg.Session
} }
func (c *Producer) GetMedias() []*streamer.Media { func (c *Client) GetMedias() []*streamer.Media {
if c.medias == nil { if c.medias == nil {
c.medias = c.getMedias() c.medias = c.getMedias()
} }
@@ -32,7 +33,7 @@ func (c *Producer) GetMedias() []*streamer.Media {
return c.medias return c.medias
} }
func (c *Producer) GetTrack(media *streamer.Media, codec *streamer.Codec) *streamer.Track { func (c *Client) GetTrack(media *streamer.Media, codec *streamer.Codec) *streamer.Track {
for _, track := range c.tracks { for _, track := range c.tracks {
if track.Codec == codec { if track.Codec == codec {
return track return track
@@ -44,13 +45,13 @@ func (c *Producer) GetTrack(media *streamer.Media, codec *streamer.Codec) *strea
return track return track
} }
func (c *Producer) Start() error { func (c *Client) Start() error {
if c.tracks == nil { if c.tracks == nil {
return errors.New("producer without tracks") return errors.New("producer without tracks")
} }
// get our server local IP-address // get our server local IP-address
host, _, err := net.SplitHostPort(c.client.LocalAddr()) host, _, err := net.SplitHostPort(c.conn.LocalAddr())
if err != nil { if err != nil {
return err return err
} }
@@ -66,7 +67,7 @@ func (c *Producer) Start() error {
hkSession.SetLocalEndpoint(host, uint16(port)) hkSession.SetLocalEndpoint(host, uint16(port))
// create client for processing camera accessory // create client for processing camera accessory
cam := camera.NewClient(c.client) cam := camera.NewClient(c.conn)
// try to start HomeKit stream // try to start HomeKit stream
if err = cam.StartStream2(hkSession); err != nil { if err = cam.StartStream2(hkSession); err != nil {
panic(err) // TODO: fixme panic(err) // TODO: fixme
@@ -103,11 +104,11 @@ func (c *Producer) Start() error {
c.sessions = []*pkg.Session{vs, as} c.sessions = []*pkg.Session{vs, as}
return nil return <-c.exit
} }
func (c *Producer) Stop() error { func (c *Client) Stop() error {
err := c.client.Close() err := c.conn.Close()
for _, session := range c.sessions { for _, session := range c.sessions {
srtp.RemoveSession(session) srtp.RemoveSession(session)
@@ -116,10 +117,10 @@ func (c *Producer) Stop() error {
return err return err
} }
func (c *Producer) getMedias() []*streamer.Media { func (c *Client) getMedias() []*streamer.Media {
var medias []*streamer.Media var medias []*streamer.Media
accs, err := c.client.GetAccessories() accs, err := c.conn.GetAccessories()
acc := accs[0] acc := accs[0]
if err != nil { if err != nil {
panic(err) panic(err)
cmd/homekit/homekit.go
+5 -11
View File
@@ -20,20 +20,14 @@ func Init() {
var log zerolog.Logger var log zerolog.Logger
func streamHandler(url string) (streamer.Producer, error) { func streamHandler(url string) (streamer.Producer, error) {
client, err := homekit.NewClient(url) conn, err := homekit.Dial(url)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err = client.Dial(); err != nil { exit := make(chan error)
return nil, err
}
// start gorutine for reading responses from camera
go func() { go func() {
if err = client.Handle(); err != nil { //start goroutine for reading responses from camera
log.Warn().Err(err).Msg("[homekit] client") exit <- conn.Handle()
}
}() }()
return &Client{conn: conn, exit: exit}, nil
return &Producer{client: client}, nil
} }
pkg/homekit/camera/client.go
+2 -2
View File
@@ -8,10 +8,10 @@ import (
) )
type Client struct { type Client struct {
client *homekit.Client client *homekit.Conn
} }
func NewClient(client *homekit.Client) *Client { func NewClient(client *homekit.Conn) *Client {
return &Client{client: client} return &Client{client: client}
} }
pkg/homekit/client.go → pkg/homekit/conn.go
+45 -22
View File
@@ -21,10 +21,11 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
"time"
) )
// Client for HomeKit. DevicePublic can be null. // Conn for HomeKit. DevicePublic can be null.
type Client struct { type Conn struct {
streamer.Element streamer.Element
DeviceAddress string // including port DeviceAddress string // including port
@@ -41,14 +42,14 @@ type Client struct {
httpResponse chan *bufio.Reader httpResponse chan *bufio.Reader
} }
func NewClient(rawURL string) (*Client, error) { func Dial(rawURL string) (*Conn, error) {
u, err := url.Parse(rawURL) u, err := url.Parse(rawURL)
if err != nil { if err != nil {
return nil, err return nil, err
} }
query := u.Query() query := u.Query()
c := &Client{ c := &Conn{
DeviceAddress: u.Host, DeviceAddress: u.Host,
DeviceID: query.Get("device_id"), DeviceID: query.Get("device_id"),
DevicePublic: DecodeKey(query.Get("device_public")), DevicePublic: DecodeKey(query.Get("device_public")),
@@ -56,16 +57,38 @@ func NewClient(rawURL string) (*Client, error) {
ClientPrivate: DecodeKey(query.Get("client_private")), ClientPrivate: DecodeKey(query.Get("client_private")),
} }
if err = c.Dial(); err != nil {
return nil, err
}
return c, nil return c, nil
} }
func Pair(deviceID, pin string) (*Client, error) { //func NewConn(rawURL string) (*Conn, error) {
// u, err := url.Parse(rawURL)
// if err != nil {
// return nil, err
// }
//
// query := u.Query()
// c := &Conn{
// DeviceAddress: u.Host,
// DeviceID: query.Get("device_id"),
// DevicePublic: DecodeKey(query.Get("device_public")),
// ClientID: query.Get("client_id"),
// ClientPrivate: DecodeKey(query.Get("client_private")),
// }
//
// return c, nil
//}
func Pair(deviceID, pin string) (*Conn, error) {
entry := mdns.GetEntry(deviceID) entry := mdns.GetEntry(deviceID)
if entry == nil { if entry == nil {
return nil, errors.New("can't find device via mDNS") return nil, errors.New("can't find device via mDNS")
} }
c := &Client{ c := &Conn{
DeviceAddress: fmt.Sprintf("%s:%d", entry.AddrV4.String(), entry.Port), DeviceAddress: fmt.Sprintf("%s:%d", entry.AddrV4.String(), entry.Port),
DeviceID: deviceID, DeviceID: deviceID,
ClientID: GenerateUUID(), ClientID: GenerateUUID(),
@@ -85,32 +108,32 @@ func Pair(deviceID, pin string) (*Client, error) {
return c, c.Pair(mfi, pin) return c, c.Pair(mfi, pin)
} }
func (c *Client) ClientPublic() []byte { func (c *Conn) ClientPublic() []byte {
return c.ClientPrivate[32:] return c.ClientPrivate[32:]
} }
func (c *Client) URL() string { func (c *Conn) URL() string {
return fmt.Sprintf( return fmt.Sprintf(
"homekit://%s?device_id=%s&device_public=%16x&client_id=%s&client_private=%32x", "homekit://%s?device_id=%s&device_public=%16x&client_id=%s&client_private=%32x",
c.DeviceAddress, c.DeviceID, c.DevicePublic, c.ClientID, c.ClientPrivate, c.DeviceAddress, c.DeviceID, c.DevicePublic, c.ClientID, c.ClientPrivate,
) )
} }
func (c *Client) DialAndServe() error { func (c *Conn) DialAndServe() error {
if err := c.Dial(); err != nil { if err := c.Dial(); err != nil {
return err return err
} }
return c.Handle() return c.Handle()
} }
func (c *Client) Dial() error { func (c *Conn) Dial() error {
// update device host before dial // update device host before dial
if host := mdns.GetAddress(c.DeviceID); host != "" { if host := mdns.GetAddress(c.DeviceID); host != "" {
c.DeviceAddress = host c.DeviceAddress = host
} }
var err error var err error
c.conn, err = net.Dial("tcp", c.DeviceAddress) c.conn, err = net.DialTimeout("tcp", c.DeviceAddress, time.Second*5)
if err != nil { if err != nil {
return err return err
} }
@@ -254,7 +277,7 @@ func (c *Client) Dial() error {
} }
// https://github.com/apple/HomeKitADK/blob/master/HAP/HAPPairingPairSetup.c // https://github.com/apple/HomeKitADK/blob/master/HAP/HAPPairingPairSetup.c
func (c *Client) Pair(mfi bool, pin string) (err error) { func (c *Conn) Pair(mfi bool, pin string) (err error) {
pin = strings.ReplaceAll(pin, "-", "") pin = strings.ReplaceAll(pin, "-", "")
if len(pin) != 8 { if len(pin) != 8 {
return fmt.Errorf("wrong PIN format: %s", pin) return fmt.Errorf("wrong PIN format: %s", pin)
@@ -489,7 +512,7 @@ func (c *Client) Pair(mfi bool, pin string) (err error) {
return nil return nil
} }
func (c *Client) Close() error { func (c *Conn) Close() error {
if c.conn == nil { if c.conn == nil {
return nil return nil
} }
@@ -498,7 +521,7 @@ func (c *Client) Close() error {
return conn.Close() return conn.Close()
} }
func (c *Client) GetAccessories() ([]*Accessory, error) { func (c *Conn) GetAccessories() ([]*Accessory, error) {
res, err := c.Get("/accessories") res, err := c.Get("/accessories")
if err != nil { if err != nil {
return nil, err return nil, err
@@ -525,7 +548,7 @@ func (c *Client) GetAccessories() ([]*Accessory, error) {
return p.Accessories, nil return p.Accessories, nil
} }
func (c *Client) GetCharacters(query string) ([]*Character, error) { func (c *Conn) GetCharacters(query string) ([]*Character, error) {
res, err := c.Get("/characteristics?id=" + query) res, err := c.Get("/characteristics?id=" + query)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -543,7 +566,7 @@ func (c *Client) GetCharacters(query string) ([]*Character, error) {
return ch.Characters, nil return ch.Characters, nil
} }
func (c *Client) GetCharacter(char *Character) error { func (c *Conn) GetCharacter(char *Character) error {
query := fmt.Sprintf("%d.%d", char.AID, char.IID) query := fmt.Sprintf("%d.%d", char.AID, char.IID)
chars, err := c.GetCharacters(query) chars, err := c.GetCharacters(query)
if err != nil { if err != nil {
@@ -553,7 +576,7 @@ func (c *Client) GetCharacter(char *Character) error {
return nil return nil
} }
func (c *Client) PutCharacters(characters ...*Character) (err error) { func (c *Conn) PutCharacters(characters ...*Character) (err error) {
for i, char := range characters { for i, char := range characters {
if char.Event != nil { if char.Event != nil {
char = &Character{AID: char.AID, IID: char.IID, Event: char.Event} char = &Character{AID: char.AID, IID: char.IID, Event: char.Event}
@@ -579,7 +602,7 @@ func (c *Client) PutCharacters(characters ...*Character) (err error) {
return return
} }
func (c *Client) GetImage(width, height int) ([]byte, error) { func (c *Conn) GetImage(width, height int) ([]byte, error) {
res, err := c.Post( res, err := c.Post(
"/resource", []byte(fmt.Sprintf( "/resource", []byte(fmt.Sprintf(
`{"image-width":%d,"image-height":%d,"resource-type":"image","reason":0}`, `{"image-width":%d,"image-height":%d,"resource-type":"image","reason":0}`,
@@ -609,7 +632,7 @@ func (c *Client) GetImage(width, height int) ([]byte, error) {
// return nil // return nil
//} //}
func (c *Client) ListPairings() error { func (c *Conn) ListPairings() error {
pReq := struct { pReq := struct {
Method byte `tlv8:"0"` Method byte `tlv8:"0"`
State byte `tlv8:"6"` State byte `tlv8:"6"`
@@ -642,7 +665,7 @@ func (c *Client) ListPairings() error {
return nil return nil
} }
func (c *Client) PairingsAdd(clientID string, clientPublic []byte, admin bool) error { func (c *Conn) PairingsAdd(clientID string, clientPublic []byte, admin bool) error {
pReq := struct { pReq := struct {
Method byte `tlv8:"0"` Method byte `tlv8:"0"`
Identifier string `tlv8:"1"` Identifier string `tlv8:"1"`
@@ -682,7 +705,7 @@ func (c *Client) PairingsAdd(clientID string, clientPublic []byte, admin bool) e
return nil return nil
} }
func (c *Client) DeletePairing(id string) error { func (c *Conn) DeletePairing(id string) error {
reqM1 := struct { reqM1 := struct {
State byte `tlv8:"6"` State byte `tlv8:"6"`
Method byte `tlv8:"0"` Method byte `tlv8:"0"`
@@ -716,7 +739,7 @@ func (c *Client) DeletePairing(id string) error {
return nil return nil
} }
func (c *Client) LocalAddr() string { func (c *Conn) LocalAddr() string {
return c.conn.LocalAddr().String() return c.conn.LocalAddr().String()
} }
pkg/homekit/http.go
+6 -6
View File
@@ -23,7 +23,7 @@ const (
UriResource = "/resource" UriResource = "/resource"
) )
func (c *Client) Write(p []byte) (r io.Reader, err error) { func (c *Conn) Write(p []byte) (r io.Reader, err error) {
if c.secure == nil { if c.secure == nil {
if _, err = c.conn.Write(p); err == nil { if _, err = c.conn.Write(p); err == nil {
r = bufio.NewReader(c.conn) r = bufio.NewReader(c.conn)
@@ -36,7 +36,7 @@ func (c *Client) Write(p []byte) (r io.Reader, err error) {
return return
} }
func (c *Client) Do(req *http.Request) (*http.Response, error) { func (c *Conn) Do(req *http.Request) (*http.Response, error) {
if c.secure == nil { if c.secure == nil {
// insecure requests // insecure requests
if err := req.Write(c.conn); err != nil { if err := req.Write(c.conn); err != nil {
@@ -56,7 +56,7 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
return http.ReadResponse(buf, req) return http.ReadResponse(buf, req)
} }
func (c *Client) Get(uri string) (*http.Response, error) { func (c *Conn) Get(uri string) (*http.Response, error) {
req, err := http.NewRequest( req, err := http.NewRequest(
"GET", "http://"+c.DeviceAddress+uri, nil, "GET", "http://"+c.DeviceAddress+uri, nil,
) )
@@ -66,7 +66,7 @@ func (c *Client) Get(uri string) (*http.Response, error) {
return c.Do(req) return c.Do(req)
} }
func (c *Client) Post(uri string, data []byte) (*http.Response, error) { func (c *Conn) Post(uri string, data []byte) (*http.Response, error) {
req, err := http.NewRequest( req, err := http.NewRequest(
"POST", "http://"+c.DeviceAddress+uri, "POST", "http://"+c.DeviceAddress+uri,
bytes.NewReader(data), bytes.NewReader(data),
@@ -85,7 +85,7 @@ func (c *Client) Post(uri string, data []byte) (*http.Response, error) {
return c.Do(req) return c.Do(req)
} }
func (c *Client) Put(uri string, data []byte) (*http.Response, error) { func (c *Conn) Put(uri string, data []byte) (*http.Response, error) {
req, err := http.NewRequest( req, err := http.NewRequest(
"PUT", "http://"+c.DeviceAddress+uri, "PUT", "http://"+c.DeviceAddress+uri,
bytes.NewReader(data), bytes.NewReader(data),
@@ -102,7 +102,7 @@ func (c *Client) Put(uri string, data []byte) (*http.Response, error) {
return c.Do(req) return c.Do(req)
} }
func (c *Client) Handle() (err error) { func (c *Conn) Handle() (err error) {
defer func() { defer func() {
if c.conn == nil { if c.conn == nil {
err = nil err = nil