Merge pull request soernt#6 from kattalo/master

Adding support for flutter for web and fixing bug with connectionToken in url query

example/lib/chatPageViewModel.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'dart:io';
-
+import 'package:http/http.dart';
 import 'package:signalr_netcore/signalr_client.dart';
 
 import 'main.dart';
@@ -73,17 +73,16 @@ class ChatPageViewModel extends ViewModel {
     print(msg.message);
   }
 
-  void _httpClientCreateCallback(HttpClient httpClient) {
-    httpClient.badCertificateCallback =
-        (X509Certificate cert, String host, int port) => true;
+  void _httpClientCreateCallback(Client httpClient) {
+    HttpOverrides.global = HttpOverrideCertificateVerificationInDev();
   }
 
   Future<void> openChatConnection() async {
     final logger = _logger;
 
     if (_hubConnection == null) {
       final httpConnectionOptions = new HttpConnectionOptions(
-          httpClient: DartIOHttpClient(logger,
+          httpClient: WebSupportingHttpClient(logger,
               httpClientCreateCallback: _httpClientCreateCallback),
           logger: logger,
           logMessageContent: true);
@@ -141,3 +140,12 @@ class ChatPageViewModelProvider extends ViewModelProvider<ChatPageViewModel> {
         .viewModel;
   }
 }
+
+class HttpOverrideCertificateVerificationInDev extends HttpOverrides {
+  @override
+  HttpClient createHttpClient(SecurityContext context) {
+    return super.createHttpClient(context)
+      ..badCertificateCallback =
+          (X509Certificate cert, String host, int port) => true;
+  }
+}

example/pubspec.yaml

@@ -18,10 +18,9 @@ dependencies:
 
   signalr_netcore:
     path: ../
-    
+
   logging: ^1.0.1
-  w3c_event_source: ^1.0.0
-  rxdart : ^0.18.1  
+  rxdart : ^0.18.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

lib/clients/http_client_browser.dart

@@ -0,0 +1,3 @@
+import 'package:http/browser_client.dart';
+
+final clientWithWebSupport = BrowserClient()..withCredentials = true;

lib/clients/http_client_default.dart

@@ -0,0 +1,3 @@
+import 'package:http/http.dart';
+
+final clientWithWebSupport = Client();

lib/handshake_protocol.dart

@@ -53,7 +53,7 @@ class HandshakeProtocol {
 
   // Handshake request is always JSON
   String writeHandshakeRequest(HandshakeRequestMessage handshakeRequest) {
-    return TextMessageFormat.write(json.encode(handshakeRequest));
+    return TextMessageFormat.write(json.encode(handshakeRequest.toJson()));
   }
 
   /// Parse the handshake reponse

lib/http_connection.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 
 import 'package:logging/logging.dart';
 
-import 'dartio_http_client.dart';
+import 'web_supporting_http_client.dart';
 import 'errors.dart';
 import 'http_connection_options.dart';
 import 'iconnection.dart';
@@ -133,7 +133,7 @@ class TransportSendQueue {
 
   Future<void> stop() {
     _executing = false;
-    _sendBufferedData.complete();
+    if (!_sendBufferedData.isCompleted) _sendBufferedData.complete();
     return _sendLoopPromise;
   }
 
@@ -149,7 +149,7 @@ class TransportSendQueue {
     }
 
     _buffer.add(data);
-    _sendBufferedData.complete();
+    if (!_sendBufferedData.isCompleted) _sendBufferedData.complete();
   }
 
   Future<void> _sendLoop() async {
@@ -158,7 +158,9 @@ class TransportSendQueue {
 
       if (!_executing) {
         if (_transportResult != null) {
-          _transportResult.completeError("Connection stopped.");
+          if (!_transportResult.isCompleted) {
+            _transportResult.completeError('Connection stopped.');
+          }
         }
 
         break;
@@ -177,9 +179,9 @@ class TransportSendQueue {
 
       try {
         await this.transport.send(data);
-        transportResult.complete();
+        if (!transportResult.isCompleted) transportResult.complete();
       } catch (error) {
-        transportResult.completeError(error);
+        if (!transportResult.isCompleted) transportResult.completeError(error);
       }
     }
   }
@@ -237,7 +239,7 @@ class HttpConnection implements IConnection {
     baseUrl = url;
 
     _options = options ?? HttpConnectionOptions();
-    _httpClient = options.httpClient ?? DartIOHttpClient(_logger);
+    _httpClient = options.httpClient ?? WebSupportingHttpClient(_logger);
     _connectionState = ConnectionState.Disconnected;
     _connectionStarted = false;
   }
@@ -486,7 +488,7 @@ class HttpConnection implements IConnection {
   }
 
   String _createConnectUrl(String url, String connectionToken) {
-    if (connectionToken != null) {
+    if (connectionToken == null) {
       return url;
     }
 
@@ -646,7 +648,7 @@ class HttpConnection implements IConnection {
     if (_connectionState == ConnectionState.Disconnecting) {
       // A call to stop() induced this call to stopConnection and needs to be completed.
       // Any stop() awaiters will be scheduled to continue after the onclose callback fires.
-      _stopPromiseCompleter.complete();
+      if (!_stopPromiseCompleter.isCompleted) _stopPromiseCompleter.complete();
     }
 
     if (error != null) {

lib/hub_connection.dart

@@ -397,25 +397,31 @@ class HubConnection {
     _callbacks[invocationDescriptor.invocationId] =
         (HubMessageBase invocationEvent, Exception error) {
       if (error != null) {
-        completer.completeError(error);
+        if (!completer.isCompleted) completer.completeError(error);
         return;
       } else if (invocationEvent != null) {
         if (invocationEvent is CompletionMessage) {
           if (invocationEvent.error != null) {
-            completer.completeError(new GeneralError(invocationEvent.error));
+            if (!completer.isCompleted) {
+              completer.completeError(new GeneralError(invocationEvent.error));
+            }
           } else {
-            completer.complete(invocationEvent.result);
+            if (!completer.isCompleted) {
+              completer.complete(invocationEvent.result);
+            }
           }
         } else {
-          completer.completeError(new GeneralError(
-              "Unexpected message type: ${invocationEvent.type}"));
+          if (!completer.isCompleted) {
+            completer.completeError(new GeneralError(
+                "Unexpected message type: ${invocationEvent.type}"));
+          }
         }
       }
     };
 
     final promiseQueue =
         _sendWithProtocol(invocationDescriptor).catchError((e) {
-      completer.completeError(e);
+      if (!completer.isCompleted) completer.completeError(e);
       // invocationId will always have a value for a non-blocking invocation
       _callbacks.remove(invocationDescriptor.invocationId);
     });
@@ -548,7 +554,7 @@ class HubConnection {
             _logger?.info("Close message received from server.");
             final closeMessage = message as CloseMessage;
 
-            final error = closeMessage.error != null
+            final Exception error = closeMessage.error != null
                 ? GeneralError(
                     "Server returned an error on close: " + closeMessage.error)
                 : null;
@@ -586,7 +592,9 @@ class HubConnection {
 
       final error = GeneralError(message);
 
-      _handshakeCompleter?.completeError(error);
+      if (!_handshakeCompleter.isCompleted) {
+        _handshakeCompleter?.completeError(error);
+      }
       _handshakeCompleter = null;
       throw error;
     }
@@ -597,14 +605,16 @@ class HubConnection {
 
       final error = GeneralError(message);
 
-      _handshakeCompleter?.completeError(error);
+      if (!_handshakeCompleter.isCompleted) {
+        _handshakeCompleter?.completeError(error);
+      }
       _handshakeCompleter = null;
       throw error;
     } else {
       _logger?.finer("Server handshake complete.");
     }
 
-    _handshakeCompleter?.complete();
+    if (!_handshakeCompleter.isCompleted) _handshakeCompleter?.complete();
     _handshakeCompleter = null;
     return handshakeResult.remainingData;
   }
@@ -656,7 +666,7 @@ class HubConnection {
         _logger?.severe(message);
 
         // We don't need to wait on this Promise.
-        _stopPromise = _stopInternal(error: new GeneralError(message));
+        _stopPromise = _stopInternal(error: GeneralError(message));
       }
     } else {
       _logger?.warning(
@@ -677,7 +687,7 @@ class HubConnection {
     // If the handshake is in progress, start will be waiting for the handshake promise, so we complete it.
     // If it has already completed, this should just noop.
     if (_handshakeCompleter != null) {
-      _handshakeCompleter.complete();
+      if (!_handshakeCompleter.isCompleted) _handshakeCompleter.complete();
     }
 
     _cancelCallbacksWithError(error ??
@@ -720,7 +730,7 @@ class HubConnection {
   _reconnect({Exception error}) async {
     final reconnectStartTime = DateTime.now();
     var previousReconnectAttempts = 0;
-    var retryError = error != null
+    Exception retryError = error != null
         ? error
         : GeneralError("Attempting to reconnect due to a unknown error.");
 

lib/ihub_protocol.dart

@@ -65,6 +65,7 @@ class MessageHeaders {
   HashMap<String, String> _headers;
 
   Iterable<String> get names => _headers.keys;
+  HashMap<String, String> get asMap => _headers;
 
   bool get isEmtpy => _headers.length == 0;
 
@@ -89,6 +90,19 @@ class MessageHeaders {
       _headers.remove(name);
     }
   }
+
+  @override
+  String toString() {
+    if (isEmtpy) return '(no headers)';
+
+    String str = '';
+    for (var name in names) {
+      if (str.isNotEmpty) str += ', ';
+      str += '{ $name: ${_headers[name]} }';
+    }
+
+    return str;
+  }
 }
 
 /// Defines properties common to all Hub messages.