Refactoring for HomeKit client

cmd/homekit/api.go

@@ -54,7 +54,7 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 			items = append(items, device)
 		}
 
-		_= json.NewEncoder(w).Encode(items)
+		_ = json.NewEncoder(w).Encode(items)
 
 	case "POST":
 		// TODO: post params...
@@ -62,10 +62,10 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 		id := r.URL.Query().Get("id")
 		pin := r.URL.Query().Get("pin")
 
-		client, err := homekit.Pair(id, pin)
+		conn, err := homekit.Pair(id, pin)
 		if err != nil {
 			// log error
-			log.Error().Err(err).Msg("[api.homekit] pair")
+			log.Error().Err(err).Caller().Send()
 			// response error
 			_, err = w.Write([]byte(err.Error()))
 			return
@@ -73,15 +73,15 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 
 		name := r.URL.Query().Get("name")
 		dict := store.GetDict("streams")
-		dict[name] = client.URL()
+		dict[name] = conn.URL()
 		if err = store.Set("streams", dict); err != nil {
 			// log error
-			log.Error().Err(err).Msg("[api.homekit] save to store")
+			log.Error().Err(err).Caller().Send()
 			// response error
 			_, err = w.Write([]byte(err.Error()))
 		}
 
-		streams.New(name, client.URL())
+		streams.New(name, conn.URL())
 
 	case "DELETE":
 		src := r.URL.Query().Get("src")
@@ -91,36 +91,32 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 				continue
 			}
 
-			client, err := homekit.NewClient(rawURL.(string))
+			conn, err := homekit.Dial(rawURL.(string))
 			if err != nil {
 				// log error
-				log.Error().Err(err).Msg("[api.homekit] new client")
+				log.Error().Err(err).Caller().Send()
 				// response error
 				_, err = w.Write([]byte(err.Error()))
 				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().Err(err).Msg("[api.homekit] client dial")
+				log.Error().Err(err).Caller().Send()
 				// response error
 				_, err = w.Write([]byte(err.Error()))
 				return
 			}
 
-			go client.Handle()
-
-			if err = client.ListPairings(); err != nil {
+			if err = conn.DeletePairing(conn.ClientID); err != nil {
 				// log error
-				log.Error().Err(err).Msg("[api.homekit] unpair")
-				// 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")
+				log.Error().Err(err).Caller().Send()
 				// response error
 				_, err = w.Write([]byte(err.Error()))
 			}

cmd/homekit/client.go

@@ -14,17 +14,18 @@ import (
 	"strconv"
 )
 
-type Producer struct {
+type Client struct {
 	streamer.Element
 
-	client *homekit.Client
+	conn   *homekit.Conn
+	exit   chan error
 	medias []*streamer.Media
 	tracks []*streamer.Track
 
 	sessions []*pkg.Session
 }
 
-func (c *Producer) GetMedias() []*streamer.Media {
+func (c *Client) GetMedias() []*streamer.Media {
 	if c.medias == nil {
 		c.medias = c.getMedias()
 	}
@@ -32,7 +33,7 @@ func (c *Producer) GetMedias() []*streamer.Media {
 	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 {
 		if track.Codec == codec {
 			return track
@@ -44,13 +45,13 @@ func (c *Producer) GetTrack(media *streamer.Media, codec *streamer.Codec) *strea
 	return track
 }
 
-func (c *Producer) Start() error {
+func (c *Client) Start() error {
 	if c.tracks == nil {
 		return errors.New("producer without tracks")
 	}
 
 	// get our server local IP-address
-	host, _, err := net.SplitHostPort(c.client.LocalAddr())
+	host, _, err := net.SplitHostPort(c.conn.LocalAddr())
 	if err != nil {
 		return err
 	}
@@ -66,7 +67,7 @@ func (c *Producer) Start() error {
 	hkSession.SetLocalEndpoint(host, uint16(port))
 
 	// create client for processing camera accessory
-	cam := camera.NewClient(c.client)
+	cam := camera.NewClient(c.conn)
 	// try to start HomeKit stream
 	if err = cam.StartStream2(hkSession); err != nil {
 		panic(err) // TODO: fixme
@@ -103,11 +104,11 @@ func (c *Producer) Start() error {
 
 	c.sessions = []*pkg.Session{vs, as}
 
-	return nil
+	return <-c.exit
 }
 
-func (c *Producer) Stop() error {
-	err := c.client.Close()
+func (c *Client) Stop() error {
+	err := c.conn.Close()
 
 	for _, session := range c.sessions {
 		srtp.RemoveSession(session)
@@ -116,10 +117,10 @@ func (c *Producer) Stop() error {
 	return err
 }
 
-func (c *Producer) getMedias() []*streamer.Media {
+func (c *Client) getMedias() []*streamer.Media {
 	var medias []*streamer.Media
 
-	accs, err := c.client.GetAccessories()
+	accs, err := c.conn.GetAccessories()
 	acc := accs[0]
 	if err != nil {
 		panic(err)

cmd/homekit/homekit.go

@@ -20,20 +20,14 @@ func Init() {
 var log zerolog.Logger
 
 func streamHandler(url string) (streamer.Producer, error) {
-	client, err := homekit.NewClient(url)
+	conn, err := homekit.Dial(url)
 	if err != nil {
 		return nil, err
 	}
-	if err = client.Dial(); err != nil {
-		return nil, err
-	}
-
-	// start gorutine for reading responses from camera
+	exit := make(chan error)
 	go func() {
-		if err = client.Handle(); err != nil {
-			log.Warn().Err(err).Msg("[homekit] client")
-		}
+		//start goroutine for reading responses from camera
+		exit <- conn.Handle()
 	}()
-
-	return &Producer{client: client}, nil
+	return &Client{conn: conn, exit: exit}, nil
 }