Handle addCandidate correctly.

cloudwebrtc · cloudwebrtc · commit 21d07d5d0c32 · 2020-11-18T07:40:51.000+08:00
diff --git a/example/lib/src/data_channel_sample.dart b/example/lib/src/data_channel_sample.dart
@@ -37,13 +37,17 @@ class _DataChannelSampleState extends State<DataChannelSample> {
     print(state);
   }
 
-  void _onCandidate(RTCIceCandidate candidate) {
-    print('onCandidate: ' + candidate.candidate);
-    _peerConnection.addCandidate(candidate);
-    setState(() {
-      _sdp += '\n';
-      _sdp += candidate.candidate;
-    });
+  void _onCandidate(RTCIceCandidate candidate) async {
+    try {
+      print('onCandidate: ' + candidate.candidate);
+      await _peerConnection.addCandidate(candidate);
+      setState(() {
+        _sdp += '\n';
+        _sdp += candidate.candidate;
+      });
+    } catch (e) {
+      print('_onCandidate, addCandidate failed => ${e.toString()}');
+    }
   }
 
   void _onRenegotiationNeeded() {
@@ -125,8 +129,8 @@ class _DataChannelSampleState extends State<DataChannelSample> {
 
       _sdp = description.sdp;
       //change for loopback.
-      //description.type = 'answer';
-      //_peerConnection.setRemoteDescription(description);
+      description.type = 'answer';
+      await _peerConnection.setRemoteDescription(description);
     } catch (e) {
       print(e.toString());
     }
diff --git a/lib/src/web/rtc_peerconnection_impl.dart b/lib/src/web/rtc_peerconnection_impl.dart
@@ -20,6 +20,10 @@ import 'media_stream_track_impl.dart';
 import 'rtc_data_channel_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';
 
+extension RtcPeerConnection$Ext on html.RtcPeerConnection {
+  js.JsObject get jsObject => js.JsObject.fromBrowserObject(this);
+}
+
 /*
  *  PeerConnection
  */
@@ -194,8 +198,23 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
 
   @override
   Future<void> addCandidate(RTCIceCandidate candidate) async {
-    await jsutil.promiseToFuture(
-        jsutil.callMethod(_jsPc, 'addIceCandidate', [_iceToJs(candidate)]));
+    try {
+      Completer completer = Completer<void>();
+      var success = js.allowInterop(() {
+        print('addCandidate success');
+        completer.complete();
+      });
+      var failure = js.allowInterop((e) {
+        print('addCandidate falied => ${e.toString()}');
+        completer.completeError(e);
+      });
+      jsutil.callMethod(
+          _jsPc, 'addIceCandidate', [_iceToJs(candidate), success, failure]);
+
+      return completer.future;
+    } catch (e) {
+      print(e.toString());
+    }
   }
 
   @override
