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: koffi 自动转换字符串，无需 decode

Browse Source
This commit is contained in:
hicccc77
2026-03-10 23:44:06 +08:00
parent d101a79bf8
commit 2f32c8e092
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
electron/services/keyServiceMac.ts
View File

@@ -74,20 +74,14 @@ export class KeyServiceMac {
try { try {
onStatus?.('正在获取数据库密钥...', 0) onStatus?.('正在获取数据库密钥...', 0)
const keyPtr = this.GetDbKey() const result = this.GetDbKey()
console.log('[KeyServiceMac] GetDbKey returned:', keyPtr, 'type:', typeof keyPtr) console.log('[KeyServiceMac] GetDbKey returned:', result)
if (!keyPtr) { if (!result) {
onStatus?.('获取失败：未知错误', 2) onStatus?.('获取失败：未知错误', 2)
return { success: false, error: '未知错误' } return { success: false, error: '未知错误' }
} }
console.log('[KeyServiceMac] Attempting to decode pointer...')
const result = this.koffi.decode(keyPtr, 'string')
console.log('[KeyServiceMac] Decoded result:', result)
this.FreeString(keyPtr)
// 检查是否是错误信息 // 检查是否是错误信息
if (result.startsWith('ERROR:')) { if (result.startsWith('ERROR:')) {
const parts = result.split(':') const parts = result.split(':')
@@ -111,7 +105,7 @@ export class KeyServiceMac {
console.error('[KeyServiceMac] Error:', e) console.error('[KeyServiceMac] Error:', e)
console.error('[KeyServiceMac] Stack:', e.stack) console.error('[KeyServiceMac] Stack:', e.stack)
onStatus?.('获取失败: ' + e.message, 2) onStatus?.('获取失败: ' + e.message, 2)
return { success: false, error: e.message + '\n' + e.stack } return { success: false, error: e.message }
} }
} }
@@ -232,14 +226,8 @@ export class KeyServiceMac {
private async _scanMemoryForAesKey(pid: number, ciphertext: Buffer): Promise<string | null> { private async _scanMemoryForAesKey(pid: number, ciphertext: Buffer): Promise<string | null> {
const ciphertextHex = ciphertext.toString('hex') const ciphertextHex = ciphertext.toString('hex')
const aesKeyPtr = this.ScanMemoryForImageKey(pid, ciphertextHex) const aesKey = this.ScanMemoryForImageKey(pid, ciphertextHex)
return aesKey || null
if (!aesKeyPtr) return null
const aesKey = this.koffi.decode(aesKeyPtr, 'string')
this.FreeString(aesKeyPtr)
return aesKey
} }
private async findWeChatPid(): Promise<number | null> { private async findWeChatPid(): Promise<number | null> {