diff --git a/electron/api/frpc.ts b/electron/api/frpc.ts index b1f092a..740b63c 100644 --- a/electron/api/frpc.ts +++ b/electron/api/frpc.ts @@ -82,7 +82,14 @@ remotePort = ${m.remotePort} localIP = "${m.localIp}" localPort = ${m.localPort} customDomains=[${m.customDomains.map(m => `"${m}"`)}] +subdomain="${m.subdomain}" `; + if (m.basicAuth) { + toml += ` +httpUser = "${m.httpUser}" +httpPassword = "${m.httpPassword}" +`; + } break; case "stcp": if (m.stcpModel === "visitors") { @@ -222,7 +229,14 @@ remote_port = ${m.remotePort} local_ip = "${m.localIp}" local_port = ${m.localPort} custom_domains=[${m.customDomains.map(m => `"${m}"`)}] +subdomain="${m.subdomain}" `; + if (m.basicAuth) { + ini += ` +httpUser = "${m.httpUser}" +httpPassword = "${m.httpPassword}" +`; + } break; case "stcp": if (m.stcpModel === "visitors") { diff --git a/electron/api/github.ts b/electron/api/github.ts index 14dcaa6..ed80d20 100644 --- a/electron/api/github.ts +++ b/electron/api/github.ts @@ -127,32 +127,38 @@ export const initGitHubApi = () => { responseData = Buffer.concat([responseData, data]); }); response.on("end", () => { - versions = JSON.parse(responseData.toString()); + log.info( + `开始获取frp版本 当前架构:${currArch} 对应frp架构:${frpArch} 状态码:${response.statusCode}` + ); + const downloadPath = path.join(app.getPath("userData"), "download"); + if (response.statusCode === 200) { + versions = JSON.parse(responseData.toString()); + } // 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 => { - const asset = getAdaptiveAsset(m.id); - const download_count = m.assets.reduce( - (sum, item) => sum + item.download_count, - 0 - ); - if (asset) { - const absPath = `${downloadPath}/${asset.name}`; - m.absPath = absPath; - m.download_completed = fs.existsSync(absPath); - m.download_count = download_count; - m.size = formatBytes(asset.size); - } - return m; - }); - // log.debug(`获取到frp版本:${JSON.stringify(returnVersionsData)}`) - event.reply("Download.frpVersionHook", returnVersionsData); + if (versions) { + const returnVersionsData = versions + .filter(f => getAdaptiveAsset(f.id)) + .map(m => { + const asset = getAdaptiveAsset(m.id); + const download_count = m.assets.reduce( + (sum, item) => sum + item.download_count, + 0 + ); + if (asset) { + const absPath = `${downloadPath}/${asset.name}`; + m.absPath = absPath; + m.download_completed = fs.existsSync(absPath); + m.download_count = download_count; + m.size = formatBytes(asset.size); + } + return m; + }); + // log.debug(`获取到frp版本:${JSON.stringify(returnVersionsData)}`) + event.reply("Download.frpVersionHook", returnVersionsData); + } else { + event.reply("Download.frpVersionHook", []); + } }); }); request.end(); diff --git a/electron/main/index.ts b/electron/main/index.ts index 959b7e4..2a49ae9 100644 --- a/electron/main/index.ts +++ b/electron/main/index.ts @@ -59,8 +59,8 @@ async function createWindow() { icon: join(process.env.VITE_PUBLIC, "logo/only/16x16.png"), width: 800, height: 600, - minWidth: 640, - minHeight: 480, + minWidth: 800, + minHeight: 600, maxWidth: 1280, maxHeight: 960, webPreferences: { diff --git a/src/layout/compoenets/LeftMenu.vue b/src/layout/compoenets/LeftMenu.vue index 84c3001..448e096 100644 --- a/src/layout/compoenets/LeftMenu.vue +++ b/src/layout/compoenets/LeftMenu.vue @@ -95,7 +95,7 @@ onMounted(() => {