11import os
22import asyncio
33from ..backend_base import BackendBase
4+ from ..backend import BrowserType , launch_browser
45from ...constants import JS_DIR , HTML_DIR
56from ..browser_main .server import server_context , find_free_port
67from playwright .async_api import async_playwright
8+ from playwright .async_api import Error as PlaywrightError
79from pathlib import Path
810import shutil
911
1012
13+ def _is_target_closed_error (e ):
14+ # TargetClosedError is not part of playwright's public api (and older
15+ # versions raise a plain Error with a "Target closed" message)
16+ msg = str (e )
17+ return (
18+ type (e ).__name__ == "TargetClosedError"
19+ or "Target closed" in msg
20+ or "has been closed" in msg
21+ )
22+
23+
1124class BrowserWorkerBackend (BackendBase ):
1225 def __init__ (
13- self , host_work_dir , work_dir , script , async_main , port , headless , slow_mo , preload_shared_libs = True
26+ self ,
27+ host_work_dir ,
28+ work_dir ,
29+ script ,
30+ async_main ,
31+ port ,
32+ headless ,
33+ slow_mo ,
34+ preload_shared_libs = True ,
35+ browser = BrowserType .chromium ,
1436 ):
1537 super ().__init__ (
1638 host_work_dir = host_work_dir ,
@@ -23,6 +45,7 @@ def __init__(
2345 self .port = port
2446 self .headless = headless
2547 self .slow_mo = slow_mo
48+ self .browser = BrowserType (browser )
2649 self .preload_shared_libs = preload_shared_libs
2750
2851 def run (self ):
@@ -47,50 +70,26 @@ def run(self):
4770
4871 async def playwright_run_in_worker_thread (self , page_url ):
4972 async with async_playwright () as p :
50- if self .slow_mo is None :
51- browser = await p .chromium .launch (headless = self .headless )
52- else :
53- browser = await p .chromium .launch (
54- headless = self .headless , slow_mo = self .slow_mo
55- )
73+ browser = await launch_browser (
74+ p , self .browser , headless = self .headless , slow_mo = self .slow_mo
75+ )
5676 page = await browser .new_page ()
5777
5878 # n min = n_min * 60 * 1000 ms
5979 n_min = 4
6080 page .set_default_timeout (n_min * 60 * 1000 )
6181
6282 async def handle_worker (worker ):
63- test_output = await worker .evaluate_handle (
64- f"""async () =>
65- {{
66-
67- { self .js_utils ()}
68-
69- var collected_prints = ""
70- const print = (text) => {{
71- console.log(text)
72- collected_prints += text;
73- collected_prints += "\\ n";
74- }}
75-
76-
77- var pyjs = await make_pyjs(print, print, { str (self .preload_shared_libs ).lower ()} );
78-
79- var r = eval_main_script(pyjs, "{ self .work_dir } ","{ self .script } ");
80- if({ int (self .async_main )} ){{
81- r = r || await run_async_python_main(pyjs);
82- }}
83-
84- msg = {{
85- return_code : r,
86- collected_prints : collected_prints
87- }}
88- self.postMessage(msg)
89- return r
90- }}"""
91- )
92- if int (str (test_output )) != 0 :
93- raise RuntimeError (f"tests failed with return code: { test_output } " )
83+ try :
84+ await self ._run_in_worker (worker )
85+ except PlaywrightError as e :
86+ if not _is_target_closed_error (e ):
87+ raise
88+ # the page terminates the worker as soon as the worker has
89+ # posted its result (see browser_worker.html), which may
90+ # happen before playwright receives the evaluate result.
91+ # The return code is read from the page below.
92+ pass
9493
9594 page .on ("worker" , handle_worker )
9695
@@ -117,3 +116,36 @@ async def handle_console(msg):
117116 )
118117 return_code = int (str (await test_output .get_property ("return_code" )))
119118 return return_code
119+
120+ async def _run_in_worker (self , worker ):
121+ test_output = await worker .evaluate_handle (
122+ f"""async () =>
123+ {{
124+
125+ { self .js_utils ()}
126+
127+ var collected_prints = ""
128+ const print = (text) => {{
129+ console.log(text)
130+ collected_prints += text;
131+ collected_prints += "\\ n";
132+ }}
133+
134+
135+ var pyjs = await make_pyjs(print, print, { str (self .preload_shared_libs ).lower ()} );
136+
137+ var r = eval_main_script(pyjs, "{ self .work_dir } ","{ self .script } ");
138+ if({ int (self .async_main )} ){{
139+ r = r || await run_async_python_main(pyjs);
140+ }}
141+
142+ msg = {{
143+ return_code : r,
144+ collected_prints : collected_prints
145+ }}
146+ self.postMessage(msg)
147+ return r
148+ }}"""
149+ )
150+ if int (str (test_output )) != 0 :
151+ raise RuntimeError (f"tests failed with return code: { test_output } " )
0 commit comments