⬆️ ScriptAgent 2.0 & Kotlin K2

Author: way-zer

build.gradle.kts

@@ -1,7 +1,8 @@
+import org.apache.tools.ant.filters.ReplaceTokens
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "2.1.10"
+    kotlin("jvm") version "2.3.0"
     id("me.qoomon.git-versioning") version "6.4.4"
     id("com.gradleup.shadow") version "8.3.6"
 }
@@ -78,7 +79,7 @@ dependencies.constraints {
     api("dev.folia:folia-api:$bukkitVersion")
 }
 dependencies {
-    val libraryVersion = "1.11.4.1"
+    val libraryVersion = "2.0.0"
     api("cf.wayzer:ScriptAgent:${libraryVersion}")
     implementation("cf.wayzer:LibraryManager:1.6")
 

buildSrc/src/Module.kt

@@ -1,44 +1,74 @@
 @file:Suppress("unused")
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.kotlin
 import org.gradle.kotlin.dsl.project
 
-class ModuleScope(val moduleId: String, private val project: Project, private val sourceSet: SourceSet) {
-    fun DependencyHandler.dependsModule(module: String, project: Project = this@ModuleScope.project) =
-        add(sourceSet.apiConfigurationName, project(project.path, module + "Exposed"))
+@DslMarker
+annotation class ModuleBuilderMarker
+
+@ModuleBuilderMarker
+class ModuleScope(val moduleId: String, val project: Project, val sourceSet: SourceSet) {
+    val exposedConfigurationName get() = sourceSet.apiConfigurationName.replace("Api", "Exposed")
+
+    fun DependencyHandler.dependsOnModule(module: String, project: Project = this@ModuleScope.project): Dependency? {
+        val sourceSet = project.sourceSets.getByName(mapIdToSourceSetName(module))
+        return dependsOn(ModuleScope(module, project, sourceSet))
+    }
+
+    fun DependencyHandler.dependsOn(module: ModuleScope): Dependency? {
+        return add(sourceSet.apiConfigurationName, project(module.project.path, module.exposedConfigurationName))
+    }
 
     fun DependencyHandler.api(dep: Any) = add(sourceSet.apiConfigurationName, dep)
     fun DependencyHandler.implementation(dep: Any) = add(sourceSet.implementationConfigurationName, dep)
 }
 
+private fun mapIdToSourceSetName(id: String) = id.replace('/', '.')
+
+@ModuleBuilderMarker
 fun Project.defineModule(
     name: String,
-    srcDir: String = name,
     body: ModuleScope.() -> Unit,
 ) {
-    val sourceSet = sourceSets.create(name) {
-        java.srcDir(srcDir)
-    }
-    val exposed = configurations.create(name + "Exposed") {
-        extendsFrom(configurations.getByName(name + "Api"))
-        isCanBeConsumed = true
-    }
-    dependencies.apply {
-        add(exposed.name, sourceSet.output)
+    val sourceSet = sourceSets.create(mapIdToSourceSetName(name)) {
+        java.srcDir(name)
     }
     ModuleScope(name, project, sourceSet).apply {
+        configurations.create(exposedConfigurationName) {
+            extendsFrom(configurations.getByName(sourceSet.apiConfigurationName))
+            isCanBeConsumed = true
+            isCanBeResolved = false
+        }
         dependencies.apply {
             implementation(kotlin("script-runtime"))
             implementation(rootProject)
+            add(exposedConfigurationName, sourceSet.output)
         }
         body()
     }
 }
 
+@ModuleBuilderMarker
+fun ModuleScope.subModule(name: String, body: ModuleScope.() -> Unit) {
+    val parent = this@subModule
+    val project = parent.project
+
+    val id = "${parent.moduleId}/$name"
+    parent.sourceSet.java.exclude("$name/**")
+    project.dependencies {
+        project.defineModule(id) {
+            dependsOn(parent)
+            body()
+        }
+    }
+}
+
 private val Project.sourceSets
     get() = project.extensions.getByType(
         SourceSetContainer::class.java

loader/mindustry/res/META-INF/kotlin/script/templates/.gitkeep

@@ -7,6 +7,7 @@ suspend fun boot() = ScriptManager.transaction {
 
     //add 添加需要加载的脚本(前缀判断) exclude 排除脚本(可以作为依赖被加载)
     addAll()
+    exclude("@")
     exclude("bootStrap/")
     exclude("coreLibrary/extApi/")//lazy load
     exclude("scratch")

scripts/bootStrap/default.kts

@@ -4,52 +4,59 @@ plugins {
     kotlin("jvm")
 }
 dependencies {
-    defineModule("kcp") {}
+    defineModule("kcp") {
+        //kcp/serialization
+        api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
+    }
     defineModule("bootStrap") {}
     defineModule("coreLibrary") {
         api("com.github.way-zer:PlaceHoldLib:v7.3")
         api("io.github.config4k:config4k:0.7.0")
         api("org.slf4j:slf4j-api:2.0.16")
-        //coreLib/kcp/serialization
-        api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
-        //coreLib/DBApi
-        val exposedVersion = "0.59.0"
-        api("org.jetbrains.exposed:exposed-core:$exposedVersion")
-        api("org.jetbrains.exposed:exposed-dao:$exposedVersion")
-        api("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
-        //coreLib/extApi/redisApi
-        api("redis.clients:jedis:4.3.1")
-        //coreLib/extApi/mongoApi
-        api("org.litote.kmongo:kmongo-coroutine:4.8.0")
-        implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-        //coreLib/extApi/KVStore
-        api("com.h2database:h2-mvstore:2.3.232")
+
+        subModule("db"){
+            val exposedVersion = "0.59.0"
+            api("org.jetbrains.exposed:exposed-core:$exposedVersion")
+            api("org.jetbrains.exposed:exposed-dao:$exposedVersion")
+            api("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
+        }
+
+        subModule("extApi"){
+            //coreLib/extApi/redisApi
+            api("redis.clients:jedis:4.3.1")
+            //coreLib/extApi/mongoApi
+            api("org.litote.kmongo:kmongo-coroutine:4.8.0")
+            implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+            //coreLib/extApi/KVStore
+            api("com.h2database:h2-mvstore:2.3.232")
+        }
     }
 
     defineModule("javalin") {
-        dependsModule("coreLibrary")
+        dependsOnModule("coreLibrary")
         api("io.javalin:javalin:6.7.0")
     }
 
     defineModule("coreMindustry") {
-        dependsModule("coreLibrary")
+        dependsOnModule("coreLibrary")
         api("com.github.TinyLake.MindustryX:core")
         //coreMindustry/console
         implementation("org.jline:jline-terminal:3.21.0")
         implementation("org.jline:jline-reader:3.21.0")
     }
     defineModule("scratch") {
-        dependsModule("coreLibrary")
+        dependsOnModule("coreLibrary")
     }
 
     defineModule("wayzer") {
-        dependsModule("coreMindustry")
+        dependsOnModule("coreMindustry")
+        dependsOnModule("coreLibrary/db")
         api("com.google.guava:guava:30.1-jre")
         //wayzer/ext/profiler
         implementation("tools.profiler:async-profiler:4.1")
     }
     defineModule("mapScript") {
-        dependsModule("wayzer")
+        dependsOnModule("wayzer")
     }
 }
 
@@ -60,7 +67,7 @@ allprojects {
                 "-Xinline-classes",
                 "-opt-in=kotlin.RequiresOptIn",
                 "-Xnullability-annotations=@arc.util:strict",
-                "-Xcontext-receivers",
+                "-Xcontext-parameters",
             )
         }
     }

scripts/build.gradle.kts

@@ -1,17 +1,20 @@
-package coreLibrary.extApi
+package coreLib.extApi
 
 import cf.wayzer.scriptAgent.Event
-import cf.wayzer.scriptAgent.contextScript
+import cf.wayzer.scriptAgent.define.SAExperimentalApi
+import cf.wayzer.scriptAgent.util.Services
+import coreLibrary.lib.all
 import java.io.Serializable
-import java.lang.ref.WeakReference
 
 @Suppress("unused")//Api
 abstract class RemoteEvent : Event, Serializable {
     private val handler0 get() = super.handler
     final override val handler: Event.Handler get() = error("You should use RemoteEvent.emit()")
 
     fun launchEmit() {
-        Impl.script.remoteEmit(this)
+        service.forEach {
+            it.remoteEmit(this)
+        }
     }
 
     internal suspend fun onReceive() {
@@ -21,12 +24,18 @@ abstract class RemoteEvent : Event, Serializable {
     abstract class Handler : Event.Handler() {
         init {
             val eventCls = javaClass.enclosingClass
-            Impl.classMap[eventCls.name] = WeakReference(eventCls)
+            service.forEach {
+                it.registerType(eventCls)
+            }
         }
     }
 
-    internal object Impl {
-        val script = contextScript<RemoteEventApi>()
-        val classMap = mutableMapOf<String, WeakReference<Class<*>>>()
+    interface Impl {
+        fun remoteEmit(event: RemoteEvent)
+        fun registerType(cls: Class<*>)
+    }
+    @OptIn(SAExperimentalApi::class)
+    companion object {
+        val service: List<Impl> by Services.get<Impl>().all
     }
 }

…coreLibrary/extApi/remoteEventApi.lib.kt …ts/coreLibrary/extApi/lib/RemoteEvent.ktscripts/coreLibrary/extApi/remoteEventApi.lib.kt renamed to scripts/coreLibrary/extApi/lib/RemoteEvent.kt scripts/coreLibrary/extApi/remoteEventApi.lib.kt renamed to scripts/coreLibrary/extApi/lib/RemoteEvent.kt

@@ -1,4 +1,5 @@
-@file:Depends("coreLibrary/extApi/redisApi", "基于redis")
+@file:Depends("coreLib/extApi/redisApi", "基于redis")
+@file:Import("./lib/RemoteEvent.kt")
 
 package coreLibrary.extApi
 
@@ -7,6 +8,7 @@ import java.io.*
 import java.util.logging.Level
 
 val group by config.key("_SA_RemoteEvent")
+val classMap = mutableMapOf<String, WeakReference<Class<*>>>()
 
 fun remoteEmit(event: RemoteEvent) = launch(Dispatchers.IO) {
     RedisApi.Redis.use {
@@ -17,6 +19,10 @@ fun remoteEmit(event: RemoteEvent) = launch(Dispatchers.IO) {
     }
 }
 
+fun registerType(cls: Class<*>) {
+    classMap[eventCls.name] = WeakReference(eventCls)
+}
+
 fun handleReceive(msg: ByteArray) {
     try {
         val event = object : ObjectInputStream(ByteArrayInputStream(msg)) {

scripts/coreLibrary/extApi/remoteEventApi.kts

@@ -110,9 +110,9 @@ typealias CommandHandlerOld = suspend CommandContext.() -> Unit
 
 fun interface CommandHandler {
     //Default only handle Command
-    context(CommandContext) fun canHandle() = context is CommandContext.Command
+    fun CommandContext.canHandle() = context is CommandContext.Command
 
-    context(CommandContext) suspend fun handle()
+    suspend fun CommandContext.handle()
 }
 
 @Deprecated("use CommandHandler.canHandle logic")
@@ -192,7 +192,7 @@ class CommandInfo(
         freeze()
     }
 
-    context(CommandContext) override fun canHandle(): Boolean =
+    override fun CommandContext.canHandle(): Boolean =
         context is CommandContext.TabComplete || body.canHandle()
 
     override suspend fun onComplete(context: CommandContext) {
@@ -212,19 +212,19 @@ class CommandInfo(
         (body as? TabCompleter)?.onComplete(context)
     }
 
-    context(CommandContext) override suspend fun handle() {
+    override suspend fun CommandContext.handle() {
         if (context is CommandContext.TabComplete)
             return onComplete(context)
         try {
             attrs.forEach { it.handle() }
             body.handle()
         } catch (e: CancellationException) {
             if (e !is Return)
-                thisContextScript().logger.log(
+                this.thisContextScript().logger.log(
                     Level.WARNING, "You should not cancel command. If you need exit, using CommandInfo.Return()", e
                 )
         } catch (e: Exception) {
-            reply("[red]执行命令出现异常: {msg}".with("msg" to (e.message ?: "")))
+            context.reply("[red]执行命令出现异常: {msg}".with("msg" to (e.message ?: "")))
             e.printStackTrace()
         }
     }
@@ -259,19 +259,19 @@ class CommandInfo(
     annotation class CommandBuilder
 }
 
-@Suppress("DEPRECATION", "SUPERTYPE_IS_SUSPEND_EXTENSION_FUNCTION_TYPE")
-open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
+@Suppress("DEPRECATION")
+open class Commands : CommandHandler, TabCompleter {
     fun interface Hidden : CommandHandler {
-        /** 当前命令是否可用, 用于[Commands.helpCommand]处理 */
-        context(CommandContext) suspend fun visible(): Boolean
-        context(CommandContext) override suspend fun handle() {
+        /** 当前命令是否可用, 用于[Commands]处理 */
+        suspend fun CommandContext.visible(): Boolean
+        override suspend fun CommandContext.handle() {
             if (!visible()) returnReply("[red]该命令当前不可用".with())
         }
     }
 
     data class Permission(val permission: String) : Hidden {
-        context(CommandContext) override suspend fun visible(): Boolean = hasPermission(permission)
-        context(CommandContext) override suspend fun handle() {
+        override suspend fun CommandContext.visible(): Boolean = hasPermission(permission)
+        override suspend fun CommandContext.handle() {
             if (!visible()) returnReply("[red]你没有执行该命令的权限".with())
         }
     }
@@ -281,11 +281,11 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
     open fun subCommands(): Map<String, CommandInfo> = nameMap
     fun getSub(name: String): CommandInfo? = subCommands()[name.lowercase()]
 
-    context(CommandContext) override fun canHandle(): Boolean = true
+    override fun CommandContext.canHandle(): Boolean = true
     override suspend fun onComplete(context: CommandContext) = context.run { handle() }
 
-    context(CommandContext) override suspend fun handle() {
-        context.onComplete(0) { subCommands().keys.toList() }
+    override suspend fun CommandContext.handle() {
+        onComplete(0) { subCommands().keys.toList() }
         if (arg.isEmpty()) return helpCommand.handle()
 
         val name = arg.first()
@@ -395,13 +395,6 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
         addSub(this)
     }
 
-    //compatibility for [CommandInfo.body]
-    @Deprecated(
-        "use CommandHandler instead", level = DeprecationLevel.ERROR,
-        replaceWith = ReplaceWith("this.handle()")
-    )
-    override suspend fun invoke(p1: CommandContext) = error("use CommandHandler")
-
     object Root : Commands() {
         init {
             this += CommandInfo(thisContextScript(), "ScriptAgent", "ScriptAgent 控制指令".with(), listOf("sa")).apply {
@@ -449,6 +442,13 @@ open class Commands : CommandHandler, TabCompleter, CommandHandlerOld {
     }
 }
 
+context(context: CommandContext)
+fun CommandHandler.canHandle() = context.canHandle()
+context(context: CommandContext)
+suspend inline fun CommandHandler.handle() = context.handle()
+context(context: CommandContext)
+suspend inline fun Commands.Hidden.visible() = context.visible()
+
 @ScriptDsl
 inline fun Script.command(
     name: String,