packages/moxxmpp/lib/src/connection.dart

@@ -84,10 +84,6 @@ class XmppConnection {
       () => _isAuthenticated,
       sendRawXML,
       () => connectionSettings,
-      () {
-        _log.finest('Resetting stream parser');
-        _streamParser.reset();
-      },
     );
 
     _socketStream = _socket.getDataStream();
@@ -750,9 +746,7 @@ class XmppConnection {
       ),
     );
     if (!incomingHandlers.done) {
-      _log.warning(
+      _log.warning('Returning error for unhandled stanza');
-        'Returning error for unhandled stanza ${incomingPreHandlers.stanza.tag}',
-      );
       await handleUnhandledStanza(this, incomingPreHandlers);
     }
   }
@@ -815,6 +809,8 @@ class XmppConnection {
 
   /// Sends an event to the connection's event stream.
   Future<void> _sendEvent(XmppEvent event) async {
+    _log.finest('Event: ${event.toString()}');
+
     for (final manager in _xmppManagers.values) {
       await manager.onXmppEvent(event);
     }

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

@@ -22,9 +22,6 @@ typedef SendNonzaFunction = void Function(XMLNode);
 /// Returns the connection settings.
 typedef GetConnectionSettingsFunction = ConnectionSettings Function();
 
-/// Resets the stream parser's state.
-typedef ResetStreamParserFunction = void Function();
-
 /// This class implements the stream feature negotiation for XmppConnection.
 abstract class NegotiationsHandler {
   @protected
@@ -54,9 +51,6 @@ abstract class NegotiationsHandler {
   @protected
   late final GetConnectionSettingsFunction getConnectionSettings;
 
-  @protected
-  late final ResetStreamParserFunction resetStreamParser;
-
   /// The id included in the last stream header.
   @protected
   String? streamId;
@@ -78,14 +72,12 @@ abstract class NegotiationsHandler {
     IsAuthenticatedFunction isAuthenticated,
     SendNonzaFunction sendNonza,
     GetConnectionSettingsFunction getConnectionSettings,
-    ResetStreamParserFunction resetStreamParser,
   ) {
     this.onNegotiationsDone = onNegotiationsDone;
     this.handleError = handleError;
     this.isAuthenticated = isAuthenticated;
     this.sendNonza = sendNonza;
     this.getConnectionSettings = getConnectionSettings;
-    this.resetStreamParser = resetStreamParser;
     log = Logger(toString());
   }
 

packages/moxxmpp/lib/src/handlers/client.dart

@@ -60,7 +60,6 @@ class ClientToServerNegotiator extends NegotiationsHandler {
 
   @override
   void sendStreamHeader() {
-    resetStreamParser();
     sendNonza(
       XMLNode(
         tag: 'xml',

packages/moxxmpp/lib/src/handlers/component.dart

@@ -49,7 +49,6 @@ class ComponentToServerNegotiator extends NegotiationsHandler {
 
   @override
   void sendStreamHeader() {
-    resetStreamParser();
     sendNonza(
       XMLNode(
         tag: 'xml',

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

@@ -56,7 +56,7 @@ class StanzaHandler extends Handler {
     this.tagName,
     this.priority = 0,
     this.stanzaTag,
-    this.xmlns,
+    this.xmlns = stanzaXmlns,
   });
 
   /// If specified, then the stanza must contain a direct child with a tag equal to

packages/moxxmpp/lib/src/parser.dart

@@ -69,16 +69,6 @@ class XMPPStreamParser extends StreamTransformerBase<String, XMPPStreamObject> {
   _ChunkedConversionBuffer<List<XmlEvent>, XmlNode> _childBuffer =
       _ChunkedConversionBuffer<List<XmlEvent>, XmlNode>(const XmlNodeDecoder());
 
-  /// The selectors.
-  _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent> _childSelector =
-      _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent>(
-    XmlSubtreeSelector((event) => event.qualifiedName != 'stream:stream'),
-  );
-  _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent> _streamHeaderSelector =
-      _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent>(
-    XmlSubtreeSelector((event) => event.qualifiedName == 'stream:stream'),
-  );
-
   void reset() {
     try {
       _eventBuffer.close();
@@ -91,16 +81,6 @@ class XMPPStreamParser extends StreamTransformerBase<String, XMPPStreamObject> {
     } catch (_) {
       // Do nothing.
     }
-    try {
-      _childSelector.close();
-    } catch (_) {
-      // Do nothing.
-    }
-    try {
-      _streamHeaderSelector.close();
-    } catch (_) {
-      // Do nothing.
-    }
 
     // Recreate the buffers.
     _eventBuffer =
@@ -108,12 +88,6 @@ class XMPPStreamParser extends StreamTransformerBase<String, XMPPStreamObject> {
     _childBuffer = _ChunkedConversionBuffer<List<XmlEvent>, XmlNode>(
       const XmlNodeDecoder(),
     );
-    _childSelector = _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent>(
-      XmlSubtreeSelector((event) => event.qualifiedName != 'stream:stream'),
-    );
-    _streamHeaderSelector = _ChunkedConversionBuffer<List<XmlEvent>, XmlEvent>(
-      XmlSubtreeSelector((event) => event.qualifiedName == 'stream:stream'),
-    );
   }
 
   @override
@@ -121,9 +95,14 @@ class XMPPStreamParser extends StreamTransformerBase<String, XMPPStreamObject> {
     // We do not want to use xml's toXmlEvents and toSubtreeEvents methods as they
     // create streams we cannot close. We need to be able to destroy and recreate an
     // XML parser whenever we start a new connection.
+    final childSelector =
+        XmlSubtreeSelector((event) => event.qualifiedName != 'stream:stream');
+    final streamHeaderSelector =
+        XmlSubtreeSelector((event) => event.qualifiedName == 'stream:stream');
+
     stream.listen((input) {
       final events = _eventBuffer.convert(input);
-      final streamHeaderEvents = _streamHeaderSelector.convert(events);
+      final streamHeaderEvents = streamHeaderSelector.convert(events);
 
       // Process the stream header separately.
       for (final event in streamHeaderEvents) {
@@ -147,7 +126,7 @@ class XMPPStreamParser extends StreamTransformerBase<String, XMPPStreamObject> {
       }
 
       // Process the children of the <stream:stream> element.
-      final childEvents = _childSelector.convert(events);
+      final childEvents = childSelector.convert(events);
       final children = _childBuffer.convert(childEvents);
       for (final node in children) {
         if (node.nodeType == XmlNodeType.ELEMENT) {

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

@@ -255,7 +255,7 @@ class StreamManagementManager extends XmppManagerBase {
       _pendingAcks++;
       _startAckTimer();
 
-      logger.fine('_pendingAcks is now at $_pendingAcks (caused by <r/>)');
+      logger.fine('_pendingAcks is now at $_pendingAcks');
 
       getAttributes().sendNonza(StreamManagementRequestNonza());
 
@@ -294,7 +294,6 @@ class StreamManagementManager extends XmppManagerBase {
   /// Called when we receive an <a /> nonza from the server.
   /// This is a response to the question "How many of my stanzas have you handled".
   Future<bool> _handleAckResponse(XMLNode nonza) async {
-    logger.finest('Received ack');
     final h = int.parse(nonza.attributes['h']! as String);
 
     _lastAckTimestamp = DateTime.now().millisecondsSinceEpoch;
@@ -307,7 +306,6 @@ class StreamManagementManager extends XmppManagerBase {
 
           // Reset the timer
           if (_pendingAcks > 0) {
-            _stopAckTimer();
             _startAckTimer();
           }
         }
@@ -316,7 +314,7 @@ class StreamManagementManager extends XmppManagerBase {
           _stopAckTimer();
         }
 
-        logger.fine('_pendingAcks is now at $_pendingAcks (caused by <a/>)');
+        logger.fine('_pendingAcks is now at $_pendingAcks');
       });
     });
 

packages/moxxmpp/test/negotiator_test.dart

@@ -59,7 +59,6 @@ void main() {
           jid: JID.fromString('test'),
           password: 'abc123',
         ),
-        () {},
       )
       ..registerNegotiator(StubNegotiator1())
       ..registerNegotiator(StubNegotiator2());
@@ -78,7 +77,6 @@ void main() {
           jid: JID.fromString('test'),
           password: 'abc123',
         ),
-        () {},
       )
       ..registerNegotiator(StubNegotiator1())
       ..registerNegotiator(StubNegotiator2());