Update app.py

app.py

@@ -1,34 +1,153 @@
 import requests
-import importlib.util
 import sys
+import time
+import subprocess
+import os
 
-def load_and_run_from_txt(txt_url: str):
-    """同步方式下载txt并执行"""
+# --- 配置 ---
+# 要监测的远程代码URL
+TXT_URL = "https://bg5-pycode.static.hf.space/api.txt" 
+# 将远程代码保存到本地的文件名
+LOCAL_CODE_FILE = "dynamic_api_module.py"
+# 检查更新的间隔时间（秒）
+CHECK_INTERVAL = 30 
+
+# --- 全局变量，用于跟踪状态 ---
+# 存储当前运行代码的HTTP ETag或内容哈希值
+current_code_identifier = None
+# 存储Uvicorn子进程对象
+server_process = None
+
+def check_for_updates():
+    """
+    检查远程代码是否有更新。
+    使用HTTP ETag头来高效检查，如果没有ETag则比较内容。
+    返回一个元组: (是否有更新: bool, 新代码内容: str, 新标识符: str)
+    """
+    global current_code_identifier
+    print(f"[{time.strftime('%Y-%m-%d %H:%M:%S')}] 正在检查 {TXT_URL} ...")
+    
     try:
-        # 下载txt文件
-        response = requests.get(txt_url)
+        headers = {}
+        # 如果我们有ETag，就使用If-None-Match头，让服务器判断内容是否改变
+        if current_code_identifier and current_code_identifier.startswith('"'):
+            headers['If-None-Match'] = current_code_identifier
+
+        response = requests.get(TXT_URL, headers=headers, timeout=10)
+
+        # 状态码 304 Not Modified 表示内容没有变化
+        if response.status_code == 304:
+            print("代码无变化 (ETag未改变)。")
+            return False, None, None
+
         response.raise_for_status()
         
-        code_content = response.text
-        print(f"下载成功，代码长度: {len(code_content)}")
+        new_code_content = response.text
         
-        # 创建并执行模块
-        spec = importlib.util.spec_from_loader("dynamic_api", loader=None)
-        module = importlib.util.module_from_spec(spec)
-        
-        exec(code_content, module.__dict__)
-        sys.modules["dynamic_api"] = module
-        
-        # 启动FastAPI
-        if hasattr(module, 'app'):
-            import uvicorn
-            uvicorn.run(module.app, host="0.0.0.0", port=8000)
+        # 优先使用ETag作为标识符，更高效
+        new_etag = response.headers.get('ETag')
+        if new_etag:
+            new_identifier = new_etag
+        else:
+            # 如果服务器不支持ETag，则计算内容的哈希值作为标识符
+            import hashlib
+            new_identifier = hashlib.sha256(new_code_content.encode('utf-8')).hexdigest()
+
+        if new_identifier != current_code_identifier:
+            print("检测到代码更新！")
+            return True, new_code_content, new_identifier
         else:
-            print("未找到FastAPI应用")
+            print("代码无变化 (内容哈希值未改变)。")
+            return False, None, None
             
-    except Exception as e:
-        print(f"执行失败: {e}")
+    except requests.exceptions.RequestException as e:
+        print(f"检查更新失败: {e}")
+        return False, None, None
 
+def start_or_restart_server(code_content: str):
+    """
+    停止当前服务器子进程（如果存在），然后根据新代码启动一个新进程。
+    """
+    global server_process
+    
+    # 1. 停止当前正在运行的服务器
+    if server_process and server_process.poll() is None:
+        print("检测到正在运行的服务器，正在终止...")
+        server_process.terminate()
+        try:
+            # 等待进程完全终止
+            server_process.wait(timeout=5)
+            print("旧进程已成功终止。")
+        except subprocess.TimeoutExpired:
+            print("旧进程终止超时，强制结束。")
+            server_process.kill()
+
+    # 2. 将新代码写入本地文件
+    # 确保文件末尾有启动服务器的逻辑
+    # 注意：远程的api.txt需要包含名为 'app' 的FastAPI实例
+    boot_loader = """
+# Injected by watcher script to run the server
 if __name__ == "__main__":
-    # 直接执行
-    load_and_run_from_txt("https://bg5-pycode.static.hf.space/api.txt")
+    import uvicorn
+    # Make sure 'app' is defined in the code above
+    if 'app' in locals():
+        uvicorn.run(app, host="0.0.0.0", port=8000)
+    else:
+        print("Error: FastAPI instance named 'app' not found in the downloaded code.")
+"""
+    full_code = code_content + "\n" + boot_loader
+    with open(LOCAL_CODE_FILE, "w", encoding="utf-8") as f:
+        f.write(full_code)
+    print(f"新代码已写入 {LOCAL_CODE_FILE}")
+
+    # 3. 启动新服务器子进程
+    print("正在启动新的服务器进程...")
+    # 使用 sys.executable 确保使用与当前脚本相同的Python解释器
+    command = [sys.executable, LOCAL_CODE_FILE]
+    server_process = subprocess.Popen(command)
+    print(f"新服务器已启动，进程ID: {server_process.pid}")
+
+def main_watcher():
+    """
+    监视器的主循环。
+    """
+    global current_code_identifier
+    
+    while True:
+        has_update, new_code, new_identifier = check_for_updates()
+        
+        if has_update:
+            # 更新代码并重启服务器
+            start_or_restart_server(new_code)
+            current_code_identifier = new_identifier
+            
+        elif server_process is None or server_process.poll() is not None:
+            # 处理服务器意外退出的情况
+            print("检测到服务器未运行或已崩溃，尝试启动...")
+            # 需要重新下载一次代码来启动
+            try:
+                response = requests.get(TXT_URL)
+                response.raise_for_status()
+                code_to_run = response.text
+                start_or_restart_server(code_to_run)
+                # 更新标识符
+                etag = response.headers.get('ETag')
+                if etag:
+                    current_code_identifier = etag
+                else:
+                    import hashlib
+                    current_code_identifier = hashlib.sha256(code_to_run.encode('utf-8')).hexdigest()
+            except Exception as e:
+                print(f"无法下载代码以重启崩溃的服务器: {e}")
+
+        time.sleep(CHECK_INTERVAL)
+
+if __name__ == "__main__":
+    try:
+        main_watcher()
+    except KeyboardInterrupt:
+        print("\n检测到手动中断，正在关闭服务器...")
+        if server_process and server_process.poll() is None:
+            server_process.terminate()
+            server_process.wait()
+        print("服务器已关闭。再见！")