Update server.py

server.py

@@ -29,6 +29,17 @@ configs = [
     local_port = 8000
     remote_port = 7071
     """, '/content/frp/frpc.ini'),
+    (f"""
+    [common]
+    server_addr = 119.8.118.149
+    server_port = 7000
+    token = qilan
+    [kjashf2]
+    type = tcp
+    local_ip = 127.0.0.1
+    local_port = 8000
+    remote_port = 7070
+    """, '/content/frp/frpc1.ini'),
     ("""
     [common]
     server_addr = 8.137.94.137
@@ -93,6 +104,9 @@ from requests.packages.urllib3.util.retry import Retry
 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")
+os.system("mkdir -p /content/frp")
+os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
+os.system("chmod +x /content/frp/frpc")
 # 更新软件包列表
 def is_installed(package):
     """Check if a package is installed."""
@@ -567,16 +581,33 @@ def monitor_port():
                 print(f"端口 8000 正在使用中")
             else:
                 print(f"端口 8000 未被使用")
+                backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
+                backup_thread.start()
                 # 启动脚本并在后台运行
-                try:
-                    process = subprocess.Popen(f'yes | sh {data_folder }/start.sh', shell=True)
-                    print(f"已尝试启动 {data_folder }/start.sh")
-                    time.sleep(20)
-                except Exception as e:  # 捕获所有异常
-                    print(f"命令失败: {e}")
+                # try:
+                #     os.chdir(data_folder)
+                #     process = subprocess.Popen(f'node "server.js" "$@"', shell=True)
+                #     print(f"已尝试启动 {data_folder }/start.sh")
+                #     # time.sleep(20)
+                # except Exception as e:  # 捕获所有异常
+                #     print(f"命令失败: {e}")
         
         time.sleep(5)  # 每5秒检查一次
-
+def Run_SillyTavern():
+    os.chdir(data_folder)
+    # subprocess.run(f'node "server.js" "$@"', shell=True, check=True)
+    try:
+        # 启动 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("已尝试启动 server.js")
+    except subprocess.CalledProcessError as e:
+        print(f"命令失败，返回码: {e.returncode}")
+    except Exception as e:  # 捕获所有其他异常
+        print(f"发生异常: {e}")
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
     # 创建目录并写入 kaggle.json
@@ -643,10 +674,12 @@ def SillyTavern():
         os.system(f"ls {data_folder}")
         print('更新文件')
         os.system('git pull --rebase --autostash')
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
-        subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
+        backup_thread.start()
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
+        # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
     print('-----------SillyTavern结束-------------')  
 threading.Thread(target=SillyTavern, daemon=True).start()
 time.sleep(60)