Fix EAP build

Author: mustard-mh

.idea/misc.xml

@@ -8,4 +8,4 @@ pluginUntilBuild=243.*
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
 pluginVerifierIdeVersions=2024.3
 # Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=2024.3
+platformVersion=243.18137.22

components/ide/jetbrains/gateway-plugin/gradle-latest.properties

@@ -26,7 +26,6 @@ import com.intellij.ui.dsl.builder.AlignY
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.util.application
 import com.intellij.util.io.DigestUtil
-import com.intellij.util.io.await
 import com.intellij.util.io.delete
 import com.intellij.util.net.JdkProxyProvider
 import com.intellij.util.net.ssl.CertificateManager
@@ -42,8 +41,10 @@ import com.jetbrains.rd.util.ConcurrentHashMap
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.lifetime.LifetimeDefinition
 import io.gitpod.gitpodprotocol.api.entities.WorkspaceInstance
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
 import io.gitpod.jetbrains.icons.GitpodIcons
 import kotlinx.coroutines.*
+import kotlinx.coroutines.future.await
 import java.net.URI
 import java.net.URL
 import java.net.http.HttpClient

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt

@@ -11,16 +11,16 @@ import com.intellij.openapi.extensions.PluginId
 import com.intellij.remoteDev.util.onTerminationOrNow
 import com.intellij.util.ExceptionUtil
 import com.intellij.util.io.DigestUtil
+import com.intellij.util.net.JdkProxyProvider
 import com.intellij.util.net.ssl.CertificateManager
-import com.intellij.util.proxy.CommonProxy
 import com.jetbrains.rd.util.concurrentMapOf
 import com.jetbrains.rd.util.lifetime.Lifetime
 import io.gitpod.gitpodprotocol.api.GitpodServerLauncher
 import io.gitpod.jetbrains.auth.GitpodAuthService
 import kotlinx.coroutines.*
 import kotlinx.coroutines.future.await
 import org.eclipse.jetty.websocket.api.UpgradeException
-import java.net.URL
+import java.net.URI
 import java.nio.charset.StandardCharsets
 
 @Service
@@ -50,7 +50,7 @@ class GitpodConnectionService {
                     val originalClassLoader = Thread.currentThread().contextClassLoader
                     val connection = try {
                         val origin = "https://$gitpodHost/"
-                        val proxies = CommonProxy.getInstance().select(URL(origin))
+                        val proxies = JdkProxyProvider.getInstance().proxySelector.select(URI(origin))
                         val sslContext = CertificateManager.getInstance().sslContext
 
                         // see https://intellij-support.jetbrains.com/hc/en-us/community/posts/360003146180/comments/360000376240

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionService.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.util.EventDispatcher
 import com.intellij.util.xmlb.XmlSerializerUtil
-import java.net.URL
+import java.net.URI
 import java.util.*
 
 @State(
@@ -25,7 +25,7 @@ class GitpodSettingsState : PersistentStateComponent<GitpodSettingsState> {
                 return
             }
             val gitpodHost = try {
-                URL(value.trim()).host
+                URI.create(value.trim()).host
             } catch (t: Throwable) {
                 value.trim()
             }

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodSettingsState.kt

@@ -1,25 +1,30 @@
-// Copyright (c) 2023 Gitpod GmbH. All rights reserved.
-// Licensed under the GNU Affero General Public License (AGPL).
-// See License.AGPL.txt in the project root for license information.
+package io.gitpod.jetbrains.gateway.common
 
-package io.gitpod.jetbrains.gateway
-
-import com.intellij.openapi.components.Service
 import com.jetbrains.gateway.api.CustomConnectionFrameComponentProvider
 import com.jetbrains.gateway.api.CustomConnectionFrameContext
 import com.jetbrains.gateway.api.GatewayConnectionHandle
-import com.jetbrains.gateway.ssh.ClientOverSshTunnelConnector
 import com.jetbrains.gateway.ssh.HostTunnelConnector
 import com.jetbrains.gateway.thinClientLink.ThinClientHandle
 import com.jetbrains.rd.util.lifetime.Lifetime
 import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
 import java.net.URI
 import javax.swing.JComponent
 
-class GitpodConnectionHandle(
+@Suppress("UnstableApiUsage")
+interface GitpodConnectionHandleFactory {
+    fun createGitpodConnectionHandle(
         lifetime: Lifetime,
-        private val component: JComponent,
-        private val params: ConnectParams
+        component: JComponent,
+        params: ConnectParams
+    ): GatewayConnectionHandle
+
+    suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle
+}
+
+class GitpodConnectionHandle(
+    lifetime: Lifetime,
+    private val component: JComponent,
+    private val params: ConnectParams
 ) : GatewayConnectionHandle(lifetime) {
     override fun customComponentProvider(lifetime: Lifetime) = object : CustomConnectionFrameComponentProvider {
         override val closeConfirmationText = "Disconnect from ${getTitle()}?"
@@ -33,22 +38,4 @@ class GitpodConnectionHandle(
     override fun hideToTrayOnStart(): Boolean {
         return false
     }
-}
-@Suppress("UnstableApiUsage")
-@Service
-class GitpodConnectionHandleFactory {
-    fun createGitpodConnectionHandle(
-            lifetime: Lifetime,
-            component: JComponent,
-            params: ConnectParams
-    ): GatewayConnectionHandle {
-        return GitpodConnectionHandle(lifetime, component, params)
-    }
-
-    suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
-        return ClientOverSshTunnelConnector(
-            lifetime,
-            connector
-        ).connect(tcpJoinLink)
-    }
-}
+}

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionHandle.kt renamed to components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/common/GitpodConnectionHandleFactory.kt

@@ -0,0 +1,35 @@
+// Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.gateway.latest
+
+import com.intellij.openapi.components.Service
+import com.jetbrains.gateway.api.GatewayConnectionHandle
+import com.jetbrains.gateway.ssh.ClientOverSshTunnelConnector
+import com.jetbrains.gateway.ssh.HostTunnelConnector
+import com.jetbrains.gateway.thinClientLink.ThinClientHandle
+import com.jetbrains.rd.util.lifetime.Lifetime
+import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandle
+import java.net.URI
+import javax.swing.JComponent
+
+@Suppress("UnstableApiUsage")
+@Service
+class LatestGitpodConnectionHandleFactory {
+    fun createGitpodConnectionHandle(
+        lifetime: Lifetime,
+        component: JComponent,
+        params: ConnectParams
+    ): GatewayConnectionHandle {
+        return GitpodConnectionHandle(lifetime, component, params)
+    }
+
+    suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
+        return ClientOverSshTunnelConnector(
+            lifetime,
+            connector
+        ).connect(tcpJoinLink, null)
+    }
+}

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/latest/GitpodConnectionHandleFactory.kt

@@ -0,0 +1,36 @@
+// Copyright (c) 2024 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.gateway.stable
+
+import com.intellij.openapi.components.Service
+import com.jetbrains.gateway.api.GatewayConnectionHandle
+import com.jetbrains.gateway.ssh.ClientOverSshTunnelConnector
+import com.jetbrains.gateway.ssh.HostTunnelConnector
+import com.jetbrains.gateway.thinClientLink.ThinClientHandle
+import com.jetbrains.rd.util.lifetime.Lifetime
+import io.gitpod.jetbrains.gateway.GitpodConnectionProvider.ConnectParams
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandle
+import io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory
+import java.net.URI
+import javax.swing.JComponent
+
+@Suppress("UnstableApiUsage")
+@Service
+class StableGitpodConnectionHandleFactory: GitpodConnectionHandleFactory {
+    override fun createGitpodConnectionHandle(
+        lifetime: Lifetime,
+        component: JComponent,
+        params: ConnectParams
+    ): GatewayConnectionHandle {
+        return GitpodConnectionHandle(lifetime, component, params)
+    }
+
+    override suspend fun connect(lifetime: Lifetime, connector: HostTunnelConnector, tcpJoinLink: URI): ThinClientHandle {
+        return ClientOverSshTunnelConnector(
+            lifetime,
+            connector
+        ).connect(tcpJoinLink)
+    }
+}

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/stable/GitpodConnectionHandleFactory.kt

@@ -5,6 +5,8 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
+                            serviceImplementation="io.gitpod.jetbrains.gateway.latest.LatestGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>

components/ide/jetbrains/gateway-plugin/src/main/resources-latest/META-INF/extensions.xml

@@ -5,6 +5,8 @@
 -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <applicationService serviceInterface="io.gitpod.jetbrains.gateway.common.GitpodConnectionHandleFactory"
+                            serviceImplementation="io.gitpod.jetbrains.gateway.stable.StableGitpodConnectionHandleFactory"/>
     </extensions>
     <extensions defaultExtensionNs="com.jetbrains">
     </extensions>