Resolve #163 Null safety support for 2.0.0-beta

Author: jumperchen

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.0-beta.3-nullsafety.0
+
+**New Feature:**
+
+* [#163](https://github.com/rikulo/socket.io-client-dart/issues/163) Null safety support for 2.0.0-beta
+
 ## 2.0.0-beta.3
 
 **Bug fix:**
@@ -17,6 +23,11 @@
 * [#130](https://github.com/rikulo/socket.io-client-dart/issues/130) Cannot connect to socket.io V3
 * [#106](https://github.com/rikulo/socket.io-client-dart/issues/106) Can we combine emitWithBinary to emit?
 
+## 1.0.0-nullsafety.0
+
+**New Feature:**
+
+* [#132](https://github.com/rikulo/socket.io-client-dart/issues/132) Migrating to null safety for Dart
 
 ## 0.9.12
 

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:pedantic/analysis_options.1.9.0.yaml
 
 analyzer:
 #   exclude:

lib/src/engine/socket.dart

@@ -465,7 +465,7 @@ class Socket extends EventEmitter {
           break;
       }
     } else {
-      _logger.fine('packet received with socket readyState "${readyState}"');
+      _logger.fine('packet received with socket readyState "$readyState"');
     }
   }
 

lib/src/engine/transport/jsonp_transport.dart

@@ -145,7 +145,7 @@ class JSONPTransport extends PollingTransport {
     if (form == null) {
       var form = document.createElement('form') as FormElement;
       var area = document.createElement('textarea') as TextAreaElement;
-      var id = iframeId = 'eio_iframe_${index}';
+      var id = iframeId = 'eio_iframe_$index';
 
       form.className = 'socketio';
       form.style.position = 'absolute';

lib/src/engine/transport/polling_transport.dart

@@ -138,7 +138,7 @@ abstract class PollingTransport extends Transport {
       if ('open' == readyState) {
         poll();
       } else {
-        _logger.fine('ignoring poll - transport state "${readyState}"');
+        _logger.fine('ignoring poll - transport state "$readyState"');
       }
     }
   }

lib/src/engine/transport/xhr_transport.dart

@@ -160,7 +160,7 @@ class Request extends EventEmitter {
     var self = this;
 
     try {
-      _logger.fine('xhr open ${method}: ${uri}');
+      _logger.fine('xhr open $method: $uri');
       xhr.open(method, uri, async: async);
 
       try {
@@ -233,7 +233,7 @@ class Request extends EventEmitter {
       });
       /*}*/
 
-      _logger.fine('xhr data ${data}');
+      _logger.fine('xhr data $data');
       xhr.send(data);
     } catch (e) {
 // Need to defer since .create() is called directly fhrom the constructor

lib/src/manager.dart

@@ -27,12 +27,42 @@ class Manager extends EventEmitter {
   List subs = [];
   late Map options;
 
-  bool? _reconnection;
-  num? _reconnectionAttempts;
-  num? _reconnectionDelay;
+  ///
+  /// Sets the `reconnection` config.
+  ///
+  /// @param {Boolean} true/false if it should automatically reconnect
+  /// @return {Manager} self or value
+  /// @api public
+  ///
+  bool? reconnection;
+
+  ///
+  /// Sets the reconnection attempts config.
+  ///
+  /// @param {Number} max reconnection attempts before giving up
+  /// @return {Manager} self or value
+  /// @api public
+  ///
+  num? reconnectionAttempts;
+
+  ///
+  /// Sets the delay between reconnections.
+  ///
+  /// @param {Number} delay
+  /// @return {Manager} self or value
+  /// @api public
+  ///
+  num? reconnectionDelay;
   num? _randomizationFactor;
   num? _reconnectionDelayMax;
-  num? _timeout;
+
+  ///
+  /// Sets the connection timeout. `false` to disable
+  ///
+  /// @return {Manager} self or value
+  /// @api public
+  ///
+  num? timeout;
   _Backoff? backoff;
   String readyState = 'closed';
   late String uri;
@@ -103,36 +133,6 @@ class Manager extends EventEmitter {
     return (nsp.isEmpty ? '' : (nsp + '#')) + (engine.id ?? '');
   }
 
-  ///
-  /// Sets the `reconnection` config.
-  ///
-  /// @param {Boolean} true/false if it should automatically reconnect
-  /// @return {Manager} self or value
-  /// @api public
-  ///
-  bool? get reconnection => _reconnection;
-  set reconnection(bool? v) => _reconnection = v;
-
-  ///
-  /// Sets the reconnection attempts config.
-  ///
-  /// @param {Number} max reconnection attempts before giving up
-  /// @return {Manager} self or value
-  /// @api public
-  ///
-  num? get reconnectionAttempts => _reconnectionAttempts;
-  set reconnectionAttempts(num? v) => _reconnectionAttempts = v;
-
-  ///
-  /// Sets the delay between reconnections.
-  ///
-  /// @param {Number} delay
-  /// @return {Manager} self or value
-  /// @api public
-  ///
-  num? get reconnectionDelay => _reconnectionDelay;
-  set reconnectionDelay(num? v) => _reconnectionDelay = v;
-
   num? get randomizationFactor => _randomizationFactor;
   set randomizationFactor(num? v) {
     _randomizationFactor = v;
@@ -152,15 +152,6 @@ class Manager extends EventEmitter {
     backoff?.max = v;
   }
 
-  ///
-  /// Sets the connection timeout. `false` to disable
-  ///
-  /// @return {Manager} self or value
-  /// @api public
-  ///
-  num? get timeout => _timeout;
-  set timeout(num? v) => _timeout = v;
-
   ///
   /// Starts trying to reconnect if reconnection is enabled and we have not
   /// started reconnecting yet
@@ -169,7 +160,7 @@ class Manager extends EventEmitter {
   ///
   void maybeReconnectOnOpen() {
     // Only try to reconnect if it's the first time we're connecting
-    if (!reconnecting && _reconnection == true && backoff!.attempts == 0) {
+    if (!reconnecting && reconnection == true && backoff!.attempts == 0) {
       // keeps reconnection from firing twice for the same reconnection loop
       reconnect();
     }
@@ -216,12 +207,11 @@ class Manager extends EventEmitter {
     });
 
     // emit `connect_timeout`
-    if (_timeout != null) {
-      var timeout = _timeout!;
+    if (timeout != null) {
       _logger.fine('connect attempt will timeout after $timeout');
 
       // set timer
-      var timer = Timer(Duration(milliseconds: timeout.toInt()), () {
+      var timer = Timer(Duration(milliseconds: timeout!.toInt()), () {
         _logger.fine('connect attempt timed out after $timeout');
         openSub.destroy();
         socket.close();
@@ -448,7 +438,7 @@ class Manager extends EventEmitter {
     readyState = 'closed';
     emit('close', error['reason']);
 
-    if (_reconnection == true && !skipReconnect!) {
+    if (reconnection == true && !skipReconnect!) {
       reconnect();
     }
   }
@@ -461,7 +451,7 @@ class Manager extends EventEmitter {
   Manager reconnect() {
     if (reconnecting || skipReconnect!) return this;
 
-    if (backoff!.attempts >= _reconnectionAttempts!) {
+    if (backoff!.attempts >= reconnectionAttempts!) {
       _logger.fine('reconnect failed');
       backoff!.reset();
       emitAll('reconnect_failed');

lib/src/socket.dart

@@ -151,7 +151,7 @@ class Socket extends EventEmitter {
       // event ack callback
       if (ack != null) {
         _logger.fine('emitting packet with ack id $ids');
-        acks['${ids}'] = ack;
+        acks['$ids'] = ack;
         packet['id'] = '${ids++}';
       }
 
@@ -186,7 +186,7 @@ class Socket extends EventEmitter {
     // if (query?.isNotEmpty == true) {
     //   packet({'type': CONNECT, 'query': query});
     // } else {
-      packet({'type': CONNECT});
+    packet({'type': CONNECT});
     // }
     // }
   }
@@ -350,7 +350,7 @@ class Socket extends EventEmitter {
   ///
   /// @api private
   void ondisconnect() {
-    _logger.fine('server disconnect (${nsp})');
+    _logger.fine('server disconnect ($nsp)');
     destroy();
     onclose('io server disconnect');
   }
@@ -383,7 +383,7 @@ class Socket extends EventEmitter {
 
   Socket disconnect() {
     if (connected == true) {
-      _logger.fine('performing disconnect (${nsp})');
+      _logger.fine('performing disconnect ($nsp)');
       packet({'type': DISCONNECT});
     }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: socket_io_client
 description: Dartlang port of socket.io-client for web, flutter, dartvm to use
-version: 2.0.0-beta-nullsafety.0
+version: 2.0.0-beta.3-nullsafety.0
 homepage: https://www.zkoss.org
 repository: https://github.com/rikulo/socket.io-client-dart
 issue_tracker: https://github.com/rikulo/socket.io-client-dart/issues
@@ -10,7 +10,8 @@ environment:
 
 dependencies:
   logging: '^1.0.0-nullsafety.0'
-  socket_io_common: '^2.0.0-beta-nullsafety.0'
+  socket_io_common: '^2.0.0-beta.1-nullsafety.0'
+  js: '^0.6.3'
 
 dev_dependencies:
   test: ">=1.3.0 <2.0.0"