* (Apollon77) Optimize reconnection handling for push connections

Apollon77 · Sep 12, 2023 · 22cfcef · 22cfcef
1 parent 5de34f1
commit 22cfcef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -37,6 +37,10 @@ Then it should work again
 * docu docu docu (sorry ... will come)
 
 ## Changelog:
+
+### __WORK IN PROGRESS__
+* (Apollon77) Optimize reconnection handling for push connections
+
 ### 6.1.1 (2023-09-09)
 * (Apollon77) Fix for cookie refresh check
 

diff --git a/alexa-http2push.js b/alexa-http2push.js
@@ -62,12 +62,12 @@ class AlexaHttp2Push extends EventEmitter {
                     reason = reason.toString();
                 }
                 try {
-                    this.stream && this.stream.end();
+                    this.stream && this.stream.destroy();
                 } catch (err) {
                     // ignore
                 }
                 try {
-                    this.client && this.client.close();
+                    this.client && this.client.destroy();
                 } catch (err) {
                     // ignore
                 }
@@ -97,15 +97,15 @@ class AlexaHttp2Push extends EventEmitter {
 
                 const retryDelay = (immediateReconnect || this.errorRetryCounter === 1) ? 1 : Math.min(60, this.errorRetryCounter * 5);
                 this._options.logger && this._options.logger('Alexa-Remote HTTP2-PUSH: Retry Connection in ' + retryDelay + 's');
-                this.emit('disconnect', true, 'Retry Connection in ' + retryDelay + 's');
+                this.emit('disconnect', true, `Retry Connection in ${retryDelay}s (${code}: ${reason})`);
                 this.reconnectTimeout && clearTimeout(this.reconnectTimeout);
                 this.reconnectTimeout = setTimeout(() => {
                     this.reconnectTimeout = null;
                     this.connect();
                 }, retryDelay * 1000);
             };
 
-            const onPingResponse = () => {
+            const onPingResponse = (resetErrorCount) => {
                 if (this.initTimeout) {
                     clearTimeout(this.initTimeout);
                     this.initTimeout = null;
@@ -117,7 +117,9 @@ class AlexaHttp2Push extends EventEmitter {
                     this.pongTimeout = null;
                 }
                 this.connectionActive = true;
-                this.errorRetryCounter = 0;
+                if (resetErrorCount) {
+                    this.errorRetryCounter = 0;
+                }
             };
 
             try {
@@ -147,13 +149,13 @@ class AlexaHttp2Push extends EventEmitter {
                         }
                         chunk = chunk.toString();
                         if (chunk.startsWith('------')) {
-                            this.client.ping(onPingResponse);
+                            this.client.ping(() => onPingResponse(false));
 
                             this.pingPongInterval = setInterval(() => {
                                 if (!this.stream || !this.client) return;
                                 this._options.logger && this._options.logger('Alexa-Remote HTTP2-PUSH: Send Ping');
                                 //console.log('SEND: ' + msg.toString('hex'));
-                                this.client.ping(onPingResponse);
+                                this.client.ping(() => onPingResponse(true));
 
                                 this.pongTimeout = setTimeout(() => {
                                     this.pongTimeout = null;