proxy pool race condition fixed

freeplay2api.py

@@ -167,7 +167,8 @@ class FreeplayClient:
             "referer": "https://app.freeplay.ai/signup",
         }
 
-        while True:
+        max_retries = 5
+        for attempt in range(max_retries):
             proxy_info = None
             try:
                 # Wait for proxy pool to be ready
@@ -208,22 +209,25 @@ class FreeplayClient:
                             "balance": 5.0,
                         }
                 
-                logging.warning(f"Registration attempt failed with status {response.status_code}: {response.text}")
+                logging.warning(f"Registration attempt {attempt + 1}/{max_retries} failed with status {response.status_code}: {response.text}")
 
             except requests.exceptions.ProxyError as e:
-                logging.warning(f"Proxy error during registration: {e}. Retrying with a new proxy...")
+                logging.warning(f"Proxy error during registration on attempt {attempt + 1}/{max_retries}: {e}. Retrying with a new proxy...")
                 if self.proxy_pool and proxy_info:
                     self.proxy_pool.remove_proxy(proxy_info['ip'], proxy_info['port'])
             
             except requests.exceptions.RequestException as e:
-                logging.warning(f"Request exception during registration: {e}. Retrying...")
+                logging.warning(f"Request exception during registration on attempt {attempt + 1}/{max_retries}: {e}. Retrying...")
                 if self.proxy_pool and proxy_info:
                     self.proxy_pool.remove_proxy(proxy_info['ip'], proxy_info['port'])
 
             except Exception as e:
-                logging.error(f"An unexpected error occurred during registration: {e}. Retrying...")
+                logging.error(f"An unexpected error occurred during registration on attempt {attempt + 1}/{max_retries}: {e}. Retrying...")
 
             time.sleep(1)
+        
+        logging.error("Failed to register a new account after multiple retries.")
+        return None
 
     def chat(
         self,
@@ -345,42 +349,31 @@ class KeyMaintainer(threading.Thread):
                 logging.info("KeyMaintainer: Starting maintenance cycle.")
                 accounts = self.manager.get_all_accounts()
 
-                # 更新所有账户余额
+                # Update balances
                 for account in accounts:
                     balance = self.client.check_balance(account["session_id"])
                     if balance != account.get("balance"):
                         account["balance"] = balance
                         self.manager.update_account(account)
-                        logging.info(
-                            f"Account {account['email']} balance updated to ${balance:.4f}"
-                        )
+                        logging.info(f"Account {account['email']} balance updated to ${balance:.4f}")
 
-                # 检查是否需要注册新账号
+                # Check if new accounts are needed
                 healthy_accounts = [
-                    acc
-                    for acc in self.manager.get_all_accounts()
+                    acc for acc in self.manager.get_all_accounts()
                     if acc.get("balance", 0) > self.config["LOW_BALANCE_THRESHOLD"]
                 ]
                 needed = self.config["ACTIVE_KEY_THRESHOLD"] - len(healthy_accounts)
 
                 if needed > 0:
-                    logging.info(
-                        f"Healthy accounts ({len(healthy_accounts)}) below threshold ({self.config['ACTIVE_KEY_THRESHOLD']}). Need to register {needed} new accounts."
-                    )
-                    with concurrent.futures.ThreadPoolExecutor(
-                        max_workers=self.config["REGISTRATION_CONCURRENCY"]
-                    ) as executor:
-                        futures = [
-                            executor.submit(self.client.register) for _ in range(needed)
-                        ]
+                    logging.info(f"Healthy accounts ({len(healthy_accounts)}) below threshold. Need to register {needed} new accounts.")
+                    with concurrent.futures.ThreadPoolExecutor(max_workers=self.config["REGISTRATION_CONCURRENCY"]) as executor:
+                        futures = [executor.submit(self.client.register) for _ in range(needed)]
                         for future in concurrent.futures.as_completed(futures):
                             new_account = future.result()
                             if new_account:
                                 self.manager.add_account(new_account)
                 else:
-                    logging.info(
-                        f"Sufficient healthy accounts ({len(healthy_accounts)}). No registration needed."
-                    )
+                    logging.info(f"Sufficient healthy accounts ({len(healthy_accounts)}).")
 
             except Exception as e:
                 logging.error(f"Error in KeyMaintainer cycle: {e}")
@@ -439,18 +432,8 @@ def initialize_app():
             logging.info("Initializing proxy pool...")
             proxy_pool_config = config.get("PROXY_POOL_CONFIG", {})
             proxy_pool = ProxyPool(proxy_pool_config)
-            
-            # Start initialization in a separate thread
-            init_thread = threading.Thread(target=proxy_pool.initialize, daemon=True)
-            init_thread.start()
-            
-            # Wait for the pool to be initialized
-            logging.info("Waiting for proxy pool to complete initial refill...")
-            while not proxy_pool.is_initialized:
-                time.sleep(1)
-            init_thread.join() # Ensure initialization thread is complete
-            logging.info("Proxy pool initialization process finished.")
-
+            # The initialize method will now run in the background
+            threading.Thread(target=proxy_pool.initialize, daemon=True).start()
         else:
             logging.info("Proxy pool is disabled in config.")