pymecli 0.6.2__tar.gz → 0.6.4__tar.gz

{pymecli-0.6.2 → pymecli-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.6.2
+Version: 0.6.4
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -88,6 +88,15 @@ uv run quark check
 ```
 
 # dnspod
+## 环境变量说明
+- `DP_ID`:         DNSPod 登录 ID
+- `DP_TOKEN`:      DNSPod 登录 Token
+- `DP_DOMAIN`:     域名 (如 cursor.email)
+- `DP_RECORD_ID`:  IPv4 A 记录 ID
+- `DP_RECORD_ID_IPV6`: IPv6 AAAA 记录 ID
+- `DP_SUB_DOMAIN`: 子域名前缀 (默认 "api")
+- `DP_RECORD_LINE`: 记录线路 (默认 "默认")
+## 示例
 ```shell
 # 列出域名下所有记录（先跑这个查 record_id）
 uv run dnspod list
@@ -97,6 +106,5 @@ uv run dnspod ddns
 uv run dnspod ddns --force
 # 更新 IPv6 AAAA 记录（从 Redis 读 local.IPv6）
 uv run dnspod ddns6
-
 uv run dnspod ddns6 --force
 ```

{pymecli-0.6.2 → pymecli-0.6.4}/README.md

@@ -49,6 +49,15 @@ uv run quark check
 ```
 
 # dnspod
+## 环境变量说明
+- `DP_ID`:         DNSPod 登录 ID
+- `DP_TOKEN`:      DNSPod 登录 Token
+- `DP_DOMAIN`:     域名 (如 cursor.email)
+- `DP_RECORD_ID`:  IPv4 A 记录 ID
+- `DP_RECORD_ID_IPV6`: IPv6 AAAA 记录 ID
+- `DP_SUB_DOMAIN`: 子域名前缀 (默认 "api")
+- `DP_RECORD_LINE`: 记录线路 (默认 "默认")
+## 示例
 ```shell
 # 列出域名下所有记录（先跑这个查 record_id）
 uv run dnspod list
@@ -58,6 +67,5 @@ uv run dnspod ddns
 uv run dnspod ddns --force
 # 更新 IPv6 AAAA 记录（从 Redis 读 local.IPv6）
 uv run dnspod ddns6
-
 uv run dnspod ddns6 --force
 ```

{pymecli-0.6.2 → pymecli-0.6.4}/api/v1/clash.py

@@ -1,3 +1,5 @@
+import base64
+
 import yaml
 from fastapi import APIRouter, Query, Response
 
@@ -5,6 +7,25 @@ from core.clash import ClashYamlGenerator, get_generator_dependency
 
 router = APIRouter()
 
+# base64 解码后 YAML 最大 64KB，防止恶意超大请求
+_MAX_CUSTOM_YAML_BYTES = 64 * 1024
+
+
+def _parse_custom_proxies(custom_b64: str | None) -> list:
+    """把 base64 编码的 custom.yaml 解码，只提取 proxies 列表"""
+    if not custom_b64:
+        return []
+    try:
+        raw = base64.b64decode(custom_b64)
+        if len(raw) > _MAX_CUSTOM_YAML_BYTES:
+            return []
+        cfg = yaml.safe_load(raw.decode("utf-8"))
+        if not isinstance(cfg, dict):
+            return []
+        return cfg.get("proxies", []) or []
+    except Exception:
+        return []
+
 
 class NoAnchorDumper(yaml.Dumper):
     def ignore_aliases(self, data):
@@ -26,11 +47,16 @@ async def subProviderWhite(
     names: str = Query(
         "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
     ),
+    custom: str | None = Query(
+        None,
+        description="自定义clash配置(base64编码,可选,只提取proxies节点合并)",
+    ),
     generator: ClashYamlGenerator = get_generator_dependency(),
 ):
     # 将JSON字符串解析为Python对象
     sub_list = generator.query2sub(urls, agents, names)
-    yaml_content, userinfo = generator.genPW(sub_list)
+    custom_proxies = _parse_custom_proxies(custom)
+    yaml_content, userinfo = generator.genPW(sub_list, custom_proxies)
     yaml_string = yaml.dump(
         yaml_content,
         allow_unicode=True,
@@ -60,11 +86,16 @@ async def subProviderBlack(
     names: str = Query(
         "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
     ),
+    custom: str | None = Query(
+        None,
+        description="自定义clash配置(base64编码,可选,只提取proxies节点合并)",
+    ),
     generator: ClashYamlGenerator = get_generator_dependency(),
 ):
     # 将JSON字符串解析为Python对象
     sub_list = generator.query2sub(urls, agents, names)
-    yaml_content, userinfo = generator.genPB(sub_list)
+    custom_proxies = _parse_custom_proxies(custom)
+    yaml_content, userinfo = generator.genPB(sub_list, custom_proxies)
     yaml_string = yaml.dump(
         yaml_content,
         allow_unicode=True,
@@ -94,11 +125,16 @@ async def subBlack(
     names: str = Query(
         "订阅1", description="订阅名称,逗号分隔(可选,在客户端中的显示名)"
     ),
+    custom: str | None = Query(
+        None,
+        description="自定义clash配置(base64编码,可选,只提取proxies节点合并)",
+    ),
     generator: ClashYamlGenerator = get_generator_dependency(),
 ):
     # 将JSON字符串解析为Python对象
     sub_list = generator.query2sub(urls, agents, names)
-    yaml_content, userinfo = generator.genB(sub_list)
+    custom_proxies = _parse_custom_proxies(custom)
+    yaml_content, userinfo = generator.genB(sub_list, custom_proxies)
     yaml_string = yaml.dump(
         yaml_content,
         allow_unicode=True,

{pymecli-0.6.2 → pymecli-0.6.4}/cli/etcd_sync.py

@@ -25,6 +25,32 @@ logger = get_logger(__name__, level=logging.INFO)
 DEFAULT_TABLE = "kvs"
 
 
+# ---------------------------------------------------------------------------
+# 智能 JSON 转换（etcd ↔ 文件）
+# ---------------------------------------------------------------------------
+
+def _try_json_loads(s: str):
+    """尝试把字符串当 JSON 解析，成功返回对象，失败返回原字符串。
+
+    只接受以 { / [ 开头的内容，避免把 "123" "true" 这类普通值也误解析。
+    """
+    s = s.strip()
+    if not s or s[0] not in "{[":
+        return s
+    try:
+        return json.loads(s)
+    except (json.JSONDecodeError, TypeError):
+        return s
+
+
+def _json_or_str(v) -> str:
+    """dict/list → 紧凑 JSON 字符串；其他 → str(v)。"""
+    if isinstance(v, (dict, list)):
+        # separators=(",", ":") 去掉空格，保持 etcd 里原样
+        return json.dumps(v, ensure_ascii=False, separators=(",", ":"))
+    return str(v)
+
+
 @app.command("mysql2etcd")
 def mysql_to_etcd(
     prefix: str = typer.Argument(
@@ -182,17 +208,19 @@ def etcd_to_json(
 ):
     """将 etcd 中指定前缀的 key/value 导出为 JSON 文件。
 
-    JSON 格式为简单的 {key: value} 对象，value 均为字符串。
+    智能转换：如果 etcd value 是 JSON 字符串（以 { 或 [ 开头），
+    会自动解析为真正的 JSON 对象写入文件，编辑更方便；
+    普通字符串保持原样。
     """
     etcd = get_etcd_client(env_path)
 
     try:
-        data: dict[str, str] = {}
+        data: dict = {}
         iterator = etcd.get_all() if not prefix else etcd.get_prefix(prefix)
         for value, meta in iterator:
             k = meta.key.decode("utf-8")
-            v = value.decode("utf-8") if isinstance(value, bytes) else value
-            data[k] = v
+            raw = value.decode("utf-8") if isinstance(value, bytes) else value
+            data[k] = _try_json_loads(raw)
 
         with open(file_path, "w", encoding="utf-8") as f:
             json.dump(data, f, ensure_ascii=False, indent=2)
@@ -226,7 +254,8 @@ def json_to_etcd(
 ):
     """将 JSON 文件中的 key/value 写入 etcd。
 
-    JSON 格式应为 {key: value} 对象，value 会被转为字符串。
+    智能转换：dict/list 会自动序列化为紧凑 JSON 字符串写入 etcd；
+    字符串/数字/布尔保持 str() 转换。
     --prefix 会加到每个 key 前面（如果 key 本身已带该前缀则不重复加）。
     """
     etcd = get_etcd_client(env_path)
@@ -253,7 +282,7 @@ def json_to_etcd(
             if prefix and not k.startswith(prefix):
                 full_key = prefix.rstrip("/") + "/" + k.lstrip("/")
 
-            etcd.put(full_key, str(v))
+            etcd.put(full_key, _json_or_str(v))
             logger.debug("put: %s -> %s", full_key, v)
             count += 1
 

{pymecli-0.6.2 → pymecli-0.6.4}/core/clash.py

@@ -52,6 +52,30 @@ class ClashYamlGenerator:
 
     # ---------- 通用 helpers ----------
 
+    def _dedupe_proxy_names(self, existing_proxies: list, new_proxies: list, suffix: str = "_custom") -> list:
+        """对 new_proxies 里与 existing_proxies 重名的节点改名加后缀。
+
+        例：已有 "lighthouse"，custom 也有 "lighthouse" → 改名为 "lighthouse_custom"
+        再加一个 → "lighthouse_custom_2"
+        """
+        used = {p["name"] for p in existing_proxies}
+        result = []
+        for p in new_proxies:
+            name = p.get("name", "")
+            if name not in used:
+                used.add(name)
+                result.append(p)
+            else:
+                i = 1
+                new_name = f"{name}{suffix}"
+                while new_name in used:
+                    i += 1
+                    new_name = f"{name}{suffix}_{i}"
+                used.add(new_name)
+                renamed = {**p, "name": new_name}
+                result.append(renamed)
+        return result
+
     def _get_proxies(self):
         if not self.request_proxy:
             return None
@@ -150,15 +174,18 @@ class ClashYamlGenerator:
             "gfw": self._http_rule_provider("gfw", "domain"),
         }
 
-    def _provider_proxy_groups(self, sub_list):
+    def _provider_proxy_groups(self, sub_list, with_custom=False):
         """provider 风格的 proxy-groups(genPW / genPB)"""
         use_list = [f"provider.{item['name']}" for item in sub_list]
+        if with_custom:
+            use_list.append("provider.custom")
         return [
             {
                 "name": "全局选择",
                 "type": "select",
                 "proxies": ["自动选择", "手动选择", "轮询"]
-                + [item["name"] for item in sub_list],
+                + [item["name"] for item in sub_list]
+                + (["自定义节点"] if with_custom else []),
             },
             {
                 "name": "自动选择",
@@ -224,13 +251,18 @@ class ClashYamlGenerator:
         )
 
     def _add_inline_sub(self, template, item, ps):
-        """单个订阅直接写入 proxies + url-test group(genB)"""
-        template["proxies"].extend(ps)
+        """单个订阅直接写入 proxies + url-test group(genB)
+
+        重名节点自动加后缀（订阅名），group 里的 proxies 列表同步用重命名后的名字。
+        """
+        suffix = f"_{item['name']}" if item.get("name") else ""
+        deduped = self._dedupe_proxy_names(template["proxies"], ps, suffix)
+        template["proxies"].extend(deduped)
         template["proxy-groups"].append(
             {
                 "name": item["name"],
                 "type": "url-test",
-                "proxies": [p["name"] for p in ps],
+                "proxies": [p["name"] for p in deduped],
             }
         )
 
@@ -266,16 +298,35 @@ class ClashYamlGenerator:
     # ---------- 三种生成模式 ----------
 
     # 白名单模式 Rules 配置方式
-    def genPW(self, sub_list: list[dict]):
+    def genPW(self, sub_list: list[dict], custom_proxies: list | None = None):
         proxies = self._get_proxies()
         template = self._load_template(proxies)
 
-        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list))
+        has_custom = bool(custom_proxies)
+        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list, has_custom))
 
         subs, userinfo = self._fetch_subscriptions(sub_list, proxies)
         for item, ps in subs:
             self._add_provider_sub(template, item, ps)
 
+        # custom proxies → provider + group
+        if custom_proxies:
+            template["proxy-providers"]["provider.custom"] = {
+                "type": "inline",
+                "payload": custom_proxies,
+            }
+            template["proxy-groups"].append(
+                {
+                    "name": "自定义节点",
+                    "type": "url-test",
+                    "url": "https://www.gstatic.com/generate_204",
+                    "interval": 300,
+                    "tolerance": 11,
+                    "lazy": True,
+                    "use": ["provider.custom"],
+                }
+            )
+
         self._add_inline_rule_providers(template, proxies)
         template["rule-providers"].update(self._whitelist_http_rule_providers())
         template["rules"].extend(WHITELIST_RULES)
@@ -283,16 +334,35 @@ class ClashYamlGenerator:
         return template, userinfo
 
     # 黑名单模式 Rules 配置方式
-    def genPB(self, sub_list: list[dict]):
+    def genPB(self, sub_list: list[dict], custom_proxies: list | None = None):
         proxies = self._get_proxies()
         template = self._load_template(proxies)
 
-        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list))
+        has_custom = bool(custom_proxies)
+        template["proxy-groups"].extend(self._provider_proxy_groups(sub_list, has_custom))
 
         subs, userinfo = self._fetch_subscriptions(sub_list, proxies)
         for item, ps in subs:
             self._add_provider_sub(template, item, ps)
 
+        # custom proxies → provider + group
+        if custom_proxies:
+            template["proxy-providers"]["provider.custom"] = {
+                "type": "inline",
+                "payload": custom_proxies,
+            }
+            template["proxy-groups"].append(
+                {
+                    "name": "自定义节点",
+                    "type": "url-test",
+                    "url": "https://www.gstatic.com/generate_204",
+                    "interval": 300,
+                    "tolerance": 11,
+                    "lazy": True,
+                    "use": ["provider.custom"],
+                }
+            )
+
         self._add_base_rules(template, with_dst_port=False)
         self._add_inline_rule_providers(template, proxies)
         template["rule-providers"].update(self._blacklist_http_rule_providers())
@@ -300,7 +370,7 @@ class ClashYamlGenerator:
 
         return template, userinfo
 
-    def genB(self, sub_list: list[dict]):
+    def genB(self, sub_list: list[dict], custom_proxies: list | None = None):
         proxies = self._get_proxies()
         template = self._load_template(proxies)
 
@@ -311,6 +381,11 @@ class ClashYamlGenerator:
         for item, ps in subs:
             self._add_inline_sub(template, item, ps)
 
+        # custom proxies 去重后追加（proxy-groups 用 include-all 自动包含）
+        if custom_proxies:
+            deduped = self._dedupe_proxy_names(template["proxies"], custom_proxies)
+            template["proxies"].extend(deduped)
+
         self._add_base_rules(template, with_dst_port=True)
         self._add_inline_rule_providers(template, proxies)
         template["rule-providers"].update(self._blacklist_http_rule_providers())

{pymecli-0.6.2 → pymecli-0.6.4}/pyproject.toml

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