From 9fe1384b5d9b4e8ea88c5c479f2e657ccd7a711e Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 5 Jun 2022 09:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E7=82=B9=E5=9D=91=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore          | 10 +++++++++-
 config/settings.yml |  5 ++++-
 main.py             | 16 +++++-----------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7778571..019a780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
 evn/*
-.DS_Store
\ No newline at end of file
+.DS_Store
+.idea
+.vscode
+venv
+debug
+error
+__pycache__
+*.py[cod]
+*.xml
\ No newline at end of file
diff --git a/config/settings.yml b/config/settings.yml
index c9b90ac..c09605f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -4,7 +4,10 @@ mitm:
   port: 8080
 
 webdriver:
-  bin: 'msedgedriver.exe'
+  headless: False
+  use: edge
+  edge:
+    bin: msedgedriver.exe
 
 rooms:
   - 19829678666
diff --git a/main.py b/main.py
index dff7865..17c70e6 100644
--- a/main.py
+++ b/main.py
@@ -1,25 +1,19 @@
-import sys
 import threading
 import subprocess
-from urllib.parse import urlparse
 
 from config.helper import config
 from handler.http_server import app
 from handler.utils import loop_queue
-from scripts import webdriver
+from browser.manager import BrowserManager
 
 if __name__ == '__main__':
-    if len(sys.argv) == 1 or not urlparse(sys.argv[1]).scheme:
-        print('Invalid url provided, please check...')
-        sys.exit(1)
-    api_thread = threading.Thread(target=app.run, args=(config()["http"]["host"], config()["http"]["port"],))
-    api_thread.start()
     mitmproxy_process = subprocess.Popen([
-        config()["mitm"]["bin"], "-s", "./scripts/mitmproxy.py", "-q",
+        config()["mitm"]["bin"], "-s", "./proxy_script.py", "-q",
         "--listen-host", config()["mitm"]["host"], "--listen-port", str(config()["mitm"]["port"])
     ])
-    t = threading.Thread(target=webdriver.go, args=(sys.argv[1],))
-    t.start()
+    api_thread = threading.Thread(target=app.run, args=(config()["http"]["host"], config()["http"]["port"],))
+    api_thread.start()
+    manager = BrowserManager()
     queue_thread = threading.Thread(target=loop_queue)
     queue_thread.start()
     queue_thread.join()