Merge pull request #13 from astorks/dev

v1.1.6 Dev -> Master

Author: astorks

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.pixlfox.scriptablemc"
-version = "1.1.5"
+version = "1.1.6"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginCommand.kt

@@ -57,7 +57,8 @@ class ScriptablePluginJsCommand(private val basePlugin: ScriptablePluginMain) :
                 basePlugin.scriptEngine = ScriptablePluginEngine(
                     basePlugin,
                     basePlugin.config.getString("root_scripts_folder", "./scripts").orEmpty(),
-                    basePlugin.config.getBoolean("debug", false)
+                    basePlugin.config.getBoolean("debug", false),
+                    basePlugin.config.getBoolean("extract_libs", true)
                 )
 
                 basePlugin.scriptEngine!!.start()

src/main/kotlin/com/pixlfox/scriptablemc/ScriptablePluginMain.kt

@@ -24,7 +24,7 @@ class ScriptablePluginMain : JavaPlugin(), Listener {
             saveDefaultConfig()
 
             try {
-                scriptEngine = ScriptablePluginEngine(this, config.getString("root_scripts_folder", "./scripts").orEmpty(), config.getBoolean("debug", false))
+                scriptEngine = ScriptablePluginEngine(this, config.getString("root_scripts_folder", "./scripts").orEmpty(), config.getBoolean("debug", false), config.getBoolean("extract_libs", true))
                 scriptEngine!!.start()
                 logger.info("Scriptable plugin engine started.")
             } catch (e: IllegalStateException) {

src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt

@@ -1,5 +1,6 @@
 package com.pixlfox.scriptablemc.core
 
+import com.pixlfox.scriptablemc.utils.UnzipUtility
 import fr.minuskube.inv.InventoryManager
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
@@ -11,7 +12,7 @@ import java.util.*
 
 
 @Suppress("MemberVisibilityCanBePrivate", "unused")
-class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFolder: String = "./scripts", val debugEnabled: Boolean = false): Listener {
+class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFolder: String = "./scripts", val debugEnabled: Boolean = false, val extractLibs: Boolean = true): Listener {
     private val graalContext: Context = Context
         .newBuilder()
         .allowAllAccess(true)
@@ -35,6 +36,14 @@ class ScriptablePluginEngine(val bootstrapPlugin: JavaPlugin, val rootScriptsFol
             mainScriptFile.parentFile.mkdirs()
         }
 
+        if(extractLibs) {
+            val librariesResource = bootstrapPlugin.getResource("libraries.zip")
+            if (librariesResource != null) {
+                val unzipUtil = UnzipUtility()
+                unzipUtil.unzip(librariesResource, "${rootScriptsFolder}/lib")
+            }
+        }
+
         if(mainScriptFile.exists()) {
             eval(
                 Source.newBuilder("js", mainScriptFile)

src/main/kotlin/com/pixlfox/scriptablemc/utils/UnzipUtil.kt

@@ -0,0 +1,76 @@
+package com.pixlfox.scriptablemc.utils
+
+import java.io.*
+import java.util.zip.ZipInputStream
+
+
+/**
+ * This utility extracts files and directories of a standard zip file to
+ * a destination directory.
+ * @author www.codejava.net
+ */
+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()
+            }
+            zipIn.closeEntry()
+            entry = zipIn.nextEntry
+        }
+        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()
+    }
+
+    companion object {
+        /**
+         * Size of the buffer to read/write data
+         */
+        private const val BUFFER_SIZE = 4096
+    }
+}

src/main/resources/config.yml

@@ -4,3 +4,7 @@ root_scripts_folder: './scripts'
 
 # Prints some additional debugging messages
 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.
+extract_libs: true

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: ScriptableMC
 description: 'Run JavaScript/TypeScript plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.1.5'
+version: '1.1.6'
 api-version: '1.15'
 author: AStorks
 main: com.pixlfox.scriptablemc.ScriptablePluginMain