Migrated dart version and added optional parameter to provide server address

analysis_options.yaml

@@ -1,12 +1,35 @@
-# This file allows you to configure the Dart analyzer.
+# This file configures the static analysis results for your project (errors,
+# warnings, and lints).
 #
-# The commented part below is just for inspiration. Read the guide here:
-#   https://www.dartlang.org/guides/language/analysis-options
-include: package:pedantic/analysis_options.yaml
+# This enables the 'recommended' set of lints from `package:lints`.
+# This set helps identify many issues that may lead to problems when running
+# or consuming Dart code, and enforces writing Dart using a single, idiomatic
+# style and format.
+#
+# If you want a smaller set of lints you can change this to specify
+# 'package:lints/core.yaml'. These are just the most critical lints
+# (the recommended set includes the core lints).
+# The core lints are also what is used by pub.dev for scoring packages.
+
+include: package:lints/recommended.yaml
 analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
+  errors:
+    dangling_library_doc_comments: ignore
+    implementation_imports: ignore
+    no_wildcard_variable_uses: ignore
+
+# Uncomment the following section to specify additional rules.
+
 # linter:
 #   rules:
-#     # see catalog here: http://dart-lang.github.io/linter/lints/
-#     - hash_and_equals
+#     - camel_case_types
+
+# analyzer:
+#   exclude:
+#     - path/to/excluded/files/**
+
+# For more information about the core and recommended set of lints, see
+# https://dart.dev/go/core-lints
+
+# For additional information about configuring this file, see
+# https://dart.dev/guides/language/analysis-options

lib/src/adapter/adapter.dart

@@ -10,12 +10,13 @@
 /// Copyright (C) 2017 Potix Corporation. All Rights Reserved.
 import 'dart:async';
 import 'package:socket_io/src/namespace.dart';
+import 'package:socket_io/src/socket.dart';
 import 'package:socket_io_common/src/parser/parser.dart';
 import 'package:socket_io/src/util/event_emitter.dart';
 
 abstract class Adapter {
   Map nsps = {};
-  Map<String, _Room> rooms = {};
+  Map<String, Room> rooms = {};
   Map<String, Map> sids = {};
 
   void add(String id, String room, [dynamic Function([dynamic]) fn]);
@@ -37,15 +38,14 @@ class _MemoryStoreAdapter extends EventEmitter implements Adapter {
   @override
   Map nsps = {};
   @override
-  Map<String, _Room> rooms = {};
+  Map<String, Room> rooms = {};
 
   @override
   Map<String, Map> sids = {};
   late Encoder encoder;
   late Namespace nsp;
 
-  _MemoryStoreAdapter(Namespace nsp) {
-    this.nsp = nsp;
+  _MemoryStoreAdapter(this.nsp) {
     encoder = nsp.server.encoder;
   }
 
@@ -60,7 +60,7 @@ class _MemoryStoreAdapter extends EventEmitter implements Adapter {
   void add(String id, String room, [dynamic Function([dynamic])? fn]) {
     sids[id] = sids[id] ?? {};
     sids[id]![room] = true;
-    rooms[room] = rooms[room] ?? _Room();
+    rooms[room] = rooms[room] ?? Room();
     rooms[room]!.add(id);
     if (fn != null) scheduleMicrotask(() => fn(null));
   }
@@ -125,34 +125,34 @@ class _MemoryStoreAdapter extends EventEmitter implements Adapter {
       'compress': flags['compress']
     };
     var ids = {};
-    var socket;
+    Socket? socket;
 
     packet['nsp'] = nsp.name;
-    encoder.encode(packet, (encodedPackets) {
-      if (rooms.isNotEmpty) {
-        for (var i = 0; i < rooms.length; i++) {
-          var room = this.rooms[rooms[i]];
-          if (room == null) continue;
-          var sockets = room.sockets;
-          for (var id in sockets.keys) {
-            if (sockets.containsKey(id)) {
-              if (ids[id] != null || except.contains(id)) continue;
-              socket = nsp.connected[id];
-              if (socket != null) {
-                socket.packet(encodedPackets, packetOpts);
-                ids[id] = true;
-              }
+    var encodedPackets = encoder.encode(packet);
+
+    if (rooms.isNotEmpty) {
+      for (var i = 0; i < rooms.length; i++) {
+        var room = this.rooms[rooms[i]];
+        if (room == null) continue;
+        var sockets = room.sockets;
+        for (var id in sockets.keys) {
+          if (sockets.containsKey(id)) {
+            if (ids[id] != null || except.contains(id)) continue;
+            socket = nsp.connected[id];
+            if (socket != null) {
+              socket.packet(encodedPackets, packetOpts);
+              ids[id] = true;
             }
           }
         }
-      } else {
-        for (var id in sids.keys) {
-          if (except.contains(id)) continue;
-          socket = nsp.connected[id];
-          if (socket != null) socket.packet(encodedPackets, packetOpts);
-        }
       }
-    });
+    } else {
+      for (var id in sids.keys) {
+        if (except.contains(id)) continue;
+        socket = nsp.connected[id];
+        if (socket != null) socket.packet(encodedPackets, packetOpts);
+      }
+    }
   }
 
   /// Gets a list of clients by sid.
@@ -165,7 +165,7 @@ class _MemoryStoreAdapter extends EventEmitter implements Adapter {
       [List<String> rooms = const [], dynamic Function([dynamic])? fn]) {
     var ids = {};
     var sids = [];
-    var socket;
+    Socket? socket;
 
     if (rooms.isNotEmpty) {
       for (var i = 0; i < rooms.length; i++) {
@@ -208,7 +208,7 @@ class _MemoryStoreAdapter extends EventEmitter implements Adapter {
 /// Room constructor.
 ///
 /// @api private
-class _Room {
+class Room {
   Map<String, bool> sockets = {};
   int length = 0;
 

lib/src/client.dart

@@ -55,7 +55,7 @@ class Client {
     _logger.fine('connecting to namespace $name');
     if (!server.nsps.containsKey(name)) {
       packet(<dynamic, dynamic>{
-        'type': ERROR,
+        'type': CONNECT_ERROR,
         'nsp': name,
         'data': 'Invalid namespace'
       });
@@ -140,10 +140,8 @@ class Client {
       _logger.fine('writing packet $packet');
       if (opts['preEncoded'] != true) {
         // not broadcasting, need to encode
-        encoder.encode(packet, (encodedPackets) {
-          // encode, then write results to engine
-          writeToEngine(encodedPackets);
-        });
+        var encodedPackets = encoder.encode(packet);
+        writeToEngine(encodedPackets);
       } else {
         // a broadcast pre-encodes a packet
         writeToEngine(packet);
@@ -189,9 +187,9 @@ class Client {
   /// @param {Objcet} error object
   /// @api private
   void onerror(err) {
-    sockets.forEach((socket) {
+    for (var socket in sockets) {
       socket.onerror(err);
-    });
+    }
     onclose('client error');
   }
 
@@ -207,9 +205,9 @@ class Client {
 
     // `nsps` and `sockets` are cleaned up seamlessly
     if (sockets.isNotEmpty) {
-      List.from(sockets).forEach((socket) {
+      for (var socket in List.from(sockets)) {
         socket.onclose(reason);
-      });
+      }
       sockets.clear();
     }
     decoder.destroy(); // clean up decoder

lib/src/engine/server.dart

@@ -134,7 +134,7 @@ class Server extends Engine {
   /// @return {Boolean} whether the request is valid
   /// @api private
 
-  void verify(SocketConnect connect, bool upgrade, fn) {
+  dynamic verify(SocketConnect connect, bool upgrade, fn) {
     // transport check
     var req = connect.request;
     var transport = req.uri.queryParameters['transport'];
@@ -261,7 +261,7 @@ class Server extends Engine {
     var id = generateId(connect);
 
     _logger.fine('handshaking client $id');
-    var transport;
+    dynamic transport;
     var req = connect.request;
     try {
       transport = Transports.newInstance(transportName, connect);
@@ -285,11 +285,8 @@ class Server extends Engine {
 
     if (cookie?.isNotEmpty == true) {
       transport.on('headers', (headers) {
-        headers['Set-Cookie'] = '$cookie=${Uri.encodeComponent(id)}' +
-            (cookiePath?.isNotEmpty == true ? '; Path=$cookiePath' : '') +
-            (cookiePath?.isNotEmpty == true && cookieHttpOnly == true
-                ? '; HttpOnly'
-                : '');
+        headers['Set-Cookie'] =
+            '$cookie=${Uri.encodeComponent(id)}${cookiePath?.isNotEmpty == true ? '; Path=$cookiePath' : ''}${cookiePath?.isNotEmpty == true && cookieHttpOnly == true ? '; HttpOnly' : ''}';
       });
     }
 
@@ -433,11 +430,10 @@ class Server extends Engine {
           : code;
       var length = utf8.encode(message).length;
       socket!.add('HTTP/1.1 400 Bad Request\r\n'
-              'Connection: close\r\n'
-              'Content-type: text/html\r\n'
-              'Content-Length: $length\r\n'
-              '\r\n' +
-          message);
+          'Connection: close\r\n'
+          'Content-type: text/html\r\n'
+          'Content-Length: $length\r\n'
+          '\r\n$message');
     }
     socket?.close();
   }

lib/src/engine/socket.dart

@@ -140,10 +140,10 @@ class Socket extends EventEmitter {
   void setTransport(Transport transport) {
     var onError = this.onError;
     var onPacket = this.onPacket;
-    var flush = (_) => this.flush();
-    var onClose = (_) {
+    flush(_) => this.flush();
+    onClose(_) {
       this.onClose('transport close');
-    };
+    }
 
     this.transport = transport;
     this.transport.once('error', onError);
@@ -182,16 +182,16 @@ class Socket extends EventEmitter {
     });
 
     // we force a polling cycle to ensure a fast upgrade
-    var check = () {
+    check() {
       if ('polling' == this.transport.name && this.transport.writable == true) {
         _logger.fine('writing a noop packet to polling for fast upgrade');
         this.transport.send([
           {'type': 'noop'}
         ]);
       }
-    };
+    }
 
-    var onPacket = (packet) {
+    onPacket(packet) {
       if ('ping' == packet['type'] && 'probe' == packet['data']) {
         transport.send([
           {'type': 'pong', 'data': 'probe'}
@@ -221,24 +221,24 @@ class Socket extends EventEmitter {
         cleanupFn['cleanup']();
         transport.close();
       }
-    };
+    }
 
-    var onError = (err) {
+    onError(err) {
       _logger.fine('client did not complete upgrade - $err');
       cleanupFn['cleanup']();
       transport.close();
       transport = null;
-    };
+    }
 
-    var onTransportClose = (_) {
+    onTransportClose(_) {
       onError('transport closed');
-    };
+    }
 
-    var onClose = (_) {
+    onClose(_) {
       onError('socket closed');
-    };
+    }
 
-    var cleanup = () {
+    cleanup() {
       upgrading = false;
       checkIntervalTimer?.cancel();
       checkIntervalTimer = null;
@@ -250,7 +250,8 @@ class Socket extends EventEmitter {
       transport.off('close', onTransportClose);
       transport.off('error', onError);
       off('close', onClose);
-    };
+    }
+
     cleanupFn['cleanup'] = cleanup; // define it later
     transport.on('packet', onPacket);
     transport.once('close', onTransportClose);
@@ -263,7 +264,7 @@ class Socket extends EventEmitter {
   ///
   /// @api private
   void clearTransport() {
-    var cleanup;
+    dynamic cleanup;
 
     var toCleanUp = cleanupFn.length;
 
@@ -311,13 +312,11 @@ class Socket extends EventEmitter {
   /// @api private
   void setupSendCallback() {
     // the message was sent successfully, execute the callback
-    var onDrain = (_) {
+    onDrain(_) {
       if (sentCallbackFn.isNotEmpty) {
         var seqFn = sentCallbackFn[0];
-        if (seqFn is Function) {
-          _logger.fine('executing send callback');
-          seqFn(transport);
-        }
+        _logger.fine('executing send callback');
+        seqFn(transport);
 
         /// else if (Array.isArray(seqFn)) {
         /// _logger.fine('executing batch send callback');
@@ -328,7 +327,7 @@ class Socket extends EventEmitter {
         /// }
         ///            }
       }
-    };
+    }
 
     transport.on('drain', onDrain);
 
@@ -391,7 +390,11 @@ class Socket extends EventEmitter {
       var wbuf = writeBuffer;
       writeBuffer = [];
       if (transport.supportsFraming == false) {
-        sentCallbackFn.add((_) => packetsFn.forEach((f) => f(_)));
+        sentCallbackFn.add((_) {
+          for (var f in packetsFn) {
+            return f();
+          }
+        });
       } else {
         sentCallbackFn.addAll(packetsFn);
       }

lib/src/engine/transport/jsonp_transport.dart

@@ -16,10 +16,8 @@ class JSONPTransport extends PollingTransport {
   late String head;
   late String foot;
   JSONPTransport(SocketConnect connect) : super(connect) {
-    head = '___eio[' +
-        (connect.request.uri.queryParameters['j'] ?? '')
-            .replaceAll(RegExp('[^0-9]'), '') +
-        '](';
+    head =
+        '___eio[${(connect.request.uri.queryParameters['j'] ?? '').replaceAll(RegExp('[^0-9]'), '')}](';
     foot = ');';
   }