Update server.py

server.py

@@ -431,7 +431,7 @@ def replace_ip_and_country_in_file(file_path):
             
             # 使用正则表达式匹配 "IP[xxx]国家[yyy]" 的格式
             pattern = r'IP\[.*?\]国家\[.*?\]ISP\[.*?\]'
-            replacement = f'机子IP[{geo_info["ip"]}]国家[{geo_info["country"]}]ISP[{geo_info["isp"]}]'
+            replacement = f'IP[{geo_info["ip"]}]国家[{geo_info["country"]}]ISP[{geo_info["isp"]}]'
             new_content = re.sub(pattern, replacement, content)
             
             # print(f"替换后的内容: {new_content}")
@@ -449,16 +449,27 @@ def replace_ip_and_country_in_file(file_path):
     except Exception as e:
         print(f"发生其他错误: {e}")
 
-def is_port_in_use(port):
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        # 尝试绑定到指定的端口
-        result = sock.connect_ex(('localhost', port))
-        if result == 0:
-            print(f"端口 {port} 正在使用中")
-            return True
-        else:
-            print(f"端口 {port} 未被使用")
-            return False
+import socket
+import subprocess
+import time
+
+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:
+                print(f"端口 8000 正在使用中")
+            else:
+                print(f"端口 8000 未被使用")
+                # 启动脚本并在后台运行
+                try:
+                    process = subprocess.Popen('yes | sh /sillytavern/start.sh', shell=True)
+                    print("已尝试启动 /sillytavern/start.sh")
+                    time.sleep(20)
+                except Exception as e:  # 捕获所有异常
+                    print(f"命令失败: {e}")
+        
+        time.sleep(5)  # 每5秒检查一次
 
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
@@ -507,7 +518,6 @@ def SillyTavern():
 
         threading.Thread(target=Oneapi, daemon=True).start()
         os.chdir('/sillytavern')
-        replace_ip_and_country_in_file('/sillytavern/public/login.html')
         os.system("ls")
         os.system("nvm install node")
         os.system("nvm use node")
@@ -528,23 +538,21 @@ time.sleep(60)
 check_api1()
 
 if os.path.exists('/sillytavern/start.sh'):
+    replace_ip_and_country_in_file('/sillytavern/public/login.html')
     # threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
     backup_thread = threading.Thread(target=repeat_task, daemon=True)
     backup_thread.start()
     print("开始衔接")
     Service_status = True
     frp(config_data2,'/content/frp/frpc2.ini',True)
-    frp(config_data,'/content/frp/frpc.ini',False)
+    frp(config_data,'/content/frp/frpc.ini',True)
     # 以线程的形式运行 frp 任务
     # frp_thread1 = threading.Thread(target=frp, args=(config_data2, '/content/frp/frpc2.ini', True))
     # frp_thread1.start()
     # frp_thread2 = threading.Thread(target=frp, args=(config_data, '/content/frp/frpc.ini', False))
     # frp_thread2.start()
+    threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
     while True:
-        if not is_port_in_use(8000):
-            os.chdir('/sillytavern')
-            subprocess.Popen('yes | sh /sillytavern/start.sh', shell=True)
-            time.sleep(15)
         if backup_thread.is_alive():
             print("备份线程仍在运行...")
         else:
@@ -552,15 +560,8 @@ if os.path.exists('/sillytavern/start.sh'):
             backup_thread = threading.Thread(target=repeat_task, daemon=True)
             backup_thread.start()
             # break
-        try:
-            # 检查 /sillytavern/start.sh 是否在运行
-            subprocess.check_output(['pgrep', '-f', '/sillytavern/start.sh'])
-            # print("脚本正在运行。")
-        except subprocess.CalledProcessError:
-            print("脚本未运行。退出循环。")
-            compress_folder()
-            break
         time.sleep(5)
 
 else:
-    print("/sillytavern 文件不存在结束执行")
+    print("/sillytavern 文件不存在结束执行")
+compress_folder()