Update Gpt-Sovits.py

Gpt-Sovits.py

@@ -124,22 +124,50 @@ def install_dependencies():
 def NPS():
     print("启动NPS")
     os.system(f"/tmp/code/nps-Copy1/npc -server={NPS_server} -vkey={NPS_key} -type=tcp")
+import subprocess
+import threading
+import time
+
 def run_ngrok():
     print('-----执行ngrok-------')
+    
+    # 定义要执行的命令
     commands = [
-    "curl -sSL https://ngrok-agent.s3.amazonaws.com/ngrok.asc | tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null",
-    "echo 'deb https://ngrok-agent.s3.amazonaws.com buster main' | tee /etc/apt/sources.list.d/ngrok.list",
-    "apt update",
-    "apt install -y ngrok"
-]
-    subprocess.run(command, shell=True, check=True)
-    subprocess.run(['ngrok', 'config', 'add-authtoken','2sWuZRgGWJHAgUC8dYumdkMe9Ma_3scefrNvGn1Qitmwb3g2n'], check=True)
-    # os.system('ngrok config add-authtoken 2sWuZRgGWJHAgUC8dYumdkMe9Ma_3scefrNvGn1Qitmwb3g2n')
+        "curl -sSL https://ngrok-agent.s3.amazonaws.com/ngrok.asc | tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null",
+        "echo 'deb https://ngrok-agent.s3.amazonaws.com buster main' | tee /etc/apt/sources.list.d/ngrok.list",
+        "apt update",
+        "apt install -y ngrok"
+    ]
+    
+    # 执行每个命令
+    for command in commands:
+        try:
+            print(f"执行命令: {command}")
+            subprocess.run(command, shell=True, check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"命令执行失败: {e}")
+            return  # 出现错误时，停止执行后续操作
+
+    # 添加 ngrok 的认证令牌
+    try:
+        print("添加 ngrok 认证令牌")
+        subprocess.run(['ngrok', 'config', 'add-authtoken', '2sWuZRgGWJHAgUC8dYumdkMe9Ma_3scefrNvGn1Qitmwb3g2n'], check=True)
+    except subprocess.CalledProcessError as e:
+        print(f"添加认证令牌失败: {e}")
+        return
+
+    # 启动 ngrok
     while True:
-        subprocess.run(['ngrok', 'http', '--url=polecat-neutral-certainly.ngrok-free.app','9880'], check=True)
-        # os.system('ngrok http --url=polecat-neutral-certainly.ngrok-free.app 9880')
+        try:
+            print("启动 ngrok http")
+            subprocess.run(['ngrok', 'http', '--url=polecat-neutral-certainly.ngrok-free.app', '9880'], check=True)
+            time.sleep(10)  # 间隔 10 秒后再次尝试
+        except subprocess.CalledProcessError as e:
+            print(f"ngrok 启动失败: {e}")
+            # break  # 如果失败，则退出循环
         time.sleep(10)
-        
+
+# 启动线程
 threading.Thread(target=run_ngrok, daemon=True).start()
 subprocess.run(['npm', 'install', '-g','localtunnel'], check=True)
 os.chdir(folder_path)