fix: harden startup flow and auth re-entry
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { BrowserWindow, app, shell } from 'electron'
|
||||
import { join } from 'path'
|
||||
import { is } from '@electron-toolkit/utils'
|
||||
import icon from '../../../resources/icon.png?asset'
|
||||
import { fileURLToPath } from 'url'
|
||||
import { dirname } from 'path'
|
||||
@@ -8,6 +7,10 @@ import { dirname } from 'path'
|
||||
const __filename = fileURLToPath(import.meta.url)
|
||||
const __dirname = dirname(__filename)
|
||||
|
||||
function isDevelopment(): boolean {
|
||||
return Boolean(process.env['ELECTRON_RENDERER_URL']) || process.env.NODE_ENV === 'development'
|
||||
}
|
||||
|
||||
export function createMainWindow(): BrowserWindow {
|
||||
const mainWindow = new BrowserWindow({
|
||||
width: 1200,
|
||||
@@ -32,7 +35,7 @@ export function createMainWindow(): BrowserWindow {
|
||||
return { action: 'deny' }
|
||||
})
|
||||
|
||||
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
|
||||
if (isDevelopment() && process.env['ELECTRON_RENDERER_URL']) {
|
||||
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
|
||||
} else {
|
||||
mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { app, dialog } from 'electron'
|
||||
import { electronApp, optimizer } from '@electron-toolkit/utils'
|
||||
import fs from 'fs'
|
||||
import { join } from 'path'
|
||||
import { ConfigManager } from '../services/config/config-manager'
|
||||
@@ -12,10 +11,23 @@ export function configurePlaywrightBrowsersPath(): string {
|
||||
}
|
||||
|
||||
export function setupElectronRuntime(): void {
|
||||
electronApp.setAppUserModelId('com.electron')
|
||||
app.setAppUserModelId('com.electron')
|
||||
|
||||
app.on('browser-window-created', (_, window) => {
|
||||
optimizer.watchWindowShortcuts(window)
|
||||
window.webContents.on('before-input-event', (event, input) => {
|
||||
const isReloadShortcut = (input.control || input.meta) && input.key.toLowerCase() === 'r'
|
||||
const isToggleDevTools = input.key === 'F12'
|
||||
|
||||
if (!app.isPackaged && isToggleDevTools && input.type === 'keyDown') {
|
||||
window.webContents.toggleDevTools()
|
||||
event.preventDefault()
|
||||
return
|
||||
}
|
||||
|
||||
if (app.isPackaged && isReloadShortcut) {
|
||||
event.preventDefault()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user