diff --git a/app/main/handlers/mitm.js b/app/main/handlers/mitm.js index d48e846a40..d68134c068 100644 --- a/app/main/handlers/mitm.js +++ b/app/main/handlers/mitm.js @@ -2,16 +2,16 @@ const {ipcMain} = require("electron"); const DNS = require("dns"); -module.exports = (win, originGetClient) => { - let mitmClient = undefined; - - function getClient() { - if (!mitmClient) { - mitmClient = originGetClient(true) - return mitmClient - } - return mitmClient - } +// module.exports = (win, originGetClient) => { +module.exports = (win, getClient) => { + // let mitmClient = undefined; + // function getClient() { + // if (!mitmClient) { + // mitmClient = originGetClient(true) + // return mitmClient + // } + // return mitmClient + // } let stream; let currentPort; diff --git a/app/renderer/src/main/src/components/YakUpgrade.tsx b/app/renderer/src/main/src/components/YakUpgrade.tsx index a267eccc9c..1b84169a73 100644 --- a/app/renderer/src/main/src/components/YakUpgrade.tsx +++ b/app/renderer/src/main/src/components/YakUpgrade.tsx @@ -2,6 +2,7 @@ import React, {useEffect, useState} from "react"; import {Alert, Button, Card, Modal, Popconfirm, Popover, Progress, Space, Spin, Tag, Typography} from "antd"; import {failed, info, success} from "../utils/notification"; import {yakProcess} from "../protected/YakLocalProcess"; +import {showModal} from "../utils/showModal"; const {ipcRenderer} = window.require("electron"); @@ -40,6 +41,8 @@ export const YakUpgrade: React.FC = (props) => { const [winPath, setWinPath] = useState(""); const [platformArch, setPlatformArch] = useState(""); + const latestVersionWithoutV = latestVersion.startsWith("v") ? latestVersion.slice(1) : latestVersion; + const queryLatestVersion = () => { setLatestLoading(true) ipcRenderer.invoke("query-latest-yak-version").then((data: string) => { @@ -158,9 +161,11 @@ export const YakUpgrade: React.FC = (props) => { - 当前最新的 Yak 引擎版本为 - {latestVersion} + message={ + + 当前最新的 Yak 引擎版本为 + {latestVersion} + }/> @@ -189,6 +194,35 @@ export const YakUpgrade: React.FC = (props) => { + {downloadProgress && = (props) => { failed("MITM 劫持服务器异常或被关闭") Modal.error({ mask: true, title: "启动 MITM 服务器 ERROR!", - content: <>{error} + content: <>{msg} }) } ipcRenderer.invoke("mitm-stop-call")