Merge pull request #6 from EmptyIrony/master

下载sha1和模块列表都走proxy httpclient和解决依赖问题

Author: CziSKY

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("java")
-    kotlin("jvm") version "1.9.22"
-    id("org.jetbrains.intellij") version "1.17.2"
+    kotlin("jvm") version "1.9.25"
+    id("org.jetbrains.intellij") version "1.17.4"
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
@@ -15,12 +15,12 @@ repositories {
 }
 
 dependencies {
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("org.freemarker:freemarker:2.3.32")
+    implementation(libs.okhttp)
+    implementation(libs.freemarker)
 }
 
 intellij {
-    version.set("2023.2.2")
+    version.set("2024.2.0.2")
 
     plugins.addAll(
         "java",
@@ -42,11 +42,19 @@ kotlin {
 
 
 tasks {
-
-shadowJar {
+    shadowJar {
         archiveClassifier.set("all")
-        relocate("org.freemarker", "org.tabooproject.intellij.freemarker")
+        relocate("freemarker", "org.tabooproject.intellij.freemarker")
         relocate("okhttp3", "org.tabooproject.intellij.okhttp3")
+        relocate("okio", "org.tabooproject.intellij.okio")
+        dependencies {
+            exclude(dependency("org.jetbrains.kotlin:::"))
+            exclude(dependency("org.jetbrains:::"))
+        }
+    }
+
+    build {
+        dependsOn(shadowJar)
     }
 
     patchPluginXml {

gradle/libs.versions.toml

@@ -0,0 +1,7 @@
+[versions]
+okhttp="4.12.0"
+freemarker="2.3.32"
+
+[libraries]
+okhttp={ module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+freemarker={module = "org.freemarker:freemarker", version.ref = "freemarker"}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/org/tabooproject/intellij/ProjectBuilder.kt

@@ -5,8 +5,10 @@ import com.intellij.ide.starters.local.StandardAssetsProvider
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.ide.wizard.*
+import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider
+import com.intellij.openapi.util.ThrowableComputable
 import org.tabooproject.intellij.step.ConfigurationPropertiesStep
 import org.tabooproject.intellij.step.OptionalPropertiesStep
 import org.tabooproject.intellij.util.Assets
@@ -37,11 +39,16 @@ class ProjectBuilder : AbstractNewProjectWizardBuilder() {
             // 资源填充
             .nextStep {
                 object : AssetsNewProjectWizardStep(it) {
-
                     override fun setupAssets(project: Project) {
                         addAssets(StandardAssetsProvider().getGradlewAssets())
-                        val directory = project.basePath!!
-                        Template.downloadAndUnzipFile(directory)
+
+                        ProgressManager.getInstance().runProcessWithProgressSynchronously(
+                            ThrowableComputable {
+                                val directory = project.basePath!!
+                                Template.downloadAndUnzipFile(directory)
+                            },
+                            "Downloading template files", true, project
+                        )
                     }
                 }
             }

src/main/kotlin/org/tabooproject/intellij/Utils.kt

@@ -1,14 +1,19 @@
 package org.tabooproject.intellij
 
-import com.intellij.psi.*
+import com.intellij.psi.PsiDirectory
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiReference
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.jetbrains.kotlin.psi.KtAnnotated
+import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
+import java.util.concurrent.TimeUnit
 
 fun createFileWithDirectories(baseDir: String, relativePath: String): Path? {
     val fullPath = Paths.get(baseDir, relativePath)
@@ -70,4 +75,18 @@ private inline fun <reified T : PsiElement> PsiElement.findParent(
 
         el = el.parent ?: return null
     }
+}
+
+fun readFromUrl(url: String): String? {
+    val client = createOkHttpClientWithSystemProxy {
+        connectTimeout(10, TimeUnit.SECONDS)
+        readTimeout(10, TimeUnit.SECONDS)
+    }
+
+    val response = client
+        .newCall(getRequest(url))
+        .execute()
+        .takeIf { it.isSuccessful } ?: throw IOException("Failed to get $url")
+
+    return response.body?.string()
 }

src/main/kotlin/org/tabooproject/intellij/step/ConfigurationPropertiesStep.kt

@@ -3,6 +3,8 @@ package org.tabooproject.intellij.step
 import ai.grazie.utils.capitalize
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.ide.util.projectWizard.WizardContext
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.openapi.util.ThrowableComputable
 import com.intellij.ui.dsl.builder.columns
 import com.intellij.ui.dsl.builder.panel
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -11,6 +13,7 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import org.tabooproject.intellij.component.CheckModulePanel
 import org.tabooproject.intellij.util.ResourceLoader
+import org.tabooproject.intellij.util.ResourceLoader.loadModules
 import javax.swing.JComponent
 import javax.swing.JTextField
 
@@ -132,6 +135,14 @@ class ConfigurationPropertiesStep(val context: WizardContext) : ModuleWizardStep
     @OptIn(DelicateCoroutinesApi::class)
     override fun _init() {
         if (inited) return
+
+        ProgressManager.getInstance().runProcessWithProgressSynchronously(
+            ThrowableComputable {
+                loadModules()
+            },
+            "Downloading modules list", true, context.project
+        )
+
         GlobalScope.launch {
             coroutineScope {
                 checkModulePanel.setModules(ResourceLoader.getModules())

src/main/kotlin/org/tabooproject/intellij/util/ResourceLoader.kt

@@ -6,8 +6,9 @@ import com.jetbrains.rd.util.info
 import groovy.util.logging.Slf4j
 import kotlinx.serialization.json.*
 import org.jetbrains.annotations.NonNls
+import org.tabooproject.intellij.readFromUrl
 import org.tabooproject.intellij.step.Module
-import java.net.URL
+import java.io.IOException
 import java.security.MessageDigest
 
 /**
@@ -26,22 +27,19 @@ object ResourceLoader {
     }
 
     fun loadModules() {
-        val moduleSha1URL = URL(url.plus("Modules.json.sha1"))
-
         val loadLocalModulesToJson = loadLocalModulesToJson()
 
+        val remoteSha1 = readFromUrl(url.plus("Modules.json.sha1")) ?: throw IOException("Failed to get remote sha1")
+
         if (cacheJson != null) {
             val cacheJsonSha1 = sha1(cacheJson.toString())
-            val remoteSha1 = moduleSha1URL.openStream().use { it.bufferedReader().use { it.readText() } }
             if (remoteSha1.trim() == cacheJsonSha1.trim()) {
                 logger.info { "缓存数据正确,不进行更新" }
                 return
             }
         }
 
-
         sha1(loadLocalModulesToJson.toString()).also {
-            val remoteSha1 = moduleSha1URL.openStream().use { it.bufferedReader().use { it.readText() } }
             if (remoteSha1.trim() == it.trim()) {
                 logger.info { "校验通过,本地文件与远程文件一致,无需更新" }
                 if (cacheJson == null) {
@@ -71,14 +69,11 @@ object ResourceLoader {
     }
 
     fun downloadRemoteJson(): JsonObject {
-        val moduleURL = URL(url.plus("Modules.json"))
-        return moduleURL.openStream().use {
-            it.bufferedReader().use { it.readText() }.let { Json.parseToJsonElement(it).jsonObject }
-        }
+        val jsonString = readFromUrl(url.plus("Modules.json")) ?: throw IOException("Failed to get modules")
+        return Json.parseToJsonElement(jsonString).jsonObject
     }
 
     fun getModules(): Map<String, List<Module>> {
-        loadModules()
         return parseModules(cacheJson ?: error("加载失败"))
     }