wip

mustard-mh · mustard-mh · commit daf113af93dc · 2024-10-31T08:09:19.000Z
diff --git a/components/ide/jetbrains/gateway-plugin/build.gradle.kts b/components/ide/jetbrains/gateway-plugin/build.gradle.kts
@@ -3,6 +3,7 @@
 // See License.AGPL.txt in the project root for license information.
 
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.changelog.date
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -36,6 +37,8 @@ if (environmentName.isNotBlank()) {
     pluginVersion += "-$environmentName"
 }
 
+pluginVersion = pluginVersion.replace("{{LOCAL_VERSION}}", date("MMddhhmm") + "-local")
+
 project(":") {
     kotlin {
         val excludedPackage = if (environmentName == "latest") "stable" else "latest"
@@ -176,3 +179,46 @@ tasks {
         }
     }
 }
+
+tasks.register("installPlugin") {
+    group = "gitpod"
+
+    println("Building plugin $pluginVersion")
+
+    dependsOn("buildPlugin")
+
+    doLast {
+        val pluginTargetPath = "distributions/jetbrains-gateway-gitpod-plugin.zip"
+        val pluginFile = layout.buildDirectory.file(pluginTargetPath).orNull?.asFile ?: {
+            throw GradleException("Plugin file not found at $pluginTargetPath")
+        }
+
+        // Example for macOS ~/Library/Application Support/JetBrains/JetBrainsGateway2024.3/plugins
+        //
+        // JB_GATEWAY_PLUGINS_DIR=/Users/hwen/Library/Application Support/JetBrains/JetBrainsGateway2024.3/plugins
+        // JB_GATEWAY_IDEA_LOG_FILE=/Users/hwen/Library/Logs/JetBrains/JetBrainsGateway2024.3/idea.log
+        val gatewayPluginsDir = System.getenv("JB_GATEWAY_PLUGINS_DIR")
+        val gatewayIDEALogFile = System.getenv("JB_GATEWAY_IDEA_LOG_FILE")
+
+        if (gatewayPluginsDir.isNullOrEmpty()) {
+            throw GradleException("Found no JB_GATEWAY_PLUGINS_DIR environment variable")
+        }
+        println("Copying plugin from $pluginFile to $gatewayPluginsDir")
+
+        copy {
+            from(zipTree(pluginFile))
+            into(file(gatewayPluginsDir))
+        }
+
+        println("Plugin successfully copied to $gatewayPluginsDir")
+
+        exec {
+            commandLine("sh", "-c", "pkill -f 'Gateway' || true")
+        }
+        if (!gatewayIDEALogFile.isNullOrEmpty()) {
+            exec {
+                commandLine("sh", "-c", "echo '' > $gatewayIDEALogFile")
+            }
+        }
+    }
+}
diff --git a/components/ide/jetbrains/gateway-plugin/gradle.properties b/components/ide/jetbrains/gateway-plugin/gradle.properties
@@ -8,7 +8,7 @@ pluginName=gitpod-gateway
 latestPluginName=Gitpod Gateway
 pluginId=io.gitpod.jetbrains.gateway
 # It is overriden by CI during the build.
-pluginVersion=0.0.1
+pluginVersion={{LOCAL_VERSION}}
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 platformType=GW
 platformDownloadSources=true
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
@@ -47,7 +47,6 @@ import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
 import io.gitpod.jetbrains.icons.GitpodIcons
 import kotlinx.coroutines.*
 import kotlinx.coroutines.future.await
-import java.awt.Component
 import java.net.URL
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -58,6 +57,7 @@ import javax.swing.JLabel
 import kotlin.coroutines.coroutineContext
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.writeText
+import kotlin.random.Random.Default.nextInt
 
 @Suppress("UnstableApiUsage", "OPT_IN_USAGE")
 class GitpodConnectionProvider : GatewayConnectionProvider {
@@ -202,6 +202,27 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
 
             var lastUpdate: WorkspaceInstance? = null
             var canceledByGitpod = false
+
+            if (settings.additionalHeartbeat) {
+                thisLogger().info("gitpod: additional heartbeat enabled for ${connectParams.resolvedWorkspaceId}")
+                connectionLifetime.launch {
+                    while (isActive) {
+                        val delaySeconds = 30 + nextInt(5, 15)
+                        try {
+                            if (lastUpdate?.status?.phase == "running") {
+                                client.sendHeartbeat(connectParams.actualWorkspaceId)
+                            }
+                        } catch (t: Throwable) {
+                            thisLogger().error(
+                                "gitpod: failed to send additional heartbeat for ${connectParams.resolvedWorkspaceId}",
+                                t
+                            )
+                        }
+                        delay(delaySeconds * 1000L)
+                    }
+                }
+            }
+
             try {
                 for (update in updates) {
                     try {
@@ -538,6 +559,34 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
         return null
     }
 
+    private suspend fun sendHeartBeatThroughJBLauncher(
+        ideUrl: URL,
+        ownerToken: String,
+        connectParams: ConnectParams
+    ) {var resolveJoinLinkUrl = "https://24000-${ideUrl.host}/joinLink2"
+        if (!connectParams.backendPort.isNullOrBlank()) {
+            resolveJoinLinkUrl += "?backendPort=${connectParams.backendPort}"
+        }
+        var rawResp = fetchWS(resolveJoinLinkUrl, connectParams, ownerToken)
+        if (rawResp != null) {
+            return with(jacksonMapper) {
+                propertyNamingStrategy = PropertyNamingStrategies.LowerCamelCaseStrategy()
+                readValue(rawResp, object : TypeReference<JoinLinkResp>() {})
+            }
+        }
+
+        // Fallback to old endpoint
+        resolveJoinLinkUrl = "https://24000-${ideUrl.host}/joinLink"
+        if (!connectParams.backendPort.isNullOrBlank()) {
+            resolveJoinLinkUrl += "?backendPort=${connectParams.backendPort}"
+        }
+        rawResp = fetchWS(resolveJoinLinkUrl, connectParams, ownerToken)
+        if (rawResp != null) {
+            return JoinLinkResp(-1, rawResp)
+        }
+        return null
+    }
+
     private fun resolveCredentials(
         host: String,
         port: Int,
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodSettingsConfigurable.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodSettingsConfigurable.kt
@@ -31,6 +31,11 @@ class GitpodSettingsConfigurable : BoundConfigurable("Gitpod") {
                     .comment("Helpful if you are behind a firewall/proxy that blocks SSH or " +
                             "have complicated SSH setup (bastions, proxy jumps, etc.)")
             }
+            row {
+                checkBox("Additional heartbeat")
+                    .bindSelected(state::additionalHeartbeat)
+                    .comment("Additional heartbeat when connection is connected, helps to keep the workspace alive more reliably")
+            }
 
         }
     }
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodSettingsState.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodSettingsState.kt
@@ -45,6 +45,15 @@ class GitpodSettingsState : PersistentStateComponent<GitpodSettingsState> {
             dispatcher.multicaster.didChange()
         }
 
+    var additionalHeartbeat: Boolean = false
+        set(value) {
+            if (value == field) {
+                return
+            }
+            field = value
+            dispatcher.multicaster.didChange()
+        }
+
     private interface Listener : EventListener {
         fun didChange()
     }
diff --git a/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodWorkspacesView.kt b/components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodWorkspacesView.kt
@@ -6,11 +6,13 @@ package io.gitpod.jetbrains.gateway
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
+import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.CompositeDisposable
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
+import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
 import com.intellij.remoteDev.util.onTerminationOrNow
@@ -106,10 +108,12 @@ class GitpodWorkspacesView(
                 }
             }.visibleIf(loggedIn.not())
 
+            val pluginVersion = PluginManagerCore.getPlugin(PluginId.getId("io.gitpod.jetbrains.gateway"))?.version
+            val pluginVersionLabel = if (pluginVersion?.contains("-local") == true) " (${pluginVersion})" else ""
             rowsRange {
                 row {
                     icon(GitpodIcons.Logo).gap(RightGap.SMALL)
-                    label("Gitpod").applyToComponent {
+                    label("Gitpod${pluginVersionLabel}").applyToComponent {
                         this.font = JBFont.h3().asBold()
                     }
                     label("").resizableColumn().align(AlignX.FILL)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ class GitpodSettingsConfigurable : BoundConfigurable("Gitpod") {`
`31`	`31`	`.comment("Helpful if you are behind a firewall/proxy that blocks SSH or " +`
`32`	`32`	`"have complicated SSH setup (bastions, proxy jumps, etc.)")`
`33`	`33`	`}`
	`34`	`+ row {`
	`35`	`+ checkBox("Additional heartbeat")`
	`36`	`+ .bindSelected(state::additionalHeartbeat)`
	`37`	`+ .comment("Additional heartbeat when connection is connected, helps to keep the workspace alive more reliably")`
	`38`	`+ }`
`34`	`39`
`35`	`40`	`}`
`36`	`41`	`}`