move to package:web

Author: timu-jesse-ezell

pubspec.yaml

@@ -1,10 +1,10 @@
 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.2.1
+version: 1.3.0
 homepage: https://github.com/flutter-webrtc/dart-webrtc
 
 environment:
-  sdk: '>=2.13.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   collection: ^1.17.1
@@ -13,6 +13,7 @@ dependencies:
   meta: ^1.8.0
   platform_detect: ^2.0.7
   synchronized: ^3.0.0+3
+  web: ^0.5.1
   webrtc_interface: ^1.1.2
 
 dev_dependencies:

web/main.dart

@@ -1,7 +1,7 @@
-import 'dart:html' as html;
 import 'dart:typed_data';
 
 import 'package:dart_webrtc/dart_webrtc.dart';
+import 'package:web/web.dart' as web;
 
 /*
 import 'test_media_devices.dart' as media_devices_tests;
@@ -25,11 +25,11 @@ List<FrameCryptor> pc1FrameCryptors = [];
 List<FrameCryptor> pc2FrameCryptors = [];
 
 void loopBackTest() async {
-  var local = html.document.querySelector('#local');
+  var local = web.document.querySelector('#local');
   var localVideo = RTCVideoElement();
   local!.append(localVideo.htmlElement);
 
-  var remote = html.document.querySelector('#remote');
+  var remote = web.document.querySelector('#remote');
   var remotelVideo = RTCVideoElement();
   remote!.append(remotelVideo.htmlElement);
 

web/p2p/p2p.dart

@@ -1,8 +1,7 @@
-import 'dart:html' as html;
-
 import 'package:dart_webrtc/dart_webrtc.dart';
 import 'package:js/js.dart';
 import 'package:test/test.dart';
+import 'package:web/web.dart' as web;
 
 import 'signaling.dart';
 
@@ -19,13 +18,13 @@ void main() {
 
   var signaling = Signaling('demo.cloudwebrtc.com');
 
-  var local = html.document.querySelector('#local');
+  var local = web.document.querySelector('#local');
 
   var localVideo = RTCVideoElement();
 
   local?.append(localVideo.htmlElement);
 
-  var remote = html.document.querySelector('#remote');
+  var remote = web.document.querySelector('#remote');
 
   var remoteVideo = RTCVideoElement();
 
@@ -41,7 +40,7 @@ void main() {
 
   signaling.connect();
   signaling.onStateChange = (SignalingState state) {
-    html.document.querySelector('#output')?.text = state.toString();
+    web.document.querySelector('#output')?.text = state.toString();
     if (state == SignalingState.CallStateBye) {
       localVideo.srcObject = null;
       remoteVideo.srcObject = null;

web/p2p/simple_websocket.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
-import 'dart:html';
-
 import 'package:http/http.dart' as http;
+import 'package:web/web.dart' as web;
 
 typedef OnMessageCallback = void Function(dynamic msg);
 typedef OnCloseCallback = void Function(int code, String reason);
@@ -20,7 +19,7 @@ class SimpleWebSocket {
 
   Future<void> connect() async {
     try {
-      _socket = WebSocket(_url);
+      _socket = web.WebSocket(_url);
       _socket.onOpen.listen((e) {
         onOpen?.call();
       });
@@ -38,7 +37,7 @@ class SimpleWebSocket {
   }
 
   void send(data) {
-    if (_socket != null && _socket.readyState == WebSocket.OPEN) {
+    if (_socket != null && _socket.readyState == web.WebSocket.OPEN) {
       _socket.send(data);
       print('send: $data');
     } else {

web/test_media_devices.dart

@@ -8,21 +8,16 @@ void closeMediaStream(MediaStream stream) {
 }
 
 List<void Function()> testFunctions = <void Function()>[
-  () => test('MediaDevices.constructor()', () {
-        expect(navigator.mediaDevices != null, true);
-      }),
   () => test('MediaDevices.enumerateDevices()', () async {
         var list = await navigator.mediaDevices.enumerateDevices();
         list.forEach((e) {
           print('${e.runtimeType}: ${e.label}, type => ${e.kind}');
         });
-        expect(list != null, true);
       }),
   () => test('MediaDevices.getUserMedia()', () async {
         var stream = await navigator.mediaDevices
             .getUserMedia({'audio': true, 'video': true});
         print('getUserMedia: stream.id => ${stream.id}');
-        expect(stream != null, true);
 
         print(
             'getUserMedia: audio track.id => ${stream.getAudioTracks()[0].id}');