Skip to content

Commit 93a4856

Browse files
cloudwebrtccloudwebrtc
committed
chore: Tidy up the code.
1 parent e4fd32a commit 93a4856

File tree

8 files changed

+63
-73
lines changed

8 files changed

+63
-73
lines changed

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
A webrtc interface wrapped in dart language.
44

5-
65
Use the [dart/js](https://pub.dev/packages/js) library to re-wrap the [webrtc](https://developer.mozilla.org/en-US/docs/Web/API/WebRTC_API) js interface of the browser, to adapted common browsers.
76

87
This library will be used for [flutter-webrtc](https://github.com/flutter-webrtc/flutter-webrtc) for [flutter web](https://flutter.dev/web) plugin.
98

10-
11-
129
## How to develop
1310

1411
* `git clone https://github.com/flutter-webrtc/dart-webrtc && cd dart-webrtc`

‎lib/src/media_devices.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import 'package:webrtc_interface/webrtc_interface.dart';
21
import '../dart_webrtc.dart';
3-
import 'factory_impl.dart';
42

53
class MediaDevices {
64
@Deprecated(

‎lib/src/media_recorder.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'package:webrtc_interface/src/media_recorder.dart' as _interface;
2-
import 'package:webrtc_interface/webrtc_interface.dart';
32

43
import '../dart_webrtc.dart';
5-
import 'factory_impl.dart';
64

75
class MediaRecorder extends _interface.MediaRecorder {
86
MediaRecorder() : _delegate = mediaRecorder();

‎lib/src/mediadevices_impl.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'dart:async';
22
import 'dart:html' as html;
3-
import 'dart:html_common';
43
import 'dart:js' as js;
54
import 'dart:js_util' as jsutil;
65
import 'package:webrtc_interface/webrtc_interface.dart';

‎web/p2p/p2p.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'dart:html' as html;
2-
import 'package:test/test.dart';
32

43
import 'package:dart_webrtc/dart_webrtc.dart';
54
import 'package:js/js.dart';
5+
import 'package:test/test.dart';
66

77
import 'signaling.dart';
88

‎web/test_media_stream.dart‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
import 'package:dart_webrtc/dart_webrtc.dart';
22
import 'package:test/test.dart';
33

4-
late MediaStream mediaStream;
4+
MediaStream? mediaStream;
55

66
List<void Function()> testFunctions = <void Function()>[
7-
() => test('MediaStream.constructor()', () async {
7+
() => test('mediaStream?.constructor()', () async {
88
mediaStream = await navigator.mediaDevices
99
.getUserMedia({'audio': true, 'video': true});
1010

11-
expect(mediaStream.id != null, true);
11+
expect(mediaStream?.id != null, true);
1212
}),
13-
() => test('MediaStream.active()', () {
14-
expect(mediaStream.active, true);
13+
() => test('mediaStream?.active()', () {
14+
expect(mediaStream?.active, true);
1515
}),
16-
() => test('MediaStream.getTracks()', () {
17-
expect(mediaStream.getTracks().length, 2);
16+
() => test('mediaStream?.getTracks()', () {
17+
expect(mediaStream?.getTracks().length, 2);
1818
}),
19-
() => test('MediaStream.getAudioTracks()', () {
20-
expect(mediaStream.getAudioTracks().length, 1);
21-
var track =
22-
mediaStream.getTrackById(mediaStream.getAudioTracks()[0].id!);
23-
expect(track?.id, mediaStream.getAudioTracks()[0].id);
19+
() => test('mediaStream?.getAudioTracks()', () {
20+
expect(mediaStream?.getAudioTracks().length, 1);
21+
var track = mediaStream
22+
?.getTrackById(mediaStream?.getAudioTracks()[0].id ?? '');
23+
expect(track?.id, mediaStream?.getAudioTracks()[0].id);
2424
}),
25-
() => test('MediaStream.getVideoTracks()', () {
26-
expect(mediaStream.getVideoTracks().length, 1);
27-
var track =
28-
mediaStream.getTrackById(mediaStream.getVideoTracks()[0].id!);
29-
expect(track!.id, mediaStream.getVideoTracks()[0].id);
25+
() => test('mediaStream?.getVideoTracks()', () {
26+
expect(mediaStream?.getVideoTracks().length, 1);
27+
var track = mediaStream
28+
?.getTrackById(mediaStream?.getVideoTracks()[0].id ?? '');
29+
expect(track!.id, mediaStream?.getVideoTracks()[0].id);
3030
}),
31-
() => test('MediaStream.removeTrack()', () {
32-
var track =
33-
mediaStream.getTrackById(mediaStream.getVideoTracks()[0].id!);
34-
mediaStream.removeTrack(track!);
35-
expect(mediaStream.getVideoTracks().length, 0);
31+
() => test('mediaStream?.removeTrack()', () {
32+
var track = mediaStream
33+
?.getTrackById(mediaStream?.getVideoTracks()[0].id ?? '');
34+
mediaStream?.removeTrack(track!);
35+
expect(mediaStream?.getVideoTracks().length, 0);
3636
}),
37-
() => test('MediaStream.close()', () {
38-
mediaStream.getTracks().forEach((element) {
37+
() => test('mediaStream?.close()', () {
38+
mediaStream?.getTracks().forEach((element) {
3939
element.stop();
40-
mediaStream.removeTrack(element);
40+
mediaStream?.removeTrack(element);
4141
});
42-
expect(mediaStream.getTracks().isEmpty, true);
42+
expect(mediaStream?.getTracks().isEmpty, true);
4343
})
4444
];

‎web/test_media_stream_track.dart‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import 'dart:html';
2-
31
import 'package:dart_webrtc/dart_webrtc.dart';
42
import 'package:test/test.dart';
53

6-
late MediaStreamTrack audioTrack, videoTrack;
4+
MediaStreamTrack? audioTrack, videoTrack;
75

86
List<void Function()> testFunctions = <void Function()>[
97
() => test('MediaStreamTrack.constructor()', () async {
@@ -13,43 +11,43 @@ List<void Function()> testFunctions = <void Function()>[
1311
audioTrack = stream.getAudioTracks()[0];
1412
expect(audioTrack != null, true);
1513

16-
expect(audioTrack.kind, 'audio');
14+
expect(audioTrack?.kind, 'audio');
1715

1816
videoTrack = stream.getVideoTracks()[0];
1917
expect(videoTrack != null, true);
2018

21-
expect(videoTrack.kind, 'video');
19+
expect(videoTrack?.kind, 'video');
2220
}),
2321
() => test('MediaStreamTrack.id()', () {
24-
expect(audioTrack.id is String, true);
25-
expect(audioTrack.id?.isNotEmpty, true);
26-
expect(videoTrack.id is String, true);
27-
expect(videoTrack.id?.isNotEmpty, true);
22+
expect(audioTrack?.id is String, true);
23+
expect(audioTrack?.id?.isNotEmpty, true);
24+
expect(videoTrack?.id is String, true);
25+
expect(videoTrack?.id?.isNotEmpty, true);
2826
}),
2927
() => test('MediaStreamTrack.label()', () {
30-
expect(audioTrack.label is String, true);
31-
expect(audioTrack.id?.isNotEmpty, true);
32-
expect(videoTrack.id is String, true);
33-
expect(videoTrack.id?.isNotEmpty, true);
28+
expect(audioTrack?.label is String, true);
29+
expect(audioTrack?.id?.isNotEmpty, true);
30+
expect(videoTrack?.id is String, true);
31+
expect(videoTrack?.id?.isNotEmpty, true);
3432
}),
3533
() => test('MediaStreamTrack.enabled()', () {
36-
expect(audioTrack.enabled, true);
37-
audioTrack.enabled = false;
38-
expect(audioTrack.enabled, false);
34+
expect(audioTrack?.enabled, true);
35+
audioTrack?.enabled = false;
36+
expect(audioTrack?.enabled, false);
3937

40-
expect(videoTrack.enabled, true);
41-
videoTrack.enabled = false;
42-
expect(videoTrack.enabled, false);
38+
expect(videoTrack?.enabled, true);
39+
videoTrack?.enabled = false;
40+
expect(videoTrack?.enabled, false);
4341
}),
4442
() => test('MediaStreamTrack.readyState() | MediaStreamTrack.stop()', () {
4543
/*
46-
expect(audioTrack.readyState, 'live');
47-
audioTrack.stop();
48-
expect(audioTrack.readyState, 'ended');
44+
expect(audioTrack?.readyState, 'live');
45+
audioTrack?.stop();
46+
expect(audioTrack?.readyState, 'ended');
4947
50-
expect(videoTrack.readyState, 'live');
51-
videoTrack.stop();
52-
expect(videoTrack.readyState, 'ended');
48+
expect(videoTrack?.readyState, 'live');
49+
videoTrack?.stop();
50+
expect(videoTrack?.readyState, 'ended');
5351
*/
5452
})
5553
];

‎web/test_video_element.dart‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
import 'package:dart_webrtc/dart_webrtc.dart';
22
import 'package:test/test.dart';
33

4-
late RTCVideoElement localVideo;
4+
late RTCVideoElement? localVideo;
55

66
List<void Function()> testFunctions = <void Function()>[
77
() => test('RTCVideoElement.constructor()', () {
88
localVideo = RTCVideoElement();
99
expect(localVideo != null, true);
1010
}),
1111
() => test('RTCVideoElement.muted()', () {
12-
localVideo.muted = true;
13-
expect(localVideo.muted, true);
14-
localVideo.muted = false;
15-
expect(localVideo.muted, false);
12+
localVideo?.muted = true;
13+
expect(localVideo?.muted, true);
14+
localVideo?.muted = false;
15+
expect(localVideo?.muted, false);
1616
}),
1717
() => test('RTCVideoElement.controls()', () {
18-
localVideo.controls = false;
19-
expect(localVideo.controls, false);
20-
localVideo.controls = true;
21-
expect(localVideo.controls, true);
18+
localVideo?.controls = false;
19+
expect(localVideo?.controls, false);
20+
localVideo?.controls = true;
21+
expect(localVideo?.controls, true);
2222
}),
2323
() => test('RTCVideoElement.autoplay()', () {
24-
localVideo.autoplay = false;
25-
expect(localVideo.autoplay, false);
26-
localVideo.autoplay = true;
27-
expect(localVideo.autoplay, true);
24+
localVideo?.autoplay = false;
25+
expect(localVideo?.autoplay, false);
26+
localVideo?.autoplay = true;
27+
expect(localVideo?.autoplay, true);
2828
})
2929
];

0 commit comments

Comments
 (0)