hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-03-24 23:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: elevated helper 输出解析改为找最后一个合法 JSON 行，修复 stderr 混入导致的解析失败

Browse Source
This commit is contained in:
hicccc77
2026-03-14 20:45:33 +08:00
parent db71bc3f19
commit d50bffad3e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electron/services/keyServiceMac.ts
View File

@@ -380,15 +380,20 @@ export class KeyServiceMac {
} }
const lines = String(stdout).split(/\r?\n/).map(x => x.trim()).filter(Boolean) const lines = String(stdout).split(/\r?\n/).map(x => x.trim()).filter(Boolean)
const last = lines[lines.length - 1] if (!lines.length) throw new Error('elevated helper returned empty output')
if (!last) throw new Error('elevated helper returned empty output')
// 找最后一个能成功 parse 的 JSON 行（stderr 混入 stdout 时会有非 JSON 行）
let payload: any let payload: any
try { let lastJsonLine = ''
payload = JSON.parse(last) for (let i = lines.length - 1; i >= 0; i--) {
} catch { if (!lines[i].startsWith('{')) continue
throw new Error('elevated helper returned invalid json: ' + last) try {
payload = JSON.parse(lines[i])
lastJsonLine = lines[i]
break
} catch { continue }
} }
if (!payload) throw new Error('elevated helper returned invalid json: ' + lines[lines.length - 1])
if (payload?.success === true && typeof payload?.key === 'string') return payload.key if (payload?.success === true && typeof payload?.key === 'string') return payload.key
if (typeof payload?.result === 'string') return payload.result if (typeof payload?.result === 'string') return payload.result
throw new Error('elevated helper json missing key/result') throw new Error('elevated helper json missing key/result')