devart-dl 4.0.2__tar.gz → 4.1.0__tar.gz

{devart_dl-4.0.2 → devart_dl-4.1.0}/MANIFEST.in

@@ -9,3 +9,4 @@ include requirements.txt
 
 # Include non-Python support files and source-tree scripts
 recursive-include bin *
+include da_downloader/*.mjs

{devart_dl-4.0.2/devart_dl.egg-info → devart_dl-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.0.2
+Version: 4.1.0
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT

{devart_dl-4.0.2 → devart_dl-4.1.0}/da_downloader/cli.py

@@ -11,6 +11,8 @@ import argparse
 import json
 import os
 import re
+import shutil
+import subprocess
 import sys
 from datetime import datetime
 from importlib.metadata import PackageNotFoundError, version
@@ -40,7 +42,7 @@ Usage:
   devart-dl gallery USERNAME [GALLERY_ID] [options]
   devart-dl search USERNAME_OR_ALL QUERY [options]
   devart-dl fav USERNAME [FOLDER_ID] [options]
-  devart-dl login oauth|interactive
+  devart-dl login oauth|browser|interactive
   devart-dl whoami | logout
   devart-dl version
 
@@ -281,6 +283,33 @@ def _oauth_login(arguments: Sequence[str]) -> int:
     return 0
 
 
+def _login_browser(arguments: Sequence[str]) -> int:
+    """One-click cookie login: drive the user's real Chrome via CDP.
+
+    Avoids the manual F12 cookie copy and, importantly, runs the login on the
+    real DeviantArt domain so the AWS WAF challenge passes (a server-side or
+    proxied headless browser is blocked). Requires Node >= 22 and Chrome.
+    Falls back with instructions if they are unavailable.
+    """
+    if not shutil.which("node"):
+        print(
+            "browser login needs Node.js (>= 22) to drive Chrome.\n"
+            "Install Node, or use `devart-dl login interactive` to paste a cookie instead.",
+            file=sys.stderr,
+        )
+        return 1
+    script = Path(__file__).resolve().parent / "da_cookie_login.mjs"
+    if not script.exists():
+        print(f"login helper not found: {script}", file=sys.stderr)
+        return 1
+    print("Opening Chrome — log in to DeviantArt in the window that appears…")
+    try:
+        return subprocess.call(["node", str(script)])
+    except KeyboardInterrupt:
+        print("\ncancelled", file=sys.stderr)
+        return 130
+
+
 def _login_interactive(arguments: Sequence[str]) -> int:
     print("Paste your DeviantArt cookie (F12 → Application → Cookies → copy auth & auth_secure):")
     cookies = input().strip()
@@ -368,14 +397,17 @@ def main(argv: Sequence[str] | None = None) -> int:
         return _run_subcommand(command, rest)
     if command == "login":
         if not rest or rest[0] in {"-h", "--help", "help"}:
-            print("Usage: devart-dl login oauth|interactive|clear")
+            print("Usage: devart-dl login oauth|browser|interactive|clear")
             print("  oauth        log in via the official API (recommended)")
+            print("  browser      one-click: log in with your own Chrome, cookie auto-saved")
             print("  interactive  paste a cookie (fallback)")
             print("  clear        clear saved login sessions")
             return 0
         login_command, *login_args = rest
         if login_command == "oauth":
             return _oauth_login(login_args)
+        if login_command == "browser":
+            return _login_browser(login_args)
         if login_command == "interactive":
             return _login_interactive(login_args)
         if login_command == "clear":

devart_dl-4.1.0/da_downloader/da_cookie_login.mjs

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+// 一键获取 DeviantArt 网页登录 Cookie（成熟/NSFW 作品下载需要登录会话）。
+//
+// 为什么这么做：DeviantArt 登录页是 AWS WAF 人机校验 SPA，服务器端 fetch / 无头代理
+// 会被挡（detectIp / validateHostname），令牌也绑定浏览器自身环境。正确做法是让你
+// 本机的真实 Chrome 在「真实 DeviantArt 域」登录，脚本用 Chrome DevTools Protocol
+// 从网络层读出登录后的网页 Cookie（auth / auth_secure / userinfo），写到本下载器
+// 约定的 ~/.deviantart_dl/session.json，之后 `devart-dl` 下载成熟作品自动带上。
+//
+// 用法：
+//   node scripts/da-cookie-login.mjs
+//
+// 依赖：本机已装 Google Chrome / Edge；Node >= 22（自带 WebSocket / fetch）。不装任何 npm 包。
+// 参考：与 deviantdrop 一键登录同思路；只抓网页 Cookie，不碰 OAuth。
+
+import { spawn } from "node:child_process";
+import { setTimeout as sleep } from "node:timers/promises";
+import { homedir, platform } from "node:os";
+import { join } from "node:path";
+import { mkdirSync, existsSync, writeFileSync, chmodSync } from "node:fs";
+
+const SESSION_COOKIES = ["auth", "auth_secure", "userinfo"];
+const DEBUG_PORT = 9334;
+const TIMEOUT = Number(process.env.DA_LOGIN_TIMEOUT_MS) || 10 * 60 * 1000;
+const PROFILE_DIR = join(homedir(), ".config", "da-cookie-login", "chrome-profile");
+
+function chromePath() {
+  const p = platform();
+  const candidates = p === "darwin"
+    ? ["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+       "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+       "/Applications/Chromium.app/Contents/MacOS/Chromium"]
+    : p === "win32"
+      ? [join(process.env.PROGRAMFILES || "", "Google/Chrome/Application/chrome.exe"),
+         join(process.env.LOCALAPPDATA || "", "Google/Chrome/Application/chrome.exe")]
+      : ["/usr/bin/google-chrome", "/usr/bin/google-chrome-stable", "/usr/bin/chromium",
+         "/usr/bin/microsoft-edge", "/snap/bin/chromium"];
+  const found = candidates.find((c) => existsSync(c));
+  if (!found) throw new Error("找不到 Chrome/Edge，请先安装 Google Chrome。");
+  return found;
+}
+
+function sessionFile() {
+  return join(homedir(), ".deviantart_dl", "session.json");
+}
+
+async function main() {
+  mkdirSync(PROFILE_DIR, { recursive: true });
+  const isWin = platform() === "win32";
+  const chrome = spawn(chromePath(), [
+    `--remote-debugging-port=${DEBUG_PORT}`,
+    `--user-data-dir=${PROFILE_DIR}`,
+    "--no-first-run", "--no-default-browser-check",
+    "https://www.deviantart.com/users/login",
+  ], { stdio: ["ignore", "ignore", "ignore"], detached: !isWin });
+
+  try {
+    // 等 DevTools 就绪
+    let target = null;
+    for (let i = 0; i < 40; i++) {
+      try {
+        const r = await fetch(`http://127.0.0.1:${DEBUG_PORT}/json/list`);
+        const tabs = await r.json();
+        target = tabs.find((t) => t.type === "page" && t.webSocketDebuggerUrl);
+        if (target) break;
+      } catch { /* not ready */ }
+      await sleep(500);
+    }
+    if (!target) throw new Error("Chrome 远程调试端口未就绪。");
+
+    const ws = new WebSocket(target.webSocketDebuggerUrl);
+    await new Promise((resolve, reject) => { ws.onopen = resolve; ws.onerror = reject; });
+    let msgId = 0;
+    const pending = new Map();
+    const send = (method, params = {}) => new Promise((resolve, reject) => {
+      const id = ++msgId;
+      pending.set(id, { resolve, reject });
+      ws.send(JSON.stringify({ id, method, params }));
+    });
+    ws.onmessage = (ev) => {
+      const msg = JSON.parse(ev.data);
+      if (msg.id && pending.has(msg.id)) {
+        const { resolve, reject } = pending.get(msg.id);
+        pending.delete(msg.id);
+        msg.error ? reject(new Error(msg.error.message)) : resolve(msg.result);
+      }
+    };
+    await send("Network.enable");
+
+    console.log("\n即将打开 Chrome 进入 DeviantArt 登录页。请在浏览器里登录你的账号。");
+    console.log("登录成功后脚本自动捕获 Cookie（最多 10 分钟）。\n");
+
+    const readSession = async () => {
+      const ctx = await send("Network.getCookies", { urls: ["https://www.deviantart.com/"] });
+      let jar = ctx.cookies || [];
+      if (!SESSION_COOKIES.every((n) => jar.some((c) => c.name === n))) {
+        const all = (await send("Network.getAllCookies")).cookies || [];
+        jar = all.filter((c) => /(^|\.)deviantart\.com$/i.test(c.domain));
+      }
+      const map = {};
+      for (const c of jar) if (SESSION_COOKIES.includes(c.name)) map[c.name] = c.value;
+      const has = SESSION_COOKIES.every((n) => map[n]);
+      const cookies = SESSION_COOKIES.filter((n) => map[n]).map((n) => `${n}=${map[n]}`).join("; ");
+      return { has, cookies };
+    };
+
+    const t0 = Date.now();
+    let lastHint = "";
+    while (Date.now() - t0 < TIMEOUT) {
+      await sleep(1500);
+      const { has, cookies } = await readSession();
+      const hint = has ? "已检测到登录 Cookie，正在保存…" : "等待你在页面里登录…";
+      if (hint !== lastHint) { console.log(hint); lastHint = hint; }
+      if (has) {
+        const path = sessionFile();
+        mkdirSync(join(homedir(), ".deviantart_dl"), { recursive: true });
+        const payload = {
+          cookies,
+          saved_at: new Date().toISOString(),
+          method: "cdp-one-click",
+        };
+        writeFileSync(path, JSON.stringify(payload, null, 2), { encoding: "utf8", mode: 0o600 });
+        try { chmodSync(path, 0o600); } catch { /* best effort */ }
+        ws.close();
+        console.log(`\n✅ Cookie 已保存到 ${path}`);
+        console.log("现在可以直接用 devart-dl 下载成熟/NSFW 作品（会自动带上登录会话）。");
+        return;
+      }
+    }
+    ws.close();
+    throw new Error("登录超时，请重新运行并在 10 分钟内完成登录。");
+  } finally {
+    try { isWin ? chrome.kill() : process.kill(-chrome.pid); } catch { /* cleanup */ }
+  }
+}
+
+main().catch((e) => { console.error("\n❌ 获取 Cookie 失败：", e.message); process.exit(1); });

{devart_dl-4.0.2 → devart_dl-4.1.0}/da_downloader/official_api.py

@@ -251,4 +251,95 @@ def resolve_uuid(
     return uuid
 
 
-__all__ = ["OfficialApiClient", "OriginalDownload", "resolve_uuid"]
+
+def deviation_init(
+    identifier: str,
+    username: Optional[str] = None,
+    timeout: int = 30,
+    session: Optional[requests.Session] = None,
+) -> dict:
+    """Fetch the full public ``_puppy/dadeviation/init`` payload (numeric or
+    fav.me ids). Mirrors DAKit/DAViewer: multimedia pages surface under
+    ``deviation.extended.additionalMedia`` here, which the official API no
+    longer returns.
+    """
+    identifier = identifier.strip()
+    if not identifier:
+        raise ParseError("the URL does not contain an artwork id")
+    http = session or requests.Session()
+    if not identifier.isdigit():
+        identifier = _resolve_short_id(identifier, http, timeout)
+    try:
+        home = http.get(
+            WEB_BASE,
+            headers={"User-Agent": USER_AGENT, "Accept": "text/html"},
+            timeout=timeout,
+        )
+        home.raise_for_status()
+        match = re.search(r"window\.__CSRF_TOKEN__ = '([^']*)'", home.text)
+        if not match or not match.group(1):
+            raise ParseError("could not read the DeviantArt CSRF token")
+        csrf = match.group(1)
+        query = {
+            "deviationid": identifier,
+            # 该接口自 2026 年起把 type 列为必填枚举（art/journal），缺失返回 400。
+            "type": "art",
+            "include_session": "false",
+            "csrf_token": csrf,
+            "mature_content": True,
+        }
+        if username:
+            query["username"] = username
+        response = http.get(
+            f"{WEB_BASE}/_puppy/dadeviation/init",
+            params=query,
+            headers={"User-Agent": USER_AGENT, "Accept": "application/json"},
+            timeout=timeout,
+        )
+        response.raise_for_status()
+        data = response.json()
+    except requests.RequestException as error:
+        raise NetworkError(f"could not reach the resolution endpoint: {error}") from error
+    except ValueError as error:
+        raise ParseError("the resolution endpoint returned invalid JSON") from error
+    if not isinstance(data, dict) or not isinstance(data.get("deviation"), dict):
+        raise ParseError("the resolution endpoint returned an unexpected payload")
+    return data
+
+
+def deviation_uuid(init_data: dict) -> str:
+    """Read the UUID out of an init payload."""
+    extended = init_data.get("deviation", {}).get("extended") or {}
+    uuid = extended.get("deviationUuid")
+    if not isinstance(uuid, str) or not uuid:
+        raise MediaUnavailableError("could not resolve the artwork to a UUID")
+    return uuid
+
+
+def additional_media_urls(init_data: dict) -> list:
+    """Original-file URLs of a multimedia deviation's extra pages
+    (``deviation.extended.additionalMedia``, each entry nests its Wix
+    descriptor under ``media``). Prefers the raw ``baseUri`` file + token.
+    """
+    extended = init_data.get("deviation", {}).get("extended") or {}
+    entries = extended.get("additionalMedia") or []
+    urls: list = []
+    for entry in entries:
+        if not isinstance(entry, dict):
+            continue
+        media = entry.get("media")
+        if not isinstance(media, dict):
+            continue
+        base = media.get("baseUri")
+        if not isinstance(base, str) or not base:
+            continue
+        raw_token = media.get("token")
+        token = raw_token[0] if isinstance(raw_token, list) and raw_token else raw_token
+        if token:
+            urls.append(f"{base}{'&' if '?' in base else '?'}token={token}")
+        else:
+            urls.append(base)
+    return urls
+
+
+__all__ = ["OfficialApiClient", "OriginalDownload", "resolve_uuid", "deviation_init", "deviation_uuid", "additional_media_urls"]

{devart_dl-4.0.2 → devart_dl-4.1.0}/da_downloader/provider.py

@@ -14,7 +14,12 @@ from typing import Any, Callable, Iterator, Optional, Protocol
 from .api import ActionType, DeviantArtAPI
 from .errors import MediaUnavailableError, ParseError
 from .models import Deviation, DownloadItem
-from .official_api import OfficialApiClient, resolve_uuid
+from .official_api import (
+    OfficialApiClient,
+    additional_media_urls,
+    deviation_init,
+    deviation_uuid,
+)
 from .targets import DownloadTarget, TargetKind
 
 logger = logging.getLogger(__name__)
@@ -158,7 +163,7 @@ class OfficialProvider:
     def resolve(self, target: DownloadTarget) -> Iterator[DownloadItem]:
         kind = target.kind
         if kind == TargetKind.ARTWORK:
-            yield self._artwork(target)
+            yield from self._artwork_items(target)
             return
         if kind == TargetKind.SEARCH:
             raise MediaUnavailableError(
@@ -191,8 +196,31 @@ class OfficialProvider:
         yield from self._paginate(fetch)
 
     def _artwork(self, target: DownloadTarget) -> DownloadItem:
-        uuid = resolve_uuid(target.identifier or "", target.username)
-        return self._item(self.client.deviation(uuid))
+        # 兼容旧的单返回值调用（resolve 里已改用 _artwork_items）
+        return next(self._artwork_items(target))
+
+    def _artwork_items(self, target: DownloadTarget) -> Iterator[DownloadItem]:
+        """单作品下载。多文件作品的附加画面来自网页 init 响应
+        （deviation.extended.additionalMedia，官方 API 不再返回），逐个产出下载项；
+        没有附加画面时只下主图（行为与以前一致）。"""
+        identifier = target.identifier or ""
+        init_data = deviation_init(identifier, target.username)
+        uuid = deviation_uuid(init_data)
+        main = self._item(self.client.deviation(uuid))
+        yield main
+        for index, url in enumerate(additional_media_urls(init_data), start=1):
+            item = DownloadItem(
+                artwork_id=f"{main.artwork_id}-{index}",
+                url=main.url,
+                title=main.title,
+                author=main.author,
+                media_url=url,
+                extension=_ext_from_url(url),
+                published_at=main.published_at,
+                mature=main.mature,
+                metadata={**main.metadata, "index": index},
+            )
+            yield item
 
     def _paginate(self, fetch: Callable[[int], dict]) -> Iterator[DownloadItem]:
         offset = 0

{devart_dl-4.0.2 → devart_dl-4.1.0/devart_dl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devart-dl
-Version: 4.0.2
+Version: 4.1.0
 Summary: 专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features
 Author: DeviantArt Downloader Team
 License-Expression: MIT

{devart_dl-4.0.2 → devart_dl-4.1.0}/devart_dl.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ da_downloader/api.py
 da_downloader/archive.py
 da_downloader/auth.py
 da_downloader/cli.py
+da_downloader/da_cookie_login.mjs
 da_downloader/download.py
 da_downloader/errors.py
 da_downloader/http.py

{devart_dl-4.0.2 → devart_dl-4.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devart-dl"
-version = "4.0.2"
+version = "4.1.0"
 description = "专业的 DeviantArt 作品批量下载工具 - Professional DeviantArt batch downloader with anti-ban features"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -63,6 +63,9 @@ da-dl = "da_downloader.cli:main"
 [tool.setuptools.packages.find]
 include = ["da_downloader*"]
 
+[tool.setuptools.package-data]
+da_downloader = ["*.mjs"]
+
 # Black configuration
 [tool.black]
 line-length = 100

{devart_dl-4.0.2 → devart_dl-4.1.0}/tests/test_official_provider.py

@@ -58,7 +58,7 @@ class FakeClient:
 
 
 def test_artwork_original(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = make_deviation()
     client.originals["uuid-1"] = OriginalDownload(
@@ -77,8 +77,35 @@ def test_artwork_original(monkeypatch) -> None:
     assert items[0].published_at == datetime(2015, 3, 30, 21, 21, 4, tzinfo=timezone.utc)
 
 
+def test_artwork_multimedia_yields_every_file(monkeypatch) -> None:
+    init = {
+        "deviation": {
+            "extended": {
+                "deviationUuid": "uuid-1",
+                "additionalMedia": [
+                    {"fileId": 2, "media": {"baseUri": "https://media.test/p2.jpg", "token": ["t2"]}},
+                    {"fileId": 3, "media": {"baseUri": "https://media.test/p3.png", "token": ["t3"]}},
+                ],
+            }
+        }
+    }
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: init)
+    client = FakeClient()
+    client.deviations["uuid-1"] = make_deviation()
+    provider = OfficialProvider(client, quality="f")
+
+    items = list(provider.resolve(TargetParser.parse("https://www.deviantart.com/alice/art/x-123456")))
+
+    assert len(items) == 3  # 主图 + 两张附加
+    assert items[0].media_url == "https://images.test/full.jpg"
+    assert items[1].media_url == "https://media.test/p2.jpg?token=t2"
+    assert items[1].artwork_id == "uuid-1-1"
+    assert items[2].media_url == "https://media.test/p3.png?token=t3"
+    assert items[2].extension == "png"
+
+
 def test_artwork_best_uses_content(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = make_deviation()
     provider = OfficialProvider(client, quality="f")
@@ -111,7 +138,7 @@ def test_gallery_paginates(monkeypatch) -> None:
 
 
 def test_no_media_raises(monkeypatch) -> None:
-    monkeypatch.setattr(provider_mod, "resolve_uuid", lambda identifier, username=None: "uuid-1")
+    monkeypatch.setattr(provider_mod, "deviation_init", lambda identifier, username=None, **_: {"deviation": {"extended": {"deviationUuid": "uuid-1", "additionalMedia": []}}})
     client = FakeClient()
     client.deviations["uuid-1"] = {
         "deviationid": "uuid-1",