From 792746bfb2f8e92e2a131b969133222381a236a1 Mon Sep 17 00:00:00 2001 From: duanshuwen Date: Thu, 12 Mar 2026 22:31:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=B8=A0=E9=81=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/process/runTaskOperationService.ts | 66 +++++------------ src/main/scripts/common/checkLoginStatus.js | 33 --------- src/main/scripts/common/tabs.js | 3 + src/main/scripts/fg_trace.mjs | 4 +- src/main/scripts/open_all_channel.mjs | 72 +++++++++++++++++++ .../service/execute-script-service/index.ts | 4 ++ src/main/utils/chrome/cdp.ts | 30 -------- 7 files changed, 98 insertions(+), 114 deletions(-) delete mode 100644 src/main/scripts/common/checkLoginStatus.js create mode 100644 src/main/scripts/open_all_channel.mjs delete mode 100644 src/main/utils/chrome/cdp.ts diff --git a/src/main/process/runTaskOperationService.ts b/src/main/process/runTaskOperationService.ts index 52cef49..b4765c8 100644 --- a/src/main/process/runTaskOperationService.ts +++ b/src/main/process/runTaskOperationService.ts @@ -3,14 +3,18 @@ import { ipcMain, app } from 'electron'; import { IPC_EVENTS } from '@common/constants'; import { launchLocalChrome } from '@main/utils/chrome/launchLocalChrome' import { executeScriptService } from '@main/service/execute-script-service'; -import { chromium } from 'playwright'; -import { addStealthInit, connectCdpContext, safeDisconnectBrowser } from '@main/utils/chrome/cdp' import fs from 'fs' import path from 'path' import log from 'electron-log'; const openedTabIndexByChannelName = new Map() +function getScriptsDir() { + return app.isPackaged + ? path.join(process.resourcesPath, 'scripts') + : path.join(process.cwd(), 'src/main/scripts') +} + export function runTaskOperationService() { const executeScriptServiceInstance = new executeScriptService(); // 打开渠道 @@ -18,51 +22,20 @@ export function runTaskOperationService() { try { await launchLocalChrome() - const arr = Array.isArray(channels) ? channels : [] - const keys = arr - .map((it: any) => typeof it === 'string' ? it : it.channelName) - .filter(Boolean) - if (keys.length === 0) return { success: true } + const scriptsDir = getScriptsDir() + const scriptPath = path.join(scriptsDir, 'open_all_channel.mjs') - const urlMap: Record = {} + openedTabIndexByChannelName.clear() - for (const it of arr) { - const name = typeof it === 'string' ? it : it.channelName - const url = typeof it === 'string' ? undefined : it?.channelUrl - if (name && url) urlMap[name] = url + if (Array.isArray(channels)) { + for (let i = 0; i < channels.length; i++) { + const name = channels[i]?.channelName + if (name) openedTabIndexByChannelName.set(String(name), i) + } } - const { browser, context } = await connectCdpContext(chromium) - await addStealthInit(context) - - for (let i = 0; i < keys.length; i++) { - const key = keys[i] - const targetUrl = urlMap[key] - - let pages = await context.pages() - - while (pages.length <= i) { - await context.newPage() - pages = await context.pages() - } - - const page = pages[i] - await page.bringToFront() - - if (targetUrl) { - const current = page.url() - - if (!current || !current.startsWith(targetUrl)) { - await page.goto(targetUrl, { waitUntil: 'domcontentloaded' as any }) - } - } - - openedTabIndexByChannelName.set(key, i) - } - - await safeDisconnectBrowser(browser) - - return { success: true } + const result = await executeScriptServiceInstance.executeScript(scriptPath, { channels }) + return { success: true, result } } catch (error) { return { success: false, error: (error as any)?.message || 'open channel failed' } } @@ -74,9 +47,6 @@ export function runTaskOperationService() { // 从options.roomList列表中找到对应的名称 const roomType = options.roomList.find((item: any) => item.id === options.roomType); - // 从roomType找fzName、mtName、dyHotelName、dyHotSpringName、xcName属性，判断是否有值 - // 如果有值，就找出对应的脚本 - // 如果没有值，就跳过 const pairs: Array<[string, string]> = [ ['fzName', 'fg_trace.mjs'], ['mtName', 'mt_trace.mjs'], @@ -86,9 +56,7 @@ export function runTaskOperationService() { ] const scriptEntries = pairs.filter(([prop]) => roomType?.[prop]) - const scriptsDir = app.isPackaged - ? path.join(process.resourcesPath, 'scripts') - : path.join(process.cwd(), 'src/main/scripts') + const scriptsDir = getScriptsDir() const scriptPaths = scriptEntries.map(([channel, fileName]) => { const p = path.join(scriptsDir, fileName) diff --git a/src/main/scripts/common/checkLoginStatus.js b/src/main/scripts/common/checkLoginStatus.js deleted file mode 100644 index 582f746..0000000 --- a/src/main/scripts/common/checkLoginStatus.js +++ /dev/null @@ -1,33 +0,0 @@ -const log = require('electron-log'); - -const checkLoginStatus = async (page) => { - try { - const currentUrl = await page.url(); - - log.info('current url==========>:', currentUrl); - - const loginPagePatterns = ['/login', '/signin', '/auth']; - const isLoginPage = loginPagePatterns.some((pattern) => currentUrl.includes(pattern)); - - if (!isLoginPage) { - return true; - } - - const pageContent = await page.content(); - const loginKeywords = ['退出', '房价房量管理']; - const hasLoginKeyword = loginKeywords.some((keyword) => pageContent.includes(keyword)); - - if (hasLoginKeyword) { - return true; - } - - return false; - } catch (error) { - return false; - } -}; - -module.exports = { - checkLoginStatus, -}; - diff --git a/src/main/scripts/common/tabs.js b/src/main/scripts/common/tabs.js index ed043b5..263970f 100644 --- a/src/main/scripts/common/tabs.js +++ b/src/main/scripts/common/tabs.js @@ -12,10 +12,12 @@ const preparePage = async (chromium, { tabIndex = Number(process.env.TAB_INDEX), const idx = Number.isFinite(tabIndex) && tabIndex >= 0 ? Math.floor(tabIndex) : 0; let pages = await context.pages(); + while (pages.length <= idx) { await context.newPage(); pages = await context.pages(); } + const page = pages[idx]; await page.bringToFront(); @@ -24,6 +26,7 @@ const preparePage = async (chromium, { tabIndex = Number(process.env.TAB_INDEX), const safeDisconnectBrowser = async (browser) => { if (!browser) return; + try { if (typeof browser.disconnect === 'function') { await browser.disconnect(); diff --git a/src/main/scripts/fg_trace.mjs b/src/main/scripts/fg_trace.mjs index f949eec..ff290b5 100644 --- a/src/main/scripts/fg_trace.mjs +++ b/src/main/scripts/fg_trace.mjs @@ -1,6 +1,6 @@ import { chromium } from 'playwright'; import log from 'electron-log'; -import tabsPkg from './common/tabs.js'; +import tabsPkg from './common/tabs'; const { preparePage, safeDisconnectBrowser } = tabsPkg; @@ -135,7 +135,7 @@ const toggleRoomByDateIndex = async (container, { roomType, dateIndex, operation } catch (error) { log.error(error); process.exitCode = 1; - }finally { + } finally { await safeDisconnectBrowser(browser); } })(); diff --git a/src/main/scripts/open_all_channel.mjs b/src/main/scripts/open_all_channel.mjs new file mode 100644 index 0000000..ba2e6f4 --- /dev/null +++ b/src/main/scripts/open_all_channel.mjs @@ -0,0 +1,72 @@ +import { chromium } from 'playwright'; +import log from 'electron-log'; + +const parseChannels = () => { + const raw = process.env.CHANNELS || ''; + if (!raw) return []; + try { + const parsed = JSON.parse(raw); + return Array.isArray(parsed) ? parsed : []; + } catch { + return []; + } +}; + +(async () => { + let browser; + + try { + const channels = parseChannels(); + + if (!channels.length) { + log.info('No channels provided, skip.'); + return; + } + + browser = await chromium.connectOverCDP('http://127.0.0.1:9222'); + const context = browser.contexts()[0]; + + if (!context) { + throw new Error('No browser context available'); + } + + await context.addInitScript(() => { + Object.defineProperty(navigator, 'webdriver', { get: () => undefined }); + }); + + for (let i = 0; i < channels.length; i++) { + const targetUrl = channels[i]?.channelUrl; + + if (!targetUrl) continue; + + let pages = await context.pages(); + + while (pages.length <= i) { + await context.newPage(); + pages = await context.pages(); + } + + const page = pages[i]; + await page.bringToFront(); + + const current = page.url(); + + if (!current || !current.startsWith(targetUrl)) { + await page.goto(targetUrl, { waitUntil: 'domcontentloaded' }); + } + } + } catch (error) { + log.error(error); + process.exitCode = 1; + } finally { + if(browser){ + try { + if (typeof browser.disconnect === 'function') { + await browser.disconnect(); + } else { + await browser.close(); + } + } catch {} + } + } +})(); diff --git a/src/main/service/execute-script-service/index.ts b/src/main/service/execute-script-service/index.ts index a3d48c8..400be35 100644 --- a/src/main/service/execute-script-service/index.ts +++ b/src/main/service/execute-script-service/index.ts @@ -23,6 +23,8 @@ export class executeScriptService extends EventEmitter { const endTime = options?.endTime ?? ''; const operation = options?.operation ?? ''; const tabIndex = options?.tabIndex ?? ''; + const channels = options?.channels ?? ''; + const startTabIndex = options?.startTabIndex ?? ''; const child = spawn('node', [scriptPath], { env: { @@ -32,6 +34,8 @@ export class executeScriptService extends EventEmitter { END_DATE: String(endTime), OPERATION: String(operation), TAB_INDEX: String(tabIndex), + CHANNELS: typeof channels === 'string' ? channels : JSON.stringify(channels), + START_TAB_INDEX: String(startTabIndex), }, }); diff --git a/src/main/utils/chrome/cdp.ts b/src/main/utils/chrome/cdp.ts deleted file mode 100644 index 4bd14d0..0000000 --- a/src/main/utils/chrome/cdp.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { Browser, BrowserContext } from 'playwright' - -export async function connectCdpContext(chromium: any, endpoint = 'http://127.0.0.1:9222'): Promise<{ browser: Browser, context: BrowserContext }> { - const browser = await chromium.connectOverCDP(endpoint) - const context = browser.contexts()[0] - - if (!context) { - throw new Error('No browser context available') - } - return { browser, context } -} - -export async function addStealthInit(context: BrowserContext) { - await context.addInitScript(() => { - Object.defineProperty(navigator, 'webdriver', { get: () => undefined }) - }) -} - -export async function safeDisconnectBrowser(browser: any) { - if (!browser) return - - try { - if (typeof browser.disconnect === 'function') { - await browser.disconnect() - } else { - await browser.close() - } - } catch {} -} -