From 0e57938e23a2cbe398a4fc0505518c3ecbe214ea Mon Sep 17 00:00:00 2001
From: g1879 <g1879@qq.com>
Date: Fri, 9 Feb 2024 21:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4quit()=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/_base/browser.py     | 49 ++++++++++++++++---------------
 DrissionPage/_functions/tools.py  | 36 -----------------------
 DrissionPage/_functions/tools.pyi |  3 --
 3 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/DrissionPage/_base/browser.py b/DrissionPage/_base/browser.py
index ce41cff..86caffe 100644
--- a/DrissionPage/_base/browser.py
+++ b/DrissionPage/_base/browser.py
@@ -7,12 +7,12 @@
 """
 from pathlib import Path
 from shutil import rmtree
-from time import sleep, perf_counter
+from time import perf_counter, sleep
 
 from websocket import WebSocketBadStatusException
 
 from .driver import BrowserDriver, Driver
-from .._functions.tools import stop_process_on_port, raise_error
+from .._functions.tools import raise_error
 from .._units.downloader import DownloadManager
 from ..errors import PageDisconnectedError
 
@@ -196,38 +196,41 @@ class Browser(object):
         :param force: 是否立刻强制终止进程
         :return: None
         """
+        pids = [pid['id'] for pid in self.run_cdp('SystemInfo.getProcessInfo')['processInfo']]
         for tab in self._all_drivers.values():
             for driver in tab:
                 driver.stop()
-        try:
-            self.run_cdp('Browser.close')
-        except PageDisconnectedError:
-            self.driver.stop()
-            return
-        self.driver.stop()
 
         if force:
-            ip, port = self.address.split(':')
-            if ip not in ('127.0.0.1', 'localhost'):
-                return
-            stop_process_on_port(port, self.process_id)
-            return
+            from psutil import Process
+            for pid in pids:
+                Process(pid).kill()
+        else:
+            try:
+                self.run_cdp('Browser.close')
+                self.driver.stop()
+            except PageDisconnectedError:
+                self.driver.stop()
 
-        if self.process_id:
-            from os import popen
-            from platform import system
-            txt = f'tasklist | findstr {self.process_id}' if system().lower() == 'windows' \
-                else f'ps -ef | grep  {self.process_id}'
-            end_time = perf_counter() + timeout
-            while perf_counter() < end_time:
+        from os import popen
+        from platform import system
+        end_time = perf_counter() + timeout
+        while perf_counter() < end_time:
+            ok = True
+            for pid in pids:
+                txt = f'tasklist | findstr {pid}' if system().lower() == 'windows' else f'ps -ef | grep {pid}'
                 p = popen(txt)
-                sleep(.1)
+                sleep(.05)
                 try:
-                    if f'  {self.process_id} ' not in p.read():
-                        return
+                    if f'  {pid} ' in p.read():
+                        ok = False
+                        break
                 except TypeError:
                     pass
 
+            if ok:
+                break
+
     def _on_disconnect(self):
         self.page._on_disconnect()
         Browser.BROWSERS.pop(self.id, None)
diff --git a/DrissionPage/_functions/tools.py b/DrissionPage/_functions/tools.py
index c2ec84e..38640cf 100644
--- a/DrissionPage/_functions/tools.py
+++ b/DrissionPage/_functions/tools.py
@@ -12,8 +12,6 @@ from tempfile import gettempdir, TemporaryDirectory
 from threading import Lock
 from time import perf_counter
 
-from psutil import process_iter, AccessDenied, NoSuchProcess, ZombieProcess, Process
-
 from .._configs.options_manage import OptionsManager
 from ..errors import (ContextLostError, ElementLostError, CDPError, PageDisconnectedError, NoRectError,
                       AlertExistsError, WrongURLError, StorageError, CookieFormatError, JavaScriptError)
@@ -182,40 +180,6 @@ def wait_until(function, kwargs=None, timeout=10):
     raise TimeoutError
 
 
-def stop_process_on_port(port, pid=None):
-    """强制关闭某个端口内的进程
-    :param port: 端口号
-    :param pid: 进程号
-    :return: None
-    """
-    if pid:
-        try:
-            for p in Process(pid).children():
-                p.terminate()
-            Process(pid).terminate()
-        except:
-            pass
-
-    for proc in process_iter(['pid', 'connections']):
-        try:
-            connections = proc.connections()
-        except (AccessDenied, NoSuchProcess):
-            continue
-        for conn in connections:
-            if conn.laddr.port == int(port):
-                try:
-                    # proc.terminate()
-                    parent = proc.parent()
-                    if parent is None:
-                        proc.kill()
-                    elif parent.name() == 'explorer.exe':
-                        proc.terminate()
-                except (NoSuchProcess, AccessDenied, ZombieProcess):
-                    pass
-                except Exception as e:
-                    print(f"{proc.pid} {port}: {e}")
-
-
 def configs_to_here(save_name=None):
     """把默认ini文件复制到当前目录
     :param save_name: 指定文件名，为None则命名为'dp_configs.ini'
diff --git a/DrissionPage/_functions/tools.pyi b/DrissionPage/_functions/tools.pyi
index f6b55c0..86d3527 100644
--- a/DrissionPage/_functions/tools.pyi
+++ b/DrissionPage/_functions/tools.pyi
@@ -42,9 +42,6 @@ def get_hwnds_from_pid(pid: Union[str, int], title: str) -> list: ...
 def wait_until(function: callable, kwargs: dict = None, timeout: float = 10): ...
 
 
-def stop_process_on_port(port: Union[int, str], pid: int = None) -> None: ...
-
-
 def configs_to_here(file_name: Union[Path, str] = None) -> None: ...