Upload 10 files

getNode.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import requests
+
 from server.decoder import decode_url_to_configs
-from server.utils import config,headers
 import random
 from fastapi import APIRouter,BackgroundTasks
-from randomSubscribeUrl import subscription_link_list,getRandomSubscribeUrl,delete_invalid_url_in_txt
+from server.utils import subscription_link_list,getRandomSubscribeUrl,delete_invalid_url_in_txt
 
 
 router = APIRouter()
@@ -22,24 +21,11 @@ def getNode(background_tasks: BackgroundTasks)->str:
     return NodeStr
 
 def RandomNode(NodeList:list)->str:
-    #返回一个节点信息（优先trojan和vmess，因为ss存活辣鸡）
-    # 检查列表中是否存在以'trojan'或'vmess'开头的项
-    trojan_vmess_nodes = [node for node in NodeList if node.startswith('trojan') or node.startswith('vmess')]
-    
-    # 如果存在以'trojan'或'vmess'开头的项，则从这些项中随机选择一个返回
-    if trojan_vmess_nodes:
-        return random.choice(trojan_vmess_nodes)
-    else:
-        # 否则从整个列表中随机选择一个返回
-        return random.choice(NodeList)
-
+    #返回一个节点信息
+    return random.choice(NodeList)
 
 
 def dump_configs(url:str)->list:
     #返回全部节点信息的列表
     configs = decode_url_to_configs(url)
-    return configs
-
-
-
-
+    return configs

getServerList.py

@@ -3,7 +3,7 @@
 from server.decoder import decode_url_to_configs
 import base64
 from fastapi import APIRouter,BackgroundTasks
-from randomSubscribeUrl import subscription_link_list,getRandomSubscribeUrl
+from server.utils import subscription_link_list
 
 
 router = APIRouter()
@@ -27,7 +27,6 @@ def getServerList(background_tasks: BackgroundTasks)->str:
 
     # 将所有节点拼接成一个字符串，每个节点之间用换行符分隔
     combined_links = "\n".join(all_node_lists)
-    # 将字符串转换为字节串
     combined_links_bytes = combined_links.encode("utf-8")
     # 对字节串进行 Base64 编码
     encoded_links = base64.b64encode(combined_links_bytes)

randomSubscribeUrl.py

@@ -1,108 +1,33 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-import requests
-import random
-from fastapi import APIRouter, BackgroundTasks
-
-
-
-
-# 添加headers模拟浏览器访问（针对juzi等特殊订阅）
-headers = {
-    'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-    'accept-language': 'zh-CN,zh;q=0.9',
-    'cache-control': 'max-age=0',
-    'priority': 'u=0, i',
-    'sec-ch-ua': '"Chromium";v="128", "Not;A=Brand";v="24", "Google Chrome";v="128"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"macOS"',
-    'sec-fetch-dest': 'document',
-    'sec-fetch-mode': 'navigate',
-    'sec-fetch-site': 'none',
-    'sec-fetch-user': '?1',
-    'upgrade-insecure-requests': '1',
-    'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
-}
-
-
-def is_subscription_link_valid(subscribeUrl: str) -> bool:
-    try:
-        result = requests.get(subscribeUrl,headers=headers).text
-        if "error" in result:
-            return False
-        return True
-    except Exception as e:
-        #这里如果只是请求超时那么认为正常返回true，比如juzi sub判断时候连接超时
-        print('判断sub link是否有效时候发生错误:',e)
-        return True
-
-
-def delete_invalid_url_in_txt(fileName: str) -> "void":
-    valid_lines = []
-    with open(fileName, "r") as file:
-        lines = file.readlines()
-    for line in lines:
-        email = line.strip().split(",")[0]
-        subscription_url = line.strip().split(",")[1]
-        if is_subscription_link_valid(subscription_url):
-            valid_lines.append(line)
-        else:
-            print(email + "订阅已经不可用")
-    # 将有效行重新写回文件
-    with open(fileName, "w") as file:
-        file.writelines(valid_lines)
-
-
-def subscription_link_list(fileName: str) -> list:
-    SubscribeUrlList = []
-    with open(fileName, "r") as f:
-        lines = f.readlines()
-    for line in lines:
-        subscription_url = line.strip().split(",")[1]
-        SubscribeUrlList.append(subscription_url)
-    return SubscribeUrlList
-
-
-def subscription_link_valid_list(SubscribeUrlList: list) -> list:
-    valid_link_list = list(filter(lambda f: is_subscription_link_valid(f), SubscribeUrlList))
-    ##返回可用订阅链接前对原始文件进行删除不可用链接操作:
-    return valid_link_list
-
-
-def read_random_line(fileName: str) -> str:
-    with open(fileName, "r") as file:
-        lines = file.readlines()
-    return random.choice(lines)
-
-
-def getRandomSubscribeUrl(validSubscribeUrlList: list) -> str:
-    # 返回一个可用的订阅链接信息
-    return random.choice(validSubscribeUrlList)
-
-
-router = APIRouter()
-
-#此接口目前唯一作用是方便调试查看订阅剩余状态
-@router.get('/')
-def returnRandomSubscribeUrl(background_tasks: BackgroundTasks) -> str:
-    # 返回一个可用的订阅链接信息
-    SubscribeUrlList = subscription_link_list(router.fileName)
-    #直接用现成的认为可用然后直接返回，之后再删不可用的
-    result = getRandomSubscribeUrl(SubscribeUrlList)
-    background_tasks.add_task(delete_invalid_url_in_txt, router.fileName)
-    return result
-
-    # return hf_test()
-
-
-
-
-if __name__ == "__main__":
-    print()
-
-    ##思路是随机选取一行订阅检测，如果没问题就返回
-    # 1订阅有问题，那么
-    ##1->对全部订阅扫描，删除不可用的，然后重新随机一个返回,此返回时不用检测
-    ##2->如果扫描后没有可用的，那么不做处理让vercel报错
-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from fastapi import APIRouter, BackgroundTasks
+from server.utils import *
+
+
+
+router = APIRouter()
+
+#此接口目前唯一作用是方便调试查看订阅剩余状态
+@router.get('/')
+def returnRandomSubscribeUrl(background_tasks: BackgroundTasks) -> str:
+    # 返回一个可用的订阅链接信息
+    SubscribeUrlList = subscription_link_list(router.fileName)
+    #直接用现成的认为可用然后直接返回，之后再删不可用的
+    result = getRandomSubscribeUrl(SubscribeUrlList)
+    background_tasks.add_task(delete_invalid_url_in_txt, router.fileName)
+    return result
+
+    # return hf_test()
+
+
+
+
+if __name__ == "__main__":
+    print()
+
+    ##思路是随机选取一行订阅检测，如果没问题就返回
+    # 1订阅有问题，那么
+    ##1->对全部订阅扫描，删除不可用的，然后重新随机一个返回,此返回时不用检测
+    ##2->如果扫描后没有可用的，那么不做处理让vercel报错
+
     # 1订阅一个都没有，那么vercel错误提醒(不做处理考虑就行)

server/decoder.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import re
-import json
-from base64 import b64decode
 from typing import Dict, Iterator, List, Union
 from .resource import Resource
 from dataclasses import dataclass
 from urllib import parse
+import json,re
+from base64 import b64decode,b64encode
+from .utils import decode_base64_with_filter,truncate_encoded_string
+
 
 
 class BaseDecoder:
@@ -30,23 +31,7 @@ class EncodedCfg:
     nameinfo: str = ""
 
 
-def decode_base64_with_filter(encoded_str):
-    # 定义合法的 Base64 字符集（包括字母、数字、加号、斜杠和等号）
-    base64_pattern = re.compile(r'[^A-Za-z0-9+/=]')
-
-    # 过滤掉非 Base64 字符
-    filtered_str = base64_pattern.sub('', encoded_str)
 
-    # 确保字符串长度是4的倍数（Base64编码要求）
-    while len(filtered_str) % 4:
-        filtered_str += '='
-
-    try:
-        # 解码
-        decoded_bytes = b64decode(filtered_str)
-        return decoded_bytes.decode('utf-8')
-    except Exception as e:
-        return f"解码失败: {e}"
 
 class ListDecoder(BaseDecoder):
     def iter_encode_config(self) -> Iterator[EncodedCfg]:
@@ -65,20 +50,29 @@ class ListDecoder(BaseDecoder):
                 # 使用正则表达式去除 type=... 参数，包括#前的部分
                 # 这里我们匹配 &type= 后面跟着任意字符直到下一个 & 或 # 或字符串结束 ,去除type=tcp== 或者type=tcp= 这类影响链接的多余部分
                 _encoded_config_str_without_type = re.sub(r'([&?]type=[^&#]*)', '',_encoded_config_str)
+
                 if "allowInsecure" in config_str:
-                    yield _encoded_config_str_without_type.replace('allowInsecure=0', 'allowInsecure=1')+"#"+nameinfo
+                    yield _encoded_config_str_without_type.replace('allowInsecure=0', 'allowInsecure=1')+"#"+truncate_encoded_string(nameinfo) # 适当缩短name
                 else:
-                    yield _encoded_config_str_without_type+"&allowInsecure=1"+"#"+nameinfo
+                    yield _encoded_config_str_without_type+"&allowInsecure=1"+"#"+truncate_encoded_string(nameinfo) # 适当缩短name
 
+            # vmess无法获取到nameinfo 因为在里面的ps这个key对于的value作为remark
             if ("vmess" in config_str):
                 vmess_decoded_data = decode_base64_with_filter(_config_str)
                 vmess_info_json = json.loads(vmess_decoded_data)
                 vmess_info_str = json.dumps(vmess_info_json,ensure_ascii=False)#不转译中文
                 if ('倍率提示'not in vmess_info_str)and('导航' not in vmess_info_str) and('443' not in vmess_info_str):
-                    yield config_str.replace('allowInsecure=0', 'allowInsecure=1')
-            if ("ss://" in config_str) and ("套餐" not in nameinfo) and('到期' not in nameinfo) and('流量' not in nameinfo) and('剩余' not in nameinfo) and ('专线' not in nameinfo):
+                    # 获取 ps 对应的remark值
+                    ps_value = vmess_info_json.get('ps', '')  # 如果 'ps' 键不存在，默认值为空字符串
+                    # 如果 ps_value 不为空，则调用 truncate_encoded_string 函数并更新值。如果 ps_value 为空，则保持原值（空字符串）。
+                    vmess_info_json['ps'] = truncate_encoded_string(ps_value) if ps_value else ps_value
+                    vmess_node_return = 'vmess://'+b64encode(json.dumps(vmess_info_json,ensure_ascii=False).encode("utf-8")).decode("utf-8")
+                    yield vmess_node_return
+
+            # 不能简单判断ss:// 因为vmess://也包含ss://
+            if (config_str.startswith("ss://")) and ("套餐" not in nameinfo) and('到期' not in nameinfo) and('流量' not in nameinfo) and('剩余' not in nameinfo) and ('专线' not in nameinfo):
                 #shadowsocks节点保留
-                yield  config_str
+                yield 'ss://'+_config_str+'#'+truncate_encoded_string(nameinfo)
 
 class ConfigDecoder(BaseDecoder):
     def get_json(self) -> Dict:

server/resource.py

@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import requests
@@ -8,24 +9,11 @@ class Resource:
     def __init__(self, url: str):
         self.url = url
         self.cutted_str: str
-        self.cutted_str_save_file = 'subscribe_data_encoded.txt'  # 添加一个文件路径存储前得到的 cutted_str
-        self.previous_cutted_str:str
         self._get_resource()
 
     def _get_resource(self) -> None:
-        try:
-            request = requests.get(self.url, headers=headers)  
-            self.cutted_str = request.text
-            with open(self.cutted_str_save_file,'w')as f:
-                f.write(self.cutted_str)
-        except Exception as e:
-            with open(self.cutted_str_save_file,'r')as f:
-                 self.previous_cutted_str=f.read()
-                 print(f"请求失败，使用之前的cutted_str",self.previous_cutted_str)
-       
+        request = requests.get(self.url,headers=headers)
+        self.cutted_str = request.text
 
     def get_encoded_data(self) -> str:
-        try:
-            return self.cutted_str + ((4 - len(self.cutted_str) % 4) * "=")
-        except Exception as e:
-            return self.previous_cutted_str + ((4 - len(self.previous_cutted_str) % 4) * "=")
+        return self.cutted_str + ((4 - len(self.cutted_str) % 4) * "=")

server/utils.py

@@ -1,7 +1,12 @@
 import json
 import os
-import hashlib
-import secrets
+import random
+import re
+import urllib.parse
+from base64 import b64decode
+
+import requests
+
 # 获取当前文件所在的目录
 current_dir = os.path.dirname(os.path.realpath(__file__))
 # 读取配置文件
@@ -24,3 +29,101 @@ headers = {
     'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
 }
 
+def decode_base64_with_filter(encoded_str):
+    # 定义合法的 Base64 字符集（包括字母、数字、加号、斜杠和等号）
+    base64_pattern = re.compile(r'[^A-Za-z0-9+/=]')
+    # 过滤掉非 Base64 字符
+    filtered_str = base64_pattern.sub('', encoded_str)
+    # 确保字符串长度是4的倍数（Base64编码要求）
+    while len(filtered_str) % 4:
+        filtered_str += '='
+    try:
+        # 解码
+        decoded_bytes = b64decode(filtered_str)
+        return decoded_bytes.decode('utf-8')
+    except Exception as e:
+        return f"解码失败: {e}"
+
+
+def truncate_encoded_string(encoded_string, max_length=8):
+    """
+    解码 URL 编码的字符串，根据指定的最大长度截断，并将处理后的字符串重新编码为原始的 URL 编码格式。
+    如果解码后的字符串长度超过最大长度，则保留前 max_length 个字符，并在后面加上 '...'。
+
+    参数:
+        encoded_string (str): URL 编码的字符串。
+        max_length (int): 最大保留长度，默认为 12。
+
+    返回:
+        tuple: (解码前的字符串, 处理后的字符串)
+    """
+    # 解码字符串
+    decoded_string = urllib.parse.unquote(encoded_string)
+
+    # 判断解码后字符串的长度
+    if len(decoded_string) > max_length:
+        # 如果长度大于 max_length，保留前 max_length 位，后面用'...'代替
+        truncated_string = decoded_string[:max_length] + "..."
+    else:
+        truncated_string = decoded_string
+
+    # 将处理后的字符串重新编码为 URL 编码格式
+    processed_encoded_string = urllib.parse.quote(truncated_string)
+
+    # 返回解码前的字符串和处理后的字符串（已重新编码）
+    return processed_encoded_string
+
+def subscription_link_list(fileName: str) -> list:
+    SubscribeUrlList = []
+    with open(fileName, "r") as f:
+        lines = f.readlines()
+    for line in lines:
+        subscription_url = line.strip().split(",")[1]
+        SubscribeUrlList.append(subscription_url)
+    return SubscribeUrlList
+
+
+
+## 作用不大的部分
+def is_subscription_link_valid(subscribeUrl: str) -> bool:
+    try:
+        result = requests.get(subscribeUrl,headers=headers).text
+        if "error" in result:
+            return False
+        return True
+    except Exception as e:
+        #这里如果只是请求超时那么认为正常返回true，比如juzi sub判断时候连接超时
+        print('判断sub link是否有效时候发生错误:',e)
+        return True
+
+def delete_invalid_url_in_txt(fileName: str) -> "void":
+    valid_lines = []
+    with open(fileName, "r") as file:
+        lines = file.readlines()
+    for line in lines:
+        email = line.strip().split(",")[0]
+        subscription_url = line.strip().split(",")[1]
+        if is_subscription_link_valid(subscription_url):
+            valid_lines.append(line)
+        else:
+            print(email + "订阅已经不可用")
+    # 将有效行重新写回文件
+    with open(fileName, "w") as file:
+        file.writelines(valid_lines)
+
+
+def subscription_link_valid_list(SubscribeUrlList: list) -> list:
+    valid_link_list = list(filter(lambda f: is_subscription_link_valid(f), SubscribeUrlList))
+    ##返回可用订阅链接前对原始文件进行删除不可用链接操作:
+    return valid_link_list
+
+def read_random_line(fileName: str) -> str:
+    with open(fileName, "r") as file:
+        lines = file.readlines()
+    return random.choice(lines)
+
+
+def getRandomSubscribeUrl(validSubscribeUrlList: list) -> str:
+    # 返回一个可用的订阅链接信息
+    return random.choice(validSubscribeUrlList)
+## 作用不大的部分

server/uu.json

@@ -1,6 +1,7 @@
-{
-    "baseUrl":"https://rogerxavier-v2b-proxy.hf.space",
-    "purchaseLinkBase":"https://afdian.com/order/create?product_type=1",
-    "planID": "ef3c43c6daa411ee965e5254001e7c00",
-    "skuID": "ef440afcdaa411ee9e165254001e7c00"
-}
+
+{
+    "baseUrl":"https://rogerxavier-v2b-proxy.hf.space",
+    "purchaseLinkBase":"https://afdian.com/order/create?product_type=1",
+    "planID": "ef3c43c6daa411ee965e5254001e7c00",
+    "skuID": "ef440afcdaa411ee9e165254001e7c00"
+}

subscribeLink.txt

@@ -1 +1,2 @@
-335,https://sublink.cute-cloud.de/link?token=176ba293ad7f4e3c8ebd53cb6d7eadbc
+335,https://sublink.cute-cloud.de/link?token=176ba293ad7f4e3c8ebd53cb6d7eadbc
+jms from git,https://jmssub.net/members/getsub.php?service=131783&id=a35aa5ea-5893-41bc-86c9-5d283bd9cd68&usedomains=1

validSubCount.py

@@ -4,7 +4,6 @@ import requests
 from fastapi import APIRouter,BackgroundTasks
 
 
-
 def ValidSubCount(fileName:str)->int:
     with open(fileName, "r") as f:
         lines = f.readlines()