fix when a normal chrome has installed, it still try to install the fallback one (chrome for testing)

This commit is contained in:
geekgeekrun
2024-11-30 19:38:46 +08:00
parent da72bec6a7
commit bfa0cbf4b6
2 changed files with 1 additions and 42 deletions

View File

@@ -9,8 +9,6 @@ import {
removeLastUsedAndAvailableBrowserPath
} from '../browser-history'
import { getExecutableFileVersion } from '@geekgeekrun/utils/windows-only/file.mjs'
import createCheckAndLocateExistedChromiumExecutableWorker from './worker/find-and-locate-existed-chromium-executable?nodeWorker&url'
import { type Worker, isMainThread } from 'node:worker_threads'
import gtag from '../../../../utils/gtag'
const getPuppeteerManagerModule = async () => {
@@ -107,7 +105,7 @@ export const getAnyAvailablePuppeteerExecutable = async (): Promise<BrowserInfo
}
// find existed browser - the one maybe actively installed by user or ship with os like Edge on windows
try {
const existedOne = await findAndLocateUserInstalledChromiumExecutable()
const existedOne = await findAndLocateUserInstalledChromiumExecutableSync()
await saveLastUsedAndAvailableBrowserInfo(existedOne)
// save its path
return existedOne
@@ -168,24 +166,3 @@ export async function findAndLocateUserInstalledChromiumExecutableSync(): Promis
browser: targetBrowser.browser
}
}
export async function findAndLocateUserInstalledChromiumExecutable(): Promise<BrowserInfo> {
return new Promise((resolve, reject) => {
const worker: Worker = createCheckAndLocateExistedChromiumExecutableWorker({
env: {
...process.env,
RESOURCES_PATH: process.resourcesPath
}
})
worker.once('message', (data) => {
if (data.type === 'RESULT') {
resolve(data.data)
}
})
worker.once('message', (data) => {
if (data.type === 'ERROR') {
reject(data.error)
}
})
})
}

View File

@@ -1,18 +0,0 @@
import { parentPort } from 'node:worker_threads'
import { findAndLocateUserInstalledChromiumExecutableSync } from '../index'
;(async () => {
try {
const result = await findAndLocateUserInstalledChromiumExecutableSync()
parentPort?.postMessage({
type: 'RESULT',
data: result
})
} catch (error) {
parentPort?.postMessage({
type: 'ERROR',
error
})
}
process.exit(0)
})()