half way through refactor

src/components/MainList.tsx

@@ -4,7 +4,7 @@ import { configLogout, setLoggingEnabled } from '../reducers/configReducer';
 import { userLogout } from '../reducers/currentUser';
 import { ReduxSelector } from '../types/store';
 import { User } from '../types/user';
-import changeExtensionState from '../utils/changeExtensionState';
+import changeExtensionState from '../utils/changeExtensionStatus';
 
 export interface MainListProps {
   loggingEnabled: boolean;

src/components/Options.tsx

@@ -20,8 +20,10 @@ export default function Options(): JSX.Element {
     apiKey: '',
     apiUrl: config.apiUrl,
     denyList: [],
+    extensionStatus: 'allGood',
     hostname: '',
     loading: false,
+    loggingEnabled: true,
     loggingStyle: config.loggingStyle,
     loggingType: config.loggingType,
     socialMediaSites: config.socialMediaSites,
@@ -54,7 +56,9 @@ export default function Options(): JSX.Element {
       apiKey: state.apiKey,
       apiUrl: state.apiUrl,
       denyList: state.denyList,
+      extensionStatus: state.extensionStatus,
       hostname: state.hostname,
+      loggingEnabled: state.loggingEnabled,
       loggingStyle: state.loggingStyle,
       loggingType: state.loggingType,
       socialMediaSites: state.socialMediaSites,

src/components/WakaTime.tsx

@@ -10,7 +10,7 @@ import NavBar from './NavBar';
 
 export default function WakaTime(): JSX.Element {
   const dispatch = useDispatch();
-  const [extensionState, setExtensionState] = useState('');
+  const [extensionStatus, setExtensionStatus] = useState('');
 
   const {
     apiKey: apiKeyFromRedux,
@@ -21,8 +21,8 @@ export default function WakaTime(): JSX.Element {
   useEffect(() => {
     const fetchData = async () => {
       await fetchUserData(apiKeyFromRedux, dispatch);
-      const items = await browser.storage.sync.get({ extensionState: '' });
-      setExtensionState(items.extensionState as string);
+      const items = await browser.storage.sync.get({ extensionStatus: '' });
+      setExtensionStatus(items.extensionStatus as string);
     };
     void fetchData();
   }, []);
@@ -32,7 +32,7 @@ export default function WakaTime(): JSX.Element {
   return (
     <div className="py-4 px-2 pt-0">
       <NavBar />
-      {isApiKeyValid && extensionState === 'notSignedIn' && (
+      {isApiKeyValid && extensionStatus === 'notSignedIn' && (
         <Alert
           type={config.alert.failure.type}
           text={'Invalid API key or API url'}

src/config/config.ts

@@ -3,7 +3,7 @@ import browser from 'webextension-polyfill';
 /**
  * Logging
  */
-export type ApiStates = 'allGood' | 'notLogging' | 'notSignedIn' | 'ignored';
+export type ExtensionStatus = 'allGood' | 'notLogging' | 'notSignedIn' | 'ignored';
 /**
  * Supported logging style
  */
@@ -90,7 +90,7 @@ export interface Config {
   name: string;
   nonTrackableSites: string[];
   socialMediaSites: string[];
-  states: ApiStates[];
+  states: ExtensionStatus[];
   /**
    * Get stats from the wakatime api
    */

src/core/WakaTimeCore.ts

@@ -1,23 +1,25 @@
 import { IDBPDatabase, openDB } from 'idb';
-import moment from 'moment';
 import browser, { Tabs } from 'webextension-polyfill';
-import { IS_EDGE, IS_FIREFOX, getOperatingSystem, isCodeReviewing } from '../utils';
-import { getHeartbeatFromPage } from '../utils/heartbeat';
 /* eslint-disable no-fallthrough */
 /* eslint-disable default-case */
+import moment from 'moment';
+import { getOperatingSystem, isCodeReviewing } from '../utils';
+import { changeExtensionStatus } from '../utils/changeExtensionStatus';
 import getDomainFromUrl, { getDomain } from '../utils/getDomainFromUrl';
+import { getSettings, Settings } from '../utils/settings';
 
-import config from '../config/config';
+import config, { ExtensionStatus } from '../config/config';
 import { Heartbeat } from '../types/heartbeats';
 import { getApiKey } from '../utils/apiKey';
-import changeExtensionState from '../utils/changeExtensionState';
 import contains from '../utils/contains';
+import { getHeartbeatFromPage } from '../utils/heartbeat';
 import { getLoggingType } from '../utils/logging';
 
 class WakaTimeCore {
   tabsWithDevtoolsOpen: Tabs.Tab[];
   lastHeartbeat: Heartbeat | undefined;
   lastHeartbeatSentAt = 0;
+  lastExtensionState: ExtensionStatus = 'allGood';
   db: IDBPDatabase | undefined;
   constructor() {
     this.tabsWithDevtoolsOpen = [];
@@ -55,47 +57,56 @@ class WakaTimeCore {
     return false;
   }
 
-  async processHeartbeat(heartbeat: Heartbeat) {
-    const apiKey = await getApiKey();
-    if (!apiKey) return changeExtensionState('notLogging');
+  canSendHeartbeat(url: string, settings: Settings): boolean {
+    if (!settings.trackSocialMedia) {
+      const domain = getDomain(url);
+      if (
+        settings.socialMediaSites.find((pattern) => {
+          const re = new RegExp(pattern.replace(/\*/g, '.*'));
+          return re.test(domain);
+        }) !== undefined
+      ) {
+        return false;
+      }
+    }
+
+    if (settings.loggingStyle === 'deny') {
+      return (
+        settings.denyList.find((pattern) => {
+          const re = new RegExp(pattern.replace(/\*/g, '.*'));
+          return re.test(url);
+        }) == undefined
+      );
+    }
+    return (
+      settings.allowList.find((pattern) => {
+        const re = new RegExp(pattern.replace(/\*/g, '.*'));
+        return re.test(url);
+      }) !== undefined
+    );
+  }
+
+  async handleActivity(url: string, heartbeat: Heartbeat) {
+    const settings = await getSettings();
+    if (!settings.loggingEnabled) {
+      await changeExtensionStatus('notLogging');
+      return;
+    }
 
     if (!this.shouldSendHeartbeat(heartbeat)) return;
 
-    if (items.loggingStyle == 'deny') {
-      if (!contains(url, items.denyList as string)) {
-        await this.sendHeartbeat(
-          {
-            branch: null,
-            hostname: items.hostname as string,
-            project,
-            url,
-          },
-          apiKey,
-          payload,
-        );
-      } else {
-        await changeExtensionState('ignored');
-        console.log(`${url} is on denyList.`);
-      }
-    } else if (items.loggingStyle == 'allow') {
-      const heartbeat = this.getHeartbeat(url, items.allowList as string);
-      if (heartbeat.url) {
-        await this.sendHeartbeat(
-          {
-            ...heartbeat,
-            branch: null,
-            hostname: items.hostname as string,
-            project: heartbeat.project ?? project,
-          },
-          apiKey,
-          payload,
-        );
-      } else {
-        await changeExtensionState('ignored');
-        console.log(`${url} is not on allowList.`);
+    if (!this.canSendHeartbeat(url, settings)) {
+      await changeExtensionStatus('ignored');
+      return;
+    }
+
+    if (this.db) {
+      // append heartbeat to queue
+      await this.db.add('cacheHeartbeats', heartbeat);
+
+      if (settings.extensionStatus !== 'notSignedIn') {
+        await changeExtensionStatus('allGood');
       }
-    } else {
-      throw Error(`Unknown logging styel: ${items.loggingStyle}`);
     }
   }
 
@@ -106,7 +117,7 @@ class WakaTimeCore {
   async recordHeartbeat(html: string, payload: Record<string, unknown> = {}): Promise<void> {
     const apiKey = await getApiKey();
     if (!apiKey) {
-      return changeExtensionState('notLogging');
+      return changeExtensionStatus('notLogging');
     }
     const items = await browser.storage.sync.get({
       allowList: '',
@@ -118,14 +129,14 @@ class WakaTimeCore {
       trackSocialMedia: config.trackSocialMedia,
     });
     if (items.loggingEnabled === true) {
-      await changeExtensionState('allGood');
+      await changeExtensionStatus('allGood');
 
       let newState = '';
       // Detects we are running this code in the extension scope
       if (browser.idle as browser.Idle.Static | undefined) {
         newState = await browser.idle.queryState(config.detectionIntervalInSeconds);
         if (newState !== 'active') {
-          return changeExtensionState('notLogging');
+          return changeExtensionStatus('notLogging');
         }
       }
 
@@ -150,7 +161,7 @@ class WakaTimeCore {
       const hostname = getDomain(url);
       if (!items.trackSocialMedia) {
         if ((items.socialMediaSites as string[]).includes(hostname)) {
-          return changeExtensionState('ignored');
+          return changeExtensionStatus('ignored');
         }
       }
 
@@ -176,7 +187,7 @@ class WakaTimeCore {
             payload,
           );
         } else {
-          await changeExtensionState('ignored');
+          await changeExtensionStatus('ignored');
           console.log(`${url} is on denyList.`);
         }
       } else if (items.loggingStyle == 'allow') {
@@ -193,7 +204,7 @@ class WakaTimeCore {
             payload,
           );
         } else {
-          await changeExtensionState('ignored');
+          await changeExtensionStatus('ignored');
           console.log(`${url} is not on allowList.`);
         }
       } else {
@@ -374,7 +385,7 @@ class WakaTimeCore {
         await this.db.add('cacheHeartbeats', payload);
       }
 
-      await changeExtensionState('notSignedIn');
+      await changeExtensionStatus('notSignedIn');
     }
   }
 
@@ -385,7 +396,7 @@ class WakaTimeCore {
   async sendCachedHeartbeatsRequest(): Promise<void> {
     const apiKey = await getApiKey();
     if (!apiKey) {
-      return changeExtensionState('notLogging');
+      return changeExtensionStatus('notLogging');
     }
 
     if (this.db) {