fix(example): Adjust example to changes

example/lib/main.dart

@@ -5,7 +5,7 @@ import 'package:moxxmpp/moxxmpp.dart';
 import 'package:moxxmpp_socket_tcp/moxxmpp_socket_tcp.dart';
 
 class ExampleTcpSocketWrapper extends TCPSocketWrapper {
-  ExampleTcpSocketWrapper() : super(false);
+  ExampleTcpSocketWrapper() : super();
 
   @override
   Future<List<MoxSrvRecord>> srvQuery(String domain, bool dnssec) async {
@@ -64,7 +64,7 @@ class _MyHomePageState extends State<MyHomePage> {
     // The below causes the app to crash.
     //ExampleTcpSocketWrapper(),
     // In a production app, the below should be false.
-    TCPSocketWrapper(true),
+    TCPSocketWrapper(),
   );
   TextEditingController jidController = TextEditingController();
   TextEditingController passwordController = TextEditingController();

packages/moxxmpp/lib/src/connection.dart

@@ -397,6 +397,9 @@ class XmppConnection {
       return;
     }
 
+    // Close the socket
+    _socket.close();
+    
     if (!error.isRecoverable()) {
       // We cannot recover this error
       _log.severe(

packages/moxxmpp_socket_tcp/integration_test/badxmpp_certificate_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 Future<void> _runTest(String domain) async {
   var gotTLSException = false;
-  final socket = TCPSocketWrapper(false);
+  final socket = TCPSocketWrapper();
   final log = Logger('TestLogger');
   socket.getEventStream().listen((event) {
     if (event is XmppSocketTLSFailedEvent) {
@@ -15,18 +15,17 @@ Future<void> _runTest(String domain) async {
   });
 
   final connection = XmppConnection(
-    ExponentialBackoffReconnectionPolicy(),
+    TestingReconnectionPolicy(),
+    AlwaysConnectedConnectivityManager(),
     socket,
-  );
+  )..registerFeatureNegotiators([
-  connection.registerFeatureNegotiators([
+      StartTlsNegotiator(),
-    StartTlsNegotiator(),
+    ]);
-  ]);
+  await connection.registerManagers([
-  connection.registerManagers([
+    DiscoManager([]),
-    DiscoManager(),
+    RosterManager(TestingRosterStateManager('', [])),
-    RosterManager(),
-    PingManager(),
     MessageManager(),
-    PresenceManager('http://moxxmpp.example'),
+    PresenceManager(),
   ]);
 
   connection.setConnectionSettings(
@@ -34,18 +33,22 @@ Future<void> _runTest(String domain) async {
       jid: JID.fromString('testuser@$domain'),
       password: 'abc123',
       useDirectTLS: true,
-      allowPlainAuth: true,
     ),
   );
 
-  final result = await connection.connectAwaitable();
+  final result = await connection.connect(
-  expect(result.success, false);
+    shouldReconnect: false,
+    waitUntilLogin: true,
+    enableReconnectOnSuccess: false,
+  );
+  expect(result.isType<XmppError>(), false);
   expect(gotTLSException, true);
 }
 
 void main() {
   Logger.root.level = Level.ALL;
   Logger.root.onRecord.listen((record) {
+    // ignore: avoid_print
     print('${record.level.name}: ${record.time}: ${record.message}');
   });
 

packages/moxxmpp_socket_tcp/integration_test/failure_reconnection_test.dart

@@ -6,93 +6,106 @@ import 'package:test/test.dart';
 void main() {
   Logger.root.level = Level.ALL;
   Logger.root.onRecord.listen((record) {
+    // ignore: avoid_print
     print('${record.level.name}: ${record.time}: ${record.message}');
   });
   final log = Logger('FailureReconnectionTest');
 
-  test('Failing an awaited connection with TestingSleepReconnectionPolicy', () async {
+  test(
-    var errors = 0;
+    'Failing an awaited connection with TestingSleepReconnectionPolicy',
-    final connection = XmppConnection(
+    () async {
-      TestingSleepReconnectionPolicy(10),
+      var errors = 0;
-      TCPSocketWrapper(false),
+      final connection = XmppConnection(
-    );
+        TestingSleepReconnectionPolicy(10),
-    connection.registerFeatureNegotiators([
+        AlwaysConnectedConnectivityManager(),
-      StartTlsNegotiator(),
+        TCPSocketWrapper(),
-    ]);
+      )..registerFeatureNegotiators([
-    connection.registerManagers([
+          StartTlsNegotiator(),
-      DiscoManager(),
+        ]);
-      RosterManager(),
+      await connection.registerManagers([
-      PingManager(),
+        DiscoManager([]),
-      MessageManager(),
+        RosterManager(TestingRosterStateManager('', [])),
-      PresenceManager('http://moxxmpp.example'),
+        MessageManager(),
-    ]);
+        PresenceManager(),
-    connection.asBroadcastStream().listen((event) {
+      ]);
-      if (event is ConnectionStateChangedEvent) {
+      connection.asBroadcastStream().listen((event) {
-        if (event.state == XmppConnectionState.error) {
+        if (event is ConnectionStateChangedEvent) {
-          errors++;
+          if (event.state == XmppConnectionState.error) {
+            errors++;
+          }
         }
-      }
+      });
-    });
 
-    connection.setConnectionSettings(
+      connection.setConnectionSettings(
-      ConnectionSettings(
+        ConnectionSettings(
-        jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
+          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
-        password: 'abc123',
+          password: 'abc123',
-        useDirectTLS: true,
+          useDirectTLS: true,
-        allowPlainAuth: true,
+        ),
-      ),
+      );
-    );
 
-    final result = await connection.connectAwaitable();
+      final result = await connection.connect(
-    log.info('Connection failed as expected');
+        shouldReconnect: false,
-    expect(result.success, false);
+        waitUntilLogin: true,
-    expect(errors, 1);
+        enableReconnectOnSuccess: false,
+      );
+      log.info('Connection failed as expected');
+      expect(result.isType<XmppError>(), false);
+      expect(errors, 1);
 
-    log.info('Waiting 20 seconds for unexpected reconnections');
+      log.info('Waiting 20 seconds for unexpected reconnections');
-    await Future.delayed(const Duration(seconds: 20));
+      await Future<void>.delayed(const Duration(seconds: 20));
-    expect(errors, 1);
+      expect(errors, 1);
-  }, timeout: Timeout.factor(2));
+    },
+    timeout: const Timeout.factor(2),
+  );
 
-  test('Failing an awaited connection with ExponentialBackoffReconnectionPolicy', () async {
+  test(
-    var errors = 0;
+    'Failing an awaited connection with ExponentialBackoffReconnectionPolicy',
-    final connection = XmppConnection(
+    () async {
-      ExponentialBackoffReconnectionPolicy(1),
+      var errors = 0;
-      TCPSocketWrapper(false),
+      final connection = XmppConnection(
-    );
+        TestingReconnectionPolicy(),
-    connection.registerFeatureNegotiators([
+        AlwaysConnectedConnectivityManager(),
-      StartTlsNegotiator(),
+        TCPSocketWrapper(),
-    ]);
+      )..registerFeatureNegotiators([
-    connection.registerManagers([
+          StartTlsNegotiator(),
-      DiscoManager(),
+        ]);
-      RosterManager(),
+      await connection.registerManagers([
-      PingManager(),
+        DiscoManager([]),
-      MessageManager(),
+        RosterManager(TestingRosterStateManager('', [])),
-      PresenceManager('http://moxxmpp.example'),
+        MessageManager(),
-    ]);
+        PresenceManager(),
-    connection.asBroadcastStream().listen((event) {
+      ]);
-      if (event is ConnectionStateChangedEvent) {
+      connection.asBroadcastStream().listen((event) {
-        if (event.state == XmppConnectionState.error) {
+        if (event is ConnectionStateChangedEvent) {
-          errors++;
+          if (event.state == XmppConnectionState.error) {
+            errors++;
+          }
         }
-      }
+      });
-    });
 
-    connection.setConnectionSettings(
+      connection.setConnectionSettings(
-      ConnectionSettings(
+        ConnectionSettings(
-        jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
+          jid: JID.fromString('testuser@no-sasl.badxmpp.eu'),
-        password: 'abc123',
+          password: 'abc123',
-        useDirectTLS: true,
+          useDirectTLS: true,
-        allowPlainAuth: true,
+        ),
-      ),
+      );
-    );
 
-    final result = await connection.connectAwaitable();
+      final result = await connection.connect(
-    log.info('Connection failed as expected');
+        shouldReconnect: false,
-    expect(result.success, false);
+        waitUntilLogin: true,
-    expect(errors, 1);
+        enableReconnectOnSuccess: false,
+      );
+      log.info('Connection failed as expected');
+      expect(result.isType<XmppError>(), false);
+      expect(errors, 1);
 
-    log.info('Waiting 20 seconds for unexpected reconnections');
+      log.info('Waiting 20 seconds for unexpected reconnections');
-    await Future.delayed(const Duration(seconds: 20));
+      await Future<void>.delayed(const Duration(seconds: 20));
-    expect(errors, 1);
+      expect(errors, 1);
-  }, timeout: Timeout.factor(2));
+    },
+    timeout: const Timeout.factor(2),
+  );
 }

packages/moxxmpp_socket_tcp/integration_test/no_service_test.dart

@@ -0,0 +1 @@
+

packages/moxxmpp_socket_tcp/lib/src/socket.dart

@@ -10,8 +10,6 @@ import 'package:moxxmpp_socket_tcp/src/rfc_2782.dart';
 
 /// TCP socket implementation for XmppConnection
 class TCPSocketWrapper extends BaseSocketWrapper {
-  TCPSocketWrapper(this._logData);
-
   /// The underlying Socket/SecureSocket instance.
   Socket? _socket;
 
@@ -31,9 +29,6 @@ class TCPSocketWrapper extends BaseSocketWrapper {
   /// Logger
   final Logger _log = Logger('TCPSocketWrapper');
 
-  /// Flag to indicate if incoming and outgoing data should get logged.
-  final bool _logData;
-
   /// Indiacted whether the connection is secure.
   bool _secure = false;
 
@@ -217,9 +212,7 @@ class TCPSocketWrapper extends BaseSocketWrapper {
     _socketSubscription = _socket!.listen(
       (List<int> event) {
         final data = utf8.decode(event);
-        if (_logData) {
+        _log.finest('<== $data');
-          _log.finest('<== $data');
-        }
         _dataStream.add(data);
       },
       onError: (Object error) {
@@ -296,18 +289,16 @@ class TCPSocketWrapper extends BaseSocketWrapper {
       _eventStream.stream.asBroadcastStream();
 
   @override
-  void write(Object? data, {String? redact}) {
+  void write(String data, {String? redact}) {
     if (_socket == null) {
       _log.severe('Failed to write to socket as _socket is null');
       return;
     }
 
-    if (data != null && data is String && _logData) {
+    if (redact != null) {
-      if (redact != null) {
+      _log.finest('**> $redact');
-        _log.finest('**> $redact');
+    } else {
-      } else {
+      _log.finest('==> $data');
-        _log.finest('==> $data');
-      }
     }
 
     try {