fix: do not register new ipc event listener when main screen component is loaded (fixes #176)
This commit is contained in:
1 parent
52ffc48cde
commit
a71feb8a08
5 files changed
+46
-19
No files matched your search
+5
-5
@@ -1,18 +1,18 @@
|
||||
import { BrowserWindow, ipcMain, shell } from 'electron'
|
||||
import { ipcMain, shell, IpcMainEvent } from 'electron'
|
||||
import Constants from './utils/Constants'
|
||||
|
||||
/*
|
||||
* IPC Communications
|
||||
* */
|
||||
export default class IPCs {
|
||||
static initialize(window: BrowserWindow): void {
|
||||
static initialize(): void {
|
||||
// Get application version
|
||||
ipcMain.on('msgRequestGetVersion', () => {
|
||||
window.webContents.send('msgReceivedVersion', Constants.APP_VERSION)
|
||||
ipcMain.on('msgRequestGetVersion', (event: IpcMainEvent) => {
|
||||
event.returnValue = Constants.APP_VERSION
|
||||
})
|
||||
|
||||
// Open url via web browser
|
||||
ipcMain.on('msgOpenExternalLink', async (event, url: string) => {
|
||||
ipcMain.on('msgOpenExternalLink', async (event: IpcMainEvent, url: string) => {
|
||||
await shell.openExternal(url)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ export const createMainWindow = async (mainWindow: BrowserWindow): Promise<Brows
|
||||
})
|
||||
|
||||
// Initialize IPC Communication
|
||||
IPCs.initialize(mainWindow)
|
||||
IPCs.initialize()
|
||||
|
||||
if (Constants.IS_DEV_ENV) {
|
||||
await mainWindow.loadURL(Constants.APP_INDEX_URL_DEV)
|
||||
|
||||
+28
-7
@@ -1,22 +1,43 @@
|
||||
import { contextBridge, ipcRenderer } from 'electron'
|
||||
import { contextBridge, ipcRenderer, IpcRendererEvent } from 'electron'
|
||||
|
||||
// Whitelist of valid channels used for IPC communication (Send message from Renderer to Main)
|
||||
const mainAvailChannels: string[] = ['msgRequestGetVersion', 'msgOpenExternalLink']
|
||||
const rendererAvailChannels: string[] = ['msgReceivedVersion']
|
||||
const rendererAvailChannels: string[] = []
|
||||
|
||||
contextBridge.exposeInMainWorld('mainApi', {
|
||||
send: (channel: string, ...data: any[]): void => {
|
||||
if (mainAvailChannels.includes(channel)) {
|
||||
ipcRenderer.send.apply(null, [channel, ...data])
|
||||
} else {
|
||||
throw new Error(`Send failed: Unknown ipc channel name: ${channel}`)
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
}
|
||||
},
|
||||
receive: (channel: string, cbFunc: Function): void => {
|
||||
sendSync: (channel: string, ...data: any[]): void => {
|
||||
if (mainAvailChannels.includes(channel)) {
|
||||
return ipcRenderer.sendSync.apply(null, [channel, ...data])
|
||||
}
|
||||
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
},
|
||||
on: (channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void => {
|
||||
if (rendererAvailChannels.includes(channel)) {
|
||||
ipcRenderer.on(channel, (event, ...args) => cbFunc(event, ...args))
|
||||
ipcRenderer.on(channel, listener)
|
||||
} else {
|
||||
throw new Error(`Receive failed: Unknown ipc channel name: ${channel}`)
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
}
|
||||
},
|
||||
once: (channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void => {
|
||||
if (rendererAvailChannels.includes(channel)) {
|
||||
ipcRenderer.once(channel, listener)
|
||||
} else {
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
}
|
||||
},
|
||||
off: (channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void => {
|
||||
if (rendererAvailChannels.includes(channel)) {
|
||||
ipcRenderer.off(channel, listener)
|
||||
} else {
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
}
|
||||
},
|
||||
invoke: async (channel: string, ...data: any[]): Promise<any> => {
|
||||
@@ -25,6 +46,6 @@ contextBridge.exposeInMainWorld('mainApi', {
|
||||
return result
|
||||
}
|
||||
|
||||
throw new Error(`Invoke failed: Unknown ipc channel name: ${channel}`)
|
||||
throw new Error(`Unknown ipc channel name: ${channel}`)
|
||||
}
|
||||
})
|
||||
@@ -17,12 +17,13 @@ onMounted((): void => {
|
||||
languages.value = availableLocales
|
||||
|
||||
// Get application version from package.json version string (Using IPC communication)
|
||||
window.mainApi.receive('msgReceivedVersion', (event: Event, version: string) => {
|
||||
appVersion.value = version
|
||||
})
|
||||
window.mainApi.send('msgRequestGetVersion')
|
||||
getApplicationVersionFromMainProcess()
|
||||
})
|
||||
|
||||
const getApplicationVersionFromMainProcess = (): void => {
|
||||
appVersion.value = window.mainApi.sendSync('msgRequestGetVersion')
|
||||
}
|
||||
|
||||
const handleChangeTheme = (): void => {
|
||||
theme.global.name.value = theme.global.current.value.dark ? 'light' : 'dark'
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user