some refactoring

Author: kaliiiiiiiiii

README.md

@@ -1,51 +1,118 @@
-# 🎭 [Playwright](https://playwright.dev) for Python [![PyPI version](https://badge.fury.io/py/playwright.svg)](https://pypi.python.org/pypi/playwright/) [![Anaconda version](https://img.shields.io/conda/v/microsoft/playwright)](https://anaconda.org/Microsoft/playwright) [![Join Discord](https://img.shields.io/badge/join-discord-infomational)](https://aka.ms/playwright/discord)
+# 🎭 [Playwright](https://playwright.dev) for Python 
 
-Playwright is a Python library to automate [Chromium](https://www.chromium.org/Home), [Firefox](https://www.mozilla.org/en-US/firefox/new/) and [WebKit](https://webkit.org/) browsers with a single API. Playwright delivers automation that is **ever-green**, **capable**, **reliable** and **fast**. [See how Playwright is better](https://playwright.dev/python/docs/why-playwright).
+[![PyPI version](https://badge.fury.io/py/undetected-playwright-patch.svg)](https://badge.fury.io/py/undetected-playwright-patch)
 
+This is a patch of the original playwright implementation for Python.
 
-## Documentation
+It currently passes for sure (tested on Win10):
+- ✅ [CloudFare] 
+- ✅ [Bet365] (shape//F5 I think)
+- [Others] Unknown/Not tested
 
-[https://playwright.dev/python/docs/intro](https://playwright.dev/python/docs/intro)
+Warnings: 
+* the **Only chromium** part for Playwright is patched.
 
-## API Reference
+## Demos (tested on Win 10)
+![img.png](assets/nowsecure_nl.png)
+![img.png](assets/creep_js.png)
 
-[https://playwright.dev/python/docs/api/class-playwright](https://playwright.dev/python/docs/api/class-playwright)
+
+## Dependencies
+
+* Google-Chrome installed (`channel="chrome"` recommended, default)
+
+## Installation
+
+#### From PyPi (recommended)
+
+execute in your shell console
+```shell
+pip install undetected-playwright-patch
+```
+
+#### Build from this repo:
+```
+git clone https://github.com/kaliiiiiiiiii/undetected-playwright-python
+cd undetected-playwright-python
+python -m pip install -r local-requirements.txt
+python build_patched.py
+```
 
 ## Example
 
+```python
+import asyncio
+
+# undetected-playwright here!
+from undetected_playwright.async_api import async_playwright, Playwright
+
+
+async def run(playwright: Playwright):
+    args = []
+    
+    # disable navigator.webdriver:true flag
+    args.append("--disable-blink-features=AutomationControlled")
+    browser = await playwright.chromium.launch(headless=False,
+                                               args=args)
+    page = await browser.new_page()
+    await page.goto("https://nowsecure.nl/#relax")
+    input("Press ENTER to continue to Creep-JS:")
+    await page.goto("https://nowsecure.nl/#relax")
+    await page.goto("https://abrahamjuliot.github.io/creepjs/")
+    input("Press ENTER to exit:")
+    await browser.close()
+
+
+async def main():
+    async with async_playwright() as playwright:
+        await run(playwright)
+
+
+if __name__ == "__main__":
+    loop = asyncio.ProactorEventLoop()
+    loop.run_until_complete(main())
+    # asyncio.run(main) # should work for non-Windows as well
+```
+
 ```py
+
+# undetected-playwright here!
 from undetected_playwright.sync_api import sync_playwright
 
+
 with sync_playwright() as p:
-    for browser_type in [p.chromium, p.firefox, p.webkit]:
-        browser = browser_type.launch()
-        page = browser.new_page()
-        page.goto('http://playwright.dev')
-        page.screenshot(path=f'example-{browser_type.name}.png')
-        browser.close()
+    args = []
+    
+    # disable navigator.webdriver:true flag
+    args.append("--disable-blink-features=AutomationControlled")
+    browser = p.chromium.launch(args=args, headless=False)
+    page = browser.new_page()
+    page.goto("https://nowsecure.nl/#relax")
+    input("Press ENTER to continue to Creep-JS:")
+    page.goto("https://nowsecure.nl/#relax")
+    page.goto("https://abrahamjuliot.github.io/creepjs/")
+    input("Press ENTER to exit:")
+    browser.close()
 ```
 
-```py
-import asyncio
-from undetected_playwright.async_api import async_playwright
+## Documentation
 
+See the original
+[https://playwright.dev/python/docs/intro](https://playwright.dev/python/docs/intro)
 
-async def main():
-    async with async_playwright() as p:
-        for browser_type in [p.chromium, p.firefox, p.webkit]:
-            browser = await browser_type.launch()
-            page = await browser.new_page()
-            await page.goto('http://playwright.dev')
-            await page.screenshot(path=f'example-{browser_type.name}.png')
-            await browser.close()
+## API Reference
+
+[https://playwright.dev/python/docs/api/class-playwright](https://playwright.dev/python/docs/api/class-playwright)
 
 
-asyncio.run(main())
-```
 
-## Other languages
+## Patches
+- [ ] [`Runtime.enable`](https://chromedevtools.github.io/devtools-protocol/tot/Runtime/#method-enable)
+  - [x] remove Runtime.enable occurences
+  - [x] patch _context(world) getter
+    - [x] isolatedWorld (utility)
+    - [ ] main world (main)
+    - [x] reset on frame-reload//navigation
 
-More comfortable in another programming language? [Playwright](https://playwright.dev) is also available in
-- [Node.js (JavaScript / TypeScript)](https://playwright.dev/docs/intro),
-- [.NET](https://playwright.dev/dotnet/docs/intro),
-- [Java](https://playwright.dev/java/docs/intro).
+## TODO's
+- [ ] add GitHub runner to build releases automated

main.py

@@ -7,7 +7,7 @@
 async def run(playwright: Playwright):
     args = []
     args.append("--disable-blink-features=AutomationControlled")
-    browser = await playwright.chromium.launch(channel="chrome", headless=False,
+    browser = await playwright.chromium.launch(headless=False,
                                                args=args)
     page = await browser.new_page()
     await page.goto("https://nowsecure.nl/#relax")

main_sync.py

@@ -5,7 +5,7 @@
 with sync_playwright() as p:
     args = []
     args.append("--disable-blink-features=AutomationControlled")
-    browser = p.chromium.launch(args=args, headless=False, channel="chrome")
+    browser = p.chromium.launch(args=args, headless=False)
     page = browser.new_page()
     page.goto("https://nowsecure.nl/#relax")
     input("Press ENTER to continue to Creep-JS:")

patch_check.py

@@ -5,9 +5,7 @@
 async def run(playwright: Playwright):
     args = []
     args.append("--disable-blink-features=AutomationControlled")
-    browser = await playwright.chromium.launch(channel="chrome", headless=False,
-                                               ignore_default_args=['--enable-automation'],
-                                               args=args)
+    browser = await playwright.chromium.launch( headless=False, args=args)
     page = await browser.new_page()
     await page.goto("https://hmaker.github.io/selenium-detector/")
     await page.evaluate("document")

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-version = attr: playwright.__version__
+version = attr: undetected_playwright.__version__
 
 [flake8]
 ignore =

setup.py

@@ -44,7 +44,7 @@ def extractall(zip: zipfile.ZipFile, path: str) -> None:
 
 
 def download_driver(zip_name: str) -> None:
-    zip_file = f"undetected_playwright-{driver_version}-{zip_name}.zip"
+    zip_file = f"playwright-{driver_version}-{zip_name}.zip"
     if os.path.exists("driver/" + zip_file):
         return
     url = "https://playwright.azureedge.net/builds/driver/"
@@ -144,7 +144,7 @@ def _build_wheels(
         for wheel_bundle in wheels:
             download_driver(wheel_bundle["zip_name"])
             zip_file = (
-                f"driver/undetected_playwright-{driver_version}-{wheel_bundle['zip_name']}.zip"
+                f"driver/playwright-{driver_version}-{wheel_bundle['zip_name']}.zip"
             )
             with zipfile.ZipFile(zip_file, "r") as zip:
                 extractall(zip, f"driver/{wheel_bundle['zip_name']}")
@@ -196,17 +196,17 @@ def _download_and_extract_local_driver(
         assert len(zip_names_for_current_system) == 1
         zip_name = zip_names_for_current_system.pop()
         download_driver(zip_name)
-        zip_file = f"driver/undetected_playwright-{driver_version}-{zip_name}.zip"
+        zip_file = f"driver/playwright-{driver_version}-{zip_name}.zip"
         with zipfile.ZipFile(zip_file, "r") as zip:
             extractall(zip, "undetected_playwright/driver")
         patch_driver(os.getcwd() + "/undetected_playwright/driver")
 
 
 setup(
-    name="undetected-undetected_playwright-patch",
+    name="undetected-playwright-patch",
     author="Microsoft Corporation, patches by github.com/kaliiiiiiiiii",
     author_email="",
-    description="Undetected version of undetected_playwright",
+    description="Undetected version of playwright",
     long_description=Path("README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
     license="Apache-2.0",

undetected_playwright/_impl/_browser_type.py

@@ -71,7 +71,7 @@ def executable_path(self) -> str:
     async def launch(
         self,
         executablePath: Union[str, Path] = None,
-        channel: str = None,
+        channel: str = "chrome",
         args: Sequence[str] = None,
         ignoreDefaultArgs: Union[bool, Sequence[str]] = None,
         handleSIGINT: bool = None,
@@ -90,7 +90,8 @@ async def launch(
     ) -> Browser:
 
         # undetected-undetected_playwright patches
-        if not ignoreDefaultArgs:
+        if ignoreDefaultArgs is None:
+            # noinspection PyPep8Naming
             ignoreDefaultArgs = []
         ignoreDefaultArgs.append('--enable-automation')
 
@@ -105,7 +106,7 @@ async def launch(
     async def launch_persistent_context(
         self,
         userDataDir: Union[str, Path],
-        channel: str = None,
+        channel: str = "chrome",
         executablePath: Union[str, Path] = None,
         args: Sequence[str] = None,
         ignoreDefaultArgs: Union[bool, Sequence[str]] = None,
@@ -154,6 +155,13 @@ async def launch_persistent_context(
         recordHarMode: HarMode = None,
         recordHarContent: HarContentPolicy = None,
     ) -> BrowserContext:
+
+        # undetected-undetected_playwright patches
+        if ignoreDefaultArgs is None:
+            # noinspection PyPep8Naming
+            ignoreDefaultArgs = []
+        ignoreDefaultArgs.append('--enable-automation')
+
         userDataDir = str(Path(userDataDir)) if userDataDir else ""
         params = locals_to_params(locals())
         await prepare_browser_context_params(params)

undetected_playwright/_impl/_driver.py

@@ -25,8 +25,8 @@ def compute_driver_executable() -> Path:
     package_path = Path(inspect.getfile(undetected_playwright)).parent
     platform = sys.platform
     if platform == "win32":
-        return package_path / "driver" / "undetected_playwright.cmd"
-    return package_path / "driver" / "undetected_playwright.sh"
+        return package_path / "driver" / "playwright.cmd"
+    return package_path / "driver" / "playwright.sh"
 
 
 def get_driver_env() -> dict: