Mirrors/SnapEnhance
1
0
Fork 0
mirror of https://github.com/rhunk/SnapEnhance.git synced 2025-05-29 21:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(scripting): function arguments

Browse Source
This commit is contained in:
rhunk 2024-05-27 22:05:49 +02:00
parent 7a23afaa82
commit 80fcdc2779
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/main/kotlin/me/rhunk/snapenhance/common/scripting/JSModule.kt
View File

@ -14,7 +14,6 @@ import me.rhunk.snapenhance.common.scripting.type.ModuleInfo
import me.rhunk.snapenhance.common.scripting.type.Permissions import me.rhunk.snapenhance.common.scripting.type.Permissions
import me.rhunk.snapenhance.common.scripting.ui.InterfaceManager import me.rhunk.snapenhance.common.scripting.ui.InterfaceManager
import org.mozilla.javascript.Function import org.mozilla.javascript.Function
import org.mozilla.javascript.NativeJavaObject
import org.mozilla.javascript.ScriptableObject import org.mozilla.javascript.ScriptableObject
import org.mozilla.javascript.Undefined import org.mozilla.javascript.Undefined
import org.mozilla.javascript.Wrapper import org.mozilla.javascript.Wrapper
@ -73,26 +72,21 @@ class JSModule(
) )
moduleObject.putFunction("setField") { args -> moduleObject.putFunction("setField") { args ->
val obj = args?.get(0) as? NativeJavaObject ?: return@putFunction Undefined.instance val obj = args?.get(0) ?: return@putFunction Undefined.instance
val name = args[1].toString() val name = args[1].toString()
val value = args[2].let { val value = args[2]
when (it) { val field = obj.javaClass.declaredFields.find { it.name == name } ?: return@putFunction Undefined.instance
is Wrapper -> it.unwrap()
else -> it
}
}
val field = obj.unwrap().javaClass.declaredFields.find { it.name == name } ?: return@putFunction Undefined.instance
field.isAccessible = true field.isAccessible = true
field.set(obj.unwrap(), value.toPrimitiveValue(lazy { field.type.name })) field.set(obj, value.toPrimitiveValue(lazy { field.type.name }))
Undefined.instance Undefined.instance
} }
moduleObject.putFunction("getField") { args -> moduleObject.putFunction("getField") { args ->
val obj = args?.get(0) as? NativeJavaObject ?: return@putFunction Undefined.instance val obj = args?.get(0) ?: return@putFunction Undefined.instance
val name = args[1].toString() val name = args[1].toString()
val field = obj.unwrap().javaClass.declaredFields.find { it.name == name } ?: return@putFunction Undefined.instance val field = obj.javaClass.declaredFields.find { it.name == name } ?: return@putFunction Undefined.instance
field.isAccessible = true field.isAccessible = true
field.get(obj.unwrap()) field.get(obj)
} }
moduleObject.putFunction("sleep") { args -> moduleObject.putFunction("sleep") { args ->
@ -126,7 +120,9 @@ class JSModule(
scriptableObject("JavaClassWrapper") { scriptableObject("JavaClassWrapper") {
putFunction("newInstance") newInstance@{ args -> putFunction("newInstance") newInstance@{ args ->
val constructor = clazz.declaredConstructors.find { val constructor = clazz.declaredConstructors.find {
it.parameterCount == (args?.size ?: 0) it.parameterTypes.zip(args ?: emptyArray()).all { (type, arg) ->
type.isAssignableFrom(arg?.javaClass ?: return@all false)
}
} ?: return@newInstance Undefined.instance } ?: return@newInstance Undefined.instance
constructor.newInstance(*args ?: emptyArray()) constructor.newInstance(*args ?: emptyArray())
} }

6
common/src/main/kotlin/me/rhunk/snapenhance/common/scripting/ktx/RhinoKtx.kt
View File

@ -42,7 +42,11 @@ fun ScriptableObject.putFunction(name: String, proxy: Scriptable.(Array<out Any?
thisObj: Scriptable, thisObj: Scriptable,
args: Array<out Any>? args: Array<out Any>?
): Any? { ): Any? {
return thisObj.proxy(args) return thisObj.proxy(args?.map {
if (it is Wrapper) {
it.unwrap()
} else it
}?.toTypedArray())
} }
}) })
} }