wip: trying to fix electron-store issue

Co-authored-by: JellyBrick <shlee1503@naver.com>

package.json

@@ -136,7 +136,6 @@
   "dependencies": {
     "@cliqz/adblocker-electron": "1.26.11",
     "@cliqz/adblocker-electron-preload": "1.26.11",
-    "@fastify/deepmerge": "1.3.0",
     "@ffmpeg.wasm/core-mt": "0.12.0",
     "@ffmpeg.wasm/main": "0.12.0",
     "@foobar404/wave": "2.0.4",
@@ -157,6 +156,7 @@
     "electron-unhandled": "4.0.1",
     "electron-updater": "6.1.4",
     "fast-average-color": "9.4.0",
+    "fast-equals": "^5.0.1",
     "filenamify": "6.0.0",
     "howler": "2.2.4",
     "html-to-text": "9.0.5",

pnpm-lock.yaml

@@ -19,9 +19,6 @@ dependencies:
   '@cliqz/adblocker-electron-preload':
     specifier: 1.26.11
     version: 1.26.11(electron@27.0.4)
-  '@fastify/deepmerge':
-    specifier: 1.3.0
-    version: 1.3.0
   '@ffmpeg.wasm/core-mt':
     specifier: 0.12.0
     version: 0.12.0
@@ -82,6 +79,9 @@ dependencies:
   fast-average-color:
     specifier: 9.4.0
     version: 9.4.0
+  fast-equals:
+    specifier: ^5.0.1
+    version: 5.0.1
   filenamify:
     specifier: 6.0.0
     version: 6.0.0
@@ -793,10 +793,6 @@ packages:
     engines: {node: '>=14'}
     dev: false
 
-  /@fastify/deepmerge@1.3.0:
-    resolution: {integrity: sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==}
-    dev: false
-
   /@ffmpeg.wasm/core-mt@0.12.0:
     resolution: {integrity: sha512-M9pjL7JQX4AYl3WI8vGcPGPTz/O7JmhW8ac/fHA3oXTxoRAPwYSY/OsY1N9C0XahIM0+fxa1QSLN9Ekz8sBM/Q==}
     dev: false
@@ -3082,6 +3078,11 @@ packages:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
     dev: true
 
+  /fast-equals@5.0.1:
+    resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==}
+    engines: {node: '>=6.0.0'}
+    dev: false
+
   /fast-glob@3.3.1:
     resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==}
     engines: {node: '>=8.6.0'}

src/config/index.ts

@@ -1,6 +1,5 @@
 import Store from 'electron-store';
-
+import { deepmerge } from 'deepmerge-ts';
-import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
 
 import defaultConfig from './defaults';
 import plugins from './plugins';
@@ -8,14 +7,13 @@ import store from './store';
 
 import { restart } from '../providers/app-controls';
 
-const deepmerge = createDeepmerge();
-
 const set = (key: string, value: unknown) => {
   store.set(key, value);
 };
 const setPartial = (key: string, value: object) => {
-  deepmerge(store.get(key) ?? {}, value);
+  const newValue = deepmerge(store.get(key) ?? {}, value);
-  store.set(value);
+  console.log('sival', key, value, newValue);
+  store.set(newValue);
 };
 
 function setMenuOption(key: string, value: unknown) {
@@ -53,9 +51,8 @@ export default {
   setPartial,
   setMenuOption,
   edit: () => store.openInEditor(),
-  watch(cb: Parameters<Store['onDidChange']>[1]) {
+  watch(cb: Parameters<Store['onDidAnyChange']>[0]) {
-    store.onDidChange('options', cb);
+    store.onDidAnyChange(cb);
-    store.onDidChange('plugins', cb);
   },
   plugins,
 };

src/index.ts

@@ -9,8 +9,8 @@ import unhandled from 'electron-unhandled';
 import { autoUpdater } from 'electron-updater';
 import electronDebug from 'electron-debug';
 import { parse } from 'node-html-parser';
-
+import { deepmerge } from 'deepmerge-ts';
-import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
+import { deepEqual } from 'fast-equals';
 
 import config from './config';
 
@@ -31,8 +31,6 @@ import youtubeMusicCSS from './youtube-music.css?inline';
 
 import type { MainPlugin, PluginBaseConfig, MainPluginContext, MainPluginFactory } from './plugins/utils/builder';
 
-const deepmerge = createDeepmerge();
-
 // Catch errors and log them
 unhandled({
   logger: console.error,
@@ -106,14 +104,19 @@ const initHook = (win: BrowserWindow) => {
   ipcMain.handle('get-config', (_, id: keyof PluginBuilderList) => deepmerge(pluginBuilders[id].config, config.get(`plugins.${id}`) ?? {}) as PluginBuilderList[typeof id]['config']);
   ipcMain.handle('set-config', (_, name: string, obj: object) => config.setPartial(`plugins.${name}`, obj));
 
-  config.watch((newValue) => {
+  config.watch((newValue, oldValue) => {
-    const value = newValue as Record<string, unknown>;
+    const newPluginConfigList = (newValue?.plugins ?? {}) as Record<string, unknown>;
-    const id = Object.keys(pluginBuilders).find((id) => id in value);
+    const oldPluginConfigList = (oldValue?.plugins ?? {}) as Record<string, unknown>;
 
-    if (id) {
+    Object.entries(newPluginConfigList).forEach(([id, newPluginConfig]) => {
-      win.webContents.send('config-changed', id, value[id]);
+      const isEqual = deepEqual(oldPluginConfigList[id], newPluginConfig);
-      // console.log('config-changed', id, value[id]);
+
-    }
+      console.log('check', id, isEqual, ';', oldPluginConfigList[id], newPluginConfig);
+      if (!isEqual) {
+        win.webContents.send('config-changed', id, newPluginConfig);
+        console.log('config-changed', id, newPluginConfig);
+      }
+    });
   });
 };
 
@@ -148,7 +151,7 @@ async function loadPlugins(win: BrowserWindow) {
     Key extends keyof PluginBuilderList,
     Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
   >(name: Key): MainPluginContext<Config> => ({
-    getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as Config,
+    getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as unknown as Config,
     setConfig: (newConfig) => {
       config.setPartial(`plugins.${name}`, newConfig);
     },

src/menu.ts

@@ -1,8 +1,7 @@
 import is from 'electron-is';
 import { app, BrowserWindow, clipboard, dialog, Menu } from 'electron';
 import prompt from 'custom-electron-prompt';
-
+import { deepmerge } from 'deepmerge-ts';
-import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
 
 import { restart } from './providers/app-controls';
 import config from './config';
@@ -24,8 +23,6 @@ const inAppMenuActive = config.plugins.isEnabled('in-app-menu');
 
 const betaPlugins = ['crossfade', 'lumiastream'];
 
-const deepmerge = createDeepmerge();
-
 const pluginEnabledMenu = (plugin: string, label = '', hasSubmenu = false, refreshMenu: (() => void ) | undefined = undefined): Electron.MenuItemConstructorOptions => ({
   label: label || plugin,
   type: 'checkbox',
@@ -56,7 +53,7 @@ export const mainMenuTemplate = async (win: BrowserWindow): Promise<MenuTemplate
     Key extends keyof PluginBuilderList,
     Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
   >(name: Key): MenuPluginContext<Config> => ({
-    getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as Config,
+    getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as unknown as Config,
     setConfig: (newConfig) => {
       config.setPartial(`plugins.${name}`, newConfig);
     },

src/plugins/ambient-mode/renderer.ts

@@ -84,6 +84,7 @@ export default builder.createRenderer(async ({ getConfig }) => {
           blurCanvas.style.setProperty('--top', `${-1 * topOffset}px`);
           blurCanvas.style.setProperty('--blur', `${blur}px`);
           blurCanvas.style.setProperty('--opacity', `${opacity}`);
+          console.log('updated!!!');
         };
         update = applyVideoAttributes;
 

src/preload.ts

@@ -3,7 +3,7 @@ import is from 'electron-is';
 
 import { pluginBuilders } from 'virtual:PluginBuilders';
 
-import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
+import { deepmerge } from 'deepmerge-ts';
 
 import config from './config';
 
@@ -11,13 +11,11 @@ import config from './config';
 import { preloadPlugins } from 'virtual:PreloadPlugins';
 import { PluginBaseConfig, PluginContext, PreloadPluginFactory } from './plugins/utils/builder';
 
-const deepmerge = createDeepmerge();
-
 const createContext = <
   Key extends keyof PluginBuilderList,
   Config extends PluginBaseConfig = PluginBuilderList[Key]['config'],
 >(name: Key): PluginContext<Config> => ({
-  getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as Config,
+  getConfig: () => deepmerge(pluginBuilders[name].config, config.get(`plugins.${name}`) ?? {}) as unknown as Config,
   setConfig: (newConfig) => {
     config.setPartial(`plugins.${name}`, newConfig);
   },
@@ -28,7 +26,12 @@ const preloadedPluginList = [];
 
 const pluginConfig = config.plugins.getPlugins();
 Object.entries(preloadPlugins)
-  .filter(([id]) => deepmerge(pluginBuilders[id as keyof PluginBuilderList].config, pluginConfig[id as keyof PluginBuilderList] ?? {}).enabled)
+  .filter(([id]) => {
+    const typedId = id as keyof PluginBuilderList;
+    const config = deepmerge(pluginBuilders[typedId].config, pluginConfig[typedId] ?? {});
+
+    return config.enabled;
+  })
   .forEach(async ([id]) => {
   if (Object.hasOwn(preloadPlugins, id)) {
     const factory = (preloadPlugins as Record<string, PreloadPluginFactory<PluginBaseConfig>>)[id];

src/renderer.ts

@@ -2,18 +2,16 @@
 // eslint-disable-next-line import/order
 import { rendererPlugins } from 'virtual:RendererPlugins';
 
-import { deepmerge as createDeepmerge } from '@fastify/deepmerge';
-
 import { pluginBuilders } from 'virtual:PluginBuilders';
 
+import { deepmerge } from 'deepmerge-ts';
+
 import { PluginBaseConfig, RendererPluginContext, RendererPluginFactory } from './plugins/utils/builder';
 
 import { startingPages } from './providers/extracted-data';
 import { setupSongControls } from './providers/song-controls-front';
 import setupSongInfo from './providers/song-info-front';
 
-const deepmerge = createDeepmerge();
-
 let api: Element | null = null;
 
 function listenForApiLoad() {
@@ -125,7 +123,12 @@ const createContext = <
   const rendererPluginList = Object.entries(rendererPlugins);
   const rendererPluginResult = await Promise.allSettled(
     rendererPluginList
-      .filter(([id]) => deepmerge(pluginBuilders[id as keyof PluginBuilderList].config, pluginConfig[id as keyof PluginBuilderList] ?? {}).enabled)
+      .filter(([id]) => {
+        const typedId = id as keyof PluginBuilderList;
+        const config = deepmerge(pluginBuilders[typedId].config, pluginConfig[typedId] ?? {});
+
+        return config.enabled;
+      })
       .map(async ([id, builder]) => {
         const context = createContext(id as keyof PluginBuilderList);
         return [id, await (builder as RendererPluginFactory<PluginBaseConfig>)(context)] as const;