feat(all): Migrate to the new StanzaDetails API

.gitlint

@@ -7,7 +7,7 @@ line-length=72
 [title-trailing-punctuation]
 [title-hard-tab]
 [title-match-regex]
-regex=^((feat|fix|chore|refactor|docs|release|test)\((meta|tests|style|docs|xep|core|example)+(,(meta|tests|style|docs|xep|core|example))*\)|release): [A-Z0-9].*$
+regex=^((feat|fix|chore|refactor|docs|release|test)\((meta|tests|style|docs|xep|core|example|all)+(,(meta|tests|style|docs|xep|core|example|all))*\)|release): [A-Z0-9].*$
 
 
 [body-trailing-whitespace]

packages/moxxmpp/CHANGELOG.md

@@ -9,6 +9,8 @@
 - **BREAKING**: Remove `DiscoManager.discoInfoCapHashQuery`.
 - **BREAKING**: The entity argument of `DiscoManager.discoInfoQuery` and `DiscoManager.discoItemsQuery` are now `JID` instead of `String`.
 - **BREAKING**: `PubSubManager` and `UserAvatarManager` now use `JID` instead of `String`.
+- **BREAKING**: `XmppConnection.sendStanza` not only takes a `StanzaDetails` argument.
+- Sent stanzas are not kept in a queue until sent.
 
 ## 0.3.1
 

packages/moxxmpp/lib/src/connection.dart

@@ -420,12 +420,17 @@ class XmppConnection {
         .contains(await getConnectionState());
   }
 
-  Future<Future<XMLNode>?> sendStanza2(StanzaDetails details) async {
+  /// Sends a stanza described by [details] to the server. Until sent, the stanza is
+  /// kept in a queue, that is flushed after going online again. If Stream Management
+  /// is active, stanza's acknowledgement is tracked.
+  // TODO(Unknown): if addId = false, the function crashes.
+  Future<XMLNode?> sendStanza(StanzaDetails details) async {
     assert(
       implies(
         details.awaitable,
         details.stanza.id != null && details.stanza.id!.isNotEmpty ||
-              details.addId),
+            details.addId,
+      ),
       'An awaitable stanza must have an id',
     );
 
@@ -550,131 +555,6 @@ class XmppConnection {
     _log.fine('Done');
   }
 
-  /// Sends a [stanza] to the server. If stream management is enabled, then keeping track
-  /// of the stanza is taken care of. Returns a Future that resolves when we receive a
-  /// response to the stanza.
-  ///
-  /// If addFrom is true, then a 'from' attribute will be added to the stanza if
-  /// [stanza] has none.
-  /// If addId is true, then an 'id' attribute will be added to the stanza if [stanza] has
-  /// none.
-  // TODO(Unknown): if addId = false, the function crashes.
-  Future<XMLNode> sendStanza(
-    Stanza stanza, {
-    StanzaFromType addFrom = StanzaFromType.full,
-    bool addId = true,
-    bool awaitable = true,
-    bool encrypted = false,
-    bool forceEncryption = false,
-  }) async {
-    assert(
-      implies(addId == false && stanza.id == null, !awaitable),
-      'Cannot await a stanza with no id',
-    );
-
-    // Add extra data in case it was not set
-    var stanza_ = stanza;
-    if (addId && (stanza_.id == null || stanza_.id == '')) {
-      stanza_ = stanza.copyWith(id: generateId());
-    }
-    if (addFrom != StanzaFromType.none &&
-        (stanza_.from == null || stanza_.from == '')) {
-      switch (addFrom) {
-        case StanzaFromType.full:
-          {
-            stanza_ = stanza_.copyWith(
-              from: _getJidWithResource().toString(),
-            );
-          }
-          break;
-        case StanzaFromType.bare:
-          {
-            stanza_ = stanza_.copyWith(
-              from: connectionSettings.jid.toBare().toString(),
-            );
-          }
-          break;
-        case StanzaFromType.none:
-          break;
-      }
-    }
-    stanza_ = stanza_.copyWith(
-      xmlns: _negotiationsHandler.getStanzaNamespace(),
-    );
-
-    _log.fine('Running pre stanza handlers..');
-    final data = await _runOutgoingPreStanzaHandlers(
-      stanza_,
-      initial: StanzaHandlerData(
-        false,
-        false,
-        null,
-        stanza_,
-        encrypted: encrypted,
-        forceEncryption: forceEncryption,
-      ),
-    );
-    _log.fine('Done');
-
-    if (data.cancel) {
-      _log.fine('A stanza handler indicated that it wants to cancel sending.');
-      await _sendEvent(StanzaSendingCancelledEvent(data));
-      return Stanza(
-        tag: data.stanza.tag,
-        to: data.stanza.from,
-        from: data.stanza.to,
-        attributes: <String, String>{
-          'type': 'error',
-          if (data.stanza.id != null) 'id': data.stanza.id!,
-        },
-      );
-    }
-
-    final prefix = data.encrypted ? '(Encrypted) ' : '';
-    _log.finest('==> $prefix${stanza_.toXml()}');
-
-    final stanzaString = data.stanza.toXml();
-
-    // ignore: cascade_invocations
-    _log.fine('Attempting to acquire lock for ${data.stanza.id}...');
-    // TODO(PapaTutuWawa): Handle this much more graceful
-    var future = Future.value(XMLNode(tag: 'not-used'));
-    if (awaitable) {
-      future = await _stanzaAwaiter.addPending(
-        // A stanza with no to attribute is for direct processing by the server. As such,
-        // we can correlate it by just *assuming* we have that attribute
-        // (RFC 6120 Section 8.1.1.1)
-        data.stanza.to ?? connectionSettings.jid.toBare().toString(),
-        data.stanza.id!,
-        data.stanza.tag,
-      );
-    }
-
-    // This uses the StreamManager to behave like a send queue
-    if (await _canSendData()) {
-      _socket.write(stanzaString);
-
-      // Try to ack every stanza
-      // NOTE: Here we have send an Ack request nonza. This is now done by StreamManagementManager when receiving the StanzaSentEvent
-    } else {
-      _log.fine('_canSendData() returned false.');
-    }
-
-    _log.fine('Running post stanza handlers..');
-    await _runOutgoingPostStanzaHandlers(
-      stanza_,
-      initial: StanzaHandlerData(
-        false,
-        false,
-        null,
-        stanza_,
-      ),
-    );
-    _log.fine('Done');
-
-    return future;
-  }
-
   /// Called when we timeout during connecting
   Future<void> _onConnectingTimeout() async {
     _log.severe('Connection stuck in "connecting". Causing a reconnection...');
@@ -696,18 +576,11 @@ class XmppConnection {
     // Set the new routing state
     _updateRoutingState(RoutingState.handleStanzas);
 
-    // Set the connection state
-    await _setConnectionState(XmppConnectionState.connected);
-
     // Enable reconnections
     if (_enableReconnectOnSuccess) {
       await _reconnectionPolicy.setShouldReconnect(true);
     }
 
-    // Resolve the connection completion future
-    _connectionCompleter?.complete(const Result(true));
-    _connectionCompleter = null;
-
     // Tell consumers of the event stream that we're done with stream feature
     // negotiations
     await _sendEvent(
@@ -716,6 +589,16 @@ class XmppConnection {
             false,
       ),
     );
+
+    // Set the connection state
+    await _setConnectionState(XmppConnectionState.connected);
+
+    // Resolve the connection completion future
+    _connectionCompleter?.complete(const Result(true));
+    _connectionCompleter = null;
+
+    // Flush the stanza send queue
+    await _stanzaQueue.restart();
   }
 
   /// Sets the connection state to [state] and triggers an event of type

packages/moxxmpp/lib/src/iq.dart

@@ -1,6 +1,7 @@
 import 'package:moxxmpp/src/connection.dart';
 import 'package:moxxmpp/src/managers/data.dart';
 import 'package:moxxmpp/src/stanza.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 /// Bounce a stanza if it was not handled by any manager. [conn] is the connection object
 /// to use for sending the stanza. [data] is the StanzaHandlerData of the unhandled
@@ -23,9 +24,11 @@ Future<void> handleUnhandledStanza(
     );
 
     await conn.sendStanza(
+      StanzaDetails(
         stanza,
         awaitable: false,
         forceEncryption: data.encrypted,
+      ),
     );
   }
 }

packages/moxxmpp/lib/src/managers/attributes.dart

@@ -6,8 +6,8 @@ import 'package:moxxmpp/src/managers/base.dart';
 import 'package:moxxmpp/src/negotiators/negotiator.dart';
 import 'package:moxxmpp/src/settings.dart';
 import 'package:moxxmpp/src/socket.dart';
-import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 class XmppManagerAttributes {
   XmppManagerAttributes({
@@ -23,14 +23,7 @@ class XmppManagerAttributes {
   });
 
   /// Send a stanza whose response can be awaited.
-  final Future<XMLNode> Function(
+  final Future<XMLNode?> Function(StanzaDetails) sendStanza;
-    Stanza stanza, {
-    StanzaFromType addFrom,
-    bool addId,
-    bool awaitable,
-    bool encrypted,
-    bool forceEncryption,
-  }) sendStanza;
 
   /// Send a nonza.
   final void Function(XMLNode) sendNonza;

packages/moxxmpp/lib/src/managers/base.dart

@@ -6,6 +6,7 @@ import 'package:moxxmpp/src/managers/data.dart';
 import 'package:moxxmpp/src/managers/handlers.dart';
 import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
@@ -165,9 +166,11 @@ abstract class XmppManagerBase {
     );
 
     await getAttributes().sendStanza(
+      StanzaDetails(
         stanza,
         awaitable: false,
         forceEncryption: data.encrypted,
+      ),
     );
   }
 }

packages/moxxmpp/lib/src/message.dart

@@ -8,6 +8,7 @@ import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/staging/file_upload_notification.dart';
 import 'package:moxxmpp/src/xeps/xep_0066.dart';
 import 'package:moxxmpp/src/xeps/xep_0085.dart';
@@ -320,6 +321,11 @@ class MessageManager extends XmppManagerBase {
       );
     }
 
-    getAttributes().sendStanza(stanza, awaitable: false);
+    getAttributes().sendStanza(
+      StanzaDetails(
+        stanza,
+        awaitable: false,
+      ),
+    );
   }
 }

packages/moxxmpp/lib/src/presence.dart

@@ -7,10 +7,9 @@ import 'package:moxxmpp/src/managers/data.dart';
 import 'package:moxxmpp/src/managers/handlers.dart';
 import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
-import 'package:moxxmpp/src/negotiators/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
-import 'package:moxxmpp/src/xeps/xep_0198/negotiator.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 /// A function that will be called when presence, outside of subscription request
 /// management, will be sent. Useful for managers that want to add [XMLNode]s to said
@@ -49,12 +48,8 @@ class PresenceManager extends XmppManagerBase {
   Future<void> onXmppEvent(XmppEvent event) async {
     if (event is StreamNegotiationsDoneEvent) {
       // Send initial presence only when we have not resumed the stream
-      final sm = getAttributes().getNegotiatorById<StreamManagementNegotiator>(
+      if (!event.resumed) {
-        streamManagementNegotiator,
+        await sendInitialPresence();
-      );
-      final isResumed = sm?.isResumed ?? false;
-      if (!isResumed) {
-        unawaited(sendInitialPresence());
       }
     }
   }
@@ -108,66 +103,82 @@ class PresenceManager extends XmppManagerBase {
 
     final attrs = getAttributes();
     await attrs.sendStanza(
+      StanzaDetails(
         Stanza.presence(
           from: attrs.getFullJID().toString(),
           children: children,
         ),
         awaitable: false,
         addId: false,
+      ),
     );
   }
 
   /// Send an unavailable presence with no 'to' attribute.
   void sendUnavailablePresence() {
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.presence(
           type: 'unavailable',
         ),
-      addFrom: StanzaFromType.full,
+        awaitable: false,
+      ),
     );
   }
 
   /// Sends a subscription request to [to].
   void sendSubscriptionRequest(String to) {
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.presence(
           type: 'subscribe',
           to: to,
         ),
         addFrom: StanzaFromType.none,
+        awaitable: false,
+      ),
     );
   }
 
   /// Sends an unsubscription request to [to].
   void sendUnsubscriptionRequest(String to) {
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.presence(
           type: 'unsubscribe',
           to: to,
         ),
         addFrom: StanzaFromType.none,
+        awaitable: false,
+      ),
     );
   }
 
   /// Accept a presence subscription request for [to].
   void sendSubscriptionRequestApproval(String to) {
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.presence(
           type: 'subscribed',
           to: to,
         ),
         addFrom: StanzaFromType.none,
+        awaitable: false,
+      ),
     );
   }
 
   /// Reject a presence subscription request for [to].
   void sendSubscriptionRequestRejection(String to) {
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.presence(
           type: 'unsubscribed',
           to: to,
         ),
         addFrom: StanzaFromType.none,
+        awaitable: false,
+      ),
     );
   }
 }

packages/moxxmpp/lib/src/roster/roster.dart

@@ -15,6 +15,7 @@ import 'package:moxxmpp/src/roster/state.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 @immutable
 class XmppRosterItem {
@@ -235,14 +236,16 @@ class RosterManager extends XmppManagerBase {
       query.attributes['ver'] = rosterVersion;
     }
 
-    final response = await attrs.sendStanza(
+    final response = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           children: [
             query,
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (response.attributes['type'] != 'result') {
       logger.warning('Error requesting roster: ${response.toXml()}');
@@ -258,7 +261,8 @@ class RosterManager extends XmppManagerBase {
   Future<Result<RosterRequestResult?, RosterError>>
       requestRosterPushes() async {
     final attrs = getAttributes();
-    final result = await attrs.sendStanza(
+    final result = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           children: [
@@ -271,7 +275,8 @@ class RosterManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       logger.warning('Requesting roster pushes failed: ${result.toXml()}');
@@ -296,7 +301,8 @@ class RosterManager extends XmppManagerBase {
     List<String>? groups,
   }) async {
     final attrs = getAttributes();
-    final response = await attrs.sendStanza(
+    final response = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -317,10 +323,11 @@ class RosterManager extends XmppManagerBase {
                       .toList(),
                 )
               ],
-          )
+            ),
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (response.attributes['type'] != 'result') {
       logger.severe('Error adding $jid to roster: $response');
@@ -334,7 +341,8 @@ class RosterManager extends XmppManagerBase {
   /// false otherwise.
   Future<RosterRemovalResult> removeFromRoster(String jid) async {
     final attrs = getAttributes();
-    final response = await attrs.sendStanza(
+    final response = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -353,7 +361,8 @@ class RosterManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (response.attributes['type'] != 'result') {
       logger.severe('Failed to remove roster item: ${response.toXml()}');

packages/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart

@@ -10,6 +10,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/util/wait.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/cache.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
@@ -291,10 +292,12 @@ class DiscoManager extends XmppManagerBase {
       }
     }
 
-    final stanza = await getAttributes().sendStanza(
+    final stanza = (await getAttributes().sendStanza(
+      StanzaDetails(
         buildDiscoInfoQueryStanza(entity, node),
         encrypted: !shouldEncrypt,
-    );
+      ),
+    ))!;
     final query = stanza.firstTag('query');
     if (query == null) {
       final result = Result<DiscoError, DiscoInfo>(InvalidResponseDiscoError());
@@ -331,10 +334,12 @@ class DiscoManager extends XmppManagerBase {
       return future;
     }
 
-    final stanza = await getAttributes().sendStanza(
+    final stanza = (await getAttributes().sendStanza(
+      StanzaDetails(
         buildDiscoItemsQueryStanza(entity, node: node),
         encrypted: !shouldEncrypt,
-    ) as Stanza;
+      ),
+    ))!;
 
     final query = stanza.firstTag('query');
     if (query == null) {
@@ -344,7 +349,7 @@ class DiscoManager extends XmppManagerBase {
       return result;
     }
 
-    if (stanza.type == 'error') {
+    if (stanza.attributes['type'] == 'error') {
       //final error = stanza.firstTag('error');
       //print("Disco Items error: " + error.toXml());
       final result =

packages/moxxmpp/lib/src/xeps/xep_0054.dart

@@ -8,6 +8,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 abstract class VCardError {}
 
@@ -103,7 +104,8 @@ class VCardManager extends XmppManagerBase {
   }
 
   Future<Result<VCardError, VCard>> requestVCard(String jid) async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           to: jid,
           type: 'get',
@@ -115,7 +117,8 @@ class VCardManager extends XmppManagerBase {
           ],
         ),
         encrypted: true,
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       return Result(UnknownVCardError());

packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart

@@ -10,6 +10,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0004.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
@@ -181,7 +182,8 @@ class PubSubManager extends XmppManagerBase {
 
   Future<Result<PubSubError, bool>> subscribe(String jid, String node) async {
     final attrs = getAttributes();
-    final result = await attrs.sendStanza(
+    final result = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: jid,
@@ -201,7 +203,8 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       return Result(UnknownPubSubError());
@@ -222,7 +225,8 @@ class PubSubManager extends XmppManagerBase {
 
   Future<Result<PubSubError, bool>> unsubscribe(String jid, String node) async {
     final attrs = getAttributes();
-    final result = await attrs.sendStanza(
+    final result = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: jid,
@@ -242,7 +246,8 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       return Result(UnknownPubSubError());
@@ -293,7 +298,8 @@ class PubSubManager extends XmppManagerBase {
       pubOptions = await preprocessPublishOptions(jid, node, options);
     }
 
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: jid.toString(),
@@ -324,7 +330,8 @@ class PubSubManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
     if (result.attributes['type'] != 'result') {
       final error = getPubSubError(result);
 
@@ -395,7 +402,8 @@ class PubSubManager extends XmppManagerBase {
     String jid,
     String node,
   ) async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           to: jid,
@@ -404,12 +412,16 @@ class PubSubManager extends XmppManagerBase {
               tag: 'pubsub',
               xmlns: pubsubXmlns,
               children: [
-              XMLNode(tag: 'items', attributes: <String, String>{'node': node}),
+                XMLNode(
+                  tag: 'items',
+                  attributes: <String, String>{'node': node},
+                ),
               ],
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       return Result(getPubSubError(result));
@@ -436,7 +448,8 @@ class PubSubManager extends XmppManagerBase {
     String node,
     String id,
   ) async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           to: jid,
@@ -459,7 +472,8 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (result.attributes['type'] != 'result') {
       return Result(getPubSubError(result));
@@ -488,7 +502,8 @@ class PubSubManager extends XmppManagerBase {
     final attrs = getAttributes();
 
     // Request the form
-    final form = await attrs.sendStanza(
+    final form = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           to: jid.toString(),
@@ -507,12 +522,14 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    );
+      ),
+    ))!;
     if (form.attributes['type'] != 'result') {
       return Result(getPubSubError(form));
     }
 
-    final submit = await attrs.sendStanza(
+    final submit = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: jid.toString(),
@@ -534,7 +551,8 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    );
+      ),
+    ))!;
     if (submit.attributes['type'] != 'result') {
       return Result(getPubSubError(form));
     }
@@ -543,7 +561,8 @@ class PubSubManager extends XmppManagerBase {
   }
 
   Future<Result<PubSubError, bool>> delete(JID host, String node) async {
-    final request = await getAttributes().sendStanza(
+    final request = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: host.toString(),
@@ -562,9 +581,10 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    ) as Stanza;
+      ),
+    ))!;
 
-    if (request.type != 'result') {
+    if (request.attributes['type'] != 'result') {
       // TODO(Unknown): Be more specific
       return Result(UnknownPubSubError());
     }
@@ -577,7 +597,8 @@ class PubSubManager extends XmppManagerBase {
     String node,
     String itemId,
   ) async {
-    final request = await getAttributes().sendStanza(
+    final request = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           to: host.toString(),
@@ -604,9 +625,10 @@ class PubSubManager extends XmppManagerBase {
             ),
           ],
         ),
-    ) as Stanza;
+      ),
+    ))!;
 
-    if (request.type != 'result') {
+    if (request.attributes['type'] != 'result') {
       // TODO(Unknown): Be more specific
       return Result(UnknownPubSubError());
     }

packages/moxxmpp/lib/src/xeps/xep_0085.dart

@@ -5,6 +5,7 @@ import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 
 enum ChatState { active, composing, paused, inactive, gone }
 
@@ -111,10 +112,14 @@ class ChatStateManager extends XmppManagerBase {
     final tagName = state.toString().split('.').last;
 
     getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.message(
           to: to,
           type: messageType,
-        children: [XMLNode.xmlns(tag: tagName, xmlns: chatStateXmlns)],
+          children: [
+            XMLNode.xmlns(tag: tagName, xmlns: chatStateXmlns),
+          ],
+        ),
       ),
     );
   }

packages/moxxmpp/lib/src/xeps/xep_0191.dart

@@ -6,6 +6,7 @@ import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
 
 class BlockingManager extends XmppManagerBase {
@@ -96,7 +97,8 @@ class BlockingManager extends XmppManagerBase {
   }
 
   Future<bool> block(List<String> items) async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -112,13 +114,15 @@ class BlockingManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     return result.attributes['type'] == 'result';
   }
 
   Future<bool> unblockAll() async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -128,7 +132,8 @@ class BlockingManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     return result.attributes['type'] == 'result';
   }
@@ -136,7 +141,8 @@ class BlockingManager extends XmppManagerBase {
   Future<bool> unblock(List<String> items) async {
     assert(items.isNotEmpty, 'The list of items to unblock must be non-empty');
 
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -154,13 +160,15 @@ class BlockingManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     return result.attributes['type'] == 'result';
   }
 
   Future<List<String>> getBlocklist() async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'get',
           children: [
@@ -170,7 +178,8 @@ class BlockingManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     final blocklist = result.firstTag('blocklist', xmlns: blockingXmlns)!;
     return blocklist

packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart

@@ -11,6 +11,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/negotiators/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0198/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0198/negotiator.dart';
 import 'package:moxxmpp/src/xeps/xep_0198/nonzas.dart';
@@ -414,7 +415,12 @@ class StreamManagementManager extends XmppManagerBase {
     _unackedStanzas.clear();
 
     for (final stanza in stanzas) {
-      await getAttributes().sendStanza(stanza, awaitable: false);
+      await getAttributes().sendStanza(
+        StanzaDetails(
+          stanza,
+          awaitable: false,
+        ),
+      );
     }
   }
 

packages/moxxmpp/lib/src/xeps/xep_0280.dart

@@ -1,6 +1,5 @@
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:moxxmpp/src/connection.dart';
 import 'package:moxxmpp/src/events.dart';
 import 'package:moxxmpp/src/jid.dart';
 import 'package:moxxmpp/src/managers/base.dart';
@@ -11,6 +10,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/negotiators/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
 import 'package:moxxmpp/src/xeps/xep_0297.dart';
 import 'package:moxxmpp/src/xeps/xep_0386.dart';
@@ -111,7 +111,8 @@ class CarbonsManager extends XmppManagerBase {
   /// Returns true if carbons were enabled. False, if not.
   Future<bool> enableCarbons() async {
     final attrs = getAttributes();
-    final result = await attrs.sendStanza(
+    final result = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           to: attrs.getFullJID().toBare().toString(),
           type: 'set',
@@ -122,9 +123,8 @@ class CarbonsManager extends XmppManagerBase {
             )
           ],
         ),
-      addFrom: StanzaFromType.full,
+      ),
-      addId: true,
+    ))!;
-    );
 
     if (result.attributes['type'] != 'result') {
       logger.warning('Failed to enable message carbons');
@@ -142,7 +142,8 @@ class CarbonsManager extends XmppManagerBase {
   ///
   /// Returns true if carbons were disabled. False, if not.
   Future<bool> disableCarbons() async {
-    final result = await getAttributes().sendStanza(
+    final result = (await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.iq(
           type: 'set',
           children: [
@@ -152,9 +153,8 @@ class CarbonsManager extends XmppManagerBase {
             )
           ],
         ),
-      addFrom: StanzaFromType.full,
+      ),
-      addId: true,
+    ))!;
-    );
 
     if (result.attributes['type'] != 'result') {
       logger.warning('Failed to disable message carbons');

packages/moxxmpp/lib/src/xeps/xep_0363/xep_0363.dart

@@ -8,6 +8,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
@@ -149,7 +150,8 @@ class HttpFileUploadManager extends XmppManagerBase {
     }
 
     final attrs = getAttributes();
-    final response = await attrs.sendStanza(
+    final response = (await attrs.sendStanza(
+      StanzaDetails(
         Stanza.iq(
           to: _entityJid.toString(),
           type: 'get',
@@ -165,7 +167,8 @@ class HttpFileUploadManager extends XmppManagerBase {
             )
           ],
         ),
-    );
+      ),
+    ))!;
 
     if (response.attributes['type']! != 'result') {
       logger.severe('Failed to request HTTP File Upload slot.');

packages/moxxmpp/lib/src/xeps/xep_0384/xep_0384.dart

@@ -11,6 +11,7 @@ import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
@@ -262,6 +263,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
     String toJid,
   ) async {
     await getAttributes().sendStanza(
+      StanzaDetails(
         Stanza.message(
           to: toJid,
           type: 'chat',
@@ -280,6 +282,7 @@ abstract class BaseOmemoManager extends XmppManagerBase {
         ),
         awaitable: false,
         encrypted: true,
+      ),
     );
   }
 

packages/moxxmpp/test/xeps/xep_0198_test.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:test/test.dart';
 import '../helpers/logging.dart';
 import '../helpers/xmpp.dart';
@@ -44,15 +45,8 @@ Future<void> runOutgoingStanzaHandlers(
 
 XmppManagerAttributes mkAttributes(void Function(Stanza) callback) {
   return XmppManagerAttributes(
-    sendStanza: (
+    sendStanza: (StanzaDetails details) async {
-      stanza, {
+      callback(details.stanza);
-      StanzaFromType addFrom = StanzaFromType.full,
-      bool addId = true,
-      bool awaitable = true,
-      bool encrypted = false,
-      bool forceEncryption = false,
-    }) async {
-      callback(stanza);
 
       return Stanza.message();
     },
@@ -290,12 +284,8 @@ void main() {
         );
       final sm = StreamManagementManager();
       await conn.registerManagers([
-        PresenceManager(),
-        RosterManager(TestingRosterStateManager('', [])),
-        DiscoManager([]),
         sm,
         CarbonsManager()..forceEnable(),
-        EntityCapabilitiesManager('http://moxxmpp.example'),
       ]);
       await conn.registerFeatureNegotiators([
         SaslPlainNegotiator(),
@@ -776,7 +766,11 @@ void main() {
 
     // Send a bogus stanza
     unawaited(
-      conn.sendStanza(Stanza.iq(to: 'localhost', type: 'get')),
+      conn.sendStanza(
+        StanzaDetails(
+          Stanza.iq(to: 'localhost', type: 'get'),
+        ),
+      ),
     );
 
     await Future<void>.delayed(const Duration(seconds: 5));

packages/moxxmpp/test/xeps/xep_0280_test.dart

@@ -1,4 +1,5 @@
 import 'package:moxxmpp/moxxmpp.dart';
+import 'package:moxxmpp/src/util/queue.dart';
 import 'package:test/test.dart';
 import '../helpers/logging.dart';
 import '../helpers/xmpp.dart';
@@ -9,17 +10,9 @@ void main() {
   test("Test if we're vulnerable against CVE-2020-26547 style vulnerabilities",
       () async {
     final attributes = XmppManagerAttributes(
-      sendStanza: (
+      sendStanza: (StanzaDetails details) async {
-        stanza, {
-        StanzaFromType addFrom = StanzaFromType.full,
-        bool addId = true,
-        bool retransmitted = false,
-        bool awaitable = true,
-        bool encrypted = false,
-        bool forceEncryption = false,
-      }) async {
         // ignore: avoid_print
-        print('==> ${stanza.toXml()}');
+        print('==> ${details.stanza.toXml()}');
         return XMLNode(tag: 'iq', attributes: {'type': 'result'});
       },
       sendNonza: (nonza) {},

packages/moxxmpp/test/xmpp_test.dart

@@ -131,11 +131,7 @@ void main() {
         password: 'aaaa',
       );
     await conn.registerManagers([
-      PresenceManager(),
-      RosterManager(TestingRosterStateManager('', [])),
-      DiscoManager([]),
       StreamManagementManager(),
-      EntityCapabilitiesManager('http://moxxmpp.example'),
     ]);
     await conn.registerFeatureNegotiators([
       SaslPlainNegotiator(),