From 5b16e89acde01de45fed7febaff186659b3dbff9 Mon Sep 17 00:00:00 2001
From: Marks Polakovs <github@markspolakovs.me>
Date: Mon, 13 Apr 2020 00:07:05 +0200
Subject: [PATCH] re-work iceconnectionstate->ConnectionStateEnum mapping

---
 src/broadcast/rtc_streamer.ts | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/broadcast/rtc_streamer.ts b/src/broadcast/rtc_streamer.ts
index 2f4e609..f337a28 100644
--- a/src/broadcast/rtc_streamer.ts
+++ b/src/broadcast/rtc_streamer.ts
@@ -35,8 +35,8 @@ export class WebRTCStreamer extends Streamer {
 				}
 			]
 		});
-		this.pc.onconnectionstatechange = e => {
-			console.log("Connection state change: " + this.pc.connectionState);
+		this.pc.oniceconnectionstatechange = e => {
+			console.log("ICE Connection state change: " + this.pc.iceConnectionState);
 			this.onStateChange(this.mapStateToConnectionState());
 		};
 		console.log("Stream tracks", stream.getAudioTracks());
@@ -143,30 +143,32 @@ export class WebRTCStreamer extends Streamer {
 	}
 
 	mapStateToConnectionState(): ConnectionStateEnum {
-		switch (this.pc.connectionState) {
+		switch (this.pc.iceConnectionState) {
 			case "connected":
+			case "completed":
+			case "disconnected": // using this here because disconnected may happen intermittently
 				return "CONNECTED";
-			case "connecting":
-				return "CONNECTING";
-			case "disconnected":
-				return "CONNECTION_LOST";
-			case "failed":
-				return "CONNECTION_LOST";
-			default:
+			case "new":
 				if (this.ws) {
 					switch (this.ws.readyState) {
+						case 0:
+							return "NOT_CONNECTED";
 						case 1:
 							return "CONNECTING";
 						case 2:
 						case 3:
 							return "CONNECTION_LOST";
-						case 0:
-							return "NOT_CONNECTED";
-						default:
-							throw new Error();
+						default: throw new Error();
 					}
+				} else {
+					return "NOT_CONNECTED";
 				}
-				return "NOT_CONNECTED";
+			case "checking":
+				return "CONNECTING";
+			case "failed":
+				return "CONNECTION_LOST";
+			case "closed":
+				return "NOT_CONNECTED"
 		}
 	}
 }