pymecli 0.4.2__tar.gz → 0.4.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymecli
-Version: 0.4.2
+Version: 0.4.4
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -22,6 +22,7 @@ Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis[hiredis]>=7.1.0
 Requires-Dist: requests[socks]>=2.32.5
 Requires-Dist: selenium>=4.40.0
+Requires-Dist: slpp>=1.2.3
 Requires-Dist: sqlalchemy>=2.0.45
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: toml>=0.10.2
@@ -42,5 +43,17 @@ uv run example goodbye Xiaoming -f
 # fastapi server
 
 ```shell
-uv run fast --port 8877
+uv run fast --port 8877 # local server
+uv build
+uv publish --token < TOKEN > # publish
+```
+
+# dontstarvetogether
+
+1. 饥荒专服禁client mods使用, 更新client mods version, modoverrides.lua:
+
+```shell
+uv run dst cmu d:/.backups/dontstarvetogether/modoverrides.lua -o c:/.dst/save/Cluster_1/Master/modoverrides.lua -o c:/.dst/save/Cluster_1/Caves/modoverrides.lua
+
+uv run dst cml d:/.backups/dontstarvetogether/modoverrides.lua -m 3486375086
 ```

pymecli-0.4.4/README.md

@@ -0,0 +1,26 @@
+# typer example
+
+```shell
+uv run example hello Xiaoming
+uv run example hello Xiaoming --from Pymecli
+uv run example goodbye Xiaoming
+uv run example goodbye Xiaoming -f
+```
+
+# fastapi server
+
+```shell
+uv run fast --port 8877 # local server
+uv build
+uv publish --token < TOKEN > # publish
+```
+
+# dontstarvetogether
+
+1. 饥荒专服禁client mods使用, 更新client mods version, modoverrides.lua:
+
+```shell
+uv run dst cmu d:/.backups/dontstarvetogether/modoverrides.lua -o c:/.dst/save/Cluster_1/Master/modoverrides.lua -o c:/.dst/save/Cluster_1/Caves/modoverrides.lua
+
+uv run dst cml d:/.backups/dontstarvetogether/modoverrides.lua -m 3486375086
+```

pymecli-0.4.4/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.4/cli/dst.py

@@ -0,0 +1,222 @@
+import re
+from typing import Dict, List, Optional
+
+import requests
+import typer
+from slpp import slpp as lua
+
+app = typer.Typer()
+
+STEAM_API_URL = (
+    "https://api.steampowered.com/ISteamRemoteStorage/GetPublishedFileDetails/v0001"
+)
+
+
+def get_mod_versions(workshop_ids: List[str]) -> Dict[str, Dict[str, Optional[str]]]:
+    if not workshop_ids:
+        return {}
+
+    data = {"itemcount": str(len(workshop_ids))}
+    for i, wid in enumerate(workshop_ids):
+        data[f"publishedfileids[{i}]"] = wid
+
+    try:
+        response = requests.post(STEAM_API_URL, data=data, timeout=15)
+        response.raise_for_status()
+        result = response.json()
+    except Exception as e:
+        typer.secho(f"❌ Steam API 请求失败: {e}", fg=typer.colors.RED)
+        return {}
+
+    versions: Dict[str, Dict[str, Optional[str]]] = {}
+    for detail in result["response"].get("publishedfiledetails", []):
+        publishedfileid = detail.get("publishedfileid")
+        title = detail.get("title")
+        tags = detail.get("tags", [])
+        version = None
+        for tag in tags:
+            tag_str = tag.get("tag", "")
+            if tag_str.startswith("version:"):
+                version = tag_str.replace("version:", "")
+                break
+        versions[publishedfileid] = {"version": version, "title": title}
+
+    return versions
+
+
+def extract_workshop_id(key: str) -> Optional[str]:
+    match = re.match(r"workshop-(\d+)", key)
+    return match.group(1) if match else None
+
+
+def parse_lua_file(file_path: str) -> dict:
+    with open(file_path, "r", encoding="utf-8") as f:
+        source = f.read()
+    source = source.strip()
+    if source.startswith("return"):
+        source = source[6:].strip()
+    result = lua.decode(source)
+    assert isinstance(result, dict)
+    return result
+
+
+def write_lua_file(file_path: str, data: dict):
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write("return " + lua.encode(data) + "\n")
+
+
+def get_client_mods_list(file_path: str, mod_id: str) -> Optional[tuple[dict, dict]]:
+    """
+    解析 lua 文件，返回 (data, client_mods_list)。
+    失败返回 None（错误信息已由函数自行打印）。
+    """
+    try:
+        data = parse_lua_file(file_path)
+    except FileNotFoundError:
+        typer.secho(f"❌ 文件不存在: {file_path}", fg=typer.colors.RED)
+        return None
+    except Exception as e:
+        typer.secho(f"❌ 解析 Lua 文件失败: {e}", fg=typer.colors.RED)
+        return None
+
+    main_mod_key = f"workshop-{mod_id}"
+    main_mod = data.get(main_mod_key)
+    if not main_mod:
+        typer.secho(f"❌ 未找到 {main_mod_key}", fg=typer.colors.RED)
+        return None
+
+    client_mods_list = main_mod.get("configuration_options", {}).get(
+        "client_mods_list", {}
+    )
+    if not client_mods_list:
+        typer.secho("❌ 未找到 client_mods_list", fg=typer.colors.RED)
+        return None
+
+    return data, client_mods_list
+
+
+# update_client_mods
+@app.command()
+def cmu(
+    file_path: str = typer.Argument(
+        "d:/.backups/dontstarvetogether/modoverrides.lua",
+        help="modoverrides.lua 文件路径",
+    ),
+    mod_id: str = typer.Option(
+        "3486375086",
+        "--mod-id",
+        "-m",
+        help="主 mod 的 workshop ID",
+    ),
+    output: List[str] = typer.Option(
+        None,
+        "--output",
+        "-o",
+        help="额外的输出路径，可多次指定",
+    ),
+):
+    result = get_client_mods_list(file_path, mod_id)
+    if result is None:
+        raise typer.Exit(code=1)
+    data, client_mods_list = result
+
+    workshop_ids = []
+    for key in client_mods_list.keys():
+        wid = extract_workshop_id(key)
+        if wid:
+            workshop_ids.append(wid)
+
+    if not workshop_ids:
+        typer.secho("❌ 未找到任何 client_mods", fg=typer.colors.RED)
+        raise typer.Exit(code=1)
+
+    typer.secho(
+        f"🔍 发现 {len(workshop_ids)} 个 client mods，正在查询 Steam API...",
+        fg=typer.colors.BLUE,
+    )
+    versions = get_mod_versions(workshop_ids)
+
+    if not versions:
+        typer.secho("❌ 未能获取版本信息", fg=typer.colors.RED)
+        raise typer.Exit(code=1)
+
+    typer.secho("📝 正在更新版本号...", fg=typer.colors.BLUE)
+    updated_count = 0
+    for mod_key, mod_info in client_mods_list.items():
+        wid = extract_workshop_id(mod_key)
+        if not wid:
+            continue
+        mod_data = versions.get(wid)
+        if mod_data is None:
+            typer.secho(f"⚠️  {mod_key}: 未获取到版本信息", fg=typer.colors.YELLOW)
+            continue
+        new_version = mod_data.get("version")
+        title = mod_data.get("title", "")
+        if new_version is None:
+            typer.secho(
+                f"⚠️  {mod_key} ({title}): 未获取到版本信息", fg=typer.colors.YELLOW
+            )
+            continue
+        old_version = mod_info.get("version")
+        if old_version != new_version:
+            mod_info["version"] = new_version
+            updated_count += 1
+            typer.secho(
+                f"✅ {mod_key} ({title}): {old_version} -> {new_version}",
+                fg=typer.colors.GREEN,
+            )
+        else:
+            typer.secho(
+                f"ℹ️  {mod_key} ({title}): 已是最新版本 {old_version}",
+                fg=typer.colors.WHITE,
+            )
+
+    try:
+        if updated_count > 0:
+            write_lua_file(file_path, data)
+            typer.secho(f"💾 已保存到: {file_path}", fg=typer.colors.CYAN)
+        if output:
+            for p in output:
+                write_lua_file(p, data)
+                typer.secho(f"💾 已保存到: {p}", fg=typer.colors.CYAN)
+    except Exception as e:
+        typer.secho(f"❌ 写入文件失败: {e}", fg=typer.colors.RED)
+        raise typer.Exit(code=1)
+
+    if updated_count > 0:
+        typer.secho(f"\n🎉 成功更新 {updated_count} 个 mod 版本", fg=typer.colors.GREEN)
+    else:
+        typer.secho("\nℹ️  所有 mod 已是最新版本", fg=typer.colors.YELLOW)
+
+
+# list_client_mods
+@app.command()
+def cml(
+    file_path: str = typer.Argument(
+        "d:/.backups/dontstarvetogether/modoverrides.lua",
+        help="modoverrides.lua 文件路径",
+    ),
+    mod_id: str = typer.Option(
+        "3486375086",
+        "--mod-id",
+        "-m",
+        help="主 mod 的 workshop ID",
+    ),
+):
+    """
+    列出 client_mods_list 中所有 mod 的当前版本
+    """
+    result = get_client_mods_list(file_path, mod_id)
+    if result is None:
+        raise typer.Exit(code=1)
+    _, client_mods_list = result
+
+    typer.secho("\n📋 client_mods_list 中的 mod 列表:", fg=typer.colors.BLUE)
+    for i, (mod_key, mod_info) in enumerate(client_mods_list.items(), 1):
+        version = mod_info.get("version", "unknown")
+        typer.secho(f"{i}. {mod_key}: {version}", fg=typer.colors.WHITE)
+
+
+if __name__ == "__main__":
+    # cmu("d:/.backups/dontstarvetogether/modoverrides.lua", "3486375086")
+    cml("d:/.backups/dontstarvetogether/modoverrides.lua", "3486375086")

{pymecli-0.4.2 → pymecli-0.4.4}/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.4}/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.4}/pyproject.toml

@@ -10,6 +10,7 @@
     "cowsay>=6.1",
     "dotenv>=0.9.9",
     "fastapi>=0.127.0",
+    "SLPP>=1.2.3",
     "numpy<2.0.0",
     "pandas>=2.3.3",
     "pymysql>=1.1.2",
@@ -18,6 +19,7 @@
     "redis[hiredis]>=7.1.0",
     "requests[socks]>=2.32.5",
     "selenium>=4.40.0",
+    "slpp>=1.2.3",
     "sqlalchemy>=2.0.45",
     "tabulate>=0.9.0",
     "toml>=0.10.2",
@@ -30,7 +32,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.4.2"
+  version = "0.4.4"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"
@@ -39,6 +41,7 @@
 [project.scripts]
   baidu = "cli.baidu:app"
   bitget = "cli.bitget:app"
+  dst = "cli.dst:app"
   example = "cli.example:app"
   fast = "cli.fast:typer_app"
   gate = "cli.gate:app"

pymecli-0.4.2/README.md

@@ -1,14 +0,0 @@
-# typer example
-
-```shell
-uv run example hello Xiaoming
-uv run example hello Xiaoming --from Pymecli
-uv run example goodbye Xiaoming
-uv run example goodbye Xiaoming -f
-```
-
-# fastapi server
-
-```shell
-uv run fast --port 8877
-```

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",
-    )