modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-09-29 08:39:59 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,20 +1,23 @@
-from typing import Dict, Union, Optional, List, Any, Literal
-from utils.user_agent import get_user_agent
-from .utils import get_local_proxy
-from services.log import logger
-from pathlib import Path
-from httpx import Response
-from asyncio.exceptions import TimeoutError
-from nonebot.adapters.onebot.v11 import MessageSegment
-from playwright.async_api import Page, BrowserContext
-from .message_builder import image
-from httpx import ConnectTimeout
-from .browser import get_browser
-from retrying import retry
 import asyncio
+from asyncio.exceptions import TimeoutError
+from contextlib import asynccontextmanager
+from pathlib import Path
+from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Union
+
 import aiofiles
 import httpx
 import rich
+from httpx import ConnectTimeout, Response
+from nonebot.adapters.onebot.v11 import MessageSegment
+from playwright.async_api import BrowserContext, Page
+from retrying import retry
+
+from services.log import logger
+from utils.user_agent import get_user_agent
+
+from .browser import get_browser
+from .message_builder import image
+from .utils import get_local_proxy


 class AsyncHttpx:
@@ -32,7 +35,7 @@ class AsyncHttpx:
        cookies: Optional[Dict[str, str]] = None,
        verify: bool = True,
        use_proxy: bool = True,
-        proxy: Dict[str, str] = None,
+        proxy: Optional[Dict[str, str]] = None,
        timeout: Optional[int] = 30,
        **kwargs,
    ) -> Response:
@@ -59,7 +62,7 @@ class AsyncHttpx:
                headers=headers,
                cookies=cookies,
                timeout=timeout,
-                **kwargs
+                **kwargs,
            )

    @classmethod
@@ -174,7 +177,9 @@ class AsyncHttpx:
                        headers = get_user_agent()
                    proxy = proxy if proxy else cls.proxy if use_proxy else None
                    try:
-                        async with httpx.AsyncClient(proxies=proxy, verify=verify) as client:
+                        async with httpx.AsyncClient(
+                            proxies=proxy, verify=verify
+                        ) as client:
                            async with client.stream(
                                "GET",
                                url,
@@ -182,9 +187,11 @@ class AsyncHttpx:
                                headers=headers,
                                cookies=cookies,
                                timeout=timeout,
-                                **kwargs
+                                **kwargs,
                            ) as response:
-                                logger.info(f"开始下载 {path.name}.. Path: {path.absolute()}")
+                                logger.info(
+                                    f"开始下载 {path.name}.. Path: {path.absolute()}"
+                                )
                                async with aiofiles.open(path, "wb") as wf:
                                    total = int(response.headers["Content-Length"])
                                    with rich.progress.Progress(
@@ -192,13 +199,18 @@ class AsyncHttpx:
                                        "[progress.percentage]{task.percentage:>3.0f}%",
                                        rich.progress.BarColumn(bar_width=None),
                                        rich.progress.DownloadColumn(),
-                                        rich.progress.TransferSpeedColumn()
+                                        rich.progress.TransferSpeedColumn(),
                                    ) as progress:
-                                        download_task = progress.add_task("Download", total=total)
+                                        download_task = progress.add_task(
+                                            "Download", total=total
+                                        )
                                        async for chunk in response.aiter_bytes():
                                            await wf.write(chunk)
                                            await wf.flush()
-                                            progress.update(download_task, completed=response.num_bytes_downloaded)
+                                            progress.update(
+                                                download_task,
+                                                completed=response.num_bytes_downloaded,
+                                            )
                                    logger.info(f"下载 {url} 成功.. Path：{path.absolute()}")
                        return True
                    except (TimeoutError, ConnectTimeout):
@@ -274,7 +286,7 @@ class AsyncHttpx:
                            use_proxy=use_proxy,
                            timeout=timeout,
                            proxy=proxy,
-                            ** kwargs,
+                            **kwargs,
                        )
                    )
                )
@@ -285,64 +297,23 @@ class AsyncHttpx:


 class AsyncPlaywright:
-
    @classmethod
-    async def _new_page(cls, user_agent: Optional[str] = None, **kwargs) -> Page:
+    @asynccontextmanager
+    async def new_page(cls, **kwargs) -> AsyncGenerator[Page, None]:
        """
        说明:
            获取一个新页面
        参数:
            :param user_agent: 请求头
        """
-        browser = await get_browser()
-        if browser:
-            return await browser.new_page(user_agent=user_agent, **kwargs)
-        raise BrowserIsNone("获取Browser失败...")
-
-    @classmethod
-    async def new_context(cls, user_agent: Optional[str] = None, **kwargs) -> BrowserContext:
-        """
-        说明:
-            获取一个新上下文
-        参数:
-            :param user_agent: 请求头
-        """
-        browser = await get_browser()
-        if browser:
-            return await browser.new_context(user_agent=user_agent, **kwargs)
-        raise BrowserIsNone("获取Browser失败...")
-
-    @classmethod
-    async def goto(
-        cls,
-        url: str,
-        *,
-        timeout: Optional[float] = 100000,
-        wait_until: Optional[
-            Literal["domcontentloaded", "load", "networkidle"]
-        ] = "networkidle",
-        referer: str = None,
-        **kwargs
-    ) -> Optional[Page]:
-        """
-        说明:
-            goto
-        参数:
-            :param url: 网址
-            :param timeout: 超时限制
-            :param wait_until: 等待类型
-            :param referer:
-        """
-        page = None
+        browser = get_browser()
+        ctx = await browser.new_context(**kwargs)
+        page = await ctx.new_page()
        try:
-            page = await cls._new_page(**kwargs)
-            await page.goto(url, timeout=timeout, wait_until=wait_until, referer=referer)
-            return page
-        except Exception as e:
-            logger.warning(f"Playwright 访问 url：{url} 发生错误 {type(e)}：{e}")
-            if page:
-                await page.close()
-        return None
+            yield page
+        finally:
+            await page.close()
+            await ctx.close()

    @classmethod
    async def screenshot(
@@ -352,13 +323,13 @@ class AsyncPlaywright:
        element: Union[str, List[str]],
        *,
        wait_time: Optional[int] = None,
-        viewport_size: Dict[str, int] = None,
+        viewport_size: Optional[Dict[str, int]] = None,
        wait_until: Optional[
            Literal["domcontentloaded", "load", "networkidle"]
        ] = "networkidle",
-        timeout: float = None,
-        type_: Literal["jpeg", "png"] = None,
-        **kwargs
+        timeout: Optional[float] = None,
+        type_: Optional[Literal["jpeg", "png"]] = None,
+        **kwargs,
    ) -> Optional[MessageSegment]:
        """
        说明:
@@ -373,33 +344,25 @@ class AsyncPlaywright:
            :param timeout: 超时限制
            :param type_: 保存类型
        """
-        page = None
        if viewport_size is None:
            viewport_size = dict(width=2560, height=1080)
        if isinstance(path, str):
            path = Path(path)
-        try:
-            page = await cls.goto(url, wait_until=wait_until, **kwargs)
-            await page.set_viewport_size(viewport_size)
-            if isinstance(element, str):
-                if wait_time:
-                    card = await page.wait_for_selector(element, timeout=wait_time * 1000)
-                else:
-                    card = await page.query_selector(element)
-            else:
-                card = page
-                for e in element:
-                    if wait_time:
-                        card = await card.wait_for_selector(e, timeout=wait_time * 1000)
-                    else:
-                        card = await card.query_selector(e)
-            await card.screenshot(path=path, timeout=timeout, type=type_)
-            return image(path)
-        except Exception as e:
-            logger.warning(f"Playwright 截图 url：{url} element：{element} 发生错误 {type(e)}：{e}")
-        finally:
-            if page:
-                await page.close()
+        wait_time = wait_time * 1000 if wait_time else None
+        if isinstance(element, str):
+            element_list = [element]
+        else:
+            element_list = element
+        async with cls.new_page(viewport=viewport_size) as page:
+            await page.goto(url, timeout=timeout, wait_until=wait_until)
+            card = page
+            for e in element_list:
+                if not card:
+                    return None
+                card = await card.wait_for_selector(e, timeout=wait_time)
+            if card:
+                await card.screenshot(path=path, timeout=timeout, type=type_)
+                return image(path)
        return None