Merge pull request #15 from astorks/dev

astorks · web-flow · commit e65508f8ec1a · 2020-02-08T20:20:40.000-07:00
Dev -&gt; Master v1.1.7
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.pixlfox.scriptablemc"
-version = "1.1.6"
+version = "1.1.7"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginCommand.kt b/src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginCommand.kt
@@ -19,7 +19,7 @@ class ScriptablePluginCommand(private val basePlugin: ScriptablePluginMain) : Ba
 
     @Subcommand("info|i")
     @CommandPermission("scriptablemc.info")
-    fun onSmcInfo(player: Player) {
+    fun onSmcInfo(player: CommandSender) {
         val scriptEngine = basePlugin.scriptEngine
         val isGraalRuntime = scriptEngine?.evalJs("if (typeof Graal != 'undefined') { Graal.isGraalRuntime() } else { false }")?.asBoolean() == true
         player.sendMessage("${ChatColor.GREEN}ScriptableMC Version: ${basePlugin.description.version}")
@@ -36,14 +36,6 @@ class ScriptablePluginCommand(private val basePlugin: ScriptablePluginMain) : Ba
         MainMenu.INVENTORY.open(player)
     }
 
-}
-
-
-@Suppress("unused")
-@CommandAlias("scriptablemc|smc")
-@Subcommand("javascript|js")
-class ScriptablePluginJsCommand(private val basePlugin: ScriptablePluginMain) : BaseCommand() {
-
     @Subcommand("reload|rl")
     @CommandAlias("jsrl")
     @CommandPermission("scriptablemc.js.reload")
@@ -77,6 +69,14 @@ class ScriptablePluginJsCommand(private val basePlugin: ScriptablePluginMain) :
         }
     }
 
+}
+
+
+@Suppress("unused")
+@CommandAlias("scriptablemc|smc")
+@Subcommand("javascript|js")
+class ScriptablePluginJavaScriptCommand(private val basePlugin: ScriptablePluginMain) : BaseCommand() {
+
     @Subcommand("execute|ex")
     @CommandAlias("jsex")
     @CommandPermission("scriptablemc.js.execute")
@@ -136,4 +136,43 @@ class ScriptablePluginJsCommand(private val basePlugin: ScriptablePluginMain) :
         }
     }
 
+}
+
+@Suppress("unused")
+@CommandAlias("scriptablemc|smc")
+@Subcommand("typescript|ts")
+class ScriptablePluginTypeScriptCommand(private val basePlugin: ScriptablePluginMain) : BaseCommand() {
+
+    @Subcommand("reload|rl")
+    @CommandAlias("jsrl")
+    @CommandPermission("scriptablemc.js.reload")
+    fun onSmcJsReload(sender: CommandSender) {
+        basePlugin.patchClassLoader {
+            try {
+                basePlugin.scriptEngine!!.close()
+                basePlugin.logger.info("Scripting engine shutdown.")
+                basePlugin.reloadConfig()
+
+                basePlugin.scriptEngine = ScriptablePluginEngine(
+                    basePlugin,
+                    basePlugin.config.getString("root_scripts_folder", "./scripts").orEmpty(),
+                    basePlugin.config.getBoolean("debug", false),
+                    basePlugin.config.getBoolean("extract_libs", true)
+                )
+
+                basePlugin.scriptEngine!!.start()
+                basePlugin.logger.info("Scripting engine started.")
+
+                sender.sendMessage("Javascript engine reloaded.")
+            }
+            catch (e: Exception) {
+                e.printStackTrace()
+
+                sender.sendMessage("${ChatColor.DARK_RED}$e")
+                for (stackTrace in e.stackTrace) {
+                    sender.sendMessage("${ChatColor.DARK_RED}$stackTrace")
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginMain.kt b/src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginMain.kt
@@ -18,7 +18,8 @@ class ScriptablePluginMain : JavaPlugin(), Listener {
     override fun onEnable() {
         commandManager = PaperCommandManager(this)
         commandManager?.registerCommand(ScriptablePluginCommand(this))
-        commandManager?.registerCommand(ScriptablePluginJsCommand(this))
+        commandManager?.registerCommand(ScriptablePluginJavaScriptCommand(this))
+        commandManager?.registerCommand(ScriptablePluginTypeScriptCommand(this))
 
         patchClassLoader {
             saveDefaultConfig()
diff --git a/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt b/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt
@@ -25,6 +25,7 @@ class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFol
     private val jsBindings: Value = graalContext.getBindings("js")
     internal val scriptablePlugins: MutableList<ScriptablePluginContext> = mutableListOf()
     internal val inventoryManager: InventoryManager = InventoryManager(bootstrapPlugin)
+    private var enabledAllPlugins: Boolean = false
 
     internal fun start() {
         instance = this
@@ -39,19 +40,30 @@ class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFol
         if(extractLibs) {
             val librariesResource = bootstrapPlugin.getResource("libraries.zip")
             if (librariesResource != null) {
-                val unzipUtil = UnzipUtility()
-                unzipUtil.unzip(librariesResource, "${rootScriptsFolder}/lib")
+                UnzipUtility.unzip(librariesResource, "${rootScriptsFolder}/lib")
             }
         }
 
         if(mainScriptFile.exists()) {
-            eval(
+            val pluginTypes = eval(
                 Source.newBuilder("js", mainScriptFile)
                     .name("main.js")
                     .mimeType("application/javascript+module")
                     .interactive(false)
                     .build()
             )
+
+            // Load all plugin types returned as an array
+            if(pluginTypes.hasArrayElements()) {
+                for (i in 0..pluginTypes.arraySize) {
+                    this.loadPlugin(pluginTypes.getArrayElement(i))
+                }
+            }
+
+            // Enable all plugins if not already enabled
+            if(!enabledAllPlugins) {
+                enableAllPlugins()
+            }
         }
         else {
             throw ScriptNotFoundException(mainScriptFile)
@@ -110,18 +122,23 @@ class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFol
 
     fun evalCommandSenderJs(source: String, sender: CommandSender): Value {
         val tempScriptFile = File("${rootScriptsFolder}/${UUID.randomUUID()}.js")
-        tempScriptFile.writeText("import * as lib from './lib/global.js';\n" +
-                "new (class EvalCommandSenderContext {\n" +
-                "    run(sender, server, servicesManager) {\n" +
-                "        $source\n" +
-                "    }\n" +
-                "})()\n");
-        val evalCommandSenderContext = evalFile(tempScriptFile)
-        tempScriptFile.delete()
-        evalCommandSenderContext.putMember("sender", sender)
-        evalCommandSenderContext.putMember("server", Bukkit.getServer())
-        evalCommandSenderContext.putMember("servicesManager", Bukkit.getServicesManager())
-        return evalCommandSenderContext.invokeMember("run", sender, Bukkit.getServer(), Bukkit.getServicesManager());
+        try {
+            tempScriptFile.writeText("import * as lib from './lib/global.js';\n" +
+                    "new (class EvalCommandSenderContext {\n" +
+                    "    run(sender, server, servicesManager) {\n" +
+                    "        $source\n" +
+                    "    }\n" +
+                    "})()\n");
+            val evalCommandSenderContext = evalFile(tempScriptFile)
+
+            evalCommandSenderContext.putMember("sender", sender)
+            evalCommandSenderContext.putMember("server", Bukkit.getServer())
+            evalCommandSenderContext.putMember("servicesManager", Bukkit.getServicesManager())
+            return evalCommandSenderContext.invokeMember("run", sender, Bukkit.getServer(), Bukkit.getServicesManager())
+        }
+        finally {
+            tempScriptFile.delete()
+        }
     }
 
     fun eval(source: Source): Value {
@@ -142,6 +159,7 @@ class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFol
         for (pluginContext in scriptablePlugins) {
             pluginContext.enable()
         }
+        enabledAllPlugins = true
     }
 
     fun enablePlugin(pluginContext: ScriptablePluginContext) {
diff --git a/src/main/kotlin/com/pixlfox/scriptablemc/utils/MysqlWrapper.kt b/src/main/kotlin/com/pixlfox/scriptablemc/utils/MysqlWrapper.kt
@@ -7,7 +7,7 @@ import java.sql.DriverManager
 import java.sql.PreparedStatement
 import java.sql.Statement
 
-@Suppress("unused")
+@Suppress("unused", "MemberVisibilityCanBePrivate")
 class MysqlWrapper(private val host: String, private val port: Int, private val database: String, private val username: String, private val password: String) {
     private var connection: Connection? = null
 
diff --git a/src/main/kotlin/com/pixlfox/scriptablemc/utils/UnzipUtil.kt b/src/main/kotlin/com/pixlfox/scriptablemc/utils/UnzipUtil.kt
@@ -9,68 +9,69 @@ import java.util.zip.ZipInputStream
  * a destination directory.
  * @author www.codejava.net
  */
+@Suppress("unused")
 class UnzipUtility {
-    /**
-     * Extracts a zip file specified by the zipFilePath to a directory specified by
-     * destDirectory (will be created if does not exists)
-     * @param zipFilePath
-     * @param destDirectory
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    fun unzip(zipStream: InputStream, destDirectory: String) {
-        val destDir = File(destDirectory)
-        if (!destDir.exists()) {
-            destDir.mkdirs()
-        }
-        val zipIn = ZipInputStream(zipStream)
-        var entry = zipIn.nextEntry
-        // iterates over entries in the zip file
-        while (entry != null) {
-            val filePath = destDirectory + File.separator + entry.name
-            if (!entry.isDirectory) { // if the entry is a file, extracts it
-                extractFile(zipIn, filePath)
-            } else { // if the entry is a directory, make the directory
-                val dir = File(filePath)
-                dir.mkdir()
+    companion object {
+        /**
+         * Size of the buffer to read/write data
+         */
+        private const val BUFFER_SIZE = 4096
+
+        /**
+         * Extracts a zip file from the zipStream to a directory specified by
+         * destDirectory (will be created if does not exists)
+         * @param zipStream
+         * @param destDirectory
+         * @throws IOException
+         */
+        @Throws(IOException::class)
+        fun unzip(zipStream: InputStream, destDirectory: String) {
+            val destDir = File(destDirectory)
+            if (!destDir.exists()) {
+                destDir.mkdirs()
             }
-            zipIn.closeEntry()
-            entry = zipIn.nextEntry
+            val zipIn = ZipInputStream(zipStream)
+            var entry = zipIn.nextEntry
+            // iterates over entries in the zip file
+            while (entry != null) {
+                val filePath = destDirectory + File.separator + entry.name
+                if (!entry.isDirectory) { // if the entry is a file, extracts it
+                    extractFile(zipIn, filePath)
+                } else { // if the entry is a directory, make the directory
+                    val dir = File(filePath)
+                    dir.mkdir()
+                }
+                zipIn.closeEntry()
+                entry = zipIn.nextEntry
+            }
+            zipIn.close()
         }
-        zipIn.close()
-    }
 
-    /**
-     * Extracts a zip file specified by the zipFilePath to a directory specified by
-     * destDirectory (will be created if does not exists)
-     * @param zipFilePath
-     * @param destDirectory
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    fun unzip(zipFilePath: String, destDirectory: String) = unzip(FileInputStream(zipFilePath), destDirectory)
-
-    /**
-     * Extracts a zip entry (file entry)
-     * @param zipIn
-     * @param filePath
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun extractFile(zipIn: ZipInputStream, filePath: String) {
-        val bos = BufferedOutputStream(FileOutputStream(filePath))
-        val bytesIn = ByteArray(BUFFER_SIZE)
-        var read: Int
-        while (zipIn.read(bytesIn).also { read = it } != -1) {
-            bos.write(bytesIn, 0, read)
-        }
-        bos.close()
-    }
+        /**
+         * Extracts a zip file specified by the zipFilePath to a directory specified by
+         * destDirectory (will be created if does not exists)
+         * @param zipFilePath
+         * @param destDirectory
+         * @throws IOException
+         */
+        @Throws(IOException::class)
+        fun unzip(zipFilePath: String, destDirectory: String) = unzip(FileInputStream(zipFilePath), destDirectory)
 
-    companion object {
         /**
-         * Size of the buffer to read/write data
+         * Extracts a zip entry (file entry)
+         * @param zipIn
+         * @param filePath
+         * @throws IOException
          */
-        private const val BUFFER_SIZE = 4096
+        @Throws(IOException::class)
+        private fun extractFile(zipIn: ZipInputStream, filePath: String) {
+            val bos = BufferedOutputStream(FileOutputStream(filePath))
+            val bytesIn = ByteArray(BUFFER_SIZE)
+            var read: Int
+            while (zipIn.read(bytesIn).also { read = it } != -1) {
+                bos.write(bytesIn, 0, read)
+            }
+            bos.close()
+        }
     }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1,10 +1,13 @@
-# Root scripts folder default: ./scripts
+# Root scripts folder
 # Example inside plugin folder: ./plugins/ScriptableMC/scripts
+# Default: ./scripts
 root_scripts_folder: './scripts'
 
 # Prints some additional debugging messages
+# Default: false
 debug: false
 
 # Automatically extract js libraries to scripts lib folder if lib folder is missing
 # If you set this to false you'll need to download and extract the libs manually.
+# Default: true
 extract_libs: true
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,6 @@
 name: ScriptableMC
 description: 'Run JavaScript/TypeScript plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.1.6'
-api-version: '1.15'
+version: '1.1.7'
 author: AStorks
 main: com.pixlfox.scriptablemc.ScriptablePluginMain
 depend: []

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`group = "com.pixlfox.scriptablemc"`
`9`		`-version = "1.1.6"`
	`9`	`+version = "1.1.7"`
`10`	`10`
`11`	`11`	`java {`
`12`	`12`	`sourceCompatibility = JavaVersion.VERSION_1_8`