fixe : resolve EDT freeze and thread safety issues in JetBrains plugin

Author: Nako0

jetbrains-plugin/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "xyz.devglobe"
-version = "1.1.0"
+version = "1.1.1"
 
 repositories {
     mavenCentral()

jetbrains-plugin/src/main/kotlin/xyz/devglobe/plugin/DevGlobeStartupActivity.kt

@@ -1,25 +1,18 @@
 package xyz.devglobe.plugin
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import xyz.devglobe.plugin.auth.ApiKeyStorage
 import xyz.devglobe.plugin.core.DevGlobeTracker
 import xyz.devglobe.plugin.settings.DevGlobeSettings
 
-/**
- * Runs once per project open.
- * Initializes the tracker if an API key is stored and tracking is enabled.
- * Since the tracker is application-level (singleton), multiple project opens
- * are safe — the tracker ignores redundant start() calls.
- */
-class DevGlobeStartupActivity : StartupActivity.DumbAware {
+class DevGlobeStartupActivity : ProjectActivity {
 
-    override fun runActivity(project: Project) {
+    override suspend fun execute(project: Project) {
         val apiKey = ApiKeyStorage.get() ?: return
         val settings = DevGlobeSettings.getInstance()
         val tracker = DevGlobeTracker.getInstance()
 
-        // start() is guarded by an AtomicBoolean — safe against concurrent project opens
         if (settings.state.trackingEnabled) {
             tracker.restoreConnected(apiKey)
             tracker.start(apiKey)

jetbrains-plugin/src/main/kotlin/xyz/devglobe/plugin/core/CoreClient.kt

@@ -165,10 +165,7 @@ class CoreClient(private val binaryPath: String) : Disposable {
     }
 
     override fun dispose() {
-        try {
-            sendShutdown()
-            process?.waitFor(2, java.util.concurrent.TimeUnit.SECONDS)
-        } catch (_: Exception) { }
+        try { sendShutdown() } catch (_: Exception) { }
         process?.destroyForcibly()
         process = null
         writer = null

jetbrains-plugin/src/main/kotlin/xyz/devglobe/plugin/core/DevGlobeTracker.kt

@@ -36,31 +36,36 @@ class DevGlobeTracker : Disposable {
     }
 
     fun start(apiKey: String) {
-        started.set(true)
+        if (!started.compareAndSet(false, true)) return
         currentApiKey = apiKey
         val settings = DevGlobeSettings.getInstance()
 
-        ensureCore()
-        coreClient?.sendInit(apiKey, settings.state.shareRepo, settings.state.anonymousMode, settings.state.statusMessage)
-        coreClient?.sendResume()
-
-        registerDocumentListener()
+        ApplicationManager.getApplication().executeOnPooledThread {
+            ensureCore()
+            coreClient?.sendInit(apiKey, settings.state.shareRepo, settings.state.anonymousMode, settings.state.statusMessage)
+            coreClient?.sendResume()
+            ApplicationManager.getApplication().invokeLater { registerDocumentListener() }
+        }
     }
 
+    @Synchronized
     fun pause() {
+        started.set(false)
         coreClient?.sendPause()
         state = state.copy(tracking = false)
         pushState()
     }
 
+    @Synchronized
     fun stop() {
         started.set(false)
-        pause()
+        coreClient?.sendPause()
+        state = state.copy(tracking = false, connected = false)
         currentApiKey = null
-        state = state.copy(connected = false)
         pushState()
     }
 
+    @Synchronized
     fun reset() {
         started.set(false)
         coreClient?.sendShutdown()
@@ -71,6 +76,7 @@ class DevGlobeTracker : Disposable {
         pushState()
     }
 
+    @Synchronized
     fun restoreConnected(apiKey: String) {
         currentApiKey = apiKey
         val settings = DevGlobeSettings.getInstance()
@@ -84,16 +90,20 @@ class DevGlobeTracker : Disposable {
         pushState()
     }
 
+    @Synchronized
     fun setStatusMessage(message: String) {
         state = state.copy(statusMessage = message)
         pushState()
     }
 
     fun sendSetStatus(message: String) {
-        ensureCore()
-        coreClient?.sendSetStatus(message)
+        ApplicationManager.getApplication().executeOnPooledThread {
+            ensureCore()
+            coreClient?.sendSetStatus(message)
+        }
     }
 
+    @Synchronized
     fun updatePreference(key: String, value: Boolean) {
         state = when (key) {
             "shareRepo" -> state.copy(shareRepo = value)
@@ -108,6 +118,7 @@ class DevGlobeTracker : Disposable {
         }
     }
 
+    @Synchronized
     private fun ensureCore() {
         if (coreClient != null) return
 
@@ -125,7 +136,7 @@ class DevGlobeTracker : Disposable {
 
         val client = CoreClient(CoreDownloader.getBinaryPath())
         client.onState = { newState ->
-            state = newState
+            synchronized(this) { state = newState }
             pushState()
         }
         client.onOffline = { msg ->