Update server9-bf.py

server9-bf.py

@@ -27,7 +27,7 @@ from IPython.display import clear_output
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
 # ==========================================
-# 1. 全局配置参数 (警告：请尽量避免在代码中明文写密码)
+# 1. 全局配置参数
 # ==========================================
 ini_content = {"username": "natclghpe", "key": "21e32070151c7fe0fbd5af3287d7e489"}
 cf_token = 'eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiNjMyNTRkZjYtNWY0ZC00YjM2LTlmZjMtY2M1MzMxMzQ1ODUyIiwicyI6IlpXSTFNV1JsTkRndFlqWmhZUzAwWW1VNUxUZzFOemN0Wm1GbE1tUTFNREZrTldSaiJ9'
@@ -150,7 +150,7 @@ configs = [
 # 2. 核心通用工具函数
 # ==========================================
 def run_cmd(command, ignore_errors=False, quiet=False):
-    """统一的命令执行工具，替代 os.system，更加安全可控"""
+    """统一的命令执行工具，替代 os.system"""
     try:
         stdout = subprocess.DEVNULL if quiet else None
         stderr = subprocess.DEVNULL if quiet else None
@@ -177,13 +177,12 @@ def is_installed(package):
 
 def install_package(package):
     logging.info(f"正在安装 {package}...")
-    run_cmd(f"sudo apt install {package} -y")
+    run_cmd(f"sudo apt install {package} -y", quiet=True)
 
 # ==========================================
-# 3. 环境初始化与服务设置
+# 3. 环境初始化与基础设置
 # ==========================================
 def init_environment():
-    """初始化基础环境和依赖"""
     logging.info('-----------更新软件包列表开始-------------')
     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")
@@ -218,7 +217,6 @@ def setup_cloudflared(install_ssh_config=True):
         with open(config_path, "w") as f:
             f.write(ssh_config_content)
         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}", quiet=True)
 
@@ -232,13 +230,11 @@ def setup_ssh():
     run_cmd("echo 'PermitRootLogin yes' | sudo tee -a /etc/ssh/sshd_config")
     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", 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.")
 
 def copy_public_key_to_remote(host, port, user, password):
     try:
@@ -247,75 +243,202 @@ def copy_public_key_to_remote(host, port, user, password):
         child.expect("password:", timeout=10)
         child.sendline(password)
         child.expect(pexpect.EOF)
-        logging.info("SSH公钥复制成功")
     except Exception as e:
         logging.error(f"复制公钥失败: {e}")
 
 # ==========================================
-# 4. 业务逻辑 (备份、监控、FRP、SillyTavern)
+# 4. 接力信息修改模块 (IP与接力时间)
+# ==========================================
+def get_current_ip():
+    """获取当前公共 IP 地址"""
+    try:
+        response = requests.get("https://ipinfo.io/ip", timeout=5)
+        return response.text.strip()
+    except:
+        return "Unknown IP"
+
+def get_geo_info(ip_address):
+    """根据 IP 地址获取地理位置信息"""
+    url = "https://api.qjqq.cn/api/Local"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+    }
+    try:
+        response = requests.get(url, headers=headers, timeout=5)
+        if response.status_code == 200:
+            geo_info = response.json()
+            if geo_info.get('code') == 200:
+                data = geo_info['data']
+                return {'ip': data['ip'], 'country': data['country'], 'isp': data['isp']}
+    except Exception as e:
+        logging.error(f"获取地理位置失败: {e}")
+    return None
+
+def get_next_relay_time():
+    """获取下一次接力时间（系统启动时间+12小时，转换为中国时区）"""
+    try:
+        boot_time = datetime.fromtimestamp(psutil.boot_time())
+        utc = pytz.UTC
+        boot_time = utc.localize(boot_time)
+        china_tz = pytz.timezone('Asia/Shanghai')
+        boot_time_china = boot_time.astimezone(china_tz)
+        next_time = boot_time_china + timedelta(hours=12)
+        return next_time.strftime("%Y-%m-%d %H:%M:%S")
+    except Exception as e:
+        logging.error(f"计算接力时间失败: {e}")
+        return "未知时间"
+
+def replace_info_in_file(file_path):
+    """修改 ST 登录界面的 IP 和接力时间信息"""
+    try:
+        if not os.path.exists(file_path):
+            logging.warning(f"找不到文件进行替换: {file_path}")
+            return
+            
+        ip_address = get_current_ip()
+        geo_info = get_geo_info(ip_address)
+        next_relay_time = get_next_relay_time()
+        
+        if geo_info is not None:
+            with open(file_path, 'r', encoding='utf-8') as file:
+                content = file.read()
+            
+            time_pattern = r'接力时间\[.*?\]'
+            time_replacement = f'接力时间[{next_relay_time}]'
+            content = re.sub(time_pattern, time_replacement, content)
+            
+            ip_pattern = r'IP\[.*?\]\s*国家\s*\[.*?\]\s*IPS\[.*?\]'
+            ip_replacement = f'IP[{ip_address}] 国家 [{geo_info["country"]}] IPS[{geo_info["isp"]}]'
+            content = re.sub(ip_pattern, ip_replacement, content)
+            
+            with open(file_path, 'w', encoding='utf-8') as file:
+                file.write(content)
+            
+            logging.info(f"成功更新前端页面信息: 接力时间[{next_relay_time}], IP[{ip_address}]")
+    except Exception as e:
+        logging.error(f"替换前端信息时发生错误: {e}")
+
+# ==========================================
+# 5. 双机接力 rsync 数据同步核心
+# ==========================================
+def sync_data_via_rsync():
+    """检测本地和远程接口，并进行 rsync 数据同步 (双机接力核心)"""
+    logging.info("------ 开始执行双机接力同步检测 (原 check_api1) ------")
+    
+    # 第一步：等待本地 ST 服务完全启动
+    retry_n = 0
+    while True:
+        retry_n += 1
+        if not os.path.exists(data_folder):
+            logging.error(f"{data_folder} 不存在，结束接力检测。")
+            return
+        try:
+            response = requests.get("http://127.0.0.1:8000/v1", timeout=10)
+            if response.status_code == 403:
+                logging.info("SillyTavern 本地接口已启动！")
+                break
+        except requests.exceptions.RequestException:
+            pass
+        
+        if retry_n % 12 == 0: 
+            logging.info("等待本地 SillyTavern 启动中...")
+        time.sleep(5)
+    
+    # 第二步：检测旧机器（远程）接口 token，触发 rsync 数据拉取
+    logging.info('ST本地已就绪，开始探测前置机器(旧机器)以触发同步...')
+    fail_count = 0
+    while fail_count <= 5:
+        if not os.path.exists(data_folder):
+            break
+            
+        url = f"{cf_jg}/csrf-token"
+        try:
+            response = requests_retry_session().get(url, timeout=15)
+            response.raise_for_status()
+            response_json = response.json()
+            
+            if "token" in response_json:
+                logging.info(f"成功探测到前置机器的 Token: {response_json}")
+                logging.info("开始执行 rsync 从旧机器接力拉取最新数据...")
+                try:
+                    subprocess.run(
+                        f"sshpass -p 'qilan' rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/",
+                        shell=True, check=True
+                    )
+                    logging.info("数据接力拉取完美收官！当前机器已获取最新状态。")
+                    break # 同步成功后安全退出循环
+                except subprocess.CalledProcessError as e:
+                    fail_count += 1
+                    logging.error(f"Rsync 失败，正在重试 ({fail_count}/5)...")
+                    generate_ssh_key() 
+            else:
+                logging.warning(f"接口未返回 token: {response_json}")
+                fail_count += 1
+                
+        except Exception as e:
+            fail_count += 1
+            logging.error(f"前置机器探测异常 ({fail_count}/5): {e}")
+            if fail_count > 5:
+                logging.warning("前置机器可能已宕机，接力同步取消，将使用当前本地数据继续。")
+        
+        time.sleep(5)
+    logging.info("------ 双机接力环节执行完毕 ------")
+
+# ==========================================
+# 6. 后台备份、FRP 与进程守护
 # ==========================================
 def get_folder_size(folder):
     try:
         result = subprocess.run(['du', '-sb', folder], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
         if result.returncode == 0:
             return int(result.stdout.split()[0])
-    except Exception as e:
-        logging.error(f"计算大小失败: {e}")
-    return 0
+    except:
+        return 0
 
 def compress_folder():
     global last_uploaded_size
-    run_cmd('rm -rf /a/', ignore_errors=True, quiet=True) # 修复了这里的报错
+    run_cmd('rm -rf /a/', ignore_errors=True, quiet=True) 
     os.makedirs('/a', exist_ok=True)
     
     with lock:
         current_folder_size = get_folder_size(data_folder)
-        logging.info(f"当前文件夹大小: {current_folder_size} 字节")
-
         if current_folder_size < (800 * 1024 ** 2):
-            logging.info("文件夹小于800MB，跳过压缩上传。")
             return
 
         if last_uploaded_size == -1 or current_folder_size != last_uploaded_size:
-            logging.info('开始压缩数据...')
+            logging.info('开始压缩打包数据用于备份...')
             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}', 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):
-                logging.info("压缩文件小于800MB，不执行上传。")
                 return
 
-            logging.info("准备上传至 Kaggle...")
+            logging.info("准备将压缩包上传至 Kaggle...")
             with open(metadata_file_path, 'w') as json_fid:
                 json.dump(kaggle_metadata, json_fid)
 
-            run_cmd('kaggle datasets version -m "new version message" -p /a')
+            run_cmd('kaggle datasets version -m "Auto Backup Update" -p /a')
             last_uploaded_size = file_size
-        else:
-            logging.info("文件夹大小未发生明显变化，跳过备份。")
 
 def repeat_task():
-    logging.info('------打包备份线程启动-------------')
+    logging.info('------后台定时打包备份线程已启动-------------')
     while True:
-        time.sleep(18000) # 等待 5 小时
+        time.sleep(18000) # 每 5 小时备份一次
         compress_folder()
 
 def kill_frpc_processes():
     try:
         subprocess.run(['pkill', '-f', 'frpc'], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        logging.info("旧的 frpc 进程已清理。")
     except subprocess.CalledProcessError:
-        pass # 如果没有进程，直接忽略
+        pass
 
 def frp(configs, backstage):
-    logging.info('-----------启动 FRP-------------')
+    logging.info('-----------启动 FRP 内网穿透-------------')
     for config_data, config_file_path in configs:
         with open(config_file_path, 'w') as config_file:
             config_file.write(config_data)
@@ -331,24 +454,25 @@ def Run_SillyTavern():
     os.chdir(data_folder)
     try:
         run_cmd(f'yes | sh {data_folder}/start.sh', quiet=True)
-        logging.info("server.js 已启动")
     except Exception as e:
-        logging.error(f"启动失败: {e}")
+        logging.error(f"SillyTavern 启动失败: {e}")
 
 def monitor_port():
     while True:
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
             result = sock.connect_ex(('localhost', 8000))
             if result != 0:
-                logging.warning("检测到端口 8000 未运行，尝试重启服务...")
                 config = configparser.ConfigParser()
                 config.read('/config.ini')
                 if config.getboolean('general', 'monitor_port_enabled', fallback=False):
                     threading.Thread(target=Run_SillyTavern, daemon=True).start()
         time.sleep(5)
 
+# ==========================================
+# 7. 主程序部署流程
+# ==========================================
 def setup_sillytavern():
-    logging.info('-----------SillyTavern 部署开始-------------')
+    logging.info('-----------SillyTavern 基础数据部署开始-------------')
     os.makedirs(os.path.expanduser("~/.kaggle"), exist_ok=True)
     with open('/root/.kaggle/kaggle.json', 'w') as json_file:
         json.dump(ini_content, json_file, indent=4)
@@ -362,14 +486,11 @@ def setup_sillytavern():
     while download_n <= 6:
         run_cmd(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name} -p /")
         if os.path.exists(f'/{huggingface_Data_name}.zip'):
-            logging.info("数据集下载成功！")
             break
-        logging.warning("下载失败，重试中...")
         download_n += 1
         time.sleep(5)
         
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
-        logging.info("备用方案：启用 rsync 实时同步。")
         generate_ssh_key()
         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}/")
@@ -388,13 +509,9 @@ def setup_sillytavern():
     run_cmd(f'yes | sh {data_folder}/start.sh', quiet=True)
     
     threading.Thread(target=Run_SillyTavern, daemon=True).start()
-    logging.info('-----------SillyTavern 部署结束-------------')
 
-# ==========================================
-# 5. 主程序执行入口
-# ==========================================
 if __name__ == '__main__':
-    # 1. 基础环境清理与配置
+    # 1. 基础环境预热
     init_environment()
     kill_frpc_processes()
     setup_cloudflared(True)
@@ -403,28 +520,29 @@ if __name__ == '__main__':
     generate_ssh_key()
     copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
     
-    # 2. 启动核心服务
+    # 2. 在后台线程启动 ST 解压与下载任务
     threading.Thread(target=setup_sillytavern, daemon=True).start()
     
-    # ================= 关键修复区 =================
+    # 3. 智能等待基础数据就绪
     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分钟超时检测
+        if wait_seconds > 1800:
             logging.error("下载/解压超时（超过30分钟）！")
             break
             
     if os.path.exists(f'{data_folder}/start.sh'):
         logging.info("SillyTavern 基础文件已就绪！")
-    # ===============================================
+        
+        # 4. 执行核心双机接力逻辑 (同步旧数据覆盖本地)
+        sync_data_via_rsync()
+
+        # 5. 替换登录页面显示接力时间与当前机器IP
+        replace_info_in_file(f'{data_folder}/public/login.html')
 
-    # 3. 写入监控配置
+    # 6. 配置环境收尾工作
     config = configparser.ConfigParser()
     config.add_section('general')
     config.set('general', 'monitor_port_enabled', 'True')
@@ -433,23 +551,22 @@ if __name__ == '__main__':
         
     run_cmd("rm -rf /qilan-st9.zip /sillytavern.tar.gz", ignore_errors=True, quiet=True)
     
-    # 4. 后台进程管理
+    # 7. 启动常驻守护服务 (备份、FRP、穿透隧道、状态监控)
     if os.path.exists(f'{data_folder}/start.sh'):
         backup_thread = threading.Thread(target=repeat_task, daemon=True)
         backup_thread.start()
         
-        logging.info("所有前置任务完成，启动监控和网络穿透...")
+        logging.info("前置任务全部完结！启动端口监控和网络穿透通道...")
         frp(configs, True)
         setup_cloudflared(False)
         threading.Thread(target=monitor_port, daemon=True).start()
         
-        # 守护进程，保持主程序存活
+        # 存活守护循环
         while True:
             if not backup_thread.is_alive():
-                logging.warning("备份线程异常退出，正在重启...")
                 backup_thread = threading.Thread(target=repeat_task, daemon=True)
                 backup_thread.start()
             time.sleep(60)
     else:
-        logging.error(f"{data_folder} 初始化失败，结束执行。")
+        logging.error(f"{data_folder} 初始化彻底失败，执行保底打包逻辑。")
         compress_folder()