* (Apollon77) Adjust automatic Cookie Refresh interval from 7 to 4 days

* (Apollon77) Add other checks for websocket connection handling (Sentry IOBROKER-ALEXA2-32)
Apollon77 · Apr 18, 2021 · ab907b5 · ab907b5
1 parent 01f3b24
commit ab907b5
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,10 @@ Thank you for that work.
 
 ## Changelog:
 
+### __WORK IN PROGRESS__
+* (Apollon77) Adjust automatic Cookie Refresh interval from 7 to 4 days
+* (Apollon77) Add other checks for websocket connection handling (Sentry IOBROKER-ALEXA2-32)
+
 ### 3.7.1 (2021-02-03)
 * (Apollon77) also capture tests from ASR_REPLACEMENT_TEXT and TTS_REPLACEMENT_TEXT into summary and alexaResponse
 

diff --git a/alexa-remote.js b/alexa-remote.js
@@ -99,7 +99,7 @@ class AlexaRemote extends EventEmitter {
             delete this._options.refreshCookieInterval;
         }
         if (this._options.cookieRefreshInterval !== 0) {
-            this._options.cookieRefreshInterval = this._options.cookieRefreshInterval || 7*24*60*60*1000; // Auto Refresh after 7 days
+            this._options.cookieRefreshInterval = this._options.cookieRefreshInterval || 4 * 24 * 60 * 60 * 1000; // Auto Refresh after 4 days
         }
 
         const self = this;

diff --git a/alexa-wsmqtt.js b/alexa-wsmqtt.js
@@ -119,18 +119,19 @@ class AlexaWsMqtt extends EventEmitter {
         }, 30000);
 
         this.websocket.on('open', () => {
+            if (! this.websocket) return;
             if (this.stop) {
                 this.websocket.close();
                 return;
             }
-            if (! this.websocket) return;
             this._options.logger && this._options.logger('Alexa-Remote WS-MQTT: Open: ' + url);
             this.connectionActive = false;
 
             // tell Tuning Service that we support "A:H" protocol = AlphaPrococol
             const msg = Buffer.from('0x99d4f71a 0x0000001d A:HTUNE');
             //console.log('SEND: ' + msg.toString('ascii'));
             this._options.logger && this._options.logger('Alexa-Remote WS-MQTT: Initialization Msg 1 sent');
+            if (this.websocket.readyState !== 1 /* OPEN */) return;
             this.websocket.send(msg);
         });
 
@@ -147,7 +148,7 @@ class AlexaWsMqtt extends EventEmitter {
         });
 
         this.websocket.on('message', (data) => {
-            if (!this.websocket) return;
+            if (!this.websocket || this.websocket.readyState !== 1 /* OPEN */) return;
             let message = this.parseIncomingMessage(data);
             if (msgCounter === 0) { // initialization
                 if (message.content.protocolName) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,10 +25,10 @@
     "layla.amazon.de"
   ],
   "dependencies": {
-    "alexa-cookie2": "^3.4.2",
+    "alexa-cookie2": "^3.4.3",
     "https": "^1.0.0",
     "querystring": "^0.2.1",
-    "ws": "^7.4.4",
+    "ws": "^7.4.5",
     "extend": "^3.0.2",
     "uuid": "^8.3.2"
   },