Update ff_sap.py

ff_sap.py

@@ -48,11 +48,18 @@ else:  # 如果 DATA_JSON 为空，就从单独的环境变量里取
 
 
 def cf():
-    os.system("rm -r /home/vncuser/ff1")
-    os.system("wget -O '/home/vncuser/ff1' -q 'https://huggingface.co//datasets/Qilan2/ff/resolve/main/f-linux-amd64?download=true'")
-    os.system("chmod +x  /home/vncuser/ff1")
+    os.system("rm -r /data/f1")
+    os.system("wget -O '/data/f1' -q 'https://huggingface.co/datasets/Qilan2/ff/resolve/main/f-linux-amd64?download=true'")
+    os.system("chmod +x  /data/f1")
     # https://ff1.vv9.dpdns.org
-    os.system('nohup /home/vncuser/ff1 tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiNDBmNjFiZGQtMzQyYS00MDYzLWJlZTQtZGU4ZjEyNDk2NTAwIiwicyI6Ik9HVXdNR0UyTWpVdFlUVmpOUzAwTlRCbExUZzRabVl0TldRNU9USTFNR1F3TjJabSJ9 >/dev/null 2>&1 &')
+    os.system('/data/f1 tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiNDBmNjFiZGQtMzQyYS00MDYzLWJlZTQtZGU4ZjEyNDk2NTAwIiwicyI6Ik9HVXdNR0UyTWpVdFlUVmpOUzAwTlRCbExUZzRabVl0TldRNU9USTFNR1F3TjJabSJ9')
+#     subprocess.Popen(
+#     '/data/cf tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiNDBmNjFiZGQtMzQyYS00MDYzLWJlZTQtZGU4ZjEyNDk2NTAwIiwicyI6Ik9HVXdNR0UyTWpVdFlUVmpOUzAwTlRCbExUZzRabVl0TldRNU9USTFNR1F3TjJabSJ9',
+#     stdout=subprocess.DEVNULL,
+#     stderr=subprocess.DEVNULL,
+#     shell=True,
+#     start_new_session=True  # 在新的会话中启动，与父进程分离
+# )
 
 UUID = os.environ.get('UUID', 'a488076d-0ced-4a83-91c4-c498fce00cff')  # UUID,如使用v1,在不同的平台部署需要修改,否则会覆盖
 N_SERVER = os.environ.get('NEZHA_SERVER', '')# N面板域名或ip, 
@@ -79,17 +86,17 @@ def nv1():
         'use_ipv6_country_code': False,
         'uuid': UUID
     }
-    with open('/home/vncuser/config.yaml', 'w') as file:
+    with open('./config.yaml', 'w') as file:
         yaml.dump(agent_config, file, default_flow_style=False)
     
-    os.system("cat /home/vncuser/config.yaml")
-    os.system("rm -rf /home/vncuser/f1")
-    os.system("wget -O '/home/vncuser/f1' -q 'https://huggingface.co//datasets/Qilan2/st-server/resolve/main/nv1amd64?download=true'")
-    os.system("chmod +x  /home/vncuser/f1")
-    os.system('/home/vncuser/f1 -c /home/vncuser/config.yaml')
-    os.system('/home/vncuser/f1 -c /home/vncuser/config.yaml')
-# threading.Thread(target=nv1, daemon=True).start()
-# threading.Thread(target=cf, daemon=True).start()
+    os.system("cat ./config.yaml")
+    os.system("rm -rf n1")
+    os.system("wget -O 'n1' -q 'https://huggingface.co/datasets/Qilan2/st-server/resolve/main/nv1amd64?download=true'")
+    os.system("chmod +x  n1")
+    os.system('./n1 -c ./config.yaml')
+    os.system('./n1 -c ./config.yaml')
+threading.Thread(target=nv1, daemon=True).start()
+
 
 def random_name(length=8):
     return ''.join(random.choices(string.ascii_lowercase, k=length))
@@ -109,7 +116,7 @@ def telegram_message(bot_token: str, chat_id: str, message: str):
     :param message: 要发送的正文内容
     :return: Telegram API 返回的结果
     """
-    url = f"https://tgbotapi.9.c.5.b.0.d.0.0.1.0.a.2.ip6.arpa/bot{bot_token}/sendMessage"
+    url = f"https://tgbotapi.111680.xyz/bot{bot_token}/sendMessage"
     params = {
         "chat_id": chat_id,
         "text": message,
@@ -125,7 +132,7 @@ def telegram_message(bot_token: str, chat_id: str, message: str):
 def create_space(type,key = "", value = "",name = ""):
     if type == 1:
         # 创建spaces
-        url = "https://huggingface.co//api/repos/create"
+        url = "https://huggingface.co/api/repos/create"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {HF_TOKON2}"
@@ -144,7 +151,7 @@ def create_space(type,key = "", value = "",name = ""):
         return response.json()
     if type == 2:
         # 删除spaces
-        url = "https://huggingface.co//api/repos/delete"
+        url = "https://huggingface.co/api/repos/delete"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {HF_TOKON2}"
@@ -158,7 +165,7 @@ def create_space(type,key = "", value = "",name = ""):
         return response.text
     if type == 3:
         # 创建spaces 变量
-        url = f"https://huggingface.co//api/spaces/{HF_USER2}/{name}/secrets"
+        url = f"https://huggingface.co/api/spaces/{HF_USER2}/{name}/secrets"
         headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {HF_TOKON2}"
@@ -171,15 +178,15 @@ def create_space(type,key = "", value = "",name = ""):
         response = requests.post(url, headers=headers, json=payload)
         return response.text
     if type == 4:
-        file_path = f"/home/vncuser/{name}/Dockerfile"
+        file_path = f"/data/{name}/Dockerfile"
         os.system("rm -rf {HF_SPACES_NAME}")
-        git = f"git clone https://{HF_USER2}:{HF_TOKON2}@huggingface.co/spaces/{HF_USER2}/{name} /home/vncuser/{name}"
+        git = f"git clone https://{HF_USER2}:{HF_TOKON2}@huggingface.co/spaces/{HF_USER2}/{name} /data/{name}"
         url = "https://huggingface.co/datasets/Qilan2/ff/raw/main/Dockerfile"
         print(git)
         os.system(git)
         os.system(f'git config --global user.email "{HF_EMAIL2}"')
         os.system(f'git config --global user.name "{HF_USER2}"') 
-        os.chdir(f'/home/vncuser/{name}')
+        os.chdir(f'/data/{name}')
         os.system(f"rm -rf {file_path}")
         time.sleep(3)
         # 如果文件已存在，先删除
@@ -198,8 +205,8 @@ def create_space(type,key = "", value = "",name = ""):
             print(f"下载失败，状态码: {response.status_code}")
             # telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}下载Dockerfile下载失败，状态码: {response.status_code}")
         
-        # os.system(f"wget -O '/data/{tmp_name}/Dockerfile' https://huggingface.co//datasets/Qilan2/ff/raw/main/Dockerfile")
-        repo_path = f"/home/vncuser/{name}"
+        # os.system(f"wget -O '/data/{tmp_name}/Dockerfile' https://huggingface.co/datasets/Qilan2/ff/raw/main/Dockerfile")
+        repo_path = f"/data/{name}"
         subprocess.run(["git", "-C", repo_path, "add", "."], check=True)
         subprocess.run(["git", "-C", repo_path, "commit", "-m", "0"], check=True)
         subprocess.run(["git", "-C", repo_path, "push", "origin", "main"], check=True)
@@ -217,7 +224,7 @@ def create_space(type,key = "", value = "",name = ""):
         }
         
         # 获取用户的所有空间列表
-        response = requests.get(f"https://huggingface.co//api/spaces?author={HF_USER2}", headers=headers)
+        response = requests.get(f"https://huggingface.co/api/spaces?author={HF_USER2}", headers=headers)
         
         if response.status_code != 200:
             print(f"获取空间列表失败：{response.status_code}")
@@ -237,7 +244,7 @@ def create_space(type,key = "", value = "",name = ""):
                 full_name = space['id']
                 space_id = full_name.split("/")[-1]
                 # 删除spaces
-                url = "https://huggingface.co//api/repos/delete"
+                url = "https://huggingface.co/api/repos/delete"
                 headers = {
                     "Content-Type": "application/json",
                     "Authorization": f"Bearer {HF_TOKON2}"
@@ -263,7 +270,7 @@ def get_latest_local_package(directory, pattern='*.tar.gz'):
         files = glob.glob(search_pattern)
         
         if not files:
-            print("未找到匹配的 ff备份 压缩包")
+            print("未找到匹配的 nezha-hf 压缩包")
             return None
         
         # 获取最新的文件
@@ -283,7 +290,7 @@ def delete_huggingface_lfs_file(filename, repo_id, token):
     """
     try:
         # 1. 查询LFS文件列表
-        url = f"https://huggingface.co//api/models/{repo_id}/lfs-files"
+        url = f"https://huggingface.co/api/models/{repo_id}/lfs-files"
         headers = {
             "content-type": "application/json",
             "Authorization": f"Bearer {token}",
@@ -310,7 +317,7 @@ def delete_huggingface_lfs_file(filename, repo_id, token):
         
         # 3. 删除LFS文件记录
         file_oid = file_to_delete['fileOid']
-        delete_url = f"https://huggingface.co//api/models/{repo_id}/lfs-files/{file_oid}?rewriteHistory=true"
+        delete_url = f"https://huggingface.co/api/models/{repo_id}/lfs-files/{file_oid}?rewriteHistory=true"
         
         delete_response = requests.delete(delete_url, headers=headers)
         if delete_response.status_code == 200:
@@ -373,7 +380,7 @@ def get_remote_lfs_files(repo_id, token):
     获取远程所有的LFS文件列表
     """
     try:
-        url = f"https://huggingface.co//api/models/{repo_id}/lfs-files"
+        url = f"https://huggingface.co/api/models/{repo_id}/lfs-files"
         headers = {
             "content-type": "application/json",
             "Authorization": f"Bearer {token}",
@@ -522,29 +529,29 @@ def compress_folder(folder_path, output_dir, keep_count=3):
 
 def github(type):
     if type == 1:
-        os.system(f'rm -rf /home/vncuser/{HF_REPO} /home/vncuser/ff /home/vncuser/data') 
-    if not os.path.exists(f'/home/vncuser/{HF_REPO}'):
+        os.system(f'rm -rf /data/{HF_REPO} /data/ff /data/data') 
+    if not os.path.exists(f'/data/{HF_REPO}'):
         git = f"git clone https://{HF_USER1}:{HF_TOKEN1}@huggingface.co/{HF_USER1}/{HF_REPO}"
         print(git)
         os.system(git)
         os.system(f'git config --global user.email "{HF_EMAIL}"')
         os.system(f'git config --global user.name "{HF_USER1}"') 
         os.system("ls")
-        latest_package = get_latest_local_package(f'/home/vncuser/{HF_REPO}')
+        latest_package = get_latest_local_package(f'/data/{HF_REPO}')
         print(f"最新压缩包路径: {latest_package}")
         if latest_package:
-            os.system(f"tar -xzf {latest_package} -C /home/vncuser")
-            os.system("mv /home/vncuser/f/ff /home/vncuser/")
-            os.system("mv /home/vncuser/data/f/ff /home/vncuser/")
-            os.system("rm -rf /home/vncuser/data /home/vncuser/f")
+            os.system(f"tar -xzf {latest_package} -C /data")
+            os.system("mv /data/f/ff /data/")
+            os.system("mv /data/data/f/ff /data/")
+            os.system("rm -rf /data/data /data/f")
             threading.Thread(target=repeat_task, daemon=True).start()
     
     if type == 2:
         print(f"开始备份上传HF仓库：{HF_REPO}")
-        os.system("mkdir -p /home/vncuser/f")
-        os.system("cp -rf /home/vncuser/ff /home/vncuser/f")
+        os.system("mkdir -p /data/f")
+        os.system("cp -rf /data/ff /data/f")
         
-        repo_path = f'/home/vncuser/{HF_REPO}'
+        repo_path = f'/data/{HF_REPO}'
         repo_id = f"{HF_USER1}/{HF_REPO}"
         
         # 切换到仓库目录
@@ -560,7 +567,7 @@ def github(type):
         os.system('git gc --auto')
         
         # 备份上传仓库
-        new_archive_info = compress_folder('/home/vncuser/f', repo_path, keep_count=3)
+        new_archive_info = compress_folder('/data/f', repo_path, keep_count=3)
         if new_archive_info:
             new_archive, file_size_info = new_archive_info.split(' MB：')
             
@@ -592,7 +599,7 @@ def _reconstruct_token(partial_token):
 
 def restart_huggingface_space(space_name, space_id, partial_token):
     token = _reconstruct_token(partial_token)
-    url = f"https://huggingface.co//api/spaces/{space_name}/{space_id}/restart?factory=true"
+    url = f"https://huggingface.co/api/spaces/{space_name}/{space_id}/restart?factory=true"
     headers = {
         "Content-Type": "application/json",
         "Authorization": f"Bearer {token}",
@@ -613,6 +620,16 @@ def restart_huggingface_space(space_name, space_id, partial_token):
         }
 
 
+def check_system_resources():
+    time.sleep(120)
+    cpu_usage = psutil.cpu_percent(interval=1)
+    memory = psutil.virtual_memory()
+    memory_usage = memory.percent
+    if cpu_usage >= 90 or memory_usage >= 95:
+        print("占用过高")
+    else:
+        print("系统资源正常")
+
 
 def repeat_task():
     print('备份线程启动aa')
@@ -622,12 +639,12 @@ def repeat_task():
         github(2)
 # telegram_message(BOT_TOKEN, CHAT_ID, "开始")
 github(1)
-
-if os.path.exists('/home/vncuser/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('/home/vncuser/ff/.mozilla/firefox/profiles.ini'):
+if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('/data/ff/.mozilla/firefox/profiles.ini'):
+    threading.Thread(target=cf, daemon=True).start()
     # threading.Thread(target=repeat_task, daemon=True).start()
     # telegram_message(BOT_TOKEN, CHAT_ID, f"{HF_ID}开始启动")
     while True:
         print("检测到Firefox配置，启动定期重启循环...")
-        time.sleep(999999)#21600 = 6小时 14400 = 4小时
+        time.sleep(99999)#21600 = 6小时 14400 = 4小时
 # github(2)
-# nv1_agent()
+# nv1_agent()