Merge remote-tracking branch 'origin/master'

lib/alexa-remote-ext.js

@@ -163,16 +163,16 @@ class AlexaRemoteExt extends AlexaRemote {
 				// proxy status message is not the final callback call
 				// it is also not an actual error
 				// so we filter it out and report it our own way
-				const begin = `You can try to get the cookie manually by opening http://`;
-				const end = `/ with your browser.`;
-				const beginIdx = err.message.indexOf(begin);
-				const endIdx = err.message.indexOf(end);
-
-				if (beginIdx !== -1 && endIdx !== -1) {
-					const url = err.message.substring(begin.length, endIdx);
+				const bypassError1 = /^You can try to get the cookie manually by opening https?:\/\/(.*)\/ with your browser\.$/;
+				const bypassError2 = /^Please open https?:\/\/(.*)\/ with your browser and login to Amazon\. The cookie will be output here after successfull login\.$/;
+				const matchError1 = bypassError1.exec(err.message);
+				const matchError2 = bypassError2.exec(err.message);
+
+				if (matchError1 || matchError2) {
+					// const url = matchError1 && matchError1[1] || matchError2 && matchError2[1];
+					const url = `http://${config.proxyOwnIp}:${config.proxyPort}`;
 					proxyActiveCallback(url);
-				}
-				else {
+				} else {
 					reject(err);
 				}
 			}