From d7df4d7d104fb9857ed56b8a760a7c24c987b1fb Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Wed, 11 Oct 2023 19:28:01 +0900
Subject: [PATCH] fix: fix `It Just Works`

Fixed an issue that caused inconsistent execution results.
---
 index.ts                                  |  3 ++-
 menu.ts                                   | 20 +++++++++++---------
 package.json                              |  2 --
 plugins/adblocker/inject-cliqz-preload.ts |  5 ++---
 plugins/adblocker/preload.ts              |  8 ++++----
 plugins/bypass-age-restrictions/front.ts  |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/index.ts b/index.ts
index b813a2fe..9fc215bd 100644
--- a/index.ts
+++ b/index.ts
@@ -8,7 +8,7 @@ import { autoUpdater } from 'electron-updater';
 import electronDebug from 'electron-debug';
 
 import config from './config';
-import { setApplicationMenu } from './menu';
+import { refreshMenu, setApplicationMenu } from './menu';
 import { fileExists, injectCSS, injectCSSAsFile } from './plugins/utils';
 import { isTesting } from './utils/testing';
 import { setUpTray } from './tray';
@@ -470,6 +470,7 @@ app.on('ready', async () => {
 
   mainWindow = await createMainWindow();
   setApplicationMenu(mainWindow);
+  refreshMenu(mainWindow);
   setUpTray(app, mainWindow);
 
   setupProtocolHandler(mainWindow);
diff --git a/menu.ts b/menu.ts
index 5432078f..1c99e037 100644
--- a/menu.ts
+++ b/menu.ts
@@ -62,13 +62,15 @@ const pluginEnabledMenu = (plugin: string, label = '', hasSubmenu = false, refre
   },
 });
 
+export const refreshMenu = (win: BrowserWindow) => {
+  setApplicationMenu(win);
+  if (inAppMenuActive) {
+    win.webContents.send('refreshMenu');
+  }
+};
+
 export const mainMenuTemplate = (win: BrowserWindow): MenuTemplate => {
-  const refreshMenu = () => {
-    setApplicationMenu(win);
-    if (inAppMenuActive) {
-      win.webContents.send('refreshMenu');
-    }
-  };
+  const innerRefreshMenu = () => refreshMenu(win);
 
   return [
     {
@@ -84,15 +86,15 @@ export const mainMenuTemplate = (win: BrowserWindow): MenuTemplate => {
             const getPluginMenu = pluginMenus[pluginName as keyof typeof pluginMenus];
 
             if (!config.plugins.isEnabled(pluginName)) {
-              return pluginEnabledMenu(pluginName, pluginLabel, true, refreshMenu);
+              return pluginEnabledMenu(pluginName, pluginLabel, true, innerRefreshMenu);
             }
 
             return {
               label: pluginLabel,
               submenu: [
-                pluginEnabledMenu(pluginName, 'Enabled', true, refreshMenu),
+                pluginEnabledMenu(pluginName, 'Enabled', true, innerRefreshMenu),
                 { type: 'separator' },
-                ...getPluginMenu(win, config.plugins.getOptions(pluginName), refreshMenu),
+                ...getPluginMenu(win, config.plugins.getOptions(pluginName), innerRefreshMenu),
               ],
             } satisfies Electron.MenuItemConstructorOptions;
           }
diff --git a/package.json b/package.json
index 7db89350..36b215bd 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,6 @@
       "!node_modules",
       "node_modules/custom-electron-prompt/**",
       "node_modules/@cliqz/adblocker-electron-preload/**",
-      "node_modules/@cliqz/adblocker-content/**",
-      "node_modules/@cliqz/adblocker-extended-selectors/**",
       "node_modules/@ffmpeg.wasm/core-mt/**",
       "!node_modules/**/*.map",
       "!node_modules/**/*.ts"
diff --git a/plugins/adblocker/inject-cliqz-preload.ts b/plugins/adblocker/inject-cliqz-preload.ts
index 8660df0f..e2419bee 100644
--- a/plugins/adblocker/inject-cliqz-preload.ts
+++ b/plugins/adblocker/inject-cliqz-preload.ts
@@ -1,4 +1,3 @@
-export default () => {
-  const path = '@cliqz/adblocker-electron-preload'; // prevent require hoisting
-  require(path);
+export default async () => {
+  await import('@cliqz/adblocker-electron-preload');
 };
diff --git a/plugins/adblocker/preload.ts b/plugins/adblocker/preload.ts
index 4f17488e..c0facb2b 100644
--- a/plugins/adblocker/preload.ts
+++ b/plugins/adblocker/preload.ts
@@ -1,15 +1,15 @@
-import config from './config';
+import config, { shouldUseBlocklists } from './config';
 import inject from './inject';
 import injectCliqzPreload from './inject-cliqz-preload';
 
 import { blockers } from './blocker-types';
 
 export default async () => {
-  if (await config.shouldUseBlocklists()) {
+  if (shouldUseBlocklists()) {
     // Preload adblocker to inject scripts/styles
-    injectCliqzPreload();
+    await injectCliqzPreload();
     // eslint-disable-next-line @typescript-eslint/await-thenable
-  } else if ((await config.get('blocker')) === blockers.InPlayer) {
+  } else if ((config.get('blocker')) === blockers.InPlayer) {
     inject();
   }
 };
diff --git a/plugins/bypass-age-restrictions/front.ts b/plugins/bypass-age-restrictions/front.ts
index d0e9d227..42df78ea 100644
--- a/plugins/bypass-age-restrictions/front.ts
+++ b/plugins/bypass-age-restrictions/front.ts
@@ -1,4 +1,4 @@
-export default () => {
+export default async () => {
   // See https://github.com/zerodytrash/Simple-YouTube-Age-Restriction-Bypass#userscript
-  import('simple-youtube-age-restriction-bypass');
+  await import('simple-youtube-age-restriction-bypass');
 };