diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5e1f2d..b12e560 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,12 +61,12 @@ jobs: npx tsc npx vite build - - name: Package and Publish macOS arm64 (unsigned DMG) + - name: Package and Publish macOS arm64 (unsigned DMG + ZIP) env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} CSC_IDENTITY_AUTO_DISCOVERY: "false" run: | - npx electron-builder --mac dmg --arm64 --publish always + npx electron-builder --mac --arm64 --publish always release-linux: runs-on: ubuntu-latest diff --git a/electron/main.ts b/electron/main.ts index 8f37dca..ec91a8b 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1300,7 +1300,7 @@ function registerIpcHandlers() { try { console.log('[Update] 开始下载更新...') await autoUpdater.downloadUpdate() - } catch (error) { + } catch (error: any) { console.error('[Update] 下载更新失败:', error) // 失败时清理状态和监听器 isDownloadInProgress = false @@ -1312,7 +1312,10 @@ function registerIpcHandlers() { autoUpdater.removeListener('update-downloaded', downloadedHandler) downloadedHandler = null } - throw error + + // 统一错误提示格式,避免出现 [object Object] 的 JSON 字符串 + const errorMessage = error.message || (typeof error === 'string' ? error : JSON.stringify(error)) + throw new Error(errorMessage) } }) @@ -2636,19 +2639,19 @@ function registerIpcHandlers() { // 密钥获取 ipcMain.handle('key:autoGetDbKey', async (event) => { - return keyService.autoGetDbKey(180_000, (message, level) => { + return keyService.autoGetDbKey(180_000, (message: string, level: number) => { event.sender.send('key:dbKeyStatus', { message, level }) }) }) ipcMain.handle('key:autoGetImageKey', async (event, manualDir?: string, wxid?: string) => { - return keyService.autoGetImageKey(manualDir, (message) => { + return keyService.autoGetImageKey(manualDir, (message: string) => { event.sender.send('key:imageKeyStatus', { message }) }, wxid) }) ipcMain.handle('key:scanImageKeyFromMemory', async (event, userDir: string) => { - return keyService.autoGetImageKeyByMemoryScan(userDir, (message) => { + return keyService.autoGetImageKeyByMemoryScan(userDir, (message: string) => { event.sender.send('key:imageKeyStatus', { message }) }) }) diff --git a/resources/xkey_helper b/resources/xkey_helper_macos old mode 100755 new mode 100644 similarity index 61% rename from resources/xkey_helper rename to resources/xkey_helper_macos index 8158ce5..e1a9f35 Binary files a/resources/xkey_helper and b/resources/xkey_helper_macos differ diff --git a/temp_assets.json b/temp_assets.json new file mode 100644 index 0000000..a30f1de Binary files /dev/null and b/temp_assets.json differ