mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-02 18:39:06 +08:00
* refactor(ProviderSettings): streamline API key management and enhance user experience - Refactored the handleProvidersProtocolUrl function to simplify API key handling and improve navigation logic. - Updated the useProviders hook to maintain consistency in provider management. - Enhanced the ApiKeyList component with improved state handling and user feedback for API key validation. - Updated localization files to reflect changes in API key management and user interactions. - Improved styling and layout for better visual consistency across provider settings. * fix(ProviderSettings): enhance confirmation modal title with provider name - Updated the confirmation modal title in the ProvidersList component to include the provider's display name, improving clarity for users during API key management. * update info * udpate line * update line * feat(Protocol): add custom protocol handling for Cherry Studio - Introduced a new protocol handler for 'cherrystudio' in the Electron app, allowing the application to respond to custom URL schemes. - Updated the electron-builder configuration to register the 'cherrystudio' protocol. - Enhanced the main application logic to handle incoming protocol URLs effectively, improving user experience when launching the app via custom links. * feat(ProviderSettings): enhance provider data handling with optional fields - Updated the handleProviderAddKey function to accept optional 'name' and 'type' fields for providers, improving flexibility in provider management. - Adjusted the API key handling logic to utilize these new fields, ensuring a more comprehensive provider configuration. - Enhanced the URL schema documentation to reflect the changes in provider data structure. * delete apikeylist * restore apiService * support utf8 * feat(Protocol): improve URL handling for macOS and Windows - Added caching for the URL received when the app is already running on macOS, ensuring it is processed correctly. - Updated the URL processing logic in handleProvidersProtocolUrl to replace characters for proper decoding. - Simplified base64 decoding in ProviderSettings to enhance readability and maintainability. * fix start in macOS * format code * fix(ProviderSettings): validate provider data before adding - Added validation to ensure 'id', 'newApiKey', and 'baseUrl' are present before proceeding with provider addition. - Implemented error handling to notify users of invalid data and redirect them to the provider settings page. * feat(Protocol): enhance URL processing for versioning - Updated the URL handling logic in handleProvidersProtocolUrl to support versioning by extracting the 'v' parameter. - Added logging for version 1 to facilitate future enhancements in handling different protocol versions. - Improved the processing of the 'data' parameter for better compatibility with the updated URL schema. * feat(i18n): add provider API key management translations for Japanese, Russian, and Traditional Chinese - Introduced new translations for API key management features, including confirmation prompts and error messages related to provider API keys. - Enhanced user experience by providing localized strings for adding, updating, and validating API keys across multiple languages. --------- Co-authored-by: rcadmin <rcadmin@rcadmins-MacBook-Pro-4.local>
175 lines
5.3 KiB
TypeScript
175 lines
5.3 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 { electronApp, optimizer } from '@electron-toolkit/utils'
|
|
import { replaceDevtoolsFont } from '@main/utils/windowUtil'
|
|
import { app } from 'electron'
|
|
import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
|
|
import Logger from 'electron-log'
|
|
|
|
import { isDev, isWin } from './constant'
|
|
import { registerIpc } from './ipc'
|
|
import { configManager } from './services/ConfigManager'
|
|
import mcpService from './services/MCPService'
|
|
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 { windowService } from './services/WindowService'
|
|
|
|
Logger.initialize()
|
|
|
|
/**
|
|
* 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 features for unresponsive renderer js call stacks
|
|
app.commandLine.appendSwitch('enable-features', 'DocumentPolicyIncludeJSCallStacksInCrashReports')
|
|
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 () => {
|
|
// 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()
|
|
|
|
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) => console.log(`Added Extension: ${name}`))
|
|
.catch((err) => console.log('An error occurred: ', err))
|
|
}
|
|
|
|
//start selection assistant service
|
|
initSelectionService()
|
|
})
|
|
|
|
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 () => {
|
|
// event.preventDefault()
|
|
try {
|
|
await mcpService.cleanup()
|
|
} catch (error) {
|
|
Logger.error('Error cleaning up MCP service:', error)
|
|
}
|
|
})
|
|
|
|
// 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.
|
|
}
|