Don't allow pings to prevent timeout

Sending a new request shouldn't clear the waiting-for-reply timeout if
we haven't got a reply yet, or else we may never time out at all if we
keep sending pings (which we do).

Author: singpolyma

packages/stream-management/index.js

@@ -124,6 +124,7 @@ export default function streamManagement({
   middleware.use(async (context, next) => {
     const { stanza } = context;
     clearTimeout(timeoutTimeout);
+    timeoutTimeout = null;
     if (["presence", "message", "iq"].includes(stanza.name)) {
       sm.inbound += 1;
     } else if (stanza.is("r", NS)) {
@@ -158,14 +159,13 @@ export default function streamManagement({
   }
 
   function requestAck() {
-    clearTimeout(timeoutTimeout);
     clearTimeout(requestAckTimeout);
 
     if (!sm.enabled) return;
 
-    if (sm.timeout) {
+    if (sm.timeout && !timeoutTimeout) {
       timeoutTimeout = setTimeout(
-        () => entity.disconnect().catch(() => {}),
+        () => { clearTimeout(requestAckTimeout); entity.disconnect().catch(() => {}); },
         sm.timeout,
       );
     }

test/stream-management.test.js

@@ -93,6 +93,7 @@ test(
 
     xmpp = client({ credentials, service: domain });
     xmpp.streamManagement.timeout = 10;
+    xmpp.streamManagement.requestAckInterval = 5;
     xmpp.streamManagement.debounceAckRequest = 1;
     debug(xmpp);