Update ssh_tunneler.py

ssh_tunneler.py

@@ -58,6 +58,8 @@ class SSHTunnel:
         self.connection_status = "disconnected"
         self.connection_error = None
         self.threads = []
+        self.last_check_time = 0
+        self.check_interval = 10  # Check tunnel every 10 seconds
         
         # Set up logging
         self.logger = logging.getLogger('ssh_tunnel')
@@ -168,25 +170,62 @@ class SSHTunnel:
         Monitor the connection and reconnect if necessary.
         """
         while self.should_reconnect:
-            if not self.is_running:
-                self.logger.info("Connection is down, attempting to reconnect...")
-                successful = self.connect()
-                if not successful:
-                    self.logger.warning(f"Reconnection failed, waiting {self.reconnect_interval} seconds...")
-                    time.sleep(self.reconnect_interval)
+            current_time = time.time()
             
-            # Check if transport is still active
-            elif self.transport and not self.transport.is_active():
-                self.logger.warning("Transport is no longer active")
-                self.stop(reconnect=True)
-            
-            # Check for activity timeout (in case keepalive fails)
-            elif time.time() - self.last_activity_time > self.reconnect_interval * 2:
-                self.logger.warning("No activity detected, reconnecting...")
-                self.stop(reconnect=True)
+            # Only check tunnel every check_interval seconds
+            if current_time - self.last_check_time >= self.check_interval:
+                self.last_check_time = current_time
+                
+                # Perform active check of tunnel status
+                is_active = self._check_tunnel_active()
+                
+                if not is_active and self.is_running:
+                    self.logger.warning("Active check detected tunnel is down despite is_running=True")
+                    self.stop(reconnect=True)
+                    continue
+                
+                if not self.is_running:
+                    self.logger.info("Connection is down, attempting to reconnect...")
+                    successful = self.connect()
+                    if not successful:
+                        self.logger.warning(f"Reconnection failed, waiting {self.reconnect_interval} seconds...")
+                        time.sleep(self.reconnect_interval)
+                
+                # Check if transport is still active
+                elif self.transport and not self.transport.is_active():
+                    self.logger.warning("Transport is no longer active")
+                    self.stop(reconnect=True)
+                
+                # Check for activity timeout (in case keepalive fails)
+                elif time.time() - self.last_activity_time > self.reconnect_interval * 2:
+                    self.logger.warning("No activity detected, reconnecting...")
+                    self.stop(reconnect=True)
             
             time.sleep(5)  # Check connection status every 5 seconds
     
+    def _check_tunnel_active(self):
+        """
+        Actively check if the tunnel is working by attempting a simple operation.
+        
+        Returns:
+            bool: True if the tunnel is active, False otherwise
+        """
+        if not self.transport or not self.client:
+            return False
+        
+        try:
+            # Try to execute a simple command to test connection
+            if self.transport.is_active():
+                # Try to open a test channel
+                test_channel = self.transport.open_channel("session")
+                if test_channel:
+                    test_channel.close()
+                    return True
+            return False
+        except Exception as e:
+            self.logger.warning(f"Active tunnel check failed: {str(e)}")
+            return False
+    
     def _send_keepalive(self):
         """
         Send keepalive packets to maintain the SSH connection.
@@ -210,6 +249,17 @@ class SSHTunnel:
             dict: Status information including whether the tunnel is running,
                   connection status, and any error messages.
         """
+        # Do an active check if it's been more than check_interval since last check
+        current_time = time.time()
+        if current_time - self.last_check_time >= self.check_interval:
+            self.last_check_time = current_time
+            is_active = self._check_tunnel_active()
+            if not is_active and self.is_running:
+                self.logger.warning("Status check: tunnel appears down but marked as running")
+                self.is_running = False
+                self.connection_status = "disconnected"
+                self.connection_error = "Tunnel appears to be down"
+        
         return {
             "is_running": self.is_running,
             "status": self.connection_status,