added SshHandler, rewrote logic for exceptions, new exception, new notification

Author: Hidanio

src/main/kotlin/com/vk/admstorm/ssh/SshConnectionService.kt

@@ -27,6 +27,7 @@ import git4idea.util.GitUIUtil.code
 import net.schmizz.sshj.sftp.SFTPClient
 import java.io.IOException
 import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
 
 /**
  * Service responsible for connecting via SSH to the development server.
@@ -144,10 +145,12 @@ class SshConnectionService(private var myProject: Project) : Disposable {
 
                 override fun run(indicator: ProgressIndicator) {
                     try {
-                        mySftpChannel = myConnectionBuilder!!.openSftpChannel(2)
-                        mySftpClient = MySshUtils.getSftpClient(mySftpChannel!!)
+                        SshHandler.handle {
+                            mySftpChannel = myConnectionBuilder!!.openSftpChannel(2)
+                            mySftpClient = MySshUtils.getSftpClient(mySftpChannel!!)
 
-                        onSuccessful?.run()
+                            onSuccessful?.run()
+                        }
                     } catch (e: SshException) {
                         if (!cancelled && e.message == "Cancelled by user") {
                             LOG.warn("Cancelled by user", e)
@@ -186,6 +189,15 @@ class SshConnectionService(private var myProject: Project) : Disposable {
                             .show()
 
                         LOG.warn("Failed to connect", e)
+                    } catch (e: TimeoutException) {
+                        AdmNotification("Don't forget to touch the yubikey if it blinks when using the AdmStorm plugin's features")
+                            .withTitle("Yubikey waiting timeout")
+                            .withActions(AdmNotification.Action("Reconnect...") { _, notification ->
+                                notification.expire()
+                                connectWithConnector(connector, onSuccessful)
+                            }).show()
+
+                        LOG.warn("Yubikey waiting timeout", e)
                     }
                 }
 

src/main/kotlin/com/vk/admstorm/ssh/SshHandler.kt

@@ -0,0 +1,21 @@
+package com.vk.admstorm.ssh
+
+import com.intellij.ssh.SshException
+
+object SshHandler {
+    inline fun <reified T> handle(call: () -> T): T {
+        return try {
+            call()
+        } catch (e: SshException) {
+          throw  unwrap(e)
+        }
+    }
+
+    fun unwrap(ex: Exception): Throwable {
+        var cause = ex.cause
+        while(cause?.cause != null) {
+            cause = cause.cause
+        }
+        return cause ?: ex
+    }
+}

src/main/kotlin/com/vk/admstorm/utils/MySshUtils.kt

@@ -16,6 +16,7 @@ import com.vk.admstorm.notifications.AdmErrorNotification
 import com.vk.admstorm.notifications.AdmNotification
 import com.vk.admstorm.notifications.AdmWarningNotification
 import com.vk.admstorm.ssh.SshConnectionService
+import com.vk.admstorm.ssh.SshHandler
 import com.vk.admstorm.ssh.YubikeyHandler
 import com.vk.admstorm.utils.MyUtils.executeOnPooledThread
 import git4idea.util.GitUIUtil.code
@@ -85,20 +86,20 @@ object MySshUtils {
         }
 
         val process = try {
-            execSync(builder)
+            SshHandler.handle {
+                execSync(builder)
+            }
         } catch (e: SshException) {
             handleSshException(project, e)
             null
-        } catch (e: TimeoutException) {
-            AdmWarningNotification("Don't forget to touch the yubikey if it blinks when using the AdmStorm plugin's features")
-                .withTitle("Yubikey waiting timeout")
-                .show()
-            LOG.warn("Yubikey waiting timeout", e)
-            null
         } catch (e: IllegalStateException) {
             handleSshException(project, e)
             null
-        } catch (e: Exception) {
+        } catch (e : TimeoutException){
+            handleSshException(project, e)
+            null
+        }
+        catch (e: Exception) {
             handleSshException(project, e)
             null
         } ?: return null
@@ -144,7 +145,6 @@ object MySshUtils {
                 }
             )
             .show()
-
         LOG.warn("Unexpected exception for execSync(builder)", e)
     }