[Gradle, JS] Parallelize requests

libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/VersionFetcher.kt

@@ -9,21 +9,19 @@ import com.google.gson.Gson
 import io.ktor.client.*
 import io.ktor.client.request.*
 import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.coroutineScope
 import java.io.UnsupportedEncodingException
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
-import kotlin.coroutines.CoroutineContext
 
 
-class VersionFetcher(
+class VersionFetcher : AutoCloseable {
-    private val coroutineContext: CoroutineContext
-) : AutoCloseable {
     private val client = HttpClient()
 
     suspend fun fetch(): List<PackageInformation> {
-        return npmPackages
+        return coroutineScope {
-            .map { fetchPackageInformationAsync(it) }
+            npmPackages
+                .map { async { fetchPackageInformationAsync(it) } }
                 .map { fetched ->
                     val (packageName, value) = fetched.await()
                     val fetchedPackageInformation = Gson().fromJson(value, FetchedPackageInformation::class.java)
@@ -33,18 +31,16 @@ class VersionFetcher(
                     )
                 }
         }
+    }
 
-    private suspend fun fetchPackageInformationAsync(packageName: String) =
+    private suspend fun fetchPackageInformationAsync(packageName: String): Pair<String, String> {
-        withContext(coroutineContext) {
         val packagePath =
             if (packageName.startsWith("@"))
                 "@" + encodeURIComponent(packageName)
             else
                 encodeURIComponent(packageName)
 
-            async {
+        return (packageName to client.get<String>("http://registry.npmjs.org/$packagePath"))
-                packageName to client.get<String>("http://registry.npmjs.org/$packagePath")
-            }
     }
 
     override fun close() {

libraries/tools/kotlin-gradle-plugin-npm-versions-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/targets/js/main.kt

@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.gradle.targets.js
 
 import kotlinx.coroutines.runBlocking
 import org.apache.velocity.VelocityContext
-import org.apache.velocity.app.Velocity
 import org.apache.velocity.app.VelocityEngine
 import org.apache.velocity.runtime.RuntimeConstants.RESOURCE_LOADER
 import java.io.File
@@ -35,10 +34,12 @@ fun main() {
 
     val template = velocityEngine.getTemplate("$fileName.vm")
 
+    val packages = VersionFetcher().use {
         runBlocking {
-        val packages = VersionFetcher(coroutineContext).use {
             it.fetch()
         }
+    }
+
     findLastVersions(packages)
         .also {
             context.put("dependencies", it)
@@ -48,7 +49,6 @@ fun main() {
         template.merge(context, it)
     }
 }
-}
 
 fun findLastVersions(packages: List<PackageInformation>): List<Package> {
     return packages