feat: update ulysse

Author: johackim

src/block.js

@@ -83,9 +83,9 @@ export const getBlockedApps = () => {
     const { blocklist } = config;
 
     return blocklist
-        .filter(({ type, name }) => (type === 'app' || !type) && (name === '*' || !isValidDomain(name)))
         .filter(({ time }) => isWithinTimeRange(time))
         .filter(({ name }) => !isDistractionWhitelisted(name))
+        .filter(({ name }) => isValidApp(name) && !isValidDomain(name))
         .map(({ name }) => name);
 };
 

src/daemon.js

@@ -2,7 +2,6 @@ import fs from 'fs';
 import { execSync } from 'child_process';
 import { dns } from './dns';
 import { socket } from './socket';
-import { getBlockedApps } from './block';
 import { config, editConfig } from './config';
 import { isSudo, sendNotification, getRunningApps, removeDuplicates } from './utils';
 import { isDistractionWhitelisted } from './whitelist';
@@ -18,7 +17,7 @@ export const updateResolvConf = (dnsServer = DNS_SERVER) => {
 export const handleAppBlocking = async () => {
     const activeWindows = await listActiveWindows();
     const runningApps = getRunningApps();
-    const blockedApps = getBlockedApps();
+    const blockedApps = config.blocklist.map(({ name }) => name);
 
     const windowsToClose = blockedApps.includes('*')
         ? activeWindows.filter((app) => !isDistractionWhitelisted(app.name))

src/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { program } from 'commander';
-import { prompt, Password } from 'enquirer';
+import { prompt as Prompt, Password } from 'enquirer';
 import { config } from './config';
 import { daemon } from './daemon';
 import { version } from '../package.json';
@@ -217,7 +217,7 @@ shieldCmd
             return;
         }
 
-        const { confirm } = await prompt({
+        const { confirm } = await Prompt({
             type: 'confirm',
             name: 'confirm',
             message: `Are you sure you want to enable shield mode for ${timeout}?`,

src/whitelist.js

@@ -25,9 +25,7 @@ export const whitelistDistraction = async (distraction) => {
 };
 
 export const unwhitelistDistraction = async (distraction) => {
-    config.whitelist = config.whitelist.filter(
-        (d) => d.name !== distraction.name || d.type !== distraction.type,
-    );
+    config.whitelist = config.whitelist.filter((d) => d.name !== distraction.name || d.type !== distraction.type);
 
     await editConfig(config);
 };