Command exited with code 0. Command output: @@ -494,7 +545,10 @@ return None except Exception as exc: err_str = str(exc).lower() - if "timeout" in err_str or "connection" in err_str or "socket" in err_str: + if "the handler is closed" in err_str or "tcptransport closed" in err_str or "connection lost" in err_str: + log(f"Pyrogram transport failure detected ({exc}). Triggering bot recovery...") + asyncio.create_task(self._restart_bot_client()) + elif "timeout" in err_str or "connection" in err_str or "socket" in err_str: log(f"Pyrogram send_message to {target} raised network error ({exc}). Skipping fallback to prevent duplicate.") return None log(f"Pyrogram send_message to {target} failed: {exc}. Trying HTTP Bot API fallback...") @@ -540,7 +594,7 @@ api_id=self.api_id, api_hash=self.api_hash, phone_number=self.owner_phone or None, - sleep_threshold=180, + sleep_threshold=10, ) def _quarantine_main_session_files(self) -> None: @@ -622,6 +676,7 @@ self.main_client_ready = False log("Bot service started.") + self.watchdog_task = asyncio.create_task(self._watchdog_loop()) for path in USERS_DIR.glob("*.json"): if path.is_file(): @@ -631,12 +686,16 @@ self._seed_existing_firebases() - for user_id, ws in list(self.workspaces.items()): - if ws.active and ws.device_id: - try: - await self.ensure_bridge_runtime(ws) - except Exception as exc: - log(f"Failed to restore bridge runtime for user {user_id}: {exc}") + active_workspaces = [ws for ws in self.workspaces.values() if ws.active and ws.device_id] + log(f"Restoring bridge runtimes for {len(active_workspaces)} active user(s)...") + pin_delay = 0.5 + for ws in active_workspaces: + try: + await self.ensure_bridge_runtime(ws, defer_pin=True) + asyncio.create_task(self._delayed_auto_pin(ws, delay=pin_delay)) + pin_delay += 0.5 + except Exception as exc: + log(f"Failed to restore bridge runtime for user {ws.user_id}: {exc}") log("Ready for multi-user menu flow.") await asyncio.Event().wait() @@ -706,6 +765,9 @@ log(f"[fcm sync] Synced old FCM credentials for {synced} user(s)") async def shutdown(self) -> None: + if self.watchdog_task: + self.watchdog_task.cancel() + for task in list(self.bridge_tasks.values()): task.cancel() @@ -753,7 +815,15 @@ ) await self.send(other_uid, fmt_msg("Session Paused", body, error=True)) - async def ensure_bridge_runtime(self, ws: Workspace) -> None: + async def _delayed_auto_pin(self, ws: Workspace, delay: float = 0.0) -> None: + if delay > 0: + await asyncio.sleep(delay) + try: + await self._auto_pin_status(ws) + except Exception as exc: + log(f"[pin] deferred pin failed for {ws.user_id}: {exc}") + + async def ensure_bridge_runtime(self, ws: Workspace, defer_pin: bool = False) -> None: if not ws.active or not ws.device_id: return @@ -774,7 +844,8 @@ self.bridge_tasks[user_id] = task log(f"Bridge started for user {user_id} ({ws.active_mode}).") - await self._auto_pin_status(ws) + if not defer_pin: + await self._auto_pin_status(ws) async def refresh_bridge_runtime(self, ws: Workspace) -> None: user_id = ws.user_id @@ -2446,8 +2517,9 @@ url += f"?auth={ws.firebase_auth}" cutoff_ts = ws.last_processed_ts + fb_timeout = aiohttp.ClientTimeout(total=5, sock_connect=2) if not cutoff_ts: - async with self.http.get(url, timeout=8) as seed: + async with self.http.get(url, timeout=fb_timeout) as seed: if seed.status == 200: try: seed_data = await seed.json()