feat: v0.22.0

Signed-off-by: MiaoWoo <admin@yumc.pw>

Author: 502647092

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pw.yumc</groupId>
     <artifactId>MiaoScript</artifactId>
-    <version>0.21.2</version>
+    <version>0.22.0</version>
     <developers>
         <developer>
             <id>502647092</id>
@@ -50,6 +50,8 @@
     <properties>
         <env.GIT_COMMIT>DEV</env.GIT_COMMIT>
         <update.changes>
+            §622-05-21 §afeat: 优化 框架加载逻辑;
+            §622-05-20 §afeat: 调整 require 主包逻辑;
             §622-04-09 §afeat: 优化 引擎初始化逻辑;
             　　　　　　§afeat: 优化 require 网络加载;
             　　　　　　§afeat: 新增 JS 类型定义文件;
@@ -204,7 +206,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java

@@ -8,7 +8,7 @@
 import java.nio.file.Paths;
 
 public class MiaoScriptAPI {
-    public static final String VERSION = "0.21.2";
+    public static final String VERSION = "0.22.0";
     private static String root;
     private static String libPath;
     private static ScriptEngine scriptEngine;

src/main/java/pw/yumc/MiaoScript/api/loader/MavenDependLoader.java

@@ -55,7 +55,7 @@ public static void downloadFile(File target, String groupId, String artifactId,
                         ext)
         ).openConnection();
         connection.setConnectTimeout(5000);
-        connection.setReadTimeout(30000);
+        connection.setReadTimeout(120000);
         connection.setUseCaches(true);
         Files.copy(connection.getInputStream(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
     }

src/main/resources/bios.js

@@ -27,7 +27,8 @@ var global = this;
         logger.info("ScriptEngine: " + ScriptEngineContextHolder.getEngine().getEngine().class.name)
         var future = new FutureTask(function () {
             Thread.currentThread().contextClassLoader = loader
-            load(System.getenv("MS_NODE_CORE_POLYFILL") || 'classpath:core/polyfill.js')(root, logger)
+            var faster = load(System.getenv("MS_NODE_CORE_POLYFILL") || 'classpath:core/polyfill.js')(root, logger)
+            return faster.default ? require(System.getenv("MS_NODE_CORE_MODULE") || (global.scope + '/core')).default : false
         })
         // Async Loading MiaoScript Engine
         new Thread(future, "MiaoScript thread").start()
@@ -39,9 +40,11 @@ var global = this;
             logger.info("Waiting MiaoScript booted...")
         }
         // await polyfill loading
-        future.get()
+        // faster load core
+        var core = future.get()
         logger.info("MiaoScript booted starting...")
-        global.engineDisableImpl = require(System.getenv("MS_NODE_CORE_MODULE") || (global.scope + '/core')).default || function () {
+        var disable = core ? core.enable() : require(System.getenv("MS_NODE_CORE_MODULE") || (global.scope + '/core')).default
+        global.engineDisableImpl = disable || function () {
             logger.info('Error: abnormal Initialization MiaoScript Engine. Skip disable step...')
         }
     }
@@ -60,8 +63,12 @@ var global = this;
             global.debug = true
         }
         if (Files.exists(Paths.get(root, "level"))) {
-            global.level = base.read(Paths.get(root, "level"))
-            logger.info('set system level to [' + global.level + ']...')
+            global.ScriptEngineLoggerLevel = base.read(Paths.get(root, "level"))
+            logger.info('found level set ScriptEngineLoggerLevel to ' + global.ScriptEngineLoggerLevel + '.')
+        }
+        if (Files.exists(Paths.get(root, "channel"))) {
+            global.ScriptEngineChannel = base.read(Paths.get(root, "channel"))
+            logger.info('found channel set ScriptEngineChannel to ' + global.ScriptEngineChannel + '.')
         }
     }
 

src/main/resources/core/console.js

@@ -38,7 +38,7 @@
             log: log,
             info: log,
             ex: log,
-            trace: global.level === "trace" ? _proxy('TRACE') : global.noop,
+            trace: global.ScriptEngineLoggerLevel === "trace" ? _proxy('TRACE') : global.noop,
             debug: global.debug ? logger.debug ? debug : _proxy('DEBUG') : global.noop,
             warn: _proxy('WARN'),
             error: _proxy('ERROR')

src/main/resources/core/polyfill.js

@@ -5,6 +5,9 @@
      * @param {any} logger
      */
     function (root, logger) {
+        var System = Java.type('java.lang.System')
+        var Thread = Java.type('java.lang.Thread')
+
         // Init Global Value
         global.root = root
         global.logger = logger
@@ -21,9 +24,9 @@
             }
         }
         // Init console and require
-        global.console = engineLoad(java.lang.System.getenv("MS_NODE_CORE_CONSOLE") || 'classpath:core/console.js')(logger)
-        console.log("Loading Engine at Thread", java.lang.Thread.currentThread().name)
-        global.require = engineLoad(java.lang.System.getenv("MS_NODE_CORE_REQUIRE") || 'classpath:core/require.js')(root)
-        require(global.scope + '/polyfill')
+        global.console = engineLoad(System.getenv("MS_NODE_CORE_CONSOLE") || 'classpath:core/console.js')(logger)
+        console.log("Loading Engine at Thread", Thread.currentThread().name)
+        global.require = engineLoad(System.getenv("MS_NODE_CORE_REQUIRE") || 'classpath:core/require.js')(root)
+        return require(global.scope + '/polyfill')
     }
 )