Merge pull request #33 from IMXEren/feat/browser

feat: improve browser to use pydoll

Author: IMXEren

.dockerignore

@@ -6,3 +6,4 @@ LICENSE
 README.md
 docker-compose.yml
 venv
+.venv

.github/workflows/build-artifact.yml

@@ -114,10 +114,10 @@ jobs:
         run: |
           if [[ "${{ inputs.CI_TEST }}" =~ ^(true|True|1)$ ]]; then
               echo "In CI Testing. Using local compose file."
-              docker compose -f docker-compose-local.yml up --build
+              docker compose -f docker-compose-local.yml up --build revanced
           else
               echo "Using Prod compose file."
-              docker compose up --build
+              docker compose up --build revanced
           fi
       - name: Upload Build APKS
         uses: actions/upload-artifact@main

Dockerfile

@@ -6,15 +6,16 @@ RUN python -m pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt
 
 ## Chrome dependencies
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends \
-    curl gnupg2 unzip xvfb
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gnupg unzip libx11-xcb1 \
+    && rm -rf /var/lib/apt/lists/*
 
-# Install chrome and chromedriver
-COPY ./src/browser/setup_browser.sh /setup_chrome_webdriver.sh
-RUN sed -i 's/\r$//g' /setup_chrome_webdriver.sh && \
-    sed -i 's/sudo\s//g' /setup_chrome_webdriver.sh
-RUN bash /setup_chrome_webdriver.sh
+# Install chrome
+COPY ./src/browser/setup_browser.sh /setup_browser.sh
+RUN sed -i 's/\r$//g' /setup_browser.sh && \
+    sed -i 's/sudo\s//g' /setup_browser.sh && \
+    chmod +x /setup_browser.sh && \
+    /setup_browser.sh "google-chrome"
 
 # Copy entrypoint script
 COPY ./entrypoint /entrypoint

docker-compose-local.yml

@@ -5,7 +5,29 @@ services:
       dockerfile: Dockerfile
     image: revanced-builder
     container_name: revanced-builder
+    depends_on:
+      - display
+      - novnc
+    environment:
+      - DISPLAY=display:0
     env_file:
       - .env
     volumes:
       - .:/app:z
+  display:
+    image: ghcr.io/dtinth/xtigervnc-docker:main
+    tmpfs: /tmp
+    restart: always
+    environment:
+      VNC_GEOMETRY: 1920x1080
+    ports:
+      - 127.0.0.1:5900:5900
+      - 127.0.0.1:6000:6000
+  novnc:
+    image: geek1011/easy-novnc
+    restart: always
+    depends_on:
+      - display
+    command: -a :5800 -h display --no-url-password
+    ports:
+      - 127.0.0.1:5800:5800

docker-compose.yml

@@ -3,7 +3,29 @@ services:
     image: imxeren/docker-py-revanced
     container_name: revanced-builder
     pull_policy: always
+    depends_on:
+      - display
+      # - novnc
+    environment:
+      - DISPLAY=display:0
     env_file:
       - .env
     volumes:
       - .:/app:z
+  display:
+    image: ghcr.io/dtinth/xtigervnc-docker:main
+    tmpfs: /tmp
+    restart: always
+    environment:
+      VNC_GEOMETRY: 1920x1080
+    ports:
+      - 127.0.0.1:5900:5900
+      - 127.0.0.1:6000:6000
+  novnc:
+    image: geek1011/easy-novnc
+    restart: always
+    depends_on:
+      - display
+    command: -a :5800 -h display --no-url-password
+    ports:
+      - 127.0.0.1:5800:5800

entrypoint

@@ -5,25 +5,7 @@ set -o pipefail
 set -o nounset
 
 
-## Ref: https://github.com/Ulyssedev/Rust-undetected-chromedriver/blob/7da3bea/xvfb.sh
-## Set up the Display for XVFB server,
-## to support running Chrome in headful mode
-export DISPLAY=:99
-function keepUpScreen() {
-  echo "Running keepUpScreen() [Xvfb Server]"
-  while true; do
-        sleep .25
-        if [ -z $(pidof Xvfb) ]; then
-                Xvfb $DISPLAY -screen $DISPLAY 1280x1024x24 -ac +extension GLX +render -noreset &
-                ## PyVirtualDisplay is another alternative to manage
-                ## running the server from the code itself.
-        fi;
-  done;
-}
-
-## Starting the XVFB server in background
-keepUpScreen &
-
 ## Browser tests
 # python src/browser/test.py
+
 python main.py

requirements.txt

@@ -8,5 +8,5 @@ packaging==24.2
 pre-commit==4.2.0
 python-dotenv==1.1.0
 requests==2.32.4
-selenium-driverless==1.9.4
 tqdm==4.67.1
+pydoll-python==2.15.1

src/browser/apkmirror.py

@@ -15,7 +15,7 @@ class APKMirror(Site):
     def __init__(self: Self, browser: Browser) -> None:
         super().__init__(browser)
 
-    async def get(self: Self, url: str, timeout: float) -> Source:  # noqa: D102
+    async def get(self: Self, url: str, timeout: int) -> Source:  # noqa: ASYNC109, D102
         return await super().get(url, timeout)
 
     async def check_if_loaded(self: Self) -> bool:  # noqa: D102