From 27d9cdb403fcaf34c0efb588e91c11153a8221fa Mon Sep 17 00:00:00 2001 From: geekgeekrun Date: Thu, 21 Nov 2024 09:59:40 +0800 Subject: [PATCH] fix cannot run in packaged app for auto reminder --- .../flow/GEEK_AUTO_START_CHAT_WITH_BOSS_DAEMON/index.ts | 8 +++++--- .../main/flow/READ_NO_REPLY_AUTO_REMINDER/bootstrap.ts | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/ui/src/main/flow/GEEK_AUTO_START_CHAT_WITH_BOSS_DAEMON/index.ts b/packages/ui/src/main/flow/GEEK_AUTO_START_CHAT_WITH_BOSS_DAEMON/index.ts index 0fcfa95..cabd96d 100644 --- a/packages/ui/src/main/flow/GEEK_AUTO_START_CHAT_WITH_BOSS_DAEMON/index.ts +++ b/packages/ui/src/main/flow/GEEK_AUTO_START_CHAT_WITH_BOSS_DAEMON/index.ts @@ -12,7 +12,7 @@ import { getPublicDbFilePath } from '@geekgeekrun/geek-auto-start-chat-with-boss import { AutoStartChatRunRecord } from '@geekgeekrun/sqlite-plugin/dist/entity/AutoStartChatRunRecord' import minimist from 'minimist' import attachListenerForKillSelfOnParentExited from '../../utils/attachListenerForKillSelfOnParentExited' - +const isUiDev = process.env.NODE_ENV === 'development' const rerunInterval = (() => { let v = Number(process.env.MAIN_BOSSGEEKGO_RERUN_INTERVAL) if (isNaN(v)) { @@ -24,7 +24,9 @@ const rerunInterval = (() => { function runWithDaemon({ runRecordId, runMode, parentProcessPipe }) { const subProcessOfCore = childProcess.spawn( process.argv[0], - [...process.argv.slice(1), `--run-record-id=${runRecordId}`], + isUiDev + ? [...process.argv.slice(1), `--run-record-id=${runRecordId}`] + : [`--run-record-id=${runRecordId}`], { stdio: ['inherit', 'inherit', 'inherit', 'pipe', 'ipc'], env: { @@ -73,7 +75,7 @@ function runWithDaemon({ runRecordId, runMode, parentProcessPipe }) { } export async function runAutoChatWithDaemon() { - const commandlineArgs = minimist(process.argv.slice(2)) + const commandlineArgs = minimist(isUiDev ? process.argv.slice(2) : process.argv.slice(1)) if (!['geekAutoStartWithBossMain'].includes(commandlineArgs['mode-to-daemon'])) { await new Promise((resolve) => { app.once('ready', () => resolve(undefined)) diff --git a/packages/ui/src/main/flow/READ_NO_REPLY_AUTO_REMINDER/bootstrap.ts b/packages/ui/src/main/flow/READ_NO_REPLY_AUTO_REMINDER/bootstrap.ts index 2eead61..7e56f93 100644 --- a/packages/ui/src/main/flow/READ_NO_REPLY_AUTO_REMINDER/bootstrap.ts +++ b/packages/ui/src/main/flow/READ_NO_REPLY_AUTO_REMINDER/bootstrap.ts @@ -1,18 +1,18 @@ import { Browser } from 'puppeteer' -import puppeteer from 'puppeteer-extra' -import StealthPlugin from 'puppeteer-extra-plugin-stealth' +import { initPuppeteer } from '@geekgeekrun/geek-auto-start-chat-with-boss/index.mjs' import { pageMapByName } from './index' import { readStorageFile } from '@geekgeekrun/geek-auto-start-chat-with-boss/runtime-file-utils.mjs' import { setDomainLocalStorage } from '@geekgeekrun/utils/puppeteer/local-storage.mjs' + const localStoragePageUrl = `https://www.zhipin.com/desktop/` const bossChatUiUrl = `https://www.zhipin.com/web/geek/chat` const bossCookies = readStorageFile('boss-cookies.json') const bossLocalStorage = readStorageFile('boss-local-storage.json') -puppeteer.use(StealthPlugin()) - export async function bootstrap() { + const { puppeteer } = await initPuppeteer() + const browser = await puppeteer.launch({ headless: false, ignoreHTTPSErrors: true,