nonebot-plugin-htmlrender 0.2.1__tar.gz → 0.2.3__tar.gz

{nonebot_plugin_htmlrender-0.2.1 → nonebot_plugin_htmlrender-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-htmlrender
-Version: 0.2.1
+Version: 0.2.3
 Summary: 通过浏览器渲染图片
 Author-Email: kexue <xana278@foxmail.com>
 License: MIT License
@@ -77,6 +77,19 @@ from nonebot_plugin_htmlrender import (
 htmlrender_browser = "chromium"
 # 使用 firefox
 htmlrender_browser = "firefox"
+
+# 下载 playwright 代理地址 可不写
+htmlrender_download_host = ""
+
+# 浏览器自定代理地址 可不写
+htmlrender_proxy_host = "http://127.0.0.1:7890"
+
+# 浏览器 channel 支持以下
+# "chrome", "chrome-beta", "chrome-dev", "chrome-canary", 
+# "msedge", "msedge-beta", "msedge-dev", "msedge-canary"
+# 手动编辑可以直接使用系统自带浏览器而不用重新下载 chromium
+# 可不写
+htmlrender_browser_channel = ""
 ```
 
 ## markdown 转 图片

{nonebot_plugin_htmlrender-0.2.1 → nonebot_plugin_htmlrender-0.2.3}/README.md

@@ -38,6 +38,19 @@ from nonebot_plugin_htmlrender import (
 htmlrender_browser = "chromium"
 # 使用 firefox
 htmlrender_browser = "firefox"
+
+# 下载 playwright 代理地址 可不写
+htmlrender_download_host = ""
+
+# 浏览器自定代理地址 可不写
+htmlrender_proxy_host = "http://127.0.0.1:7890"
+
+# 浏览器 channel 支持以下
+# "chrome", "chrome-beta", "chrome-dev", "chrome-canary", 
+# "msedge", "msedge-beta", "msedge-dev", "msedge-canary"
+# 手动编辑可以直接使用系统自带浏览器而不用重新下载 chromium
+# 可不写
+htmlrender_browser_channel = ""
 ```
 
 ## markdown 转 图片

{nonebot_plugin_htmlrender-0.2.1 → nonebot_plugin_htmlrender-0.2.3}/nonebot_plugin_htmlrender/browser.py

@@ -42,10 +42,16 @@ async def init(**kwargs) -> Browser:
     return _browser
 
 
-async def launch_browser(proxy=config.htmlrender_proxy_host, **kwargs) -> Browser:
+async def launch_browser(**kwargs) -> Browser:
     assert _playwright is not None, "Playwright 没有安装"
-    if proxy:
-        kwargs["proxy"] = proxy
+
+    if config.htmlrender_browser_channel:
+        kwargs["channel"] = config.htmlrender_browser_channel
+
+    if config.htmlrender_proxy_host:
+        kwargs["proxy"] = {
+            "server": config.htmlrender_proxy_host,
+        }
     if config.htmlrender_browser == "firefox":
         logger.info("使用 firefox 启动")
         return await _playwright.firefox.launch(**kwargs)
@@ -61,9 +67,9 @@ async def get_browser(**kwargs) -> Browser:
 
 
 @asynccontextmanager
-async def get_new_page(device_scale_factor:float = 2,**kwargs) -> AsyncIterator[Page]:
+async def get_new_page(device_scale_factor: float = 2, **kwargs) -> AsyncIterator[Page]:
     browser = await get_browser()
-    page = await browser.new_page(device_scale_factor=device_scale_factor,**kwargs)
+    page = await browser.new_page(device_scale_factor=device_scale_factor, **kwargs)
     try:
         yield page
     finally:

{nonebot_plugin_htmlrender-0.2.1 → nonebot_plugin_htmlrender-0.2.3}/nonebot_plugin_htmlrender/config.py

@@ -7,3 +7,4 @@ class Config(BaseModel, extra=Extra.ignore):
     htmlrender_browser: Optional[str] = "chromium"
     htmlrender_download_host: Optional[str]
     htmlrender_proxy_host: Optional[str]
+    htmlrender_browser_channel: Optional[str]

{nonebot_plugin_htmlrender-0.2.1 → nonebot_plugin_htmlrender-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-htmlrender"
-version = "0.2.1"
+version = "0.2.3"
 description = "通过浏览器渲染图片"
 authors = [
     { name = "kexue", email = "xana278@foxmail.com" },