Merge pull request #1004 from JetBrains/rival/improve-startup

Improve startup

Author: rafaelldi

PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/base/PluginLifecycleListener.kt renamed to PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/base/PluginLifecycleActivity.kt

@@ -1,12 +1,15 @@
 /*
- * Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
+ * Copyright 2018-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
  */
 
 package com.microsoft.azure.toolkit.intellij.base
 
-import com.intellij.ide.AppLifecycleListener
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.util.net.HttpConfigurable
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.ProjectActivity
+import com.intellij.util.net.ProxyAuthentication
+import com.intellij.util.net.ProxyConfiguration.StaticProxyConfiguration
+import com.intellij.util.net.ProxySettings
 import com.intellij.util.net.ssl.CertificateManager
 import com.microsoft.azure.toolkit.ide.common.auth.IdeAzureAccount
 import com.microsoft.azure.toolkit.ide.common.store.AzureConfigInitializer.initialize
@@ -15,43 +18,40 @@ import com.microsoft.azure.toolkit.ide.common.store.DefaultMachineStore
 import com.microsoft.azure.toolkit.intellij.common.CommonConst
 import com.microsoft.azure.toolkit.intellij.common.auth.IntelliJSecureStore
 import com.microsoft.azure.toolkit.intellij.common.settings.IntellijStore
-import com.microsoft.azure.toolkit.intellij.common.telemetry.IntelliJAzureTelemetryCommonPropertiesProvider
 import com.microsoft.azure.toolkit.lib.Azure
 import com.microsoft.azure.toolkit.lib.auth.AzureCloud
 import com.microsoft.azure.toolkit.lib.common.proxy.ProxyInfo
 import com.microsoft.azure.toolkit.lib.common.proxy.ProxyManager
 import com.microsoft.azure.toolkit.lib.common.task.AzureRxTaskManager
-import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager
-import java.io.File
+import java.util.UUID
 import javax.net.ssl.HttpsURLConnection
+import kotlin.io.path.Path
+import kotlin.io.path.absolutePathString
 
-class PluginLifecycleListener : AppLifecycleListener {
+class PluginLifecycleActivity : ProjectActivity {
     companion object {
-        private val LOG = logger<PluginLifecycleListener>()
+        private val LOG = logger<PluginLifecycleActivity>()
     }
 
-    override fun appFrameCreated(commandLineArgs: MutableList<String>) {
+    override suspend fun execute(project: Project) {
         try {
             AzureRxTaskManager.register()
-            val azureJson = String.format("%s%s%s", CommonConst.PLUGIN_PATH, File.separator, "azure.json")
+            val azureJson = Path(CommonConst.PLUGIN_PATH).resolve("azure.json").absolutePathString()
             AzureStoreManager.register(
                 DefaultMachineStore(azureJson),
                 IntellijStore.getInstance(),
                 IntelliJSecureStore.getInstance()
             )
             initProxy()
             initializeConfig()
-            AzureTaskManager.getInstance().runLater {
-                IdeAzureAccount.getInstance().restoreSignin()
-            }
+            IdeAzureAccount.getInstance().restoreSignin()
         } catch (t: Throwable) {
             LOG.error(t)
         }
     }
 
     private fun initializeConfig() {
-        val installId = IntelliJAzureTelemetryCommonPropertiesProvider.getInstallationId()
-
+        val installId = UUID.randomUUID().toString()
         initialize(installId, "Azure Toolkit for IntelliJ", CommonConst.PLUGIN_VERSION)
         val cloud = Azure.az().config().cloud
         if (cloud.isNotBlank()) {
@@ -60,18 +60,23 @@ class PluginLifecycleListener : AppLifecycleListener {
     }
 
     private fun initProxy() {
-        val instance = HttpConfigurable.getInstance()
-        if (instance != null && instance.USE_HTTP_PROXY) {
-            val proxy = ProxyInfo.builder()
-                .source("intellij")
-                .host(instance.PROXY_HOST)
-                .port(instance.PROXY_PORT)
-                .username(instance.proxyLogin)
-                .password(instance.plainProxyPassword)
-                .build()
-            Azure.az().config().setProxyInfo(proxy)
-            ProxyManager.getInstance().applyProxy()
+        val proxySettings = ProxySettings.getInstance().getProxyConfiguration()
+        if (proxySettings is StaticProxyConfiguration) {
+            val proxyAuthentication = ProxyAuthentication.getInstance()
+            val credentials = proxyAuthentication.getKnownAuthentication(proxySettings.host, proxySettings.port)
+            if (credentials != null) {
+                val proxy = ProxyInfo.builder()
+                    .source("intellij")
+                    .host(proxySettings.host)
+                    .port(proxySettings.port)
+                    .username(credentials.userName)
+                    .password(credentials.password?.toString() ?: "")
+                    .build()
+                Azure.az().config().setProxyInfo(proxy)
+                ProxyManager.getInstance().applyProxy()
+            }
         }
+
         val certificateManager = CertificateManager.getInstance()
         Azure.az().config().sslContext = certificateManager.sslContext
         HttpsURLConnection.setDefaultSSLSocketFactory(certificateManager.sslContext.socketFactory)

PluginsAndFeatures/azure-toolkit-for-rider/src/main/resources/META-INF/plugin.xml

@@ -46,6 +46,8 @@
     <depends>com.intellij.modules.rider</depends>
 
     <extensions defaultExtensionNs="com.intellij">
+        <postStartupActivity implementation="com.microsoft.azure.toolkit.intellij.base.PluginLifecycleActivity"/>
+
         <applicationConfigurable parentId="tools"
                                  displayName="Azure"
                                  id="com.microsoft.intellij.AzureConfigurable"
@@ -76,11 +78,6 @@
         <actions implementation="com.microsoft.azure.toolkit.intellij.settings.IntellijCommonActionsContributor"/>
     </extensions>
 
-    <applicationListeners>
-        <listener class="com.microsoft.azure.toolkit.intellij.base.PluginLifecycleListener"
-                  topic="com.intellij.ide.AppLifecycleListener"/>
-    </applicationListeners>
-
     <actions>
         <group id="AzurePopupGroup"
                text="Azure"