diff --git a/electron/services/chatService.ts b/electron/services/chatService.ts index afa4a4b..dc9c50b 100644 --- a/electron/services/chatService.ts +++ b/electron/services/chatService.ts @@ -50,6 +50,9 @@ export interface Message { emojiCdnUrl?: string emojiMd5?: string emojiLocalPath?: string // 本地缓存 castle 路径 + emojiThumbUrl?: string + emojiEncryptUrl?: string + emojiAesKey?: string // 引用消息相关 quotedContent?: string quotedSender?: string @@ -1151,6 +1154,9 @@ class ChatService { const emojiInfo = this.parseEmojiInfo(content) emojiCdnUrl = emojiInfo.cdnUrl emojiMd5 = emojiInfo.md5 + cdnThumbUrl = emojiInfo.thumbUrl // 复用 cdnThumbUrl 字段或使用 emojiThumbUrl + // 注意:Message 接口定义的 emojiThumbUrl,这里我们统一一下 + // 如果 Message 接口有 emojiThumbUrl,则使用它 } else if (localType === 3 && content) { const imageInfo = this.parseImageInfo(content) imageMd5 = imageInfo.md5 @@ -1373,7 +1379,7 @@ class ChatService { /** * 解析表情包信息 */ - private parseEmojiInfo(content: string): { cdnUrl?: string; md5?: string } { + private parseEmojiInfo(content: string): { cdnUrl?: string; md5?: string; thumbUrl?: string; encryptUrl?: string; aesKey?: string } { try { // 提取 cdnurl let cdnUrl: string | undefined @@ -1387,16 +1393,15 @@ class ChatService { } } - // 如果没有 cdnurl,尝试 thumburl - if (!cdnUrl) { - const thumbUrlMatch = /thumburl\s*=\s*['"]([^'"]+)['"]/i.exec(content) || /thumburl\s*=\s*([^'"]+?)(?=\s|\/|>)/i.exec(content) - if (thumbUrlMatch) { - cdnUrl = thumbUrlMatch[1].replace(/&/g, '&') - if (cdnUrl.includes('%')) { - try { - cdnUrl = decodeURIComponent(cdnUrl) - } catch { } - } + // 提取 thumburl + let thumbUrl: string | undefined + const thumbUrlMatch = /thumburl\s*=\s*['"]([^'"]+)['"]/i.exec(content) || /thumburl\s*=\s*([^'"]+?)(?=\s|\/|>)/i.exec(content) + if (thumbUrlMatch) { + thumbUrl = thumbUrlMatch[1].replace(/&/g, '&') + if (thumbUrl.includes('%')) { + try { + thumbUrl = decodeURIComponent(thumbUrl) + } catch { } } } @@ -1404,9 +1409,23 @@ class ChatService { const md5Match = /md5\s*=\s*['"]([a-fA-F0-9]+)['"]/i.exec(content) || /md5\s*=\s*([a-fA-F0-9]+)/i.exec(content) const md5 = md5Match ? md5Match[1] : undefined - // 不构造假 URL,只返回真正的 cdnurl - // 没有 cdnUrl 时保持静默,交由后续回退逻辑处理 - return { cdnUrl, md5 } + // 提取 encrypturl + let encryptUrl: string | undefined + const encryptUrlMatch = /encrypturl\s*=\s*['"]([^'"]+)['"]/i.exec(content) || /encrypturl\s*=\s*([^'"]+?)(?=\s|\/|>)/i.exec(content) + if (encryptUrlMatch) { + encryptUrl = encryptUrlMatch[1].replace(/&/g, '&') + if (encryptUrl.includes('%')) { + try { + encryptUrl = decodeURIComponent(encryptUrl) + } catch { } + } + } + + // 提取 aeskey + const aesKeyMatch = /aeskey\s*=\s*['"]([a-zA-Z0-9]+)['"]/i.exec(content) || /aeskey\s*=\s*([a-zA-Z0-9]+)/i.exec(content) + const aesKey = aesKeyMatch ? aesKeyMatch[1] : undefined + + return { cdnUrl, md5, thumbUrl, encryptUrl, aesKey } } catch (e) { console.error('[ChatService] 表情包解析失败:', e, { xml: content }) return {} @@ -2622,11 +2641,7 @@ class ChatService { // 检查内存缓存 const cached = emojiCache.get(cacheKey) if (cached && existsSync(cached)) { - // 读取文件并转为 data URL - const dataUrl = this.fileToDataUrl(cached) - if (dataUrl) { - return { success: true, localPath: dataUrl } - } + return { success: true, localPath: cached } } // 检查是否正在下载 @@ -2634,10 +2649,7 @@ class ChatService { if (downloading) { const result = await downloading if (result) { - const dataUrl = this.fileToDataUrl(result) - if (dataUrl) { - return { success: true, localPath: dataUrl } - } + return { success: true, localPath: result } } return { success: false, error: '下载失败' } } @@ -2654,10 +2666,7 @@ class ChatService { const filePath = join(cacheDir, `${cacheKey}${ext}`) if (existsSync(filePath)) { emojiCache.set(cacheKey, filePath) - const dataUrl = this.fileToDataUrl(filePath) - if (dataUrl) { - return { success: true, localPath: dataUrl } - } + return { success: true, localPath: filePath } } } @@ -2671,10 +2680,7 @@ class ChatService { if (localPath) { emojiCache.set(cacheKey, localPath) - const dataUrl = this.fileToDataUrl(localPath) - if (dataUrl) { - return { success: true, localPath: dataUrl } - } + return { success: true, localPath } } return { success: false, error: '下载失败' } } catch (e) { @@ -3917,6 +3923,13 @@ class ChatService { const imgInfo = this.parseImageInfo(rawContent) Object.assign(msg, imgInfo) msg.imageDatName = this.parseImageDatNameFromRow(row) + } else if (msg.localType === 47) { // Emoji + const emojiInfo = this.parseEmojiInfo(rawContent) + msg.emojiCdnUrl = emojiInfo.cdnUrl + msg.emojiMd5 = emojiInfo.md5 + msg.emojiThumbUrl = emojiInfo.thumbUrl + msg.emojiEncryptUrl = emojiInfo.encryptUrl + msg.emojiAesKey = emojiInfo.aesKey } return msg @@ -4227,6 +4240,34 @@ class ChatService { return { success: false, error: String(e) } } } + + + /** + * 下载表情包文件(用于导出,返回文件路径) + */ + async downloadEmojiFile(msg: Message): Promise { + if (!msg.emojiMd5) return null + let url = msg.emojiCdnUrl + + // 尝试获取 URL + if (!url && msg.emojiEncryptUrl) { + console.warn('[ChatService] Emoji has only encryptUrl:', msg.emojiMd5) + } + + if (!url) { + await this.fallbackEmoticon(msg) + url = msg.emojiCdnUrl + } + + if (!url) return null + + // Reuse existing downloadEmoji method + const result = await this.downloadEmoji(url, msg.emojiMd5) + if (result.success && result.localPath) { + return result.localPath + } + return null + } } export const chatService = new ChatService() diff --git a/electron/services/config.ts b/electron/services/config.ts index be606f2..d9eda16 100644 --- a/electron/services/config.ts +++ b/electron/services/config.ts @@ -14,7 +14,7 @@ interface ConfigSchema { // 缓存相关 cachePath: string - weixinDllPath: string + lastOpenedDb: string lastSession: string @@ -75,7 +75,7 @@ export class ConfigService { imageAesKey: '', wxidConfigs: {}, cachePath: '', - weixinDllPath: '', + lastOpenedDb: '', lastSession: '', theme: 'system', diff --git a/electron/services/exportService.ts b/electron/services/exportService.ts index 5814efd..ab0eb67 100644 --- a/electron/services/exportService.ts +++ b/electron/services/exportService.ts @@ -1479,49 +1479,30 @@ class ExportService { fs.mkdirSync(emojisDir, { recursive: true }) } - // 使用消息对象中已提取的字段 - const emojiUrl = msg.emojiCdnUrl - const emojiMd5 = msg.emojiMd5 - - if (!emojiUrl && !emojiMd5) { + // 使用 chatService 下载表情包 (利用其重试和 fallback 逻辑) + const localPath = await chatService.downloadEmojiFile(msg) + if (!localPath || !fs.existsSync(localPath)) { return null } - - - const key = emojiMd5 || String(msg.localId) - // 根据 URL 判断扩展名 - let ext = '.gif' - if (emojiUrl) { - if (emojiUrl.includes('.png')) ext = '.png' - else if (emojiUrl.includes('.jpg') || emojiUrl.includes('.jpeg')) ext = '.jpg' - } + // 确定目标文件名 + const ext = path.extname(localPath) || '.gif' + const key = msg.emojiMd5 || String(msg.localId) const fileName = `${key}${ext}` const destPath = path.join(emojisDir, fileName) - // 如果已存在则跳过 - if (fs.existsSync(destPath)) { - return { - relativePath: path.posix.join(mediaRelativePrefix, 'emojis', fileName), - kind: 'emoji' - } + // 复制文件到导出目录 (如果不存在) + if (!fs.existsSync(destPath)) { + fs.copyFileSync(localPath, destPath) } - // 下载表情 - if (emojiUrl) { - const downloaded = await this.downloadFile(emojiUrl, destPath) - if (downloaded) { - return { - relativePath: path.posix.join(mediaRelativePrefix, 'emojis', fileName), - kind: 'emoji' - } - } else { - } + return { + relativePath: path.posix.join(mediaRelativePrefix, 'emojis', fileName), + kind: 'emoji' } - - return null } catch (e) { + console.error('ExportService: exportEmoji failed', e) return null } } diff --git a/electron/services/isaac64.ts b/electron/services/isaac64.ts index 731f6db..8be407b 100644 --- a/electron/services/isaac64.ts +++ b/electron/services/isaac64.ts @@ -99,23 +99,29 @@ export class Isaac64 { this.isaac64(); this.randcnt = 256; } - return this.randrsl[256 - (this.randcnt--)]; + return this.randrsl[--this.randcnt]; } /** - * Generates a keystream of the specified size (in bytes). - * @param size Size of the keystream in bytes (must be multiple of 8) - * @returns Buffer containing the keystream + * Generates a keystream where each 64-bit block is Big-Endian. + * This matches WeChat's behavior (Reverse index order + byte reversal). */ - public generateKeystream(size: number): Buffer { - const stream = new BigUint64Array(size / 8); - for (let i = 0; i < stream.length; i++) { - stream[i] = this.getNext(); + public generateKeystreamBE(size: number): Buffer { + const buffer = Buffer.allocUnsafe(size); + const fullBlocks = Math.floor(size / 8); + + for (let i = 0; i < fullBlocks; i++) { + buffer.writeBigUInt64BE(this.getNext(), i * 8); } - // WeChat's logic specifically reverses the entire byte array - const buffer = Buffer.from(stream.buffer); - // 注意:根据 worker.html 的逻辑,它是对 Uint8Array 执行 reverse() - // Array.from(wasmArray).reverse() - return buffer.reverse(); + + const remaining = size % 8; + if (remaining > 0) { + const lastK = this.getNext(); + const temp = Buffer.allocUnsafe(8); + temp.writeBigUInt64BE(lastK, 0); + temp.copy(buffer, fullBlocks * 8, 0, remaining); + } + + return buffer; } } diff --git a/electron/services/snsService.ts b/electron/services/snsService.ts index 61abbd2..f4b7fff 100644 --- a/electron/services/snsService.ts +++ b/electron/services/snsService.ts @@ -292,7 +292,6 @@ class SnsService { // 视频专用下载逻辑 (下载 -> 解密 -> 缓存) return new Promise(async (resolve) => { const tmpPath = join(require('os').tmpdir(), `sns_video_${Date.now()}_${Math.random().toString(36).slice(2)}.enc`) - console.log(`[SnsService] 开始下载视频到临时文件: ${tmpPath}`) try { const https = require('https') @@ -325,7 +324,6 @@ class SnsService { fileStream.on('finish', async () => { fileStream.close() - console.log(`[SnsService] 视频下载完成,开始解密... Key: ${key}`) try { const encryptedBuffer = await readFile(tmpPath) @@ -334,7 +332,6 @@ class SnsService { if (key && String(key).trim().length > 0) { try { - console.log(`[SnsService] 使用 WASM Isaac64 解密视频... Key: ${key}`) const keyText = String(key).trim() let keystream: Buffer @@ -344,9 +341,8 @@ class SnsService { keystream = await wasmService.getKeystream(keyText, 131072) } catch (wasmErr) { // 打包漏带 wasm 或 wasm 初始化异常时,回退到纯 TS ISAAC64 - console.warn(`[SnsService] WASM 解密不可用,回退 Isaac64: ${wasmErr}`) const isaac = new Isaac64(keyText) - keystream = isaac.generateKeystream(131072) + keystream = isaac.generateKeystreamBE(131072) } const decryptLen = Math.min(keystream.length, raw.length) @@ -358,23 +354,16 @@ class SnsService { // 验证 MP4 签名 ('ftyp' at offset 4) const ftyp = raw.subarray(4, 8).toString('ascii') - if (ftyp === 'ftyp') { - console.log(`[SnsService] 视频解密成功: ${url}`) - } else { - console.warn(`[SnsService] 视频解密可能失败: ${url}, 未找到 ftyp 签名: ${ftyp}`) - // 打印前 32 字节用于调试 - console.warn(`[SnsService] Decrypted Header (first 32 bytes): ${raw.subarray(0, 32).toString('hex')}`) + if (ftyp !== 'ftyp') { + // 可以在此处记录解密可能失败的标记,但不打印详细 hex } } catch (err) { console.error(`[SnsService] 视频解密出错: ${err}`) } - } else { - console.warn(`[SnsService] 未提供 Key,跳过解密,直接保存`) } // 写入最终缓存 (覆盖) await writeFile(cachePath, raw) - console.log(`[SnsService] 视频已保存到缓存: ${cachePath}`) // 删除临时文件 try { await import('fs/promises').then(fs => fs.unlink(tmpPath)) } catch (e) { } @@ -444,8 +433,24 @@ class SnsService { // 图片逻辑 const shouldDecrypt = (xEnc === '1' || !!key) && key !== undefined && key !== null && String(key).trim().length > 0 if (shouldDecrypt) { - const decrypted = await wcdbService.decryptSnsImage(raw, String(key)) - decoded = Buffer.from(decrypted) + try { + const keyStr = String(key).trim() + if (/^\d+$/.test(keyStr)) { + // 使用 WASM 版本的 Isaac64 解密图片 + // 修正逻辑:使用带 reverse 且修正了 8字节对齐偏移的 getKeystream + const wasmService = WasmService.getInstance() + const keystream = await wasmService.getKeystream(keyStr, raw.length) + + const decrypted = Buffer.allocUnsafe(raw.length) + for (let i = 0; i < raw.length; i++) { + decrypted[i] = raw[i] ^ keystream[i] + } + + decoded = decrypted + } + } catch (e) { + console.error('[SnsService] TS Decrypt Error:', e) + } } // 写入磁盘缓存 diff --git a/electron/services/wasmService.ts b/electron/services/wasmService.ts index 79575d9..2a5a1ed 100644 --- a/electron/services/wasmService.ts +++ b/electron/services/wasmService.ts @@ -46,7 +46,6 @@ export class WasmService { const wasmPath = path.join(basePath, 'wasm_video_decode.wasm'); const jsPath = path.join(basePath, 'wasm_video_decode.js'); - console.log('[WasmService] Loading WASM from:', wasmPath); if (!fs.existsSync(wasmPath) || !fs.existsSync(jsPath)) { throw new Error(`WASM files not found at ${basePath}`); @@ -88,7 +87,6 @@ export class WasmService { // Define Module mockGlobal.Module = { onRuntimeInitialized: () => { - console.log("[WasmService] WASM Runtime Initialized"); this.wasmLoaded = true; resolve(); }, @@ -133,10 +131,24 @@ export class WasmService { } public async getKeystream(key: string, size: number = 131072): Promise { + // ISAAC-64 uses 8-byte blocks. If size is not a multiple of 8, + // the global reverse() will cause a shift in alignment. + const alignSize = Math.ceil(size / 8) * 8; + const buffer = await this.getRawKeystream(key, alignSize); + + // Reverse the entire aligned buffer + const reversed = new Uint8Array(buffer); + reversed.reverse(); + + // Return exactly the requested size from the beginning of the reversed stream. + // Since we reversed the 'aligned' buffer, index 0 is the last byte of the last block. + return Buffer.from(reversed).subarray(0, size); + } + + public async getRawKeystream(key: string, size: number = 131072): Promise { await this.init(); if (!this.module || !this.module.WxIsaac64) { - // Fallback check for asm.WxIsaac64 logic if needed, but debug showed it on Module if (this.module.asm && this.module.asm.WxIsaac64) { this.module.WxIsaac64 = this.module.asm.WxIsaac64; } @@ -149,26 +161,19 @@ export class WasmService { try { this.capturedKeystream = null; const isaac = new this.module.WxIsaac64(key); - isaac.generate(size); // This triggers the global.wasm_isaac_generate callback + isaac.generate(size); - // Cleanup if possible? isaac.delete()? - // In worker code: p.decryptor.delete() if (isaac.delete) { isaac.delete(); } if (this.capturedKeystream) { - // The worker_release.js logic does: - // p.decryptor_array.set(r.reverse()) - // So the actual keystream is the REVERSE of what is passed to the callback. - const reversed = new Uint8Array(this.capturedKeystream); - reversed.reverse(); - return Buffer.from(reversed); + return Buffer.from(this.capturedKeystream); } else { throw new Error('[WasmService] Failed to capture keystream (callback not called)'); } } catch (error) { - console.error('[WasmService] Error generating keystream:', error); + console.error('[WasmService] Error generating raw keystream:', error); throw error; } } diff --git a/electron/services/wcdbCore.ts b/electron/services/wcdbCore.ts index ca08869..d6634d2 100644 --- a/electron/services/wcdbCore.ts +++ b/electron/services/wcdbCore.ts @@ -66,7 +66,7 @@ export class WcdbCore { private wcdbStopMonitorPipe: any = null private monitorPipeClient: any = null - private wcdbDecryptSnsImage: any = null + private avatarUrlCache: Map = new Map() private readonly avatarCacheTtlMs = 10 * 60 * 1000 @@ -144,42 +144,7 @@ export class WcdbCore { } } - /** - * 解密朋友圈图片 - */ - async decryptSnsImage(encryptedData: Buffer, key: string): Promise { - if (!this.initialized) { - const initOk = await this.initialize() - if (!initOk) return encryptedData - } - if (!this.wcdbDecryptSnsImage) return encryptedData - - try { - if (!this.wcdbDecryptSnsImage) { - console.error('[WCDB] wcdbDecryptSnsImage func is null') - return encryptedData - } - - const outPtr = [null as any] - // Koffi pass Buffer as char* pointer - const result = this.wcdbDecryptSnsImage(encryptedData, encryptedData.length, key, outPtr) - - if (result === 0 && outPtr[0]) { - const hex = this.decodeJsonPtr(outPtr[0]) - if (hex) { - return Buffer.from(hex, 'hex') - } - } else { - console.error(`[WCDB] Decrypt SNS image failed with code: ${result}`) - // 主动获取 DLL 内部日志以诊断问题 - await this.printLogs(true) - } - } catch (e) { - console.error('解密图片失败:', e) - } - return encryptedData - } stopMonitor(): void { if (this.monitorPipeClient) { @@ -602,12 +567,7 @@ export class WcdbCore { this.wcdbVerifyUser = null } - // wcdb_status wcdb_decrypt_sns_image(const char* encrypted_data, int32_t data_len, const char* key, char** out_hex) - try { - this.wcdbDecryptSnsImage = this.lib.func('int32 wcdb_decrypt_sns_image(const char* data, int32 len, const char* key, _Out_ void** outHex)') - } catch { - this.wcdbDecryptSnsImage = null - } + // 初始化 const initResult = this.wcdbInit() diff --git a/electron/services/wcdbService.ts b/electron/services/wcdbService.ts index e0464fc..516c11b 100644 --- a/electron/services/wcdbService.ts +++ b/electron/services/wcdbService.ts @@ -431,12 +431,7 @@ export class WcdbService { return this.callWorker('verifyUser', { message, hwnd }) } - /** - * 解密朋友圈图片 - */ - async decryptSnsImage(encryptedData: Buffer, key: string): Promise { - return this.callWorker('decryptSnsImage', { encryptedData, key }) - } + } diff --git a/electron/wcdbWorker.ts b/electron/wcdbWorker.ts index 9c7c771..a18acc9 100644 --- a/electron/wcdbWorker.ts +++ b/electron/wcdbWorker.ts @@ -150,9 +150,7 @@ if (parentPort) { case 'verifyUser': result = await core.verifyUser(payload.message, payload.hwnd) break - case 'decryptSnsImage': - result = await core.decryptSnsImage(payload.encryptedData, payload.key) - break + default: result = { success: false, error: `Unknown method: ${type}` } } diff --git a/package-lock.json b/package-lock.json index c7110b7..84cdacd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "weflow", - "version": "1.5.4", + "version": "2.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "weflow", - "version": "1.5.4", + "version": "2.0.1", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.5.0", diff --git a/package.json b/package.json index 282c41c..155eeb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weflow", - "version": "1.5.4", + "version": "2.0.1", "description": "WeFlow", "main": "dist-electron/main.js", "author": "cc", diff --git a/src/pages/AnalyticsPage.scss b/src/pages/AnalyticsPage.scss index c45c74e..81102df 100644 --- a/src/pages/AnalyticsPage.scss +++ b/src/pages/AnalyticsPage.scss @@ -482,13 +482,43 @@ margin-top: 16px; } + .exclude-footer-left { + display: flex; + align-items: center; + gap: 12px; + } + .exclude-count { font-size: 12px; color: var(--text-tertiary); } + .btn-text { + display: inline-flex; + align-items: center; + gap: 4px; + background: none; + border: none; + cursor: pointer; + font-size: 12px; + color: var(--text-secondary); + padding: 4px 8px; + border-radius: 6px; + transition: all 0.15s; + + &:hover { + color: var(--primary); + background: var(--primary-light); + } + + &:disabled { + opacity: 0.5; + cursor: not-allowed; + } + } + .exclude-actions { display: flex; gap: 8px; } -} +} \ No newline at end of file diff --git a/src/pages/AnalyticsPage.tsx b/src/pages/AnalyticsPage.tsx index 9e56515..df8a6c7 100644 --- a/src/pages/AnalyticsPage.tsx +++ b/src/pages/AnalyticsPage.tsx @@ -146,6 +146,17 @@ function AnalyticsPage() { }) } + const toggleInvertSelection = () => { + setDraftExcluded((prev) => { + const allUsernames = new Set(excludeCandidates.map(c => normalizeUsername(c.username))) + const inverted = new Set() + for (const u of allUsernames) { + if (!prev.has(u)) inverted.add(u) + } + return inverted + }) + } + const handleApplyExcluded = async () => { const payload = Array.from(draftExcluded) setIsExcludeDialogOpen(false) @@ -493,7 +504,12 @@ function AnalyticsPage() { )}
- 已排除 {draftExcluded.size} 人 +
+ 已排除 {draftExcluded.size} 人 + +
-
- - 用于朋友圈在线图片原生解密,优先使用这里配置的 DLL - { - const value = e.target.value - setWeixinDllPath(value) - scheduleConfigSave('weixinDllPath', () => configService.setWeixinDllPath(value)) - }} - /> -
- - -
-
+
diff --git a/src/services/config.ts b/src/services/config.ts index 684bdcf..089a78e 100644 --- a/src/services/config.ts +++ b/src/services/config.ts @@ -12,7 +12,7 @@ export const CONFIG_KEYS = { LAST_SESSION: 'lastSession', WINDOW_BOUNDS: 'windowBounds', CACHE_PATH: 'cachePath', - WEIXIN_DLL_PATH: 'weixinDllPath', + EXPORT_PATH: 'exportPath', AGREEMENT_ACCEPTED: 'agreementAccepted', LOG_ENABLED: 'logEnabled', @@ -163,16 +163,7 @@ export async function setCachePath(path: string): Promise { } -// 获取 Weixin.dll 路径 -export async function getWeixinDllPath(): Promise { - const value = await config.get(CONFIG_KEYS.WEIXIN_DLL_PATH) - return value as string | null -} -// 设置 Weixin.dll 路径 -export async function setWeixinDllPath(path: string): Promise { - await config.set(CONFIG_KEYS.WEIXIN_DLL_PATH, path) -} // 获取导出路径 export async function getExportPath(): Promise {