diff --git a/packages/ui/electron.vite.config.ts b/packages/ui/electron.vite.config.ts index eb529c4..2883f15 100644 --- a/packages/ui/electron.vite.config.ts +++ b/packages/ui/electron.vite.config.ts @@ -7,6 +7,56 @@ import transformerDirective from '@unocss/transformer-directives' import Replace from 'unplugin-replace/vite' process.env = { ...process.env, ...loadEnv(process.env.NODE_ENV!, process.cwd()) } +const mainPlugins = [ + externalizeDepsPlugin({ + exclude: [ + '@geekgeekrun/utils', + 'find-chrome-bin', + '@geekgeekrun/launch-bosszhipin-login-page-with-preload-extension' + ] + }), + Replace({ + delimiters: ['', ''], + sourcemap: true, + include: ['**/src/main/utils/gtag/Analytics.ts'], + values: [ + { + find: //g, + replacement: process.env.VITE_APP_GTAG_MEASUREMENT_ID as string + }, + { + find: //g, + replacement: process.env.VITE_APP_GTAG_API_SECRET as string + } + ] + }) +] +const preloadPlugins = [externalizeDepsPlugin()] +const rendererPlugins = [ + vue(), + UnoCSS({ + presets: [presetUno(), presetAttributify(), presetIcons()], + transformers: [transformerDirective()] + }) +] +if (process.env.NODE_ENV) { + ;[mainPlugins, preloadPlugins, rendererPlugins].forEach((pluginList) => { + pluginList.push( + Replace({ + delimiters: ['', ''], + sourcemap: true, + include: ['**'], + values: [ + { + find: /process.env.NODE_ENV/g, + replacement: `'${process.env.NODE_ENV}'` as string + } + ] + }) + ) + }) +} + export default defineConfig({ main: { build: { @@ -15,33 +65,10 @@ export default defineConfig({ }, minify: process.env.NODE_ENV === 'development' ? undefined : 'terser' }, - plugins: [ - externalizeDepsPlugin({ - exclude: [ - '@geekgeekrun/utils', - 'find-chrome-bin', - '@geekgeekrun/launch-bosszhipin-login-page-with-preload-extension' - ] - }), - Replace({ - delimiters: ['', ''], - sourcemap: true, - include: ['**/src/main/utils/gtag/Analytics.ts'], - values: [ - { - find: //g, - replacement: process.env.VITE_APP_GTAG_MEASUREMENT_ID as string - }, - { - find: //g, - replacement: process.env.VITE_APP_GTAG_API_SECRET as string - } - ] - }) - ] + plugins: mainPlugins }, preload: { - plugins: [externalizeDepsPlugin()], + plugins: preloadPlugins, build: { minify: process.env.NODE_ENV === 'development' ? undefined : 'terser' } @@ -52,13 +79,7 @@ export default defineConfig({ '@renderer': resolve('src/renderer/src') } }, - plugins: [ - vue(), - UnoCSS({ - presets: [presetUno(), presetAttributify(), presetIcons()], - transformers: [transformerDirective()] - }) - ], + plugins: rendererPlugins, build: { minify: process.env.NODE_ENV === 'development' ? undefined : 'terser' } diff --git a/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/ipc/index.ts b/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/ipc/index.ts index 3eb9a96..bcafd3b 100644 --- a/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/ipc/index.ts +++ b/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/ipc/index.ts @@ -373,7 +373,9 @@ export default function initIpc() { } subProcessOfOpenBossSite = childProcess.spawn( process.argv[0], - [process.argv[1], `--mode=launchBossSite`], + process.env.NODE_ENV === 'development' + ? [process.argv[1], `--mode=launchBossSite`] + : [`--mode=launchBossSite`], { env: subProcessEnv, stdio: ['inherit', 'inherit', 'inherit', 'pipe'] diff --git a/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/launch-daemon.ts b/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/launch-daemon.ts index 0b6a543..ffd3714 100644 --- a/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/launch-daemon.ts +++ b/packages/ui/src/main/flow/OPEN_SETTING_WINDOW/launch-daemon.ts @@ -7,7 +7,6 @@ import { import { randomUUID } from 'node:crypto' import { connectToDaemon } from './connect-to-daemon' -const isUiDev = process.env.NODE_ENV === 'development' export async function ensureIpcPipeName({ isReset } = {}) { if (isReset) { await writeStorageFile('ipc-pipe-name', '', { isJson: false }) @@ -29,7 +28,9 @@ export async function launchDaemon() { // 添加参数使守护进程在后台运行，不显示 UI daemonProcess = spawn( process.argv[0], - isUiDev ? [process.argv[1], `--mode=launchDaemon`] : [`--mode=launchDaemon`], + process.env.NODE_ENV === 'development' + ? [process.argv[1], `--mode=launchDaemon`] + : [`--mode=launchDaemon`], { stdio: ['ignore', 'pipe', 'pipe', 'pipe'], detached: true, diff --git a/packages/ui/src/main/index.ts b/packages/ui/src/main/index.ts index dcf690f..56c0e1c 100644 --- a/packages/ui/src/main/index.ts +++ b/packages/ui/src/main/index.ts @@ -1,8 +1,16 @@ +import overrideConsole from './utils/overrideConsole' import minimist from 'minimist' import { runCommon } from './features/run-common' import { launchDaemon } from './flow/OPEN_SETTING_WINDOW/launch-daemon' import { app } from 'electron' +const isUiDev = process.env.NODE_ENV === 'development' +const enableLogToFile = process.env.GEEKGEEKRUN_ENABLE_LOG_TO_FILE === String(1) +if (isUiDev || enableLogToFile) { + overrideConsole() +} +console.log('NODE_ENV:', process.env.NODE_ENV) + // 捕获未处理的 EPIPE 错误 process.on('uncaughtException', (err) => { if (err?.code === 'EPIPE' || err?.code === 'ERR_STREAM_DESTROYED') { @@ -11,9 +19,9 @@ process.on('uncaughtException', (err) => { throw err }) -const isUiDev = process.env.NODE_ENV === 'development' +console.log('argv:', process.argv) const commandlineArgs = minimist(isUiDev ? process.argv.slice(2) : process.argv.slice(1)) -console.log(commandlineArgs) +console.log('parsed commandline args:', commandlineArgs) const runMode = commandlineArgs['mode'] diff --git a/packages/ui/src/main/utils/overrideConsole.ts b/packages/ui/src/main/utils/overrideConsole.ts new file mode 100644 index 0000000..2d4b97b --- /dev/null +++ b/packages/ui/src/main/utils/overrideConsole.ts @@ -0,0 +1,75 @@ +import path from 'node:path' +import os from 'node:os' +import fs from 'node:fs' +import dayjs from 'dayjs' + +export default function overrideConsole() { + const originConsoleLog = console.log.bind(console) + const originConsoleWarn = console.warn.bind(console) + const originConsoleError = console.error.bind(console) + + const runtimeFolderPath = path.join(os.homedir(), '.geekgeekrun') + const logDirPath = path.join(runtimeFolderPath, 'log') + if (!fs.existsSync(logDirPath)) { + fs.mkdirSync(logDirPath, { recursive: true }) + } + + const logFileStream = fs.createWriteStream(path.join(logDirPath, `log.log`), { + flags: 'a' // 追加模式 + }) + const warnFileStream = fs.createWriteStream(path.join(logDirPath, `warn.log`), { + flags: 'a' // 追加模式 + }) + const errorFileStream = fs.createWriteStream(path.join(logDirPath, `error.log`), { + flags: 'a' // 追加模式 + }) + + console.log = (...args: any[]) => { + const lineHead = `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} [log][PID=${process.pid}]` + originConsoleLog(lineHead, ...args) + logFileStream.write( + [ + lineHead, + args.map((arg) => { + try { + return JSON.stringify(arg) + } catch (err) { + return `[[${JSON.stringify(err?.toString())}]]` + } + }) + ].join(' ') + '\n' + ) + } + console.warn = (...args: any[]) => { + const lineHead = `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} [warn][PID=${process.pid}]` + originConsoleWarn(lineHead, ...args) + warnFileStream.write( + [ + lineHead, + args.map((arg) => { + try { + return JSON.stringify(arg) + } catch (err) { + return `[[${JSON.stringify(err?.toString())}]]` + } + }) + ].join(' ') + '\n' + ) + } + console.error = (...args: any[]) => { + const lineHead = `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} [warn][PID=${process.pid}]` + originConsoleError(lineHead, ...args) + errorFileStream.write( + [ + lineHead, + args.map((arg) => { + try { + return JSON.stringify(arg) + } catch (err) { + return `[[${JSON.stringify(err?.toString())}]]` + } + }) + ].join(' ') + '\n' + ) + } +} diff --git a/packages/ui/src/main/window/browserDownloadProgressWindow.ts b/packages/ui/src/main/window/browserDownloadProgressWindow.ts index e915568..00fed6a 100644 --- a/packages/ui/src/main/window/browserDownloadProgressWindow.ts +++ b/packages/ui/src/main/window/browserDownloadProgressWindow.ts @@ -62,7 +62,9 @@ export function createBrowserDownloadProgressWindow( } subProcessOfCheckAndDownloadDependencies = childProcess.spawn( process.argv[0], - [process.argv[1], `--mode=downloadDependenciesForInit`], + process.env.NODE_ENV === 'development' + ? [process.argv[1], `--mode=downloadDependenciesForInit`] + : [`--mode=downloadDependenciesForInit`], { stdio: [null, null, null, 'pipe', 'ipc'] } diff --git a/packages/ui/src/main/window/cookieAssistantWindow.ts b/packages/ui/src/main/window/cookieAssistantWindow.ts index 9631a48..6a27979 100644 --- a/packages/ui/src/main/window/cookieAssistantWindow.ts +++ b/packages/ui/src/main/window/cookieAssistantWindow.ts @@ -83,7 +83,9 @@ export function createCookieAssistantWindow( } subProcessOfBossZhipinLoginPageWithPreloadExtension = childProcess.spawn( process.argv[0], - [process.argv[1], `--mode=launchBossZhipinLoginPageWithPreloadExtension`], + process.env.NODE_ENV === 'development' + ? [process.argv[1], `--mode=launchBossZhipinLoginPageWithPreloadExtension`] + : [`--mode=launchBossZhipinLoginPageWithPreloadExtension`], { env: subProcessEnv, stdio: [null, null, null, 'pipe', 'ipc'] diff --git a/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue b/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue index f43d83b..74ee323 100644 --- a/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue +++ b/packages/ui/src/renderer/src/page/MainLayout/GeekAutoStartChatWithBoss/index.vue @@ -323,7 +323,8 @@ >正则表达式，不区分大小写；输入框留空表示不筛选；优先级高于上方“期望投递公司”
请小心验证你编写的正则，填写太过于宽泛的正则（例如`.*`）将导致任何职位都不会开聊