Merge pull request #38 from femioladeji/feat/update-v2-v3

update manifest file

Author: femioladeji

manifest.json

@@ -1,10 +1,10 @@
 {
-    "manifest_version": 2,
+    "manifest_version": 3,
     "name": "Screentime",
     "description": "To keep track and manage your time on sites that reduce productivity. You can set the number of minutes you want and time frames",
     "short_name": "screentime",
     "version": "5.0.2",
-    "browser_action": {
+    "action": {
       "default_popup": "index.html",
       "default_icon" : "images/icon_128.png"
     },
@@ -14,15 +14,13 @@
       "128": "images/icon_128.png"
     },
     "background": {
-      "scripts": [
-        "js/background/main.js"
-      ]
+      "service_worker": "js/background/main.js",
+      "type": "module"
     },
     "permissions": [
       "storage",
       "notifications",
       "tabs"
-    ],
-    "content_security_policy": "script-src 'self'; object-src 'self'"
+    ]
   }
 

src/assets/js/background.js

@@ -23,8 +23,8 @@ const setDelayedAction = async (name, tabId) => {
     if (secondsToNextBlock && secondsToNextBlock < secondsToLimit) {
       secondsLeft = secondsToNextBlock;
     }
-    delayHandler = setTimeout(() => {
-      chrome.tabs.remove(tabId);
+    delayHandler = setTimeout(async () => {
+      await chrome.tabs.remove(tabId);
       utils.notify(`You can no longer be on ${name}`);
     }, secondsLeft * 1000);
   }
@@ -38,10 +38,10 @@ const setActive = async () => {
     if (utils.isTabAMatch(name, cacheStorage.configuration)) {
       if (utils.isTimeExceeded(cacheStorage, name)) {
         // eslint-disable-next-line
-        chrome.tabs.remove(id);
+        await chrome.tabs.remove(id);
       } else if (utils.isTimeframeBlocked(cacheStorage, name)) {
         // eslint-disable-next-line
-        chrome.tabs.remove(id);
+        await chrome.tabs.remove(id);
       } else if (cacheStorage.active.name !== name) {
         // if a different site is active then end the existing site's session
         utils.end(cacheStorage);
@@ -79,10 +79,12 @@ const synchronize = async (fetchData = false) => {
 
   // eslint-disable-next-line
   chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-    const { url } = tab;
-    const name = utils.getName(url);
-    if (cacheStorage.active.name !== name) {
-      setActive();
+    if (tab) {
+      const { url } = tab;
+      const name = utils.getName(url);
+      if (cacheStorage.active.name !== name) {
+        setActive();
+      }
     }
   });
 
@@ -106,17 +108,17 @@ const synchronize = async (fetchData = false) => {
   });
 
   // eslint-disable-next-line
-  chrome.notifications.onButtonClicked.addListener((notificationId, buttonIndex) => {
+  chrome.notifications.onButtonClicked.addListener(async (notificationId, buttonIndex) => {
     if (buttonIndex === 0) {
       // close the tab
       // eslint-disable-next-line
-      chrome.tabs.query({
+      const activeTab = await chrome.tabs.query({
         active: true,
         currentWindow: true
-      }, (activeTab) => {
-        // eslint-disable-next-line
-        chrome.tabs.remove(activeTab[0].id);
       });
+      if (activeTab[0]) {
+        await chrome.tabs.remove(activeTab[0].id);
+      }
     }
   });
 

src/assets/js/utils.js

@@ -132,7 +132,7 @@ export default {
    * @param {string} message message to show
    * @param {boolean} action if action buttons should be added
    */
-  notify(message, action) {
+  async notify(message, action) {
     const notificationObject = {
       type: 'basic',
       iconUrl: 'images/icon_128.png',
@@ -145,9 +145,7 @@ export default {
       ];
       notificationObject.requireInteraction = true;
     }
-    // eslint-disable-next-line
-    chrome.notifications.create(notificationObject, () => {
-    });
+    await chrome.notifications.create(null, notificationObject);
   },
 
   saveConfiguration(key, data) {