alexa-cookie2 4.0.1 → 4.1.0

package/.eslintrc.json

@@ -0,0 +1,40 @@
+{
+    "root": true,
+    "env": {
+        "es6": true,
+        "node": true,
+        "mocha": true
+    },
+    "extends": [
+        "eslint:recommended"
+    ],
+    "plugins": [],
+    "rules": {
+        "indent": [
+            "error",
+            4,
+            {
+                "SwitchCase": 1
+            }
+        ],
+        "no-console": "off",
+        "no-var": "error",
+        "no-trailing-spaces": "error",
+        "prefer-const": "error",
+        "quotes": [
+            "error",
+            "single",
+            {
+                "avoidEscape": true,
+                "allowTemplateLiterals": true
+            }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    }
+}

package/.releaseconfig.json

@@ -0,0 +1,3 @@
+{
+    "plugins": ["license"]
+}

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Apollon77 <ingo@fischer-ka.de>
+Copyright (c) 2018-2022 Apollon77 <ingo@fischer-ka.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -6,6 +6,10 @@
 
 Library to generate/retrieve a cookie including a csrf for alexa remote
 
+## Disclaimer
+**All product and company names or logos are trademarks™ or registered® trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them or any associated subsidiaries! This personal project is maintained in spare time and has no business goal.**
+**ALEXA is a trademark of AMAZON TECHNOLOGIES, INC.**
+
 ## Description
 This library can be used to get the cookies needed to access Amazon Alexa services from outside. It authenticates with Amazon and gathers all needed details. These details are returned in the callback.
 If the automatic authentication fails (which is more common case in the meantime because of security checks from amazon like a needed Captcha or because you enabled two factor authentication) the library can also setup a proxy server to allow the manual login and will catch the cookie by itself. Using this proxy you can enter needed 2FA codes or solve captchas and still do not need to trick around to get the cookie.
@@ -45,6 +49,16 @@ Partly based on [Amazon Alexa Remote Control](http://blog.loetzimmer.de/2017/10/
 Thank you for that work.
 
 ## Changelog:
+### 4.1.0 (2022-07-18)
+* (Apollon77) Allow to overwrite the used App-Name for the Amazon App Registration.
+* (Apollon77) Include the used app name also in the response
+
+### 4.0.3 (2022-07-06)
+* (Apollon77) Update some request meta data to match current Alexa Apps
+
+### 4.0.2 (2022-06-30)
+* (Apollon77) Prevent potential crash cases
+
 ### 4.0.1 (2021-10-11)
 * (Apollon77) Adjust call headers
 
@@ -140,4 +154,4 @@ Thank you for that work.
 * (Apollon77) 0.1.1: update to get it working again and sync to [alexa-remote-control](https://github.com/thorsten-gehrig/alexa-remote-control)
 
 ### 0.0.x
-* Versions by soef
+* Versions by soef

package/alexa-cookie.js

@@ -1,10 +1,3 @@
-/* jshint -W097 */
-/* jshint -W030 */
-/* jshint strict: false */
-/* jslint node: true */
-/* jslint esversion: 6 */
-"use strict";
-
 /**
  * partly based on Amazon Alexa Remote Control (PLAIN shell)
  * http://blog.loetzimmer.de/2017/10/amazon-alexa-hort-auf-die-shell-echo.html AND on
@@ -25,6 +18,10 @@ const defaultUserAgentLinux = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.3
 //const defaultUserAgentMacOs = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36';
 const defaultAcceptLanguage = 'de-DE';
 
+const apiCallVersion = '2.2.483723.0';
+const apiCallUserAgent = 'AmazonWebView/Amazon Alexa/2.2.483723.0/iOS/15.5/iPhone';
+const defaultAppName = 'ioBroker Alexa2';
+
 const csrfOptions = [
     '/api/language',
     '/spa/index.html',
@@ -57,8 +54,7 @@ function AlexaCookie() {
             }
         }
         Cookie = '';
-        for (let name in cookies) {
-            if (!cookies.hasOwnProperty(name)) continue;
+        for (const name of Object.keys(cookies)) {
             Cookie += name + '=' + cookies[name] + '; ';
         }
         Cookie = Cookie.replace(/[; ]*$/, '');
@@ -83,14 +79,14 @@ function AlexaCookie() {
             removeContentLength = true;
         }
 
-        let req = https.request(options, (res) => {
-            let body = "";
+        const req = https.request(options, (res) => {
+            let body = '';
             info.requests.push({options: options, response: res});
 
             if (options.followRedirects !== false && res.statusCode >= 300 && res.statusCode < 400) {
                 _options.logger && _options.logger('Alexa-Cookie: Response (' + res.statusCode + ')' + (res.headers.location ? ' - Redirect to ' + res.headers.location : ''));
                 //options.url = res.headers.location;
-                let u = url.parse(res.headers.location);
+                const u = url.parse(res.headers.location);
                 if (u.host) options.host = u.host;
                 options.path = u.path;
                 options.method = 'GET';
@@ -127,11 +123,11 @@ function AlexaCookie() {
     const getFields = body => {
         body = body.replace(/[\n\r]/g, ' ');
         let re = /^.*?("hidden"\s*name=".*$)/;
-        let ar = re.exec(body);
+        const ar = re.exec(body);
         if (!ar || ar.length < 2) return {};
         let h;
         re = /.*?name="([^"]+)"[\s^\s]*value="([^"]+).*?"/g;
-        let data = {};
+        const data = {};
         while ((h = re.exec(ar[1])) !== null) {
             if (h[1] !== 'rememberMe') {
                 data[h[1]] = h[2];
@@ -149,6 +145,9 @@ function AlexaCookie() {
         _options.baseAmazonPage = _options.baseAmazonPage || 'amazon.com';
         _options.logger && _options.logger('Alexa-Cookie: Use as Base-Amazon-URL: ' + _options.baseAmazonPage);
 
+        _options.deviceAppName = _options.deviceAppName || defaultAppName;
+        _options.logger && _options.logger('Alexa-Cookie: Use as Device-App-Name: ' + _options.deviceAppName);
+
         if (!_options.baseAmazonPageHandle && _options.baseAmazonPageHandle !== '') {
             const amazonDomain = _options.baseAmazonPage.substr(_options.baseAmazonPage.lastIndexOf('.') + 1);
             if (amazonDomain === 'jp') {
@@ -164,7 +163,7 @@ function AlexaCookie() {
         }
 
         if (!_options.userAgent) {
-            let platform = os.platform();
+            const platform = os.platform();
             if (platform === 'win32') {
                 _options.userAgent = defaultUserAgent;
             }
@@ -205,13 +204,13 @@ function AlexaCookie() {
 
         function csrfTry() {
             const path = csrfUrls.shift();
-            let options = {
+            const options = {
                 'host': 'alexa.' + _options.amazonPage,
                 'path': path,
                 'method': 'GET',
                 'headers': {
                     'DNT': '1',
-                    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36',
+                    'User-Agent': _options.userAgent,
                     'Connection': 'keep-alive',
                     'Referer': 'https://alexa.' + _options.amazonPage + '/spa/index.html',
                     'Cookie': cookie,
@@ -223,8 +222,8 @@ function AlexaCookie() {
             _options.logger && _options.logger('Alexa-Cookie: Step 4: get CSRF via ' + path);
             request(options, (error, response) => {
                 cookie = addCookies(cookie, response ? response.headers : null);
-                let ar = /csrf=([^;]+)/.exec(cookie);
-                let csrf = ar ? ar[1] : undefined;
+                const ar = /csrf=([^;]+)/.exec(cookie);
+                const csrf = ar ? ar[1] : undefined;
                 _options.logger && _options.logger('Alexa-Cookie: Result: csrf=' + csrf + ', Cookie=' + cookie);
                 if (!csrf && csrfUrls.length) {
                     csrfTry();
@@ -268,7 +267,7 @@ function AlexaCookie() {
 
         if (!_options.proxyOnly) {
             // get first cookie and write redirection target into referer
-            let options = {
+            const options = {
                 host: 'alexa.' + _options.amazonPage,
                 path: '',
                 method: 'GET',
@@ -288,10 +287,10 @@ function AlexaCookie() {
                     return;
                 }
 
-                let lastRequestOptions = info.requests[info.requests.length - 1].options;
+                const lastRequestOptions = info.requests[info.requests.length - 1].options;
                 // login empty to generate session
                 Cookie = addCookies(Cookie, response.headers);
-                let options = {
+                const options = {
                     host: 'www.' + _options.amazonPage,
                     path: '/ap/signin',
                     method: 'POST',
@@ -322,7 +321,7 @@ function AlexaCookie() {
                     options.path = '/ap/signin';
                     options.method = 'POST';
                     options.headers.Cookie = Cookie = addCookies(Cookie, response.headers);
-                    let ar = options.headers.Cookie.match(/session-id=([^;]+)/);
+                    const ar = options.headers.Cookie.match(/session-id=([^;]+)/);
                     options.headers.Referer = `https://www.${_options.amazonPage}/ap/signin/${ar[1]}`;
                     options.body = getFields(body);
                     options.body.email = email || '';
@@ -336,7 +335,7 @@ function AlexaCookie() {
                             return;
                         }
 
-                        let lastRequestOptions = info.requests[info.requests.length - 1].options;
+                        const lastRequestOptions = info.requests[info.requests.length - 1].options;
 
                         // check whether the login has been successful or exit otherwise
                         if (!lastRequestOptions.host.startsWith('alexa') || !lastRequestOptions.path.endsWith('.html')) {
@@ -397,10 +396,15 @@ function AlexaCookie() {
         }
     };
 
+    this.getDeviceAppName = () => {
+        return _options.deviceAppName || defaultAppName;
+    };
 
     const handleTokenRegistration = (_options, loginData, callback) => {
         _options.logger && _options.logger('Handle token registration Start: ' + JSON.stringify(loginData));
 
+        loginData.deviceAppName = _options.deviceAppName;
+
         let deviceSerial;
         if (!_options.formerRegistrationData || !_options.formerRegistrationData.deviceSerial) {
             const deviceSerialBuffer = Buffer.alloc(16);
@@ -422,69 +426,68 @@ function AlexaCookie() {
          */
 
         const registerData = {
-            "requested_extensions": [
-                "device_info",
-                "customer_info"
+            'requested_extensions': [
+                'device_info',
+                'customer_info'
             ],
-            "cookies": {
-                "website_cookies": [
+            'cookies': {
+                'website_cookies': [
                     /*{
                         "Value": cookies["session-id-time"],
                         "Name": "session-id-time"
                     }*/
                 ],
-                "domain": "." + _options.baseAmazonPage
+                'domain': '.' + _options.baseAmazonPage
             },
-            "registration_data": {
-                "domain": "Device",
-                "app_version": "2.2.443692.0",
-                "device_type": "A2IVLV5VM2W81",
-                "device_name": "%FIRST_NAME%\u0027s%DUPE_STRATEGY_1ST%ioBroker Alexa2",
-                "os_version": "14.8",
-                "device_serial": deviceSerial,
-                "device_model": "iPhone",
-                "app_name": "ioBroker Alexa2",
-                "software_version": "1"
+            'registration_data': {
+                'domain': 'Device',
+                'app_version': apiCallVersion,
+                'device_type': 'A2IVLV5VM2W81',
+                'device_name': '%FIRST_NAME%\u0027s%DUPE_STRATEGY_1ST%ioBroker Alexa2',
+                'os_version': '15.5',
+                'device_serial': deviceSerial,
+                'device_model': 'iPhone',
+                'app_name': _options.deviceAppName,
+                'software_version': '1'
             },
-            "auth_data": {
+            'auth_data': {
                 // Filled below
             },
-            "user_context_map": {
-                "frc": cookies.frc
+            'user_context_map': {
+                'frc': cookies.frc
             },
-            "requested_token_type": [
-                "bearer",
-                "mac_dms",
-                "website_cookies"
+            'requested_token_type': [
+                'bearer',
+                'mac_dms',
+                'website_cookies'
             ]
         };
         if (loginData.accessToken) {
             registerData.auth_data = {
-                "access_token": loginData.accessToken
+                'access_token': loginData.accessToken
             };
         } else if (loginData.authorization_code && loginData.verifier) {
             registerData.auth_data = {
-                "client_id" : loginData.deviceId,
-                "authorization_code" : loginData.authorization_code,
-                "code_verifier" : loginData.verifier,
-                "code_algorithm" : "SHA-256",
-                "client_domain" : "DeviceLegacy"
+                'client_id' : loginData.deviceId,
+                'authorization_code' : loginData.authorization_code,
+                'code_verifier' : loginData.verifier,
+                'code_algorithm' : 'SHA-256',
+                'client_domain' : 'DeviceLegacy'
             };
         }
-        for (let key in cookies) {
-            if (!cookies.hasOwnProperty(key)) continue;
+        for (const key of Object.keys(cookies)) {
             registerData.cookies.website_cookies.push({
-                "Value": cookies[key],
-                "Name": key
+                'Value': cookies[key],
+                'Name': key
             });
         }
 
-        let options = {
+        const options = {
             host: 'api.' + _options.baseAmazonPage,
             path: '/auth/register',
             method: 'POST',
             headers: {
-                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
+                'User-Agent': apiCallUserAgent,
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',
@@ -524,12 +527,12 @@ function AlexaCookie() {
                 Get Amazon Marketplace Country
             */
 
-            let options = {
+            const options = {
                 host: 'alexa.' + _options.baseAmazonPage,
-                path: '/api/users/me?platform=ios&version=2.2.443692.0',
+                path: '/api/users/me?platform=ios&version=' + apiCallVersion,
                 method: 'GET',
                 headers: {
-                    'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
+                    'User-Agent': apiCallUserAgent,
                     'Accept-Language': _options.acceptLanguage,
                     'Accept-Charset': 'utf-8',
                     'Connection': 'keep-alive',
@@ -560,7 +563,7 @@ function AlexaCookie() {
                 } else if (error && (!_options || !_options.amazonPage)) {
                     callback && callback(error, null);
                     return;
-                } else if (error && !_options.formerRegistrationData.amazonPage && _options.amazonPage) {
+                } else if (error && (!_options.formerRegistrationData || !_options.formerRegistrationData.amazonPage) && _options.amazonPage) {
                     _options.logger && _options.logger('Continue with externally set amazonPage: ' + _options.amazonPage);
                 } else if (error) {
                     _options.logger && _options.logger('Ignore error while getting user data and amazonPage because previously set amazonPage is available');
@@ -600,7 +603,7 @@ function AlexaCookie() {
 
         const exchangeParams = {
             'di.os.name': 'iOS',
-            'app_version': '2.2.443692.0',
+            'app_version': apiCallVersion,
             'domain': '.' + amazonPage,
             'source_token': refreshToken,
             'requested_token_type': 'auth_cookies',
@@ -611,12 +614,12 @@ function AlexaCookie() {
             'app_name': 'Amazon Alexa',
             'di.os.version': '11.4.1'
         };
-        let options = {
+        const options = {
             host: 'www.' + amazonPage,
             path: '/ap/exchangetoken',
             method: 'POST',
             headers: {
-                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
+                'User-Agent': apiCallUserAgent,
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',
@@ -665,8 +668,7 @@ function AlexaCookie() {
 
             });
             let localCookie = '';
-            for (let name in cookies) {
-                if (!cookies.hasOwnProperty(name)) continue;
+            for (const name of Object.keys(cookies)) {
                 localCookie += name + '=' + cookies[name] + '; ';
             }
             localCookie = localCookie.replace(/[; ]*$/, '');
@@ -693,26 +695,26 @@ function AlexaCookie() {
         initConfig();
 
         const refreshData = {
-            "app_name": "ioBroker Alexa2",
-            "app_version": "2.2.443692.0",
-            "di.sdk.version": "6.10.0",
-            "source_token": _options.formerRegistrationData.refreshToken,
-            "package_name": "com.amazon.echo",
-            "di.hw.version": "iPhone",
-            "platform": "iOS",
-            "requested_token_type": "access_token",
-            "source_token_type": "refresh_token",
-            "di.os.name": "iOS",
-            "di.os.version": "14.8",
-            "current_version": "6.10.0"
+            'app_name': 'ioBroker Alexa2',
+            'app_version': apiCallVersion,
+            'di.sdk.version': '6.10.0',
+            'source_token': _options.formerRegistrationData.refreshToken,
+            'package_name': 'com.amazon.echo',
+            'di.hw.version': 'iPhone',
+            'platform': 'iOS',
+            'requested_token_type': 'access_token',
+            'source_token_type': 'refresh_token',
+            'di.os.name': 'iOS',
+            'di.os.version': '14.8',
+            'current_version': '6.10.0'
         };
 
-        let options = {
+        const options = {
             host: 'api.' + _options.baseAmazonPage,
             path: '/auth/token',
             method: 'POST',
             headers: {
-                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
+                'User-Agent': apiCallUserAgent,
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',

package/example/example.js

@@ -16,9 +16,10 @@ const config = {
     proxyOwnIp: '...',         // required if proxy enabled: provide own IP or hostname to later access the proxy. needed to setup all rewriting and proxy stuff internally
     proxyPort: 3456,           // optional: use this port for the proxy, default is 0 means random port is selected
     proxyListenBind: '0.0.0.0',// optional: set this to bind the proxy to a special IP, default is '0.0.0.0'
-    proxyLogLevel: 'info',      // optional: Loglevel of Proxy, default 'warn'
+    proxyLogLevel: 'info',     // optional: Loglevel of Proxy, default 'warn'
     baseAmazonPage: 'amazon.com', // optional: Change the Proxy Amazon Page - all "western countries" directly use amazon.com! Change to amazon.co.jp for Japan
     amazonPageProxyLanguage: 'de_DE', // optional: language to be used for the Amazon Sign-in page the proxy calls. default is "de_DE")
+    deviceAppName: '...',       // optional: name of the device app name which will be registered with Amazon, leave empty to use a default one
     formerDataStorePath: '...', // optional: overwrite path where some of the formerRegistrationData are persisted to optimize against Amazon security measures
     formerRegistrationData: { ... } // optional/preferred: provide the result object from subsequent proxy usages here and some generated data will be reused for next proxy call too
 };

package/lib/proxy.js

@@ -3,7 +3,7 @@
 /* jshint strict: false */
 /* jslint node: true */
 /* jslint esversion: 6 */
-"use strict";
+'use strict';
 
 const modifyResponse = require('http-proxy-response-rewrite');
 const express = require('express');
@@ -27,8 +27,7 @@ function addCookies(Cookie, headers) {
         }
     }
     Cookie = '';
-    for (let name in cookies) {
-        if (!cookies.hasOwnProperty(name)) continue;
+    for (const name of Object.keys(cookies)) {
         Cookie += name + '=' + cookies[name] + '; ';
     }
     Cookie = Cookie.replace(/[; ]*$/, '');
@@ -90,7 +89,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         initialCookies.frc = _options.formerRegistrationData.frc;
     }
 
-    if (!_options.formerRegistrationData || !_options.formerRegistrationData["map-md"]) {
+    if (!_options.formerRegistrationData || !_options.formerRegistrationData['map-md']) {
         initialCookies['map-md'] = Buffer.from('{"device_user_dictionary":[],"device_registration_data":{"software_version":"1"},"app_identifier":{"app_version":"2.2.223830","bundle_id":"com.amazon.echo"}}').toString('base64');
     }
     else {
@@ -123,19 +122,19 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         // ignore
     }
 
-	function base64URLEncode(str) {
-		return str.toString('base64')
-			.replace(/\+/g, '-')
-			.replace(/\//g, '_')
-			.replace(/=/g, '');
-	}
-	function sha256(buffer) {
-		return crypto.createHash('sha256').update(buffer).digest();
-	}
-	const code_verifier = base64URLEncode(crypto.randomBytes(32));
-	const code_challenge = base64URLEncode(sha256(code_verifier));
+    function base64URLEncode(str) {
+        return str.toString('base64')
+            .replace(/\+/g, '-')
+            .replace(/\//g, '_')
+            .replace(/=/g, '');
+    }
+    function sha256(buffer) {
+        return crypto.createHash('sha256').update(buffer).digest();
+    }
+    const code_verifier = base64URLEncode(crypto.randomBytes(32));
+    const code_challenge = base64URLEncode(sha256(code_verifier));
 
-    let proxyCookies = "";
+    let proxyCookies = '';
 
     // proxy middleware options
     const optionsAlexa = {
@@ -151,19 +150,19 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         onProxyRes: onProxyRes,
         onProxyReq: onProxyReq,
         headers: {
-            'user-agent': "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 PitanguiBridge/2.2.345247.0-[HARDWARE=iPhone10_4][SOFTWARE=13.5.1]",
+            'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 PitanguiBridge/2.2.345247.0-[HARDWARE=iPhone10_4][SOFTWARE=13.5.1]',
             'accept-language': _options.acceptLanguage,
             'authority': `www.${_options.baseAmazonPage}`
         },
         cookieDomainRewrite: { // enhanced below
-            "*": ""
+            '*': ''
         }
     };
     optionsAlexa.pathRewrite[`^/www.${_options.baseAmazonPage}`] = '';
     optionsAlexa.pathRewrite[`^/alexa.${_options.baseAmazonPage}`] = '';
     optionsAlexa.cookieDomainRewrite[`.${_options.baseAmazonPage}`] = _options.proxyOwnIp;
     optionsAlexa.cookieDomainRewrite[_options.baseAmazonPage] = _options.proxyOwnIp;
-    if (_options.logger) optionsAlexa.logProvider = function logProvider(_provider) {
+    if (_options.logger) optionsAlexa.logProvider = function logProvider() {
         return {
             log: _options.logger.log || _options.logger,
             debug: _options.logger.debug || _options.logger,
@@ -190,7 +189,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
                 }
             }
             if (url === '/') { // initial redirect
-			returnedInitUrl =  `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
+                returnedInitUrl =  `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
                 _options.logger && _options.logger('Alexa-Cookie: Initial Page Request: ' + returnedInitUrl);
                 return returnedInitUrl;
             }
@@ -215,8 +214,8 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
 
     function replaceHosts(data) {
         //const dataOrig = data;
-        const amazonRegex = new RegExp(`https?://www.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), 'g');
-        const alexaRegex = new RegExp(`https?://alexa.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), 'g');
+        const amazonRegex = new RegExp(`https?://www.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, '\\.'), 'g');
+        const alexaRegex = new RegExp(`https?://alexa.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, '\\.'), 'g');
         data = data.replace(///g, '/');
         data = data.replace(amazonRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`);
         data = data.replace(alexaRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`);
@@ -225,8 +224,8 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
     }
 
     function replaceHostsBack(data) {
-        const amazonRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), 'g');
-        const alexaRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), 'g');
+        const amazonRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`.replace(/\./g, '\\.'), 'g');
+        const alexaRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`.replace(/\./g, '\\.'), 'g');
         data = data.replace(amazonRegex, `https://www.${_options.baseAmazonPage}/`);
         data = data.replace(alexaRegex, `https://alexa.${_options.baseAmazonPage}/`);
         if (data === `http://${_options.proxyOwnIp}:${_options.proxyPort}/`) {
@@ -235,7 +234,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         return data;
     }
 
-    function onProxyReq(proxyReq, req, _res) {
+    function onProxyReq(proxyReq, req/*, _res*/) {
         const url = req.originalUrl || req.url;
         if (url.endsWith('.ico') || url.endsWith('.js') || url.endsWith('.ttf') || url.endsWith('.svg') || url.endsWith('.png') || url.endsWith('.appcache')) return;
         //if (url.startsWith('/ap/uedata')) return;
@@ -247,10 +246,9 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
             _options.logger && _options.logger('Alexa-Cookie: Headers: ' + JSON.stringify(proxyReq.getHeaders()));
             let reqCookie = proxyReq.getHeader('cookie');
             if (reqCookie === undefined) {
-                reqCookie = "";
+                reqCookie = '';
             }
-            for (var cookie in initialCookies) {
-                if (!initialCookies.hasOwnProperty(cookie)) continue;
+            for (const cookie of Object.keys(initialCookies)) {
                 if (!reqCookie.includes(cookie + '=')) {
                     reqCookie += '; ' + cookie + '=' + initialCookies[cookie];
                 }
@@ -270,7 +268,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         let modified = false;
         if (req.method === 'POST') {
             if (typeof proxyReq.getHeader === 'function' && proxyReq.getHeader('referer')) {
-                let fixedReferer = replaceHostsBack(proxyReq.getHeader('referer'));
+                const fixedReferer = replaceHostsBack(proxyReq.getHeader('referer'));
                 if (fixedReferer ) {
                     proxyReq.setHeader('referer', fixedReferer);
                     _options.logger && _options.logger('Alexa-Cookie: Modify headers: Changed Referer: ' + fixedReferer);
@@ -330,12 +328,12 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
             _options.logger && _options.logger('Alexa-Cookie: Proxy catched parameters: ' + JSON.stringify(queryParams));
 
             callbackCookie && callbackCookie(null, {
-                "loginCookie": proxyCookies,
-                "authorization_code": queryParams['openid.oa2.authorization_code'],
-                "frc": initialCookies.frc,
-                "map-md": initialCookies['map-md'],
-                "deviceId": deviceId,
-				"verifier": code_verifier
+                'loginCookie': proxyCookies,
+                'authorization_code': queryParams['openid.oa2.authorization_code'],
+                'frc': initialCookies.frc,
+                'map-md': initialCookies['map-md'],
+                'deviceId': deviceId,
+                'verifier': code_verifier
             });
             return;
         }
@@ -376,7 +374,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
     app.get('/cookie-success', function(req, res) {
         res.send('<b>Amazon Alexa Cookie successfully retrieved. You can close the browser.</b>');
     });
-    let server = app.listen(_options.proxyPort, _options.proxyListenBind, function() {
+    const server = app.listen(_options.proxyPort, _options.proxyListenBind, function() {
         _options.logger && _options.logger('Alexa-Cookie: Proxy-Server listening on port ' + server.address().port);
         callbackListening && callbackListening(server);
         callbackListening = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alexa-cookie2",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Generate Cookie and CSRF for Alexa Remote",
   "author": {
     "name": "Apollon77",
@@ -21,15 +21,17 @@
     "layla.amazon.de"
   ],
   "dependencies": {
-    "cookie": "^0.4.1",
-    "express": "^4.17.1",
-    "http-proxy-middleware": "^2.0.1",
+    "cookie": "^0.5.0",
+    "express": "^4.18.1",
+    "http-proxy-middleware": "^2.0.6",
     "http-proxy-response-rewrite": "^0.0.1",
     "https": "^1.0.0",
     "querystring": "^0.2.1"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.4.0"
+    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.5.9",
+    "eslint": "^8.20.0"
   },
   "repository": {
     "type": "git",