novel-downloader 1.4.5__py3-none-any.whl → 2.0.0__py3-none-any.whl

novel_downloader/core/fetchers/{esjzone/session.py → esjzone.py}

@@ -1,21 +1,26 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.fetchers.esjzone.session
-----------------------------------------------
+novel_downloader.core.fetchers.esjzone
+--------------------------------------
 
 """
 
 import re
+from collections.abc import Mapping
 from typing import Any
 
 from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig, LoginField
-from novel_downloader.utils.time_utils import async_sleep_with_random_delay
+from novel_downloader.utils import async_jitter_sleep
 
 
+@register_fetcher(
+    site_keys=["esjzone"],
+)
 class EsjzoneSession(BaseSession):
     """
-    A session class for interacting with the esjzone (www.esjzone.cc) novel website.
+    A session class for interacting with the ESJ Zone (www.esjzone.cc) novel website.
     """
 
     BOOKCASE_URL = "https://www.esjzone.cc/my/favorite"
@@ -63,7 +68,7 @@ class EsjzoneSession(BaseSession):
             ):
                 self._is_logged_in = True
                 return True
-            await async_sleep_with_random_delay(
+            await async_jitter_sleep(
                 self.backoff_factor,
                 mul_spread=1.1,
                 max_sleep=self.backoff_factor + 2,
@@ -81,7 +86,7 @@ class EsjzoneSession(BaseSession):
         Fetch the raw HTML of the book info page asynchronously.
 
         :param book_id: The book identifier.
-        :return: The page content as a string.
+        :return: The page content as string list.
         """
         url = self.book_info_url(book_id=book_id)
         return [await self.fetch(url, **kwargs)]
@@ -97,7 +102,7 @@ class EsjzoneSession(BaseSession):
 
         :param book_id: The book identifier.
         :param chapter_id: The chapter identifier.
-        :return: The chapter content as a string.
+        :return: The page content as string list.
         """
         url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
         return [await self.fetch(url, **kwargs)]
@@ -165,10 +170,6 @@ class EsjzoneSession(BaseSession):
         """
         return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)
 
-    @property
-    def hostname(self) -> str:
-        return "www.esjzone.cc"
-
     async def _api_login(self, username: str, password: str) -> bool:
         """
         Login to the API using a 2-step token-based process.
@@ -229,3 +230,14 @@ class EsjzoneSession(BaseSession):
     def _extract_token(self, text: str) -> str:
         match = re.search(r"<JinJing>(.+?)</JinJing>", text)
         return match.group(1) if match else ""
+
+    @staticmethod
+    def _filter_cookies(
+        raw_cookies: list[Mapping[str, Any]],
+    ) -> dict[str, str]:
+        ALLOWED_DOMAINS = {".www.esjzone.cc", "www.esjzone.cc", ".esjzone.cc", ""}
+        return {
+            c["name"]: c["value"]
+            for c in raw_cookies
+            if c.get("domain", "") in ALLOWED_DOMAINS
+        }

novel_downloader/core/fetchers/guidaye.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.fetchers.guidaye
+--------------------------------------
+
+"""
+
+from typing import Any
+
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
+from novel_downloader.models import FetcherConfig
+
+
+@register_fetcher(
+    site_keys=["guidaye"],
+)
+class GuidayeSession(BaseSession):
+    """
+    A session class for interacting with the 名著阅读 (b.guidaye.com) novel website.
+    """
+
+    BOOK_INFO_URL = "https://b.guidaye.com/{book_id}/"
+    CHAPTER_URL = "https://b.guidaye.com/{book_id}/{chapter_id}.html"
+
+    def __init__(
+        self,
+        config: FetcherConfig,
+        cookies: dict[str, str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__("guidaye", config, cookies, **kwargs)
+
+    async def get_book_info(
+        self,
+        book_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of the book info page asynchronously.
+
+        :param book_id: The book identifier.
+        :return: The page content as string list.
+        """
+        book_id = book_id.replace("-", "/")
+        url = self.book_info_url(book_id=book_id)
+        return [await self.fetch(url, **kwargs)]
+
+    async def get_book_chapter(
+        self,
+        book_id: str,
+        chapter_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of a single chapter asynchronously.
+
+        :param book_id: The book identifier.
+        :param chapter_id: The chapter identifier.
+        :return: The page content as string list.
+        """
+        book_id = book_id.replace("-", "/")
+        url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
+        return [await self.fetch(url, **kwargs)]
+
+    @classmethod
+    def book_info_url(cls, book_id: str) -> str:
+        """
+        Construct the URL for fetching a book's info page.
+
+        :param book_id: The identifier of the book.
+        :return: Fully qualified URL for the book info page.
+        """
+        return cls.BOOK_INFO_URL.format(book_id=book_id)
+
+    @classmethod
+    def chapter_url(cls, book_id: str, chapter_id: str) -> str:
+        """
+        Construct the URL for fetching a specific chapter.
+
+        :param book_id: The identifier of the book.
+        :param chapter_id: The identifier of the chapter.
+        :return: Fully qualified chapter URL.
+        """
+        return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)

novel_downloader/core/fetchers/hetushu.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.fetchers.hetushu
+--------------------------------------
+
+"""
+
+from typing import Any
+
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
+from novel_downloader.models import FetcherConfig
+
+
+@register_fetcher(
+    site_keys=["hetushu"],
+)
+class HetushuSession(BaseSession):
+    """
+    A session class for interacting with the 和图书 (www.hetushu.com) novel website.
+    """
+
+    BOOK_INFO_URL = "https://{base_url}/book/{book_id}/index.html"
+    CHAPTER_URL = "https://{base_url}/book/{book_id}/{chapter_id}.html"
+
+    def __init__(
+        self,
+        config: FetcherConfig,
+        cookies: dict[str, str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__("hetushu", config, cookies, **kwargs)
+        self.base_url = (
+            "www.hetushu.com"
+            if config.locale_style == "simplified"
+            else "www.hetubook.com"
+        )
+
+    async def get_book_info(
+        self,
+        book_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of the book info page asynchronously.
+
+        :param book_id: The book identifier.
+        :return: The page content as string list.
+        """
+        url = self.book_info_url(base_url=self.base_url, book_id=book_id)
+        return [await self.fetch(url, **kwargs)]
+
+    async def get_book_chapter(
+        self,
+        book_id: str,
+        chapter_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of a single chapter asynchronously.
+
+        :param book_id: The book identifier.
+        :param chapter_id: The chapter identifier.
+        :return: The page content as string list.
+        """
+        url = self.chapter_url(
+            base_url=self.base_url, book_id=book_id, chapter_id=chapter_id
+        )
+        return [await self.fetch(url, **kwargs)]
+
+    @classmethod
+    def book_info_url(cls, base_url: str, book_id: str) -> str:
+        """
+        Construct the URL for fetching a book's info page.
+
+        :param book_id: The identifier of the book.
+        :return: Fully qualified URL for the book info page.
+        """
+        return cls.BOOK_INFO_URL.format(base_url=base_url, book_id=book_id)
+
+    @classmethod
+    def chapter_url(cls, base_url: str, book_id: str, chapter_id: str) -> str:
+        """
+        Construct the URL for fetching a specific chapter.
+
+        :param book_id: The identifier of the book.
+        :param chapter_id: The identifier of the chapter.
+        :return: Fully qualified chapter URL.
+        """
+        return cls.CHAPTER_URL.format(
+            base_url=base_url, book_id=book_id, chapter_id=chapter_id
+        )

novel_downloader/core/fetchers/{qianbi/browser.py → i25zw.py}

@@ -1,37 +1,37 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.fetchers.qianbi.browser
----------------------------------------------
+novel_downloader.core.fetchers.i25zw
+------------------------------------
 
 """
 
+import asyncio
 from typing import Any
 
-from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
-class QianbiBrowser(BaseBrowser):
+@register_fetcher(
+    site_keys=["i25zw"],
+)
+class I25zwSession(BaseSession):
     """
-    A browser class for interacting with the Qianbi (www.23qb.com) novel website.
+    A session class for interacting with the 25中文网 (www.i25zw.com) novel website.
     """
 
-    BASE_URLS = [
-        "www.23qb.com",
-        "www.23qb.net",
-    ]
-
-    BOOK_INFO_URL = "https://www.23qb.com/book/{book_id}/"
-    BOOK_CATALOG_URL = "https://www.23qb.com/book/{book_id}/catalog"
-    CHAPTER_URL = "https://www.23qb.com/book/{book_id}/{chapter_id}.html"
+    BOOK_INFO_URL = "https://www.i25zw.com/book/{book_id}.html"
+    BOOK_CATALOG_URL = "https://www.i25zw.com/{book_id}/"
+    CHAPTER_URL = "https://www.i25zw.com/{book_id}/{chapter_id}.html"
 
     def __init__(
         self,
         config: FetcherConfig,
-        reuse_page: bool = False,
+        cookies: dict[str, str] | None = None,
         **kwargs: Any,
     ) -> None:
-        super().__init__("qianbi", config, reuse_page, **kwargs)
+        super().__init__("i25zw", config, cookies, **kwargs)
 
     async def get_book_info(
         self,
@@ -44,14 +44,15 @@ class QianbiBrowser(BaseBrowser):
         Order: [info, catalog]
 
         :param book_id: The book identifier.
-        :return: The page content as a string.
+        :return: The page content as string list.
         """
         info_url = self.book_info_url(book_id=book_id)
         catalog_url = self.book_catalog_url(book_id=book_id)
 
-        info_html = await self.fetch(info_url, **kwargs)
-        catalog_html = await self.fetch(catalog_url, **kwargs)
-
+        info_html, catalog_html = await asyncio.gather(
+            self.fetch(info_url, **kwargs),
+            self.fetch(catalog_url, **kwargs),
+        )
         return [info_html, catalog_html]
 
     async def get_book_chapter(
@@ -65,11 +66,10 @@ class QianbiBrowser(BaseBrowser):
 
         :param book_id: The book identifier.
         :param chapter_id: The chapter identifier.
-        :return: The chapter content as a string.
+        :return: The page content as string list.
         """
-        catalog_url = self.book_catalog_url(book_id=book_id)
         url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
-        return [await self.fetch(url, referer=catalog_url, **kwargs)]
+        return [await self.fetch(url, **kwargs)]
 
     @classmethod
     def book_info_url(cls, book_id: str) -> str:
@@ -101,7 +101,3 @@ class QianbiBrowser(BaseBrowser):
         :return: Fully qualified chapter URL.
         """
         return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)
-
-    @property
-    def hostname(self) -> str:
-        return "www.23qb.com"

novel_downloader/core/fetchers/ixdzs8.py

@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.fetchers.ixdzs8
+-------------------------------------
+
+"""
+
+import asyncio
+import re
+from typing import Any
+
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
+from novel_downloader.models import FetcherConfig
+
+
+@register_fetcher(
+    site_keys=["ixdzs8"],
+)
+class Ixdzs8Session(BaseSession):
+    """
+    A session class for interacting with the 爱下电子书 (ixdzs8.com) novel website.
+    """
+
+    BOOK_INFO_URL = "https://ixdzs8.com/read/{book_id}/"
+    BOOK_CATALOG_URL = "https://ixdzs8.com/novel/clist/"
+    CHAPTER_URL = "https://ixdzs8.com/read/{book_id}/{chapter_id}.html"
+    _TOKEN_PATTERN = re.compile(r'let\s+token\s*=\s*"([^"]+)"')
+
+    def __init__(
+        self,
+        config: FetcherConfig,
+        cookies: dict[str, str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__("ixdzs8", config, cookies, **kwargs)
+
+    async def get_book_info(
+        self,
+        book_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of the book info page asynchronously.
+
+        Order: [info, catalog]
+
+        :param book_id: The book identifier.
+        :return: The page content as string list.
+        """
+        url = self.book_info_url(book_id=book_id)
+        data = {"bid": book_id}
+        info_html, clist_response = await asyncio.gather(
+            self.fetch_verified_html(url, **kwargs),
+            self.post(self.BOOK_CATALOG_URL, data),
+        )
+        catalog_html = await clist_response.text()
+        return [info_html, catalog_html]
+
+    async def get_book_chapter(
+        self,
+        book_id: str,
+        chapter_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of a single chapter asynchronously.
+
+        :param book_id: The book identifier.
+        :param chapter_id: The chapter identifier.
+        :return: The page content as string list.
+        """
+        url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
+        return [await self.fetch_verified_html(url, **kwargs)]
+
+    @classmethod
+    def book_info_url(cls, book_id: str) -> str:
+        """
+        Construct the URL for fetching a book's info page.
+
+        :param book_id: The identifier of the book.
+        :return: Fully qualified URL for the book info page.
+        """
+        return cls.BOOK_INFO_URL.format(book_id=book_id)
+
+    @classmethod
+    def chapter_url(cls, book_id: str, chapter_id: str) -> str:
+        """
+        Construct the URL for fetching a specific chapter.
+
+        :param book_id: The identifier of the book.
+        :param chapter_id: The identifier of the chapter.
+        :return: Fully qualified chapter URL.
+        """
+        return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)
+
+    async def fetch_verified_html(self, url: str, **kwargs: Any) -> str:
+        """
+        Automatically solving the browser verification challenge if required.
+        """
+        resp = await self.fetch(url, **kwargs)
+
+        if "正在验证浏览器" not in resp:
+            return resp
+
+        token_match = self._TOKEN_PATTERN.search(resp)
+        if not token_match:
+            raise ValueError("Token not found in page HTML.")
+        token_value = token_match.group(1)
+
+        challenge_url = f"{url}?challenge={token_value}"
+        _ = await self.fetch(challenge_url, **kwargs)
+        return await self.fetch(url, **kwargs)

novel_downloader/core/fetchers/jpxs123.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+"""
+novel_downloader.core.fetchers.jpxs123
+--------------------------------------
+
+"""
+
+from typing import Any
+
+from lxml import html
+
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
+from novel_downloader.models import FetcherConfig
+
+
+@register_fetcher(
+    site_keys=["jpxs123"],
+)
+class Jpxs123Session(BaseSession):
+    """
+    A session class for interacting with the 精品小说网 (www.jpxs123.com) novel website.
+    """
+
+    BASE_URL = "https://www.jpxs123.com"
+    BOOK_INFO_URL = "https://www.jpxs123.com/{book_id}.html"
+    CHAPTER_URL = "https://www.jpxs123.com/{book_id}/{chapter_id}.html"
+
+    def __init__(
+        self,
+        config: FetcherConfig,
+        cookies: dict[str, str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__("jpxs123", config, cookies, **kwargs)
+
+    async def get_book_info(
+        self,
+        book_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of the book info page asynchronously.
+
+        Order: [info, download]
+
+        :param book_id: The book identifier.
+        :return: The page content as string list.
+        """
+        book_id = book_id.replace("-", "/")
+        url = self.book_info_url(book_id=book_id)
+        info_html = await self.fetch(url, **kwargs)
+        try:
+            info_tree = html.fromstring(info_html)
+            txt_link = info_tree.xpath(
+                '//div[@class="booktips"]//a[contains(text(), "txt下载")]/@href'
+            )
+            download_url = f"{self.BASE_URL}{txt_link[0]}" if txt_link else None
+        except Exception:
+            download_url = None
+
+        download_html = await self.fetch(download_url, **kwargs) if download_url else ""
+        return [info_html, download_html]
+
+    async def get_book_chapter(
+        self,
+        book_id: str,
+        chapter_id: str,
+        **kwargs: Any,
+    ) -> list[str]:
+        """
+        Fetch the raw HTML of a single chapter asynchronously.
+
+        :param book_id: The book identifier.
+        :param chapter_id: The chapter identifier.
+        :return: The page content as string list.
+        """
+        book_id = book_id.replace("-", "/")
+        url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
+        return [await self.fetch(url, **kwargs)]
+
+    @classmethod
+    def book_info_url(cls, book_id: str) -> str:
+        """
+        Construct the URL for fetching a book's info page.
+
+        :param book_id: The identifier of the book.
+        :return: Fully qualified URL for the book info page.
+        """
+        return cls.BOOK_INFO_URL.format(book_id=book_id)
+
+    @classmethod
+    def chapter_url(cls, book_id: str, chapter_id: str) -> str:
+        """
+        Construct the URL for fetching a specific chapter.
+
+        :param book_id: The identifier of the book.
+        :param chapter_id: The identifier of the chapter.
+        :return: Fully qualified chapter URL.
+        """
+        return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)

novel_downloader/core/fetchers/{biquge/browser.py → lewenn.py}

@@ -1,31 +1,35 @@
 #!/usr/bin/env python3
 """
-novel_downloader.core.fetchers.biquge.browser
----------------------------------------------
+novel_downloader.core.fetchers.lewenn
+-------------------------------------
 
 """
 
 from typing import Any
 
-from novel_downloader.core.fetchers.base import BaseBrowser
+from novel_downloader.core.fetchers.base import BaseSession
+from novel_downloader.core.fetchers.registry import register_fetcher
 from novel_downloader.models import FetcherConfig
 
 
-class BiqugeBrowser(BaseBrowser):
+@register_fetcher(
+    site_keys=["lewenn", "lewen"],
+)
+class LewennSession(BaseSession):
     """
-    A browser class for interacting with the Biquge (www.b520.cc) novel website.
+    A session class for interacting with the 乐文小说网 (www.lewenn.net) novel website.
     """
 
-    BOOK_INFO_URL = "http://www.b520.cc/{book_id}/"
-    CHAPTER_URL = "http://www.b520.cc/{book_id}/{chapter_id}.html"
+    BOOK_INFO_URL = "https://www.lewenn.net/{book_id}/"
+    CHAPTER_URL = "https://www.lewenn.net/{book_id}/{chapter_id}.html"
 
     def __init__(
         self,
         config: FetcherConfig,
-        reuse_page: bool = False,
+        cookies: dict[str, str] | None = None,
         **kwargs: Any,
     ) -> None:
-        super().__init__("biquge", config, reuse_page, **kwargs)
+        super().__init__("lewenn", config, cookies, **kwargs)
 
     async def get_book_info(
         self,
@@ -36,7 +40,7 @@ class BiqugeBrowser(BaseBrowser):
         Fetch the raw HTML of the book info page asynchronously.
 
         :param book_id: The book identifier.
-        :return: The page content as a string.
+        :return: The page content as string list.
         """
         url = self.book_info_url(book_id=book_id)
         return [await self.fetch(url, **kwargs)]
@@ -52,7 +56,7 @@ class BiqugeBrowser(BaseBrowser):
 
         :param book_id: The book identifier.
         :param chapter_id: The chapter identifier.
-        :return: The chapter content as a string.
+        :return: The page content as string list.
         """
         url = self.chapter_url(book_id=book_id, chapter_id=chapter_id)
         return [await self.fetch(url, **kwargs)]
@@ -77,7 +81,3 @@ class BiqugeBrowser(BaseBrowser):
         :return: Fully qualified chapter URL.
         """
         return cls.CHAPTER_URL.format(book_id=book_id, chapter_id=chapter_id)
-
-    @property
-    def hostname(self) -> str:
-        return "www.b520.cc"