From 2fdd7f9b38d475e4211dd26cdb319aeb1d0513e7 Mon Sep 17 00:00:00 2001
From: Lei PAN <panleicim@gmail.com>
Date: Tue, 12 Apr 2022 17:53:06 +0200
Subject: [PATCH] multi instance works

---
 commandor_page.py | 18 ++++++++++--------
 main.py           |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/commandor_page.py b/commandor_page.py
index e4eb93e..a8b5572 100644
--- a/commandor_page.py
+++ b/commandor_page.py
@@ -84,8 +84,8 @@ class CommandorPage:
                 self.logger.info("will set thread event")
                 self.thread_event.set()
                 # wait for the sms for 20 seconds
-                while not self.is_finished:
-                    time.sleep(2)
+                # while not self.is_finished:
+                #     time.sleep(2)
                 self.is_finished = True
                 if self.current_gsm_modem:
                     self.logger.info("will close used modem")
@@ -125,6 +125,7 @@ class CommandorPage:
         self.reset_air_plan_mode()
 
     def _run(self, e: threading.Event, proxy):
+        print("will start browser")
         self.on_success_listener = on_success
         # reset otp_value to None
         self.otp_value = None
@@ -150,6 +151,7 @@ class CommandorPage:
         # wait for sms_code field
         # self.clickOnValidBtn()
         self.thread_event = e
+        self.set_up_sms_listener()
         otp_input = self.page.locator(OTP_FIELD_ID)
         otp_input.wait_for(state='visible', timeout=TIME_OUT)
         event_is_set = e.wait()
@@ -196,12 +198,12 @@ class CommandorPage:
             self.browser.close()
             return None
 
-    def start_page(self, proxy) -> threading.Event:
-        self.set_up_sms_listener()
+    def start_page(self, proxy):
         e = threading.Event()
-        t = threading.Thread(target=self._run, args=(e, proxy))
-        t.start()
-        return e
+        # t = threading.Thread(target=self._run, args=(e, proxy))
+        # t.start()
+        self._run(e, proxy)
+        # return e
 
     def _on_page_loaded(self):
         self.logger.info("page loaded")
@@ -322,7 +324,7 @@ def launch_page(ready_for_otp) -> threading.Event:
                           first_name="xingzhen",
                           mail="ColbyPatel653@gmail.com", ccid="", position=0)
     page = CommandorPage()
-    return page.start_page(proxy, contact, ready_for_otp, on_sucess=on_success)
+    return page.start_page(proxy)
 
 
 def wait_for_otp(event: threading.Event, commandor: CommandorPage):
diff --git a/main.py b/main.py
index 44c25bc..6956d19 100644
--- a/main.py
+++ b/main.py
@@ -66,8 +66,8 @@ def init_modems() -> list:
 
 
 def start_book():
-    start_slot_number = 1
-    end_slot_number = 21
+    start_slot_number = 13
+    end_slot_number = 13
     slot_list = list(range(start_slot_number, end_slot_number + 1))
     random.shuffle(slot_list)
     for i in slot_list: