Merge branch 'main' into remove_js_util

Author: cloudwebrtc

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 --------------------------------------------
 
+[1.4.10] - 2024-012-16
+
+* fix compiler errors.
+
 [1.4.9] - 2024-09-04
 
 * bump web version to 1.0.0.

analysis_options.yaml

@@ -39,8 +39,4 @@ analyzer:
     todo: ignore
     # allow self-reference to deprecated members (we do this because otherwise we have
     # to annotate every member in every test, assert, etc, when we deprecate something)
-    deprecated_member_use_from_same_package: ignore
-    # Ignore analyzer hints for updating pubspecs when using Future or
-    # Stream and not importing dart:async
-    # Please see https://github.com/flutter/flutter/pull/24528 for details.
-    sdk_version_async_exported_from_core: ignore
+    deprecated_member_use_from_same_package: ignore

lib/src/e2ee.worker/e2ee.cryptor.dart

@@ -6,7 +6,6 @@ import 'dart:typed_data';
 
 import 'package:js/js.dart';
 import 'package:web/web.dart' as web;
-
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';
 import 'e2ee.sfi_guard.dart';

lib/src/e2ee.worker/e2ee.worker.dart

@@ -6,7 +6,6 @@ import 'dart:typed_data';
 import 'package:collection/collection.dart';
 import 'package:logging/logging.dart';
 import 'package:web/web.dart' as web;
-
 import 'e2ee.cryptor.dart';
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';

lib/src/media_stream_track_impl.dart

@@ -9,18 +9,21 @@ import 'utils.dart';
 
 class MediaStreamTrackWeb extends MediaStreamTrack {
   MediaStreamTrackWeb(this.jsTrack) {
-    if (onEnded != null) {
-      void Function(JSAny) onEndedCallback = (event) => onEnded?.call();
-      jsTrack.addEventListener('ended', onEndedCallback.toJS);
-    }
-    if (onMute != null) {
-      void Function(JSAny) onMuteCallback = (event) => onMute?.call();
-      jsTrack.addEventListener('mute', onMuteCallback.toJS);
-    }
-    if (onUnMute != null) {
-      void Function(JSAny) onUnmuteCallback = (event) => onUnMute?.call();
-      jsTrack.addEventListener('unmute', onUnmuteCallback.toJS);
-    }
+    jsTrack.addEventListener(
+        'ended',
+        (web.Event event) {
+          onEnded?.call();
+        }.toJS);
+    jsTrack.addEventListener(
+        'mute',
+        (web.Event event) {
+          onMute?.call();
+        }.toJS);
+    jsTrack.addEventListener(
+        'unmute',
+        (web.Event event) {
+          onUnMute?.call();
+        }.toJS);
   }
 
   final web.MediaStreamTrack jsTrack;

lib/src/rtc_data_channel_impl.dart

@@ -8,33 +8,37 @@ class RTCDataChannelWeb extends RTCDataChannel {
   RTCDataChannelWeb(this._jsDc) {
     stateChangeStream = _stateChangeController.stream;
     messageStream = _messageController.stream;
-    final void Function(JSAny) onClose = (_) {
-      _state = RTCDataChannelState.RTCDataChannelClosed;
-      _stateChangeController.add(_state);
-      onDataChannelState?.call(_state);
-    };
-
-    final void Function(JSAny) onOpen = (_) {
-      _state = RTCDataChannelState.RTCDataChannelOpen;
-      _stateChangeController.add(_state);
-      onDataChannelState?.call(_state);
-    };
-
-    final void Function(web.MessageEvent event) onMessageCb =
-        (web.MessageEvent event) async {
-      var msg = await _parse(event.data);
-      _messageController.add(msg);
-      onMessage?.call(msg);
-    };
-
-    final void Function(JSAny) toLow = (_) {
-      onBufferedAmountLow?.call(bufferedAmount ?? 0);
-    };
-
-    _jsDc.addEventListener('close', onClose.toJS, false.toJS);
-    _jsDc.addEventListener('open', onOpen.toJS, false.toJS);
-    _jsDc.addEventListener('message', onMessageCb.toJS, false.toJS);
-    _jsDc.addEventListener('bufferedamountlow', toLow.toJS, false.toJS);
+    _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);
   }
 
   final web.RTCDataChannel _jsDc;

lib/src/rtc_peerconnection_impl.dart

@@ -23,9 +23,7 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
   RTCPeerConnectionWeb(this._peerConnectionId, this._jsPc) {
     final void Function(web.RTCDataChannelEvent) toDataChannel =
         (web.RTCDataChannelEvent dataChannelEvent) {
-      if (dataChannelEvent.channel != null) {
-        onDataChannel?.call(RTCDataChannelWeb(dataChannelEvent.channel!));
-      }
+      onDataChannel?.call(RTCDataChannelWeb(dataChannelEvent.channel));
     };
 
     final void Function(web.RTCPeerConnectionIceEvent) onIceCandidateCb =

lib/src/rtc_rtp_sender_impl.dart

@@ -5,7 +5,7 @@ import 'dart:js_interop_unsafe';
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 
-import 'package:dart_webrtc/src/media_stream_impl.dart';
+import 'media_stream_impl.dart';
 import 'media_stream_track_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';
 import 'rtc_rtp_parameters_impl.dart';

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.4.9
+version: 1.4.10
 homepage: https://github.com/flutter-webrtc/dart-webrtc
 
 environment:

web/main.dart

@@ -165,7 +165,7 @@ void loopBackTest() async {
       pc1FrameCryptors.add(fc);
     }
   });
-
+/*
   var transceivers = await pc1.getTransceivers();
   transceivers.forEach((transceiver) {
     print('transceiver: ${transceiver.sender.track!.kind!}');
@@ -181,7 +181,7 @@ void loopBackTest() async {
           .toList());
     }
   });
-
+*/
   await pc1.createDataChannel(
       'label', RTCDataChannelInit()..binaryType = 'binary');
   var offer = await pc1.createOffer();