You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
174 lines
4.9 KiB
174 lines
4.9 KiB
const { app, BrowserWindow } = require('electron')
|
|
const path = require('path')
|
|
const fs = require('fs')
|
|
const logger = require('../utils/logger')
|
|
|
|
// Check if running in dev mode
|
|
const isDev = process.argv.includes('--inspect')
|
|
|
|
function createWindow() {
|
|
// Add before createWindow function
|
|
const preloadPath = path.join(__dirname, 'preload.js')
|
|
logger.log('Checking preload path:', preloadPath)
|
|
logger.log('Preload exists:', fs.existsSync(preloadPath))
|
|
|
|
// Create the browser window.
|
|
const mainWindow = new BrowserWindow({
|
|
width: 1200,
|
|
height: 800,
|
|
webPreferences: {
|
|
nodeIntegration: false,
|
|
contextIsolation: true,
|
|
webSecurity: true,
|
|
allowRunningInsecureContent: false,
|
|
preload: path.join(__dirname, 'preload.js')
|
|
}
|
|
})
|
|
|
|
// Always open DevTools for now
|
|
mainWindow.webContents.openDevTools()
|
|
|
|
// Intercept requests to fix asset paths
|
|
mainWindow.webContents.session.webRequest.onBeforeRequest(
|
|
{
|
|
urls: [
|
|
'file://*/*/assets/*',
|
|
'file://*/assets/*',
|
|
'file:///assets/*', // Catch absolute paths
|
|
'<all_urls>' // Catch all URLs as a fallback
|
|
]
|
|
},
|
|
(details, callback) => {
|
|
let url = details.url
|
|
|
|
// Handle paths that don't start with file://
|
|
if (!url.startsWith('file://') && url.includes('/assets/')) {
|
|
url = `file://${path.join(__dirname, 'www', url)}`
|
|
}
|
|
|
|
// Handle absolute paths starting with /assets/
|
|
if (url.includes('/assets/') && !url.includes('/www/assets/')) {
|
|
const baseDir = url.includes('dist-electron')
|
|
? url.substring(
|
|
0,
|
|
url.indexOf('/dist-electron') + '/dist-electron'.length
|
|
)
|
|
: `file://${__dirname}`
|
|
const assetPath = url.split('/assets/')[1]
|
|
const newUrl = `${baseDir}/www/assets/${assetPath}`
|
|
callback({ redirectURL: newUrl })
|
|
return
|
|
}
|
|
|
|
callback({}) // No redirect for other URLs
|
|
}
|
|
)
|
|
|
|
if (isDev) {
|
|
// Debug info
|
|
logger.log('Debug Info:')
|
|
logger.log('Running in dev mode:', isDev)
|
|
logger.log('App is packaged:', app.isPackaged)
|
|
logger.log('Process resource path:', process.resourcesPath)
|
|
logger.log('App path:', app.getAppPath())
|
|
logger.log('__dirname:', __dirname)
|
|
logger.log('process.cwd():', process.cwd())
|
|
}
|
|
|
|
const indexPath = path.join(__dirname, 'www', 'index.html')
|
|
|
|
if (isDev) {
|
|
logger.log('Loading index from:', indexPath)
|
|
logger.log('www path:', path.join(__dirname, 'www'))
|
|
logger.log('www assets path:', path.join(__dirname, 'www', 'assets'))
|
|
}
|
|
|
|
if (!fs.existsSync(indexPath)) {
|
|
logger.error(`Index file not found at: ${indexPath}`)
|
|
throw new Error('Index file not found')
|
|
}
|
|
|
|
// Add CSP headers to allow API connections
|
|
mainWindow.webContents.session.webRequest.onHeadersReceived(
|
|
(details, callback) => {
|
|
callback({
|
|
responseHeaders: {
|
|
...details.responseHeaders,
|
|
'Content-Security-Policy': [
|
|
"default-src 'self';" +
|
|
"connect-src 'self' https://api.endorser.ch https://*.timesafari.app;" +
|
|
"img-src 'self' data: https: blob:;" +
|
|
"script-src 'self' 'unsafe-inline' 'unsafe-eval';" +
|
|
"style-src 'self' 'unsafe-inline';" +
|
|
"font-src 'self' data:;"
|
|
]
|
|
}
|
|
})
|
|
}
|
|
)
|
|
|
|
// Load the index.html
|
|
mainWindow
|
|
.loadFile(indexPath)
|
|
.then(() => {
|
|
logger.log('Successfully loaded index.html')
|
|
if (isDev) {
|
|
mainWindow.webContents.openDevTools()
|
|
logger.log('DevTools opened - running in dev mode')
|
|
}
|
|
})
|
|
.catch((err) => {
|
|
logger.error('Failed to load index.html:', err)
|
|
logger.error('Attempted path:', indexPath)
|
|
})
|
|
|
|
// Listen for console messages from the renderer
|
|
mainWindow.webContents.on('console-message', (_event, level, message) => {
|
|
logger.log('Renderer Console:', message)
|
|
})
|
|
|
|
// Add right after creating the BrowserWindow
|
|
mainWindow.webContents.on(
|
|
'did-fail-load',
|
|
(event, errorCode, errorDescription) => {
|
|
logger.error('Page failed to load:', errorCode, errorDescription)
|
|
}
|
|
)
|
|
|
|
mainWindow.webContents.on('preload-error', (event, preloadPath, error) => {
|
|
logger.error('Preload script error:', preloadPath, error)
|
|
})
|
|
|
|
mainWindow.webContents.on(
|
|
'console-message',
|
|
(event, level, message, line, sourceId) => {
|
|
logger.log('Renderer Console:', line, sourceId, message)
|
|
}
|
|
)
|
|
|
|
// Enable remote debugging when in dev mode
|
|
if (isDev) {
|
|
mainWindow.webContents.openDevTools()
|
|
}
|
|
}
|
|
|
|
// Handle app ready
|
|
app.whenReady().then(createWindow)
|
|
|
|
// Handle all windows closed
|
|
app.on('window-all-closed', () => {
|
|
if (process.platform !== 'darwin') {
|
|
app.quit()
|
|
}
|
|
})
|
|
|
|
app.on('activate', () => {
|
|
if (BrowserWindow.getAllWindows().length === 0) {
|
|
createWindow()
|
|
}
|
|
})
|
|
|
|
// Handle any errors
|
|
process.on('uncaughtException', (error) => {
|
|
logger.error('Uncaught Exception:', error)
|
|
})
|
|
|