Send regular keep alive while call is active (#390)

Author: biglittlebigben

pkg/sip/analytics.go

@@ -145,3 +145,9 @@ func (s *CallState) Flush(ctx context.Context) {
 	}
 	s.flush(ctx)
 }
+
+func (s *CallState) ForceFlush(ctx context.Context) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.flush(ctx)
+}

pkg/sip/inbound.go

@@ -566,20 +566,27 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
 
 	c.started.Break()
 
-	// Wait for the caller to terminate the call.
-	select {
-	case <-ctx.Done():
-		c.closeWithHangup()
-		return nil
-	case <-c.lkRoom.Closed():
-		c.state.DeferUpdate(func(info *livekit.SIPCallInfo) {
-			info.DisconnectReason = livekit.DisconnectReason_CLIENT_INITIATED
-		})
-		c.close(false, callDropped, "removed")
-		return nil
-	case <-c.media.Timeout():
-		c.closeWithTimeout()
-		return psrpc.NewErrorf(psrpc.DeadlineExceeded, "media timeout")
+	ticker := time.NewTicker(10 * time.Minute)
+	defer ticker.Stop()
+	// Wait for the caller to terminate the call. Send regular keep alives
+	for {
+		select {
+		case <-ticker.C:
+			c.log.Debugw("sending keep-alive")
+			c.state.ForceFlush(ctx)
+		case <-ctx.Done():
+			c.closeWithHangup()
+			return nil
+		case <-c.lkRoom.Closed():
+			c.state.DeferUpdate(func(info *livekit.SIPCallInfo) {
+				info.DisconnectReason = livekit.DisconnectReason_CLIENT_INITIATED
+			})
+			c.close(false, callDropped, "removed")
+			return nil
+		case <-c.media.Timeout():
+			c.closeWithTimeout()
+			return psrpc.NewErrorf(psrpc.DeadlineExceeded, "media timeout")
+		}
 	}
 }
 

pkg/sip/outbound.go

@@ -205,17 +205,25 @@ func (c *outboundCall) Dial(ctx context.Context) error {
 func (c *outboundCall) WaitClose(ctx context.Context) error {
 	ctx = context.WithoutCancel(ctx)
 	defer c.ensureClosed(ctx)
-	select {
-	case <-c.Disconnected():
-		c.CloseWithReason(callDropped, "removed", livekit.DisconnectReason_CLIENT_INITIATED)
-		return nil
-	case <-c.media.Timeout():
-		c.closeWithTimeout()
-		err := psrpc.NewErrorf(psrpc.DeadlineExceeded, "media timeout")
-		c.setErrStatus(ctx, err)
-		return err
-	case <-c.Closed():
-		return nil
+
+	ticker := time.NewTicker(10 * time.Minute)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			c.log.Debugw("sending keep-alive")
+			c.state.ForceFlush(ctx)
+		case <-c.Disconnected():
+			c.CloseWithReason(callDropped, "removed", livekit.DisconnectReason_CLIENT_INITIATED)
+			return nil
+		case <-c.media.Timeout():
+			c.closeWithTimeout()
+			err := psrpc.NewErrorf(psrpc.DeadlineExceeded, "media timeout")
+			c.setErrStatus(ctx, err)
+			return err
+		case <-c.Closed():
+			return nil
+		}
 	}
 }