From 2a0fa73f9d427bb966972e94449a7adc2d561519 Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Thu, 2 Nov 2023 23:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6tabs=E5=87=8F=E5=B0=91?=
 =?UTF-8?q?=E7=94=A8get()=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/_base/browser.py         |  9 +++++----
 DrissionPage/_pages/chromium_frame.py |  2 +-
 DrissionPage/_pages/chromium_page.py  | 13 ++-----------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/DrissionPage/_base/browser.py b/DrissionPage/_base/browser.py
index 4c7aee0..7c8f0e9 100644
--- a/DrissionPage/_base/browser.py
+++ b/DrissionPage/_base/browser.py
@@ -79,12 +79,13 @@ class Browser(object):
     @property
     def tabs_count(self):
         """返回标签页数量"""
-        return len(self.tabs)
+        j = self.run_cdp('Target.getTargets')['targetInfos']  # 不要改用get，避免卡死
+        return len([i for i in j if i['type'] == 'page'])
 
     @property
     def tabs(self):
         """返回所有标签页id组成的列表"""
-        j = self._driver.get(f'http://{self.address}/json').json()  # 不要改用cdp
+        j = self._driver.get(f'http://{self.address}/json').json()  # 不要改用cdp，因为顺序不对
         return [i['id'] for i in j if i['type'] == 'page']
 
     @property
@@ -118,14 +119,14 @@ class Browser(object):
         :param tab_id: 标签页id
         :return: None
         """
-        self._driver.get(f'http://{self.address}/json/close/{tab_id}')
+        self.run_cdp('Target.closeTarget', targetId=tab_id)
 
     def activate_tab(self, tab_id):
         """使标签页变为活动状态
         :param tab_id: 标签页id
         :return: None
         """
-        self._driver.get(f'http://{self.address}/json/activate/{tab_id}')
+        self.run_cdp('Target.activateTarget', targetId=tab_id)
 
     def get_window_bounds(self, tab_id=None):
         """返回浏览器窗口位置和大小信息
diff --git a/DrissionPage/_pages/chromium_frame.py b/DrissionPage/_pages/chromium_frame.py
index ac6f03d..3ca9b25 100644
--- a/DrissionPage/_pages/chromium_frame.py
+++ b/DrissionPage/_pages/chromium_frame.py
@@ -91,7 +91,7 @@ class ChromiumFrame(ChromiumBase):
         try:
             super()._driver_init(tab_id)
         except:
-            get(f'http://{self.address}/json', headers={'Connection': 'close'})
+            self.browser.driver.get(f'http://{self.address}/json')
             super()._driver_init(tab_id)
         self.driver.set_listener('Inspector.detached', self._onInspectorDetached)
 
diff --git a/DrissionPage/_pages/chromium_page.py b/DrissionPage/_pages/chromium_page.py
index 2017eee..e19fbb6 100644
--- a/DrissionPage/_pages/chromium_page.py
+++ b/DrissionPage/_pages/chromium_page.py
@@ -161,17 +161,8 @@ class ChromiumPage(ChromiumBase):
         :return: 新标签页的id
         """
         if switch_to:
-            begin_tabs = set(self.tabs)
-            len_tabs = len(begin_tabs)
             tid = self.run_cdp('Target.createTarget', url='')['targetId']
-
-            tabs = self.tabs
-            while len(tabs) == len_tabs:
-                tabs = self.tabs
-                sleep(.005)
-
-            new_tab = set(tabs) - begin_tabs
-            self._to_tab(new_tab.pop(), read_doc=False)
+            self._to_tab(tid, read_doc=False)
             if url:
                 self.get(url)
 
@@ -265,7 +256,7 @@ class ChromiumPage(ChromiumBase):
         for tab in tabs:
             self.browser.close_tab(tab)
             sleep(.2)
-        while len(self.tabs) != end_len:
+        while self.tabs_count != end_len:
             sleep(.1)
 
         if self._main_tab in tabs: