mirror of
https://github.com/geekgeekrun/geekgeekrun.git
synced 2026-09-06 16:07:17 +08:00
fix when a normal chrome has installed, it still try to install the fallback one (chrome for testing)
This commit is contained in:
+1
-24
@@ -9,8 +9,6 @@ import {
|
|||||||
removeLastUsedAndAvailableBrowserPath
|
removeLastUsedAndAvailableBrowserPath
|
||||||
} from '../browser-history'
|
} from '../browser-history'
|
||||||
import { getExecutableFileVersion } from '@geekgeekrun/utils/windows-only/file.mjs'
|
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'
|
import gtag from '../../../../utils/gtag'
|
||||||
|
|
||||||
const getPuppeteerManagerModule = async () => {
|
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
|
// find existed browser - the one maybe actively installed by user or ship with os like Edge on windows
|
||||||
try {
|
try {
|
||||||
const existedOne = await findAndLocateUserInstalledChromiumExecutable()
|
const existedOne = await findAndLocateUserInstalledChromiumExecutableSync()
|
||||||
await saveLastUsedAndAvailableBrowserInfo(existedOne)
|
await saveLastUsedAndAvailableBrowserInfo(existedOne)
|
||||||
// save its path
|
// save its path
|
||||||
return existedOne
|
return existedOne
|
||||||
@@ -168,24 +166,3 @@ export async function findAndLocateUserInstalledChromiumExecutableSync(): Promis
|
|||||||
browser: targetBrowser.browser
|
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)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
-18
@@ -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)
|
|
||||||
})()
|
|
||||||
Reference in New Issue
Block a user