Update server9-bf.py

server9-bf.py

@@ -21,7 +21,9 @@ from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 from IPython.display import clear_output
 
-# 配置日志输出格式
+# ==========================================
+# 0. 配置日志输出格式
+# ==========================================
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 # ==========================================
@@ -54,7 +56,6 @@ lock = threading.Lock()
 
 # FRP 配置文件列表
 configs = [
-    # ... (为了排版简洁，这里保留你原本的 configs 列表内容，直接复制你原本的那一大串过来即可)
     ("""
     [common]
     server_addr = 47.237.156.222
@@ -83,7 +84,57 @@ configs = [
     local_port = 8000
     remote_port = 7082
     """, '/content/frp/frpc1.ini'),
-    (f"""
+    ("""
+    [common]
+    server_addr = 43.134.75.213
+    server_port = 7000
+    [2kjas9]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = 8000
+    remote_port = 7079
+    """, '/content/frp/frpc2.ini'),
+   ("""
+   [common]
+   server_addr = 8.210.217.27
+   server_port = 7000
+   [3kja1sh9]
+   type = tcp
+   local_ip = 127.0.0.1
+   local_port = 8000
+   remote_port = 7079
+   """, '/content/frp/frpc3.ini'),
+   ("""
+   [common]
+   server_addr = 45.32.68.209
+   server_port=7000 
+   [4kkji1mk9] 
+   type=tcp 
+   local_ip=127.0.0.1
+   local_port=8000 
+   remote_port=7079
+     """, '/content/frp/frpc4.ini'),
+    ("""
+   [common]
+   server_addr = 47.74.57.131
+   server_port=7000 
+   [4kkji1mk9] 
+   type=tcp 
+   local_ip=127.0.0.1
+   local_port=8000 
+   remote_port=7090
+     """, '/content/frp/frpc6.ini'),
+    ("""
+   [common]
+   server_addr = 47.243.129.107
+   server_port=7000 
+   [4kkji1mk9] 
+   type=tcp 
+   local_ip=127.0.0.1
+   local_port=8000 
+   remote_port=7090
+     """, '/content/frp/frpc7.ini'),
+   (f"""
    [common]
    server_addr = {ssh_url}
    server_port=7000 
@@ -134,12 +185,12 @@ def install_package(package):
 def init_environment():
     """初始化基础环境和依赖"""
     logging.info('-----------更新软件包列表开始-------------')
-    run_cmd("rm -r /sync.sh", ignore_errors=True)
-    run_cmd("wget -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh")
+    run_cmd("rm -r /sync.sh", ignore_errors=True, quiet=True)
+    run_cmd("wget -q -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh")
     run_cmd("export LC_ALL=zh_CN.UTF-8")
     
     run_cmd("mkdir -p /content/frp")
-    run_cmd("wget https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
+    run_cmd("wget -q https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
     run_cmd("chmod +x /content/frp/frpc")
     
     if not is_installed('nodejs'):
@@ -157,7 +208,7 @@ def setup_cloudflared(install_ssh_config=True):
         run_cmd("sudo mkdir -p --mode=0755 /usr/share/keyrings")
         run_cmd("curl -fsSL https://pkg.cloudflare.com/cloudflare-public-v2.gpg | sudo tee /usr/share/keyrings/cloudflare-public-v2.gpg >/dev/null")
         run_cmd("echo 'deb [signed-by=/usr/share/keyrings/cloudflare-public-v2.gpg] https://pkg.cloudflare.com/cloudflared any main' | sudo tee /etc/apt/sources.list.d/cloudflared.list")
-        run_cmd("sudo apt-get update && sudo apt-get install cloudflared -y")
+        run_cmd("sudo apt-get update && sudo apt-get install cloudflared -y", quiet=True)
         
         ssh_dir = os.path.expanduser("~/.ssh")
         os.makedirs(ssh_dir, exist_ok=True)
@@ -169,23 +220,23 @@ def setup_cloudflared(install_ssh_config=True):
         os.chmod(config_path, 0o600)
         logging.info(f"✅ SSH config for {cf_ssh} generated successfully.")
     else:  
-        run_cmd(f"sudo cloudflared service install {cf_token}")
+        run_cmd(f"sudo cloudflared service install {cf_token}", quiet=True)
 
 def setup_ssh():
     logging.info('-----------SSH配置开始-------------')
-    run_cmd("apt update && apt install openssh-server vim -y")
+    run_cmd("apt update && apt install openssh-server vim -y", quiet=True)
     run_cmd("sudo sed -i '/PasswordAuthentication/s/^#//g' /etc/ssh/ssh_config")
     run_cmd("sudo sed -i '/PermitRootLogin prohibit-password/s/prohibit-password/yes/' /etc/ssh/sshd_config")
     
     run_cmd("echo 'root:qilan' | sudo chpasswd")
     run_cmd("echo 'PermitRootLogin yes' | sudo tee -a /etc/ssh/sshd_config")
-    run_cmd("service ssh restart")
+    run_cmd("service ssh restart", quiet=True)
     run_cmd("export LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | tr ':' '\n' | grep -v '/opt/conda/lib' | paste -sd ':') ")
     logging.info('-----------SSH配置结束-------------')
 
 def generate_ssh_key():
-    run_cmd("rm -f ~/.ssh/id_rsa ~/.ssh/id_rsa.pub")
-    run_cmd("ssh-keygen -t rsa -b 2048 -f ~/.ssh/id_rsa -N ''")
+    run_cmd("rm -f ~/.ssh/id_rsa ~/.ssh/id_rsa.pub", quiet=True)
+    run_cmd("ssh-keygen -t rsa -b 2048 -f ~/.ssh/id_rsa -N ''", quiet=True)
     run_cmd('chmod 600 ~/.ssh/id_rsa')
     logging.info("SSH key pair generated.")
 
@@ -214,7 +265,7 @@ def get_folder_size(folder):
 
 def compress_folder():
     global last_uploaded_size
-    run_cmd('rm -r /a/', ignore_errors=True)
+    run_cmd('rm -rf /a/', ignore_errors=True, quiet=True) # 修复了这里的报错
     os.makedirs('/a', exist_ok=True)
     
     with lock:
@@ -230,7 +281,11 @@ def compress_folder():
             run_cmd(f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path}', quiet=True)
             
             file_path = "/a/sillytavern.ctk"
-            run_cmd(f'mv {zip_file_path} {file_path}')
+            run_cmd(f'mv {zip_file_path} {file_path}', ignore_errors=True)
+            if not os.path.exists(file_path):
+                 logging.error("压缩文件未生成！")
+                 return
+                 
             file_size = os.path.getsize(file_path)
             
             if file_size < (800 * 1024 ** 2):
@@ -254,7 +309,7 @@ def repeat_task():
 
 def kill_frpc_processes():
     try:
-        subprocess.run(['pkill', '-f', 'frpc'], check=True)
+        subprocess.run(['pkill', '-f', 'frpc'], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         logging.info("旧的 frpc 进程已清理。")
     except subprocess.CalledProcessError:
         pass # 如果没有进程，直接忽略
@@ -267,15 +322,14 @@ def frp(configs, backstage):
         frpc_cmd = ['/content/frp/frpc', '-c', config_file_path]
         
         if backstage:
-            subprocess.Popen(frpc_cmd)
+            subprocess.Popen(frpc_cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         else:
-            run_cmd(f'/content/frp/frpc -c {config_file_path}')
+            run_cmd(f'/content/frp/frpc -c {config_file_path}', quiet=True)
 
 def Run_SillyTavern():
     """启动 Node 服务"""
     os.chdir(data_folder)
     try:
-        # 原代码执行了5次，优化为仅执行1次即可
         run_cmd(f'yes | sh {data_folder}/start.sh', quiet=True)
         logging.info("server.js 已启动")
     except Exception as e:
@@ -300,7 +354,7 @@ def setup_sillytavern():
         json.dump(ini_content, json_file, indent=4)
     run_cmd("chmod 600 ~/.kaggle/kaggle.json")
 
-    run_cmd(f"rm -rf /a /sillytavern /*.zi* {data_folder}", ignore_errors=True)
+    run_cmd(f"rm -rf /a /sillytavern /*.zi* {data_folder}", ignore_errors=True, quiet=True)
     os.makedirs(data_folder, exist_ok=True)
     os.chdir('/')
     
@@ -320,18 +374,18 @@ def setup_sillytavern():
         copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
         run_cmd(f"sshpass -p 'qilan' rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/")
     else:
-        run_cmd(f"7z x /{huggingface_Data_name}.zip -o/ -y")
-        run_cmd("mv /sillytavern.tck sillytavern.tar.gz", ignore_errors=True)
-        run_cmd("mv /sillytavern.ctk sillytavern.tar.gz", ignore_errors=True)
+        run_cmd(f"7z x /{huggingface_Data_name}.zip -o/ -y", quiet=True)
+        run_cmd("mv /sillytavern.tck sillytavern.tar.gz", ignore_errors=True, quiet=True)
+        run_cmd("mv /sillytavern.ctk sillytavern.tar.gz", ignore_errors=True, quiet=True)
         run_cmd("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz > /dev/null")
 
-    run_cmd("rm -f ip.py")
-    run_cmd("wget -O /root/SillyTavern/ip.py https://huggingface.co/datasets/Qilan2/st-server/raw/main/ip.py")
-    run_cmd("python /root/SillyTavern/ip.py", ignore_errors=True)
+    run_cmd("rm -f ip.py", quiet=True)
+    run_cmd("wget -q -O /root/SillyTavern/ip.py https://huggingface.co/datasets/Qilan2/st-server/raw/main/ip.py")
+    run_cmd("python /root/SillyTavern/ip.py", ignore_errors=True, quiet=True)
     
     os.chdir(data_folder)
-    run_cmd("nvm install node && nvm use node && npm install -y")
-    run_cmd(f'yes | sh {data_folder}/start.sh')
+    run_cmd("nvm install node && nvm use node && npm install -y", quiet=True)
+    run_cmd(f'yes | sh {data_folder}/start.sh', quiet=True)
     
     threading.Thread(target=Run_SillyTavern, daemon=True).start()
     logging.info('-----------SillyTavern 部署结束-------------')
@@ -351,8 +405,25 @@ if __name__ == '__main__':
     
     # 2. 启动核心服务
     threading.Thread(target=setup_sillytavern, daemon=True).start()
-    time.sleep(60)
     
+    # ================= 关键修复区 =================
+    logging.info("正在等待数据下载和解压，这可能需要几分钟，请耐心等待...")
+    
+    # 智能等待机制：不再死等60秒，而是每5秒检查一次，直到文件出现（最多等30分钟防止卡死）
+    wait_seconds = 0
+    while not os.path.exists(f'{data_folder}/start.sh'):
+        time.sleep(5)
+        wait_seconds += 5
+        if wait_seconds % 60 == 0:
+            logging.info(f"已等待 {wait_seconds // 60} 分钟，继续解压中...")
+        if wait_seconds > 1800: # 30分钟超时检测
+            logging.error("下载/解压超时（超过30分钟）！")
+            break
+            
+    if os.path.exists(f'{data_folder}/start.sh'):
+        logging.info("SillyTavern 基础文件已就绪！")
+    # ===============================================
+
     # 3. 写入监控配置
     config = configparser.ConfigParser()
     config.add_section('general')
@@ -360,7 +431,7 @@ if __name__ == '__main__':
     with open('/config.ini', 'w') as configfile:
         config.write(configfile)
         
-    run_cmd("rm -rf /qilan-st9.zip /sillytavern.tar.gz", ignore_errors=True)
+    run_cmd("rm -rf /qilan-st9.zip /sillytavern.tar.gz", ignore_errors=True, quiet=True)
     
     # 4. 后台进程管理
     if os.path.exists(f'{data_folder}/start.sh'):