v0.22.0

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

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.21.0",
+    "version": "0.22.0",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [
@@ -8,10 +8,6 @@
     "command": {
         "run": {
             "stream": true
-        },
-        "publish": {
-            "access": "public",
-            "registry": "https://repo.yumc.pw/repository/npm-hosted/"
         }
     }
 }

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,9 +19,9 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0",
+        "@ccms/container": "^0.22.0",
-        "@ccms/polyfill": "^0.21.0",
+        "@ccms/polyfill": "^0.22.0",
         "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },

packages/api/src/database.ts

@@ -35,6 +35,9 @@ export namespace database {
         abstract createDatabase(name: string, config: DataBaseConfig): DataBase
         abstract removeDatabase(name: string): boolean
         abstract getDatabase(name: string): DataBase
+        abstract startWebManager(...args: string[])
+        abstract stopWebManager()
+        abstract shutdown()
     }
     @injectable()
     export abstract class DataBase {

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",

packages/common/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/common",
-    "version": "0.21.0",
+    "version": "0.22.0",
-    "description": "MiaoScript api package",
+    "description": "MiaoScript common package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/common/src/version.ts

@@ -0,0 +1,35 @@
+export type Version = [string, string, string]
+
+export class VersionUtils {
+    static isEqual(version: string, targetVersion: string): boolean {
+        return version == targetVersion
+    }
+    static isGreaterOrEqual(version: string, targetVersion: string): boolean {
+        const v1 = parseVersion(version)
+        const v2 = parseVersion(targetVersion)
+
+        return (
+            v1[0] > v2[0] ||
+            (v1[0] === v2[0] && v1[1] > v2[1]) ||
+            (v1[0] === v2[0] && v1[1] === v2[1] && v1[2] >= v2[2])
+        )
+    }
+    static isGreater(version: string, targetVersion: string): boolean {
+        const v1 = parseVersion(version)
+        const v2 = parseVersion(targetVersion)
+
+        return (
+            v1[0] > v2[0] ||
+            (v1[0] === v2[0] && v1[1] > v2[1]) ||
+            (v1[0] === v2[0] && v1[1] === v2[1] && v1[2] > v2[2])
+        )
+    }
+}
+
+function parseVersion(version: string = ""): Version {
+    const v: Version = ['0', '0', '0']
+
+    version.split(".").forEach((value, i) => (v[i] = value))
+
+    return v
+}

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.6.3"

packages/container/src/index.ts

@@ -102,8 +102,8 @@ export const MavenDepend = (groupId: string, artifactId: string, version: string
 const loadedMavenDepend = new Set<string>()
 
 export function loadMavenDepend(groupId: string, artifactId: string, version: string, recursion = false) {
+    const key = `${groupId}:${artifactId}:${version}`
     try {
-        const key = `${groupId}:${artifactId}:${version}`
         if (loadedMavenDepend.has(key)) { return }
         console.info('loading maven dependency', key)
         let [pom, _] = base.loadMavenDepend(groupId, artifactId, version)
@@ -137,7 +137,7 @@ export function loadMavenDepend(groupId: string, artifactId: string, version: st
             }
         }
     } catch (error: any) {
-        console.warn('attachMavenDepend failed. Error: ' + error)
+        console.warn('load maven dependency', key, 'failed. Error:', error)
         if (global.debug) {
             console.ex(error)
         }

packages/core/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/core",
-    "version": "0.21.0",
+    "version": "0.22.0",
-    "description": "MiaoScript api package",
+    "description": "MiaoScript core package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -24,8 +24,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -6,6 +6,7 @@ console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() -
 import * as yaml from 'js-yaml'
 import http from '@ccms/common/dist/http'
 import * as fs from '@ccms/common/dist/fs'
+import { VersionUtils } from '@ccms/common/dist/version'
 
 const UUID = Java.type('java.util.UUID')
 
@@ -25,6 +26,11 @@ class MiaoScriptCore {
         this.loadServerConsole()
         this.loadPlugins()
         process.emit('core.after.enable')
+        console.i18n("ms.core.engine.completed", {
+            loader: base.version,
+            version: 'v' + global.ScriptEngineVersion,
+            time: (Date.now() - global.ScriptEngineStartTime) / 1000
+        })
         return () => this.disable()
     }
 
@@ -123,6 +129,30 @@ function loadMiaoScriptConfig() {
     global.ScriptSlowExecuteTime = global.ScriptEngineConfig.slow_execute || 50
 }
 
+function createCore() {
+    let corePackageStartTime = new Date().getTime()
+    container.bind(ContainerInstance).toConstantValue(container)
+    container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
+    container.bind(plugin.PluginFolder).toConstantValue('plugins')
+    let type = detectServer()
+
+    process.emit('core.before.initialize.detect')
+    console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
+    container.bind(server.ServerType).toConstantValue(type)
+    container.bind(server.ServerChecker).toSelf().inSingletonScope()
+    container.bind(server.NativePluginManager).toSelf().inSingletonScope()
+    process.emit('core.after.initialize.detect')
+
+    process.emit('core.before.package.initialize')
+    console.i18n("ms.core.package.initialize", { scope: global.scope, type })
+    require(`${global.scope}/${type}`).default(container)
+    require(`${global.scope}/plugin`)
+    container.load(buildProviderModule())
+    console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
+    process.emit('core.after.package.initialize')
+    return container.get<MiaoScriptCore>(MiaoScriptCore)
+}
+
 function initialize() {
     process.emit('core.before.initialize')
     loadMiaoScriptConfig()
@@ -130,43 +160,22 @@ function initialize() {
     global.setGlobal('loadCoreScript', loadCoreScript)
     loadCoreScript('initialize')
     try {
-        let corePackageStartTime = new Date().getTime()
+        let core = createCore()
-        container.bind(ContainerInstance).toConstantValue(container)
+        if (VersionUtils.isGreaterOrEqual(base.version, '0.22.0')) { return core }
-        container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
+        return core.enable()
-        container.bind(plugin.PluginFolder).toConstantValue('plugins')
-        let type = detectServer()
-
-        process.emit('core.before.initialize.detect')
-        console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
-        container.bind(server.ServerType).toConstantValue(type)
-        container.bind(server.ServerChecker).toSelf().inSingletonScope()
-        container.bind(server.NativePluginManager).toSelf().inSingletonScope()
-        process.emit('core.after.initialize.detect')
-
-        process.emit('core.before.package.initialize')
-        console.i18n("ms.core.package.initialize", { scope: global.scope, type })
-        require(`${global.scope}/${type}`).default(container)
-        require(`${global.scope}/plugin`)
-        container.load(buildProviderModule())
-        console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
-        process.emit('core.after.package.initialize')
-
-        let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-        console.i18n("ms.core.engine.completed", {
-            loader: base.version,
-            version: 'v' + global.ScriptEngineVersion,
-            time: (Date.now() - global.ScriptEngineStartTime) / 1000
-        })
-        process.emit('core.after.initialize')
-        return disable
     } catch (error: any) {
         if (console.console) {
-            console.i18n("ms.core.initialize.error", { error })
+            console.i18n("core.initialize.error", { error })
             console.ex(error)
         } else {
             error.printStackTrace()
         }
-        return () => console.i18n('ms.core.engine.disable.abnormal')
+        process.emit('core.initialize.error')
+        return {
+            enable: () => console.i18n('ms.core.engine.disable.abnormal')
+        }
+    } finally {
+        process.emit('core.after.initialize')
     }
 }
 

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/database/src/database.ts

@@ -1,6 +1,7 @@
 import { database } from '@ccms/api'
 import { JSClass, postConstruct } from '@ccms/container'
 
+const JavaString = Java.type('java.lang.String')
 const Properties = Java.type('java.util.Properties')
 
 /**
@@ -47,11 +48,11 @@ export class DataBase extends database.DataBase {
         } else {
             this.dataSource = dbConfig.url
         }
+        this.jdbcTemplate = new this.JdbcTemplate(this.dataSource)
     }
 
-    @postConstruct()
+    getDataSource() {
-    private initialize() {
+        return this.dataSource
-        this.jdbcTemplate = new this.JdbcTemplate(this.dataSource)
     }
 
     /**
@@ -62,7 +63,7 @@ export class DataBase extends database.DataBase {
     query<T>(sql: string, ...args: any[]): Array<T> {
         let startTime = Date.now()
         let result = Java.from<any>(this.jdbcTemplate.queryForList(sql, args))
-        console.debug(java.lang.String.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(JavaString.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
@@ -74,7 +75,7 @@ export class DataBase extends database.DataBase {
     update(sql: string, ...args: any[]): number {
         let startTime = Date.now()
         let result = this.jdbcTemplate.update(sql, args)
-        console.debug(java.lang.String.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(JavaString.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
@@ -85,7 +86,7 @@ export class DataBase extends database.DataBase {
     execute(sql: string): void {
         let startTime = Date.now()
         this.jdbcTemplate.execute(sql)
-        console.debug(java.lang.String.format(`\n[DB] execute \nSQL  : sql} \nCOST : ${Date.now() - startTime}ms`))
+        console.debug(`\n[DB] execute \nSQL  : ${sql} \nCOST : ${Date.now() - startTime}ms`)
     }
 
     close() {

packages/database/src/manager.ts

@@ -1,5 +1,5 @@
 import { database } from '@ccms/api'
-import { provideSingleton } from '@ccms/container'
+import { JSClass, provideSingleton } from '@ccms/container'
 import { DataBase } from './database'
 
 @provideSingleton(database.DataBaseManager)
@@ -7,11 +7,32 @@ export class DataBaseManager extends database.DataBaseManager {
     private mainDatabase: DataBase
     private databases = new Map<string, DataBase>()
 
+    @JSClass('org.h2.tools.Server')
+    private Server: any
+
+    private webManager: any
+
     constructor() {
         super()
-        process.on('exit', () => this.disable())
+        process.on('exit', () => this.shutdown())
     }
 
+    startWebManager(...args: string[]) {
+        this.webManager = this.Server.createWebServer(args)
+        this.webManager.start()
+    }
+
+    stopWebManager() {
+        if (this.webManager) {
+            this.webManager.stop()
+            this.webManager.shutdown()
+        }
+    }
+
+    shutdown() {
+        this.stopWebManager()
+        this.disable()
+    }
     /**
      * 设置主数据库
      * @param mainDatabase 主数据库

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "@types/js-yaml": "^4.0.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",

packages/molang/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/molang",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "A fast parser for Minecraft's MoLang",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

packages/nashorn/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.21.0",
+    "version": "0.22.0",
-    "description": "MiaoScript api package",
+    "description": "MiaoScript nashorn package",
     "keywords": [
         "miaoscript",
         "minecraft",

packages/nashorn/src/index.ts

@@ -48,7 +48,10 @@ declare global {
             scope: string
             logger: any
             debug: boolean
-            level: string
+            /**
+             * 引擎日志等级
+             */
+            ScriptEngineLoggerLevel: string
             /**
              * 引擎配置
              */

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "tslib": "^2.3.1",

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/plugin/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.21.0",
+    "version": "0.22.0",
-    "description": "MiaoScript api package",
+    "description": "MiaoScript plugin package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -26,10 +26,10 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0",
+        "@ccms/container": "^0.22.0",
-        "@ccms/i18n": "^0.21.0",
+        "@ccms/i18n": "^0.22.0",
         "@ccms/verify": "^0.21.1",
         "crypto-js": "^4.1.1",
         "js-yaml": "^4.1.0"

packages/polyfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/polyfill",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript polyfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "homepage": "https://github.com/circlecloud/ms.git",
@@ -14,12 +14,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/i18n": "^0.21.0",
+        "@ccms/i18n": "^0.22.0",
-        "@ccms/nodejs": "^0.21.0",
+        "@ccms/nodejs": "^0.22.0",
         "core-js": "^3.22.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.6.3"

packages/polyfill/src/index.ts

@@ -14,3 +14,4 @@ global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 global.setGlobal('Blob', require('blob-polyfill').Blob)
 console.i18n("ms.polyfill.completed", { time: (new Date().getTime() - polyfillStartTime) / 1000 })
+export default true

packages/polyfill/src/node-shim.ts

@@ -15,7 +15,7 @@ const DelayQueue = Java.type('java.util.concurrent.DelayQueue')
 const JavaScriptTask = Java.type(base.getJavaScriptTaskClass().name)
 
 const threadCount = new AtomicInteger(0)
-const threadGroup = new ThreadGroup("@ccms/ployfill-micro-task")
+const threadGroup = new ThreadGroup("@ccms/micro-task")
 const microTaskPool = new ThreadPoolExecutor(
     100, 200, 60, TimeUnit.SECONDS,
     new LinkedBlockingQueue(300),
@@ -76,16 +76,16 @@ class Process extends EventEmitter {
 class EventLoop {
     private eventLoopMainThread = undefined
     private eventLoopTaskQueue = new DelayQueue()
-    private taskExecTimeout = 3
+    private taskExecuteTimeout = 3000
     private fixedThreadPool = undefined
 
     constructor() {
-        this.taskExecTimeout = parseInt(process.env.MS_NODE_EVENT_LOOP_TIMEOUT) || 3
+        this.taskExecuteTimeout = parseInt(process.env.MS_TASK_EXECUTE_TIMEOUT) || 3000
         this.fixedThreadPool = new ThreadPoolExecutor(
             1, 1, 0, TimeUnit.SECONDS,
-            new LinkedBlockingQueue(300),
+            new LinkedBlockingQueue(500),
             new ThreadFactory((run: any) => {
-                let thread = new Thread(run, "@ccms/node-shim/event-loop-exec")
+                let thread = new Thread(run, "@ccms/event-loop")
                 thread.setDaemon(true)
                 return thread
             }))
@@ -115,7 +115,7 @@ class EventLoop {
                 this.intervalTasks = undefined
                 this.eventLoopMainThread = undefined
             }
-        }, "@ccms/node-shim/event-loop")
+        }, "@ccms/event-loop")
         this.eventLoopMainThread.setDaemon(true)
         process.on('exit', () => {
             this.eventLoopMainThread.interrupt()
@@ -137,7 +137,9 @@ class EventLoop {
         if (!callback) {
             throw new Error(`task ${name} callback function can't be null!`)
         }
-        if (this.fixedThreadPool.isShutdown()) { return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`) }
+        if (this.fixedThreadPool.isShutdown()) {
+            return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`)
+        }
         try {
             this.fixedThreadPool.submit(new Callable({
                 call: () => {
@@ -153,13 +155,13 @@ class EventLoop {
                         }
                     }
                 }
-            })).get(this.taskExecTimeout, TimeUnit.SECONDS)
+            })).get(this.taskExecuteTimeout, TimeUnit.MILLISECONDS)
         } catch (error: any) {
             if (error instanceof InterruptedException) {
                 return console.warn(`FixedThreadPool isInterrupted exit! Task ${name} exec exit!`)
             }
             if (error instanceof TimeoutException) {
-                return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecTimeout}s!`)
+                return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecuteTimeout}s!`)
             }
             throw error.getCause && error.getCause() || error
         }

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",

packages/sponge/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.21.0",
+    "version": "0.22.0",
-    "description": "MiaoScript api package",
+    "description": "MiaoScript sponge package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -24,9 +24,9 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/common": "^0.21.0",
+        "@ccms/common": "^0.22.0",
-        "@ccms/container": "^0.21.0",
+        "@ccms/container": "^0.22.0",
-        "@ccms/database": "^0.21.0"
+        "@ccms/database": "^0.22.0"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -29,7 +29,7 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.0",
+        "@ccms/api": "^0.22.0",
-        "@ccms/container": "^0.21.0"
+        "@ccms/container": "^0.22.0"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.21.0",
+    "version": "0.22.0",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -23,7 +23,7 @@
         "parseuri": "^0.0.6"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.0",
+        "@ccms/nashorn": "^0.22.0",
         "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",