Skip to content

Fix Windows OSError on Chrome driver cleanup #113

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

Open
fl-99 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

Fix Windows OSError on Chrome driver cleanup #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions KeyBackup/shared_key_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,9 @@ def request_shared_key_flow():
if data['method'] == 'setVaultSharedKeys':
shared_key = get_fmdn_shared_key(data['vaultKeys'])
print("[SharedKeyFlow] Received Shared Key.")
driver.quit()
return shared_key.hex()
elif data['method'] == 'closeView':
print("[SharedKeyFlow] closeView() called. Closing browser.")
driver.quit()
break

except Exception:
Expand Down
20 changes: 17 additions & 3 deletions chrome_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@
import platform
import time


class _ChromeDriver(uc.Chrome):
"""Chrome driver with safe cleanup for undetected-chromedriver on Windows."""

def quit(self):
try:
super().quit()
except OSError as error:
# undetected-chromedriver can raise this while its destructor retries
# cleanup after Windows has already closed the wait handle.
if getattr(error, "winerror", None) != 6:
raise


def find_chrome():
"""Find Chrome executable using known paths and system commands."""
possiblePaths = [
Expand Down Expand Up @@ -58,7 +72,7 @@ def create_driver():
pass

chrome_options = get_options()
driver = uc.Chrome(options=chrome_options, version_main=None)
driver = _ChromeDriver(options=chrome_options, version_main=None)
print("[ChromeDriver] Installed and browser started.")
return driver
except Exception as e:
Expand All @@ -69,7 +83,7 @@ def create_driver():
chrome_options = get_options()
chrome_options.binary_location = chrome_path
try:
driver = uc.Chrome(options=chrome_options, version_main=None)
driver = _ChromeDriver(options=chrome_options, version_main=None)
print(f"[ChromeDriver] ChromeDriver started using {chrome_path}")
return driver
except Exception as e:
Expand All @@ -82,7 +96,7 @@ def create_driver():
try:
chrome_options = get_options()
chrome_options.add_argument("--headless")
driver = uc.Chrome(options=chrome_options, version_main=None)
driver = _ChromeDriver(options=chrome_options, version_main=None)
print("[ChromeDriver] Started in headless mode successfully.")
return driver
except Exception as e:
Expand Down