Merge branch 'flutter-webrtc:main' into fix-optional-track-settings

Author: holzgeist

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 --------------------------------------------
 
+[1.5.3] - 2025-03-24
+
+* add getBufferedAmount for DC.
+
+[1.5.2+hotfix.1] - 2025-02-23.
+
+* remove platform_detect.
+
+[1.5.2] - 2025-02-23.
+
+* fix stats for web.
+
 [1.5.1] - 2025-02-15
 
 * fix E2EE for firefox.

lib/src/rtc_data_channel_impl.dart

@@ -8,37 +8,29 @@ class RTCDataChannelWeb extends RTCDataChannel {
   RTCDataChannelWeb(this._jsDc) {
     stateChangeStream = _stateChangeController.stream;
     messageStream = _messageController.stream;
-    _jsDc.addEventListener(
-        'close',
-        (web.Event _) {
-          _state = RTCDataChannelState.RTCDataChannelClosed;
-          _stateChangeController.add(_state);
-          onDataChannelState?.call(_state);
-        }.toJS,
-        false.toJS);
-    _jsDc.addEventListener(
-        'open',
-        (web.Event _) {
-          _state = RTCDataChannelState.RTCDataChannelOpen;
-          _stateChangeController.add(_state);
-          onDataChannelState?.call(_state);
-        }.toJS,
-        false.toJS);
-    _jsDc.addEventListener(
-        'message',
-        (web.MessageEvent event) {
-          _parse(event.data).then((msg) {
-            _messageController.add(msg);
-            onMessage?.call(msg);
-          });
-        }.toJS,
-        false.toJS);
-    _jsDc.addEventListener(
-        'bufferedamountlow',
-        (web.Event _) {
-          onBufferedAmountLow?.call(bufferedAmount ?? 0);
-        }.toJS,
-        false.toJS);
+
+    _jsDc.onclose = (web.Event _) {
+      _state = RTCDataChannelState.RTCDataChannelClosed;
+      _stateChangeController.add(_state);
+      onDataChannelState?.call(_state);
+    }.toJS;
+
+    _jsDc.onopen = (web.Event _) {
+      _state = RTCDataChannelState.RTCDataChannelOpen;
+      _stateChangeController.add(_state);
+      onDataChannelState?.call(_state);
+    }.toJS;
+
+    _jsDc.onmessage = (web.MessageEvent event) {
+      _parse(event.data.dartify()).then((msg) {
+        _messageController.add(msg);
+        onMessage?.call(msg);
+      });
+    }.toJS;
+
+    _jsDc.onbufferedamountlow = (web.Event _) {
+      onBufferedAmountLow?.call(bufferedAmount ?? 0);
+    }.toJS;
   }
 
   final web.RTCDataChannel _jsDc;
@@ -56,6 +48,11 @@ class RTCDataChannelWeb extends RTCDataChannel {
   @override
   int? get bufferedAmount => _jsDc.bufferedAmount;
 
+  @override
+  Future<int> getBufferedAmount() async {
+    return _jsDc.bufferedAmount;
+  }
+
   @override
   set bufferedAmountLowThreshold(int? bufferedAmountLowThreshold) {
     _jsDc.bufferedAmountLowThreshold = bufferedAmountLowThreshold ?? 0;

lib/src/rtc_peerconnection_impl.dart

@@ -1,8 +1,9 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 
 import 'package:dart_webrtc/dart_webrtc.dart';
-import 'package:platform_detect/platform_detect.dart';
 import 'package:web/web.dart' as web;
 
 import 'media_stream_track_impl.dart';
@@ -42,7 +43,7 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
           iceConnectionStateForString(_jsPc.iceConnectionState);
       onIceConnectionState?.call(_iceConnectionState!);
 
-      if (browser.isFirefox) {
+      if (web.Device.isFirefox) {
         switch (_iceConnectionState!) {
           case RTCIceConnectionState.RTCIceConnectionStateNew:
             _connectionState = RTCPeerConnectionState.RTCPeerConnectionStateNew;
@@ -91,7 +92,7 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
 
     _jsPc.addEventListener('signalingstatechange', onSignalingStateChange.toJS);
 
-    if (!browser.isFirefox) {
+    if (!web.Device.isFirefox) {
       final void Function(JSAny) onConnectionStateChange = (_) {
         _connectionState = peerConnectionStateForString(_jsPc.connectionState);
         onConnectionState?.call(_connectionState!);
@@ -157,7 +158,7 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
   @override
   Future<RTCIceConnectionState?> getIceConnectionState() async {
     _iceConnectionState = iceConnectionStateForString(_jsPc.iceConnectionState);
-    if (browser.isFirefox) {
+    if (web.Device.isFirefox) {
       switch (_iceConnectionState!) {
         case RTCIceConnectionState.RTCIceConnectionStateNew:
           _connectionState = RTCPeerConnectionState.RTCPeerConnectionStateNew;
@@ -194,7 +195,8 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
 
   @override
   Future<RTCPeerConnectionState?> getConnectionState() async {
-    if (browser.isFirefox) {
+    /// platform is Firefox
+    if (web.Device.isFirefox) {
       await getIceConnectionState();
     } else {
       _connectionState = peerConnectionStateForString(_jsPc.connectionState);
@@ -312,7 +314,7 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
 
   @override
   Future<List<StatsReport>> getStats([MediaStreamTrack? track]) async {
-    var stats;
+    web.RTCStatsReport stats;
     if (track != null) {
       var jsTrack = (track as MediaStreamTrackWeb).jsTrack;
       stats = await _jsPc.getStats(jsTrack).toDart;
@@ -321,10 +323,20 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
     }
 
     var report = <StatsReport>[];
-    stats.forEach((key, value) {
-      report.add(
-          StatsReport(value['id'], value['type'], value['timestamp'], value));
-    });
+    stats.callMethodVarArgs('forEach'.toJS, [
+      (JSObject value, JSAny key) {
+        var map = value.dartify() as LinkedHashMap<Object?, Object?>;
+        var stats = <String, dynamic>{};
+        for (var entry in map.entries) {
+          stats[(entry.key as JSString).toDart] = entry.value;
+        }
+        report.add(StatsReport(
+            value.getProperty<JSString>('id'.toJS).toDart,
+            value.getProperty<JSString>('type'.toJS).toDart,
+            value.getProperty<JSNumber>('timestamp'.toJS).toDartDouble,
+            stats));
+      }.toJS,
+    ]);
     return report;
   }
 

lib/src/rtc_rtp_parameters_impl.dart

@@ -70,14 +70,17 @@ class RTCHeaderExtensionWeb {
 class RTCRtpEncodingWeb {
   static RTCRtpEncoding fromJsObject(web.RTCRtpEncodingParameters object) {
     return RTCRtpEncoding.fromMap({
-      'rid': object.rid,
+      'rid': object.getProperty<JSString?>('rid'.toJS)?.toDart,
       'active': object.active,
-      'maxBitrate': object.maxBitrate,
-      'maxFramerate': object.maxFramerate.toInt(),
+      'maxBitrate': object.getProperty<JSNumber?>('maxBitrate'.toJS)?.toDartInt,
+      'maxFramerate':
+          object.getProperty<JSNumber?>('maxFramerate'.toJS)?.toDartInt,
       'minBitrate': object.getProperty<JSNumber?>('minBitrate'.toJS)?.toDartInt,
       'numTemporalLayers':
           object.getProperty<JSNumber?>('numTemporalLayers'.toJS)?.toDartInt,
-      'scaleResolutionDownBy': object.scaleResolutionDownBy,
+      'scaleResolutionDownBy': object
+          .getProperty<JSNumber?>('scaleResolutionDownBy'.toJS)
+          ?.toDartDouble,
       'ssrc': object.getProperty<JSString?>('ssrc'.toJS)?.toDart
     });
   }

lib/src/rtc_rtp_receiver_impl.dart

@@ -1,4 +1,6 @@
+import 'dart:collection';
 import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
@@ -14,12 +16,22 @@ class RTCRtpReceiverWeb extends RTCRtpReceiver {
 
   @override
   Future<List<StatsReport>> getStats() async {
-    var stats = (await _jsRtpReceiver.getStats().toDart) as JSObject;
+    var stats = await _jsRtpReceiver.getStats().toDart;
     var report = <StatsReport>[];
-    (stats.dartify() as Map).forEach((key, value) {
-      report.add(
-          StatsReport(value['id'], value['type'], value['timestamp'], value));
-    });
+    stats.callMethodVarArgs('forEach'.toJS, [
+      (JSObject value, JSAny key) {
+        var map = value.dartify() as LinkedHashMap<Object?, Object?>;
+        var stats = <String, dynamic>{};
+        for (var entry in map.entries) {
+          stats[(entry.key as JSString).toDart] = entry.value;
+        }
+        report.add(StatsReport(
+            value.getProperty<JSString>('id'.toJS).toDart,
+            value.getProperty<JSString>('type'.toJS).toDart,
+            value.getProperty<JSNumber>('timestamp'.toJS).toDartDouble,
+            stats));
+      }.toJS,
+    ]);
     return report;
   }
 

lib/src/rtc_rtp_sender_impl.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 
@@ -85,10 +86,20 @@ class RTCRtpSenderWeb extends RTCRtpSender {
   Future<List<StatsReport>> getStats() async {
     var stats = await _jsRtpSender.getStats().toDart;
     var report = <StatsReport>[];
-    (stats.dartify() as Map<String, dynamic>).forEach((key, value) {
-      report.add(
-          StatsReport(value['id'], value['type'], value['timestamp'], value));
-    });
+    stats.callMethodVarArgs('forEach'.toJS, [
+      (JSObject value, JSAny key) {
+        var map = value.dartify() as LinkedHashMap<Object?, Object?>;
+        var stats = <String, dynamic>{};
+        for (var entry in map.entries) {
+          stats[(entry.key as JSString).toDart] = entry.value;
+        }
+        report.add(StatsReport(
+            value.getProperty<JSString>('id'.toJS).toDart,
+            value.getProperty<JSString>('type'.toJS).toDart,
+            value.getProperty<JSNumber>('timestamp'.toJS).toDartDouble,
+            stats));
+      }.toJS,
+    ]);
     return report;
   }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_webrtc
 description: Use the dart/js library to re-wrap the webrtc js interface of the browser, to adapted common browsers.
-version: 1.5.1
+version: 1.5.3
 homepage: https://github.com/flutter-webrtc/dart-webrtc
 
 environment:
@@ -11,10 +11,9 @@ dependencies:
   js: ">0.6.0 <0.8.0"
   logging: ^1.1.0
   meta: ^1.8.0
-  platform_detect: ^2.1.0
   synchronized: ^3.0.0+3
   web: ^1.0.0
-  webrtc_interface: ^1.2.1
+  webrtc_interface: ^1.2.2+hotfix.1
 
 dev_dependencies:
   build_runner: ^2.3.3

web/main.dart

@@ -254,4 +254,26 @@ void loopBackTest() async {
       key: Uint8List.fromList('testkey2'.codeUnits));
 
   */
+
+  Timer.periodic(Duration(seconds: 1), (timer) async {
+    var senders = await pc1.getSenders();
+    var receivers = await pc2.getReceivers();
+
+    print('senders: ${senders.length}');
+    print('receivers: ${receivers.length}');
+
+    senders.forEach((sender) {
+      sender.getStats().then((stats) {
+        print(
+            'sender stats: ${stats.map((e) => 'id: ${e.id}, type:  ${e.type}, timestamp: ${e.timestamp}, values: ${e.values.toString()} ')}');
+      });
+    });
+
+    receivers.forEach((receiver) {
+      receiver.getStats().then((stats) {
+        print(
+            'receiver stats: ${stats.map((e) => 'id: ${e.id}, type:  ${e.type}, timestamp: ${e.timestamp}, values: ${e.values.toString()} ')}');
+      });
+    });
+  });
 }