Update main.py

main.py

@@ -171,19 +171,138 @@ remotePort = 8188
 
 
 def install_frp():
-    frp_tar_path = os.path.join(REPO_PATH, "frp_0.61.0_linux_amd64.tar.gz")
-    frp_install_path = os.path.join(REPO_PATH, "frp_0.61.0_linux_amd64")
+    FRP_VERSION = "0.69.0"
+
+    frp_tar_name = f"frp_{FRP_VERSION}_linux_amd64.tar.gz"
+
+    frp_tar_path = os.path.join(REPO_PATH, frp_tar_name)
+
+    frp_install_path = os.path.join(
+        REPO_PATH,
+        f"frp_{FRP_VERSION}_linux_amd64"
+    )
 
     frp_download_urls = [
-        "https://github.com/fatedier/frp/releases/download/v0.61.0/frp_0.61.0_linux_amd64.tar.gz",
-        "https://gh.llkk.cc/https://github.com/fatedier/frp/releases/download/v0.61.0/frp_0.61.0_linux_amd64.tar.gz",
-        "https://gh-proxy.com/https://github.com/fatedier/frp/releases/download/v0.61.0/frp_0.61.0_linux_amd64.tar.gz"
+        f"https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
+        f"https://gh.llkk.cc/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
+        f"https://gh-proxy.com/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}"
     ]
 
     if os.path.exists(frp_install_path):
         print(f"frp 已安装: {frp_install_path}")
         return True
 
+    def is_valid_tar_gz(path):
+        if not os.path.exists(path):
+            return False
+
+        try:
+            result = subprocess.run(
+                ["tar", "-tzf", path],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True
+            )
+
+            return result.returncode == 0
+
+        except Exception:
+            return False
+
+    # =========================
+    # 删除损坏文件
+    # =========================
+    if os.path.exists(frp_tar_path):
+        if not is_valid_tar_gz(frp_tar_path):
+            print("检测到损坏的 frp 压缩包，正在删除...")
+            os.remove(frp_tar_path)
+
+    # =========================
+    # 下载 frp
+    # =========================
+    if not os.path.exists(frp_tar_path):
+        print("开始下载 frp...")
+
+        download_success = False
+
+        for url in frp_download_urls:
+            try:
+                print(f"尝试下载: {url}")
+
+                result = subprocess.run(
+                    [
+                        "wget",
+                        "--no-check-certificate",
+                        "-O",
+                        frp_tar_path,
+                        url
+                    ],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True
+                )
+
+                if result.returncode == 0 and is_valid_tar_gz(frp_tar_path):
+                    print("frp 下载成功。")
+                    download_success = True
+                    break
+
+                print("下载失败或文件损坏，尝试下一个下载源。")
+
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
+
+            except Exception as e:
+                print(f"下载异常: {e}")
+
+        if not download_success:
+            print("frp 下载失败。")
+            return False
+
+    # =========================
+    # 解压 frp
+    # =========================
+    try:
+        print(f"正在解压 frp 到 {REPO_PATH}...")
+
+        subprocess.run(
+            [
+                "tar",
+                "-xzf",
+                frp_tar_path,
+                "-C",
+                REPO_PATH
+            ],
+            check=True
+        )
+
+        frpc_path = os.path.join(
+            frp_install_path,
+            "frpc"
+        )
+
+        frps_path = os.path.join(
+            frp_install_path,
+            "frps"
+        )
+
+        subprocess.run(
+            ["chmod", "+x", frpc_path],
+            check=False
+        )
+
+        subprocess.run(
+            ["chmod", "+x", frps_path],
+            check=False
+        )
+
+        print("frp 安装成功！")
+        return True
+
+    except subprocess.CalledProcessError as e:
+        print(f"解压 frp 时出错: {e}")
+        return False
+
     def is_valid_tar_gz(path):
         if not os.path.exists(path):
             return False