npm - alexa-cookie2 - Versions diffs - 3.4.3 → 4.0.2 - Mend

alexa-cookie2 3.4.3 → 4.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/.eslintrc.json ADDED Viewed

@@ -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 ADDED Viewed

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

package/LICENSE CHANGED Viewed

@@ -1,6 +1,6 @@
 The MIT License (MIT)
-Copyright (c) 2018-2020 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 CHANGED Viewed

@@ -1,12 +1,14 @@
 # alexa-cookie
+[![NPM version](http://img.shields.io/npm/v/alexa-cookie2.svg)](https://www.npmjs.com/package/alexa-cookie2)
+[![Downloads](https://img.shields.io/npm/dm/alexa-cookie2.svg)](https://www.npmjs.com/package/alexa-cookie2)
+![Test and Release](https://github.com/Apollon77/alexa-cookie/workflows/Test%20and%20Release/badge.svg)
 Library to generate/retrieve a cookie including a csrf for alexa remote
-<!--
-[![NPM version](http://img.shields.io/npm/v/alexa-remote.svg)](https://www.npmjs.com/package/alexa-remote)
-[![Tests](http://img.shields.io/travis/soef/alexa-remote/master.svg)](https://travis-ci.org/soef/alexa-remote)
--->
-[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/soef/alexa-remote/blob/master/LICENSE)
+## 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.
@@ -36,15 +38,28 @@ Important for the further interaction with alexa are the keys "localCookie" (sam
 If you not do this a new device is created each time the proxy is used which can end up in having many unused devices (such a device is like a mobile phone where you use the Alexa App with).
-Please use the new method "refreshAlexaCookie" to refresh the cookie data. It takes the same options object as the other method and requires the key "formerRegistrationData". It returns an updated object will all data as above. Please also store this and provide for susequent calls!
+Please use the new method "refreshAlexaCookie" to refresh the cookie data. It takes the same options object as the other method and requires the key "formerRegistrationData". It returns an updated object will all data as above. Please also store this and provide for subsequent calls!
+Since 4.0.0 of this library a new key called "macDms" is also returned when cookies are generated or refreshed. This is (right now Oct 2021) needed to use the Push Connection (alexa-remote library). Better strt also persisting this field, might be needed more later on.
 ## Thanks:
-A big thanks go to soef for the initial version of this library.
+A big thanks go to soef for the initial version of this library and to many other community users to support in finding out what Amazon changes here and there.
 Partly based on [Amazon Alexa Remote Control](http://blog.loetzimmer.de/2017/10/amazon-alexa-hort-auf-die-shell-echo.html) (PLAIN shell) and [alexa-remote-control](https://github.com/thorsten-gehrig/alexa-remote-control) and the the Proxy idea from [OpenHab-Addon](https://github.com/openhab/openhab2-addons/blob/f54c9b85016758ff6d271b62d255bbe41a027928/addons/binding/org.openhab.binding.amazonechocontrol). Also the new way to refresh cookie and all needed changes were developed in close cooperation with @mgeramb
 Thank you for that work.
 ## Changelog:
+### 4.0.2 (2022-06-30)
+* (Apollon77) Prevent potential crash cases
+### 4.0.1 (2021-10-11)
+* (Apollon77) Adjust call headers
+### 4.0.0 (2021-10-11)
+* IMPORTANT: Node.js 10 support is dropped, supports LTS versions of Node.js starting with 12.x
+* (Apollon77) Add support to get macDms with relevant data from the device registration process to use in push connection.
+* (adn77) Update Login Flow to use match to most current Alexa App flow using code auth
+* (Apollon77) Update deps, drop Node.js 10 support
 ### 3.4.3 (2021-04-18)
 * (Apollon77) handle potential crash case (Sentry IOBROKER-ALEXA2-86)

package/alexa-cookie.js CHANGED Viewed

@@ -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
@@ -57,7 +50,7 @@ function AlexaCookie() {
             }
         }
         Cookie = '';
-        for (let name in cookies) {
+        for (const name in cookies) {
             if (!cookies.hasOwnProperty(name)) continue;
             Cookie += name + '=' + cookies[name] + '; ';
         }
@@ -83,14 +76,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 +120,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];
@@ -164,7 +157,7 @@ function AlexaCookie() {
         }
         if (!_options.userAgent) {
-            let platform = os.platform();
+            const platform = os.platform();
             if (platform === 'win32') {
                 _options.userAgent = defaultUserAgent;
             }
@@ -205,7 +198,7 @@ function AlexaCookie() {
         function csrfTry() {
             const path = csrfUrls.shift();
-            let options = {
+            const options = {
                 'host': 'alexa.' + _options.amazonPage,
                 'path': path,
                 'method': 'GET',
@@ -223,8 +216,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 +261,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 +281,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 +315,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 +329,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')) {
@@ -389,7 +382,7 @@ function AlexaCookie() {
         }
         function prepareResult(err, data) {
-            if (err || !data.accessToken) {
+            if (err || !data.authorization_code) {
                 callback && callback(err, data.loginCookie);
                 return;
             }
@@ -422,62 +415,75 @@ 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.223830.0",
-                "device_type": "A2IVLV5VM2W81",
-                "device_name": "%FIRST_NAME%\u0027s%DUPE_STRATEGY_1ST%ioBroker Alexa2",
-                "os_version": "11.4.1",
-                "device_serial": deviceSerial,
-                "device_model": "iPhone",
-                "app_name": "ioBroker Alexa2",
-                "software_version": "1"
+            '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'
             },
-            "auth_data": {
-                "access_token": loginData.accessToken
+            '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'
             ]
         };
-        for (let key in cookies) {
+        if (loginData.accessToken) {
+            registerData.auth_data = {
+                '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'
+            };
+        }
+        for (const key in cookies) {
             if (!cookies.hasOwnProperty(key)) continue;
             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.223830.0/iOS/11.4.1/iPhone',
+                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',
                 'Content-Type': 'application/json',
                 'Cookie': loginData.loginCookie,
-                'Accept': '*/*',
+                'Accept': 'application/json',
                 'x-amzn-identity-auth-domain': 'api.' + _options.baseAmazonPage
             },
             body: JSON.stringify(registerData)
@@ -505,18 +511,18 @@ function AlexaCookie() {
             Cookie = addCookies(Cookie, response.headers);
             loginData.refreshToken = body.response.success.tokens.bearer.refresh_token;
             loginData.tokenDate = Date.now();
+            loginData.macDms = body.response.success.tokens.mac_dms;
             /*
                 Get Amazon Marketplace Country
             */
-            let options = {
+            const options = {
                 host: 'alexa.' + _options.baseAmazonPage,
-                path: '/api/users/me?platform=ios&version=2.2.223830.0',
+                path: '/api/users/me?platform=ios&version=2.2.443692.0',
                 method: 'GET',
                 headers: {
-                    'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.223830.0/iOS/11.4.1/iPhone',
+                    'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
                     'Accept-Language': _options.acceptLanguage,
                     'Accept-Charset': 'utf-8',
                     'Connection': 'keep-alive',
@@ -547,7 +553,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');
@@ -569,7 +575,9 @@ function AlexaCookie() {
                         loginData.localCookie = resData.cookie;
                         loginData.csrf = resData.csrf;
                         delete loginData.accessToken;
-                        _options.logger && _options.logger('Final Registraton Result: ' + JSON.stringify(loginData));
+                        delete loginData.authorization_code;
+                        delete loginData.verifier;
+                        _options.logger && _options.logger('Final Registration Result: ' + JSON.stringify(loginData));
                         callback && callback(null, loginData);
                     });
                 });
@@ -585,7 +593,7 @@ function AlexaCookie() {
         const exchangeParams = {
             'di.os.name': 'iOS',
-            'app_version': '2.2.223830.0',
+            'app_version': '2.2.443692.0',
             'domain': '.' + amazonPage,
             'source_token': refreshToken,
             'requested_token_type': 'auth_cookies',
@@ -596,12 +604,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.223830.0/iOS/11.4.1/iPhone',
+                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',
@@ -650,7 +658,7 @@ function AlexaCookie() {
             });
             let localCookie = '';
-            for (let name in cookies) {
+            for (const name in cookies) {
                 if (!cookies.hasOwnProperty(name)) continue;
                 localCookie += name + '=' + cookies[name] + '; ';
             }
@@ -678,26 +686,26 @@ function AlexaCookie() {
         initConfig();
         const refreshData = {
-            "app_name": "ioBroker Alexa2",
-            "app_version": "2.2.223830.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": "11.4.1",
-            "current_version": "6.10.0"
+            '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'
         };
-        let options = {
+        const options = {
             host: 'api.' + _options.baseAmazonPage,
             path: '/auth/token',
             method: 'POST',
             headers: {
-                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.223830.0/iOS/11.4.1/iPhone',
+                'User-Agent': 'AmazonWebView/Amazon Alexa/2.2.443692.0/iOS/14.8/iPhone',
                 'Accept-Language': _options.acceptLanguage,
                 'Accept-Charset': 'utf-8',
                 'Connection': 'keep-alive',

package/lib/proxy.js CHANGED Viewed

@@ -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,7 +27,7 @@ function addCookies(Cookie, headers) {
         }
     }
     Cookie = '';
-    for (let name in cookies) {
+    for (const name in cookies) {
         if (!cookies.hasOwnProperty(name)) continue;
         Cookie += name + '=' + cookies[name] + '; ';
     }
@@ -90,7 +90,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,7 +123,19 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
         // ignore
     }
-    let proxyCookies = "";
+    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 = '';
     // proxy middleware options
     const optionsAlexa = {
@@ -139,12 +151,12 @@ 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}`] = '';
@@ -178,7 +190,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=token&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&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;
             }
@@ -203,8 +215,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(/&#x2F;/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}/`);
@@ -213,8 +225,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,9 +247,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) {
+            for (const cookie in initialCookies) {
                 if (!initialCookies.hasOwnProperty(cookie)) continue;
                 if (!reqCookie.includes(cookie + '=')) {
                     reqCookie += '; ' + cookie + '=' + initialCookies[cookie];
@@ -258,7 +270,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);
@@ -318,11 +330,12 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
             _options.logger && _options.logger('Alexa-Cookie: Proxy catched parameters: ' + JSON.stringify(queryParams));
             callbackCookie && callbackCookie(null, {
-                "loginCookie": proxyCookies,
-                "accessToken": queryParams['openid.oa2.access_token'],
-                "frc": initialCookies.frc,
-                "map-md": initialCookies['map-md'],
-                "deviceId": deviceId
+                'loginCookie': proxyCookies,
+                'authorization_code': queryParams['openid.oa2.authorization_code'],
+                'frc': initialCookies.frc,
+                'map-md': initialCookies['map-md'],
+                'deviceId': deviceId,
+                'verifier': code_verifier
             });
             return;
         }
@@ -363,7 +376,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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "alexa-cookie2",
-  "version": "3.4.3",
+  "version": "4.0.2",
   "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": "^1.2.0",
+    "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": "^1.8.3"
+    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.5.9",
+    "eslint": "^8.18.0"
   },
   "repository": {
     "type": "git",
@@ -41,6 +43,9 @@
   "scripts": {
     "release": "release-script"
   },
+  "engines": {
+    "node": ">=12.0.0"
+  },
   "main": "alexa-cookie.js",
   "readmeFilename": "readme.md"
 }

package/.commitmessage DELETED Viewed

@@ -1,3 +0,0 @@
-chore: release v3.4.3
-handle potential crash case (Sentry IOBROKER-ALEXA2-86)