Investigating stacking interval

Author: Spring3

src/background/browserAction.js

@@ -20,7 +20,7 @@ const iconsDisabled = {
 
 const twitchUrlRegexp = /^https:\/\/www.twitch.tv\/*/;
 
-let isEnabled = true;
+let isEnabled;
 
 browser.storage.local.get().then((currentState) => {
   isEnabled = typeof currentState.isEnabled === 'boolean' ? currentState.isEnabled : true;
@@ -44,6 +44,11 @@ function broadcastUpdate(isEnabled) {
 }
 
 function emitStatus(tabId, isEnabled) {
+  if (isEnabled) {
+    unlockForTab(tabId);
+  } else {
+    lockForTab(tabId);
+  }
   browser.tabs.sendMessage(tabId, { isEnabled });
 }
 
@@ -69,19 +74,54 @@ browser.storage.onChanged.addListener((changes, areaName) => {
 
 const redirectedToTwitch = {};
 
-browser.tabs.onUpdated.addListener((tabId, changeInfo) => {
-  if (changeInfo.status === 'loading') {
-    if (twitchUrlRegexp.test(changeInfo.url)) {
+console.log('location', window.location.href);
+
+browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
+  if (changeInfo.status === 'loading' && changeInfo.url) {
+    console.log('changeInfo', changeInfo);
+    if (
+      !redirectedToTwitch[tabId] &&
+      // if redirecting within twitch
+      twitchUrlRegexp.test(changeInfo.url)
+      // // or reloading the twitch page
+      // || !changeInfo.url && twitchUrlRegexp.test(tab.url)
+    ) {
+      console.log('valid url', (changeInfo || 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] && !twitchUrlRegexp.test(changeInfo.url)) {
       lockForTab(tabId);
+      console.log('leaving twitch', changeInfo.url);
       delete redirectedToTwitch[tabId];
-    } else if (!twitchUrlRegexp.test(changeInfo.url)) {
+    // if not twitch
+    } else if (!redirectedToTwitch[tabId] && !twitchUrlRegexp.test(changeInfo.url)) {
+      console.log('not twitch', changeInfo.url);
       lockForTab(tabId);
     }
   } else if (changeInfo.status === 'complete' && redirectedToTwitch[tabId]) {
+    console.log('changeInfo', changeInfo);
     emitStatus(tabId, isEnabled);
   }
 });
+
+// browser.runtime.onMessage.addListener((message, sender) => {
+//   console.log('sender', sender);
+//   console.log('message', message);
+//   if (sender.origin === 'https://www.twitch.tv') {
+//     const tabId = sender.tab.id;
+//     if (!twitchUrlRegexp.test(message.url)) {
+//       console.log('false');
+//       emitStatus(tabId, false);
+//     } else if (typeof isEnabled === 'boolean') {
+//       console.log('returning', isEnabled);
+//       emitStatus(sender.tab.id, isEnabled);
+//     } else {
+//       browser.storage.local.get().then((currentState) => {
+//         console.log('returning', typeof currentState.isEnabled === 'boolean' ? currentState.isEnabled : true);
+//         const isEnabled = typeof currentState.isEnabled === 'boolean' ? currentState.isEnabled : true;
+//         emitStatus(sender.tab.id, isEnabled);
+//       });
+//     }
+//   }
+// })

src/contentScripts/worker.js

@@ -1,6 +1,5 @@
 // 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;
@@ -13,6 +12,7 @@ function isLive() {
 
 function attemptToClick() {
   const bonusIcon = document.getElementsByClassName('claimable-bonus__icon')[0];
+  console.log('icon', bonusIcon);
   if (bonusIcon) {
     bonusIcon.click();
     return true;
@@ -22,8 +22,10 @@ function attemptToClick() {
 
 function waitForBonusButton() {
   let clickAttempts = 0;
+  console.log('looking for button');
   intervalId = setInterval(() => {
     const clicked = attemptToClick();
+    console.log('click', clicked);
     if (clicked) {
       pauseFor(ALMOST_FIFTEEN_MINUTES_MS);
     }
@@ -37,6 +39,7 @@ function waitForBonusButton() {
 }
 
 function pauseFor(duration) {
+  console.log('pausing for', duration);
   clearInterval(intervalId);
   setTimeout(() => {
     if (isLive()) {
@@ -48,22 +51,27 @@ function pauseFor(duration) {
 }
 
 function waitForWhenLive() {
+  console.log('waiting when live');
   clearInterval(intervalId);
   // reusing the same interval
   intervalId = setInterval(() => {
     if (isLive()) {
       clearInterval(intervalId);
       waitForBonusButton();
     }
-  }, TEN_SECONDS_MS);
+  }, FIVE_SECONDS);
 }
 
 
 function initialize() {
+  console.log('INTERVAL', intervalId);
   if (intervalId) {
+    console.log('CLEARING');
     clearInterval(intervalId);
   }
 
+  console.log('initializing');
+
   // initial check for the button
   attemptToClick();
 
@@ -78,6 +86,7 @@ const onMessage = (message, sender) => {
   if (sender.id === browser.runtime.id) {
     isEnabled = message.isEnabled;
     if (isEnabled) {
+      clearInterval(intervalId);
       initialize();
     } else {
       clearInterval(intervalId);