v3.16b

Author: odell0111

docker-compose.yml

@@ -7,8 +7,9 @@ services:
       dockerfile: ./solver.Dockerfile
     restart: always
     ports:
-      - 8088:8088 # turnstile_solver server
-      - 3389:3389 # RDP
+      - ${SOLVER_SERVER_PORT:-8088}:${SOLVER_SERVER_PORT:-8088}
+      - ${VNC_PORT:-5901}:${VNC_PORT:-5901}
+      - ${XRDP_PORT:-3389}:${XRDP_PORT:-3389}
     networks:
       - solver
     environment:
@@ -17,9 +18,21 @@ services:
       - LANGUAGE=en_US:en
       - LC_ALL=en_US.UTF-8
       - TZ=${TZ:-America/New_York}
+
+      - SOLVER_SERVER_PORT=${SOLVER_SERVER_PORT:-8088}
+      - SOLVER_BROWSER=${SOLVER_BROWSER:-chrome}
       - START_SERVER=${START_SERVER:-false}
 
+      - REMOTE_DESKTOP_PROTOCOL=${REMOTE_DESKTOP_PROTOCOL:-VNC}
+      # VNC Server
+      - VNC_PORT=${VNC_PORT:-5901}
+      - VNC_PASSWORD=${VNC_PWD:-12345678}
+      - VNC_GEOMETRY=${VNC_GEOMETRY:-1280x720}
+      - VNC_DPI=${VNC_DPI:-70}
+      - VNC_DEPTH=${VNC_DEPTH:-24}
+      # Xrdp
+      - XRDP_PORT=${XRDP_PORT:-3389}
 networks:
   solver:
-    name: solver
+    # name: solver # Explicit name declaration can cause conflicts, let docker manage names unless required
     driver: bridge

docker/README.md

@@ -29,13 +29,29 @@ docker compose build --no-cache --pull
 
 #### 3. Start the Container
 
-**Set-up optional .env file**:
+##### Set-up optional .env file at `docker-compose.yml` level:
 
-- `TZ`: Set your [IANA timezone](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)  
-  *(Example: Europe/London, Asia/Dubai)* Default: America/New_York
+- `TZ`: Set your [IANA timezone](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). Example: Europe/London, Asia/Dubai). Default: **_America/New_York_**
 - `START_SERVER`:
-    - `true` = Auto-start with default config
-    - `false` = Manual start required (default)
+    - **false** - Manual start required (default)
+    - **true** - Auto-start with default config
+- `SOLVER_SERVER_PORT` - Turnstile Solver server port. Default: **_8088_**
+- `SOLVER_BROWSER` - Patchright browser to install and use on auto-start build.
+    - **chrome** (default and recommended)
+    - **chromium**
+    - **msedge**
+- `REMOTE_DESKTOP_PROTOCOL`:
+    - **RDP** - Xrdp
+    - **VNC** - VNC/TightVNC
+    - [any] - No start remote desktop server
+- TightVNC Server:
+    - `VNC_PASSWORD` - Password. Default: **_12312312_**
+    - `VNC_PORT` - Port. Default: **_5901_**
+    - `VNC_GEOMETRY` - Geometry. Default: **_1280x720_**
+    - `VNC_DPI` - DPI. Default: **_70_**
+    - `VNC_DEPTH` - Depth. Default: **_24_**
+- Xrdp:
+    - `XRDP_PORT` - Xrdp port. Default: **_3389_**
 
 **Command**:
 
@@ -45,32 +61,45 @@ docker compose up -d
 
 ### 🔌 Remote Access Configuration
 
-**Current Protocol (RDP)**:
+**RDP**:
 
 1. **Client Software**:
     - Windows: Built-in Remote Desktop Connection
     - Linux: `Remmina` or `FreeRDP`
     - macOS: Microsoft Remote Desktop
 
 2. **Connection Details**:
-    - Address: `localhost:3389`
+    - Address (default): `localhost:3389`
     - Credentials:
         - Username: `root`
         - Password: `root` (❗Change after first login)
 
+⚠️ **Security Notice**: Default credentials pose significant risk - change immediately after initial setup!
+
+**VNC/TightVNC**:
+
+1. **Client Software**:
+    - Windows: `RealVNC Viewer`, `TightVNC` (tvnviewer.exe)
+    - Linux: `xtightvncviewer` (vncviewer/xtightvncviewer)
+    - macOS: `?` # TODO
+2. **Connection Details**:
+    - Address (default): `localhost:5901`
+
+**Example connection with TightVNC Viewer on Windows**:
+
+```cmd
+tvnviewer.exe 2.tcp.ngrok.io:17774 -password=12345678 -useclipboard=yes -mousecursor=no -jpegimagequality=2 -compressionlevel=2
+```
+
 3. **Post-Connection (Start server with desired parameters)**:
 
 ```bash
 python3 solver
 ```
 
-⚠️ **Security Notice**: Default credentials pose significant risk - change immediately after initial setup!
-
 ---
 
-Do you think I should add support for VNC server/protocol for next release?
-
-### 🤔 VNC vs RDP Considerations
+### 🤔 VNC vs RDP
 
 **Protocol Comparison**:
 
@@ -81,22 +110,3 @@ Do you think I should add support for VNC server/protocol for next release?
 | Cross-Platform        | ✅ Excellent         | ✅ Universal         |
 | File Transfer         | ✅ Built-in          | ❌ Requires add-ons  |
 | Multi-Monitor Support | ✅ Native            | ✅ Possible          |
-
-```diff
-+ For Next Release: Hybrid Support
-- Implement both protocols (RDP+VNC) via separate ports
-- Add environment variable: PROTOCOL="RDP|VNC" (default: RDP)
-- Include VNC password configuration in docker-compose
-```
-
-**Suggested Implementation**:
-
-```yaml
-# docker-compose.yml
-environment:
-  - PROTOCOL=${REMOTE_PROTOCOL:-RDP}
-  - VNC_PASSWORD=${VNC_PWD:-changeme}
-ports:
-  - "3389:3389"  # RDP
-  - "5900:5900"  # VNC
-```

docker/services/solver/entrypoint.sh

@@ -4,19 +4,59 @@ declare -r TARGET_USER="root"
 #declare -r WORKSPACE="/${TARGET_USER}/Desktop"
 declare -r REPO_URL="https://github.com/odell0111/turnstile_solver.git"
 
-clean_pids() {
+start_vnc_server() {
+  # Kill any previous previous session
+  vncserver -kill :1 > /dev/null 2>&1
+
+  # Build the base command arguments
+  CMD="vncserver :1 \
+    -httpport $VNC_SERVER_PORT \
+    -geometry $GEOMETRY \
+    -dpi $DPI \
+    -depth $DEPTH"
+
+  # Generate input sequence (password x2 + confirm)
+  INPUT_FEED=$(printf "%s\r\n%s\r\n\r\y\r\n" "$PASSWORD" "$PASSWORD")
+
+  # Execute and capture output
+eval "$CMD" <<EOF 2>&1
+$INPUT_FEED
+EOF
+}
+
+start_xrdp() {
+    # Clean PIDs
     find /var/run -name '*xrdp*.pid' -delete
+    # Update port
+    sed -E -i "s/port=[0-9]+/port=${XRDP_PORT}/g" /etc/xrdp/xrdp.ini
+    xrdp-sesman & xrdp -n &
 }
 
 service_init() {
-    clean_pids
-    xrdp-sesman & xrdp -n &
+
+    if [ "$REMOTE_DESKTOP_PROTOCOL" = "RDP" ]; then
+      (start_xrdp && echo "Xrdp running on port: ${XRDP_PORT}") || {
+        echo "Xrdp failed to start"
+        exit 2
+      }
+    elif [ "$REMOTE_DESKTOP_PROTOCOL" = "VNC" ]; then
+      (start_vnc_server && echo "TightVNC server running on port: ${VNC_SERVER_PORT}") || {
+        echo "TightVNC server setup failed"
+        exit 3
+      }
+    fi
+
+    # Wait up to 20s fot Xorg to start
     local timeout=20
 
     while ((timeout-- > 0)); do
-        pgrep -x Xorg && return 0
+        pgrep -x Xorg && {
+          echo "Xorg started"
+          return 0
+        }
         sleep 1
     done
+    echo "Xorg not started after 20s"
     return 1
 }
 
@@ -49,30 +89,25 @@ install_patchright() {
   # Install patchright (with PEP 668 workaround)
   pip3 install --no-cache-dir --break-system-packages patchright || {
       echo "Failed to install patchright"
-      exit 2
+      exit 3
   }
 
   # Run patchright
-  patchright install chrome || {
-      echo "Failed to configure Chrome"
-      exit 3
+  patchright install $SOLVER_BROWSER || {
+      echo "Failed to install Patchright browser: $SOLVER_BROWSER"
+      exit 4
   }
 }
 
 # Execution flow
 user_setup || { echo "User config failed"; exit 1; }
-env_config || exit 1
+env_config || exit 5
 repo_setup  && echo "repo set-up"
 install_patchright && echo "patchright installed"
-if service_init; then
-  echo "Xorg running"
-else
-  echo "X server failed"
-  exit 3
-fi
+service_init || exit 6
 
 if [ "$START_SERVER" = "true" ]; then
   echo "Starting server in headful mode..."
-  xvfb-run -a python3 solver --browser chrome
+  xvfb-run -a python3 solver --browser ${SOLVER_BROWSER} --port ${SOLVER_SERVER_PORT}
 #  xvfb-run -a python3 "${WORKSPACE}/turnstile_solver/main.py"
 fi

docker/services/solver/solver.Dockerfile

@@ -20,6 +20,7 @@ RUN apt-get update && \
     python3-pip \
     xorgxrdp \
     xrdp \
+    tightvncserver \
     xvfb \
     wget \
     screen \
@@ -42,8 +43,8 @@ COPY ./entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
 # Healthcheck (adjust as needed)
-HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
-    CMD netstat -an | grep 3389 >/dev/null || exit 1
+#HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
+#    CMD netstat -an | grep $XRDP_PORT >/dev/null || exit 1
 
 # Set entrypoint
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 #dynamic = ["version"]
 dynamic = ["dependencies"]
 name = "turnstile_solver"
-version = "3.15"
+version = "3.16"
 description = "Python server to automatically solve Cloudflare Turnstile CAPTCHA with an average solving time of two seconds"
 readme = "README.md"
 authors = [{ name = "OGM" }]

src/turnstile_solver/main.py

@@ -34,7 +34,7 @@
 
 # mdata = metadata.metadata(__pname__)
 # __version__ = mdata['Version']
-__version__ = "3.15b"
+__version__ = "3.16b"
 __homepage__ = "https://github.com/odell0111/turnstile_solver"  # mdata['Home-page']
 __author__ = "OGM"  # mdata['Author']
 __summary__ = "Automatically solve Cloudflare Turnstile captcha"  # mdata['Summary']