pymecli 0.6.0__tar.gz → 0.6.1__tar.gz

{pymecli-0.6.0 → pymecli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.6.0
+Version: 0.6.1
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -72,3 +72,28 @@ etcdsync etcd2mysql "" -e d:/.env/pymecli.env -t kvs # 全量
 etcdsync mysql2etcd /cron/jobs -e d:/.env/pymecli.env -t kvs
 etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
 ```
+# quark
+```shell
+# 执行签到（默认会发通知）
+uv run quark sign
+# 签到但不发通知
+uv run quark sign --no-notify
+# 指定不同的 dotenv 路径
+uv run quark sign -e /path/to/.env
+# 只检查账号状态（不签到），方便调试
+uv run quark check
+```
+
+# dnspod
+```shell
+# 列出域名下所有记录（先跑这个查 record_id）
+uv run dnspod list
+# 更新 IPv4 A 记录
+uv run dnspod ddns
+# 强制更新（即使 IP 没变化）
+uv run dnspod ddns --force
+# 更新 IPv6 AAAA 记录（从 Redis 读 local.IPv6）
+uv run dnspod ddns6
+
+uv run dnspod ddns6 --force
+```

{pymecli-0.6.0 → pymecli-0.6.1}/README.md

@@ -33,3 +33,28 @@ etcdsync etcd2mysql "" -e d:/.env/pymecli.env -t kvs # 全量
 etcdsync mysql2etcd /cron/jobs -e d:/.env/pymecli.env -t kvs
 etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
 ```
+# quark
+```shell
+# 执行签到（默认会发通知）
+uv run quark sign
+# 签到但不发通知
+uv run quark sign --no-notify
+# 指定不同的 dotenv 路径
+uv run quark sign -e /path/to/.env
+# 只检查账号状态（不签到），方便调试
+uv run quark check
+```
+
+# dnspod
+```shell
+# 列出域名下所有记录（先跑这个查 record_id）
+uv run dnspod list
+# 更新 IPv4 A 记录
+uv run dnspod ddns
+# 强制更新（即使 IP 没变化）
+uv run dnspod ddns --force
+# 更新 IPv6 AAAA 记录（从 Redis 读 local.IPv6）
+uv run dnspod ddns6
+
+uv run dnspod ddns6 --force
+```

pymecli-0.6.1/cli/dnspod.py

@@ -0,0 +1,259 @@
+"""DNSPod DDNS 自动更新 CLI。
+
+环境变量 (Go 版命名保持一致):
+    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: 记录线路 (默认 "默认")
+
+Redis 依赖 (用于 IPv6 DDNS):
+    REDIS_URL:     Redis 地址，key = "local.IPv6"
+"""
+import os
+import re
+
+import requests
+import typer
+from dotenv import load_dotenv
+
+from utils.logger import get_logger
+
+logger = get_logger(__name__)
+app = typer.Typer(help="DNSPod DDNS 自动更新")
+
+
+API_BASE = "https://dnsapi.cn"
+
+
+# ---------------------------------------------------------------------------
+# 底层 API
+# ---------------------------------------------------------------------------
+
+def _call(action: str, data: dict) -> dict:
+    """通用 DNSPod API 调用（form-urlencoded POST）"""
+    resp = requests.post(f"{API_BASE}/{action}", data=data, timeout=15)
+    resp.raise_for_status()
+    body = resp.json()
+
+    status = body.get("status", {})
+    code = str(status.get("code", ""))
+    if code != "1":
+        msg = status.get("message", "未知错误")
+        raise RuntimeError(f"DNSPod API 错误 [{code}]: {msg}")
+
+    return body
+
+
+def record_modify(
+    login_token: str,
+    domain: str,
+    record_id: str,
+    sub_domain: str,
+    record_type: str,
+    value: str,
+    record_line: str = "默认",
+) -> dict:
+    """调用 Record.Modify 修改 DNS 记录"""
+    data = {
+        "login_token": login_token,
+        "format": "json",
+        "domain": domain,
+        "record_id": record_id,
+        "sub_domain": sub_domain,
+        "record_type": record_type,
+        "record_line": record_line,
+        "value": value,
+    }
+    return _call("Record.Modify", data)
+
+
+def record_list(login_token: str, domain: str) -> list[dict]:
+    """调用 Record.List 列出域名下所有记录"""
+    data = {
+        "login_token": login_token,
+        "format": "json",
+        "domain": domain,
+    }
+    body = _call("Record.List", data)
+    return body.get("records", [])
+
+
+def get_public_ipv4() -> str:
+    """从 ip.3322.net 获取公网 IPv4（纯文本）"""
+    resp = requests.get("http://ip.3322.net", timeout=10)
+    resp.raise_for_status()
+    ip = resp.text.strip()
+    # 简单校验
+    if not re.match(r"^\d{1,3}(?:\.\d{1,3}){3}$", ip):
+        raise RuntimeError(f"获取到的不是有效 IPv4: {ip!r}")
+    return ip
+
+
+def get_public_ipv6() -> str:
+    """从 Redis 读取公网 IPv6（key=local.IPv6）"""
+    from utils.pyredis import get_redis_client_sync
+
+    r = get_redis_client_sync()
+    try:
+        val = r.get("local.IPv6")
+        if not val:
+            raise RuntimeError("Redis 中 local.IPv6 为空")
+        return val.strip()
+    finally:
+        r.close()
+
+
+# ---------------------------------------------------------------------------
+# CLI 子命令
+# ---------------------------------------------------------------------------
+
+def _require_env(env_path: str) -> dict:
+    """加载 dotenv 并返回公共配置"""
+    load_dotenv(env_path)
+    dp_id = os.getenv("DP_ID")
+    dp_token = os.getenv("DP_TOKEN")
+    dp_domain = os.getenv("DP_DOMAIN")
+
+    missing = []
+    if not dp_id:
+        missing.append("DP_ID")
+    if not dp_token:
+        missing.append("DP_TOKEN")
+    if not dp_domain:
+        missing.append("DP_DOMAIN")
+    if missing:
+        logger.error("缺少环境变量: %s", ", ".join(missing))
+        raise typer.Exit(1)
+
+    return {
+        "login_token": f"{dp_id},{dp_token}",
+        "domain": dp_domain,
+        "sub_domain": os.getenv("DP_SUB_DOMAIN", "api"),
+        "record_line": os.getenv("DP_RECORD_LINE", "默认"),
+    }
+
+
+@app.command()
+def list(
+    dotenv_path: str = typer.Option(".env", "--env", "-e", help="dotenv 文件路径"),
+):
+    """列出域名下所有 DNS 记录（方便查 record_id）"""
+    cfg = _require_env(dotenv_path)
+
+    records = record_list(cfg["login_token"], cfg["domain"])
+    if not records:
+        typer.secho("没有记录", fg=typer.colors.YELLOW)
+        return
+
+    typer.secho(f"\n域名 {cfg['domain']} 共 {len(records)} 条记录:\n", fg=typer.colors.CYAN)
+    typer.secho(f"{'ID':<10} {'类型':<6} {'子域':<16} {'值':<30} {'状态'}", fg=typer.colors.GREEN)
+    typer.secho("-" * 80, fg=typer.colors.CYAN)
+    for r in records:
+        typer.echo(
+            f"{r['id']:<10} {r['type']:<6} {r['name']:<16} {r['value']:<30} {r['status']}"
+        )
+
+
+@app.command()
+def ddns(
+    dotenv_path: str = typer.Option(".env", "--env", "-e", help="dotenv 文件路径"),
+    force: bool = typer.Option(False, "--force", help="IP 未变化也强制更新"),
+):
+    """更新 A 记录（IPv4 DDNS）"""
+    cfg = _require_env(dotenv_path)
+
+    record_id = os.getenv("DP_RECORD_ID")
+    if not record_id:
+        logger.error("缺少环境变量: DP_RECORD_ID")
+        raise typer.Exit(1)
+
+    try:
+        cur_ip = get_public_ipv4()
+    except Exception as e:
+        logger.exception("获取公网 IPv4 失败: %s", e)
+        raise typer.Exit(1)
+
+    typer.secho(f"当前公网 IPv4: {cur_ip}", fg=typer.colors.CYAN)
+
+    # 获取现有记录对比
+    records = record_list(cfg["login_token"], cfg["domain"])
+    existing = next((r for r in records if r["id"] == record_id), None)
+    if existing and existing["value"] == cur_ip and not force:
+        typer.secho(f"IP 未变化 ({cur_ip})，跳过更新", fg=typer.colors.YELLOW)
+        return
+
+    try:
+        resp = record_modify(
+            login_token=cfg["login_token"],
+            domain=cfg["domain"],
+            record_id=record_id,
+            sub_domain=cfg["sub_domain"],
+            record_type="A",
+            value=cur_ip,
+            record_line=cfg["record_line"],
+        )
+        typer.secho(
+            f"✅ A 记录更新成功 | "
+            f"新地址: {resp['record']['value']} | "
+            f"接口返回: {resp['status']['message']}",
+            fg=typer.colors.GREEN,
+        )
+    except Exception as e:
+        logger.exception("A 记录更新失败: %s", e)
+        raise typer.Exit(1)
+
+
+@app.command()
+def ddns6(
+    dotenv_path: str = typer.Option(".env", "--env", "-e", help="dotenv 文件路径"),
+    force: bool = typer.Option(False, "--force", help="IP 未变化也强制更新"),
+):
+    """更新 AAAA 记录（IPv6 DDNS，从 Redis 读取 IPv6）"""
+    cfg = _require_env(dotenv_path)
+
+    record_id = os.getenv("DP_RECORD_ID_IPV6")
+    if not record_id:
+        logger.error("缺少环境变量: DP_RECORD_ID_IPV6")
+        raise typer.Exit(1)
+
+    try:
+        cur_ip = get_public_ipv6()
+    except Exception as e:
+        logger.exception("获取公网 IPv6 失败: %s", e)
+        raise typer.Exit(1)
+
+    typer.secho(f"当前公网 IPv6: {cur_ip}", fg=typer.colors.CYAN)
+
+    # 获取现有记录对比
+    records = record_list(cfg["login_token"], cfg["domain"])
+    existing = next((r for r in records if r["id"] == record_id), None)
+    if existing and existing["value"] == cur_ip and not force:
+        typer.secho(f"IPv6 未变化 ({cur_ip})，跳过更新", fg=typer.colors.YELLOW)
+        return
+
+    try:
+        resp = record_modify(
+            login_token=cfg["login_token"],
+            domain=cfg["domain"],
+            record_id=record_id,
+            sub_domain=cfg["sub_domain"],
+            record_type="AAAA",
+            value=cur_ip,
+            record_line=cfg["record_line"],
+        )
+        typer.secho(
+            f"✅ AAAA 记录更新成功 | "
+            f"新地址: {resp['record']['value']} | "
+            f"接口返回: {resp['status']['message']}",
+            fg=typer.colors.GREEN,
+        )
+    except Exception as e:
+        logger.exception("AAAA 记录更新失败: %s", e)
+        raise typer.Exit(1)
+
+
+if __name__ == "__main__":
+    app()

pymecli-0.6.1/cli/quark.py

@@ -0,0 +1,258 @@
+"""夸克网盘自动签到 CLI。
+
+环境变量:
+    COOKIE_QUARK: 多账户用 回车 或 && 分开。
+        新格式: user=张三; url=https://drive-m.quark.cn/1/clouddrive/act/growth/reward?...&kps=xxx&sign=xxx&vcode=xxx;
+        旧格式: user=张三; kps=xxx; sign=xxx; vcode=xxx;
+"""
+
+import os
+import re
+
+import requests
+import typer
+from dotenv import load_dotenv
+
+from utils.logger import get_logger
+from utils.notify import send
+
+logger = get_logger(__name__)
+app = typer.Typer(help="夸克网盘自动签到")
+
+
+# ---------------------------------------------------------------------------
+# 核心逻辑（改编自 checkIn_Quark.py）
+# ---------------------------------------------------------------------------
+
+
+def _convert_bytes(b: float) -> str:
+    """将字节转换为人类可读格式 (B/KB/MB/GB/TB/...)"""
+    units = ("B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB")
+    i = 0
+    while b >= 1024 and i < len(units) - 1:
+        b /= 1024
+        i += 1
+    return f"{b:.2f} {units[i]}"
+
+
+def _extract_params(url: str) -> dict:
+    """从完整 URL 中提取 kps / sign / vcode 参数"""
+    query_start = url.find("?")
+    query_string = url[query_start + 1 :] if query_start != -1 else ""
+
+    params = {}
+    for param in query_string.split("&"):
+        if "=" in param:
+            key, value = param.split("=", 1)
+            params[key] = value
+
+    return {
+        "kps": params.get("kps", ""),
+        "sign": params.get("sign", ""),
+        "vcode": params.get("vcode", ""),
+    }
+
+
+class _Quark:
+    """夸克签到 API 封装（内部类，不对外暴露）"""
+
+    def __init__(self, user_data: dict):
+        self.param = user_data
+
+    # ---- API ----
+
+    def get_growth_info(self):
+        url = "https://drive-m.quark.cn/1/clouddrive/capacity/growth/info"
+        resp = requests.get(url, params=self._qs(pr="ucpro", fr="android")).json()
+        return resp.get("data") or False
+
+    def get_growth_sign(self):
+        url = "https://drive-m.quark.cn/1/clouddrive/capacity/growth/sign"
+        resp = requests.post(
+            url, json={"sign_cyclic": True}, params=self._qs(pr="ucpro", fr="android")
+        ).json()
+        if resp.get("data"):
+            return True, resp["data"]["sign_daily_reward"]
+        return False, resp.get("message", "未知错误")
+
+    def query_balance(self):
+        url = "https://coral2.quark.cn/currency/v1/queryBalance"
+        resp = requests.get(
+            url,
+            params={
+                "moduleCode": "1f3563d38896438db994f118d4ff53cb",
+                "kps": self.param.get("kps"),
+            },
+        ).json()
+        if resp.get("data"):
+            return resp["data"]["balance"]
+        return resp.get("msg", "未知错误")
+
+    # ---- 业务入口 ----
+
+    def do_sign(self) -> str:
+        log = ""
+        growth_info = self.get_growth_info()
+        if growth_info:
+            log += (
+                f" {'88VIP' if growth_info['88VIP'] else '普通用户'} {self.param.get('user')}\n"
+                f"💾 网盘总容量：{_convert_bytes(growth_info['total_capacity'])}，"
+                f"签到累计容量："
+            )
+            comp = growth_info.get("cap_composition", {})
+            if "sign_reward" in comp:
+                log += f"{_convert_bytes(comp['sign_reward'])}\n"
+            else:
+                log += "0 MB\n"
+
+            cap_sign = growth_info["cap_sign"]
+            if cap_sign["sign_daily"]:
+                log += (
+                    f"✅ 签到日志: 今日已签到+{_convert_bytes(cap_sign['sign_daily_reward'])}，"
+                    f"连签进度({cap_sign['sign_progress']}/{cap_sign['sign_target']})\n"
+                )
+            else:
+                ok, ret = self.get_growth_sign()
+                if ok:
+                    log += (
+                        f"✅ 执行签到: 今日签到+{_convert_bytes(ret)}，"
+                        f"连签进度({cap_sign['sign_progress'] + 1}/{cap_sign['sign_target']})\n"
+                    )
+                else:
+                    log += f"❌ 签到异常: {ret}\n"
+        else:
+            log += "❌ 签到异常: 获取成长信息失败\n"
+
+        return log
+
+    # ---- 内部工具 ----
+
+    def _qs(self, **extra) -> dict:
+        """构造请求公共 query string 参数"""
+        qs = {
+            "kps": self.param.get("kps"),
+            "sign": self.param.get("sign"),
+            "vcode": self.param.get("vcode"),
+        }
+        qs.update(extra)
+        return qs
+
+
+# ---------------------------------------------------------------------------
+# CLI 子命令
+# ---------------------------------------------------------------------------
+
+
+@app.command()
+def sign(
+    dotenv_path: str = typer.Option(".env", "--env", "-e", help="dotenv 文件路径"),
+    notify_flag: bool = typer.Option(True, "--notify/--no-notify", help="是否发送通知"),
+):
+    """执行夸克网盘每日签到。
+
+    需要 .env 中配置 COOKIE_QUARK。多账户用 回车 或 && 分隔。
+    """
+    load_dotenv(dotenv_path)
+
+    raw = os.getenv("COOKIE_QUARK")
+    if not raw:
+        logger.error("未添加 COOKIE_QUARK 环境变量")
+        raise typer.Exit(1)
+
+    # 解析多账户
+    cookie_list = re.split(r"\n|&&", raw)
+    cookie_list = [c.strip() for c in cookie_list if c.strip()]
+
+    typer.secho(f"✅ 检测到共 {len(cookie_list)} 个夸克账号\n", fg=typer.colors.GREEN)
+
+    msg = ""
+    for i, raw_account in enumerate(cookie_list):
+        # 解析 user_data
+        user_data: dict = {}
+        for part in raw_account.replace(" ", "").split(";"):
+            if not part or "=" not in part:
+                continue
+            k, v = part.split("=", 1)
+            user_data[k] = v
+
+        # 从 url 中提取 kps / sign / vcode（兼容新格式）
+        if "url" in user_data:
+            user_data.update(_extract_params(user_data["url"]))
+
+        # 必须的参数检查
+        missing = [k for k in ("kps", "sign", "vcode") if not user_data.get(k)]
+        if missing:
+            msg += f"🙍🏻‍♂️ 第{i + 1}个账号 ❌ 缺少参数: {', '.join(missing)}\n"
+            logger.warning("账号 %s 缺少参数: %s", i + 1, missing)
+            continue
+
+        msg += f"🙍🏻‍♂️ 第{i + 1}个账号\n"
+        result = _Quark(user_data).do_sign()
+        msg += result + "\n"
+
+        # 实时打印
+        typer.echo(f"🙍🏻‍♂️ 第{i + 1}个账号 {user_data.get('user', '(未命名)')}")
+        typer.echo(result)
+
+    # 发送通知
+    if notify_flag and msg:
+        try:
+            send("夸克自动签到", msg)
+        except Exception:
+            logger.exception("发送通知失败")
+
+    # 返回给调用者（方便编程调用）
+    typer.secho("\n----------夸克网盘签到完毕----------", fg=typer.colors.CYAN)
+
+
+@app.command()
+def check(
+    dotenv_path: str = typer.Option(".env", "--env", "-e", help="dotenv 文件路径"),
+):
+    """检查 COOKIE_QUARK 是否配置，以及每个账号的成长信息。"""
+    load_dotenv(dotenv_path)
+
+    raw = os.getenv("COOKIE_QUARK")
+    if not raw:
+        logger.error("未添加 COOKIE_QUARK 环境变量")
+        raise typer.Exit(1)
+
+    cookie_list = re.split(r"\n|&&", raw)
+    cookie_list = [c.strip() for c in cookie_list if c.strip()]
+
+    typer.secho(f"✅ 检测到共 {len(cookie_list)} 个夸克账号\n", fg=typer.colors.GREEN)
+
+    for i, raw_account in enumerate(cookie_list):
+        user_data: dict = {}
+        for part in raw_account.replace(" ", "").split(";"):
+            if not part or "=" not in part:
+                continue
+            k, v = part.split("=", 1)
+            user_data[k] = v
+        if "url" in user_data:
+            user_data.update(_extract_params(user_data["url"]))
+
+        typer.secho(
+            f"🙍🏻‍♂️ 第{i + 1}个账号 {user_data.get('user', '(未命名)')}",
+            fg=typer.colors.CYAN,
+        )
+
+        missing = [k for k in ("kps", "sign", "vcode") if not user_data.get(k)]
+        if missing:
+            typer.secho(f"  ❌ 缺少参数: {', '.join(missing)}", fg=typer.colors.RED)
+            continue
+
+        growth = _Quark(user_data).get_growth_info()
+        if growth:
+            typer.secho(
+                f"  👤 {'88VIP' if growth['88VIP'] else '普通用户'} | "
+                f"💾 {_convert_bytes(growth['total_capacity'])} | "
+                f"✅今日已签到={growth['cap_sign']['sign_daily']}",
+                fg=typer.colors.GREEN,
+            )
+        else:
+            typer.secho("  ❌ 获取成长信息失败（参数可能已过期）", fg=typer.colors.RED)
+
+
+if __name__ == "__main__":
+    app()

{pymecli-0.6.0 → pymecli-0.6.1}/pyproject.toml

@@ -38,7 +38,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.6.0"
+  version = "0.6.1"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"
@@ -47,12 +47,14 @@
 [project.scripts]
   # baidu = "cli.baidu:app"
   bitget = "cli.bitget:app"
+  dnspod = "cli.dnspod:app"
   dst = "cli.dst:app"
   etcdsync = "cli.etcd_mysql:app"
   example = "cli.example:app"
   fast = "cli.fast:typer_app"
   gate = "cli.gate:app"
   okx = "cli.okx:app"
+  quark = "cli.quark:app"
   util = "cli.util:app"
   # 临时命令
   rd = "cli.redis_csv:app"