Prepare first stable release

Fix bug whereby extension does not refresh  blocked sites immediately 
after profile Added or removed. Also added 1 second delay in 
SetBlockedSitesLoop in case of rounding problems.

Author: AzlanCoding

README.md

@@ -1,15 +1,15 @@
 # Project Ignite
 Project Ignite is a new Device Manager Application (DMA) for schools developed after [Mobile Guardian was hacked](https://www.channelnewsasia.com/singapore/mobile-guardian-application-remove-cybersecurity-incident-moe-4526676).
 <br>
-Project Ignite focuses on ensuring the **Security** and **Privacy** of students as well as being as **Fail-Proof** as possible. The chrome extension for students is **designed to work even if the server goes offline** after it has been properly set up. Moreover, the chrome extension does not collect any data from students' devices (as of version 0.1).
+Project Ignite focuses on ensuring the **Security** and **Privacy** of students as well as being as **Fail-Proof** as possible. The chrome extension for students is **designed to work even if the server goes offline** after it has been properly set up. Moreover, the chrome extension does not collect any data from students' devices (as of version 0.1.0).
 <br>
-The first version of this application was made in less than 3 days and is currently under testing.
+The first version unstable of this application was made in less than 3 days.
 <br><br>
-I believe that Singapore needs our own solution for a DMA to accommodate for the various needs of students and teachers. In the future, Project Ignite be more than just a DMA. It will be an all in one software to help teachers facilitate learning through various tools and feature that will keep student intrigued to learning. These features will be synced to the complex timetable schools in Singapore have. It will also come with software to help schools create these complex timetables.
+I believe that Singapore needs our own solution for a DMA to accommodate for the various needs of students and teachers. In the future, Project Ignite be more than just a DMA. It will be an all in one software to help teachers facilitate learning through various tools and features that will keep students intrigued to conducted lessons. These features will be synced to the complex timetable schools in Singapore have. It will also come with software to help schools create these complex timetables.
 <br>
 Thus, I plan to further develop this project after my GCE O'Level examinations.<br>
 <br>
-The server is based off a past project which is based off a tutorial found [here](https://www.digitalocean.com/community/tutorials/how-to-add-authentication-to-your-app-with-flask-login).
+The server is originally based off a past project which is based off a tutorial found [here](https://www.digitalocean.com/community/tutorials/how-to-add-authentication-to-your-app-with-flask-login).
 <br>
 This project is made possible thanks to [Free DNS](https://freedns.afraid.org/).
 
@@ -44,16 +44,16 @@ This full stack application does not collect any personal data nor does it have
 - **Future Goals**
   - Timetable generation and ability to sync with "Live class" system
   - iPad and Windows Client for students using these devices
-  - Point system linked to "Live Polls". Points can be used in...
+  - Point system linked to "Live Polls". Points can be used to claim...
 
 
 ## Important Notes
-1. **THERE IS A LIMIT OF 5,000 BLOCKED SITES PER STUDENT** due to the usage of `declarativeNetRequest`. As stated in the [documentation](https://developer.chrome.com/docs/extensions/reference/api/declarativeNetRequest#dynamic-rules):
-> An extension can have at least 5000 dynamic rules. This is exposed as the `MAX_NUMBER_OF_UNSAFE_DYNAMIC_RULES`.
+1. **THERE IS A LIMIT OF 5,000 BLOCKED SITES PER STUDENT** due to the usage of `declarativeNetRequest`. As stated in Chrome's [documentation](https://developer.chrome.com/docs/extensions/reference/api/declarativeNetRequest#dynamic-rules):
+  > An extension can have at least 5000 dynamic rules. This is exposed as the `MAX_NUMBER_OF_UNSAFE_DYNAMIC_RULES`.
 
 2. The extension checks for updates from the profile every 30 seconds. You can force a refresh by pressing `Refresh Profile` in the options page.
 
-3. **FOR ADMINISTRATORS:** When force installing the extension on students' devices, extension needs access to `file://` URLs and `Site Access` must be set to `On all sites` in order for the extensions to work properly. Please ensure you enforce this rule.<br>
+3. **FOR ADMINISTRATORS:** When force installing the extension on students' devices, extension needs access to file URLs and `Site Access` must be set to `On all sites` in order for the extensions to work properly. Please ensure you enforce this rule.<br>
 Even if you cannot enforce this setting, it will by default have access to all sites. A full screen popup will annoy students if they attempt to try to change the setting. The extension will also switch to `legacyWebBlocking` to stop students from visiting the blocked webpage should this popup fail to launch.
 
 

extension/background.js

@@ -26,6 +26,7 @@ function areMapsEqual(map1, map2) {
 
 
 function checkProfileActive(data){
+  // TODO: Check if it will work with overnight timing
   let d = new Date();
   if ((data.startHour == data.endHour) && (data.startMin == data.endMin) && (data.enforceDays.includes(d.getDay()))){
     return true;
@@ -35,6 +36,27 @@ function checkProfileActive(data){
   let secondsEndSince2400 = ((data.endHour*3600) + (data.endMin*60));
   return ((data.enforceDays.includes(d.getDay())) && ((secondsStartSince2400 <= secondsNowSince2400) && (secondsEndSince2400 > secondsNowSince2400)))
 }
+/*function checkProfileActive(enforceDays, enrollTime){
+  let [startHour, startMin] = enrollTime.start.split(":");
+  let [endHour, endMin] = enrollTime.end.split(":");
+  let d = new Date();
+  if (enforceDays.includes(d.getDay())){
+    if (enrollTime.start == enrollTime.end){
+      return true;
+    }
+    let secondsNowSince2400 = ((d.getHours()*3600) + (d.getMinutes()*60));
+    let secondsStartSince2400 = ((startHour*3600) + (startMin*60));
+    let secondsEndSince2400 = ((endHour*3600) + (endMin*60));
+    if (secondsStartSince2400 >= secondsEndSince2400){
+      secondsEndSince2400 += 86400;//Overnight profile. Add 24hrs
+    }
+    return ((secondsStartSince2400 <= secondsNowSince2400) && (secondsEndSince2400 > secondsNowSince2400))
+
+  }
+  else {
+    return false
+  }
+}*/
 
 function enforceBlockedSites(data){
   console.log("Enforcing new blockedSites");
@@ -116,7 +138,7 @@ function enforceBlockedSites(data){
 }
 
 function setBlockedSites(){
-  console.log("checking blocked sites changes")
+  console.log("checking blocked sites changes");
   return getClasses().then((classList) => {
     let blockedSitesCache = new Map();
     let activeProfilesCache = new Map();
@@ -207,7 +229,7 @@ function syncProfiles(){
 function setBlockedSitesLoop(){
   return setBlockedSites().then(() => {
     let now = new Date();
-    let delay = (60 - now.getSeconds()) * 1000;
+    let delay = (61 - now.getSeconds()) * 1000;//Runs every minute + 1 second delay just in case
     return setTimeout(setBlockedSitesLoop,delay)
   });
 }
@@ -257,7 +279,13 @@ function relaunchEnforceWindow(windowId) {
 }
 function fulllscreenEnforceWindow(windowId){
   if (windowId === WindowTopRuleData.windowId) {
-    return chrome.windows.update(windowId, { state: 'fullscreen'});
+    try{
+      return chrome.windows.update(windowId, { state: 'fullscreen'});
+    }
+    catch(err){
+      //probably can't find the window
+      console.log(err);
+    }
   }
 }
 function relaunchClosedEnforceWindow(windowId) {
@@ -404,11 +432,15 @@ function checkPermissions() {
 
 
 export function addClass(className){
-  return getUpdates(className);
+  return getUpdates(className).then(setBlockedSites);
 }
 
-export function removeClass(className){
-  return chrome.storage.sync.remove(className);
+/*export function removeClass(className){
+  return chrome.storage.sync.remove(className).then(setBlockedSites);
+}*/
+
+export function removeClass(){
+  return chrome.storage.sync.clear().then(setBlockedSites);
 }
 
 export function getUpdateHost(){

extension/scripts.js

@@ -51,7 +51,7 @@ function masterPin(){
   document.getElementById("removeProfileBtn").classList.add("is-loading");
   fetch(updateHost+"/api/v0/masterPin",{cache: "no-cache", method:"post", headers: {'PIN': document.getElementById('maserPinInput').value}}).then((response) => {
     if (response.ok) {
-      chrome.storage.sync.clear().then(()=>{
+      removeClass().then(()=>{
         alert("REMOVAL PROCESS SUCCESS!");
         window.location.reload();
       });