Skip to content

[Feature] 在引擎连接过程中，增加 “中断链接” 与 “倒计时” 功能 #3244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hubin4826 merged 3 commits into from
Jan 9, 2026
Merged

[Feature] 在引擎连接过程中，增加 “中断链接” 与 “倒计时” 功能 #3244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
200d495
add break status in link engine
VillanCh Jan 4, 2026
97ca2d3
add countdown
VillanCh Jan 4, 2026
f3fff2e
pref: 中断连接&倒计时进入
song-xiao-lin Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 121 additions & 39 deletions app/main/handlers/newEngineStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ const {GLOBAL_YAK_SETTING} = require("../state")
const {getLocalYaklangEngine, YakitProjectPath} = require("../filePath")
const {engineLogOutputFileAndUI, engineLogOutputUI} = require("../logFile")

// 引擎连接过程中涉及到的执行任务，请务必存入，引擎引擎连接有中断连接功能
const runningTasks = new Map()

const ECHO_TEST_MSG = "Hello Yakit!"

/** 各版本下的数据库环境变量 */
Expand Down Expand Up @@ -48,19 +51,37 @@ module.exports = {
let stderr = ""
const timeoutMs = 11000
let killed = false
let close = false
let successDetected = false
const taskKey = "check_" + checkId
let cleaned = false

const timeoutId = setTimeout(() => {
if (close) return
const killFun = (timeOut = false) => {
if (killed) return
killed = true
subprocess.kill()
cleanTask()
clearTimeout(timeoutId)
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 check -----`)
try {
subprocess.kill()
if (process.platform === "win32") {
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
} else {
process.kill(subprocess.pid, "SIGKILL")
}
} catch {}
}

runningTasks.set(taskKey, killFun)

const cleanTask = () => {
if (cleaned) return
cleaned = true
runningTasks.delete(taskKey)
}

const timeoutId = setTimeout(() => {
if (checkId !== currentStartId || successDetected || killed) return
killFun(true)
engineLogOutputFileAndUI(win, `----- 检查随机密码模式超时 -----`)
reject({status: "timeout", message: "检查随机密码模式超时"})
}, timeoutMs)
Expand All @@ -81,6 +102,7 @@ module.exports = {

subprocess.on("error", (error) => {
if (checkId !== currentCheckId) return
cleanTask()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, `----- 检查随机密码模式失败 -----`)
engineLogOutputFileAndUI(win, `process_error: ${error.message}`)
Expand All @@ -89,7 +111,7 @@ module.exports = {

subprocess.on("close", (code) => {
if (checkId !== currentCheckId || killed) return
close = true
cleanTask()
clearTimeout(timeoutId)
const combinedOutput = (stdout + stderr).trim()
engineLogOutputFileAndUI(win, `----- 检查随机密码模式结束，退出码: ${code} -----`)
Expand All @@ -106,6 +128,7 @@ module.exports = {
}

if (json && json.ok === true) {
successDetected = true
engineLogOutputFileAndUI(win, `----- 随机密码模式检查通过 -----`)
return resolve({status: "success", json})
}
Expand Down Expand Up @@ -255,17 +278,37 @@ module.exports = {
let stderr = ""
const timeoutMs = 11000
let killed = false
let successDetected = false
const taskKey = "fixdb_" + checkId
let cleaned = false

const timeoutId = setTimeout(() => {
const killFun = (timeOut = false) => {
if (killed) return
killed = true
subprocess.kill()
cleanTask()
clearTimeout(timeoutId)
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 修复数据库 -----`)
try {
subprocess.kill()
if (process.platform === "win32") {
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
} else {
process.kill(subprocess.pid, "SIGKILL")
}
} catch {}
}

runningTasks.set(taskKey, killFun)

const cleanTask = () => {
if (cleaned) return
cleaned = true
runningTasks.delete(taskKey)
}

const timeoutId = setTimeout(() => {
if (checkId !== currentStartId || successDetected || killed) return
killFun(true)
engineLogOutputFileAndUI(win, `----- 修复数据库超时 -----`)
reject({status: "timeout", message: "修复数据库超时"})
}, timeoutMs)
Expand All @@ -286,6 +329,7 @@ module.exports = {

subprocess.on("error", (error) => {
if (checkId !== currentFixId) return
cleanTask()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, `----- 修复数据库失败 -----`)
engineLogOutputFileAndUI(win, `process_error: ${error.message}`)
Expand All @@ -294,6 +338,7 @@ module.exports = {

subprocess.on("close", (code) => {
if (checkId !== currentFixId || killed) return
cleanTask()
clearTimeout(timeoutId)
const combinedOutput = (stdout + stderr).trim()
engineLogOutputFileAndUI(win, `----- 修复数据库结束，退出码: ${code} -----`)
Expand All @@ -310,6 +355,7 @@ module.exports = {
}

if (json && json.ok === true) {
successDetected = true
engineLogOutputFileAndUI(win, `----- 修复数据库成功 -----`)
return resolve({status: "success", json})
}
Expand Down Expand Up @@ -444,27 +490,11 @@ module.exports = {
let stderr = ""
let successDetected = false
let killed = false
const taskKey = "start_" + checkId
let cleaned = false
let pollIntervalId = null
const timeoutMs = 60000 // 增加到 60 秒，配合轮询检测

/** 清理轮询 */
const cleanup = () => {
if (pollIntervalId) {
clearInterval(pollIntervalId)
pollIntervalId = null
}
}

/** 成功回调，确保只触发一次 */
const onSuccess = (msg1, msg2) => {
if (successDetected || killed) return
successDetected = true
cleanup()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, msg2)
resolve({status: "success", msg1})
}

/** 轮询检测引擎连接状态 */
const startConnectionPolling = () => {
engineLogOutputFileAndUI(win, `开始轮询检测引擎连接状态 (每 2 秒一次)...`)
Expand All @@ -491,38 +521,73 @@ module.exports = {
}

if (data && data["result"] === ECHO_TEST_MSG) {
onSuccess("引擎启动成功（通过连接检测）", `轮询检测到引擎连接成功 (Echo 测试通过)！`)
onSuccess(
"引擎启动成功（通过连接检测）",
`轮询检测到引擎连接成功 (Echo 测试通过)！`
)
}
})
} catch (e) {
engineLogOutputFileAndUI(win, `轮询连接异常: ${e.message || e}`)
}
}, 2000) // 每 2 秒检测一次
}

// 延迟 2 秒开始轮询，给引擎一点启动时间
setTimeout(() => {
if (!successDetected && !killed && checkId === currentStartId) {
startConnectionPolling()
}
}, 2000)
/** 清理轮询 */
const cleanup = () => {
if (pollIntervalId) {
clearInterval(pollIntervalId)
pollIntervalId = null
}
}

const timeoutId = setTimeout(() => {
if (successDetected || killed) return
const killFun = (timeOut = false) => {
if (killed) return
killed = true
cleanup()
subprocess.kill()
cleanTask()
clearTimeout(timeoutId)
!timeOut && engineLogOutputFileAndUI(win, `----- 执行中止 启动本地引擎 -----`)
try {
subprocess.kill()
if (process.platform === "win32") {
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
} else {
process.kill(subprocess.pid, "SIGKILL")
}
} catch {}
}

runningTasks.set(taskKey, killFun)
const cleanTask = () => {
if (cleaned) return
cleaned = true
runningTasks.delete(taskKey)
}

const timeoutId = setTimeout(() => {
if (checkId !== currentStartId || successDetected || killed) return
killFun(true)
engineLogOutputFileAndUI(win, `----- 启动本地引擎超时 (60s) -----`)
reject({status: "timeout", message: "启动本地引擎超时"})
}, timeoutMs)

/** 成功回调，确保只触发一次 */
const onSuccess = (msg1, msg2) => {
if (checkId !== currentStartId || successDetected || killed) return
successDetected = true
cleanup()
cleanTask()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, msg2)
resolve({status: "success", msg1})
}

subprocess.stdout.on("data", (data) => {
if (checkId !== currentStartId) return
const output = data.toString("utf-8")
Expand Down Expand Up @@ -554,20 +619,13 @@ module.exports = {
})

process.on("exit", () => {
cleanup()
subprocess.kill()
try {
if (process.platform === "win32") {
childProcess.exec(`taskkill /PID ${subprocess.pid} /T /F`)
} else {
process.kill(subprocess.pid, "SIGKILL")
}
} catch {}
killFun()
})

subprocess.on("error", (err) => {
if (checkId !== currentStartId) return
cleanup()
cleanTask()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, `启动引擎出错: ${err.message}`)
win.webContents.send("start-yaklang-engine-error", `本地引擎遭遇错误，错误原因为：${err}`)
Expand All @@ -577,6 +635,7 @@ module.exports = {
subprocess.on("close", (code) => {
if (checkId !== currentStartId || killed || successDetected) return
cleanup()
cleanTask()
clearTimeout(timeoutId)
engineLogOutputFileAndUI(win, `----- 引擎进程退出，退出码: ${code} -----`)
reject({status: "exit", message: `引擎进程提前退出 (${code})`})
Expand All @@ -601,5 +660,28 @@ module.exports = {
}
}
})

// 中断连接 取消所有正在执行的任务
ipcMain.handle(ipcEventPre + "cancel-all-tasks", () => {
if (runningTasks.size === 0) {
return {ok: true, canceled: 0}
}

let count = 0

for (const [, cancel] of runningTasks) {
try {
cancel()
count++
} catch {}
}

runningTasks.clear()

return {
ok: true,
canceled: count
}
})
}
}
1 change: 1 addition & 0 deletions ...rer/engine-link-startup/src/pages/StartupPage/components/LocalEngine/LocalEngineType.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface LocalEngineProps {
ref?: React.ForwardedRef<LocalEngineLinkFuncProps>
setLog: Dispatch<SetStateAction<string[]>>
onLinkEngine: (params: LocalLinkParams) => void
yakitStatus: YakitStatusType
setYakitStatus: (v: YakitStatusType) => void
buildInEngineVersion: string
setRestartLoading: Dispatch<SetStateAction<boolean>>
Expand Down
Loading