Completed JavaScript Module.

Author: Score2

common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt

@@ -2,6 +2,7 @@ package me.scoretwo.fastscript
 
 import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
+import me.scoretwo.fastscript.api.script.AbstractScript
 import me.scoretwo.fastscript.command.ScriptCommandNexus
 import me.scoretwo.fastscript.config.SettingConfig
 import me.scoretwo.fastscript.script.ScriptManager
@@ -103,7 +104,8 @@ class FastScript(val plugin: ScriptPlugin) {
     }
 
 }
-lateinit var plugin: GlobalPlugin
+lateinit var plugin: ScriptPlugin
+val scripts = mutableListOf<AbstractScript>()
 
 fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorIndex: Boolean = true) {
     strings.forEach {

common/src/main/kotlin/me/scoretwo/fastscript/addon/javascript/JavaScript.kt

@@ -1,25 +1,65 @@
 package me.scoretwo.fastscript.addon.javascript
 
 import me.scoretwo.fastscript.FastScript
+import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.script.ConfigScriptOptions
 import me.scoretwo.fastscript.api.script.FileScript
 import me.scoretwo.fastscript.api.script.ScriptDescription
 import me.scoretwo.fastscript.plugin
+import me.scoretwo.fastscript.sendMessage
+import me.scoretwo.utils.syntaxes.readString
 import java.io.File
+import javax.script.Invocable
+import javax.script.ScriptEngine
 import javax.script.ScriptEngineManager
+import javax.script.ScriptException
 
 class JavaScript(
     description: ScriptDescription,
     val options: JavaScriptOptions,
     files: MutableList<File>
 ): FileScript(description, options, files) {
 
-    val engine = ScriptEngineManager(plugin.pluginClassLoader).getEngineByName(options.engine)
+    val engine: ScriptEngine
+    val mergedString: String
 
     init {
+        mergedString = StringBuilder().also { builder ->
+            files.forEach {
+                builder.append(it.readString())
+                builder.append("\n")
+            }
+        }.toString()
+        engine = ScriptEngineManager(plugin.pluginClassLoader).getEngineByName(options.engine)
 
+        options.includes.forEach {
+            engine.put(it.key, it.value[this])
+        }
+        meta.forEach {
+            engine.put(it.key, it.value)
+        }
+        engine.put("api", plugin.abstractScriptUtils)
     }
+    fun directEval(): Any? {
+        return try {
+            engine.eval(mergedString)
+        } catch (e: ScriptException) {
+            plugin.server.console.sendMessage(FormatHeader.ERROR,"脚本 §c${description.name} §7解析时出现错误, 请检查脚本格式.")
+        }
+    }
+
+    fun execute(function: String = options.main, args: Array<Any?> = arrayOf()): Any? {
+        /*if (engine !is Invocable)*/
+        return try {
+            directEval()
 
+            val invocable = engine as Invocable
+
+            invocable.invokeFunction(function, *args)
+        } catch (e: Exception) {
+            plugin.server.console.sendMessage(FormatHeader.ERROR,"脚本 §c${description.name} §7执行函数 $function 时发生错误.")
+        }
+    }
 
 
 }

common/src/main/kotlin/me/scoretwo/fastscript/addon/javascript/ScriptInclude.kt

@@ -5,7 +5,7 @@ import me.scoretwo.fastscript.addon.javascript.exception.IncludeFormatException
 import me.scoretwo.fastscript.addon.javascript.exception.TypeInferenceException
 import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.plugin
-import me.scoretwo.fastscript.utils.sendMessage
+import me.scoretwo.fastscript.sendMessage
 import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import java.lang.reflect.Method
@@ -31,7 +31,7 @@ class ScriptInclude(
         } else this.type = type
     }
 
-    fun get(script: JavaScript): Any? {
+    operator fun get(script: JavaScript): Any? {
         obj ?: throw IncludeFormatException()
         met ?: throw IncludeFormatException()
         val clazz = findClass(script, obj.first) ?: throw ClassNotFoundException()

common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/ScriptPlugin.kt

@@ -1,5 +1,6 @@
 package me.scoretwo.fastscript.api.plugin
 
+import me.scoretwo.fastscript.api.utils.AbstractScriptUtils
 import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.plugin.PluginDescription
 import me.scoretwo.utils.plugin.logging.GlobalLogger
@@ -11,6 +12,8 @@ abstract class ScriptPlugin(plugin: GlobalPlugin): GlobalPlugin {
 
     abstract fun setPlaceholder(player: GlobalPlayer, string: String): String
 
+    abstract val abstractScriptUtils: AbstractScriptUtils
+
     open fun load() {}
     open fun reload() {}
     open fun enable() {}

common/src/main/kotlin/me/scoretwo/fastscript/api/utils/AbstractScriptUtils.kt

@@ -0,0 +1,14 @@
+package me.scoretwo.fastscript.api.utils
+
+import me.scoretwo.utils.sender.GlobalPlayer
+import me.scoretwo.utils.sender.GlobalSender
+import me.scoretwo.utils.server.GlobalServer
+
+abstract class AbstractScriptUtils {
+
+    abstract fun toSender(sender: GlobalSender): Any?
+    abstract fun toPlayer(player: GlobalPlayer): Any?
+    abstract fun toServer(): Any?
+
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/utils/ScriptKits.kt

@@ -6,13 +6,19 @@ import me.scoretwo.utils.sender.GlobalSender
 
 class ScriptCommand: SubCommand(plugin, arrayOf("script")) {
 
+    init {
 
+    }
 
     override fun executed(sender: GlobalSender, parents: MutableList<String>, args: MutableList<String>): Boolean {
         if (args.isEmpty()) {
             // list script
+            return true
         }
 
+        if (args[0] == "") {
+
+        }
 
 
         return true

common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ScriptCommand.kt

@@ -3,12 +3,18 @@ package me.scoretwo.fastscript.bukkit
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
+import me.scoretwo.fastscript.api.utils.AbstractScriptUtils
 import me.scoretwo.fastscript.bukkit.hook.PlaceholderAPIHook
+import me.scoretwo.fastscript.sendMessage
 import me.scoretwo.utils.bukkit.command.bukkitCommandMap
 import me.scoretwo.utils.bukkit.command.toBukkitPlayer
+import me.scoretwo.utils.bukkit.command.toBukkitSender
+import me.scoretwo.utils.bukkit.command.toGlobalSender
 import me.scoretwo.utils.bukkit.plugin.toBukkitPlugin
 import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.sender.GlobalPlayer
+import me.scoretwo.utils.sender.GlobalSender
+import me.scoretwo.utils.server.GlobalServer
 import org.bukkit.Bukkit
 import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
@@ -22,16 +28,24 @@ class BukkitPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
     override fun enable() {
         bukkitCommandMap.register(description.name, object : Command(description.name, "", "/" + description.name, listOf("script","bukkitScript")) {
             override fun execute(sender: CommandSender, label: String, args: Array<String>): Boolean {
-                FastScript.instance.commandManager.execute(sender, args)
+                FastScript.instance.commandNexus.execute(sender.toGlobalSender(), mutableListOf(label), args.toMutableList())
                 return true
             }
 
             override fun tabComplete(sender: CommandSender, alias: String, args: Array<String>): MutableList<String> {
-                return FastScript.instance.commandManager.tabComplete(sender, args)
+                return FastScript.instance.commandNexus.tabComplete(sender.toGlobalSender(), mutableListOf(label), args.toMutableList()) ?: mutableListOf()
             }
         })
     }
 
+    override val abstractScriptUtils = object : AbstractScriptUtils() {
+        override fun toSender(sender: GlobalSender) = sender.toBukkitSender()
+        override fun toPlayer(player: GlobalPlayer) = player.toBukkitPlayer()
+
+        override fun toServer() = Bukkit.getServer()
+
+    }
+
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {
         var text: String = string
         if (PAPIHook != null) {