Merge branch 'release/1.1.0'

Author: Spring3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "twitch-auto-points",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {

src/background/browserAction.js

@@ -69,19 +69,30 @@ browser.storage.onChanged.addListener((changes, areaName) => {
 
 const redirectedToTwitch = {};
 
-browser.tabs.onUpdated.addListener((tabId, changeInfo) => {
+browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
   if (changeInfo.status === 'loading') {
-    if (twitchUrlRegexp.test(changeInfo.url)) {
+    // if redirecting within twitch
+    if (
+      (!redirectedToTwitch[tabId] && changeInfo.url && twitchUrlRegexp.test(changeInfo.url))
+      || (!changeInfo.url && twitchUrlRegexp.test(tab.url))      
+    ) {
       unlockForTab(tabId);
       redirectedToTwitch[tabId] = true;
-      // if was on twitch, but is redirecting outside
-    } else if (redirectedToTwitch[tabId]) {
+    // if was on twitch, but is redirecting outside
+    } else if (redirectedToTwitch[tabId] && changeInfo.url && !twitchUrlRegexp.test(changeInfo.url)) {
       lockForTab(tabId);
       delete redirectedToTwitch[tabId];
-    } else if (!twitchUrlRegexp.test(changeInfo.url)) {
+    // if not twitch
+    } else if (!redirectedToTwitch[tabId] && changeInfo.url && !twitchUrlRegexp.test(changeInfo.url)) {
       lockForTab(tabId);
     }
   } else if (changeInfo.status === 'complete' && redirectedToTwitch[tabId]) {
     emitStatus(tabId, isEnabled);
   }
 });
+
+browser.tabs.onRemoved.addListener((tabId) => {
+  if (redirectedToTwitch[tabId]) {
+    delete redirectedToTwitch[tabId];
+  }
+})

src/contentScripts/worker.js

@@ -1,11 +1,26 @@
 // 14 minutes 58 seconds in ms
 const ALMOST_FIFTEEN_MINUTES_MS = 15 * 60 * 1000 - 2000;
-const TEN_SECONDS_MS = 10 * 1000;
 const FIVE_SECONDS = 5 * 1000;
 
 const maxClickAttempts = 5;
 let isEnabled;
-let intervalId;
+let timeout;
+
+const IntervalOperator = () => {
+  let intervalId;
+
+  return {
+    set: (handler, interval) => {
+      clearInterval(intervalId);
+      intervalId = setInterval(handler, interval);
+    },
+    clear: () => {
+      clearInterval(intervalId);
+    }
+  };
+};
+
+const interval = IntervalOperator();
 
 function isLive() {
   return !!document.getElementsByClassName('live-indicator')[0];
@@ -22,7 +37,7 @@ function attemptToClick() {
 
 function waitForBonusButton() {
   let clickAttempts = 0;
-  intervalId = setInterval(() => {
+  interval.set(() => {
     const clicked = attemptToClick();
     if (clicked) {
       pauseFor(ALMOST_FIFTEEN_MINUTES_MS);
@@ -37,8 +52,8 @@ function waitForBonusButton() {
 }
 
 function pauseFor(duration) {
-  clearInterval(intervalId);
-  setTimeout(() => {
+  interval.clear();
+  timeout = setTimeout(() => {
     if (isLive()) {
       waitForBonusButton();
     } else {
@@ -48,21 +63,19 @@ function pauseFor(duration) {
 }
 
 function waitForWhenLive() {
-  clearInterval(intervalId);
+  interval.clear();
   // reusing the same interval
-  intervalId = setInterval(() => {
+  interval.set(() => {
     if (isLive()) {
-      clearInterval(intervalId);
+      interval.clear();
       waitForBonusButton();
     }
-  }, TEN_SECONDS_MS);
+  }, FIVE_SECONDS);
 }
 
 
 function initialize() {
-  if (intervalId) {
-    clearInterval(intervalId);
-  }
+  clearTimeout(timeout);
 
   // initial check for the button
   attemptToClick();
@@ -80,7 +93,8 @@ const onMessage = (message, sender) => {
     if (isEnabled) {
       initialize();
     } else {
-      clearInterval(intervalId);
+      interval.clear();
+      clearTimeout(timeout);
     }
   }
 }

src/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "author": "Daniyil Vasylenko",
   "name": "Twitch Auto Points",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "homepage_url": "https://github.com/Spring3/twitch-auto-points",
   "description": "Automatic twitch channel points collection",
   "permissions": [