diff --git a/simbot-cores/simbot-core-spring-boot-starter/src/test/kotlin/love/forte/simbot/spring/test/KeywordBinderTests.kt b/simbot-cores/simbot-core-spring-boot-starter/src/test/kotlin/love/forte/simbot/spring/test/KeywordBinderTests.kt
new file mode 100644
index 000000000..9b132c7bc
--- /dev/null
+++ b/simbot-cores/simbot-core-spring-boot-starter/src/test/kotlin/love/forte/simbot/spring/test/KeywordBinderTests.kt
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2024. ForteScarlet.
+ *
+ * Project https://github.com/simple-robot/simpler-robot
+ * Email ForteScarlet@163.com
+ *
+ * This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Lesser GNU General Public License for more details.
+ *
+ * You should have received a copy of the Lesser GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+package love.forte.simbot.spring.test
+
+import io.mockk.*
+import kotlinx.coroutines.test.runTest
+import love.forte.simbot.annotations.InternalSimbotAPI
+import love.forte.simbot.common.attribute.AttributeMapContainer
+import love.forte.simbot.common.attribute.mutableAttributeMapOf
+import love.forte.simbot.common.attribute.set
+import love.forte.simbot.event.EventListener
+import love.forte.simbot.event.EventListenerContext
+import love.forte.simbot.event.MessageEvent
+import love.forte.simbot.event.handleWith
+import love.forte.simbot.quantcat.common.annotations.Filter
+import love.forte.simbot.quantcat.common.annotations.FilterValue
+import love.forte.simbot.quantcat.common.binder.ParameterBinderFactory
+import love.forte.simbot.quantcat.common.binder.impl.KeywordBinderFactory
+import love.forte.simbot.quantcat.common.convert.NonConverters
+import love.forte.simbot.quantcat.common.keyword.KeywordListAttribute
+import love.forte.simbot.quantcat.common.keyword.SimpleKeyword
+import love.forte.simbot.spring.configuration.binder.DefaultBinderManagerProvidersConfiguration
+import love.forte.simbot.spring.configuration.listener.KFunctionEventListenerImpl
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.SpringBootConfiguration
+import org.springframework.boot.test.context.SpringBootTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+
+/**
+ *
+ * @author ForteScarlet
+ */
+@SpringBootTest(
+ classes = [
+ KeywordBinderTests::class,
+ DefaultBinderManagerProvidersConfiguration::class,
+ ]
+)
+@SpringBootConfiguration
+open class KeywordBinderTests {
+
+ @Suppress("MemberVisibilityCanBePrivate")
+ fun doParam(value: Int) {
+ println("param.value = $value")
+ }
+
+ @Filter("(?\\d+)num")
+ fun param(
+ @FilterValue("value")
+ value: Int
+ ) {
+ doParam(value)
+ }
+
+ @OptIn(InternalSimbotAPI::class)
+ @Test
+ fun keywordBinderTest(
+ @Autowired factory: KeywordBinderFactory
+ ) {
+ mockkObject(NonConverters)
+
+ val p = ::param.parameters.first()
+
+ val context = mockk()
+
+ every { context.parameter } returns p
+
+ val binderResult = factory.resolveToBinder(context)
+
+ val binder0 = binderResult.binder
+ assertNotNull(binder0)
+ val binder = spyk(binder0, recordPrivateCalls = true)
+
+ val binderContext = mockk(relaxed = true)
+ val event = mockk()
+ val listener = mockk(
+ moreInterfaces = arrayOf(AttributeMapContainer::class)
+ )
+
+ every { binderContext.listener } returns listener
+ every { binderContext.event } returns event
+
+ every {
+ (listener as AttributeMapContainer).attributeMap[KeywordListAttribute]
+ } returns mutableListOf(SimpleKeyword("(?\\d+)num", isPlainText = false))
+
+ every {
+ binderContext.plainText
+ } returns "123num"
+
+ val bindResult = binder.arg(binderContext)
+
+ verify { binder["convert"](any()) }
+ verify { NonConverters.convert(any(), any()) }
+
+ assertTrue(bindResult.isSuccess)
+ assertEquals(123, bindResult.getOrNull())
+ }
+
+
+ @Test
+ fun kFunctionListenerImplKeywordBinderTest(
+ @Autowired factory: KeywordBinderFactory
+ ) = runTest {
+ val instance = spyk()
+
+ val func = instance::param
+ val context = mockk()
+ every { context.parameter } returns func.parameters.first()
+ val binderResult = factory.resolveToBinder(context)
+ val binder = assertNotNull(binderResult.binder)
+
+ val listener = KFunctionEventListenerImpl(
+ instance = instance,
+ caller = func,
+ binders = arrayOf(binder),
+ attributes = mutableAttributeMapOf().apply {
+ set(
+ KeywordListAttribute,
+ mutableListOf(
+ SimpleKeyword("(?\\d+)num", isPlainText = false)
+ )
+ )
+ },
+ matcher = { true }
+ )
+
+ val ec = mockk(
+ relaxed = true
+ )
+ every { ec.listener } returns listener
+ every { ec.plainText } returns "123num"
+
+ listener.handleWith(ec)
+
+ verify { instance.doParam(any()) }
+ }
+
+}
diff --git a/simbot-quantcat/simbot-quantcat-common/src/commonMain/kotlin/love/forte/simbot/quantcat/common/convert/NonConverters.kt b/simbot-quantcat/simbot-quantcat-common/src/commonMain/kotlin/love/forte/simbot/quantcat/common/convert/NonConverters.kt
index c9f4c3392..4830ef1e1 100644
--- a/simbot-quantcat/simbot-quantcat-common/src/commonMain/kotlin/love/forte/simbot/quantcat/common/convert/NonConverters.kt
+++ b/simbot-quantcat/simbot-quantcat-common/src/commonMain/kotlin/love/forte/simbot/quantcat/common/convert/NonConverters.kt
@@ -23,6 +23,7 @@
package love.forte.simbot.quantcat.common.convert
+import love.forte.simbot.annotations.InternalSimbotAPI
import kotlin.reflect.KClass
import kotlin.reflect.cast
import kotlin.reflect.safeCast
@@ -32,7 +33,8 @@ import kotlin.reflect.safeCast
*
* @author ForteScarlet
*/
-internal object NonConverters {
+@InternalSimbotAPI
+public object NonConverters {
private val primitives: Set> = setOf(
Byte::class, Short::class, Int::class, Long::class,
UInt::class, ULong::class,
@@ -45,7 +47,7 @@ internal object NonConverters {
*
* @throws ConvertException if [type 'to'][TO] is not assignable from [type 'from'][FROM]
*/
- fun convert(instance: FROM, to: KClass): TO {
+ public fun convert(instance: FROM, to: KClass): TO {
val fromType: KClass = instance::class
val safeCast: TO? = to.safeCast(instance)
diff --git a/simbot-quantcat/simbot-quantcat-common/src/jvmMain/kotlin/love/forte/simbot/quantcat/common/binder/impl/KeywordBinder.kt b/simbot-quantcat/simbot-quantcat-common/src/jvmMain/kotlin/love/forte/simbot/quantcat/common/binder/impl/KeywordBinder.kt
index 45cc92425..adb626dfc 100644
--- a/simbot-quantcat/simbot-quantcat-common/src/jvmMain/kotlin/love/forte/simbot/quantcat/common/binder/impl/KeywordBinder.kt
+++ b/simbot-quantcat/simbot-quantcat-common/src/jvmMain/kotlin/love/forte/simbot/quantcat/common/binder/impl/KeywordBinder.kt
@@ -23,6 +23,7 @@
package love.forte.simbot.quantcat.common.binder.impl
+import love.forte.simbot.annotations.InternalSimbotAPI
import love.forte.simbot.common.attribute.AttributeMapContainer
import love.forte.simbot.event.EventListenerContext
import love.forte.simbot.quantcat.common.binder.BindException
@@ -46,7 +47,7 @@ public class KeywordBinderFactory(
) : ParameterBinderFactory {
override fun resolveToBinder(context: ParameterBinderFactory.Context): ParameterBinderResult {
val value = filterValueReader(context) ?: return ParameterBinderResult.empty()
- val paramType = context.parameter.type as? KClass<*>
+ val paramType = context.parameter.type.classifier as? KClass<*>
return ParameterBinderResult.normal(
if (value.required) {
KeywordBinder.Required(value.value, paramType)
@@ -60,6 +61,7 @@ public class KeywordBinderFactory(
private sealed class KeywordBinder(val name: String, val paramType: KClass<*>?) : ParameterBinder {
+ @OptIn(InternalSimbotAPI::class)
private val converter: (Any) -> Any = if (paramType != null && paramType != String::class) {
{
NonConverters.convert(instance = it, to = paramType)
diff --git a/website b/website
index c8b40dbf5..ddfbdb4dd 160000
--- a/website
+++ b/website
@@ -1 +1 @@
-Subproject commit c8b40dbf5764d3ab251b6545157ab5b29b891f24
+Subproject commit ddfbdb4dd9d46a9c49ebe3e8f8b4537bc836bbc4