Update server10.py

server10.py

@@ -4,9 +4,12 @@
 #lsof -i :8000
 # 查找server.py进程
 #ps aux | grep server.py
-huggingface_user="Qi28s"#
-huggingface_id="1010"
-huggingface_tokon="hf_bHdgZHDe   QHDHtoMjyIgpKvICbNbWJcTDTG"
+#source /opt/venv/bin/activate
+#python a.py
+
+huggingface_user="sahdbxuuu"#
+huggingface_id="s10"
+huggingface_tokon="hf_ImrWBdTCO   xnBCNtFcVpITLmrMJmHgthmtS"
 
 ini_content = {"username":"tmpysanneernier91","key":"fcffd91fcc8a94fb4a8d3a1b39ff652c"}
 frp_url = '119.8.118.149'
@@ -29,58 +32,7 @@ configs = [
     local_ip = 127.0.0.1
     local_port = 8000
     remote_port = 7091
-    """, '/data/frp/frpc.ini'),
-    (f"""
-    [common]
-    server_addr = {frp_url}
-    server_port = 7000
-    token = qilan
-    [1kkjmk1010]
-    type = tcp
-    local_ip = 127.0.0.1
-    local_port = 8000
-    remote_port = 7090
-    """, '/data/frp/frpc1.ini'),
-    ("""
-    [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
-    """, '/data/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
-   """, '/data/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
-     """, '/data/frp/frpc4.ini'),
-   (f"""
-   [common]
-   server_addr = {ssh_url}
-   server_port=7000 
-   [5kkji1mk99] 
-   type=tcp 
-   local_ip=127.0.0.1
-   local_port=22 
-   remote_port={ssh_port}
-     """, '/data/frp/frpc5.ini')
+    """, '/data/frp/frpc.ini')
 ]
 kaggle_metadata = {
     "title": "Your Dataset Title",
@@ -108,19 +60,35 @@ from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 import logging
 from datetime import datetime
+import psutil
+from typing import List, Dict
 import pytz
-os.system("rm -r /sync.sh")
-os.system("wget -O /sync.sh https://huggingface.co/datasets/Qilan2/st-server/resolve/main/sync.sh" )
-os.system("export LC_ALL=zh_CN.UTF-8")
+
 # 创建 FRP 文件夹并下载 frpc 可执行文件。
 os.system("mkdir -p /data/frp")
-os.system("wget /data/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /data/frp/frpc")
+os.system("wget /data/frp/frpc -q https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /data/frp/frpc")
 os.system("chmod +x /data/frp/frpc")
-os.system("wget https://huggingface.co/datasets/Qilan2/st-server/resolve/main/xugou-agent-linux-amd64?download=true -O /data/xugou-agent")
+os.system("wget -q  https://huggingface.co/datasets/Qilan2/st-server/resolve/main/xugou-agent-linux-amd64?download=true -O /data/xugou-agent")
 os.system("chmod +x /data/xugou-agent")
 os.system('nohup /data/xugou-agent start --server "https://tz.282820.xyz" --token "xugou_meqz1qus_80244ac171f1d9cf3a1ead6be2ecf86f.7d4ae786cbb7e559" --interval "30" > /data/xugou-agent.log 2>&1 &')
-os.system("wget https://huggingface.co/datasets/Qilan2/st-server/raw/main/ip_huggingface.py -O /data/ip_huggingface.py")
-
+os.system("wget -q  https://huggingface.co/datasets/Qilan2/st-server/raw/main/ip_huggingface.py -O /data/ip_huggingface.py")
+# os.system("wget -O '/data/nezha-agent-amd64' 'https://huggingface.co/datasets/Qilan2/st-server/resolve/main/nezha-agent-v0.17.6?download=true'")
+# os.system("chmod +x  /data/nezha-agent-amd64")
+# os.system('nohup /data/nezha-agent-amd64 -s tzz.282820.xyz:443 -p aLLlygYqAXgjq9Anln --tls --debug --temperature --disable-force-update  --disable-auto-update  > nezha-agent-amd64.log 2>&1 &')
+# os.system('/data/nezha-agent-amd64 -s tzz.282820.xyz:443 -p aLLlygYqAXgjq9Anln --tls --debug --temperature --disable-force-update  --disable-auto-update')
+
+def nezha():
+    os.system("rm -r /data/nezha-agent-amd64")
+    os.system("wget -O '/data/nezha-agent-amd64' 'https://huggingface.co/datasets/Qilan2/st-server/resolve/main/nezha-agent-v0.17.6?download=true'")
+    os.system("chmod +x  /data/nezha-agent-amd64")
+    os.system('/data/nezha-agent-amd64 -s tzz.282820.xyz:443 -p aLLlygYqAXgjq9Anln --tls --debug --temperature --disable-force-update  --disable-auto-update')
+def cloudflared():
+    os.system("rm -r /data/cloudflared-linux-amd64")
+    os.system("wget -O '/data/cloudflared-linux-amd64' -q 'https://github.com/cloudflare/cloudflared/releases/download/2025.9.0/cloudflared-linux-amd64'")
+    os.system("chmod +x  /data/cloudflared-linux-amd64")
+    os.system('/data/cloudflared-linux-amd64 tunnel run --token eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiMzg0OWFhNjgtMDJhMS00YWYyLWEzMTMtYzQ3ZmRiYTRjNzE3IiwicyI6IlpUTTRZemRsT1RFdE5tVXhOUzAwTlRVeUxUbGhZbUV0TmpFM09UWm1NR1ExTkdJMCJ9')
+# threading.Thread(target=nezha, daemon=True).start()
+# threading.Thread(target=cloudflared, daemon=True).start()
 def kill_frpc_processes():
     try:
         # 使用pkill命令结束所有frpc进程
@@ -132,9 +100,6 @@ def kill_frpc_processes():
 kill_frpc_processes()
 
 
-
-
-
 # 创建一���锁
 lock = threading.Lock()
 
@@ -185,6 +150,7 @@ def compress_folder():
             try:
                 # 执行压缩
                 result = subprocess.run(
+                    # tar -cvf - /data/SillyTavern | pigz -p 2 -1 > /dev/shm/a/sillytavern.tar.gz 2> /dev/null
                     f'tar -cvf - {data_folder} | pigz -p 2 -1 > {zip_file_path} 2> /dev/null',
                     shell=True,
                     check=True,
@@ -235,9 +201,11 @@ def repeat_task():
     print('------打包线程启动-------------')
     while True:
         print('等待打包')
-        time.sleep(18000)
+        # time.sleep(600)
+        time.sleep(10800)# 2小时
         compress_folder()
-    print('------打包线程结束-------------')
+    
+
 
 
 def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
@@ -249,6 +217,91 @@ def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500,
     session.mount('https://', adapter)
     return session
 
+def kill_processes_on_port(port: int = 8000) -> Dict[str, List[int]]:
+    """
+    结束指定端口的所有相关进程
+    
+    Args:
+        port (int): 要处理的端口号，默认为8000
+    
+    Returns:
+        Dict[str, List[int]]: 结束的进程信息
+    """
+    killed_processes = {
+        'success': [],
+        'failed': []
+    }
+
+    try:
+        # 遍历所有进程
+        for proc in psutil.process_iter(['pid', 'name', 'cmdline']):
+            try:
+                # 检查进程的连接
+                connections = proc.net_connections()
+                
+                # 检查是否有指定端口的连接
+                port_matches = [
+                    conn for conn in connections 
+                    if conn.laddr.port == port
+                ]
+
+                if port_matches:
+                    pid = proc.pid
+                    name = proc.name()
+
+                    print(f"找到端口 {port} 相关进程: PID {pid}, 名称 {name}")
+                    
+                    try:
+                        # 尝试优雅地终止进程
+                        parent = psutil.Process(pid)
+                        
+                        # 终止进程及其所有子进程
+                        for child_proc in parent.children(recursive=True):
+                            try:
+                                child_proc.terminate()
+                                print(f"终止子进程: PID {child_proc.pid}")
+                            except Exception as child_err:
+                                print(f"无法终止子进程 {child_proc.pid}: {child_err}")
+                        
+                        parent.terminate()
+                        
+                        # 等待进程结束
+                        gone, alive = psutil.wait_procs([parent], timeout=3)
+                        
+                        for p in alive:
+                            print(f"强制杀死进程: PID {p.pid}")
+                            p.kill()
+                        
+                        killed_processes['success'].append(pid)
+                        print(f"成功终止进程 {pid}")
+
+                    except psutil.NoSuchProcess:
+                        print(f"进程 {pid} 已不存在")
+                    except psutil.AccessDenied:
+                        print(f"没有权限终止进程 {pid}")
+                        killed_processes['failed'].append(pid)
+                    except Exception as e:
+                        print(f"终止进程 {pid} 时发生错误: {e}")
+                        killed_processes['failed'].append(pid)
+
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                continue
+
+    except Exception as e:
+        print(f"搜索进程时发生错误: {e}")
+
+    # 打印总结报告
+    print("--- 进程终止报告 ---")
+    print(f"成功终止进程数: {len(killed_processes['success'])}")
+    print(f"终止失败进程数: {len(killed_processes['failed'])}")
+    
+    if killed_processes['success']:
+        print(f"成功终止的进程 PID: {killed_processes['success']}")
+    
+    if killed_processes['failed']:
+        print(f"终止失败的进程 PID: {killed_processes['failed']}")
+
+    return killed_processes
 
 
 def check_api1():
@@ -298,48 +351,35 @@ def monitor_port():
     while True:
         url = "http://127.0.0.1:8000/v1"
         response = requests.get(url, timeout=30)
-        if response.status_code == 403:
-            print("SillyTavern运行中")
-            # break
-        else:
+        if response.status_code != 403:
             print("SillyTavern未运行，状态码:", response.status_code, n)
             # 读取 config.ini 中的 monitor_port_enabled 配置项
             config = configparser.ConfigParser()
             config.read('/data/config.ini')
             monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
             if monitor_port_enabled:
+                kill_processes_on_port()
                 backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
                 backup_thread.start()
             else:
                 print(f"monitor_port_enabled 为False跳过")
-
         
-        # with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        #     result = sock.connect_ex(('localhost', 8000))
-        #     if result == 0:
-        #         print(f"端口 8000 正在使用中")
-        #     else:
-        #         print(f"端口 8000 未被使用")
-        #         # 读取 config.ini 中的 monitor_port_enabled 配置项
-        #         config = configparser.ConfigParser()
-        #         config.read('/data/config.ini')
-        #         monitor_port_enabled = config.getboolean('general', 'monitor_port_enabled', fallback=False)
-        #         if monitor_port_enabled:
-        #             backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
-        #             backup_thread.start()
-        #         else:
-        #             print(f"monitor_port_enabled 为False跳过")
-        
-        time.sleep(5)  # 每5秒检查一次
+        time.sleep(15)  # 每5秒检查一次
 def Run_SillyTavern():
-    os.chdir(data_folder)
     try:
+        os.chdir('/data/SillyTavern')
         # 启动 Node.js 服务器，并将输出重定向到 /dev/null
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+        print('-----启动st-----')
+        os.system("yes | sh ./start.sh")
+        os.system("yes | sh ./start.sh")
+        os.system("yes | sh ./start.sh")
+        os.system("yes | sh ./start.sh")
+        os.system("yes | sh ./start.sh")
+        # subprocess.run(f'yes | sh ./start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
         
         print("已尝试启动 server.js")
     except subprocess.CalledProcessError as e:
@@ -350,8 +390,6 @@ def Run_SillyTavern():
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
     # 创建目录并写入 kaggle.json
-
-
     # 打印当前工作目录和用户主目录
     print("Current Working Directory:", os.getcwd())
     print("Home Directory:", os.path.expanduser('~'))
@@ -381,8 +419,11 @@ def SillyTavern():
     
     os.system(f"rm -rf /a /data/sillytavern /data/data /data/*.zip /data/*.ctk")
     # os.system(f"mkdir -p {data_folder}")
+    print('----当前文件夹路径--------')
+    os.system('pwd')
+    print('----进入/data--------')
     os.chdir('/data')
-    os.system("ls")
+    
     print(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
     # os.system(f"kaggle datasets download {huggingface_name}/{huggingface_Data_name}")
     download_n = 0
@@ -404,36 +445,46 @@ def SillyTavern():
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
         
     else:
-        
+        os.chdir('/data')
         # 如果文件存在，可以继续执行后续代码
+        print('----/data文件夹内容--------')
+        # os.system("ls")
         print(f"文件 /data/{huggingface_Data_name}.zip 存在，继续执行程序。")
     # # 解压 sillytavern.zip
         # os.system("rm *.zip")
         os.system(f"7z x /data/{huggingface_Data_name}.zip  -y")
-        os.system("mv /data/sillytavern.tck sillytavern.tar.gz")
+        # os.system("mv /data/sillytavern.tck sillytavern.tar.gz")
         os.system("mv /data/sillytavern.ctk sillytavern.tar.gz")
-        os.system("ls /data")
-        # os.system("tar -xvpf /sillytavern.tar.gz -C / --use-compress-program=pigz")
-        os.system(f"tar -xvpf /data/sillytavern.tar.gz -C /data --use-compress-program=pigz > /dev/null")
+        # os.system("ls /data")
+        # os.system("tar -xvpf ./sillytavern.tar.gz -C / --use-compress-program=pigz")
+        # 使用标准 tar 解压
+        os.system("tar -xzf sillytavern.tar.gz --strip-components=1 -C /data")
         # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
-        os.system("mv /data/data/SillyTavern  /data/SillyTavern")
-        
-        print('更新文件')
+        # os.system("mv /data/data/SillyTavern  /data/SillyTavern")
+          
+        print('更新npm')
+        print('----进入/data/SillyTavern--------')
         os.chdir('/data/SillyTavern')
+        os.system("pwd")
+        # print('----/data/SillyTavern内容--------')
         os.system(f"ls {data_folder}")
+        os.system("python /data/ip_huggingface.py")
         os.system("nvm install node")
         os.system("nvm use node")
         os.system("npm install -y")
-        try:
-            subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
-        except subprocess.CalledProcessError as e:
-            print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
-            print("Output:", e.output)
-        os.system(f"ls {data_folder}")
-        os.system("python /data/ip_huggingface.py")
+        # os.system("yes | sh ./start.sh")
+        # try:
+        #     subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        # except subprocess.CalledProcessError as e:
+        #     print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
+        #     print("Output:", e.output)
+        # os.system(f"ls {data_folder}")
+        
+        # Run_SillyTavern()
         backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
         backup_thread.start()
         # os.system(f"rm -rf /a /data/sillytavern /data/data /data/*.zip /data/*.ctk")
+        # os.system("ls /data/")
         
     print('-----------SillyTavern结束-------------')  
 import requests
@@ -484,6 +535,8 @@ def restart_huggingface_space(space_name, space_id, partial_token):
 import psutil
 
 def check_system_resources():
+    print("查看CPU占用情况")
+    time.sleep(120)
     # 获取CPU使用率
     cpu_usage = psutil.cpu_percent(interval=1)
     
@@ -492,14 +545,15 @@ def check_system_resources():
     memory_usage = memory.percent
     
     # 检查CPU和内存占用是否超过85%
-    if cpu_usage >= 90 or memory_usage >= 90:
+    if cpu_usage >= 90:
+    # if cpu_usage >= 90 or memory_usage >= 90:
         print("占用过高")
         # 可选：打印具体的使用率
         print(f"CPU使用率: {cpu_usage}%")
         print(f"内存使用率: {memory_usage}%")
         result = restart_huggingface_space(huggingface_user, huggingface_id, huggingface_tokon)
         print(result)
-        time.sleep(6666666)
+        # time.sleep(6666666)
     else:
         print("系统资源正常")
         
@@ -511,7 +565,7 @@ threading.Thread(target=SillyTavern, daemon=True).start()
 # SillyTavern()
 time.sleep(60)
 check_api1()
-
+# compress_folder()
 
 # 创建 ConfigParser 对象
 config = configparser.ConfigParser()
@@ -530,21 +584,19 @@ if os.path.exists(f'/data/{huggingface_Data_name}.zip'):
     Service_status = True
     frp(configs, True)
     threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
-    # check_system_resources()
+    threading.Thread(target=check_system_resources, daemon=True).start()#检测CPU内存状态
     # time.sleep(600)
     while True:
         # 检查是否是中国时区早上6点
         china_tz = pytz.timezone('Asia/Shanghai')
         now = datetime.now(china_tz)
-        if now.hour == 14 and now.minute < 2:  # 6:00-6:05之间退出
+        if now.hour == 6 and now.minute < 5:  # 6:00-6:05之间退出
             print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 到达早上6点，退出循环")
             break
-        else:
-            print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 未到达早上6点")
+        # else:
+        #     print(f"当前时间: {now.strftime('%Y-%m-%d %H:%M:%S')}, 未到达早上6点")
             
-        if backup_thread.is_alive():
-            print("备份线程仍在运行...")
-        else:
+        if backup_thread.is_alive() == False:
             print("备份线程已停止.")
             backup_thread = threading.Thread(target=repeat_task, daemon=True)
             backup_thread.start()
@@ -553,5 +605,4 @@ else:
     print(f'{data_folder}/start.sh 文件不存在结束执行')
 compress_folder()
 result = restart_huggingface_space(huggingface_user, huggingface_id, huggingface_tokon)
-print(result)
-
+print(result)