Bug fixes and optimizations (#14)

* test

* test

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* sync

* syncing

* syncing v2.4.0 changes

* sync

Author: tonesto7

.editorconfig

@@ -1,12 +1,11 @@
 {
+    "root": true,
     "env": {
-        "browser": false,
-        "commonjs": true,
         "es6": true,
         "node": true
     },
     "parserOptions": {
-        "ecmaVersion": 2017,
+        "ecmaVersion": 9,
         "ecmaFeatures": {
             "jsx": true
         },
@@ -22,5 +21,9 @@
         "no-unused-vars": "warn",
         "constructor-super": "warn",
         "valid-typeof": "warn"
-    }
-}
+    },
+    "extends": [
+        "eslint:recommended",
+        "prettier"
+    ]
+}

.eslintrc.json

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 /* jshint -W097 */
 /* jshint -W030 */
 /* jshint strict: false */
@@ -20,7 +21,7 @@ const cookieTools = require('cookie');
 const amazonProxy = require('./lib/proxy.js');
 const removeRoute = require('express-remove-route');
 
-const defaultAmazonPage = 'amazon.com';
+// const defaultAmazonPage = 'amazon.com';
 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 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';

alexa-cookie/alexa-cookie.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 /* jshint -W097 */
 /* jshint -W030 */
 /* jshint strict: false */
@@ -14,46 +15,46 @@ const cookieTools = require('cookie');
 let webApp;
 
 function addCookies(Cookie, headers) {
-  if (!headers || !headers['set-cookie']) return Cookie;
-  const cookies = cookieTools.parse(Cookie);
-  for (let cookie of headers['set-cookie']) {
-    cookie = cookie.match(/^([^=]+)=([^;]+);.*/);
-    if (cookie && cookie.length === 3) {
-      if (cookie[1] === 'ap-fid' && cookie[2] === '""') continue;
-      cookies[cookie[1]] = cookie[2];
+    if (!headers || !headers['set-cookie']) return Cookie;
+    const cookies = cookieTools.parse(Cookie);
+    for (let cookie of headers['set-cookie']) {
+        cookie = cookie.match(/^([^=]+)=([^;]+);.*/);
+        if (cookie && cookie.length === 3) {
+            if (cookie[1] === 'ap-fid' && cookie[2] === '""') continue;
+            cookies[cookie[1]] = cookie[2];
+        }
+    }
+    Cookie = '';
+    for (let name in cookies) {
+        if (!cookies.hasOwnProperty(name)) continue;
+        Cookie += name + '=' + cookies[name] + '; ';
     }
-  }
-  Cookie = '';
-  for (let name in cookies) {
-    if (!cookies.hasOwnProperty(name)) continue;
-    Cookie += name + '=' + cookies[name] + '; ';
-  }
-  Cookie = Cookie.replace(/[; ]*$/, '');
-  return Cookie;
+    Cookie = Cookie.replace(/[; ]*$/, '');
+    return Cookie;
 }
 
 function customStringify(v, func, intent) {
-  const cache = new Map();
-  return JSON.stringify(v, function(key, value) {
-    if (typeof value === 'object' && value !== null) {
-      if (cache.get(value)) {
-        // Circular reference found, discard key
-        return;
-      }
-      // Store value in our map
-      cache.set(value, true);
-    }
-    return value;
-  }, intent);
+    const cache = new Map();
+    return JSON.stringify(v, function(key, value) {
+        if (typeof value === 'object' && value !== null) {
+            if (cache.get(value)) {
+                // Circular reference found, discard key
+                return;
+            }
+            // Store value in our map
+            cache.set(value, true);
+        }
+        return value;
+    }, intent);
 }
 
 function initAmazonProxy(_options, webapp, callbackCookie, callbackListening) {
-  if (webapp) {
-    webApp = webapp;
-  }
+    if (webapp) {
+        webApp = webapp;
+    }
 
-  const getLocalHost = function(noPort = false) {
-      return `${(_options.proxyHost || _options.proxyOwnIp)}${(noPort || _options.useHeroku) ? '' : `:${_options.proxyPort}`}`;
+    const getLocalHost = function(noPort = false) {
+            return `${(_options.proxyHost || _options.proxyOwnIp)}${(noPort || _options.useHeroku) ? '' : `:${_options.proxyPort}`}`;
     };
     const initialCookies = {};
     if (!_options.formerRegistrationData || !_options.formerRegistrationData.frc) {
@@ -324,4 +325,4 @@ function initAmazonProxy(_options, webapp, callbackCookie, callbackListening) {
     }
 }
 
-module.exports.initAmazonProxy = initAmazonProxy;
+module.exports.initAmazonProxy = initAmazonProxy;