pymecli 0.4.2__tar.gz → 0.4.3__tar.gz

{pymecli-0.4.2 → pymecli-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymecli
-Version: 0.4.2
+Version: 0.4.3
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -43,4 +43,6 @@ uv run example goodbye Xiaoming -f
 
 ```shell
 uv run fast --port 8877
+uv build
+uv publish --token (TOKEN)
 ```

{pymecli-0.4.2 → pymecli-0.4.3}/README.md

@@ -11,4 +11,6 @@ uv run example goodbye Xiaoming -f
 
 ```shell
 uv run fast --port 8877
+uv build
+uv publish --token (TOKEN)
 ```

pymecli-0.4.3/api/v1/clash.py

@@ -0,0 +1,62 @@
+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",
+    )

{pymecli-0.4.2 → pymecli-0.4.3}/core/clash.py

@@ -21,7 +21,8 @@ class ClashYamlGenerator:
         self.my_rule_base_url = config.my_rule_base_url
         self.request_proxy = config.request_proxy
 
-    def gen(self, sub_list: list[dict]):
+    # 白名单模式 Rules 配置方式
+    def genW(self, sub_list: list[dict]):
         proxies = None
         if self.request_proxy:
             proxies = {
@@ -57,7 +58,7 @@ class ClashYamlGenerator:
                 {
                     "name": "轮询",
                     "type": "load-balance",
-                    "url": "https://www.gstatic.com/generate_204",
+                    "url": "https://api.bitget.com/api/v2/public/time",
                     "interval": 300,
                     "lazy": True,
                     "strategy": "round-robin",
@@ -102,10 +103,13 @@ 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")
-        template["rules"].append("DOMAIN-SUFFIX,kleientertainment.com,全局选择")
-        template["rules"].append("DOMAIN-SUFFIX,klei.com,全局选择")
         # 获取rules
         rule_list = [
             [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
@@ -115,8 +119,8 @@ class ClashYamlGenerator:
                 "轮询",
             ],
             [
-                f"{self.my_rule_base_url}/xbox.yaml",
-                "全局选择",
+                f"{self.my_rule_base_url}/reject.yaml",
+                "REJECT",
             ],
         ]
 
@@ -214,6 +218,14 @@ class ClashYamlGenerator:
                     "path": "./ruleset/telegramcidr.yaml",
                     "interval": 86400,
                 },
+                # "reject": {
+                #     "type": "http",
+                #     "format": "yaml",
+                #     "behavior": "domain",
+                #     "url": f"{self.rule_base_url}/reject.txt",
+                #     "path": "./ruleset/reject.yaml",
+                #     "interval": 86400,
+                # },
             },
         )
 
@@ -221,22 +233,215 @@ class ClashYamlGenerator:
             [
                 "RULE-SET,applications,DIRECT",
                 "RULE-SET,private,DIRECT",
+                # "RULE-SET,reject,REJECT",
                 "RULE-SET,icloud,DIRECT",
                 "RULE-SET,apple,DIRECT",
                 "RULE-SET,google,全局选择",
                 "RULE-SET,proxy,全局选择",
                 "RULE-SET,direct,DIRECT",
-                "RULE-SET,lancidr,DIRECT,no-resolve",
-                "RULE-SET,cncidr,DIRECT,no-resolve",
+                "RULE-SET,lancidr,DIRECT",
+                "RULE-SET,cncidr,DIRECT",
                 "RULE-SET,telegramcidr,全局选择",
-                "GEOIP,LAN,DIRECT,no-resolve",
-                "GEOIP,CN,DIRECT,no-resolve",
+                "GEOIP,LAN,DIRECT",
+                "GEOIP,CN,DIRECT",
                 "MATCH,全局选择",
             ]
         )
 
         return template, userinfo
 
+    # 黑名单模式 Rules 配置方式
+    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",
+                    "url": "https://www.gstatic.com/generate_204",
+                    "interval": 300,
+                    "tolerance": 11,
+                    "lazy": True,
+                    "use": [f"provider.{item['name']}" for item in sub_list],
+                },
+                {
+                    "name": "手动选择",
+                    "type": "select",
+                    "use": [f"provider.{item['name']}" for item in sub_list],
+                },
+                {
+                    "name": "轮询",
+                    "type": "load-balance",
+                    "url": "https://api.bitget.com/api/v2/public/time",
+                    "interval": 300,
+                    "lazy": True,
+                    "strategy": "round-robin",
+                    "use": [f"provider.{item['name']}" for item in sub_list],
+                },
+            ]
+        )
+
+        userinfo = ""
+        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["proxy-providers"][f"provider.{item['name']}"] = {
+                "type": "inline",
+                "payload": ps,
+            }
+
+            template["proxy-groups"].append(
+                {
+                    "name": item["name"],
+                    "type": "url-test",
+                    "url": "https://www.gstatic.com/generate_204",
+                    "interval": 300,
+                    "tolerance": 11,
+                    "lazy": True,
+                    "use": [f"provider.{item['name']}"],
+                },
+            )
+
+        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.2 → pymecli-0.4.3}/data/template.yaml

@@ -12,15 +12,15 @@ tun:
   mtu: 1500
 dns:
   enable: true
-  listen: ":5353"
+  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 # 是否让 DNS 解析遵循路由规则
-  use-hosts: true # 启用本地 hosts
-  use-system-hosts: true # 启用系统 hosts
-  ipv6: false
+  respect-rules: false
+  use-hosts: false
+  use-system-hosts: false
+  ipv6: true
   fake-ip-filter:
     - "*.lan"
     - "*.local"
@@ -32,22 +32,17 @@ dns:
     - "localhost.ptlogin2.qq.com"
     - "*.msftncsi.com"
     - "www.msftconnecttest.com"
-    - "ipv6.shuzilm.cn"
-    - "+.qq.com"
-    - "+.tgp.qq.com"
-    - "+.klei.com"
-    - "+.steamserver.net"
-    - "dontstarve_rail_x64.exe"
-  default-nameserver: # 默认 DNS 服务器
-    - "223.5.5.5" # 阿里云 DNS（国内）
-    - "8.8.8.8" # Google DNS（国外）
-    - "2400:3200::1" # 阿里云 IPv6 DNS
-    - "2001:4860:4860::8888" # Google IPv6 DNS
+  default-nameserver:
+    - "system"
+    - "223.6.6.6"
+    - "8.8.8.8"
+    - "2400:3200::1"
+    - "2001:4860:4860::8888"
   nameserver:
-    - "8.8.8.8" # Google DNS（UDP 协议）
-    - "https://doh.pub/dns-query" # 公共 DoH DNS（加密解析，防污染）
-    - "https://dns.alidns.com/dns-query" # 阿里云 DoH DNS（国内稳定）
-  fallback: []
+    - "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"
@@ -58,11 +53,11 @@ dns:
       - "+.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-follow-policy: false # 直连域名的 DNS 不遵循代理规则
   direct-nameserver: []
 external-controller-cors:
   allow-private-network: true

{pymecli-0.4.2 → pymecli-0.4.3}/pyproject.toml

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

pymecli-0.4.2/api/v1/clash.py

@@ -1,34 +0,0 @@
-import yaml
-from fastapi import APIRouter, Query, Response
-
-from core.clash import ClashYamlGenerator, get_generator_dependency
-
-router = APIRouter()
-
-
-@router.get(
-    "/sub",
-    summary="转换订阅(可以转换多个订阅)",
-    description="根据提供的URL、User-Agent和名称获取并处理订阅信息,返回YAML格式的Clash配置",
-    response_description="返回YAML格式的Clash配置文件",
-)
-async def sub(
-    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.gen(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",
-    )