Merge pull request #260 from JetBrains/refactor-services

Refactor services

src/main/kotlin/com/jetbrains/rider/aspire/MigrateBuildSolutionTaskActivity.kt

@@ -0,0 +1,27 @@
+package com.jetbrains.rider.aspire
+
+import com.intellij.execution.RunManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.ProjectActivity
+import com.jetbrains.rider.build.tasks.BuildProjectBeforeRunTask
+import com.jetbrains.rider.build.tasks.BuildSolutionBeforeRunTaskProvider
+
+class MigrateBuildSolutionTaskActivity : ProjectActivity {
+    override suspend fun execute(project: Project) {
+        RunManager.getInstance(project).allSettings.forEach { setting ->
+            if (setting.type.id == "AspireHostConfiguration") {
+                val buildSolutionTasks = setting.configuration.beforeRunTasks.filter {
+                    it.providerId == BuildSolutionBeforeRunTaskProvider.providerId
+                }
+                if (buildSolutionTasks.isNotEmpty()) {
+                    buildSolutionTasks.forEach {
+                        setting.configuration.beforeRunTasks.remove(it)
+                    }
+                    val buildSolutionTask = BuildProjectBeforeRunTask()
+                    buildSolutionTask.isEnabled = true
+                    setting.configuration.beforeRunTasks.add(0, buildSolutionTask)
+                }
+            }
+        }
+    }
+}

src/main/kotlin/com/jetbrains/rider/aspire/actions/dashboard/AspireManifestAction.kt

@@ -4,18 +4,18 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.jetbrains.rider.aspire.manifest.ManifestService
-import com.jetbrains.rider.aspire.services.AspireServiceManager
+import com.jetbrains.rider.aspire.services.AspireHostManager
 import com.jetbrains.rider.aspire.util.ASPIRE_HOST_PATH
 
 class AspireManifestAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val hostPath = event.getData(ASPIRE_HOST_PATH) ?: return
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
             ?: return
-        val hostProjectPath = hostService.projectPath
+        val hostProjectPath = hostService.hostProjectPath
 
         ManifestService.getInstance(project).generateManifest(hostProjectPath)
     }
@@ -28,9 +28,9 @@ class AspireManifestAction : AnAction() {
             return
         }
 
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
         if (hostService == null) {
             event.presentation.isEnabledAndVisible = false
             return

src/main/kotlin/com/jetbrains/rider/aspire/actions/dashboard/AspireOpenDashboardAction.kt

@@ -4,16 +4,16 @@ import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.jetbrains.rider.aspire.services.AspireServiceManager
+import com.jetbrains.rider.aspire.services.AspireHostManager
 import com.jetbrains.rider.aspire.util.ASPIRE_HOST_PATH
 
 class AspireOpenDashboardAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val hostPath = event.getData(ASPIRE_HOST_PATH) ?: return
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
             ?: return
         val dashboardUrl = hostService.dashboardUrl
         if (dashboardUrl.isNullOrEmpty()) return
@@ -29,9 +29,9 @@ class AspireOpenDashboardAction : AnAction() {
             return
         }
 
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
         if (hostService == null || !hostService.isActive || hostService.dashboardUrl.isNullOrEmpty()) {
             event.presentation.isEnabledAndVisible = false
             return

src/main/kotlin/com/jetbrains/rider/aspire/actions/dashboard/DebugHostAction.kt

@@ -4,16 +4,16 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.jetbrains.rider.aspire.run.AspireHostRunManager
-import com.jetbrains.rider.aspire.services.AspireServiceManager
+import com.jetbrains.rider.aspire.services.AspireHostManager
 import com.jetbrains.rider.aspire.util.ASPIRE_HOST_PATH
 
 class DebugHostAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val hostPath = event.getData(ASPIRE_HOST_PATH) ?: return
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
             ?: return
 
         AspireHostRunManager.getInstance(project)
@@ -28,9 +28,9 @@ class DebugHostAction : AnAction() {
             return
         }
 
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
         if (hostService == null) {
             event.presentation.isEnabledAndVisible = false
             return

src/main/kotlin/com/jetbrains/rider/aspire/actions/dashboard/RunHostAction.kt

@@ -4,16 +4,16 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.jetbrains.rider.aspire.run.AspireHostRunManager
-import com.jetbrains.rider.aspire.services.AspireServiceManager
+import com.jetbrains.rider.aspire.services.AspireHostManager
 import com.jetbrains.rider.aspire.util.ASPIRE_HOST_PATH
 
 class RunHostAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val hostPath = event.getData(ASPIRE_HOST_PATH) ?: return
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
             ?: return
 
         AspireHostRunManager.getInstance(project)
@@ -28,9 +28,9 @@ class RunHostAction : AnAction() {
             return
         }
 
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
         if (hostService == null) {
             event.presentation.isEnabledAndVisible = false
             return

src/main/kotlin/com/jetbrains/rider/aspire/actions/dashboard/StopHostAction.kt

@@ -5,17 +5,17 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.jetbrains.rider.aspire.AspireService
 import com.jetbrains.rider.aspire.run.AspireHostRunManager
-import com.jetbrains.rider.aspire.services.AspireServiceManager
+import com.jetbrains.rider.aspire.services.AspireHostManager
 import com.jetbrains.rider.aspire.util.ASPIRE_HOST_PATH
 import kotlinx.coroutines.launch
 
 class StopHostAction : AnAction() {
     override fun actionPerformed(event: AnActionEvent) {
         val project = event.project ?: return
         val hostPath = event.getData(ASPIRE_HOST_PATH) ?: return
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
             ?: return
 
         AspireService.getInstance(project).scope.launch {
@@ -32,9 +32,9 @@ class StopHostAction : AnAction() {
             return
         }
 
-        val hostService = AspireServiceManager
+        val hostService = AspireHostManager
             .getInstance(project)
-            .getHostService(hostPath)
+            .getAspireHost(hostPath)
         if (hostService == null) {
             event.presentation.isEnabledAndVisible = false
             return

src/main/kotlin/com/jetbrains/rider/aspire/database/DatabaseResourceListener.kt

@@ -2,8 +2,8 @@ package com.jetbrains.rider.aspire.database
 
 import com.intellij.openapi.project.Project
 import com.jetbrains.rider.aspire.generated.ResourceType
-import com.jetbrains.rider.aspire.services.AspireResourceService
 import com.jetbrains.rider.aspire.services.ResourceListener
+import com.jetbrains.rider.aspire.services.AspireResource
 import java.net.URI
 
 class DatabaseResourceListener(private val project: Project) : ResourceListener {
@@ -18,15 +18,15 @@ class DatabaseResourceListener(private val project: Project) : ResourceListener
         private const val REDIS = "redis"
     }
 
-    override fun resourceCreated(resource: AspireResourceService) {
+    override fun resourceCreated(resource: AspireResource) {
         applyChanges(resource)
     }
 
-    override fun resourceUpdated(resource: AspireResourceService) {
+    override fun resourceUpdated(resource: AspireResource) {
         applyChanges(resource)
     }
 
-    private fun applyChanges(resource: AspireResourceService) {
+    private fun applyChanges(resource: AspireResource) {
         val service = DatabaseService.getInstance(project)
         if (resource.type == ResourceType.Project) {
             resource.environment

src/main/kotlin/com/jetbrains/rider/aspire/listeners/AspireSessionHostListener.kt

@@ -0,0 +1,17 @@
+package com.jetbrains.rider.aspire.listeners
+
+import com.intellij.util.messages.Topic
+import com.jetbrains.rd.util.lifetime.Lifetime
+import com.jetbrains.rider.aspire.generated.AspireSessionHostModel
+import com.jetbrains.rider.aspire.run.AspireHostConfig
+import java.nio.file.Path
+
+interface AspireSessionHostListener {
+    companion object {
+        @Topic.ProjectLevel
+        val TOPIC = Topic("AspireSessionHostListener", AspireSessionHostListener::class.java)
+    }
+
+    fun configCreated(aspireHostProjectPath: Path, config: AspireHostConfig)
+    fun modelCreated(aspireHostProjectPath: Path, sessionHostModel: AspireSessionHostModel, lifetime: Lifetime)
+}

src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostConfig.kt

@@ -9,14 +9,13 @@ data class AspireHostConfig(
     val debugSessionToken: String,
     //from env: DEBUG_SESSION_PORT
     val debugSessionPort: Int,
-    val aspireHostProjectPath: Path,
-    //from env: ASPNETCORE_URLS
-    val aspireHostProjectUrl: String?,
     val debuggingMode: Boolean,
     //from env: DOTNET_RESOURCE_SERVICE_ENDPOINT_URL
     val resourceServiceEndpointUrl: String?,
     //from env: DOTNET_DASHBOARD_RESOURCESERVICE_APIKEY
     val resourceServiceApiKey: String?,
     val aspireHostLifetime: Lifetime,
-    val hostRunConfiguration: AspireHostConfiguration?
+    val aspireHostProjectPath: Path,
+    val aspireHostProjectUrl: String?,
+    val aspireHostRunConfiguration: AspireHostConfiguration?
 )

src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostConfiguration.kt

@@ -3,8 +3,8 @@ package com.jetbrains.rider.aspire.run
 import com.intellij.execution.configurations.ConfigurationFactory
 import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.openapi.project.Project
-import com.jetbrains.rider.build.tasks.SolutionRunConfiguration
 import com.jetbrains.rider.run.configurations.IAutoSelectableRunConfiguration
+import com.jetbrains.rider.run.configurations.IProjectBasedRunConfiguration
 import com.jetbrains.rider.run.configurations.RiderAsyncRunConfiguration
 import org.jdom.Element
 
@@ -19,7 +19,7 @@ class AspireHostConfiguration(
     factory,
     { AspireHostSettingsEditor(it) },
     AspireHostExecutorFactory(project, parameters)
-), SolutionRunConfiguration, IAutoSelectableRunConfiguration {
+), IProjectBasedRunConfiguration, IAutoSelectableRunConfiguration {
     override fun checkConfiguration() {
         parameters.validate()
     }
@@ -46,4 +46,10 @@ class AspireHostConfiguration(
     }
 
     override fun getAutoSelectPriority() = 10
+
+    override fun getProjectFilePath() = parameters.projectFilePath
+
+    override fun setProjectFilePath(path: String) {
+        parameters.projectFilePath = path
+    }
 }

src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostRunManager.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.jetbrains.rd.util.lifetime.LifetimeDefinition
 import com.jetbrains.rd.util.lifetime.isNotAlive
-import com.jetbrains.rider.aspire.services.AspireHostService
+import com.jetbrains.rider.aspire.services.AspireHost
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.nio.file.Path
@@ -38,7 +38,7 @@ class AspireHostRunManager(private val project: Project) {
         configurationLifetimes[aspireHostProjectPath] = aspireHostLifetime
     }
 
-    fun executeConfigurationForHost(host: AspireHostService, underDebug: Boolean) {
+    fun executeConfigurationForHost(host: AspireHost, underDebug: Boolean) {
         val executor =
             if (underDebug) DefaultDebugExecutor.getDebugExecutorInstance()
             else DefaultRunExecutor.getRunExecutorInstance()
@@ -47,7 +47,7 @@ class AspireHostRunManager(private val project: Project) {
         val selected = runManager.selectedConfiguration
         val selectedConfiguration = selected?.configuration
         if (selectedConfiguration != null && selectedConfiguration is AspireHostConfiguration) {
-            if (host.projectPath == Path(selectedConfiguration.parameters.projectFilePath)) {
+            if (host.hostProjectPath == Path(selectedConfiguration.parameters.projectFilePath)) {
                 ProgramRunnerUtil.executeConfiguration(selected, executor)
                 return
             }
@@ -57,15 +57,15 @@ class AspireHostRunManager(private val project: Project) {
             .filter {
                 val path = (it.configuration as? AspireHostConfiguration)?.parameters?.projectFilePath
                     ?: return@filter false
-                Path(path) == host.projectPath
+                Path(path) == host.hostProjectPath
             }
 
         if (configurations.isEmpty()) {
             LOG.warn("Unable to find Aspire host run configurations")
             return
         }
 
-        val configurationName = configurationNames[host.projectPath]
+        val configurationName = configurationNames[host.hostProjectPath]
         if (configurationName != null) {
             val configurationWithName = configurations.firstOrNull { it.name == configurationName }
             if (configurationWithName != null) {
@@ -78,10 +78,10 @@ class AspireHostRunManager(private val project: Project) {
         ProgramRunnerUtil.executeConfiguration(firstConfiguration, executor)
     }
 
-    suspend fun stopConfigurationForHost(host: AspireHostService) {
-        val lifetime = configurationLifetimes[host.projectPath]
+    suspend fun stopConfigurationForHost(host: AspireHost) {
+        val lifetime = configurationLifetimes[host.hostProjectPath]
         if (lifetime == null || lifetime.lifetime.isNotAlive) {
-            LOG.warn("Unable to stop configuration for Aspire host ${host.projectPathString}")
+            LOG.warn("Unable to stop configuration for Aspire host ${host.hostProjectPathString}")
             return
         }
 

src/main/kotlin/com/jetbrains/rider/aspire/run/runners/AspireHostDebugProgramRunner.kt

@@ -14,7 +14,6 @@ import com.jetbrains.rider.aspire.AspireService
 import com.jetbrains.rider.aspire.run.AspireHostConfig
 import com.jetbrains.rider.aspire.run.AspireHostConfiguration
 import com.jetbrains.rider.aspire.run.states.AspireHostDebugProfileState
-import com.jetbrains.rider.aspire.services.AspireServiceManager
 import com.jetbrains.rider.debugger.DebuggerWorkerProcessHandler
 import com.jetbrains.rider.debugger.DotNetDebugRunner
 import com.jetbrains.rider.model.debuggerWorker.DebuggerWorkerModel
@@ -54,17 +53,16 @@ class AspireHostDebugProgramRunner : DotNetDebugRunner() {
 
         LOG.trace { "Aspire session host config: $config" }
 
-        startSessionHostAndSubscribe(
+        saveRunConfiguration(
             environment.project,
-            config,
+            config.aspireHostProjectPath,
+            config.name,
             aspireHostLifetimeDefinition
         )
 
-        val executionResult = state.execute(environment.executor, this, workerProcessHandler, sessionLifetime)
+        startSessionHostAndSubscribe(config, environment.project)
 
-        AspireServiceManager
-            .getInstance(environment.project)
-            .updateAspireHostService(config.aspireHostProjectPath, executionResult)
+        val executionResult = state.execute(environment.executor, this, workerProcessHandler, sessionLifetime)
 
         connectExecutionHandlerAndLifetime(executionResult, aspireHostLifetimeDefinition)