fix _check_chrome_connection too fast and no retry

Author: ClericPy

examples_async.py

@@ -204,7 +204,7 @@ async def test_tab_js(tab: AsyncTab):
     # test wait tags
     result = await tab.wait_tags("abcdabcdabcdabcd", max_wait_time=1)
     assert result == []
-    assert await tab.wait_tag("title", max_wait_time=3)
+    assert await tab.wait_tag("title", max_wait_time=5)
     assert await tab.includes("MIT License")
     assert not (await tab.includes("abcdabcdabcdabcd"))
     assert await tab.wait_includes("MIT License")
@@ -570,7 +570,8 @@ def on_shutdown(chromed):
                 assert await tab.clear_browser_cache()
                 logger.info("clear_browser_cache OK.")
                 # close tab
-                await tab.close()
+                # await tab.close()
+                # logger.info("close tab OK.")
             # test chrome.connect_tab
             async with chrome.connect_tab(chrome.server + "/json", True) as tab:
                 await tab.wait_loading(2)

ichrome/__init__.py

@@ -5,7 +5,7 @@
 from .logs import logger
 from .pool import ChromeEngine
 
-__version__ = "5.0.1"
+__version__ = "5.0.2"
 __tips__ = "[github]: https://github.com/ClericPy/ichrome\n[cdp]: https://chromedevtools.github.io/devtools-protocol/\n[cmd args]: https://peter.sh/experiments/chromium-command-line-switches/"
 __all__ = [
     "ChromeDaemon",

ichrome/async_utils.py

@@ -18,17 +18,18 @@
     Coroutine,
     Dict,
     List,
+    Literal,
     Optional,
     Set,
     Union,
 )
 from urllib.parse import quote_plus, urljoin
 from weakref import WeakValueDictionary
 
+from aiohttp import ClientResponse, ClientSession
 from aiohttp.client import ClientWebSocketResponse
 from aiohttp.client_exceptions import ClientError
 from aiohttp.http import WebSocketError, WSMsgType
-from aiohttp import ClientSession, ClientResponse
 
 from .base import (
     INF,
@@ -612,8 +613,7 @@ async def close(self, timeout=0) -> Union[dict, None]:
         """[Page.close], close tab with cdp websocket. will lose ws, so timeout default to 0."""
         try:
             return await self.send("Page.close", timeout=timeout)
-        except ChromeRuntimeError as error:
-            logger.error(f"close tab failed for {error!r}")
+        except ChromeRuntimeError:
             return None
 
     async def crash(self, timeout=0) -> Union[dict, None]:
@@ -1752,7 +1752,13 @@ async def wait_findall(
         self,
         regex: str,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         flags: str = "g",
         max_wait_time: Optional[float] = None,
         interval: float = 1,
@@ -1778,7 +1784,13 @@ async def findone(
         self,
         regex: str,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         timeout=NotSet,
     ):
         "find the string in html(select with given css)"
@@ -1793,7 +1805,13 @@ async def findall(
         self,
         regex: str,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         flags: str = "g",
         timeout=NotSet,
     ) -> list:
@@ -1851,7 +1869,13 @@ async def contains(
         self,
         text,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         timeout=NotSet,
     ) -> bool:
         """alias for Tab.includes"""
@@ -1863,7 +1887,13 @@ async def includes(
         self,
         text,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         timeout=NotSet,
     ) -> bool:
         """String.prototype.includes.
@@ -1882,7 +1912,13 @@ async def wait_includes(
         self,
         text: str,
         cssselector: str = "html",
-        attribute: str = "outerHTML",
+        attribute: Literal[
+            "outerHTML",
+            "innerHTML",
+            "textContent",
+            "innerText",
+            "outerText",
+        ] = "outerHTML",
         max_wait_time: Optional[float] = None,
         interval: float = 1,
         timeout=NotSet,
@@ -3888,7 +3924,7 @@ async def __aexit__(self, *_):
         if self.browserContextId:
             try:
                 await self.browser.send("Target.disposeBrowserContext")
-            except ChromeRuntimeError:
+            except Exception:
                 pass
             self.browserContextId = None
         if self._need_init_chrome:

ichrome/daemon.py

@@ -148,6 +148,7 @@ class ChromeDaemon(object):
         "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
     ]
     SYSTEM_ENCODING = os.getenv("SYSTEM_ENCODING") or ""
+    LAST_N_LINES_STDOUT = 5
 
     def __init__(
         self,
@@ -510,16 +511,16 @@ def close_stdout_stderr(self, error_name=""):
                 if f and not f.closed:
                     try:
                         if error_name and f is self.opened_files[1]:
-                            last_5_lines = []
+                            last_n_lines = []
                             f.seek(0)
                             for line in f:
                                 if not line.strip():
                                     continue
-                                last_5_lines.append(line)
-                                if len(last_5_lines) > 5:
-                                    last_5_lines.pop(0)
-                            if last_5_lines:
-                                content = b"".join(last_5_lines)
+                                last_n_lines.append(line)
+                                if len(last_n_lines) > self.LAST_N_LINES_STDOUT:
+                                    last_n_lines.pop(0)
+                            if last_n_lines:
+                                content = b"".join(last_n_lines)
                                 if self.SYSTEM_ENCODING:
                                     text = content.decode(self.SYSTEM_ENCODING)
                                 else:
@@ -529,9 +530,14 @@ def close_stdout_stderr(self, error_name=""):
                                         text = content.decode(
                                             "gb18030", errors="replace"
                                         )
-                                logger.error(
-                                    f"stderr file last 5 lines for {error_name}: {text}"
-                                )
+                                if (
+                                    self.LAST_N_LINES_STDOUT
+                                    and error_name
+                                    and error_name != "None"
+                                ):
+                                    logger.error(
+                                        f"stderr file last {self.LAST_N_LINES_STDOUT} lines for {error_name!r}: {text}"
+                                    )
                     except Exception:
                         pass
                     f.close()
@@ -734,9 +740,7 @@ def shutdown(self, reason=None, exc_type=None):
         if self.on_shutdown:
             self.on_shutdown(self)
         self.kill(True)
-        self.close_stdout_stderr(
-            error_name=getattr(exc_type, "__name__", repr(exc_type))
-        )
+        self.close_stdout_stderr(error_name=getattr(exc_type, "__name__", ""))
         if self.after_shutdown:
             self.after_shutdown(self)
         if self.clear_after_shutdown:
@@ -939,8 +943,18 @@ async def launch_chrome(self):
 
     async def _check_chrome_connection(self):
         async with ClientSession() as session:
-            r = await session.head(self.server, timeout=self._timeout)
-            return r.ok
+            start = time.time()
+            for _ in range(20):
+                try:
+                    r = await session.head(self.server, timeout=self._timeout)
+                    return r.ok
+                except Exception:
+                    if time.time() - start > self.MAX_WAIT_CHECKING_SECONDS:
+                        break
+                    await asyncio.sleep(0.1)
+            raise ChromeRuntimeError(
+                f"check_chrome_connection failed for {self.server} not ok."
+            )
 
     async def check_connection(self):
         "check chrome connection ok"
@@ -1072,7 +1086,7 @@ async def shutdown(self, reason=None, exc_type=None):
         await async_run(self.kill, True)
         await async_run(
             self.close_stdout_stderr,
-            error_name=getattr(exc_type, "__name__", repr(exc_type)),
+            error_name=getattr(exc_type, "__name__", ""),
         )
         if self.after_shutdown:
             await ensure_awaitable(self.after_shutdown(self))

ichrome/pool.py

@@ -105,10 +105,10 @@ def cancel_task(self):
         except AttributeError:
             pass
 
-    def cancel(self):
+    def cancel(self, msg=None):
         logger.info(f"[canceled] {self}")
         self.cancel_task()
-        super().cancel()
+        super().cancel(msg=msg)
 
     def __lt__(self, other):
         return self.expire_time < other.expire_time