Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove temp dir after closing chrome #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove temp dir after closing chrome #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bf11b1
Remove temp dir after closing chrome
Block81838 Aug 31, 2024
691b617
Fixed temp user data dir was not removed after closing chrome
Block81838 Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions backend/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import sys
import tempfile
import time
import shutil
import websockets

stats = {'connection_count': 0, 'connection_count_total': 0, 'confirmed_data_received': 0, 'special_counter':[]}
Expand Down Expand Up @@ -112,11 +113,14 @@ def launch_chrome(port=19222, user_data_dir="/tmp", url_query=""):
chrome_run.append(screen_wh_arg)
else:
logger.warning(f"No --window-size in query, and no SCREEN_HEIGHT + SCREEN_WIDTH env vars found :-(")

is_temp = False
if not '--user-data-dir' in url_query:
tmp_user_data_dir = tempfile.mkdtemp(prefix="chrome-puppeteer-proxy", dir="/tmp")
chrome_run.append(f"--user-data-dir={tmp_user_data_dir}")
logger.debug(f"No user-data-dir in query, using {tmp_user_data_dir}")
is_temp = True
else:
tmp_user_data_dir = user_data_dir

# start_new_session not (makes the main one keep running?)
# Shell has to be false or it wont process the args
Expand All @@ -135,7 +139,7 @@ def launch_chrome(port=19222, user_data_dir="/tmp", url_query=""):
logger.critical(f"Chrome process did not launch cleanly code {process_poll_status} '{stderr}' '{stdout}'")

# Check if the process crashed on startup, print some debug if it did
return process
return process, tmp_user_data_dir, is_temp


async def close_socket(websocket: websockets.WebSocketServerProtocol = None):
Expand All @@ -158,7 +162,7 @@ async def stats_disconnect(time_at_start=0.0, websocket: websockets.WebSocketSer
logger.debug(
f"Websocket {websocket.id} - Connection ended, processed in {time.time() - time_at_start:.3f}s")

async def cleanup_chrome_by_pid(chrome_process, user_data_dir="/tmp", time_at_start=0.0, websocket: websockets.WebSocketServerProtocol = None):
async def cleanup_chrome_by_pid(chrome_process, user_data_dir="/tmp", time_at_start=0.0, websocket: websockets.WebSocketServerProtocol = None, is_temp=False):
import signal

# Wait for the process to complete without blocking
Expand All @@ -180,6 +184,11 @@ async def cleanup_chrome_by_pid(chrome_process, user_data_dir="/tmp", time_at_st
return_code_poll_status = chrome_process.poll()

# Should be dead now or already dead, report the status if it was something like a crash (SIG 11 etc)
if is_temp:
try:
shutil.rmtree(user_data_dir)
except Exception:
pass
if return_code_poll_status not in [-9, 9, -0]:
# Process exited with non-zero status
logger.error(f"WebSocket ID: {websocket.id} Chrome subprocess PID {chrome_process.pid} exited with non-zero status: {return_code_poll_status}")
Expand Down Expand Up @@ -259,10 +268,10 @@ async def launchPuppeteerChromeProxy(websocket, path):
now_before_chrome_launch = time.time()

port = next(port_selector)
chrome_process = launch_chrome(port=port, url_query=path)
chrome_process, user_data_dir, is_temp = launch_chrome(port=port, url_query=path)

closed.add_done_callback(lambda task: asyncio.ensure_future(
cleanup_chrome_by_pid(chrome_process=chrome_process, user_data_dir='@todo', time_at_start=now, websocket=websocket))
cleanup_chrome_by_pid(chrome_process=chrome_process, user_data_dir=user_data_dir, time_at_start=now, websocket=websocket, is_temp=is_temp))
)

chrome_json_info_url = f"http://localhost:{port}/json/version"
Expand Down