Skip to content

Commit 7335a11

Browse files
update to web 1.0
1 parent 6990ea8 commit 7335a11

File tree

3 files changed

+10
-25
lines changed

3 files changed

+10
-25
lines changed

lib/src/frame_cryptor_impl.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ class KeyProviderImpl implements KeyProvider {
367367

368368
class FrameCryptorFactoryImpl implements FrameCryptorFactory {
369369
FrameCryptorFactoryImpl._internal() {
370-
worker = web.Worker('e2ee.worker.dart.js');
370+
worker = web.Worker('e2ee.worker.dart.js'.toJS);
371371
worker.addEventListener(
372372
'message',
373373
(web.MessageEvent msg) {

lib/src/mediadevices_impl.dart

+8-23
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,12 @@ class MediaDevicesWeb extends MediaDevices {
3232

3333
return MediaStreamWeb(jsStream, 'local');
3434
} else {
35-
final streamCompleter = Completer<web.MediaStream>();
36-
37-
web.window.navigator.getUserMedia(
38-
web.MediaStreamConstraints(
35+
final jsStream = await web.window.navigator.mediaDevices
36+
.getUserMedia(web.MediaStreamConstraints(
3937
audio: mediaConstraints['audio'],
4038
video: mediaConstraints['video'],
41-
),
42-
(web.MediaStream stream) {}.toJS,
43-
(JSAny err) {
44-
streamCompleter.completeError(err);
45-
}.toJS);
46-
47-
final jsStream = await streamCompleter.future;
39+
))
40+
.toDart;
4841
return MediaStreamWeb(jsStream, 'local');
4942
}
5043
} catch (e) {
@@ -64,19 +57,11 @@ class MediaDevicesWeb extends MediaDevices {
6457
jsutil.callMethod(mediaDevices, 'getDisplayMedia', [arg]));
6558
return MediaStreamWeb(jsStream, 'local');
6659
} else {
67-
final streamCompleter = Completer<web.MediaStream>();
68-
69-
web.window.navigator.getUserMedia(
70-
web.MediaStreamConstraints(
60+
final jsStream = await web.window.navigator.mediaDevices
61+
.getUserMedia(web.MediaStreamConstraints(
7162
video: jsutil.jsify({'mediaSource': 'screen'}),
72-
audio: mediaConstraints['audio'] ?? false),
73-
(web.MediaStream stream) {
74-
streamCompleter.complete(stream);
75-
}.toJS,
76-
(JSAny err) {
77-
streamCompleter.completeError(err);
78-
}.toJS);
79-
final jsStream = await streamCompleter.future;
63+
audio: mediaConstraints['audio'] ?? false))
64+
.toDart;
8065
return MediaStreamWeb(jsStream, 'local');
8166
}
8267
} catch (e) {

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
meta: ^1.8.0
1414
platform_detect: ^2.0.7
1515
synchronized: ^3.0.0+3
16-
web: ^0.5.1
16+
web: ^1.0.0
1717
webrtc_interface: ^1.1.2
1818

1919
dev_dependencies:

0 commit comments

Comments
 (0)