mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-26 11:44:28 +08:00
Some checks failed
Auto I18N Weekly / Auto I18N (push) Has been cancelled
* refactor: optimize DatabaseManager and fix libsql crash issues Major improvements: - Created DatabaseManager singleton to centralize database connection management - Auto-initialize database in constructor (no manual initialization needed) - Removed all manual initialize() and ensureInitialized() calls (47 occurrences) - Simplified initialization logic (removed retry loops that could cause crashes) - Removed unused close() and reinitialize() methods - Reduced code from ~270 lines to 172 lines (-36%) Key changes: 1. DatabaseManager.ts (new file): - Singleton pattern with auto-initialization - State management (INITIALIZING, INITIALIZED, FAILED) - Windows compatibility fixes (empty file detection, intMode: 'number') - Simplified waitForInitialization() logic 2. BaseService.ts: - Removed static initialize() and ensureInitialized() methods - Simplified database/rawClient getters to use DatabaseManager 3. Service classes (AgentService, SessionService, SessionMessageService): - Removed all initialize() methods - Removed all ensureInitialized() calls - Services now work out of the box 4. Main entry points (index.ts, server.ts): - Removed explicit database initialization calls - Database initializes automatically on first access Benefits: - Fixes Windows libsql crashes by removing dangerous retry logic - Simpler API - no need to remember to call initialize() - Better separation of concerns - Cleaner codebase with 36% less code 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: wait for database initialization on app startup Issue: "Database is still initializing" error on startup Root cause: Synchronous database getter was called before async initialization completed Solution: - Explicitly wait for database initialization in main index.ts - Import DatabaseManager and call getDatabase() to ensure initialization is complete - This guarantees database is ready before any service methods are called Changes: - src/main/index.ts: Added explicit database initialization wait before API server check 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: use static import for getDatabaseManager - Move import to top of file for better code organization - Remove unnecessary dynamic import 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: streamline database access in service classes - Replaced direct database access with asynchronous calls to getDatabase() in various service classes (AgentService, SessionService, SessionMessageService). - Updated the main index.ts to utilize runAsyncFunction for API server initialization, ensuring proper handling of asynchronous database access. - Improved code organization and readability by consolidating database access logic. This change enhances the reliability of database interactions across the application and ensures that services are correctly initialized before use. * refactor: remove redundant logging in ApiServer initialization - Removed the logging statement for 'AgentService ready' during server initialization. - This change streamlines the startup process by eliminating unnecessary log entries. This update contributes to cleaner logs and improved readability during server startup. * refactor: change getDatabase method to synchronous return type - Updated the getDatabase method in DatabaseManager to return a synchronous LibSQLDatabase instance instead of a Promise. - This change simplifies the database access pattern, aligning with the current initialization logic. This refactor enhances code clarity and reduces unnecessary asynchronous handling in the database access layer. * refactor: simplify sessionMessageRepository by removing transaction handling - Removed transaction handling parameters from message persistence methods in sessionMessageRepository. - Updated database access to use a direct call to getDatabase() instead of passing a transaction client. - Streamlined the upsertMessage and persistExchange methods for improved clarity and reduced complexity. This refactor enhances code readability and simplifies the database interaction logic. --------- Co-authored-by: Claude <noreply@anthropic.com>
257 lines
8.1 KiB
TypeScript
257 lines
8.1 KiB
TypeScript
// don't reorder this file, it's used to initialize the app data dir and
|
|
// other which should be run before the main process is ready
|
|
// eslint-disable-next-line
|
|
import './bootstrap'
|
|
|
|
import '@main/config'
|
|
|
|
import { loggerService } from '@logger'
|
|
import { electronApp, optimizer } from '@electron-toolkit/utils'
|
|
import { replaceDevtoolsFont } from '@main/utils/windowUtil'
|
|
import { app, crashReporter } from 'electron'
|
|
import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
|
|
import { isDev, isLinux, isWin } from './constant'
|
|
|
|
import process from 'node:process'
|
|
|
|
import { registerIpc } from './ipc'
|
|
import { agentService } from './services/agents'
|
|
import { apiServerService } from './services/ApiServerService'
|
|
import { appMenuService } from './services/AppMenuService'
|
|
import { configManager } from './services/ConfigManager'
|
|
import mcpService from './services/MCPService'
|
|
import { nodeTraceService } from './services/NodeTraceService'
|
|
import powerMonitorService from './services/PowerMonitorService'
|
|
import {
|
|
CHERRY_STUDIO_PROTOCOL,
|
|
handleProtocolUrl,
|
|
registerProtocolClient,
|
|
setupAppImageDeepLink
|
|
} from './services/ProtocolClient'
|
|
import selectionService, { initSelectionService } from './services/SelectionService'
|
|
import { registerShortcuts } from './services/ShortcutService'
|
|
import { TrayService } from './services/TrayService'
|
|
import { versionService } from './services/VersionService'
|
|
import { windowService } from './services/WindowService'
|
|
import { initWebviewHotkeys } from './services/WebviewService'
|
|
import { runAsyncFunction } from './utils'
|
|
|
|
const logger = loggerService.withContext('MainEntry')
|
|
|
|
// enable local crash reports
|
|
crashReporter.start({
|
|
companyName: 'CherryHQ',
|
|
productName: 'CherryStudio',
|
|
submitURL: '',
|
|
uploadToServer: false
|
|
})
|
|
|
|
/**
|
|
* Disable hardware acceleration if setting is enabled
|
|
*/
|
|
const disableHardwareAcceleration = configManager.getDisableHardwareAcceleration()
|
|
if (disableHardwareAcceleration) {
|
|
app.disableHardwareAcceleration()
|
|
}
|
|
|
|
/**
|
|
* Disable chromium's window animations
|
|
* main purpose for this is to avoid the transparent window flashing when it is shown
|
|
* (especially on Windows for SelectionAssistant Toolbar)
|
|
* Know Issue: https://github.com/electron/electron/issues/12130#issuecomment-627198990
|
|
*/
|
|
if (isWin) {
|
|
app.commandLine.appendSwitch('wm-window-animations-disabled')
|
|
}
|
|
|
|
/**
|
|
* Enable GlobalShortcutsPortal for Linux Wayland Protocol
|
|
* see: https://www.electronjs.org/docs/latest/api/global-shortcut
|
|
*/
|
|
if (isLinux && process.env.XDG_SESSION_TYPE === 'wayland') {
|
|
app.commandLine.appendSwitch('enable-features', 'GlobalShortcutsPortal')
|
|
}
|
|
|
|
// DocumentPolicyIncludeJSCallStacksInCrashReports: Enable features for unresponsive renderer js call stacks
|
|
// EarlyEstablishGpuChannel,EstablishGpuChannelAsync: Enable features for early establish gpu channel
|
|
// speed up the startup time
|
|
// https://github.com/microsoft/vscode/pull/241640/files
|
|
app.commandLine.appendSwitch(
|
|
'enable-features',
|
|
'DocumentPolicyIncludeJSCallStacksInCrashReports,EarlyEstablishGpuChannel,EstablishGpuChannelAsync'
|
|
)
|
|
app.on('web-contents-created', (_, webContents) => {
|
|
webContents.session.webRequest.onHeadersReceived((details, callback) => {
|
|
callback({
|
|
responseHeaders: {
|
|
...details.responseHeaders,
|
|
'Document-Policy': ['include-js-call-stacks-in-crash-reports']
|
|
}
|
|
})
|
|
})
|
|
|
|
webContents.on('unresponsive', async () => {
|
|
// Interrupt execution and collect call stack from unresponsive renderer
|
|
logger.error('Renderer unresponsive start')
|
|
const callStack = await webContents.mainFrame.collectJavaScriptCallStack()
|
|
logger.error(`Renderer unresponsive js call stack\n ${callStack}`)
|
|
})
|
|
})
|
|
|
|
// in production mode, handle uncaught exception and unhandled rejection globally
|
|
if (!isDev) {
|
|
// handle uncaught exception
|
|
process.on('uncaughtException', (error) => {
|
|
logger.error('Uncaught Exception:', error)
|
|
})
|
|
|
|
// handle unhandled rejection
|
|
process.on('unhandledRejection', (reason, promise) => {
|
|
logger.error(`Unhandled Rejection at: ${promise} reason: ${reason}`)
|
|
})
|
|
}
|
|
|
|
// Check for single instance lock
|
|
if (!app.requestSingleInstanceLock()) {
|
|
app.quit()
|
|
process.exit(0)
|
|
} else {
|
|
// This method will be called when Electron has finished
|
|
// initialization and is ready to create browser windows.
|
|
// Some APIs can only be used after this event occurs.
|
|
|
|
app.whenReady().then(async () => {
|
|
// Record current version for tracking
|
|
// A preparation for v2 data refactoring
|
|
versionService.recordCurrentVersion()
|
|
|
|
initWebviewHotkeys()
|
|
// Set app user model id for windows
|
|
electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
|
|
|
|
// Mac: Hide dock icon before window creation when launch to tray is set
|
|
const isLaunchToTray = configManager.getLaunchToTray()
|
|
if (isLaunchToTray) {
|
|
app.dock?.hide()
|
|
}
|
|
|
|
const mainWindow = windowService.createMainWindow()
|
|
new TrayService()
|
|
|
|
// Setup macOS application menu
|
|
appMenuService?.setupApplicationMenu()
|
|
|
|
nodeTraceService.init()
|
|
powerMonitorService.init()
|
|
|
|
app.on('activate', function () {
|
|
const mainWindow = windowService.getMainWindow()
|
|
if (!mainWindow || mainWindow.isDestroyed()) {
|
|
windowService.createMainWindow()
|
|
} else {
|
|
windowService.showMainWindow()
|
|
}
|
|
})
|
|
|
|
registerShortcuts(mainWindow)
|
|
|
|
registerIpc(mainWindow, app)
|
|
|
|
replaceDevtoolsFont(mainWindow)
|
|
|
|
// Setup deep link for AppImage on Linux
|
|
await setupAppImageDeepLink()
|
|
|
|
if (isDev) {
|
|
installExtension([REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS])
|
|
.then((name) => logger.info(`Added Extension: ${name}`))
|
|
.catch((err) => logger.error('An error occurred: ', err))
|
|
}
|
|
|
|
//start selection assistant service
|
|
initSelectionService()
|
|
|
|
runAsyncFunction(async () => {
|
|
// Start API server if enabled or if agents exist
|
|
try {
|
|
const config = await apiServerService.getCurrentConfig()
|
|
logger.info('API server config:', config)
|
|
|
|
// Check if there are any agents
|
|
let shouldStart = config.enabled
|
|
if (!shouldStart) {
|
|
try {
|
|
const { total } = await agentService.listAgents({ limit: 1 })
|
|
if (total > 0) {
|
|
shouldStart = true
|
|
logger.info(`Detected ${total} agent(s), auto-starting API server`)
|
|
}
|
|
} catch (error: any) {
|
|
logger.warn('Failed to check agent count:', error)
|
|
}
|
|
}
|
|
|
|
if (shouldStart) {
|
|
await apiServerService.start()
|
|
}
|
|
} catch (error: any) {
|
|
logger.error('Failed to check/start API server:', error)
|
|
}
|
|
})
|
|
})
|
|
|
|
registerProtocolClient(app)
|
|
|
|
// macOS specific: handle protocol when app is already running
|
|
|
|
app.on('open-url', (event, url) => {
|
|
event.preventDefault()
|
|
handleProtocolUrl(url)
|
|
})
|
|
|
|
const handleOpenUrl = (args: string[]) => {
|
|
const url = args.find((arg) => arg.startsWith(CHERRY_STUDIO_PROTOCOL + '://'))
|
|
if (url) handleProtocolUrl(url)
|
|
}
|
|
|
|
// for windows to start with url
|
|
handleOpenUrl(process.argv)
|
|
|
|
// Listen for second instance
|
|
app.on('second-instance', (_event, argv) => {
|
|
windowService.showMainWindow()
|
|
|
|
// Protocol handler for Windows/Linux
|
|
// The commandLine is an array of strings where the last item might be the URL
|
|
handleOpenUrl(argv)
|
|
})
|
|
|
|
app.on('browser-window-created', (_, window) => {
|
|
optimizer.watchWindowShortcuts(window)
|
|
})
|
|
|
|
app.on('before-quit', () => {
|
|
app.isQuitting = true
|
|
|
|
// quit selection service
|
|
if (selectionService) {
|
|
selectionService.quit()
|
|
}
|
|
})
|
|
|
|
app.on('will-quit', async () => {
|
|
// 简单的资源清理,不阻塞退出流程
|
|
try {
|
|
await mcpService.cleanup()
|
|
await apiServerService.stop()
|
|
} catch (error) {
|
|
logger.warn('Error cleaning up MCP service:', error as Error)
|
|
}
|
|
// finish the logger
|
|
logger.finish()
|
|
})
|
|
|
|
// In this file you can include the rest of your app"s specific main process
|
|
// code. You can also put them in separate files and require them here.
|
|
}
|