From 0edb398e20914043027ece93bc557572ad6ebaa3 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 12 Jun 2022 00:46:07 +0800
Subject: [PATCH] Bump mitmproxy and protobuf version

---
 proxy/manager.py | 26 ++++++++++++++------------
 requirements.txt |  5 ++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/proxy/manager.py b/proxy/manager.py
index d8f4b3a..bd340ba 100644
--- a/proxy/manager.py
+++ b/proxy/manager.py
@@ -18,17 +18,20 @@ _manager: "Optional[ProxyManager]" = None
 class ProxyManager:
     def __init__(self):
         self._mitm_instance = None
-        self._loop: "Optional[asyncio.AbstractEventLoop]" = None
+        self._loop: "asyncio.AbstractEventLoop" = asyncio.new_event_loop()
         opts = Options(
             listen_host=config()['mitm']['host'],
             listen_port=config()['mitm']['port'],
         )
-        self._mitm_instance = DumpMaster(options=opts)
-        self._load_addon()
-        opts.update_defer(
-            flow_detail=0,
-            termlog_verbosity="error",
-        )
+        async def _init_mitm_instance():
+            self._mitm_instance = DumpMaster(options=opts)
+            self._load_addon()
+            opts.update_defer(
+                flow_detail=0,
+                termlog_verbosity="error",
+            )
+        _loop = asyncio.get_event_loop()
+        _loop.run_until_complete(_init_mitm_instance())
         self._thread = None
 
     def __del__(self):
@@ -45,13 +48,12 @@ class ProxyManager:
         self._mitm_instance.addons.add(DanmakuWebsocketAddon(MESSAGE_QUEUE))
 
     def _start(self):
-        loop = asyncio.new_event_loop()
-        self._loop = loop
-        asyncio.set_event_loop(loop)
-        self._mitm_instance.run()
+        asyncio.set_event_loop(self._loop)
+        if self._mitm_instance:
+            self._loop.run_until_complete(self._mitm_instance.run())
 
     def start_loop(self):
-        self._thread = threading.Thread(target=self._start)
+        self._thread = threading.Thread(target=self._start, args=())
         self._thread.start()
 
     def join(self):
diff --git a/requirements.txt b/requirements.txt
index 7b7733b..21ac01a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 colorama==0.4.4
 selenium==4.1.0
-requests==2.27.1
 
-mitmproxy~=7.0.4
-protobuf<3.19
\ No newline at end of file
+mitmproxy~=8.1.0
+protobuf~=3.20.1
\ No newline at end of file