From 686acdd7c5c6716d6c31ea43c39f60f6b51453ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Sun, 15 Sep 2024 10:31:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/github.ts | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/electron/api/github.ts b/electron/api/github.ts
index 14dcaa6..41ec5d4 100644
--- a/electron/api/github.ts
+++ b/electron/api/github.ts
@@ -134,25 +134,29 @@ export const initGitHubApi = () => {
         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();

From 6d5f985dfe8fe5f04e9446c2ea0ded46a817ae83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Sun, 15 Sep 2024 10:47:48 +0800
Subject: [PATCH 2/6] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/proxy/index.vue | 66 +++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/views/proxy/index.vue b/src/views/proxy/index.vue
index 59bf7d5..0519298 100644
--- a/src/views/proxy/index.vue
+++ b/src/views/proxy/index.vue
@@ -1,5 +1,12 @@
 <script lang="ts" setup>
-import { defineComponent, onMounted, onUnmounted, reactive, ref } from "vue";
+import {
+  computed,
+  defineComponent,
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref
+} from "vue";
 import Breadcrumb from "@/layout/compoenets/Breadcrumb.vue";
 import { ElMessage, FormInstance, FormRules } from "element-plus";
 import { ipcRenderer } from "electron";
@@ -7,6 +14,7 @@ import { clone } from "@/utils/clone";
 import { useDebounceFn } from "@vueuse/core";
 import IconifyIconOffline from "@/components/IconifyIcon/src/iconifyIconOffline";
 import commonIps from "./commonIp.json";
+import router from "@/router";
 
 defineComponent({
   name: "Proxy"
@@ -133,6 +141,38 @@ const editFormRules = reactive<FormRules>({
  */
 const editFormRef = ref<FormInstance>();
 
+const isTcp = computed(() => {
+  return editForm.value.type === "tcp";
+});
+
+const isUdp = computed(() => {
+  return editForm.value.type === "udp";
+});
+
+const isHttp = computed(() => {
+  return editForm.value.type === "http";
+});
+
+const isHttps = computed(() => {
+  return editForm.value.type === "https";
+});
+
+const isStcp = computed(() => {
+  return editForm.value.type === "stcp";
+});
+
+const isStcpVisited = computed(() => {
+  return (
+    editForm.value.type === "stcp" && editForm.value.stcpModel === "visited"
+  );
+});
+
+const isStcpVisitors = computed(() => {
+  return (
+    editForm.value.type === "stcp" && editForm.value.stcpModel === "visitors"
+  );
+});
+
 const handleGetPortCount = (portString: string) => {
   let count = 0;
   const portRanges = portString.split(",");
@@ -618,7 +658,7 @@ onUnmounted(() => {
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <template v-if="editForm.type === 'stcp'">
+          <template v-if="isStcp">
             <el-col :span="12">
               <el-form-item label="stcp模式：" prop="stcpModel">
                 <el-radio-group v-model="editForm.stcpModel">
@@ -665,7 +705,7 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="editForm.stcpModel === 'visitors' ? 12 : 24">
+          <el-col :span="isStcpVisitors ? 12 : 24">
             <el-form-item label="代理名称：" prop="name">
               <el-input
                 v-model="editForm.name"
@@ -674,12 +714,7 @@ onUnmounted(() => {
               />
             </el-form-item>
           </el-col>
-          <template
-            v-if="
-              editForm.type !== 'stcp' ||
-              (editForm.type === 'stcp' && editForm.stcpModel === 'visited')
-            "
-          >
+          <template v-if="!isStcp || isStcpVisited">
             <el-col :span="12">
               <el-form-item label="内网地址：" prop="localIp">
                 <el-autocomplete
@@ -698,7 +733,7 @@ onUnmounted(() => {
             <el-col :span="12">
               <el-form-item label="内网端口：" prop="localPort">
                 <el-input-number
-                  v-if="editForm.type === 'http' || editForm.type === 'https'"
+                  v-if="isHttp || isHttps"
                   placeholder="8080"
                   class="local-port-input"
                   :min="0"
@@ -727,7 +762,8 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <template v-if="editForm.type === 'tcp' || editForm.type === 'udp'">
+          <template v-if="isHttp || isHttps"></template>
+          <template v-if="isTcp || isUdp">
             <el-col :span="8">
               <el-form-item label="外网端口：" prop="remotePort">
                 <!--                <el-input-number-->
@@ -745,9 +781,7 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <template
-            v-if="editForm.type === 'http' || editForm.type === 'https'"
-          >
+          <template v-if="isHttp || isHttps">
             <el-col :span="24">
               <el-form-item
                 v-for="(d, di) in editForm.customDomains"
@@ -832,9 +866,7 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <template
-            v-if="editForm.type === 'stcp' && editForm.stcpModel === 'visitors'"
-          >
+          <template v-if="isStcpVisitors">
             <el-col :span="12">
               <el-form-item label="被访问者代理名称：" prop="serverName">
                 <el-input

From 139fed40d870b5567559f3f27ab8814c8d0210f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 25 Sep 2024 10:20:37 +0800
Subject: [PATCH 3/6] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/github.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/electron/api/github.ts b/electron/api/github.ts
index 41ec5d4..ed80d20 100644
--- a/electron/api/github.ts
+++ b/electron/api/github.ts
@@ -127,13 +127,15 @@ 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}`
-        );
         if (versions) {
           const returnVersionsData = versions
             .filter(f => getAdaptiveAsset(f.id))

From f788990705dc011b9105b0652124eeca652053f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 25 Sep 2024 10:21:29 +0800
Subject: [PATCH 4/6] =?UTF-8?q?:bug:=20=E5=90=AF=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=92=8C=E6=94=AF=E6=8C=81=20http=20Basic=E3=80=81?=
 =?UTF-8?q?=E5=AD=90=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/api/frpc.ts       |  20 +++++-
 src/views/config/index.vue |   1 +
 src/views/proxy/index.vue  | 133 +++++++++++++++++++++++++++++--------
 types/global.d.ts          |   6 +-
 4 files changed, 130 insertions(+), 30 deletions(-)

diff --git a/electron/api/frpc.ts b/electron/api/frpc.ts
index be3452c..740b63c 100644
--- a/electron/api/frpc.ts
+++ b/electron/api/frpc.ts
@@ -35,8 +35,8 @@ const getFrpcVersionWorkerPath = (
 
 const isRangePort = (m: Proxy) => {
   return (
-    (m.localPort.indexOf("-") !== -1 || m.localPort.indexOf(",") !== -1) &&
-    (m.type === "tcp" || m.type === "udp")
+    (m.type === "tcp" || m.type === "udp") &&
+    (m.localPort.indexOf("-") !== -1 || m.localPort.indexOf(",") !== -1)
   );
 };
 
@@ -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") {
@@ -204,7 +211,7 @@ export const genIniConfig = (config: FrpConfig, proxys: Proxy[]) => {
   const proxyIni = proxys.map(m => {
     const rangePort = isRangePort(m);
     let ini = `
-[${rangePort ? 'range:' : ''}${m.name}]
+[${rangePort ? "range:" : ""}${m.name}]
 type = "${m.type}"
 `;
     switch (m.type) {
@@ -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/src/views/config/index.vue b/src/views/config/index.vue
index 2502bec..61e00ed 100644
--- a/src/views/config/index.vue
+++ b/src/views/config/index.vue
@@ -537,6 +537,7 @@ onUnmounted(() => {
                   placeholder="token"
                   type="password"
                   v-model="formData.authToken"
+                  :show-password="true"
                 />
               </el-form-item>
             </el-col>
diff --git a/src/views/proxy/index.vue b/src/views/proxy/index.vue
index 0519298..7af4daa 100644
--- a/src/views/proxy/index.vue
+++ b/src/views/proxy/index.vue
@@ -57,7 +57,11 @@ const defaultForm = ref<Proxy>({
   secretKey: "",
   bindAddr: "",
   bindPort: null,
-  status: true
+  status: true,
+  subdomain: "",
+  basicAuth: false,
+  httpUser: "",
+  httpPassword: ""
 });
 
 /**
@@ -133,7 +137,12 @@ const editFormRules = reactive<FormRules>({
       trigger: "blur"
     }
   ],
-  bindPort: [{ required: true, message: "请输入绑定的端口", trigger: "blur" }]
+  bindPort: [{ required: true, message: "请输入绑定的端口", trigger: "blur" }],
+  basicAuth: [
+    { required: true, message: "请选择是否开启HTTP基本认证", trigger: "blur" }
+  ],
+  httpUser: [{ required: true, message: "请输入认证用户名", trigger: "blur" }],
+  httpPassword: [{ required: true, message: "请输入认证密码", trigger: "blur" }]
 });
 
 /**
@@ -192,6 +201,9 @@ const handleGetPortCount = (portString: string) => {
 };
 
 const handleRangePort = () => {
+  if (isHttp || isHttps) {
+    return false;
+  }
   if (editForm.value.localPort.indexOf("-") !== -1) {
     return true;
   }
@@ -631,13 +643,20 @@ onUnmounted(() => {
       </div>
     </div>
 
-    <el-dialog
-      v-model="edit.visible"
+    <el-drawer
       :title="edit.title"
-      class="sm:w-[500px] md:w-[600px] lg:w-[800px]"
-      top="5%"
+      v-model="edit.visible"
+      direction="rtl"
+      size="60%"
       @close="editForm = defaultForm"
     >
+      <!--    <el-dialog-->
+      <!--      v-model="edit.visible"-->
+      <!--      :title="edit.title"-->
+      <!--      class="sm:w-[500px] md:w-[600px] lg:w-[800px]"-->
+      <!--      top="5%"-->
+      <!--      @close="editForm = defaultForm"-->
+      <!--    >-->
       <el-form
         v-loading="loading.form"
         label-position="top"
@@ -693,7 +712,7 @@ onUnmounted(() => {
                           </template>
                         </el-popover>
                       </div>
-                      共享密钥：
+                       共享密钥：
                     </div>
                   </div>
                 </template>
@@ -701,6 +720,7 @@ onUnmounted(() => {
                   type="password"
                   v-model="editForm.secretKey"
                   placeholder="密钥"
+                  :show-password="true"
                 />
               </el-form-item>
             </el-col>
@@ -762,7 +782,6 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
-          <template v-if="isHttp || isHttps"></template>
           <template v-if="isTcp || isUdp">
             <el-col :span="8">
               <el-form-item label="外网端口：" prop="remotePort">
@@ -781,6 +800,44 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
+          <template v-if="isHttp || isHttps">
+            <el-col :span="12">
+              <el-form-item label="子域名：" prop="remotePort">
+                <template #label>
+                  <div class="inline-block">
+                    <div class="flex items-center">
+                      <div class="mr-1">
+                        <el-popover
+                          placement="top"
+                          trigger="hover"
+                          :width="180"
+                        >
+                          <template #default>
+                            对应参数：<span class="font-black text-[#5A3DAA]"
+                              >subdomain</span
+                            >
+                          </template>
+                          <template #reference>
+                            <IconifyIconOffline
+                              class="text-base"
+                              color="#5A3DAA"
+                              icon="info"
+                            />
+                          </template>
+                        </el-popover>
+                      </div>
+                      子域名：
+                    </div>
+                  </div>
+                </template>
+                <el-input
+                  class="w-full"
+                  placeholder="subdomain"
+                  v-model="editForm.subdomain"
+                />
+              </el-form-item>
+            </el-col>
+          </template>
           <template v-if="isHttp || isHttps">
             <el-col :span="24">
               <el-form-item
@@ -824,23 +881,6 @@ onUnmounted(() => {
                       自定义域名：
                     </div>
                   </div>
-                  <!--                  <el-popover-->
-                  <!--                      placement="top"-->
-                  <!--                      trigger="hover"-->
-                  <!--                  >-->
-                  <!--                    <template #default>-->
-                  <!--                      对应参数：<span class="font-black text-[#5A3DAA]">customDomains</span>-->
-                  <!--                    </template>-->
-                  <!--                    <template #reference>-->
-                  <!--                      <IconifyIconOffline class="text-base" color="#5A3DAA" icon="info"/>-->
-                  <!--                    </template>-->
-                  <!--                  </el-popover>-->
-                  <!--                  <div class="flex items-center inin">-->
-                  <!--                    <div class="h-full flex items-center mr-1">-->
-                  <!--                      -->
-                  <!--                    </div>-->
-                  <!--                    <div>自定义域名：</div>-->
-                  <!--                  </div>-->
                 </template>
                 <el-input
                   class="domain-input"
@@ -866,6 +906,38 @@ onUnmounted(() => {
               </el-form-item>
             </el-col>
           </template>
+          <template v-if="isHttp || isHttps">
+            <el-col :span="24">
+              <el-form-item label="HTTP基本认证：" prop="basicAuth">
+                <el-switch
+                  active-text="开"
+                  inline-prompt
+                  inactive-text="关"
+                  v-model="editForm.basicAuth"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="editForm.basicAuth">
+              <el-form-item label="认证用户名：" prop="httpUser">
+                <el-input
+                  class="w-full"
+                  placeholder="httpUser"
+                  v-model="editForm.httpUser"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="editForm.basicAuth">
+              <el-form-item label="认证密码：" prop="httpPassword">
+                <el-input
+                  type="password"
+                  class="w-full"
+                  placeholder="httpPassword"
+                  v-model="editForm.httpPassword"
+                  :show-password="true"
+                />
+              </el-form-item>
+            </el-col>
+          </template>
           <template v-if="isStcpVisitors">
             <el-col :span="12">
               <el-form-item label="被访问者代理名称：" prop="serverName">
@@ -982,7 +1054,8 @@ onUnmounted(() => {
           </el-col>
         </el-row>
       </el-form>
-    </el-dialog>
+    </el-drawer>
+    <!--    </el-dialog>-->
 
     <el-dialog v-model="listPortsVisible" title="内网端口" width="600" top="5%">
       <el-table
@@ -1055,4 +1128,12 @@ onUnmounted(() => {
   margin-left: 10px;
   cursor: pointer;
 }
+
+:deep(.el-drawer__header) {
+  margin-bottom: 10px;
+}
+
+:deep(.el-drawer__body) {
+  //padding-top: 0;
+}
 </style>
diff --git a/types/global.d.ts b/types/global.d.ts
index 61d65f0..d9ea7da 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -26,7 +26,11 @@ declare global {
         secretKey: string;
         bindAddr: string;
         bindPort: number;
-        status: boolean
+        status: boolean;
+        subdomain: string;
+        basicAuth: boolean;
+        httpUser: string;
+        httpPassword: string;
     };
 
     /**

From 0c1d6919ecaa1bce596d2c3a6a4e1b59cf7eeebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 25 Sep 2024 10:24:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?:dizzy:=20=E4=BF=AE=E6=94=B9=20logo?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/compoenets/LeftMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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(() => {
     <div class="logo-container">
       <img
         src="/logo/only/128x128.png"
-        class="logo animate__animated animate__flip"
+        class="logo animate__animated animate__bounceInLeft"
         alt="Logo"
       />
     </div>

From d57e6f41ed3ec3a522adee76779fb48234ed1a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E4=BC=9F?= <8473136@qq.com>
Date: Wed, 25 Sep 2024 10:25:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?:lipstick:=20=E4=BF=AE=E5=A4=8D=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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: {