* (Apollon77) update amazon-cookie library to work around amazon secu…

…rity changes * (Apollon77) Prevent crash on invalid data in request data (Sentry IOBROKER-ALEXA2-1A) * (Apollon77) Make sure to handle invalid list responses correctly (Sentry IOBROKER-ALEXA2-1T)
Apollon77 · Jul 13, 2020 · 70732e0 · 70732e0
1 parent 3b83f9c
commit 70732e0
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,11 @@ Thank you for that work.
 
 ## Changelog:
 
+### __WORK IN PROGRESS__
+* (Apollon77) update amazon-cookie library to work around amazon security changes
+* (Apollon77) Prevent crash on invalid data in request data (Sentry IOBROKER-ALEXA2-1A)
+* (Apollon77) Make sure to handle invalid list responses correctly (Sentry IOBROKER-ALEXA2-1T)
+
 ### 3.2.2 (2020-06-17)
 * (Apollon77) Optimize Request Handling to also Handle timeouts correctly
 * (Apollon77) Increase timeouts for some Smart Home calls to 30s

diff --git a/alexa-remote.js b/alexa-remote.js
@@ -799,38 +799,48 @@ class AlexaRemote extends EventEmitter {
         delete logOptions.headers.Referer;
         delete logOptions.headers.Origin;
         this._options.logger && this._options.logger('Alexa-Remote: Sending Request with ' + JSON.stringify(logOptions) + ((options.method === 'POST' || options.method === 'PUT' || options.method === 'DELETE') ? ' and data=' + flags.data : ''));
-
-		let req = https.request(options, (res) => {
-            let body  = '';
 
-            res.on('data', (chunk) => {
-                body += chunk;
-            });
+        let req;
+        try {
+            req = https.request(options, (res) => {
+                let body = '';
 
-            res.on('end', () => {
-                let ret;
-
-                if (typeof callback === 'function') {
-                    if (!body) { // Method 'DELETE' may return HTTP STATUS 200 without body
-                        this._options.logger && this._options.logger('Alexa-Remote: Response: No body');
-                        return typeof res.statusCode === 'number' && res.statusCode%100 === 2 ? callback(null, { 'success': true }) : callback(new Error('no body'), null);
-                    }
-
-                    try {
-                        ret = JSON.parse(body);
-                    } catch (e) {
-                        this._options.logger && this._options.logger('Alexa-Remote: Response: No/Invalid JSON');
-                        callback && callback (new Error('no JSON'), body);
+                res.on('data', (chunk) => {
+                    body += chunk;
+                });
+
+                res.on('end', () => {
+                    let ret;
+
+                    if (typeof callback === 'function') {
+                        if (!body) { // Method 'DELETE' may return HTTP STATUS 200 without body
+                            this._options.logger && this._options.logger('Alexa-Remote: Response: No body');
+                            return typeof res.statusCode === 'number' && res.statusCode % 100 === 2 ? callback(null, {'success': true}) : callback(new Error('no body'), null);
+                        }
+
+                        try {
+                            ret = JSON.parse(body);
+                        } catch (e) {
+                            this._options.logger && this._options.logger('Alexa-Remote: Response: No/Invalid JSON');
+                            callback && callback(new Error('no JSON'), body);
+                            callback = null;
+                            return;
+                        }
+
+                        this._options.logger && this._options.logger('Alexa-Remote: Response: ' + JSON.stringify(ret));
+                        callback(null, ret);
                         callback = null;
-                        return;
                     }
-
-                    this._options.logger && this._options.logger('Alexa-Remote: Response: ' + JSON.stringify(ret));
-                    callback (null, ret);
-                    callback = null;
-                }
+                });
             });
-        });
+        } catch(err) {
+            this._options.logger && this._options.logger('Alexa-Remote: Response: Exception: ' + err);
+            if (typeof callback === 'function'/* && callback.length >= 2*/) {
+                callback (err, null);
+                callback = null;
+            }
+            return;
+        }
 
         req.on('error', (e) => {
             this._options.logger && this._options.logger('Alexa-Remote: Response: Error: ' + e);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,12 +25,12 @@
     "layla.amazon.de"
   ],
   "dependencies": {
-    "alexa-cookie2": "^3.2.1",
+    "alexa-cookie2": "^3.3.0",
     "https": "^1.0.0",
     "querystring": "^0.2.0",
     "ws": "^7.3.1",
     "extend": "^3.0.2",
-    "uuid": "^8.1.0"
+    "uuid": "^8.2.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^1.6.0"