feat: optimize market & scripts feature

Author: alazeprt

common/build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     implementation("com.alessiodp.libby:libby-core:2.0.0-SNAPSHOT")
-    compileOnly("com.github.alazeprt:AOneBot:1.0.19-beta")
+    compileOnly("com.github.alazeprt:AOneBot:1.0.20-beta")
     compileOnly("com.google.code.gson:gson:2.11.0")
     compileOnly("net.kyori:adventure-api:4.18.0")
     compileOnly("net.kyori:adventure-text-serializer-legacy:4.24.0")

common/src/main/kotlin/top/alazeprt/aqqbot/AQQBot.kt

@@ -193,7 +193,7 @@ interface AQQBot: ConfigProvider, CommandProvider, DataProvider, HookProvider, T
         val aonebotLib = Library.builder()
             .groupId("com{}github{}alazeprt")
             .artifactId("AOneBot")
-            .version("1.0.19-beta")
+            .version("1.0.20-beta")
             .relocate("com{}google{}code{}gson", "top{}alazeprt{}aonebot{}lib{}com{}google")
             .resolveTransitiveDependencies(true)
             .build()

common/src/main/kotlin/top/alazeprt/aqqbot/command/sub/SubMarket.kt

@@ -12,21 +12,24 @@ class SubMarket(val plugin: AQQBot) : ACommand {
             sender.sendMessage(Component.text("你没有权限使用此命令!", NamedTextColor.RED))
             return
         }
-        when (args[1]) {
-            "list" -> plugin.scriptLoader.marketManager.list(sender)
-            "info" -> if (args.size == 3) {
-                plugin.scriptLoader.marketManager.info(sender, args[2], null)
-            } else if (args.size == 4) {
-                plugin.scriptLoader.marketManager.info(sender, args[2], args[3])
-            } else SubHelp(plugin).onCommand(command, sender, args)
-            "install" -> if (args.size == 3) {
-                plugin.scriptLoader.marketManager.install(sender, args[2], null)
-            } else if (args.size == 4) {
-                plugin.scriptLoader.marketManager.install(sender, args[2], args[3])
-            } else SubHelp(plugin).onCommand(command, sender, args)
-            "update" -> if (args.size == 3) {
-                plugin.scriptLoader.marketManager.update(sender, args[2])
-            } else SubHelp(plugin).onCommand(command, sender, args)
+        plugin.submitAsync {
+            when (args[1]) {
+                "list" -> plugin.scriptLoader.marketManager.list(sender)
+                "info" -> if (args.size == 3) {
+                    plugin.scriptLoader.marketManager.info(sender, args[2], null)
+                } else if (args.size == 4) {
+                    plugin.scriptLoader.marketManager.info(sender, args[2], args[3])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+                "install" -> if (args.size == 3) {
+                    plugin.scriptLoader.marketManager.install(sender, args[2], null)
+                } else if (args.size == 4) {
+                    plugin.scriptLoader.marketManager.install(sender, args[2], args[3])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+                "update" -> if (args.size == 3) {
+                    plugin.scriptLoader.marketManager.update(sender, args[2])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+                else -> SubHelp(plugin).onCommand(command, sender, args)
+            }
         }
     }
 

common/src/main/kotlin/top/alazeprt/aqqbot/command/sub/SubScripts.kt

@@ -12,18 +12,20 @@ class SubScripts(val plugin: AQQBot): ACommand {
             sender.sendMessage(Component.text("你没有权限使用此命令!", NamedTextColor.RED))
             return
         }
-        when (args[1]) {
-            "list" -> plugin.scriptLoader.scriptManager.list(sender)
-            "download" -> if (args.size == 3) {
-                plugin.scriptLoader.scriptManager.download(sender, args[2])
-            } else SubHelp(plugin).onCommand(command, sender, args)
-            "info" -> if (args.size == 3) {
-                plugin.scriptLoader.scriptManager.info(sender, args[2])
-            } else SubHelp(plugin).onCommand(command, sender, args)
-            "reload" -> plugin.scriptLoader.scriptManager.reload(sender)
-            "load" -> if (args.size == 3) {
-                plugin.scriptLoader.scriptManager.load(sender, args[2])
-            } else SubHelp(plugin).onCommand(command, sender, args)
+        plugin.submitAsync {
+            when (args[1]) {
+                "list" -> plugin.scriptLoader.scriptManager.list(sender)
+                "download" -> if (args.size == 3) {
+                    plugin.scriptLoader.scriptManager.download(sender, args[2])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+                "info" -> if (args.size == 3) {
+                    plugin.scriptLoader.scriptManager.info(sender, args[2])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+                "reload" -> plugin.scriptLoader.scriptManager.reload(sender)
+                "load" -> if (args.size == 3) {
+                    plugin.scriptLoader.scriptManager.load(sender, args[2])
+                } else SubHelp(plugin).onCommand(command, sender, args)
+            }
         }
     }
 }

common/src/main/kotlin/top/alazeprt/aqqbot/scripts/ScriptManager.kt

@@ -83,8 +83,10 @@ class ScriptManager(val plugin: AQQBot) {
         sender.sendMessage(Component.text("[AQQBot] 尝试从 $url 下载脚本 ...").color(NamedTextColor.GREEN))
         val scriptFolder = plugin.getDataFolder().resolve("plugins")
         val tmpFile = scriptFolder.resolve(UUID.randomUUID().toString() + ".zip")
+        plugin.log(LogLevel.DEBUG, "Downloading plugin from $url to $tmpFile")
         ARemoteUtil.downloadToFile(url, tmpFile)
         sender.sendMessage(Component.text("[AQQBot] 解压文件中 ...").color(NamedTextColor.GREEN))
+        plugin.log(LogLevel.DEBUG, "Decompressing plugin $tmpFile")
         ACompressUtil.unzip(tmpFile, scriptFolder)
         sender.sendMessage(Component.text("[AQQBot] 尝试加载所有 plugins 文件夹内未加载的插件 ...").color(NamedTextColor.GREEN))
         val originList = plugin.scriptLoader.pluginList.map { it.directory }

common/src/main/kotlin/top/alazeprt/aqqbot/util/ACompressUtil.kt

@@ -3,6 +3,7 @@ package top.alazeprt.aqqbot.util
 import java.io.File
 import java.io.FileOutputStream
 import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.util.zip.ZipFile
 
 object ACompressUtil {
@@ -11,22 +12,22 @@ object ACompressUtil {
         Files.createDirectories(outputDir.toPath())
         require(outputDir.isDirectory) { "Failed to create directory: ${outputDir.absolutePath}" }
 
+        val outputPath = outputDir.toPath().normalize()
         ZipFile(file).use { zip ->
-            for (entry in zip.entries()) {
-                val targetFile = outputDir.resolve(entry.name).normalize().absoluteFile
-                require(targetFile.toPath().startsWith(outputDir.toPath().normalize())) {
-                    "Invalid entry name: ${entry.name}"
-                }
+            zip.entries().asSequence().forEach { entry ->
+                // 处理条目名称：移除开头的斜杠并替换分隔符
+                val entryName = entry.name.replace(Regex("^/"), "").replace('/', File.separatorChar)
+                val targetPath = outputPath.resolve(entryName).normalize()
+
+                // 安全检查：确保目标路径在输出目录内
+                require(targetPath.startsWith(outputPath)) { "Invalid entry name: ${entry.name}" }
 
                 if (entry.isDirectory) {
-                    targetFile.mkdirs()
+                    Files.createDirectories(targetPath)
                 } else {
-                    targetFile.parentFile?.mkdirs()
-
+                    Files.createDirectories(targetPath.parent)
                     zip.getInputStream(entry).use { input ->
-                        FileOutputStream(targetFile).use { output ->
-                            input.copyTo(output)
-                        }
+                        Files.copy(input, targetPath, StandardCopyOption.REPLACE_EXISTING)
                     }
                 }
             }

common/src/main/resources/messages.yml

@@ -69,6 +69,15 @@ game:
     - "&b/aqqbot whitelist unbind <qq|player> <数据>   &e给玩家解除绑定(qq: QQ号, player: 游戏名, 根据数据选择其一)"
     - "&b/aqqbot whitelist reset <qq|player> <数据>   &e清除玩家绑定的信息 (若为 player 则清除对应 QQ 号的所有绑定数据)"
     - "&b/aqqbot whitelist query/info <qq|player> <数据>   &e根据QQ号或游戏名查询对应的游戏名或QQ号"
+    - "&b/aqqbot market install <名称> <版本>   &e从市场安装指定名称的脚本插件"
+    - "&b/aqqbot market update <名称>   &e从市场更新指定名称的脚本插件"
+    - "&b/aqqbot market list   &e列出市场中所有可用的脚本插件"
+    - "&b/aqqbot market info <名称> [版本]   &e查看指定名称的脚本插件信息"
+    - "&b/aqqbot scripts download <URL地址>   &e从指定 URL 下载脚本插件"
+    - "&b/aqqbot scripts reload   &e重载所有脚本插件"
+    - "&b/aqqbot scripts info <名称>   &e查看指定名称的脚本插件信息"
+    - "&b/aqqbot scripts load <名称>   &e加载指定名称的脚本插件"
+    - "&b/aqqbot scripts info <名称>   &e查看指定名称的脚本插件信息"
     - "&b/aqqbot status   &e查看 AQQBot 插件状态"
     - "&b/aqqbot send <群号> <消息>   &e以机器人账号身份发送消息到 QQ 群"
     - "&b/aqqbot reload   &e重载配置文件"