Add --timeout

Author: gavv

README.md

@@ -79,6 +79,7 @@ Usage of webrtc-cli:
       --answer                    enable answer mode
       --source string             pulseaudio source or input wav file
       --sink string               pulseaudio sink
+      --timeout duration          exit if can't connect during timeout
       --stun string               STUN server URL (default "stun:stun.l.google.com:19302")
       --ports string              use specific UDP port range (e.g. "3100:3200")
       --override-ip string        override IP address in SDP offer/answer

main.go

@@ -37,6 +37,8 @@ func mainWithCode() int {
 	source := fset.String("source", "", "pulseaudio source or input wav file")
 	sink := fset.String("sink", "", "pulseaudio sink")
 
+	timeout := fset.Duration("timeout", 0, "exit if can't connect during timeout")
+
 	stun := fset.String("stun", "stun:stun.l.google.com:19302", "STUN server URL")
 	ports := fset.String("ports", "", "use specific UDP port range (e.g. \"3100:3200\")")
 	overrideIP := fset.String("override-ip", "", "override IP address in SDP offer/answer")
@@ -217,17 +219,39 @@ func mainWithCode() int {
 		}
 	}
 
-	if err := snd.SetPulseBufferSize(*pulseBuf); err != nil {
-		printErr(err)
-		return 1
-	}
-
 	sigCh := make(chan os.Signal, 2)
 	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
 
-	errCh := make(chan error, 4)
+	errCh := make(chan error, 32)
 	eofCh := make(chan struct{})
 
+	go func() {
+		var state rtc.State
+		var timeoutCh <-chan time.Time
+
+		for {
+			if state.IsConnected() {
+				timeoutCh = nil
+			} else if *timeout > 0 && timeoutCh == nil {
+				timeoutCh = time.After(*timeout)
+			}
+
+			select {
+			case state = <-peer.State():
+				printMsg("ICE connection state changed to " + state.String())
+
+			case <-timeoutCh:
+				errCh <- fmt.Errorf("can't connect to remote peer during %s", *timeout)
+				return
+			}
+		}
+	}()
+
+	if err := snd.SetPulseBufferSize(*pulseBuf); err != nil {
+		printErr(err)
+		return 1
+	}
+
 	if *source != "" {
 		printMsg("Starting recording...")
 
@@ -430,7 +454,7 @@ func printErr(err error) {
 }
 
 func printErrMsg(s string) {
-	printMsg("Error " + s)
+	printMsg("Error: " + s)
 }
 
 func printMsg(s string) {

src/rtc/const.go src/rtc/opus.gosrc/rtc/const.go renamed to src/rtc/opus.go

@@ -13,6 +13,16 @@ import (
 	"gopkg.in/gavv/opus.v2"
 )
 
+type State string
+
+func (s State) String() string {
+	return string(s)
+}
+
+func (s State) IsConnected() bool {
+	return s == State(webrtc.ICEConnectionStateConnected.String())
+}
+
 type Mode int
 
 const (
@@ -62,6 +72,7 @@ type Peer struct {
 	simulateLossPerc int
 
 	remoteTrackCh chan struct{}
+	connCh        chan State
 	closingCh     chan struct{}
 	closedCh      chan struct{}
 }
@@ -71,6 +82,7 @@ func NewPeer(params Params) (*Peer, error) {
 		channels:         params.Channels,
 		simulateLossPerc: params.SimulateLossPercent,
 		remoteTrackCh:    make(chan struct{}),
+		connCh:           make(chan State, 128),
 		closingCh:        make(chan struct{}),
 		closedCh:         make(chan struct{}),
 	}
@@ -173,10 +185,17 @@ func NewPeer(params Params) (*Peer, error) {
 
 	p.conn.OnICEConnectionStateChange(
 		func(connState webrtc.ICEConnectionState) {
-			fmt.Fprintf(os.Stderr, "ICE connection state changed to %s\n",
-				connState.String())
+			select {
+			case p.connCh <- State(connState.String()):
+			default:
+				select {
+				case p.connCh <- State(connState.String()):
+				case <-p.closingCh:
+				}
+			}
 
 			if connState == webrtc.ICEConnectionStateClosed {
+				close(p.connCh)
 				close(p.closedCh)
 			}
 		})
@@ -222,13 +241,19 @@ func NewPeer(params Params) (*Peer, error) {
 
 func (p *Peer) Close() error {
 	close(p.closingCh)
+
 	if err := p.conn.Close(); err != nil {
 		return err
 	}
+
 	<-p.closedCh
 	return nil
 }
 
+func (p *Peer) State() <-chan State {
+	return p.connCh
+}
+
 func (p *Peer) GetOffer() string {
 	if p.offer == nil {
 		return ""