BIG core logic rewrite

pkg/isapi/client.go

@@ -2,7 +2,7 @@ package isapi
 
 import (
 	"errors"
-	"github.com/AlexxIT/go2rtc/pkg/streamer"
+	"github.com/AlexxIT/go2rtc/pkg/core"
 	"github.com/AlexxIT/go2rtc/pkg/tcp"
 	"io"
 	"net"
@@ -11,16 +11,15 @@ import (
 )
 
 type Client struct {
-	streamer.Element
-
-	url string
-
-	medias []*streamer.Media
-	tracks []*streamer.Track
+	core.Listener
 
+	url     string
 	channel string
 	conn    net.Conn
-	send    int
+
+	medias []*core.Media
+	sender *core.Sender
+	send   int
 }
 
 func NewClient(rawURL string) (*Client, error) {
@@ -60,22 +59,22 @@ func (c *Client) Dial() (err error) {
 
 	xml := string(b)
 
-	codec := streamer.Between(xml, `<audioCompressionType>`, `<`)
+	codec := core.Between(xml, `<audioCompressionType>`, `<`)
 	switch codec {
 	case "G.711ulaw":
-		codec = streamer.CodecPCMU
+		codec = core.CodecPCMU
 	case "G.711alaw":
-		codec = streamer.CodecPCMA
+		codec = core.CodecPCMA
 	default:
 		return nil
 	}
 
-	c.channel = streamer.Between(xml, `<id>`, `<`)
+	c.channel = core.Between(xml, `<id>`, `<`)
 
-	media := &streamer.Media{
-		Kind:      streamer.KindAudio,
-		Direction: streamer.DirectionRecvonly,
-		Codecs: []*streamer.Codec{
+	media := &core.Media{
+		Kind:      core.KindAudio,
+		Direction: core.DirectionSendonly,
+		Codecs: []*core.Codec{
 			{Name: codec, ClockRate: 8000},
 		},
 	}

pkg/isapi/consumer.go

@@ -1,18 +1,63 @@
 package isapi
 
 import (
-	"github.com/AlexxIT/go2rtc/pkg/streamer"
+	"encoding/json"
+	"github.com/AlexxIT/go2rtc/pkg/core"
 	"github.com/pion/rtp"
 )
 
-func (c *Client) AddTrack(media *streamer.Media, track *streamer.Track) *streamer.Track {
-	consCodec := media.MatchCodec(track.Codec)
-	consTrack := c.GetTrack(media, consCodec)
-	if consTrack == nil {
-		return nil
+func (c *Client) GetMedias() []*core.Media {
+	return c.medias
+}
+
+func (c *Client) GetTrack(media *core.Media, codec *core.Codec) (*core.Receiver, error) {
+	return nil, core.ErrCantGetTrack
+}
+
+func (c *Client) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiver) error {
+	if c.sender == nil {
+		c.sender = core.NewSender(media, track.Codec)
+		c.sender.Handler = func(packet *rtp.Packet) {
+			if c.conn == nil {
+				return
+			}
+			c.send += len(packet.Payload)
+			_, _ = c.conn.Write(packet.Payload)
+		}
 	}
 
-	return track.Bind(func(packet *rtp.Packet) error {
-		return consTrack.WriteRTP(packet)
-	})
+	c.sender.HandleRTP(track)
+	return nil
+}
+
+func (c *Client) Start() (err error) {
+	if err = c.Open(); err != nil {
+		return
+	}
+	return
+}
+
+func (c *Client) Stop() (err error) {
+	if c.sender != nil {
+		c.sender.Close()
+	}
+
+	if c.conn != nil {
+		_ = c.Close()
+		return c.conn.Close()
+	}
+
+	return nil
+}
+
+func (c *Client) MarshalJSON() ([]byte, error) {
+	info := &core.Info{
+		Type:   "ISAPI active consumer",
+		Medias: c.medias,
+		Send:   c.send,
+	}
+	if c.sender != nil {
+		info.Senders = []*core.Sender{c.sender}
+	}
+	return json.Marshal(info)
 }

pkg/isapi/producer.go

@@ -1,56 +0,0 @@
-package isapi
-
-import (
-	"encoding/json"
-	"github.com/AlexxIT/go2rtc/pkg/streamer"
-	"github.com/pion/rtp"
-)
-
-func (c *Client) GetMedias() []*streamer.Media {
-	return c.medias
-}
-
-func (c *Client) GetTrack(media *streamer.Media, codec *streamer.Codec) *streamer.Track {
-	for _, track := range c.tracks {
-		if track.Codec == codec {
-			return track
-		}
-	}
-
-	track := streamer.NewTrack(media, codec)
-	track = track.Bind(func(packet *rtp.Packet) (err error) {
-		if c.conn != nil {
-			c.send += len(packet.Payload)
-			_, err = c.conn.Write(packet.Payload)
-		}
-		return
-	})
-	c.tracks = append(c.tracks, track)
-
-	return track
-}
-
-func (c *Client) Start() (err error) {
-	if err = c.Open(); err != nil {
-		return
-	}
-	return
-}
-
-func (c *Client) Stop() (err error) {
-	if c.conn == nil {
-		return
-	}
-	_ = c.Close()
-	return c.conn.Close()
-}
-
-func (c *Client) MarshalJSON() ([]byte, error) {
-	info := &streamer.Info{
-		Type:   "ISAPI",
-		Medias: c.medias,
-		Tracks: c.tracks,
-		Send:   uint32(c.send),
-	}
-	return json.Marshal(info)
-}