cleanup analysis warnings

timu-jesse-ezell · timu-jesse-ezell · commit 6fac42eeeb34 · 2024-09-20T20:13:13.000-07:00
diff --git a/lib/src/e2ee.worker/e2ee.cryptor.dart b/lib/src/e2ee.worker/e2ee.cryptor.dart
@@ -9,7 +9,6 @@ import 'dart:typed_data';
 import 'package:dart_webrtc/src/e2ee.worker/crypto.dart';
 import 'package:web/web.dart' as web;
 
-import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';
 import 'e2ee.sfi_guard.dart';
diff --git a/lib/src/e2ee.worker/e2ee.keyhandler.dart b/lib/src/e2ee.worker/e2ee.keyhandler.dart
@@ -1,11 +1,10 @@
 import 'dart:async';
+import 'dart:js_interop';
+import 'dart:js_interop_unsafe';
 import 'dart:typed_data';
 
-import 'package:dart_webrtc/src/frame_cryptor_impl.dart';
 import 'package:web/web.dart' as web;
-import 'dart:js_interop';
-import 'dart:js_interop_unsafe';
-import 'crypto.dart' as crypto;
+
 import 'e2ee.logger.dart';
 import 'e2ee.utils.dart';
 
@@ -235,9 +234,9 @@ class ParticipantKeyHandler {
     var algorithmOptions = getAlgoOptions('PBKDF2', salt);
 
     // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/deriveBits
-    var newKey = (await web.window.crypto.subtle
+    var newKey = await web.window.crypto.subtle
         .deriveBits(algorithmOptions.jsify(), material, 256)
-        .toDart) as JSArrayBuffer;
+        .toDart;
     return newKey.toDart.asUint8List();
   }
 }
diff --git a/lib/src/e2ee.worker/e2ee.utils.dart b/lib/src/e2ee.worker/e2ee.utils.dart
@@ -1,13 +1,9 @@
 import 'dart:js' as js;
-import 'dart:typed_data';
 import 'dart:js_interop';
-
-import 'package:dart_webrtc/src/frame_cryptor_impl.dart';
+import 'dart:typed_data';
 
 import 'package:web/web.dart' as web;
 
-import 'crypto.dart' as crypto;
-
 bool isE2EESupported() {
   return isInsertableStreamSupported() || isScriptTransformSupported();
 }
diff --git a/lib/src/e2ee.worker/e2ee.worker.dart b/lib/src/e2ee.worker/e2ee.worker.dart
@@ -4,11 +4,9 @@ import 'dart:js_interop_unsafe';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
-import 'package:dart_webrtc/src/frame_cryptor_impl.dart';
 import 'package:logging/logging.dart';
 import 'package:web/web.dart' as web;
 
-import 'package:dart_webrtc/src/rtc_transform_stream.dart';
 import 'e2ee.cryptor.dart';
 import 'e2ee.keyhandler.dart';
 import 'e2ee.logger.dart';
@@ -63,9 +61,9 @@ void main() async {
     logger.info('setup RTCTransformEvent event handler');
     self.onrtctransform = (web.RTCTransformEvent event) {
       logger.info('Got onrtctransform event');
-      var transformer = (event as web.RTCTransformEvent).transformer;
+      var transformer = event.transformer;
 
-      transformer.handled = true;
+      transformer.setProperty('handled'.toJS, true.toJS);
 
       var options = transformer.options as JSObject;
       var kind = options.getProperty('kind'.toJS) as JSString;
diff --git a/lib/src/factory_impl.dart b/lib/src/factory_impl.dart
@@ -12,8 +12,6 @@ import 'navigator_impl.dart';
 import 'rtc_peerconnection_impl.dart';
 import 'rtc_rtp_capailities_imp.dart';
 
-import 'package:web/web.dart' as web;
-
 @JS('RTCRtpSender')
 @staticInterop
 class RTCRtpSenderJs {
diff --git a/lib/src/frame_cryptor_impl.dart b/lib/src/frame_cryptor_impl.dart
@@ -5,14 +5,13 @@ import 'dart:js_interop_unsafe';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
+import 'package:dart_webrtc/src/e2ee.worker/e2ee.logger.dart';
+import 'package:dart_webrtc/src/event.dart';
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 
-import 'package:dart_webrtc/src/e2ee.worker/e2ee.logger.dart';
-import 'package:dart_webrtc/src/event.dart';
 import 'rtc_rtp_receiver_impl.dart';
 import 'rtc_rtp_sender_impl.dart';
-import 'rtc_transform_stream.dart';
 import 'utils.dart';
 
 class WorkerResponse {
diff --git a/lib/src/media_recorder_impl.dart b/lib/src/media_recorder_impl.dart
@@ -38,7 +38,7 @@ class MediaRecorderWeb extends MediaRecorder {
       _recorder.addEventListener(
           'dataavailable',
           (web.Event event) {
-            final web.Blob blob = event.getProperty('data'.toJS) as web.Blob;
+            final blob = event.getProperty('data'.toJS) as web.Blob;
             if (blob.size > 0) {
               _chunks.add(blob);
             }
diff --git a/lib/src/mediadevices_impl.dart b/lib/src/mediadevices_impl.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 
-import 'package:dart_webrtc/src/frame_cryptor_impl.dart';
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
 
@@ -230,26 +229,5 @@ class MediaDevicesWeb extends MediaDevices {
     } catch (e) {
       throw 'Unable to get ondevicechange: ${e.toString()}';
     }
-    return null;
   }
 }
-
-extension _MediaTrackConstraints on web.MediaTrackSupportedConstraints {
-  external bool get brightness;
-  external bool get colorTemperature;
-  external bool get contrast;
-  external bool get exposureCompensation;
-  external bool get exposureMode;
-  external bool get exposureTime;
-  external bool get focusDistance;
-  external bool get focusMode;
-  external bool get iso;
-  external bool get pan;
-  external bool get pointsOfInterest;
-  external bool get saturation;
-  external bool get sharpness;
-  external bool get tilt;
-  external bool get torch;
-  external bool get whiteBalanceMode;
-  external bool get zoom;
-}
diff --git a/lib/src/rtc_peerconnection_impl.dart b/lib/src/rtc_peerconnection_impl.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:js_interop';
 
+import 'package:dart_webrtc/dart_webrtc.dart';
 import 'package:platform_detect/platform_detect.dart';
 import 'package:web/web.dart' as web;
 
-import 'package:dart_webrtc/dart_webrtc.dart';
 import 'media_stream_track_impl.dart';
 import 'rtc_data_channel_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';
@@ -478,11 +478,6 @@ class RTCPeerConnectionWeb extends RTCPeerConnection {
   }
 }
 
-extension type _RTCMediaStreamEvent._(JSObject _)
-    implements web.Event, JSObject {
-  external web.MediaStream get stream;
-}
-
 extension _AddRemoveStream on web.RTCPeerConnection {
   external void addStream(web.MediaStream stream);
 
diff --git a/lib/src/rtc_rtp_capailities_imp.dart b/lib/src/rtc_rtp_capailities_imp.dart
@@ -1,9 +1,8 @@
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
 
-import 'package:dart_webrtc/src/rtc_data_channel_impl.dart';
-import 'package:webrtc_interface/webrtc_interface.dart';
 import 'package:web/web.dart' as web;
+import 'package:webrtc_interface/webrtc_interface.dart';
 
 class RTCRtpCapabilitiesWeb {
   static RTCRtpCapabilities fromJsObject(web.RTCRtpCapabilities object) {
diff --git a/lib/src/rtc_rtp_receiver_impl.dart b/lib/src/rtc_rtp_receiver_impl.dart
@@ -1,7 +1,8 @@
-import 'package:dart_webrtc/src/rtc_data_channel_impl.dart';
+import 'dart:js_interop';
+
 import 'package:web/web.dart' as web;
 import 'package:webrtc_interface/webrtc_interface.dart';
-import 'dart:js_interop';
+
 import 'media_stream_track_impl.dart';
 import 'rtc_rtp_parameters_impl.dart';
 
diff --git a/lib/src/rtc_rtp_sender_impl.dart b/lib/src/rtc_rtp_sender_impl.dart
@@ -2,10 +2,11 @@ import 'dart:async';
 
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
+
+import 'package:dart_webrtc/src/media_stream_impl.dart';
 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_track_impl.dart';
 import 'rtc_dtmf_sender_impl.dart';
 import 'rtc_rtp_parameters_impl.dart';
diff --git a/lib/src/rtc_rtp_transceiver_impl.dart b/lib/src/rtc_rtp_transceiver_impl.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
 import 'dart:js_interop';
 import 'dart:js_interop_unsafe';
-import 'package:webrtc_interface/webrtc_interface.dart';
 
 import 'package:web/web.dart' as web;
+import 'package:webrtc_interface/webrtc_interface.dart';
+
 import 'media_stream_impl.dart';
 import 'rtc_rtp_receiver_impl.dart';
 import 'rtc_rtp_sender_impl.dart';
diff --git a/lib/src/rtc_video_element.dart b/lib/src/rtc_video_element.dart
@@ -65,7 +65,3 @@ class RTCVideoElement {
 
   Future<void> setSinkId(String sinkId) => _html.setSinkId(sinkId).toDart;
 }
-
-extension _SetSinkId on web.HTMLMediaElement {
-  external JSPromise setSinkId(String sinkId);
-}
diff --git a/web/main.dart b/web/main.dart
@@ -167,7 +167,7 @@ void loopBackTest() async {
     }
   });
 */
-  var dc = await pc1.createDataChannel(
+  await pc1.createDataChannel(
       'label', RTCDataChannelInit()..binaryType = 'binary');
   var offer = await pc1.createOffer();
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class MediaRecorderWeb extends MediaRecorder {`
`38`	`38`	`_recorder.addEventListener(`
`39`	`39`	`'dataavailable',`
`40`	`40`	`(web.Event event) {`
`41`		`- final web.Blob blob = event.getProperty('data'.toJS) as web.Blob;`
	`41`	`+ final blob = event.getProperty('data'.toJS) as web.Blob;`
`42`	`42`	`if (blob.size > 0) {`
`43`	`43`	`_chunks.add(blob);`
`44`	`44`	`}`