[Gradle, JS] Consider potential hash of nodejs and yarn

^KT-47845 fixed

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt

@@ -2,7 +2,9 @@ package org.jetbrains.kotlin.gradle.targets.js.nodejs
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.Configuration
+import org.gradle.api.file.FileCollection
 import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.file.FileTree
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.gradle.logging.kotlinInfo
@@ -44,10 +46,6 @@ abstract class NodeJsSetupTask : DefaultTask() {
     @get:Internal
     internal lateinit var configuration: Provider<Configuration>
 
-    private val _nodeJsDist by lazy {
-        configuration.get().files.single()
-    }
-
     @get:Classpath
     val nodeJsDist: File by lazy {
         val repo = project.repositories.ivy { repo ->
@@ -61,7 +59,7 @@ abstract class NodeJsSetupTask : DefaultTask() {
             repo.content { it.includeModule("org.nodejs", "node") }
         }
         val startDownloadTime = System.currentTimeMillis()
-        val dist = _nodeJsDist
+        val dist = configuration.get().files.single()
         val downloadDuration = System.currentTimeMillis() - startDownloadTime
         if (downloadDuration > 0) {
             KotlinBuildStatsService.getInstance()
@@ -82,21 +80,30 @@ abstract class NodeJsSetupTask : DefaultTask() {
     fun exec() {
         logger.kotlinInfo("Using node distribution from '$nodeJsDist'")
 
+        var dirHash: String? = null
         val upToDate = destinationHashFile.let { file ->
             if (file.exists()) {
                 file.useLines {
-                    it.single() == calculateDirHash(destination)
+                    it.single() == (calculateDirHash(destination).also { dirHash = it })
                 }
             } else false
         }
 
-        if (upToDate) return
+        val tmpDir = temporaryDir
+        unpackNodeArchive(nodeJsDist, tmpDir)
+
+        if (upToDate && calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) return
 
         if (destination.isDirectory) {
             destination.deleteRecursively()
         }
 
-        unpackNodeArchive(nodeJsDist, destination.parentFile) // parent because archive contains name already
+        fs.copy {
+            it.from(tmpDir)
+            it.into(destination.parentFile)
+        }
+
+        tmpDir.deleteRecursively()
 
         if (!env.isWindows) {
             File(env.nodeExecutable).setExecutable(true)
@@ -110,20 +117,18 @@ abstract class NodeJsSetupTask : DefaultTask() {
     private fun unpackNodeArchive(archive: File, destination: File) {
         logger.kotlinInfo("Unpacking $archive to $destination")
 
-        when {
+        fs.copy {
-            archive.name.endsWith("zip") -> fs.copy {
+            it.from(fileTree(archive))
-                it.from(archiveOperations.zipTree(archive))
+            it.into(destination)
-                it.into(destination)
-            }
-            else -> {
-                fs.copy {
-                    it.from(archiveOperations.tarTree(archive))
-                    it.into(destination)
-                }
-            }
         }
     }
 
+    private fun fileTree(archive: File): FileTree =
+        when {
+            archive.name.endsWith("zip") -> archiveOperations.zipTree(archive)
+            else -> archiveOperations.tarTree(archive)
+        }
+
     companion object {
         const val NAME: String = "kotlinNodeJsSetup"
     }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/utils.kt

@@ -40,7 +40,7 @@ fun calculateDirHash(dir: File): String? {
     val md = MessageDigest.getInstance("MD5")
     dir.walk()
         .forEach { file ->
-            md.update(file.absolutePath.toByteArray())
+            md.update(file.toRelativeString(dir).toByteArray())
             if (file.isFile) {
                 file.inputStream().use {
                     md.update(it.readBytes())

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt

@@ -57,10 +57,6 @@ open class YarnSetupTask : DefaultTask() {
     @get:Internal
     internal lateinit var configuration: Provider<Configuration>
 
-    private val _yarnDist by lazy {
-        configuration.get().files.single()
-    }
-
     @get:Classpath
     val yarnDist: File by lazy {
         val repo = project.repositories.ivy { repo ->
@@ -73,7 +69,7 @@ open class YarnSetupTask : DefaultTask() {
             repo.content { it.includeModule("com.yarnpkg", "yarn") }
         }
         val startDownloadTime = System.currentTimeMillis()
-        val dist = _yarnDist
+        val dist = configuration.get().files.single()
         val downloadDuration = System.currentTimeMillis() - startDownloadTime
         if (downloadDuration > 0) {
             KotlinBuildStatsService.getInstance()
@@ -93,21 +89,30 @@ open class YarnSetupTask : DefaultTask() {
     fun setup() {
         logger.kotlinInfo("Using yarn distribution from '$yarnDist'")
 
+        var dirHash: String? = null
         val upToDate = destinationHashFile.let { file ->
             if (file.exists()) {
                 file.useLines {
-                    it.single() == calculateDirHash(destination)
+                    it.single() == (calculateDirHash(destination).also { dirHash = it })
                 }
             } else false
         }
 
-        if (upToDate) return
+        val tmpDir = temporaryDir
+        extract(yarnDist, tmpDir) // parent because archive contains name already
+
+        if (upToDate && calculateDirHash(tmpDir.resolve(destination.name))!! == dirHash) return
 
         if (destination.isDirectory) {
             destination.deleteRecursively()
         }
 
-        extract(yarnDist, destination.parentFile) // parent because archive contains name already
+        fs.copy {
+            it.from(tmpDir)
+            it.into(destination.parentFile)
+        }
+
+        tmpDir.deleteRecursively()
 
         destinationHashFile.writeText(
             calculateDirHash(destination)!!