Update sbx/a/app1.py

sbx/a/app1.py

@@ -214,7 +214,7 @@ ingress:
         with open(os.path.join(FILE_PATH, 'tunnel.yml'), 'w') as f:
             f.write(tunnel_yml)
     else:
-        print("Use token connect to tunnel,please set the {ARGO_PORT} in cloudflare")
+        print("Use token connect to ")
 
 # Execute shell command and return output
 def exec_cmd(command):
@@ -411,8 +411,11 @@ uuid: {UUID}"""
                         "music.youtube.com",
                         "github.com",
                         "www.youtube.com",
+                        "youtube.googleapis.com",
                         "youtube.com",
                         "youtu.be",
+                        "yt3.ggpht.com",
+                        "youtubei.googleapis.com",
                         "googlevideo.com",
                         "ytimg.com",
                         "gstatic.com",
@@ -600,13 +603,24 @@ def send_telegram():
         requests.post(url, params=params)
         print('Telegram message sent successfully')
     except Exception as e:
-        print(f'Failed to send Telegram message: {e}')
+        print(f'Failed to send Telegram message: ')
 
 # Generate links and subscription content
 async def generate_links(argo_domain):
-    meta_info = subprocess.run(['curl', '-s', 'https://speed.cloudflare.com/meta'], capture_output=True, text=True)
-    meta_info = meta_info.stdout.split('"')
-    ISP = f"{meta_info[25]}-{meta_info[17]}".replace(' ', '_').strip()
+    # 使用 requests 或 subprocess 获取数据
+    try:
+        response = requests.get('https://speed.cloudflare.com/meta', timeout=5)
+        if response.status_code == 200:
+            data = response.json()
+            # 从 JSON 字典中安全提取字段，如果不存在则使用默认值
+            asn_organization = data.get('asOrganization', 'Unknown-ISP')
+            city = data.get('city', 'Unknown-City')
+            ISP = f"{asn_organization}-{city}".replace(' ', '_').strip()
+        else:
+            ISP = "Unknown_ISP"
+    except Exception as e:
+        print(f"Failed to fetch ISP info: ")
+        ISP = "Default_ISP"
 
     time.sleep(2)
     VMESS = {"v": "2", "ps": f"{NAME}", "add": 'time.is', "port": CFPORT, "id": UUID, "aid": "0", "scy": "none", "net": "ws", "type": "none", "host": argo_domain, "path": "/vmess-argo?ed=2560", "tls": "tls", "sni": argo_domain, "alpn": "", "fp": "chrome"}
@@ -670,9 +684,9 @@ trojan://{UUID}@cloudflare.cdnjson.com:{CFPORT}?security=tls&sni={argo_domain}&f
     with open(os.path.join(FILE_PATH, 'sub.txt'), 'w', encoding='utf-8') as sub_file:
         sub_file.write(sub_txt)
         
-    print(sub_txt)
+    # print(sub_txt)
     
-    print(f"{FILE_PATH}/sub.txt saved successfully")
+    # print(f"{FILE_PATH}/sub.txt saved successfully")
     
     # Additional actions
     send_telegram()