alexa-cookie2 4.0.2 → 4.1.1

package/README.md

@@ -49,6 +49,16 @@ Partly based on [Amazon Alexa Remote Control](http://blog.loetzimmer.de/2017/10/
 Thank you for that work.
 
 ## Changelog:
+### 4.1.1 (2022-07-18)
+* (Apollon77/bbindreiter) Update used User-Agent for some requests
+
+### 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
 

package/alexa-cookie.js

@@ -13,11 +13,15 @@ const cookieTools = require('cookie');
 const amazonProxy = require('./lib/proxy.js');
 
 const defaultAmazonPage = 'amazon.de';
-const defaultUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:99.0) Gecko/20100101 Firefox/99.0';
-const defaultUserAgentLinux = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36';
+const defaultUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36';
+const defaultUserAgentLinux = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36';
 //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',
@@ -50,8 +54,7 @@ function AlexaCookie() {
             }
         }
         Cookie = '';
-        for (const name in cookies) {
-            if (!cookies.hasOwnProperty(name)) continue;
+        for (const name of Object.keys(cookies)) {
             Cookie += name + '=' + cookies[name] + '; ';
         }
         Cookie = Cookie.replace(/[; ]*$/, '');
@@ -142,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') {
@@ -204,7 +210,7 @@ function AlexaCookie() {
                 '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,
@@ -390,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);
@@ -430,13 +441,13 @@ function AlexaCookie() {
             },
             'registration_data': {
                 'domain': 'Device',
-                'app_version': '2.2.443692.0',
+                'app_version': apiCallVersion,
                 'device_type': 'A2IVLV5VM2W81',
                 'device_name': '%FIRST_NAME%\u0027s%DUPE_STRATEGY_1ST%ioBroker Alexa2',
-                'os_version': '14.8',
+                'os_version': '15.5',
                 'device_serial': deviceSerial,
                 'device_model': 'iPhone',
-                'app_name': 'ioBroker Alexa2',
+                'app_name': _options.deviceAppName,
                 'software_version': '1'
             },
             'auth_data': {
@@ -464,8 +475,7 @@ function AlexaCookie() {
                 'client_domain' : 'DeviceLegacy'
             };
         }
-        for (const 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
@@ -477,7 +487,7 @@ function AlexaCookie() {
             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',
@@ -519,10 +529,10 @@ function AlexaCookie() {
 
             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',
@@ -593,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',
@@ -609,7 +619,7 @@ function AlexaCookie() {
             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',
@@ -658,8 +668,7 @@ function AlexaCookie() {
 
             });
             let localCookie = '';
-            for (const name in cookies) {
-                if (!cookies.hasOwnProperty(name)) continue;
+            for (const name of Object.keys(cookies)) {
                 localCookie += name + '=' + cookies[name] + '; ';
             }
             localCookie = localCookie.replace(/[; ]*$/, '');
@@ -687,7 +696,7 @@ function AlexaCookie() {
 
         const refreshData = {
             'app_name': 'ioBroker Alexa2',
-            'app_version': '2.2.443692.0',
+            'app_version': apiCallVersion,
             'di.sdk.version': '6.10.0',
             'source_token': _options.formerRegistrationData.refreshToken,
             'package_name': 'com.amazon.echo',
@@ -705,7 +714,7 @@ function AlexaCookie() {
             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

@@ -27,8 +27,7 @@ function addCookies(Cookie, headers) {
         }
     }
     Cookie = '';
-    for (const name in cookies) {
-        if (!cookies.hasOwnProperty(name)) continue;
+    for (const name of Object.keys(cookies)) {
         Cookie += name + '=' + cookies[name] + '; ';
     }
     Cookie = Cookie.replace(/[; ]*$/, '');
@@ -163,7 +162,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
     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,
@@ -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;
@@ -249,8 +248,7 @@ function initAmazonProxy(_options, callbackCookie, callbackListening) {
             if (reqCookie === undefined) {
                 reqCookie = '';
             }
-            for (const cookie in initialCookies) {
-                if (!initialCookies.hasOwnProperty(cookie)) continue;
+            for (const cookie of Object.keys(initialCookies)) {
                 if (!reqCookie.includes(cookie + '=')) {
                     reqCookie += '; ' + cookie + '=' + initialCookies[cookie];
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alexa-cookie2",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "description": "Generate Cookie and CSRF for Alexa Remote",
   "author": {
     "name": "Apollon77",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@alcalzone/release-script": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "eslint": "^8.18.0"
+    "eslint": "^8.20.0"
   },
   "repository": {
     "type": "git",