Improve resolution speed

Author: PranavPurwar

.idea/.gitignore

@@ -6,13 +6,13 @@ import kotlin.time.measureTime
 
 @OptIn(ExperimentalTime::class)
 suspend fun main() {
-    val artifact = getArtifact("dev.kord", "kord-core", "0.13.1")
+    val artifact = getArtifact("com.onesignal", "OneSignal", "5.1.13")
     val dir = File("test")
     dir.deleteRecursively()
     dir.mkdir()
     val time = measureTime {
         println("Starting...")
-        artifact?.downloadArtifact(dir)
+        artifact?.resolve()
     }
     println("Total time: $time")
 }

lib/src/main/kotlin/org/cosmic/ide/dependency/resolver/Main.kt

@@ -15,7 +15,6 @@ import java.io.File
 import java.io.InputStream
 import java.net.SocketException
 import java.net.URL
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentLinkedQueue
 import javax.xml.parsers.DocumentBuilderFactory
 
@@ -49,27 +48,24 @@ data class Artifact(
         }
     }
 
-    suspend fun resolve(resolved: MutableSet<Artifact> = ConcurrentHashMap.newKeySet()): ConcurrentLinkedQueue<Artifact> {
+    suspend fun resolve(resolved: ConcurrentLinkedQueue<Artifact> = ConcurrentLinkedQueue<Artifact>()): ConcurrentLinkedQueue<Artifact> {
         val pom = getPOM() ?: return ConcurrentLinkedQueue()
-        val deps = ConcurrentLinkedQueue(pom.resolvePOM(ConcurrentLinkedQueue(resolved)))
+        val deps = ConcurrentLinkedQueue(pom.resolvePOM(resolved))
         val artifacts = ConcurrentLinkedQueue<Artifact>()
         deps.parallelForEach { dep ->
             eventReciever.onResolving(this, dep)
-            if (dep.version.isBlank()) {
-                eventReciever.onFetchingLatestVersion(dep)
-                val factory = DocumentBuilderFactory.newInstance()
-                val builder = factory.newDocumentBuilder()
-                val doc = builder.parse(dep.getMavenMetadata().byteInputStream())
-                val v = doc.getElementsByTagName("release").item(0)
-                if (v != null) {
-                    dep.version = v.textContent
-                    eventReciever.onFetchedLatestVersion(dep, dep.version)
+
+            val saved = resolved.find { it.groupId == dep.groupId && it.artifactId == dep.artifactId }
+
+            if (saved != null) {
+                val max = listOf(saved.version, dep.version).maxOrNull()
+                if (saved.version != max) {
+                    println("Updating max of ${saved.version} to $max")
+                    saved.version = max ?: ""
                 }
-            }
-            artifacts.add(dep)
-            if (resolved.any { it.groupId == dep.groupId && it.artifactId == dep.artifactId && it.version >= dep.version }) {
                 return@parallelForEach
             }
+            artifacts.add(dep)
             resolved.add(dep)
             val depArtifacts = dep.resolve(resolved)
             eventReciever.onResolutionComplete(dep)

lib/src/main/kotlin/org/cosmic/ide/dependency/resolver/api/Artifact.kt

@@ -92,7 +92,14 @@ suspend fun InputStream.resolvePOM(resolved: ConcurrentLinkedQueue<Artifact>): C
             }
             val item = dependencyElement.getElementsByTagName("version").item(0)?.textContent ?: ""
 
-            if (resolved.any { it.groupId == groupId && it.artifactId == artifactId && it.version >= item }) {
+            if (resolved.any { it.groupId == groupId && it.artifactId == artifactId }) {
+                val found = resolved.find { it.groupId == groupId && it.artifactId == artifactId }!!
+
+                if (found.version.isBlank() && item.isNotBlank()) {
+                    found.version = item
+                } else {
+                    found.version = listOf(found.version, item).maxOrNull() ?: ""
+                }
                 eventReciever.onSkippingResolution(Artifact(groupId, artifactId, item))
                 return@async
             }
@@ -126,6 +133,17 @@ suspend fun InputStream.resolvePOM(resolved: ConcurrentLinkedQueue<Artifact>): C
                 }
                 version = tag.textContent
             }
+
+            if (version.isBlank()) {
+                eventReciever.onFetchingLatestVersion(artifact)
+                val factory = DocumentBuilderFactory.newInstance()
+                val builder = factory.newDocumentBuilder()
+                val doc = builder.parse(metadata.byteInputStream())
+                val v = doc.getElementsByTagName("release").item(0)
+                if (v != null) {
+                    version = v.textContent
+                }
+            }
             artifact.version = version
             artifacts.add(artifact)
         }