From 1eaa56efdb9ba5607e67ae94c29c9733206b942a Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Thu, 11 Jan 2024 18:12:54 +0800
Subject: [PATCH] =?UTF-8?q?Page=E6=94=B9=E6=88=90=E5=8D=95=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/_base/browser.py         |   1 +
 DrissionPage/_pages/chromium_page.py  | 121 ++++++++++++++++----------
 DrissionPage/_pages/chromium_page.pyi |   5 ++
 3 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/DrissionPage/_base/browser.py b/DrissionPage/_base/browser.py
index 0e71e1d..8ef4df0 100644
--- a/DrissionPage/_base/browser.py
+++ b/DrissionPage/_base/browser.py
@@ -202,6 +202,7 @@ class Browser(object):
                     pass
 
     def _on_quit(self):
+        self.page._on_quit()
         Browser.BROWSERS.pop(self.id, None)
         if self.page._chromium_options.is_auto_port and self.page._chromium_options.user_data_path:
             path = Path(self.page._chromium_options.user_data_path)
diff --git a/DrissionPage/_pages/chromium_page.py b/DrissionPage/_pages/chromium_page.py
index 2101c8c..76eb836 100644
--- a/DrissionPage/_pages/chromium_page.py
+++ b/DrissionPage/_pages/chromium_page.py
@@ -22,6 +22,26 @@ from ..errors import BrowserConnectError
 
 class ChromiumPage(ChromiumBase):
     """用于管理浏览器的类"""
+    PAGES = {}
+
+    def __new__(cls, addr_or_opts=None, tab_id=None, timeout=None, addr_driver_opts=None):
+        """
+        :param addr_or_opts: 浏览器地址:端口、ChromiumOptions对象或端口数字（int）
+        :param tab_id: 要控制的标签页id，不指定默认为激活的
+        :param timeout: 超时时间（秒）
+        """
+        addr_or_opts = addr_or_opts or addr_driver_opts
+        opt = _handle_options(addr_or_opts)
+        is_exist, browser_id = _run_browser(opt)
+        if browser_id in cls.PAGES:
+            return cls.PAGES[browser_id]
+        r = object.__new__(cls)
+        r._chromium_options = opt
+        r._is_exist = is_exist
+        r._browser_id = browser_id
+        r.address = opt.address
+        cls.PAGES[browser_id] = r
+        return r
 
     def __init__(self, addr_or_opts=None, tab_id=None, timeout=None, addr_driver_opts=None):
         """
@@ -29,58 +49,20 @@ class ChromiumPage(ChromiumBase):
         :param tab_id: 要控制的标签页id，不指定默认为激活的
         :param timeout: 超时时间（秒）
         """
-        addr_or_opts = addr_or_opts or addr_driver_opts
+        if hasattr(self, '_created'):
+            return
+        self._created = True
+
         self._page = self
-        address = self._handle_options(addr_or_opts)
         self._run_browser()
-        super().__init__(address, tab_id)
+        super().__init__(self.address, tab_id)
         self.set.timeouts(base=timeout)
         self._page_init()
 
-    def _handle_options(self, addr_or_opts):
-        """设置浏览器启动属性
-        :param addr_or_opts: 'ip:port'、ChromiumOptions、Driver
-        :return: 返回浏览器地址
-        """
-        if not addr_or_opts:
-            self._chromium_options = ChromiumOptions(addr_or_opts)
-
-        elif isinstance(addr_or_opts, ChromiumOptions):
-            if addr_or_opts.is_auto_port:
-                port, path = PortFinder(addr_or_opts.tmp_path).get_port()
-                addr_or_opts.set_address(f'127.0.0.1:{port}')
-                addr_or_opts.set_user_data_path(path)
-                addr_or_opts.auto_port()
-            self._chromium_options = addr_or_opts
-
-        elif isinstance(addr_or_opts, str):
-            self._chromium_options = ChromiumOptions()
-            self._chromium_options.set_address(addr_or_opts)
-
-        elif isinstance(addr_or_opts, int):
-            self._chromium_options = ChromiumOptions()
-            self._chromium_options.set_local_port(addr_or_opts)
-
-        else:
-            raise TypeError('只能接收ip:port格式或ChromiumOptions类型参数。')
-
-        return self._chromium_options.address
-
     def _run_browser(self):
         """连接浏览器"""
-        is_exist = connect_browser(self._chromium_options)
-        try:
-            ws = get(f'http://{self._chromium_options.address}/json/version', headers={'Connection': 'close'})
-            if not ws:
-                raise BrowserConnectError('\n浏览器连接失败，如使用全局代理，须设置不代理127.0.0.1地址。')
-            ws = ws.json()['webSocketDebuggerUrl'].split('/')[-1]
-        except KeyError:
-            raise BrowserConnectError('浏览器版本太旧，请升级。')
-        except:
-            raise BrowserConnectError('\n浏览器连接失败，如使用全局代理，须设置不代理127.0.0.1地址。')
-
-        self._browser = Browser(self._chromium_options.address, ws, self)
-        if (is_exist and self._chromium_options._headless is False and
+        self._browser = Browser(self._chromium_options.address, self._browser_id, self)
+        if (self._is_exist and self._chromium_options._headless is False and
                 'headless' in self._browser.run_cdp('Browser.getVersion')['userAgent'].lower()):
             self._browser.quit(3)
             connect_browser(self._chromium_options)
@@ -263,6 +245,10 @@ class ChromiumPage(ChromiumBase):
         """
         self.browser.quit(timeout, force)
 
+    def _on_quit(self):
+        """浏览器退出时执行"""
+        ChromiumPage.PAGES.pop(self._browser_id, None)
+
     def __repr__(self):
         return f'<ChromiumPage browser_id={self.browser.id} tab_id={self.tab_id}>'
 
@@ -275,6 +261,51 @@ class ChromiumPage(ChromiumBase):
         self.close_tabs(tabs_or_ids, True)
 
 
+def _handle_options(addr_or_opts):
+    """设置浏览器启动属性
+    :param addr_or_opts: 'ip:port'、ChromiumOptions、Driver
+    :return: 返回浏览器地址
+    """
+    if not addr_or_opts:
+        _chromium_options = ChromiumOptions(addr_or_opts)
+
+    elif isinstance(addr_or_opts, ChromiumOptions):
+        if addr_or_opts.is_auto_port:
+            port, path = PortFinder(addr_or_opts.tmp_path).get_port()
+            addr_or_opts.set_address(f'127.0.0.1:{port}')
+            addr_or_opts.set_user_data_path(path)
+            addr_or_opts.auto_port()
+        _chromium_options = addr_or_opts
+
+    elif isinstance(addr_or_opts, str):
+        _chromium_options = ChromiumOptions()
+        _chromium_options.set_address(addr_or_opts)
+
+    elif isinstance(addr_or_opts, int):
+        _chromium_options = ChromiumOptions()
+        _chromium_options.set_local_port(addr_or_opts)
+
+    else:
+        raise TypeError('只能接收ip:port格式或ChromiumOptions类型参数。')
+
+    return _chromium_options
+
+
+def _run_browser(_chromium_options):
+    """连接浏览器"""
+    is_exist = connect_browser(_chromium_options)
+    try:
+        ws = get(f'http://{_chromium_options.address}/json/version', headers={'Connection': 'close'})
+        if not ws:
+            raise BrowserConnectError('\n浏览器连接失败，如使用全局代理，须设置不代理127.0.0.1地址。')
+        browser_id = ws.json()['webSocketDebuggerUrl'].split('/')[-1]
+    except KeyError:
+        raise BrowserConnectError('浏览器版本太旧，请升级。')
+    except:
+        raise BrowserConnectError('\n浏览器连接失败，如使用全局代理，须设置不代理127.0.0.1地址。')
+    return is_exist, browser_id
+
+
 def get_rename(original, rename):
     if '.' in rename:
         return rename
diff --git a/DrissionPage/_pages/chromium_page.pyi b/DrissionPage/_pages/chromium_page.pyi
index 407cd1a..50c14ce 100644
--- a/DrissionPage/_pages/chromium_page.pyi
+++ b/DrissionPage/_pages/chromium_page.pyi
@@ -18,6 +18,7 @@ from .._units.waiter import PageWaiter
 
 
 class ChromiumPage(ChromiumBase):
+    PAGES: dict = ...
 
     def __init__(self,
                  addr_or_opts: Union[str, int, ChromiumOptions] = None,
@@ -25,7 +26,9 @@ class ChromiumPage(ChromiumBase):
                  timeout: float = None):
         self._chromium_options: ChromiumOptions = ...
         self._browser: Browser = ...
+        self._browser_id: str = ...
         self._rect: Optional[TabRect] = ...
+        self._is_exist:bool = ...
 
     def _handle_options(self, addr_or_opts: Union[str, ChromiumOptions]) -> str: ...
 
@@ -95,5 +98,7 @@ class ChromiumPage(ChromiumBase):
 
     def quit(self, timeout: float = 5, force: bool = True) -> None: ...
 
+    def _on_quit(self) -> None: ...
+
 
 def get_rename(original: str, rename: str) -> str: ...