GithubBackup/geekgeekrun
1
0
Fork 0
mirror of https://github.com/geekgeekrun/geekgeekrun.git synced 2026-06-03 06:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix the issue that import external-node-runtime-dependencies in worker threads will throw error due to it cannot access electron module - the import path in worker threads will not rely on electron

Browse Source
This commit is contained in:
geekgeekrun
2024-03-14 09:31:47 +08:00
parent f534c56af8
commit 2339b2565e
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/ui/src/main/flow/CHECK_AND_DOWNLOAD_DEPENDENCIES/utils/puppeteer-executable/index.ts
View File

@@ -9,7 +9,7 @@ import {
removeLastUsedAndAvailableBrowserPath
} from '../browser-history'
import { getExecutableFileVersion } from '@geekgeekrun/utils/windows-only/file.mjs'
import CheckAndLocateExistedChromiumExecutableWorker from './worker/find-and-locate-existed-chromium-executable?nodeWorker&url'
import createCheckAndLocateExistedChromiumExecutableWorker from './worker/find-and-locate-existed-chromium-executable?nodeWorker&url'
import { type Worker, isMainThread } from 'node:worker_threads'
const getPuppeteerManagerModule = async () => {
@@ -29,8 +29,12 @@ const getPuppeteerManagerModule = async () => {
)
).puppeteerManager
} else {
// TODO: Run from worker
debugger
puppeteerManager = (
await import(
'file://' +
path.join(__dirname, '../../..', '/external-node-runtime-dependencies/index.mjs')
)
).puppeteerManager
}
return puppeteerManager
@@ -185,8 +189,12 @@ export async function findAndLocateUserInstalledChromiumExecutableSync(): Promis
)
).findChromeBin.findChrome
} else {
// TODO: Run from worker
debugger
findChrome = (
await import(
'file://' +
path.join(__dirname, '../../..', '/external-node-runtime-dependencies/index.mjs')
)
).findChromeBin.findChrome
}
const targetBrowser = await findChrome({
min: exceptChromiumMainVersion
@@ -202,7 +210,12 @@ export async function findAndLocateUserInstalledChromiumExecutableSync(): Promis
export async function findAndLocateUserInstalledChromiumExecutable(): Promise<BrowserInfo> {
return new Promise((resolve, reject) => {
const worker: Worker = new CheckAndLocateExistedChromiumExecutableWorker()
const worker: Worker = createCheckAndLocateExistedChromiumExecutableWorker({
env: {
...process.env,
RESOURCES_PATH: process.resourcesPath
}
})
worker.once('message', (data) => {
if (data.type === 'RESULT') {
resolve(data.data)