Avoid shutting down terminals when disconnecting JetBrains Client

Author: felladrin

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodTerminalService.kt

@@ -4,11 +4,14 @@
 
 package io.gitpod.jetbrains.remote
 
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.rd.defineNestedLifetime
 import com.intellij.util.application
 import com.jediterm.terminal.ui.TerminalWidget
 import com.jediterm.terminal.ui.TerminalWidgetListener
+import com.jetbrains.rd.framework.util.launch
 import com.jetbrains.rdserver.terminal.BackendTerminalManager
 import io.gitpod.supervisor.api.Status
 import io.gitpod.supervisor.api.StatusServiceGrpc
@@ -17,14 +20,15 @@ import io.gitpod.supervisor.api.TerminalServiceGrpc
 import io.grpc.StatusRuntimeException
 import io.grpc.stub.ClientCallStreamObserver
 import io.grpc.stub.ClientResponseObserver
+import kotlinx.coroutines.delay
 import org.jetbrains.plugins.terminal.ShellTerminalWidget
 import org.jetbrains.plugins.terminal.TerminalView
 import java.util.*
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 
-class GitpodTerminalService(project: Project) {
+class GitpodTerminalService(project: Project): Disposable {
     private companion object {
         var hasStarted = false
     }
@@ -34,11 +38,14 @@ class GitpodTerminalService(project: Project) {
     private val terminalServiceFutureStub = TerminalServiceGrpc.newFutureStub(GitpodManager.supervisorChannel)
     private val terminalServiceStub = TerminalServiceGrpc.newStub(GitpodManager.supervisorChannel)
     private val statusServiceStub = StatusServiceGrpc.newStub(GitpodManager.supervisorChannel)
+    private val lifetime = defineNestedLifetime()
 
     init {
         start()
     }
 
+    override fun dispose() = Unit
+
     private fun start() {
         if (application.isHeadlessEnvironment || hasStarted) return
 
@@ -270,11 +277,14 @@ class GitpodTerminalService(project: Project) {
         @Suppress("ObjectLiteralToLambda")
         shellTerminalWidget.addListener(object : TerminalWidgetListener {
             override fun allSessionsClosed(widget: TerminalWidget) {
-                terminalServiceFutureStub.shutdown(
-                        TerminalOuterClass.ShutdownTerminalRequest.newBuilder()
-                                .setAlias(supervisorTerminal.alias)
-                                .build()
-                )
+                lifetime.launch {
+                    delay(5000)
+                    terminalServiceFutureStub.shutdown(
+                            TerminalOuterClass.ShutdownTerminalRequest.newBuilder()
+                                    .setAlias(supervisorTerminal.alias)
+                                    .build()
+                    )
+                }
             }
         })
     }