Fix bug for web.

Author: cloudwebrtc

lib/src/peer.dart

@@ -126,44 +126,42 @@ class Peer extends EventEmitter {
     var completer = new Completer();
     var request = Message.requestFactory(method, data);
     try {
-      this._transport.send(request).then((data) {
-        var handler = {
-          'resolve': (data2) {
-            var handler = _requestHandlers[request['id']];
-            if (handler == null)
-              completer.completeError('Request handler is not in map!');
-            handler['timer'].cancel();
-            this._requestHandlers.remove(request['id']);
-            completer.complete(data2);
-          },
-          'reject': (error) {
-            var handler = _requestHandlers[request['id']];
-            if (handler == null)
-              completer.completeError('Request handler is not in map!');
-            handler['timer'].cancel();
-            this._requestHandlers.remove(request['id']);
-            completer.completeError(error);
-          },
-          'timer': new Timer.periodic(
-              new Duration(milliseconds: REQUEST_TIMEOUT),
-                  (Timer timer) {
-                timer.cancel();
-                if (this._requestHandlers.remove(request['id']) == null)
-                  completer.completeError('Request handler is not in map!');
-                completer.completeError('request timeout');
-              }),
-          close: () {
-            var handler = _requestHandlers[request['id']];
-            if (handler == null)
-              completer.completeError('Request handler is not in map!');
-            handler['timer'].cancel();
-            completer.completeError('peer closed');
-          }
-        };
-        // Add handler stuff to the Map.
-        this._requestHandlers[request['id']] = handler;
-      });
-    }catch(e) {
+      this._transport.send(request);
+      var handler = {
+        'resolve': (data2) {
+          var handler = _requestHandlers[request['id']];
+          if (handler == null)
+            completer.completeError('Request handler is not in map!');
+          handler['timer'].cancel();
+          this._requestHandlers.remove(request['id']);
+          completer.complete(data2);
+        },
+        'reject': (error) {
+          var handler = _requestHandlers[request['id']];
+          if (handler == null)
+            completer.completeError('Request handler is not in map!');
+          handler['timer'].cancel();
+          this._requestHandlers.remove(request['id']);
+          completer.completeError(error);
+        },
+        'timer': new Timer.periodic(new Duration(milliseconds: REQUEST_TIMEOUT),
+            (Timer timer) {
+          timer.cancel();
+          if (this._requestHandlers.remove(request['id']) == null)
+            completer.completeError('Request handler is not in map!');
+          completer.completeError('request timeout');
+        }),
+        close: () {
+          var handler = _requestHandlers[request['id']];
+          if (handler == null)
+            completer.completeError('Request handler is not in map!');
+          handler['timer'].cancel();
+          completer.completeError('peer closed');
+        }
+      };
+      // Add handler stuff to the Map.
+      this._requestHandlers[request['id']] = handler;
+    } catch (e) {
       completer.completeError('transport error');
     }
     return completer.future;

lib/src/transports/websocket_dart_impl.dart

@@ -20,12 +20,10 @@ class WebSocketImpl {
   connect({Object protocols, Object headers}) async {
     logger.debug('connect $_url, $headers, $protocols');
     try {
-      _socket =
-          await WebSocket.connect(_url, protocols: protocols, headers: headers);
+     // _socket =
+     //     await WebSocket.connect(_url, protocols: protocols, headers: headers);
 
-      /// Allow self-signed certificate, for test only.
-      /// var parsed_url = Grammar.parse(this._url, 'absoluteURI');
-      /// _socket = await _connectForBadCertificate(parsed_url.scheme, parsed_url.host, parsed_url.port);
+      _socket = await _connectForBadCertificate(_url);
 
       this?.onOpen();
       _socket.listen((data) {
@@ -54,8 +52,7 @@ class WebSocketImpl {
   }
 
   /// For test only.
-  Future<WebSocket> _connectForBadCertificate(
-      String scheme, String host, int port) async {
+  Future<WebSocket> _connectForBadCertificate(url) async {
     try {
       Random r = new Random();
       String key = base64.encode(List<int>.generate(8, (_) => r.nextInt(255)));
@@ -67,9 +64,7 @@ class WebSocketImpl {
         return true;
       };
 
-      HttpClientRequest request = await client.getUrl(Uri.parse(
-          (scheme == 'wss' ? 'https' : 'http') +
-              '://$host:$port/ws')); // form the correct url here
+      HttpClientRequest request = await client.getUrl(Uri.parse(url)); // form the correct url here
 
       request.headers.add('Connection', 'Upgrade');
       request.headers.add('Upgrade', 'websocket');

lib/src/transports/websocket_web_impl.dart

@@ -14,7 +14,9 @@ class WebSocketImpl {
   OnCloseCallback onClose;
   final logger = Logger('Logger::HTML::WebSocket');
 
-  WebSocketImpl(this._url);
+  WebSocketImpl(url) {
+    this._url = url.replaceAll('https:', 'wss:');
+  }
 
   connect({Object protocols, Object headers}) async {
     logger.debug('connect $_url, $headers, $protocols');
@@ -39,7 +41,7 @@ class WebSocketImpl {
         this?.onClose(e.code, e.reason);
       });
     } catch (e) {
-      this?.onClose(e.code, e.reason);
+      this?.onClose(500, e.toString());
     }
   }