pymecli 0.4.4__tar.gz → 0.4.5__tar.gz

{pymecli-0.4.4 → pymecli-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymecli
-Version: 0.4.4
+Version: 0.4.5
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli

pymecli-0.4.5/api/v1/clash.py

@@ -0,0 +1,113 @@
+import yaml
+from fastapi import APIRouter, Query, Response
+
+from core.clash import ClashYamlGenerator, get_generator_dependency
+
+router = APIRouter()
+
+
+class NoAnchorDumper(yaml.Dumper):
+    def ignore_aliases(self, data):
+        return True
+
+
+@router.get(
+    "/subpw",
+    summary="转换订阅(可以转换多个订阅),proxy-providers方式合并多个订阅,白名单模式",
+    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
+    response_description="返回YAML格式的Clash配置文件",
+)
+async def subProviderWhite(
+    urls: str = Query(..., description="订阅URL,逗号分隔"),
+    agents: str = Query(
+        "clash-verge/v2.4.3",
+        description="User-Agent,逗号分隔(根据客户段选择)",
+    ),
+    names: str = Query(
+        "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
+    ),
+    generator: ClashYamlGenerator = get_generator_dependency(),
+):
+    # 将JSON字符串解析为Python对象
+    sub_list = generator.query2sub(urls, agents, names)
+    yaml_content, userinfo = generator.genPW(sub_list)
+    yaml_string = yaml.dump(
+        yaml_content,
+        allow_unicode=True,
+        default_flow_style=False,
+        sort_keys=False,
+        # Dumper=NoAnchorDumper,
+    )
+    return Response(
+        headers={"Subscription-Userinfo": userinfo},
+        content=yaml_string,
+        media_type="text/yaml",
+    )
+
+
+@router.get(
+    "/subpb",
+    summary="转换订阅(可以转换多个订阅),proxy-providers方式合并多个订阅, 黑名单模式",
+    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
+    response_description="返回YAML格式的Clash配置文件",
+)
+async def subProviderBlack(
+    urls: str = Query(..., description="订阅URL,逗号分隔"),
+    agents: str = Query(
+        "clash-verge/v2.4.3",
+        description="User-Agent,逗号分隔(根据客户段选择)",
+    ),
+    names: str = Query(
+        "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
+    ),
+    generator: ClashYamlGenerator = get_generator_dependency(),
+):
+    # 将JSON字符串解析为Python对象
+    sub_list = generator.query2sub(urls, agents, names)
+    yaml_content, userinfo = generator.genPB(sub_list)
+    yaml_string = yaml.dump(
+        yaml_content,
+        allow_unicode=True,
+        default_flow_style=False,
+        sort_keys=False,
+        # Dumper=NoAnchorDumper,
+    )
+    return Response(
+        headers={"Subscription-Userinfo": userinfo},
+        content=yaml_string,
+        media_type="text/yaml",
+    )
+
+
+@router.get(
+    "/subb",
+    summary="转换订阅(可以转换多个订阅),拼接proxies的方式合并多个订阅, 黑名单模式",
+    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
+    response_description="返回YAML格式的Clash配置文件",
+)
+async def subBlack(
+    urls: str = Query(..., description="订阅URL,逗号分隔"),
+    agents: str = Query(
+        "clash-verge/v2.4.3",
+        description="User-Agent,逗号分隔(根据客户段选择)",
+    ),
+    names: str = Query(
+        "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
+    ),
+    generator: ClashYamlGenerator = get_generator_dependency(),
+):
+    # 将JSON字符串解析为Python对象
+    sub_list = generator.query2sub(urls, agents, names)
+    yaml_content, userinfo = generator.genB(sub_list)
+    yaml_string = yaml.dump(
+        yaml_content,
+        allow_unicode=True,
+        default_flow_style=False,
+        sort_keys=False,
+        # Dumper=NoAnchorDumper,
+    )
+    return Response(
+        headers={"Subscription-Userinfo": userinfo},
+        content=yaml_string,
+        media_type="text/yaml",
+    )

{pymecli-0.4.4 → pymecli-0.4.5}/cli/fast.py

@@ -136,13 +136,13 @@ def run_app(
         help="ssl certfile",
     ),
     rule: str = typer.Option(
-        "https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release",
+        "https://fastly.jsdelivr.net/gh/Loyalsoldier/clash-rules@release",
         "--rule",
         "-r",
         help="clash Rule base URL",
     ),
     my_rule: str = typer.Option(
-        "https://raw.githubusercontent.com/meme2046/data/refs/heads/main/clash",
+        "https://fastly.jsdelivr.net/gh/meme2046/data@main/clash",
         "--my-rule",
         "-mr",
         help="my clash rule base URL(自定义规则)",

{pymecli-0.4.4 → pymecli-0.4.5}/core/clash.py

@@ -22,7 +22,7 @@ class ClashYamlGenerator:
         self.request_proxy = config.request_proxy
 
     # 白名单模式 Rules 配置方式
-    def genW(self, sub_list: list[dict]):
+    def genPW(self, sub_list: list[dict]):
         proxies = None
         if self.request_proxy:
             proxies = {
@@ -103,13 +103,6 @@ class ClashYamlGenerator:
                 },
             )
 
-        template["rules"].append("IP-CIDR,192.168.0.0/16,DIRECT,no-resolve")
-        template["rules"].append("IP-CIDR,10.0.0.0/8,DIRECT,no-resolve")
-        template["rules"].append("IP-CIDR,172.16.0.0/12,DIRECT,no-resolve")
-        template["rules"].append("IP-CIDR,127.0.0.0/8,DIRECT,no-resolve")
-
-        template["rules"].append("DOMAIN,clash.razord.top,DIRECT")
-        template["rules"].append("DOMAIN,yacd.haishan.me,DIRECT")
         # 获取rules
         rule_list = [
             [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
@@ -251,7 +244,7 @@ class ClashYamlGenerator:
         return template, userinfo
 
     # 黑名单模式 Rules 配置方式
-    def genB(self, sub_list: list[dict]):
+    def genPB(self, sub_list: list[dict]):
         proxies = None
         if self.request_proxy:
             proxies = {
@@ -442,6 +435,185 @@ class ClashYamlGenerator:
 
         return template, userinfo
 
+    def genB(self, sub_list: list[dict]):
+        proxies = None
+        if self.request_proxy:
+            proxies = {
+                "http": self.request_proxy,
+                "https": self.request_proxy,
+            }
+
+        with open(str(module_dir / "data/template.yaml"), "r", encoding="utf-8") as f:
+            template = yaml.safe_load(f)
+
+        template["proxy-groups"].extend(
+            [
+                {
+                    "name": "全局选择",
+                    "type": "select",
+                    "proxies": ["自动选择", "手动选择", "轮询"]
+                    + [item["name"] for item in sub_list],
+                },
+                {
+                    "name": "自动选择",
+                    "type": "url-test",
+                    "include-all": True,
+                },
+                {
+                    "name": "手动选择",
+                    "type": "select",
+                    "include-all": True,
+                },
+                {
+                    "name": "轮询",
+                    "type": "load-balance",
+                    "url": "https://api.bitget.com/api/v2/public/time",
+                    "strategy": "round-robin",
+                    "include-all": True,
+                },
+            ]
+        )
+
+        userinfo = ""
+        template["proxies"] = []
+        for item in sub_list:
+            headers = {"User-Agent": item["user_agent"]} if item["user_agent"] else {}
+
+            if not item["url"]:
+                raise ValueError("Invalid subscription URL.")
+            response = requests.get(item["url"], headers=headers, proxies=proxies)
+            response.raise_for_status()
+            if not userinfo:
+                userinfo = response.headers["Subscription-Userinfo"]
+            remote_config = yaml.safe_load(response.text)
+
+            # 检查 remote_config 是否为 None
+            if remote_config is None:
+                raise ValueError("Invalid subscription content: empty or invalid YAML.")
+
+            ps = remote_config.get("proxies", [])
+            if not ps:
+                raise ValueError("No proxies found in subscription.")
+
+            template["proxies"].extend(ps)
+
+            template["proxy-groups"].append(
+                {
+                    "name": item["name"],
+                    "type": "url-test",
+                    "proxies": [item["name"] for item in ps],
+                },
+            )
+
+        template["rules"].append("IP-CIDR,192.168.0.0/16,DIRECT,no-resolve")
+        template["rules"].append("IP-CIDR,10.0.0.0/8,DIRECT,no-resolve")
+        template["rules"].append("IP-CIDR,172.16.0.0/12,DIRECT,no-resolve")
+        template["rules"].append("IP-CIDR,127.0.0.0/8,DIRECT,no-resolve")
+        # ⬇️饥荒服务器相关端口
+        template["rules"].append("DST-PORT,10999,DIRECT")
+        template["rules"].append("DST-PORT,10998,DIRECT")
+        template["rules"].append("DST-PORT,27016,DIRECT")
+        template["rules"].append("DST-PORT,27017,DIRECT")
+        template["rules"].append("DST-PORT,8766,DIRECT")
+        template["rules"].append("DST-PORT,8767,DIRECT")
+
+        template["rules"].append("DOMAIN,clash.razord.top,DIRECT")
+        template["rules"].append("DOMAIN,yacd.haishan.me,DIRECT")
+        # template["rules"].append("DOMAIN,accounts.klei.com,全局选择")
+
+        # 获取rules
+        rule_list = [
+            [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
+            [f"{self.my_rule_base_url}/proxy.yaml", "全局选择"],
+            [
+                f"{self.my_rule_base_url}/round.yaml",
+                "轮询",
+            ],
+            [
+                f"{self.my_rule_base_url}/reject.yaml",
+                "REJECT",
+            ],
+        ]
+
+        for item in rule_list:
+            response = requests.get(item[0], proxies=proxies)
+            response.raise_for_status()
+            remote = yaml.safe_load(response.text)
+            template["rule-providers"][os.path.basename(item[0])] = {
+                "type": "inline",
+                "behavior": "classical",
+                "payload": remote["payload"],
+            }
+
+            template["rules"].append(f"RULE-SET,{os.path.basename(item[0])},{item[1]}")
+
+        template["rule-providers"].update(
+            {
+                "applications": {
+                    "type": "http",
+                    "format": "yaml",
+                    "behavior": "classical",
+                    "url": f"{self.rule_base_url}/applications.txt",
+                    "path": "./ruleset/applications.yaml",
+                    "interval": 86400,
+                },
+                "private": {
+                    "type": "http",
+                    "format": "yaml",
+                    "behavior": "domain",
+                    "url": f"{self.rule_base_url}/private.txt",
+                    "path": "./ruleset/private.yaml",
+                    "interval": 86400,
+                },
+                "tld-not-cn": {
+                    "type": "http",
+                    "format": "yaml",
+                    "behavior": "domain",
+                    "url": f"{self.rule_base_url}/tld-not-cn.txt",
+                    "path": "./ruleset/tld-not-cn.yaml",
+                    "interval": 86400,
+                },
+                "telegramcidr": {
+                    "type": "http",
+                    "format": "yaml",
+                    "behavior": "ipcidr",
+                    "url": f"{self.rule_base_url}/telegramcidr.txt",
+                    "path": "./ruleset/telegramcidr.yaml",
+                    "interval": 86400,
+                },
+                "gfw": {
+                    "type": "http",
+                    "format": "yaml",
+                    "behavior": "domain",
+                    "url": f"{self.rule_base_url}/gfw.txt",
+                    "path": "./ruleset/gfw.yaml",
+                    "interval": 86400,
+                },
+                # "reject": {
+                #     "type": "http",
+                #     "format": "yaml",
+                #     "behavior": "domain",
+                #     "url": f"{self.rule_base_url}/reject.txt",
+                #     "path": "./ruleset/reject.yaml",
+                #     "interval": 86400,
+                # },
+            },
+        )
+
+        template["rules"].extend(
+            [
+                "RULE-SET,applications,DIRECT",
+                "RULE-SET,private,DIRECT",
+                # "RULE-SET,reject,REJECT",
+                "RULE-SET,tld-not-cn,全局选择",
+                "RULE-SET,gfw,全局选择",
+                "RULE-SET,telegramcidr,全局选择",
+                "MATCH,DIRECT",
+            ]
+        )
+
+        return template, userinfo
+
     def query2sub(self, urls: str, agents: str, names: str):
         url_list = urls.split(",") if urls and urls.strip() else []
         agents_list = agents.split(",") if agents else []

{pymecli-0.4.4 → pymecli-0.4.5}/data/template.yaml

@@ -1,70 +1,70 @@
-mixed-port: 7897
-allow-lan: false
-mode: rule
-log-level: warning
-external-controller: "127.0.0.1:9097"
-client-fingerprint: chrome
-unified-delay: true
-ipv6: false
-profile:
-  store-selected: true
-tun:
-  mtu: 1500
-dns:
-  enable: true
-  listen: ":53"
-  enhanced-mode: "fake-ip"
-  fake-ip-range: "198.18.0.1/16"
-  fake-ip-filter-mode: "blacklist"
-  prefer-h3: false
-  respect-rules: false
-  use-hosts: false
-  use-system-hosts: false
-  ipv6: true
-  fake-ip-filter:
-    - "*.lan"
-    - "*.local"
-    - "*.arpa"
-    - "time.*.com"
-    - "ntp.*.com"
-    - "time.*.com"
-    - "+.market.xiaomi.com"
-    - "localhost.ptlogin2.qq.com"
-    - "*.msftncsi.com"
-    - "www.msftconnecttest.com"
-  default-nameserver:
-    - "system"
-    - "223.6.6.6"
-    - "8.8.8.8"
-    - "2400:3200::1"
-    - "2001:4860:4860::8888"
-  nameserver:
-    - "8.8.8.8"
-    - "https://doh.pub/dns-query"
-    - "https://dns.alidns.com/dns-query"
-  direct-nameserver-follow-policy: false
-  fallback-filter:
-    geoip: true
-    geoip-code: "CN"
-    ipcidr:
-      - "240.0.0.0/4"
-      - "0.0.0.0/32"
-    domain:
-      - "+.google.com"
-      - "+.facebook.com"
-      - "+.youtube.com"
-  fallback: []
-  proxy-server-nameserver:
-    - "https://doh.pub/dns-query"
-    - "https://dns.alidns.com/dns-query"
-    - "tls://223.5.5.5"
-  direct-nameserver: []
-external-controller-cors:
-  allow-private-network: true
-  allow-origins:
-    - "*"
-proxies: []
-proxy-providers: {}
-proxy-groups: []
-rule-providers: {}
-rules: []
+mixed-port: 7897
+allow-lan: false
+mode: rule
+log-level: warning
+external-controller: "127.0.0.1:9097"
+client-fingerprint: chrome
+unified-delay: true
+ipv6: false
+profile:
+  store-selected: true
+tun:
+  mtu: 1500
+dns:
+  enable: true
+  listen: ":53"
+  enhanced-mode: "fake-ip"
+  fake-ip-range: "198.18.0.1/16"
+  fake-ip-filter-mode: "blacklist"
+  prefer-h3: false
+  respect-rules: false
+  use-hosts: false
+  use-system-hosts: false
+  ipv6: true
+  fake-ip-filter:
+    - "*.lan"
+    - "*.local"
+    - "*.arpa"
+    - "time.*.com"
+    - "ntp.*.com"
+    - "time.*.com"
+    - "+.market.xiaomi.com"
+    - "localhost.ptlogin2.qq.com"
+    - "*.msftncsi.com"
+    - "www.msftconnecttest.com"
+  default-nameserver:
+    - "system"
+    - "223.6.6.6"
+    - "8.8.8.8"
+    - "2400:3200::1"
+    - "2001:4860:4860::8888"
+  nameserver:
+    - "8.8.8.8"
+    - "https://doh.pub/dns-query"
+    - "https://dns.alidns.com/dns-query"
+  direct-nameserver-follow-policy: false
+  fallback-filter:
+    geoip: true
+    geoip-code: "CN"
+    ipcidr:
+      - "240.0.0.0/4"
+      - "0.0.0.0/32"
+    domain:
+      - "+.google.com"
+      - "+.facebook.com"
+      - "+.youtube.com"
+  fallback: []
+  proxy-server-nameserver:
+    - "https://doh.pub/dns-query"
+    - "https://dns.alidns.com/dns-query"
+    - "tls://223.5.5.5"
+  direct-nameserver: []
+external-controller-cors:
+  allow-private-network: true
+  allow-origins:
+    - "*"
+proxies: []
+proxy-providers: {}
+proxy-groups: []
+rule-providers: {}
+rules: []

{pymecli-0.4.4 → pymecli-0.4.5}/pyproject.toml

@@ -32,7 +32,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.4.4"
+  version = "0.4.5"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"

pymecli-0.4.4/api/v1/clash.py

@@ -1,62 +0,0 @@
-import yaml
-from fastapi import APIRouter, Query, Response
-
-from core.clash import ClashYamlGenerator, get_generator_dependency
-
-router = APIRouter()
-
-
-@router.get(
-    "/subwhite",
-    summary="转换订阅(可以转换多个订阅)",
-    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
-    response_description="返回YAML格式的Clash配置文件",
-)
-async def subWhite(
-    urls: str = Query(..., description="订阅URL,逗号分隔"),
-    agents: str = Query(
-        "clash-verge/v2.4.3",
-        description="User-Agent,逗号分隔(根据客户段选择)",
-    ),
-    names: str = Query(
-        "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
-    ),
-    generator: ClashYamlGenerator = get_generator_dependency(),
-):
-    # 将JSON字符串解析为Python对象
-    sub_list = generator.query2sub(urls, agents, names)
-    yaml_content, userinfo = generator.genW(sub_list)
-    yaml_string = yaml.dump(yaml_content, allow_unicode=True, default_flow_style=False)
-    return Response(
-        headers={"Subscription-Userinfo": userinfo},
-        content=yaml_string,
-        media_type="text/yaml",
-    )
-
-
-@router.get(
-    "/subblack",
-    summary="转换订阅(可以转换多个订阅)",
-    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
-    response_description="返回YAML格式的Clash配置文件",
-)
-async def subBlack(
-    urls: str = Query(..., description="订阅URL,逗号分隔"),
-    agents: str = Query(
-        "clash-verge/v2.4.3",
-        description="User-Agent,逗号分隔(根据客户段选择)",
-    ),
-    names: str = Query(
-        "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
-    ),
-    generator: ClashYamlGenerator = get_generator_dependency(),
-):
-    # 将JSON字符串解析为Python对象
-    sub_list = generator.query2sub(urls, agents, names)
-    yaml_content, userinfo = generator.genB(sub_list)
-    yaml_string = yaml.dump(yaml_content, allow_unicode=True, default_flow_style=False)
-    return Response(
-        headers={"Subscription-Userinfo": userinfo},
-        content=yaml_string,
-        media_type="text/yaml",
-    )