feat: add whitelist time & password support

getulysse · Apr 6, 2024 · ba0d820 · ba0d820
1 parent 248b2b2
commit ba0d820
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/src/commands.js b/src/commands.js
@@ -60,6 +60,20 @@ export const unblockCmd = (name) => {
 };
 
 export const whitelistCmd = (name) => {
+    const time = getParam('--time') || getParam('-t');
+    const password = getParam('--password') || getParam('-p');
+    const distraction = { name, time };
+
+    if (isValidPassword(password)) {
+        disableShieldMode(password);
+        console.log('Shield mode disabled.');
+        whitelistDistraction(distraction);
+        console.log(`Whitelisting ${name}`);
+        enableShieldMode(password);
+        console.log('Shield mode enabled.');
+        return;
+    }
+
     if (config?.shield) {
         console.log('You must disable the shield mode first.');
         return;
@@ -70,7 +84,7 @@ export const whitelistCmd = (name) => {
         return;
     }
 
-    whitelistDistraction({ name });
+    whitelistDistraction(distraction);
     console.log(`Whitelisting ${name}`);
 };
 

diff --git a/src/daemon.js b/src/daemon.js
@@ -24,14 +24,16 @@ const handleAppBlocking = () => {
 };
 
 const handleTimeout = () => {
-    const blocklist = config?.blocklist.filter(({ timeout }) => {
+    const list = [...config.blocklist, ...config.whitelist];
+
+    const listWithoutTimeout = list.filter(({ timeout }) => {
         if (!timeout) return true;
         return timeout >= Math.floor(Date.now() / 1000);
     });
 
-    if (blocklist?.length === config?.blocklist.length) return;
+    if (listWithoutTimeout.length === list.length) return;
 
-    editConfig({ ...config, blocklist });
+    editConfig(config);
 };
 
 const cleanUpAndExit = () => {

diff --git a/src/utils.js b/src/utils.js
@@ -97,6 +97,7 @@ export const editConfig = ({ blocklist = [], whitelist = [], shield, password, p
     config.whitelist = removeDuplicates(config.shield ? config.whitelist : whitelist);
     config.blocklist = removeDuplicates(config.shield ? [...config.blocklist, ...blocklist] : blocklist);
     config.blocklist = config.blocklist.filter(({ timeout }) => !timeout || timeout >= Math.floor(Date.now() / 1000));
+    config.whitelist = config.whitelist.filter(({ timeout }) => !timeout || timeout >= Math.floor(Date.now() / 1000));
 
     if (isValidPassword(password)) {
         unblockRoot();
@@ -191,13 +192,21 @@ export const unblockDistraction = (distraction) => {
 
 export const whitelistDistraction = (distraction) => {
     config.whitelist.push(distraction);
+    config.whitelist = config.whitelist.map((d) => {
+        if (getTimeType(d.time) === 'duration') {
+            return { ...d, timeout: createTimeout(d.time) };
+        }
+
+        return d;
+    });
     sendDataToSocket(config);
 };
 
 export const getRootDomain = (domain) => domain.split('.').slice(-2).join('.');
 
 export const isDistractionWhitelisted = (distraction) => {
     if (config.whitelist.some((d) => d.name === distraction)) return true;
+    if (config.whitelist.some((d) => d.name === '*')) return true;
     if (config.whitelist.some((d) => d.name === `*.${getRootDomain(distraction)}`)) return true;
 
     return false;
@@ -241,6 +250,7 @@ export const sendNotification = (title, message) => {
 export const getRunningBlockedApps = () => {
     const blockedApps = config.blocklist
         .filter(({ name }) => !isValidDomain(name) && !name.includes('*'))
+        .filter(({ name }) => !isDistractionWhitelisted(name))
         .filter(({ time }) => isWithinTimeRange(time))
         .map(({ name }) => name);