a

Author: Chetan11-dev

src/main/config.ts

@@ -1,20 +1,21 @@
 import fs from 'fs';
 import { app } from 'electron';
 
-const isDev: boolean = process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
+const isDev: boolean =
+  process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
 
 function getProductNameFromPackageJson() {
-    let data = fs.readFileSync('./package.json', { encoding: "utf-8" });
-    data = JSON.parse(data);
-    return data['productName'] ?? data['name'];
+  let data = fs.readFileSync('./package.json', { encoding: 'utf-8' });
+  data = JSON.parse(data);
+  return data['productName'] ?? data['name'];
 }
 
 export const config = {
-    productName: app ? app.getName() : getProductNameFromPackageJson(),
-    downloadsPath: app ? app.getPath('downloads') : process.cwd(),
-    userDataPath: app ? app.getPath('userData') : process.cwd(),
-    protocol: 'todo-my-app-name',
-    isDev: isDev,
-}
+  productName: app ? app.getName() : getProductNameFromPackageJson(),
+  downloadsPath: app ? app.getPath('downloads') : process.cwd(),
+  userDataPath: app ? app.getPath('userData') : process.cwd(),
+  protocol: 'todo-my-app-name',
+  isDev: isDev,
+};
 
-global.ELECTRON_CONFIG = config
+global.ELECTRON_CONFIG = config;

src/main/menu.ts

@@ -1,6 +1,10 @@
 import { BrowserWindow, Menu, MenuItemConstructorOptions } from 'electron';
 import { isDev } from 'botasaurus-server/env';
-import { buildMacTemplate, buildDefaultTemplate,MacMenuItemConstructorOptions } from './utils/menu-utils';
+import {
+  buildMacTemplate,
+  buildDefaultTemplate,
+  MacMenuItemConstructorOptions,
+} from './utils/menu-utils';
 import { config } from './config';
 import { getSupportSubMenu } from './support-sub-menu';
 
@@ -22,11 +26,10 @@ export default class MenuBuilder {
       this.setupDevelopmentEnvironment();
     }
 
-    const isMac = process.platform === 'darwin'
-    const template =
-    isMac
-        ? buildMacTemplate(getIsDev(), config.productName, this.mainWindow)
-        : buildDefaultTemplate(getIsDev(), this.mainWindow);
+    const isMac = process.platform === 'darwin';
+    const template = isMac
+      ? buildMacTemplate(getIsDev(), config.productName, this.mainWindow)
+      : buildDefaultTemplate(getIsDev(), this.mainWindow);
 
     const subMenuHelp: MacMenuItemConstructorOptions = {
       label: 'Support',
@@ -55,4 +58,4 @@ export default class MenuBuilder {
       ]).popup({ window: this.mainWindow });
     });
   }
-}
+}

src/main/preload.ts

@@ -1,20 +1,25 @@
 // Disable no-unused-vars, broken for spread args
 /* eslint no-unused-vars: off */
-import { contextBridge, ipcRenderer, IpcRendererEvent , webUtils} from 'electron';
-
+import {
+  contextBridge,
+  ipcRenderer,
+  IpcRendererEvent,
+  webUtils,
+} from 'electron';
 
 const electronHandler = {
+  ipcRenderer: {
     send(channel: string, value: any = null) {
-      ipcRenderer.send(channel, value)
+      ipcRenderer.send(channel, value);
     },
     on(channel: string, callback: (...args: unknown[]) => void) {
       const subscription = (_event: IpcRendererEvent, ...args: unknown[]) =>
-        callback(...args)
-      ipcRenderer.on(channel, subscription)
-  
+        callback(...args);
+      ipcRenderer.on(channel, subscription);
+
       return () => {
-        ipcRenderer.removeListener(channel, subscription)
-      }
+        ipcRenderer.removeListener(channel, subscription);
+      };
     },
     off(channel: string, callback: (...args: unknown[]) => void) {
       ipcRenderer.off(channel, callback);
@@ -25,9 +30,10 @@ const electronHandler = {
     once(channel: string, func: (...args: unknown[]) => void) {
       ipcRenderer.once(channel, (_event, ...args) => func(...args));
     },
-    getPathForFile: webUtils.getPathForFile,
+  },
+  getPathForFile: webUtils.getPathForFile,
 };
 
-contextBridge.exposeInMainWorld('ipc', electronHandler);
+contextBridge.exposeInMainWorld('electron', electronHandler);
 
 export type ElectronHandler = typeof electronHandler;

src/main/support-sub-menu.ts

@@ -8,7 +8,7 @@ import {
 import { removeSync } from 'botasaurus/utils';
 import { AppUpdater } from './utils/AppUpdater';
 import { getBotasaurusStorage } from 'botasaurus/botasaurus-storage';
-import { MainHandler } from './utils/main-handler';
+import { ipcMain } from './utils/ipc-main';
 import { Server } from 'botasaurus-server/server';
 
 export function getSupportSubMenu(): MenuItemConstructorOptions[] {
@@ -58,8 +58,8 @@ export function getSupportSubMenu(): MenuItemConstructorOptions[] {
     {
       label: 'Factory Reset App and Clear All Data',
       click: () => {
-        MainHandler.send('show-reset-prompt');
-        MainHandler.once('perform-reset', performFactoryReset);
+        ipcMain.send('show-reset-prompt');
+        ipcMain.once('perform-reset', performFactoryReset);
       },
     },
   );

src/main/utils/AppUpdater.ts

@@ -1,5 +1,5 @@
 import { autoUpdater } from 'electron-updater';
-import { MainHandler } from './main-handler'
+import { ipcMain } from './ipc-main'
 import { sleep } from 'botasaurus/utils';
 import { getOs } from 'botasaurus/env';
 
@@ -46,25 +46,25 @@ class _AppUpdater {
   async listenEvents(){
 
       // autoUpdater.on('checking-for-update', () => {
-      //   MainHandler.log('Checking for updates...');
+      //   ipcMain.log('Checking for updates...');
       // });
 
       autoUpdater.on('update-available', (info) => {
-        MainHandler.log('Update available:', info);
+        ipcMain.log('Update available:', info);
         // Only Download the Latest Version
         autoUpdater.downloadUpdate();
       });
 
       // autoUpdater.on('update-not-available', (info) => {
-      //   MainHandler.log('Update not available:', info);
+      //   ipcMain.log('Update not available:', info);
       // });
 
       autoUpdater.on('error', (err) => {
-        MainHandler.log('Error in auto-updater:', err);
+        ipcMain.log('Error in auto-updater:', err);
       });
 
       autoUpdater.on('update-downloaded', (info) => {
-        MainHandler.log('Update downloaded:', info);
+        ipcMain.log('Update downloaded:', info);
       });    
   }
 
@@ -76,7 +76,7 @@ class _AppUpdater {
     }
 
     try {
-      MainHandler.send('checkingForUpdates')
+      ipcMain.send('checkingForUpdates')
       const startTime = Date.now();
       const result = await autoUpdater.checkForUpdates();
       const elapsedTime = Date.now() - startTime;
@@ -85,21 +85,21 @@ class _AppUpdater {
         await sleep(2)
       }
       if (canUpdate(result)) {
-        MainHandler.send('downloadingUpdates')
+        ipcMain.send('downloadingUpdates')
         await autoUpdater.downloadUpdate(); // Start downloading the update
-        MainHandler.send('quittingToApplyUpdates')
+        ipcMain.send('quittingToApplyUpdates')
         // wait for 10 seconds
         await sleep(10)
-        MainHandler.send('hideAll')
+        ipcMain.send('hideAll')
 
         autoUpdater.quitAndInstall(false, true); // Quit and install the update
-        MainHandler.log('Updated')
+        ipcMain.log('Updated')
       } else {
-        MainHandler.send('success', getCurrentVersion())
+        ipcMain.send('success', getCurrentVersion())
       }
     } catch (error) {
       console.error(error)
-      MainHandler.send('hideAll')
+      ipcMain.send('hideAll')
     }
   }
 }

src/main/utils/main-handler.ts renamed to src/main/utils/ipc-main.ts

@@ -4,7 +4,7 @@ import { IpcRendererEvent } from 'electron'
 import { ipcMain, IpcMainInvokeEvent } from 'electron'
 import { getWindow,  } from './window'
 
-const MainHandler = {
+const _ipcMain = {
     send: (channel: string, ...args: any[]) => {
         const window = getWindow()
         window?.webContents.send(channel, ...args)
@@ -23,7 +23,7 @@ const MainHandler = {
     log: (...args: any[]) => {
         // @ts-ignore
         try {
-            MainHandler.send("log", ...args)    
+            _ipcMain.send("log", ...args)    
         } catch (error:any) {
             // can't console error as it is modified in set-up-error-forwarding-to-renderer.ts
             console.log(error?.message)
@@ -34,4 +34,4 @@ const MainHandler = {
 
 }
 
-export { MainHandler }
+export { _ipcMain as ipcMain }

src/main/utils/set-up-error-forwarding-to-renderer.ts

@@ -1,11 +1,11 @@
-import { MainHandler } from './main-handler';
+import { ipcMain } from './ipc-main';
 
 const sendErrorToRenderer = (error) => {
   const errorMessage = error instanceof Error ? error.message : String(error);
   const errorStack =
     error instanceof Error ? error.stack : 'No stack available';
 
-  MainHandler.log({
+  ipcMain.log({
     error: errorMessage,
     stack: errorStack,
     timestamp: new Date().toISOString(),

src/main/utils/set-up-renderer-to-server-call.ts

@@ -1,6 +1,6 @@
 import { shell } from 'electron';
 import run from 'botasaurus-server/run';
-import { MainHandler } from './main-handler';
+import { ipcMain } from './ipc-main';
 import * as routes from 'botasaurus-server/task-routes';
 import setUpErrorForwardingToRenderer from './set-up-error-forwarding-to-renderer';
 
@@ -14,18 +14,18 @@ export function setUpRendererToServerCall() {
   setUpErrorForwardingToRenderer();
 
   for (const [key, value] of Object.entries(routes)) {
-    MainHandler.handle(key, async (_, ...data) => {
+    ipcMain.handle(key, async (_, ...data) => {
       // @ts-ignore
       const result = await value(...data);
       // writeTempJson(result)
       return result;
     });
   }
-  MainHandler.handle('openInFolder', async (_, ...data) => {
+  ipcMain.handle('openInFolder', async (_, ...data) => {
     // @ts-ignore
     return shell.showItemInFolder(...data);
   });
-  MainHandler.handle('openExternal', async (_, ...data) => {
+  ipcMain.handle('openExternal', async (_, ...data) => {
     // @ts-ignore
     return shell.openExternal(...data);
   });

src/renderer/app/components/FactoryResetModal.tsx

@@ -8,7 +8,7 @@ import { EuiModalHeader } from '@elastic/eui/optimize/es/components/modal/modal_
 import { EuiModalHeaderTitle } from '@elastic/eui/optimize/es/components/modal/modal_header_title';
 import { useEffect, useState } from 'react';
 import ClickOutside from './ClickOutside/ClickOutside';
-import { handler } from '../utils/handler';
+import { ipcRenderer } from '../utils/electron';
 
 export default function FactoryResetModal() {
   const [isModalVisible, setIsModalVisible] = useState(false);
@@ -19,9 +19,9 @@ export default function FactoryResetModal() {
 
   useEffect(() => {
     const showModal = () => setIsModalVisible(true);
-    handler.on('show-reset-prompt', showModal);
+    ipcRenderer.on('show-reset-prompt', showModal);
     return () => {
-      handler.off('show-reset-prompt', showModal);
+      ipcRenderer.off('show-reset-prompt', showModal);
     };
   }, []);
 
@@ -47,7 +47,7 @@ export default function FactoryResetModal() {
             <EuiButtonEmpty onClick={closeModal}>Cancel</EuiButtonEmpty>
             <EuiButton
               onClick={() => {
-                handler.send('perform-reset');
+                ipcRenderer.send('perform-reset');
                 closeModal();
               }}
             >

src/renderer/app/components/inputs/DragDropFileUploader.tsx

@@ -1,5 +1,5 @@
 import { EuiFilePicker } from '@elastic/eui/optimize/es/components/form/file_picker/file_picker';
-import { handler } from '../../utils/handler'
+import { getPathForFile } from '../../utils/electron'
 
 export default function DragDropFileUploader({ filePickerRef, onChange, multiple = true, acceptedFileTypes = [], ...props }) {
     const handleFileChange = (files) => {
@@ -8,7 +8,7 @@ export default function DragDropFileUploader({ filePickerRef, onChange, multiple
       const file = files[i];
       const item = {
         name: file.name,
-        path: handler.getPathForFile(file),
+        path: getPathForFile(file),
         size: file.size,
         last_modified: file.lastModified
       }