From 4e9f95ba7ed6ae46daa9aed1068b3434c06c3715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Tue, 6 Aug 2024 10:57:42 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8DMacOS=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/github.ts             | 18 ++++++++++++------
 electron/main/index.ts             |  5 +++--
 package.json                       |  2 +-
 src/layout/compoenets/LeftMenu.vue |  2 +-
 src/views/download/index.vue       |  5 +++++
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/electron/api/github.ts b/electron/api/github.ts
index f7e6ddf..1209ef3 100644
--- a/electron/api/github.ts
+++ b/electron/api/github.ts
@@ -14,9 +14,15 @@ const versionRelation = {
     "win32_arm64": ["window", "arm64"],
     "win32_ia32": ["window", "386"],
     "darwin_arm64": ["darwin", "arm64"],
+    "darwin_x64": ["darwin", "amd64"],
     // "darwin_arm64": ["window", "amd64"],
     "darwin_amd64": ["darwin", "amd64"],
 }
+const platform = process.platform;
+const arch = process.arch;
+let currArch = `${platform}_${arch}`
+// currArch = `darwin_x64`
+const frpArch = versionRelation[currArch]
 
 const unTarGZ = (tarGzPath: string, targetPath: string) => {
     const tar = require("tar");
@@ -77,11 +83,10 @@ export const initGitHubApi = () => {
 
     const getAdaptiveAsset = versionId => {
         const {assets} = getVersion(versionId);
-        const arch = process.arch;
-        const platform = process.platform;
         const asset = assets.find(
             f => {
-                const a = versionRelation[`${platform}_${arch}`]
+                // const a = versionRelation[currArch]
+                const a = frpArch
                 if (a) {
                     const flag = a.every(item => f.name.includes(item))
                     return flag;
@@ -113,6 +118,7 @@ export const initGitHubApi = () => {
                 // const borderContent: Electron.WebContents =
                 //   BrowserWindow.getFocusedWindow().webContents;
                 const downloadPath = path.join(app.getPath("userData"), "download");
+                log.info(`开始获取frp版本 当前架构：${currArch} 对应frp架构：${frpArch}`)
                 const returnVersionsData = versions
                     .filter(f => getAdaptiveAsset(f.id))
                     .map(m => {
@@ -124,7 +130,7 @@ export const initGitHubApi = () => {
                         }
                         return m;
                     });
-                log.debug(`获取到frp版本：${JSON.stringify(returnVersionsData)}`)
+                // log.debug(`获取到frp版本：${JSON.stringify(returnVersionsData)}`)
                 event.reply("Download.frpVersionHook", returnVersionsData);
             });
         });
@@ -137,8 +143,8 @@ export const initGitHubApi = () => {
     ipcMain.on("github.download", async (event, args) => {
         const version = getVersion(args);
         const asset = getAdaptiveAsset(args);
-        log.info(`开始下载frp version：${version} asset：${asset}`)
         const {browser_download_url} = asset;
+        log.info(`开始下载frp url：${browser_download_url} asset：${asset.name}`)
         // 数据目录
         await download(BrowserWindow.getFocusedWindow(), browser_download_url, {
             filename: `${asset.name}`,
@@ -150,7 +156,7 @@ export const initGitHubApi = () => {
                 });
             },
             onCompleted: () => {
-                log.info(`frp下载完成 version：${version} asset：${asset}`)
+                log.info(`frp下载完成 url：${browser_download_url} asset：${asset.name}`)
                 const targetPath = path.resolve(path.join(app.getPath("userData"), "frp"));
                 const ext = path.extname(asset.name)
                 let frpcVersionPath = ""
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 39d8c66..02b445d 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -117,7 +117,7 @@ async function createWindow() {
 }
 
 export const createTray = () => {
-    log.info(`当前环境 platform：${process.platform} arch：${process.arch}`)
+    log.info(`当前环境 platform：${process.platform} arch：${process.arch} appData：${app.getPath("userData")}`)
     let menu: Array<(MenuItemConstructorOptions) | (MenuItem)> = [
         {
             label: '显示主窗口', click: function () {
@@ -214,7 +214,8 @@ ipcMain.handle("open-win", (_, arg) => {
 });
 
 ipcMain.on('open-url', (event, url) => {
-    shell.openExternal(url).then(r => {});
+    shell.openExternal(url).then(r => {
+    });
 });
 
 initGitHubApi();
diff --git a/package.json b/package.json
index f953501..db57926 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Frpc-Desktop",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "dist-electron/main/index.js",
   "description": "一个frpc桌面客户端",
   "repository": "https://github.com/luckjiawei/frpc-desktop",
diff --git a/src/layout/compoenets/LeftMenu.vue b/src/layout/compoenets/LeftMenu.vue
index faf9090..fd06adf 100644
--- a/src/layout/compoenets/LeftMenu.vue
+++ b/src/layout/compoenets/LeftMenu.vue
@@ -69,7 +69,7 @@ onMounted(() => {
       </li>
     </ul>
     <div class="version mb-2 animate__animated" @click="handleOpenGitHubReleases">
-      v1.0.4
+      v1.0.5
     </div>
   </div>
 </template>
diff --git a/src/views/download/index.vue b/src/views/download/index.vue
index d41afe0..4b68fb1 100644
--- a/src/views/download/index.vue
+++ b/src/views/download/index.vue
@@ -114,6 +114,11 @@ onUnmounted(() => {
 <template>
   <div class="main">
     <breadcrumb/>
+    <!--    <breadcrumb>-->
+    <!--      <div class="flex items-center">-->
+    <!--        <el-checkbox>加速下载</el-checkbox>-->
+    <!--      </div>-->
+    <!--    </breadcrumb>-->
     <div class="app-container-breadcrumb pr-2" v-loading="loading > 0">
       <template v-if="versions && versions.length > 0">
         <div