Merge pull request #17 from flutter-webrtc/fix/connection-state-for-firefox

fix: Convert iceconnectionstate to connectionstate for Firefox.

Author: cloudwebrtc

lib/src/rtc_peerconnection_impl.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:html' as html;
 import 'dart:js' as js;
 import 'dart:js_util' as jsutil;
+
+import 'package:platform_detect/platform_detect.dart';
 import 'package:webrtc_interface/webrtc_interface.dart';
 
 import 'media_stream_impl.dart';
@@ -72,6 +74,37 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
       _iceConnectionState =
           iceConnectionStateForString(_jsPc.iceConnectionState);
       onIceConnectionState?.call(_iceConnectionState!);
+
+      if (browser.isFirefox) {
+        switch (_iceConnectionState!) {
+          case RTCIceConnectionState.RTCIceConnectionStateNew:
+            _connectionState = RTCPeerConnectionState.RTCPeerConnectionStateNew;
+            break;
+          case RTCIceConnectionState.RTCIceConnectionStateChecking:
+            _connectionState =
+                RTCPeerConnectionState.RTCPeerConnectionStateConnecting;
+            break;
+          case RTCIceConnectionState.RTCIceConnectionStateConnected:
+            _connectionState =
+                RTCPeerConnectionState.RTCPeerConnectionStateConnected;
+            break;
+          case RTCIceConnectionState.RTCIceConnectionStateFailed:
+            _connectionState =
+                RTCPeerConnectionState.RTCPeerConnectionStateFailed;
+            break;
+          case RTCIceConnectionState.RTCIceConnectionStateDisconnected:
+            _connectionState =
+                RTCPeerConnectionState.RTCPeerConnectionStateDisconnected;
+            break;
+          case RTCIceConnectionState.RTCIceConnectionStateClosed:
+            _connectionState =
+                RTCPeerConnectionState.RTCPeerConnectionStateClosed;
+            break;
+          default:
+            break;
+        }
+        onConnectionState?.call(_connectionState!);
+      }
     });
 
     jsutil.setProperty(_jsPc, 'onicegatheringstatechange', js.allowInterop((_) {
@@ -94,10 +127,12 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
       onSignalingState?.call(_signalingState!);
     });
 
-    _jsPc.onConnectionStateChange.listen((_) {
-      _connectionState = peerConnectionStateForString(_jsPc.connectionState);
-      onConnectionState?.call(_connectionState!);
-    });
+    if (!browser.isFirefox) {
+      _jsPc.onConnectionStateChange.listen((_) {
+        _connectionState = peerConnectionStateForString(_jsPc.connectionState);
+        onConnectionState?.call(_connectionState!);
+      });
+    }
 
     _jsPc.onNegotiationNeeded.listen((_) {
       onRenegotiationNeeded?.call();

pubspec.yaml

@@ -7,6 +7,7 @@ environment:
   sdk: '>=2.13.0 <3.0.0'
 
 dependencies:
+  platform_detect: ^2.0.7
   webrtc_interface: ^1.0.10
 
 dev_dependencies:

web/main.dart

@@ -25,8 +25,29 @@ void loopBackTest() async {
   var localVideo = RTCVideoElement();
   local!.append(localVideo.htmlElement);
 
-  //var pc = await createPeerConnection({});
-  //pc.onAddStream = (MediaStream stream) {};
+  var remote = html.document.querySelector('#remote');
+  var remotelVideo = RTCVideoElement();
+  remote!.append(remotelVideo.htmlElement);
+
+  var pc2 = await createPeerConnection({});
+  pc2.onTrack = (event) {
+    if (event.track.kind == 'video') {
+      remotelVideo.srcObject = event.streams[0];
+    }
+  };
+  pc2.onConnectionState = (state) {
+    print('connectionState $state');
+  };
+
+  pc2.onIceConnectionState = (state) {
+    print('iceConnectionState $state');
+  };
+
+  var pc1 = await createPeerConnection({});
+
+  pc1.onIceCandidate = (candidate) => pc2.addCandidate(candidate);
+  pc2.onIceCandidate = (candidate) => pc1.addCandidate(candidate);
+
   var stream =
       await navigator.mediaDevices.getUserMedia({'audio': true, 'video': true});
   /*.getUserMedia(MediaStreamConstraints(audio: true, video: true))*/
@@ -56,12 +77,26 @@ void loopBackTest() async {
     }
   }
 
-  /*
-  stream.oninactive = (Event event) {
-    print('oninactive: stream.id => ${event.target.id}');
-    localVideo.srcObject = null;
-  };
-  */
-  //await pc.addStream(stream);
+  stream.getTracks().forEach((track) async {
+    await pc1.addTrack(track, stream);
+  });
+
+  var offer = await pc1.createOffer();
+
+  await pc2.addTransceiver(
+      kind: RTCRtpMediaType.RTCRtpMediaTypeAudio,
+      init: RTCRtpTransceiverInit(direction: TransceiverDirection.RecvOnly));
+  await pc2.addTransceiver(
+      kind: RTCRtpMediaType.RTCRtpMediaTypeVideo,
+      init: RTCRtpTransceiverInit(direction: TransceiverDirection.RecvOnly));
+
+  await pc1.setLocalDescription(offer);
+  await pc2.setRemoteDescription(offer);
+  var answer = await pc2.createAnswer({});
+  await pc2.setLocalDescription(answer);
+
+  await pc1.setRemoteDescription(answer);
+
+  localVideo.muted = true;
   localVideo.srcObject = stream;
 }