v0.14.0

chorn: update depends version
Signed-off-by: MiaoWoo <admin@yumc.pw>
2021-03-26 17:20:41 +08:00 · 2021-03-26 17:20:22 +08:00 · 2021-03-26 16:43:45 +08:00 · 2021-03-26 16:43:14 +08:00 · 2021-03-26 16:42:45 +08:00 · 2021-03-26 16:42:02 +08:00
69 changed files with 1737 additions and 298 deletions
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.12.0",
+    "version": "0.14.0",
    "useWorkspaces": true,
    "npmClient": "yarn",
    "packages": [
--- a/package.json
+++ b/package.json
@@ -20,6 +20,6 @@
        "packages/*"
    ],
    "devDependencies": {
-        "lerna": "^3.22.1"
+        "lerna": "^4.0.0"
    }
 }
--- a/packages/amqp/package.json
+++ b/packages/amqp/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/amqp",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript amqp package",
    "keywords": [
        "miaoscript",
@@ -19,17 +19,17 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "@javatypes/amqp-client": "^0.0.3",
        "@javatypes/spring-amqp": "^0.0.3",
        "@javatypes/spring-rabbit": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/api",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,9 +19,9 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0",
-        "@ccms/ployfill": "^0.12.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0",
+        "@ccms/polyfill": "^0.14.0",
        "base64-js": "^1.5.1",
        "source-map-builder": "^0.0.7"
    },
@@ -29,6 +29,6 @@
        "@types/base64-js": "^1.3.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/api/src/console.ts
+++ b/packages/api/src/console.ts
@@ -91,7 +91,7 @@ export class MiaoScriptConsole implements Console {
    ex(ex: Error) {
        this.stack(ex).forEach(line => this.console(line))
    }
-    readSourceMap(fileName: string, lineNumber: number) {
+    readSourceMap(fileName: string, lineNumber: any) {
        try {
            if (fileName.endsWith('js')) {
                if (MiaoScriptConsole.sourceMaps[fileName] === undefined) {
@@ -154,9 +154,10 @@ export class MiaoScriptConsole implements Console {
            } else {
                let className = trace.className
                var fileName = trace.fileName as string
+                var lineNumber = trace.lineNumber
                if (className.startsWith('jdk.nashorn.internal.scripts')) {
                    className = className.substr(className.lastIndexOf('$') + 1)
-                    var { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
+                    var { fileName, lineNumber } = this.readSourceMap(fileName, lineNumber)
                    if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
                } else {
                    if (!global.debug) {
--- a/packages/bukkit/package.json
+++ b/packages/bukkit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/bukkit",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript bukkit package",
    "keywords": [
        "miaoscript",
@@ -22,11 +22,11 @@
        "@javatypes/spigot-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/bungee/package.json
+++ b/packages/bungee/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/bungee",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript bungee package",
    "keywords": [
        "miaoscript",
@@ -22,11 +22,11 @@
        "@javatypes/bungee-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "@ccms/client",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript client package",
    "keywords": [
        "miaoscript",
@@ -22,10 +22,10 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "minecraft-protocol": "^1.19.0"
+        "minecraft-protocol": "^1.24.1"
    },
    "devDependencies": {
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -4,10 +4,12 @@ import { createClient } from 'minecraft-protocol'
 import { attachForge } from './forge'
 import { attachEvents } from './event'

-let username = process.argv[2] || 'Mr_jtb'
-let password = process.argv[3] || ''
-let version = process.argv[4] || '1.12.2'
-let readAddress = process.argv[5] || '192.168.2.5:25577'
+let readUserInfo = process.argv[2] || 'Mr_jtb'
+let realUserInfo = readUserInfo.split(":")
+let username = realUserInfo[0]
+let password = realUserInfo[1] || ''
+let version = process.argv[3] || '1.12.2'
+let readAddress = process.argv[4] || '192.168.2.25:25565'
 let realAddress = readAddress.split(":")
 let address = realAddress[0]
 let port = parseInt(realAddress[1] || "25565")
@@ -18,17 +20,23 @@ function commandLineCreateClient() {
 }

 function createConnection(host: string, port: number, username: string, password: string) {
-    let client = createClient({
+    let clientOptions: any = {
        version,
        host,
        port,
        username,
        password,
-        clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
+        // clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
        //@ts-ignore
-        authServer: 'https://mcsso.yumc.pw/api/yggdrasil/authserver',
-        sessionServer: 'https://mcsso.yumc.pw/api/yggdrasil/sessionserver'
-    })
+        // authServer: 'https://skin.yumc.pw/api/yggdrasil/authserver',
+        // sessionServer: 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    if (clientOptions.password) {
+        clientOptions.clientToken = 'd02c7f39-2376-45da-a5a5-50e24fa8b185'
+        clientOptions.authServer = 'https://skin.yumc.pw/api/yggdrasil/authserver'
+        clientOptions.sessionServer = 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    let client = createClient(clientOptions)

    attachCommon(client)
    attachForge(client)
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/common",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,11 +19,11 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "@javatypes/jdk": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }
--- a/packages/compile/package.json
+++ b/packages/compile/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/compile",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript compile package",
    "keywords": [
        "miaoscript",
@@ -21,6 +21,6 @@
    "devDependencies": {
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/container/package.json
+++ b/packages/container/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/container",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript container package",
    "keywords": [
        "miaoscript",
@@ -19,13 +19,13 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "inversify": "^5.0.1",
+        "inversify": "^5.0.5",
        "inversify-binding-decorators": "^4.0.0"
    }
 }
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/core",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -21,11 +21,11 @@
    "devDependencies": {
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    },
    "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/database",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript database package",
    "keywords": [
        "miaoscript",
@@ -22,10 +22,10 @@
        "@javatypes/spring-jdbc": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/i18n/languages/en.yml
+++ b/packages/i18n/languages/en.yml
@@ -1,6 +1,6 @@
 ms.i18n.completed: "Internationalization component initialization completed. Current Language: English"
-ms.ployfill.initialize: "Initialization Java Nashorn ployfill. Please wait..."
-ms.ployfill.completed: "Java Nashorn ployfill loading completed... Cost ({time}s)!"
+ms.polyfill.initialize: "Initialization Java Nashorn polyfill. Please wait..."
+ms.polyfill.completed: "Java Nashorn polyfill loading completed... Cost ({time}s)!"

 ms.core.ioc.initialize: "Initialization MiaoScript IOC Container {scope}/container. Please wait..."
 ms.core.ioc.completed: "MiaoScript IOC Container {scope}/container loading completed({time}s)!"
@@ -31,7 +31,8 @@ ms.api.command.tab.completer.error: "§6Player {player} §6exec §b{plugin} §6P

 ms.plugin.initialize: "Initialization MiaoScript Plugin System: Plugin: {plugin} Loader: {loader}..."
 ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."
-ms.plugin.manager.scan: "Scanning Plugins in {folder} ..."
+ms.plugin.manager.scan: "Scanner {scanner} Scanning Plugins in {folder} ..."
+ms.plugin.manager.scan.finish: "Scanner {scanner} Found {size} Plugins in {folder} Start Build..."
 ms.plugin.manager.initialize.error: "§6Plugin §b{name} §6initialize error §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} version {version} by {author}"
 ms.plugin.manager.stage.exec: "[{plugin}] Exec {name} Stage {stage} When servers is {servers}..."
@@ -39,6 +40,7 @@ ms.plugin.manager.stage.exec.error: "§6Plugin §b{plugin} §6exec §d{executor}
 ms.plugin.manager.stage.load: "Loading"
 ms.plugin.manager.stage.enable: "Enabling"
 ms.plugin.manager.stage.disable: "Disabling"
+ms.plugin.manager.build: "Plugin {name}({version}) Build Finish source: {file}({scanner}) loader: {loader} Cost: {cost}s."
 ms.plugin.manager.build.error: "§6Load Plugin From §b{file} §6failed. §4Error: §c{error}"
 ms.plugin.manager.build.update: "Auto Update Plugin {name} ..."
 ms.plugin.manager.build.not.extends: "§4Found error plugin §b{source} §4it's not extends interfaces.Plugin, the plugin will be ignore!"
--- a/packages/i18n/languages/zh_cn.yml
+++ b/packages/i18n/languages/zh_cn.yml
@@ -1,6 +1,6 @@
 ms.i18n.completed: "国际化组件 初始化完成 当前语言: 简体中文"
-ms.ployfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
-ms.ployfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
+ms.polyfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
+ms.polyfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"

 ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 {scope}/container. 请稍候..."
 ms.core.ioc.completed: "MiaoScript IOC 容器 {scope}/container 加载完成 耗时({time}s)"
@@ -32,7 +32,8 @@ ms.api.command.tab.completer.error: "§6玩家 §a{player} §6执行 §b{plugin}

 ms.plugin.initialize: "初始化 MiaoScript 插件系统: 实例: {plugin} 加载器: {loader}..."
 ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
-ms.plugin.manager.scan: "扫描 {folder} 文件夹中插件..."
+ms.plugin.manager.scan: "扫描器 {scanner} 扫描 {folder} 中的插件..."
+ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始构建..."
 ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} 版本 {version} 作者 {author}"
 ms.plugin.manager.stage.exec: "[{plugin}] 执行 {stage} 阶段函数 {name} 匹配类型 {servers}..."
@@ -40,6 +41,7 @@ ms.plugin.manager.stage.exec.error: "§6插件 §b{plugin} §6执行 §d{executo
 ms.plugin.manager.stage.load: "加载"
 ms.plugin.manager.stage.enable: "启用"
 ms.plugin.manager.stage.disable: "关闭"
+ms.plugin.manager.build: "插件 {name}({version}) 构建完成 来源: {file}({scanner}) 引导: {loader} 构建耗时: {cost}s."
 ms.plugin.manager.build.error: "§6从文件 §b{file} §6加载插件失败 §4错误: §c{error}"
 ms.plugin.manager.build.update: "自动更新插件 {name} ..."
 ms.plugin.manager.build.not.extends: "§4发现错误的插件 §b{source} §4未继承接口 interfaces.Plugin, 将不会被载入到服务器!"
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/i18n",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript i18n package",
    "keywords": [
        "miaoscript",
@@ -19,14 +19,14 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
-        "@types/js-yaml": "^3.12.5",
+        "@ccms/nashorn": "^0.14.0",
+        "@types/js-yaml": "^4.0.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "js-yaml": "^3.14.0"
+        "js-yaml": "^4.0.0"
    },
    "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }
--- a/packages/keyvalue/package.json
+++ b/packages/keyvalue/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/keyvalue",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript keyvalue package",
    "keywords": [
        "miaoscript",
@@ -19,18 +19,18 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "@javatypes/amqp-client": "^0.0.3",
        "@javatypes/spring-amqp": "^0.0.3",
        "@javatypes/spring-rabbit": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
 }
--- a/packages/nashorn/package.json
+++ b/packages/nashorn/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nashorn",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -22,6 +22,6 @@
    "devDependencies": {
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/nodejs/package.json
+++ b/packages/nodejs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nodejs",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript nodejs package",
    "keywords": [
        "miaoscript",
@@ -19,10 +19,10 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }
--- a/packages/nukkit/package.json
+++ b/packages/nukkit/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/nukkit",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript nukkit package",
    "keywords": [
        "miaoscript",
@@ -22,11 +22,11 @@
        "@javatypes/nukkit-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/plugin",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -19,16 +19,16 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@types/js-yaml": "^3.12.5",
+        "@types/js-yaml": "^4.0.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0",
-        "@ccms/i18n": "^0.12.0",
-        "js-yaml": "^3.14.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0",
+        "@ccms/i18n": "^0.14.0",
+        "js-yaml": "^4.0.0"
    }
 }
--- a/packages/plugin/src/config.ts
+++ b/packages/plugin/src/config.ts
@@ -92,6 +92,16 @@ export class PluginConfigManager {
            } else {
                value = configLoader.load(base.read(metadata.file))
                console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>\n${JSON.stringify(value, undefined, 4)}`)
+                if (metadata.default) {
+                    let needSave = false
+                    for (const key of Object.keys(metadata.default)) {
+                        if (value[key] == undefined) {
+                            value[key] = metadata.default[key]
+                            needSave = true
+                        }
+                    }
+                    needSave && base.save(metadata.file, configLoader.dump(value))
+                }
            }
            this.defienConfigProp(plugin, metadata, value)
        } catch (error) {
--- a/packages/plugin/src/interfaces.ts
+++ b/packages/plugin/src/interfaces.ts
@@ -67,6 +67,10 @@ export namespace interfaces {
         * 配置文件版本号
         */
        version?: number
+        /**
+         * 默认配置
+         */
+        default?: any
        /**
         * 实体变量名称
         */
--- a/packages/plugin/src/manager.ts
+++ b/packages/plugin/src/manager.ts
@@ -81,9 +81,12 @@ export class PluginManagerImpl implements plugin.PluginManager {
        this.initialize()
        for (const [, scanner] of this.sacnnerMap) {
            try {
-                scanner.scan(folder).forEach(loadMetadata => {
+                console.i18n('ms.plugin.manager.scan', { scanner: scanner.type, folder })
+                let plugins = scanner.scan(folder)
+                console.i18n('ms.plugin.manager.scan.finish', { scanner: scanner.type, folder, size: plugins.length })
+                plugins.forEach(loadMetadata => {
                    try {
-                        this.loadPlugin(scanner.load(loadMetadata))
+                        this.loadAndRequirePlugin(loadMetadata)
                    } catch (error) {
                        console.error(`plugin scanner ${scanner.type} load ${loadMetadata.file} occurred error ${error}`)
                        console.ex(error)
@@ -158,6 +161,20 @@ export class PluginManagerImpl implements plugin.PluginManager {
        }
    }

+    private loadAndRequirePlugin(loadMetadata: plugin.PluginLoadMetadata) {
+        let startTime = Date.now()
+        let metadata = this.loadPlugin(loadMetadata.scanner.load(loadMetadata))
+        console.i18n('ms.plugin.manager.build', {
+            name: loadMetadata.metadata.name,
+            version: loadMetadata.metadata.version,
+            file: loadMetadata.file.toString().replace(root, ''),
+            scanner: loadMetadata.scanner.type,
+            loader: loadMetadata.loader.type,
+            cost: (Date.now() - startTime) / 1000
+        })
+        return metadata
+    }
+
    /**
     * 从文件加载插件
     * @param file java.io.File
@@ -165,7 +182,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
    loadFromFile(file: string, scanner = this.sacnnerMap.get('file')): plugin.Plugin {
        if (!file) { throw new Error('plugin file can\'t be undefiend!') }
        if (!scanner) { throw new Error('plugin scanner can\'t be undefiend!') }
-        let metadata = this.loadPlugin(scanner.load(scanner.read(file)))
+        let metadata = this.loadAndRequirePlugin(scanner.read(file))
        let plugin = this.buildPlugin(metadata)
        this.load(plugin)
        this.enable(plugin)
--- a/packages/plugin/src/scanner/file-scanner.ts
+++ b/packages/plugin/src/scanner/file-scanner.ts
@@ -26,7 +26,6 @@ export class JSFileScanner implements plugin.PluginScanner {

    private scanFolder(folder: any): string[] {
        var files = []
-        console.i18n('ms.plugin.manager.scan', { folder })
        this.checkUpdateFolder(folder)
        // must check file is exist maybe is a illegal symbolic link file
        fs.list(folder).forEach((path: any) => {
--- a/packages/plugins/docs/MiaoMail.md
+++ b/packages/plugins/docs/MiaoMail.md
@@ -0,0 +1,33 @@
+    private static void injectInventoryAddItemMethod() {
+        System.out.println("Injectoring Mail...");
+        try {
+            ClassPool pool = ClassPool.getDefault();
+            String inventoryClassName = Bukkit.getServer().getClass().getPackage().getName() + ".inventory.CraftInventory";
+            File classFile = new File(URLDecoder.decode(InventoryDragEvent.class.getProtectionDomain().getCodeSource().getLocation().getPath().split("!")[0], "UTF-8"));
+            pool.appendClassPath(classFile.getPath());
+            classFile = new File(URLDecoder.decode(MailPlugin.class.getProtectionDomain().getCodeSource().getLocation().getPath().split("!")[0], "UTF-8"));
+            pool.appendClassPath(classFile.getPath());
+            CtClass inventoryClass = pool.get(inventoryClassName);
+            CtMethod addItemMethod = inventoryClass.getDeclaredMethod("addItem");
+
+            addItemMethod.insertAfter(
+                    "if(this instanceof org.bukkit.inventory.PlayerInventory){"
+                    + "    final org.bukkit.inventory.PlayerInventory playerInventory = (org.bukkit.inventory.PlayerInventory)this;"
+                    + "    final org.bukkit.entity.Player player = (org.bukkit.entity.Player)playerInventory.getHolder();"
+                    + "    if(!$_.values().isEmpty()){"
+                    + "        org.bukkit.event.inventory.InventoryDragEvent event = new org.bukkit.event.inventory.InventoryDragEvent(player.getOpenInventory(), new org.bukkit.inventory.ItemStack(org.bukkit.Material.AIR), new org.bukkit.inventory.ItemStack(org.bukkit.Material.AIR), true, $_);"
+                    + "        event.setCancelled(true);"
+                    + "        event.setResult(org.bukkit.event.Event.Result.DENY);"
+                    + "        org.bukkit.Bukkit.getPluginManager().callEvent(event);"
+                    + "    }"
+                    + "}");
+            try {
+                inventoryClass.toClass();
+                System.out.println("Injected");
+            } catch (Exception e) {
+                System.out.println("Inject fail, Please restart server");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
--- a/packages/plugins/docs/MiaoPay.md
+++ b/packages/plugins/docs/MiaoPay.md
@@ -0,0 +1,14 @@
+# MiaoPay
+
+## 安装方式
+先按照帖子 
+
+### 网关
+- https://pay.yumc.pw/api
+
+### 相关接口
+
+#### 创建订单
+- METHOD: /create
+- PARAM: 
+  - 
--- a/packages/plugins/docs/MiaoReport.md
+++ b/packages/plugins/docs/MiaoReport.md
@@ -0,0 +1,112 @@
+# MiaoReport(喵式报告)
+
+## 插件简介
+
+- 本插件只有一个功能 就是上报当前服务器信息和运行日志到 Ubuntu Paste
+- 适用于哪些 有问题 但是不知道怎么提供报错的用户
+
+## 插件命令
+
+- 只有一个 `/mbrp`
+- 并且只有 OP 权限用户才可以执行
+
+## 功能预览
+
+- 报告地址 https://paste.ubuntu.com/p/mVjJtb6Xcg/
+- 报告详情(已删除无用信息 并不是完整报告)
+
+```
+当前报告由 MiaoBugReport(0.0.1) 生成 作者 MiaoWoo 官网 https://w.yumc.pw
+生成时间: 2021-02-13 21:52:54
+============================== 以下为本次报告内容 ==============================
+服务器版本: git-Spigot-dcd1643-e60fc34 (MC: 1.12.2)
+Bukkit版本: 1.12.2-R0.1-SNAPSHOT
+============================== 运行数据 ==============================
+运行时间: 1 小时 25 分 48 秒
+CPU 核心: 16
+最大内存: 7282 MB
+分配内存: 626 MB
+空闲内存: 307 MB
+============================== 数据统计 ==============================
+世界列表: 
+ - world(NORMAL)
+    - 已加载区块: 272
+    - 实体数量: 146
+    - Tile数量: 10
+    - 玩家数量: 0
+ - world_nether(NETHER)
+    - 已加载区块: 0
+    - 实体数量: 0
+    - Tile数量: 0
+    - 玩家数量: 0
+ - world_the_end(THE_END)
+    - 已加载区块: 0
+    - 实体数量: 0
+    - Tile数量: 0
+    - 玩家数量: 0
+在线玩家: Mr_jtb
+插件列表: MiaoBugReport(0.0.1)
+============================== 服务器线程堆栈 ==============================
+"Spigot Metrics Thread" daemon prio=5 id=32
+	java.lang.Thread.State: TIMED_WAITING
+	 at java.lang.Object.wait(Native Method)
+	 at java.util.TimerThread.mainLoop(Unknown Source)
+	 at java.util.TimerThread.run(Unknown Source)
+
+"Spigot Watchdog Thread" prio=5 id=31
+	java.lang.Thread.State: TIMED_WAITING
+	 at java.lang.Thread.sleep(Native Method)
+	 at org.spigotmc.WatchdogThread.run(WatchdogThread.java:92)
+
+"Server thread" prio=5 id=26
+	java.lang.Thread.State: TIMED_WAITING
+	 at java.lang.Thread.sleep(Native Method)
+	 at net.minecraft.server.v1_12_R1.MinecraftServer.run(MinecraftServer.java:560)
+	 at java.lang.Thread.run(Unknown Source)
+
+"Server console handler" daemon prio=5 id=29
+	java.lang.Thread.State: RUNNABLE
+	 at org.fusesource.jansi.internal.Kernel32.ReadConsoleInputW(Native Method)
+	 at org.fusesource.jansi.internal.Kernel32.readConsoleInputHelper(Kernel32.java:761)
+	 at org.fusesource.jansi.internal.Kernel32.readConsoleKeyInput(Kernel32.java:794)
+	 at org.fusesource.jansi.internal.WindowsSupport.readConsoleInput(WindowsSupport.java:97)
+	 at org.bukkit.craftbukkit.libs.jline.WindowsTerminal.readConsoleInput(WindowsTerminal.java:215)
+	 at org.bukkit.craftbukkit.libs.jline.WindowsTerminal.access$000(WindowsTerminal.java:55)
+	 at org.bukkit.craftbukkit.libs.jline.WindowsTerminal$1.read(WindowsTerminal.java:157)
+	 at org.bukkit.craftbukkit.libs.jline.internal.NonBlockingInputStream.read(NonBlockingInputStream.java:169)
+	 at org.bukkit.craftbukkit.libs.jline.internal.NonBlockingInputStream.read(NonBlockingInputStream.java:137)
+	 at org.bukkit.craftbukkit.libs.jline.internal.NonBlockingInputStream.read(NonBlockingInputStream.java:246)
+	 at org.bukkit.craftbukkit.libs.jline.internal.InputStreamReader.read(InputStreamReader.java:261)
+	 at org.bukkit.craftbukkit.libs.jline.internal.InputStreamReader.read(InputStreamReader.java:198)
+	 at org.bukkit.craftbukkit.libs.jline.console.ConsoleReader.readCharacter(ConsoleReader.java:2145)
+	 at org.bukkit.craftbukkit.libs.jline.console.ConsoleReader.readLine(ConsoleReader.java:2349)
+	 at net.minecraft.server.v1_12_R1.DedicatedServer$2.run(DedicatedServer.java:85)
+
+"Netty Server IO #0" daemon prio=5 id=34
+	java.lang.Thread.State: RUNNABLE
+	 at sun.nio.ch.WindowsSelectorImpl$SubSelector.poll0(Native Method)
+	 at sun.nio.ch.WindowsSelectorImpl$SubSelector.poll(Unknown Source)
+	 at sun.nio.ch.WindowsSelectorImpl$SubSelector.access$400(Unknown Source)
+	 at sun.nio.ch.WindowsSelectorImpl.doSelect(Unknown Source)
+	 at sun.nio.ch.SelectorImpl.lockAndDoSelect(Unknown Source)
+	 at sun.nio.ch.SelectorImpl.select(Unknown Source)
+	 at io.netty.channel.nio.SelectedSelectionKeySetSelector.select(SelectedSelectionKeySetSelector.java:62)
+	 at io.netty.channel.nio.NioEventLoop.select(NioEventLoop.java:753)
+	 at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:409)
+	 at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:884)
+	 at java.lang.Thread.run(Unknown Source)
+...忽略其他线程信息
+============================== 本次运行日志 ==============================
+[20:27:18] [Server thread/INFO]: Starting minecraft server version 1.12.2
+...忽略启动日志
+[20:27:27] [Server thread/INFO]: [MiaoBugReport] Enabling MiaoBugReport v0.0.1
+[20:27:28] [Server thread/INFO]: Server permissions file permissions.yml is empty, ignoring it
+[20:27:28] [Server thread/INFO]: Done (8.205s)! For help, type "help" or "?"
+[20:27:53] [Craft Scheduler Thread - 0/INFO]: [0;33;22m[[0;36;1mMiaoBugReport[0;33;22m][m [0;32;1m正在生成日志数据...[m
+[20:27:55] [Craft Scheduler Thread - 0/INFO]: [0;33;22m[[0;36;1mMiaoBugReport[0;33;22m][m [0;32;1m正在上报数据至UbuntuPaste...[m
+[20:27:55] [Craft Scheduler Thread - 0/INFO]: [0;33;22m[[0;36;1mMiaoBugReport[0;33;22m][m [0;32;1m数据上报完成 您可以分享地址给他人[m
+============================== 报告结束 ==============================
+```
+
+## 下载地址
+
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "@ccms/plugins",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript plugins package",
    "keywords": [
        "miaoscript",
@@ -26,13 +26,16 @@
        "@javatypes/spring-data-redis": "^0.0.3",
        "@javatypes/spring-web": "^0.0.3",
        "@javatypes/tomcat": "^0.0.3",
+        "@types/crypto-js": "^4.0.1",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/container": "^0.12.0",
-        "@ccms/plugin": "^0.12.0"
+        "@babel/standalone": "^7.13.12",
+        "@ccms/api": "^0.14.0",
+        "@ccms/container": "^0.14.0",
+        "@ccms/plugin": "^0.14.0",
+        "crypto-js": "^4.0.0"
    }
 }
--- a/packages/plugins/src/HelloWorld.ts
+++ b/packages/plugins/src/HelloWorld.ts
@@ -1,24 +1,24 @@
 /// <reference types="@javatypes/bungee-api" />
-/// <reference types="@javatypes/spigot-api" />
+/// <reference types="@javatypes/bukkit-api" />
 /// <reference types="@javatypes/sponge-api" />

-import { server } from '@ccms/api';
-import { inject } from '@ccms/container';
-import { plugin, interfaces, cmd, listener, tab } from '@ccms/plugin'
+import { server } from '@ccms/api'
+import { Autowired } from '@ccms/container'
+import { Cmd, JSPlugin, Listener, Tab, interfaces } from '@ccms/plugin'

-@plugin({ name: 'HelloWorld', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+@JSPlugin({ name: 'HelloWorld', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class HelloWorld extends interfaces.Plugin {
-    @inject(server.Server)
+    @Autowired(server.Server)
    private Server: server.Server

    load() {
-        this.logger.log('Plugin load from MiaoScript Plugin System...');
+        this.logger.log('Plugin load from MiaoScript Plugin System...')
    }
    enable() {
-        this.logger.log('Plugin enable from MiaoScript Plugin System...');
+        this.logger.log('Plugin enable from MiaoScript Plugin System...')
    }
    disable() {
-        this.logger.log('Plugin disable from MiaoScript Plugin System...');
+        this.logger.log('Plugin disable from MiaoScript Plugin System...')
    }

    bukkitload() {
@@ -61,28 +61,29 @@ export class HelloWorld extends interfaces.Plugin {
        this.logger.log('Plugin Disable When ServerType is Nukkit!')
    }

-    @cmd()
+    @Cmd()
    hello(sender: any, command: string, args: string[]) {
-        this.logger.log(sender, command, args);
+        this.logger.log(sender, command, args)
        sender.sendMessage(JSON.stringify({ command, ...args }))
    }

-    @tab()
+    @Tab()
    tabhello(_sender: any, _command: string, _args: string[]) {
        return ['world']
    }

-    @listener({ servers: ['bukkit', 'nukkit'] })
+    @Listener({ servers: ['bukkit', 'nukkit'] })
    PlayerJoin(event: org.bukkit.event.player.PlayerJoinEvent) {
-        let plyaer = event.getPlayer();
+        let plyaer = event.getPlayer()
        this.logger.console(`§cBukkit §aPlayerJoinEvent: §b${plyaer.getName()}`)
-        setTimeout(() => this.sendWelcome(plyaer), 10);
+        setTimeout(() => this.sendWelcome(plyaer), 500)
    }

-    @listener({ servers: ['sponge'] })
+    @Listener({ servers: ['sponge'] })
    ClientConnectionEvent$Join(event: org.spongepowered.api.event.network.ClientConnectionEvent.Join) {
+        event.getTargetEntity().getLocation()
        this.logger.console(`§cSponge §aClientConnectionEvent.Join: §b${event.getTargetEntity().getName()}`)
-        setTimeout(() => this.sendWelcome(event.getTargetEntity()), 10);
+        setTimeout(() => this.sendWelcome(event.getTargetEntity()), 500)
    }

    private sendWelcome(player: any) {
@@ -90,10 +91,9 @@ export class HelloWorld extends interfaces.Plugin {
        this.logger.sender(player, `§6当前版本: §c${this.Server.getVersion()}`)
    }

-    @listener({ servers: ['bungee'] })
-    ServerConnected(e: any) {
-        let event = e as net.md_5.bungee.api.event.ServerConnectedEvent
+    @Listener({ servers: ['bungee'] })
+    ServerConnected(event: net.md_5.bungee.api.event.ServerConnectedEvent) {
        this.logger.console(`§cBungeeCord §aServerConnectedEvent: §b${event.getPlayer().getDisplayName()}`)
-        setTimeout(() => this.logger.sender(event.getPlayer(), `§a欢迎来到 §bMiaoScript §a的世界 §6来自 §cBungeeCord §6的问候!`), 10);
+        setTimeout(() => this.logger.sender(event.getPlayer(), `§a欢迎来到 §bMiaoScript §a的世界 §6来自 §cBungeeCord §6的问候!`), 500)
    }
 }
--- a/packages/plugins/src/MiaoAuth.ts
+++ b/packages/plugins/src/MiaoAuth.ts
@@ -0,0 +1,48 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+
+import { plugin, server } from '@ccms/api'
+import { Autowired } from '@ccms/container'
+import { Cmd, interfaces, JSPlugin, Tab } from '@ccms/plugin'
+
+import type { MiaoReward } from './MiaoReward'
+import * as fs from '@ccms/common/dist/fs'
+
+@JSPlugin({ version: '1.0.0', author: 'MiaoWoo', source: __filename, depends: ['MiaoReward'] })
+export class MiaoAuth extends interfaces.Plugin {
+    @Autowired()
+    private Server: server.Server
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    private MiaoReward: MiaoReward
+
+    load() {
+    }
+
+    enable() {
+        this.MiaoReward = this.pluginManager.getPlugin('MiaoReward') as MiaoReward
+        if (!this.MiaoReward) { return this.logger.error('当前脚本插件需要 MiaoReward 作为前置插件!') }
+
+    }
+
+    disable() {
+    }
+
+    @Cmd({ autoMain: true })
+    msma() { }
+
+    cmdbind(sender: org.bukkit.entity.Player) {
+        if (!sender.getItemInHand) { return this.logger.sender(sender, '§4控制台无法执行此命令!') }
+        if (!this.MiaoReward.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置 请联系管理员配置MiaoReward!') }
+        this.MiaoReward.scanAuth(sender, 'bind', { title: '账号绑定', content: '是否绑定' }, (token, user) => {
+
+        }, () => {
+
+        })
+    }
+
+    @Tab()
+    tabmsma() { }
+}
--- a/packages/plugins/src/MiaoChat.ts
+++ b/packages/plugins/src/MiaoChat.ts
@@ -50,7 +50,7 @@ class MiaoMessage {
    }
 }

-@plugin({ name: 'MiaoChat', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+@plugin({ version: '1.0.1', author: 'MiaoWoo', source: __filename })
 export class MiaoChat extends interfaces.Plugin {
    @Autowired()
    private Server: server.Server
--- a/packages/plugins/src/MiaoConsole.ts
+++ b/packages/plugins/src/MiaoConsole.ts
@@ -19,7 +19,7 @@ let help = [
    '§6/mconsole §areload               §6-  §3重载插件',
 ]

-@plugin({ prefix: 'Console', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
+@plugin({ prefix: 'Console', version: '1.1.1', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
 export class MiaoConsole extends interfaces.Plugin {
    @Autowired(ContainerInstance)
    private container: Container
@@ -42,6 +42,8 @@ export class MiaoConsole extends interfaces.Plugin {
    private rootLogger: any
    private appender: any
    private handler: any
+    private babel: any
+    private downgrade = true

    private logCache: string[] = []

@@ -58,10 +60,25 @@ export class MiaoConsole extends interfaces.Plugin {
        }
        process.on('message', (msg) => {
            this.logCache.push(msg)
-            if (this.logCache.length > 30) {
-                this.logCache = this.logCache.slice(this.logCache.length - 30, this.logCache.length)
+            if (this.logCache.length > 100) {
+                this.logCache = this.logCache.slice(this.logCache.length - 100, this.logCache.length)
            }
        })
+        this.task.create(() => {
+            if (!this.babel) {
+                try {
+                    this.logger.console('§3脚本 Babel 引擎初始化中 请稍候...')
+                    let startTime = Date.now()
+                    this.babel = require('@babel/standalone')
+                    this.compileCode(`() => console.log("Babel ready!")`)
+                    this.logger.console(`§3脚本 Babel 引擎初始化完毕 耗时 §a${Date.now() - startTime}ms...`)
+                    this.downgrade = false
+                } catch (error) {
+                    this.logger.console(`§c脚本 Babel 引擎初始化失败 将无法使用ES5以上语法!`)
+                    console.ex(error)
+                }
+            }
+        }).async().submit()
    }

    @cmd()
@@ -81,8 +98,6 @@ export class MiaoConsole extends interfaces.Plugin {
    }

    cmdreload(sender: any) {
-        // @ts-ignore
-        require.clear('websocket')
        this.pluginManager.reload(this)
        return
    }
@@ -223,7 +238,7 @@ export class MiaoConsole extends interfaces.Plugin {
    startSocketIOServer() {
        let namespace = this.socketIOServer.of('/MiaoConsole')
        process.on('message', (msg) => namespace.emit('log', msg))
-        namespace.on('connect', (client: SocketIOSocket) => {
+        namespace.on('connection', (client: SocketIOSocket) => {
            if (!this.token) {
                this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
                client.emit('unauthorized', () => client.disconnect(true))
@@ -247,14 +262,23 @@ export class MiaoConsole extends interfaces.Plugin {
            client.emit('log', `Currect Server Version is ${this.server.getVersion()}`)
        })
        client.on('command', (cmd) => {
-            setTimeout(() => this.server.dispatchConsoleCommand(cmd), 0)
+            this.task.callSyncMethod(() => this.server.dispatchConsoleCommand(cmd))
            client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
        })
        client.on('tabComplate', (input, index, callback) => {
-            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index) || [])
+            try {
+                callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index) || [])
+            } catch (error) {
+                callback?.([])
+                client.emit('log', `§4命令补全发生异常: ${error}!`)
+                console.ex(error)
+            }
        })
        client.on('exec', (code) => {
            try {
+                if (!this.babel) {
+                    return client.emit('log', '§cBabel 引擎初始化中 请稍候再试!')
+                }
                client.emit('log', this.runCode(code, client.nsp, client))
            } catch (ex) {
                client.emit('log', `§4代码执行异常 错误: ${ex}\n${console.stack(ex).join('\n')}`)
@@ -307,15 +331,33 @@ export class MiaoConsole extends interfaces.Plugin {
            this.container,
            this.pluginManager
        ]
-        let tfunc = new Function(
-            ...paramNames,
-            `var api = require('@ccms/api');
+        client.emit('log', '§3代码编译中 请稍候...')
+        let startTime = Date.now()
+        let tfunc = new Function(...paramNames, this.compileCode(code))
+        client.emit('log', `§3代码编译完成 耗时 §e${Date.now() - startTime}ms §b开始执行 请稍候...`)
+        return tfunc.apply(this, params) + ''
+    }
+
+    private compileCode(code: string) {
+        if (!this.downgrade && this.babel?.transform) {
+            code = this.babel.transform(code, {
+                filename: 'miaoconsole-temp.ts',
+                presets: ['typescript', 'es2015'],
+                plugins: [
+                    ['proposal-decorators', { legacy: true }],
+                    'transform-runtime'
+                ],
+                sourceMaps: "inline"
+            }).code
+        }
+        return `var api = require('@ccms/api');
 if (this.serverType == "spring") {
    var dbm = container.get(api.database.DataBaseManager)
    var db = dbm.getMainDatabase()
    var bf = base.getInstance().getAutowireCapableBeanFactory()
 }
-return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
-        return this.task.callSyncMethod(() => tfunc.apply(this, params)) + ''
+var startTime = Date.now()
+var result = eval(${JSON.stringify(code)});
+return '§3代码执行完成 耗时 §e' + (Date.now() - startTime) + 'ms §a返回结果: §r'+ result`
    }
 }
--- a/packages/plugins/src/MiaoExplorer.ts
+++ b/packages/plugins/src/MiaoExplorer.ts
@@ -46,7 +46,7 @@ export class MiaoExplorer extends interfaces.Plugin {
        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
        this.token = consolePlugin.token
        this.namespace = server.of('/MiaoExplorer')
-        this.namespace.on('connect', (client: SocketIOSocket) => {
+        this.namespace.on('connection', (client: SocketIOSocket) => {
            if (!this.token) {
                this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
                client.emit('unauthorized', () => client.disconnect(true))
--- a/packages/plugins/src/MiaoParticle.ts
+++ b/packages/plugins/src/MiaoParticle.ts
@@ -0,0 +1,36 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+
+import { particle } from '@ccms/api'
+import { Autowired } from '@ccms/container'
+import { Cmd, JSPlugin, Tab, interfaces } from '@ccms/plugin'
+
+@JSPlugin({ version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class MiaoParticle extends interfaces.Plugin {
+    @Autowired()
+    private particleManager: particle.ParticleManager
+
+    private particleTask: particle.ParticleTask
+
+    enable() {
+        // let boot = new Bootstrap()
+        this.particleTask = this.particleManager.create(new particle.Circle(2, 20).setParticle(org.bukkit.Particle.BLOCK_DUST), this)
+    }
+
+    diable() {
+        this.particleTask.cancel()
+    }
+
+    @Cmd({ autoMain: true })
+    mpt() { }
+
+    cmdtest(sender: org.bukkit.entity.Player) {
+        this.particleTask.follow(sender).async(true).timer(5).submit()
+    }
+
+    @Tab()
+    tabmpt(_sender: any, _command: string, _args: string[]) {
+        return []
+    }
+}
--- a/packages/plugins/src/MiaoPay.ts
+++ b/packages/plugins/src/MiaoPay.ts
@@ -0,0 +1,406 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+
+import { plugin, server, task } from '@ccms/api'
+import { Autowired, JSClass } from '@ccms/container'
+import { Cmd, Config, interfaces, JSPlugin, Listener, PluginConfig, Tab } from '@ccms/plugin'
+
+import type { MiaoReward } from './MiaoReward'
+import http from '@ccms/common/dist/http'
+import * as CryptoJS from "crypto-js"
+
+const Thread = java.lang.Thread
+
+interface PlayerPointsAPI {
+    look(name: string)
+    give(name: string, amount: number)
+    take(name: string, amount: number)
+}
+
+interface Order {
+    order_id: string
+    amount: number
+    url?: string
+}
+interface Sync {
+    scaned: boolean
+    start?: number
+    left?: number
+    cancelled?: boolean
+    paying?: boolean
+}
+
+interface PlaceholderAPI {
+    registerPlaceholderHook: (key: string, onPlaceholderRequest: (player, s) => string) => void
+    unregisterPlaceholderHook: (key: string) => void
+    setPlaceholders: (player: any, str: string) => string
+}
+
+const defaultConfig = {
+    prefix: '§6[§b喵式支付§6]',
+    name: '',
+    id: '',
+    secret: '',
+    command: 'points give %player_name% %amount%',
+    check: '%playerpoints_points%',
+    ratio: 100,
+    coinName: '点券',
+    reward: {
+        '*': [
+            'msg %player_name% 充值 %amount% 点券成功...'
+        ],
+        10: [
+            "points give %player_name% 1",
+            'msg %player_name% 充值 10 点券 奖励 1 点券...'
+        ],
+        300: [
+            "points give %player_name% 15",
+            'msg %player_name% 充值 300 点券 奖励 15 点券...'
+        ],
+        500: [
+            "points give %player_name% 25",
+            'msg %player_name% 充值 500 点券 奖励 25 点券...'
+        ],
+        680: [
+            "points give %player_name% 35",
+            'msg %player_name% 充值 680 点券 奖励 35 点券...'
+        ],
+        1280: [
+            "points give %player_name% 70",
+            'msg %player_name% 充值 1280 点券 奖励 70 点券...'
+        ],
+    }
+}
+
+@JSPlugin({ version: '1.3.5', author: 'MiaoWoo', source: __filename, depends: ['MiaoReward'], nativeDepends: ['PlaceholderAPI'] })
+export class MiaoPay extends interfaces.Plugin {
+    @Autowired()
+    private server: server.Server
+    @Autowired()
+    private taskManager: task.TaskManager
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    @JSClass('me.clip.placeholderapi.PlaceholderAPI')
+    private PlaceholderAPI: PlaceholderAPI
+
+    private apiGateWay = "https://pay.yumc.pw"
+    private MiaoReward: MiaoReward
+
+    private cacheMap = new Map<string, Order>();
+    private cacheSyncMap = new Map<string, Sync>();
+
+    @Config()
+    private config: PluginConfig & typeof defaultConfig = defaultConfig
+
+    load() {
+        let needSave = false
+        for (const key of Object.keys(defaultConfig)) {
+            if (!this.config[key]) {
+                this.config[key] = defaultConfig[key]
+                needSave = true
+            }
+        }
+        needSave && this.config.save()
+    }
+
+    enable() {
+        this.MiaoReward = this.pluginManager.getPlugin('MiaoReward') as MiaoReward
+        if (!this.MiaoReward) { return this.logger.error('当前脚本插件需要 MiaoReward 作为前置脚本插件!') }
+        if (!this.config.id || !this.config.secret) { return this.logger.console('§4尚未配置商户信息 将无法正常收款!') }
+    }
+
+    disable() {
+        this.cacheMap.forEach((v, k) => {
+            this.MiaoReward.cancelTask(this.server.getPlayer(k))
+        })
+        this.cacheMap.clear()
+    }
+
+    @Cmd({ autoMain: true })
+    mpay() { }
+
+    cmdpay(sender: org.bukkit.entity.Player, amount: number = 0) {
+        if (!sender.getItemInHand) { return this.logger.sender(sender, '§4控制台无法执行此命令!') }
+        if (!this.MiaoReward.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置 请联系管理员先配置MiaoReward!') }
+        if (!this.config.id || !this.config.secret) { return this.logger.sender(sender, '§c当前服务器尚未配置 请联系管理员配置支付密钥!') }
+        if (this.cacheMap.has(sender.getName())) {
+            this.logger.sender(sender, '§c您有一笔订单尚未完成 请完成支付或等待订单超时!')
+            let sync = this.cacheSyncMap.get(sender.getName())
+            if (!sync.cancelled) { return }
+            sync.scaned = false
+            sync.left = (sync.paying ? 100 : 55) - (Math.round(Date.now() / 1000) - sync.start)
+            let order = this.cacheMap.get(sender.getName())
+            this.MiaoReward.setItemAndTp(sender, order.url, sync, `充值 ${this.config.ratio * order.amount} ${this.config.coinName}`, `支付宝/微信/QQ 扫码支付`)
+            return
+        }
+        if (amount < 1) { return this.logger.sender(sender, `§c充值异常 §4充值金额不得小于 1 ${this.config.coinName}!`) }
+        if (amount / this.config.ratio > 1000) { return this.logger.sender(sender, `§c充值异常 §4充值金额不得大于 ${this.config.ratio * 1000} ${this.config.coinName}!`) }
+        if (amount != Math.round(amount)) { return this.logger.sender(sender, `§c充值异常 §4充值金额必须为整数!`) }
+        try {
+            this.getPlayerAmount(sender)
+        } catch (error) {
+            return this.logger.sender(sender, error.message || error)
+        }
+        this.MiaoReward.sendTitle(sender, `§6充值 §a${amount} §6${this.config.coinName}`, '§c正在请求充值二维码 请稍候...')
+        let sync: any = { scaned: false, start: Math.round(Date.now() / 1000) }
+        let order = this.createOrder(sender, amount)
+        this.cacheMap.set(sender.getName(), order)
+        this.cacheSyncMap.set(sender.getName(), sync)
+        let order_id = order.order_id
+        this.MiaoReward.setItemAndTp(sender, order.url, sync, `充值 ${amount} ${this.config.coinName}`, `支付宝/微信/QQ 扫码支付`)
+        this.logger.sender(sender, [`§3请使用 §b支付宝§3/§a微信§3/§5QQ §3扫描二维码支付!`, `§c如未显示二维码 请打开下列网址完成充值!`, `§6地址: §3${order.url}`])
+        this.taskManager.create(() => {
+            try {
+                let status = this.queryStatus(order_id, 0, 55)
+                if (status.code != 200) { throw new Error('§c扫码超时 请重新充值!') }
+                this.MiaoReward.sendTitle(sender, '§a已扫码', `§3订单已创建 请及时支付!`)
+                this.MiaoReward.sendActionBar(sender, '§6订单号: §3' + order_id)
+                sync.scaned = true
+                sync.start = Math.round(Date.now() / 1000)
+                sync.paying = true
+                status = this.queryStatus(order_id, 1, 100)
+                if (status.code != 200) { throw new Error('§c支付超时 请重新充值!') }
+                if (status.data == 2) {
+                    this.MiaoReward.sendTitle(sender, '§a已支付', `§3订单已支付 请等待充值到账...`)
+                    this.MiaoReward.sendActionBar(sender, '§6订单号: §3' + order_id)
+                    this.logger.sender(sender, `§6订单号: §3${order_id} §a支付成功!`)
+                    this.recharge(sender, order)
+                }
+            } catch (error) {
+                let cacheOrder = this.cacheMap.get(sender.getName())
+                if (cacheOrder && cacheOrder.order_id == order_id) {
+                    this.MiaoReward.sendTitle(sender, '§4充值失败', error.message)
+                }
+            } finally {
+                sync.scaned = true
+                this.cacheMap.delete(sender.getName())
+                this.cacheSyncMap.delete(sender.getName())
+            }
+        }).async().submit()
+        this.MiaoReward.clearTitle(sender)
+    }
+
+    cmdquery(sender: org.bukkit.entity.Player, id: string) {
+        if (!id) { return this.logger.sender(sender, '§c请输入订单号!') }
+        this.taskManager.create(() => {
+            let result = this.queryOrder(id, sender.getName(), sender.getUniqueId().toString())
+            if (result.code != 200) { return this.logger.sender(sender, `§c查询异常! §4ERROR: ${result.msg}`) }
+            let order = result.data
+            this.logger.sender(sender, [
+                `§6商户名称: §3${order.appname}`,
+                `§6订单号: §3${id}`,
+                `§6商品: §b${order.subject}`,
+                `§6金额: §e${order.amount}`,
+                `§6玩家: §a${order.username}`,
+                `§6状态: §c${order.status}`,
+            ])
+            if (order.status > 1 && order.status < 4) {
+                this.logger.sender(sender, `§3当前订单已支付 尚未完成充值 开始补单操作...`)
+                this.recharge(sender, order)
+            }
+        }).async().submit()
+    }
+
+    cmdcheck(sender: org.bukkit.entity.Player, force = 1) {
+        this.logger.sender(sender, `§3正在检查需要补单充值的订单 请稍候...`)
+        this.taskManager.create(() => {
+            let result = this.queryUnconverted(sender.getName(), force)
+            if (result.code != 200) { return this.logger.sender(sender, `§c订单查询失败: ${result.msg}`) }
+            let unconverteds = result.data
+            if (!unconverteds.length) { return this.logger.sender(sender, `§c未发现需要进行补单充值的订单!`) }
+            this.logger.sender(sender, `§3发现 §a${unconverteds.length}笔 §3未充值订单 §c正在充值 请稍候...`)
+            for (const unconverted of unconverteds) {
+                this.logger.sender(sender, `§3正在处理订单 §a${unconverted.order_id} §3请稍候...`)
+                this.recharge(sender, unconverted)
+                Thread.sleep(300)
+            }
+        }).async().submit()
+    }
+
+    /**
+     * 请在异步线程执行此方法
+     * @param amount 订单金额(非点券金额)
+     */
+    recharge(sender: org.bukkit.entity.Player, order: Order) {
+        let order_id = order.order_id
+        let amount = order.amount
+        let point = this.safeMultiply(amount, this.config.ratio)
+        let finish = this.preFinishOrder(order_id)
+        if (finish.code != 200) {
+            this.sendError(sender, order_id, amount, '§4充值预标记异常!')
+            return this.logger.console(`§c充值系统异常 订单 §3${order_id} 预标记异常! §4${this.config.coinName}已停止充值 §c请手动补单!`)
+        }
+        this.taskManager.callSyncMethod(() => {
+            let prePoint = this.getPlayerAmount(sender)
+            let command = this.config.command.replace('%player_name%', sender.getName()).replace('%amount%', `${point}`).replace('%remark%', `${order_id}`)
+            if (!this.server.dispatchConsoleCommand(command)) {
+                return this.sendError(sender, order_id, amount, '§4充值命令执行异常!')
+            }
+            this.checkRecharge(sender, order_id, amount, prePoint, point)
+        })
+    }
+
+    @Listener()
+    private PlayerJoinEvent(event: org.bukkit.event.player.PlayerJoinEvent) {
+        const player = event.getPlayer()
+        this.cmdcheck(player, 0)
+    }
+
+    private checkRecharge(sender: org.bukkit.entity.Player, order_id: string, amount: number, prePoint: number, point: number) {
+        this.taskManager.create(() => {
+            let nowPoint = this.checkNowPoint(sender, point, prePoint)
+            if (nowPoint === false) {
+                return this.sendError(sender, order_id, amount, '§4充值结果检测异常!')
+            }
+            this.logger.sender(sender, [
+                `§6充值 §a${point} §6${this.config.coinName} §a成功 §6当前账户余额: §3${nowPoint} §6${this.config.coinName}`,
+                `§c如出现未到账的情况 请联系管理员!`
+            ])
+            this.rewardOrder(sender, order_id, point)
+            let finish = this.finishOrder(order_id)
+            if (finish.code != 200) {
+                return this.logger.console(`§c充值系统异常 订单 §3${order_id} 完成标记异常! §4${this.config.coinName}可能重复到账!`)
+            }
+        }).async().submit()
+    }
+
+    private checkNowPoint(sender: org.bukkit.entity.Player, point: number, prePoint: number) {
+        let nowPoint = this.getPlayerAmount(sender)
+        if (nowPoint == prePoint + point) {
+            return nowPoint
+        }
+        Thread.sleep(100)
+        nowPoint = this.getPlayerAmount(sender)
+        if (nowPoint == prePoint + point) {
+            return nowPoint
+        }
+        Thread.sleep(200)
+        nowPoint = this.getPlayerAmount(sender)
+        if (nowPoint == prePoint + point) {
+            return nowPoint
+        }
+        Thread.sleep(300)
+        nowPoint = this.getPlayerAmount(sender)
+        return false
+    }
+
+    private rewardOrder(sender, order_id, point) {
+        this.taskManager.callSyncMethod(() => {
+            try {
+                if (this.config.reward['*']) {
+                    let rewardCommands: string[] = this.config.reward['*']
+                    for (const command of rewardCommands) {
+                        this.dispatchConsoleCommand(sender, command, point, order_id)
+                    }
+                }
+                let rewardCommands: string[] = this.config.reward[point]
+                if (rewardCommands && rewardCommands.length) {
+                    for (const command of rewardCommands) {
+                        this.dispatchConsoleCommand(sender, command, point, order_id)
+                    }
+                }
+            } catch (error) {
+                console.error('§4充值奖励命令执行错误: §c' + error)
+                console.ex(error)
+            }
+        })
+    }
+
+    private dispatchConsoleCommand(sender, command, point, order_id) {
+        return this.server.dispatchConsoleCommand(command.replace('%player_name%', sender.getName()).replace('%amount%', `${point}`).replace('%remark%', `${order_id}`))
+    }
+
+    sendError(sender: org.bukkit.entity.Player, order_id: string, amount: number, error: string) {
+        return this.logger.sender(sender, [
+            `§c========== ${this.config.prefix}§4充值异常 §c==========`,
+            `§6异常订单: §3${order_id}`,
+            `§6订单金额: §3${amount}`,
+            `§6异常原因: §4${error}`,
+            `§6异常账号: §b${sender.getName()}`,
+            `§6异常时间: §a${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`,
+            `§c如果已付款但${this.config.coinName}未到账 请截图发给腐竹!`,
+            `§c========== ${this.config.prefix}§4充值异常 §c==========`,
+        ])
+    }
+
+    @Tab()
+    tabmpay() { }
+
+    private safeMultiply(a: number, b: number) {
+        return parseFloat((a * b).toFixed(0))
+    }
+
+    private getPlayerAmount(sender: any): number {
+        let result = this.PlaceholderAPI.setPlaceholders(sender, this.config.check)
+        let amount = parseFloat(result)
+        if (isNaN(amount)) {
+            throw new Error(`§c读取玩家 §3${this.config.coinName} §c异常 §6请检查 §3check §6配置是否正确!
+§6数据解析链路: §3${this.config.check} §6=> §3${result} §6=> §3${amount}`)
+        }
+        return amount
+    }
+
+    private queryStatus(id: string, wait: number, time = 60) {
+        return this.httpPost('/status', { id, wait, time })
+    }
+
+    private preFinishOrder(id: string) {
+        return this.httpPost('/preFinish', { id })
+    }
+
+    private finishOrder(id: string) {
+        return this.httpPost('/finish', { id })
+    }
+
+    private createOrder(sender: org.bukkit.entity.Player, amount: number): Order {
+        let serverName = this.MiaoReward.serverInfo.name
+        if (this.config.name) { serverName = `${serverName}(${this.config.name})` }
+        let result = this.httpPost('/create', {
+            subject: `${serverName} 充值 ${amount} ${this.config.coinName}`,
+            amount: amount / this.config.ratio,
+            username: sender.getName(),
+            unionId: sender.getUniqueId().toString()
+        })
+        if (result.code != 200) {
+            throw new Error(`订单创建失败: ${result.msg}`)
+        }
+        return result.data
+    }
+
+    private queryOrder(id: string, username: string, uuid: string) {
+        return this.httpPost('/query', { id, username, uuid })
+    }
+
+    private queryUnconverted(username: string, force: number) {
+        return this.httpPost('/unconverted', { username, force })
+    }
+
+    private httpPost(method: string, data: any) {
+        let startTime = Date.now()
+        data.appid = this.config.id
+        data.timestamp = Math.round(Date.now() / 1000)
+        data.sign = this.sign(data)
+        let url = `${this.apiGateWay}/api${method}`
+        let result = http.post(url, data)
+        console.debug(`
+====== HTTP POST ======
+REQUEST URL : ${url}
+REQUEST DATA: ${JSON.stringify(data)}
+RESPONSE    : ${JSON.stringify(result)}
+CAST TIME   : ${Date.now() - startTime}`)
+        return result
+    }
+
+    private http_build_query(params: any) {
+        return Object.keys(params).filter(key => key !== 'sign' && params[key] != undefined && params[key] != null)
+            .sort().map(key => key + '=' + params[key]).join('&')
+    }
+
+    private sign(params) {
+        // 排序后转换为字符串
+        let signStr = `${this.http_build_query(params)}&key=${this.config.secret}`
+        return CryptoJS.MD5(signStr).toString().toUpperCase()
+    }
+}
--- a/packages/plugins/src/MiaoReward.ts
+++ b/packages/plugins/src/MiaoReward.ts
@@ -12,15 +12,44 @@ const Bytes = Java.type('byte[]')

 interface PlaceholderAPI {
    registerPlaceholderHook: (key: string, onPlaceholderRequest: (player, s) => string) => void
+    registerExpansion: (expansion: PlaceholderExpansion) => void
    unregisterPlaceholderHook: (key: string) => void
    setPlaceholders: (player: any, str: string) => string
 }

+interface PlaceholderExpansion {
+    getIdentifier: () => string
+    getAuthor: () => string
+    getVersion: () => string
+    persist: () => string
+    onPlaceholderRequest: (player, s) => string
+}
+
 interface UserInfo {
    balance: number
    sign: string
    video: string
    box: string
+    block: string
+}
+
+interface ServerInfo {
+    // 16,
+    id: number
+    // "圈云大陆",
+    name: string
+    // 1,
+    owner: number
+    // 48200,
+    score: number
+    // 1,
+    ratio: number
+    // 1,
+    audit: number
+    // 2,
+    status: number
+    // 0
+    today: number
 }

 let createPacketAdapterFunction = eval(`
@@ -30,9 +59,19 @@ function(cls, plugin, type, onPacketSending){
    }
 }`)

-@JSPlugin({ prefix: 'MRD', version: '1.4.2', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+const defaultConfig = {
+    prefix: '§6[§b广告系统§6]§r',
+    serverId: '',
+    serverToken: '',
+    drawCommand: 'points give %player_name% %amount%',
+    coinName: '点券',
+    joinTip: true
+}
+
+@JSPlugin({ prefix: 'MRD', version: '1.5.9', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], nativeDepends: ['ProtocolLib', 'PlaceholderAPI'], source: __filename })
 export class MiaoReward extends interfaces.Plugin {
-    private serverInfo: any
+    public serverInfo: ServerInfo
+    private notifyError = true
    private cacheBindUuid = ''
    private zeroMapView = undefined
    private playerImageCache = new Map<string, any>()
@@ -53,19 +92,7 @@ export class MiaoReward extends interfaces.Plugin {
    private bungee: proxy.BungeeCord

    @Config()
-    private config: PluginConfig & {
-        prefix: string
-        serverId: string
-        serverToken: string
-        drawCommand: string
-        coinName: string
-    } = {
-            prefix: '§6[§b广告系统§6]§r',
-            serverId: '',
-            serverToken: '',
-            drawCommand: 'p give %player_name% %amount%',
-            coinName: '点券'
-        }
+    private config: PluginConfig & typeof defaultConfig = defaultConfig

    @JSClass('org.bukkit.Bukkit')
    private Bukkit: any
@@ -74,6 +101,9 @@ export class MiaoReward extends interfaces.Plugin {
    private PlaceholderAPI: PlaceholderAPI
    @JSClass('me.clip.placeholderapi.PlaceholderHook')
    private PlaceholderHook: any
+    @JSClass('me.clip.placeholderapi.expansion.PlaceholderExpansion')
+    private PlaceholderExpansion: any
+    private expansion: any

    @JSClass('com.comphenix.protocol.ProtocolLibrary')
    private ProtocolLibrary: any
@@ -91,10 +121,14 @@ export class MiaoReward extends interfaces.Plugin {
    load() {
        this.config.prefix = this.config.prefix || '§6[§b广告系统§6]§r'
        this.config.drawCommand = this.config.drawCommand || 'p give %player_name% %amount%'
-        if (!this.config.coinName) {
+        if (this.config.coinName == undefined) {
            this.config.coinName = '点券'
            this.config.save()
        }
+        if (this.config.joinTip == undefined) {
+            this.config.joinTip = true
+            this.config.save()
+        }
        //@ts-ignore
        this.logger.prefix = this.config.prefix
        this.downgrade = this.Bukkit.server.class.name.split('.')[3] == "v1_7_R4"
@@ -170,19 +204,28 @@ export class MiaoReward extends interfaces.Plugin {
        if (!this.PlaceholderAPI) {
            console.console("§cCan't found me.clip.placeholderapi.PlaceholderAPI variable will not be replaced!")
        } else {
-            this.PlaceholderAPI.registerPlaceholderHook("mrd", new this.PlaceholderHook({
-                onPlaceholderRequest: (player: any, s: string) => {
-                    if (!this.playerInfoCache.has(player.getName())) { return '用户未绑定' }
-                    let data = this.playerInfoCache.get(player.getName())
-                    switch (s.toLowerCase()) {
-                        case "balance": return data.balance
-                        case "sign": return data.sign
-                        case "video": return data.video
-                        case "box": return data.box
-                        default: return "未知的参数: " + s
-                    }
-                }
-            }))
+            this.expansion = new this.PlaceholderExpansion({
+                getIdentifier: () => 'mrd',
+                persist: () => true,
+                getAuthor: () => 'MiaoWoo',
+                getVersion: () => '1.0.0',
+                onPlaceholderRequest: this.onPlaceholderRequest.bind(this)
+            })
+            this.taskManager.create(() => this.expansion.register()).submit()
+        }
+    }
+
+    private onPlaceholderRequest(player: any, s: string) {
+        if (!this.playerInfoCache.has(player.getName())) { return '数据加载中' }
+        let data = this.playerInfoCache.get(player.getName())
+        if (!data) { return '用户未绑定' }
+        switch (s.toLowerCase()) {
+            case "balance": return data.balance
+            case "sign": return data.sign
+            case "video": return data.video
+            case "box": return data.box
+            case "block": return data.block
+            default: return "未知的参数: " + s
        }
    }

@@ -197,11 +240,14 @@ export class MiaoReward extends interfaces.Plugin {
        this.initPacketAdapter()
    }

-    createPacketAdapter(onPacketSending: (event) => void) {
+    private createPacketAdapter(onPacketSending: (event) => void) {
        return createPacketAdapterFunction(this.PacketAdapter, base.getInstance(), [this.PacketType.Play.Server.MAP], onPacketSending)
    }

-    initPacketAdapter() {
+    private initPacketAdapter() {
+        if (!this.ProtocolLibrary) {
+            return this.logger.console(`§4服务器未安装 ProtocolLib 无法扫码功能 请安装后重试!`)
+        }
        this.adapter = this.createPacketAdapter((event) => {
            let integers = event.getPacket().getIntegers().getValues()
            let mapId = integers.get(0)
@@ -235,10 +281,19 @@ export class MiaoReward extends interfaces.Plugin {
            java.util.Arrays.fill(arritemStack, new org.bukkit.inventory.ItemStack(org.bukkit.Material.AIR))
            arritemStack[36 + player.getInventory().getHeldItemSlot()] = mapItem
            var packetContainer = protocolManager.createPacket(this.PacketType.Play.Server.WINDOW_ITEMS)
-            if (packetContainer.getItemArrayModifier().size() > 0) {
+            try {
                packetContainer.getItemArrayModifier().write(0, arritemStack)
-            } else {
-                packetContainer.getItemListModifier().write(0, java.util.Arrays.asList(arritemStack))
+            } catch (error) {
+                try {
+                    packetContainer.getItemListModifier().write(0, java.util.Arrays.asList(arritemStack))
+                } catch (error) {
+                    if (this.notifyError) {
+                        console.console('§4发送虚拟物品包失败 可能是ProtocolLib版本不兼容!')
+                        console.ex(error)
+                        this.notifyError = false
+                        return
+                    }
+                }
            }
            protocolManager.sendServerPacket(player, packetContainer)
        } catch (ex) {
@@ -247,14 +302,14 @@ export class MiaoReward extends interfaces.Plugin {
    }

    disable() {
-        this.PlaceholderAPI?.unregisterPlaceholderHook("mrd")
+        try { this.expansion?.unregister() } catch (error) { }
        this.adapter && this.ProtocolLibrary.getProtocolManager().removePacketListener(this.adapter)
        Java.from(this.server.getOnlinePlayers()).forEach(p => this.checkAndClear(p))
        this.channelOff?.off()
    }

    @Cmd()
-    mrd(sender: any, command: string, args: string[]) {
+    private mrd(sender: any, command: string, args: string[]) {
        let cmd = args[0] || 'help'
        let cmdKey = 'cmd' + cmd
        if (!this[cmdKey]) {
@@ -266,7 +321,7 @@ export class MiaoReward extends interfaces.Plugin {
        this.taskManager.create(() => this[cmdKey](sender, ...args)).async().submit()
    }

-    private scanAuth(sender: org.bukkit.entity.Player, scanType: string, scanObj: { title: string, content: string }, success: (token: string, user: any) => void, cancel?: () => void) {
+    public scanAuth(sender: org.bukkit.entity.Player, scanType: string, scanObj: { title: string, content: string }, success: (token: string, user: any) => void, cancel?: () => void) {
        this.logger.sender(sender, '§a正在获取授权二维码...')
        let scan = this.httpPost('https://reward.yumc.pw/auth/scan', { ...scanObj, type: scanType })
        if (scan.code == 200) {
@@ -313,6 +368,9 @@ export class MiaoReward extends interfaces.Plugin {
    }

    private bindCheck(sender: org.bukkit.entity.Player) {
+        if (!this.ProtocolLibrary) {
+            return this.logger.sender(sender, `§4服务器未安装 ProtocolLib 无法扫码功能 请安装后重试!`)
+        }
        let scanning = this.playerTaskCache.has(sender.getName())
        if (scanning) {
            this.logger.sender(sender, "§4当前正在进行扫码 请稍候重试!")
@@ -320,7 +378,7 @@ export class MiaoReward extends interfaces.Plugin {
        return scanning
    }

-    cmdopen(sender: org.bukkit.entity.Player) {
+    private cmdopen(sender: org.bukkit.entity.Player) {
        if (this.bindCheck(sender)) return
        this.logger.sender(sender, '§a正在获取小程序二维码...')
        let sync = { scaned: false }
@@ -328,7 +386,7 @@ export class MiaoReward extends interfaces.Plugin {
        this.taskManager.create(() => sync.scaned = true).later(20 * 50).submit()
    }

-    cmdbind(sender: org.bukkit.entity.Player, server: boolean) {
+    private cmdbind(sender: org.bukkit.entity.Player, server: boolean) {
        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
        if (this.bindCheck(sender)) return
        if (server) {
@@ -338,9 +396,9 @@ export class MiaoReward extends interfaces.Plugin {
        }
    }

-    cmddraw(sender: org.bukkit.entity.Player, amount: number) {
+    private cmddraw(sender: org.bukkit.entity.Player, amount: number) {
        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
-        if (!this.playerInfoCache.has(sender.getName())) { return this.logger.sender(sender, '§c当前用户尚未绑定服务器玩家账号 请先执行 /mrd bind 绑定账号!') }
+        if (!this.playerInfoCache.get(sender.getName())) { return this.logger.sender(sender, '§c当前用户尚未绑定服务器玩家账号 请先执行 /mrd bind 绑定账号!') }
        amount = Number(amount)
        if (!Number.isInteger(amount)) {
            return this.logger.sender(sender, '§4金额必须是数字!')
@@ -356,7 +414,7 @@ export class MiaoReward extends interfaces.Plugin {
                "是否授权 " + this.serverInfo.name + " 兑换喵币",
                "兑换玩家: " + sender.getName(),
                "兑换数量: " + amount,
-                "兑换比例: " + parseFloat(this.serverInfo.ratio),
+                "兑换比例: " + this.serverInfo.ratio,
                "预计到帐: " + (amount * this.serverInfo.ratio).toFixed(0),
                "注意: 数据可能更新不及时 请以实际到账金额为准!"
            ].join('\n')
@@ -390,6 +448,7 @@ export class MiaoReward extends interfaces.Plugin {
            this.logger.sender(sender, draw.msg.split('\n').map(s => s.replace('点券', this.config.coinName)))
            this.sendBroadcast(sender, `${this.config.prefix}§6玩家 §b${sender.getName()} §6成功将 §a${amount}喵币 §6兑换成 §c${draw.data}${this.config.coinName}!`)
            this.sendBroadcast(sender, `${this.config.prefix}§c/mrd help §b查看广告系统帮助 §6快来一起看广告赚${this.config.coinName}吧!`)
+            this.queryUser(sender)
        }).submit()
    }

@@ -404,7 +463,7 @@ export class MiaoReward extends interfaces.Plugin {
        ])
    }

-    cmdrank(sender: any, boardcast: boolean) {
+    private cmdrank(sender: any, boardcast: boolean) {
        if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
        let result = this.httpPost(`https://reward.yumc.pw/server/rank`, {
            id: this.config.serverId,
@@ -425,7 +484,7 @@ export class MiaoReward extends interfaces.Plugin {
        }
    }

-    cmdserver(sender: any) {
+    private cmdserver(sender: any) {
        if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
        let result = this.httpPost(`https://reward.yumc.pw/server/server`, {
            id: this.config.serverId,
@@ -445,7 +504,7 @@ export class MiaoReward extends interfaces.Plugin {
        ])
    }

-    cmdratio(sender: any, ratioStr: string, confirm: string) {
+    private cmdratio(sender: any, ratioStr: string, confirm: string) {
        if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
        let [ratio, mbr, msg] = this.ratio2string(ratioStr)
@@ -484,7 +543,7 @@ export class MiaoReward extends interfaces.Plugin {
        })
    }

-    cmdreload() {
+    private cmdreload() {
        this.config.reload()
    }

@@ -556,65 +615,74 @@ export class MiaoReward extends interfaces.Plugin {
        this.setItemAndTp(sender, bindUrl, sync)
    }

-    private sendActionBar(sender, message) {
+    public sendActionBar(sender, message) {
        if (!this.downgrade) {
            this.chat.sendActionBar(sender, message)
        }
    }

-    private sendTitle(sender, title, subtitle?) {
+    public sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 20, time: number = 100, fadeOut: number = 20) {
        if (!title) return
        if (this.downgrade) {
            this.logger.sender(sender, `${title}${subtitle ? ` ${subtitle}` : ''}`)
        } else {
-            this.chat.sendTitle(sender, title, subtitle)
+            this.chat.sendTitle(sender, title, subtitle, fadeIn, time, fadeOut)
        }
    }

-    private setItemAndTp(sender: org.bukkit.entity.Player, content: string, sync: { scaned: boolean }) {
+    public clearTitle(sender) {
+        this.chat.clearTitle(sender)
+    }
+
+    public setItemAndTp(sender: org.bukkit.entity.Player, content: string, sync: { scaned: boolean, left?: number, cancelled?: boolean }, name: string = '手机QQ扫描二维码', tip: string = '手机QQ扫描二维码') {
        this.taskManager.create(() => {
-            let bindingLeftTime = 55
+            if (!sync.left) { sync.left = 55 }
+            sync.cancelled = false
            let task = this.taskManager.create(() => {
                try {
-                    if (sync.scaned || !sender.isOnline() || !this.isHoldQrCodeItem(sender) || --bindingLeftTime < 0) {
-                        if (bindingLeftTime < 0) {
+                    if (sync.scaned || !sender.isOnline() || !this.isHoldQrCodeItem(sender) || --sync.left < 0) {
+                        if (sync.left < 0) {
                            this.logger.sender(sender, '§c二维码已过期 请重新获取 如已扫码请忽略!')
                            task.cancel()
                        }
                        this.cancelTask(sender)
+                        sync.cancelled = true
                        return
                    }
-                    this.sendActionBar(sender, `§c§l手机QQ扫描二维码 剩余 ${bindingLeftTime} 秒...`)
+                    this.sendActionBar(sender, `§c§l${tip} 剩余 ${sync.left} 秒...`)
                } catch (error) {
                    console.ex(error)
                }
            }, this).async().later(20).timer(20).submit()
            this.playerTaskCache.set(sender.getName(), task)
-            if (this.downgrade) {
-                this.logger.sender(sender, '§c低版本客户端 二维码渲染中 请等待 3 秒 稍候扫码!')
-                let waitTask = this.taskManager.create(() => {
-                    let temp = sender.getLocation()
-                    temp.setPitch(-90)
-                    sender.teleport(temp)
-                }, this).later(0).timer(20).submit()
-                this.taskManager.create(() => {
-                    waitTask.cancel()
-                    let temp = sender.getLocation()
-                    temp.setPitch(90)
-                    sender.teleport(temp)
-                }).later(80).submit()
-            }
+            if (this.downgrade) { this.downgradeTask(sender) }
            this.playerImageCache.set(sender.getName(), org.bukkit.map.MapPalette.imageToBytes(this.createQrcode(content)))
            if (!this.downgrade) {
                let temp = sender.getLocation()
                temp.setPitch(90)
                sender.teleport(temp)
            }
-            this.sendWindowItems(sender, this.createQrCodeMapItem())
+            this.sendWindowItems(sender, this.createQrCodeMapItem(name))
            sender.sendMap(this.zeroMapView)
+            this.taskManager.create(() => this.sendWindowItems(sender, this.createQrCodeMapItem(name))).later(20).async().submit()
        }).submit()
    }

+    private downgradeTask(sender) {
+        this.logger.sender(sender, '§c低版本客户端 二维码渲染中 请等待 3 秒 稍候扫码!')
+        let waitTask = this.taskManager.create(() => {
+            let temp = sender.getLocation()
+            temp.setPitch(-90)
+            sender.teleport(temp)
+        }, this).later(0).timer(20).submit()
+        this.taskManager.create(() => {
+            waitTask.cancel()
+            let temp = sender.getLocation()
+            temp.setPitch(90)
+            sender.teleport(temp)
+        }).later(80).submit()
+    }
+
    private queryUser(sender: org.bukkit.entity.Player, sync = false) {
        if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
        let result = this.httpPost(`https://reward.yumc.pw/server/queryUser`, {
@@ -624,13 +692,11 @@ export class MiaoReward extends interfaces.Plugin {
            username: sender.getName(),
            sync
        })
-        if (result?.code == 200) {
-            this.playerInfoCache.set(sender.getName(), result.data)
-        }
+        this.playerInfoCache.set(sender.getName(), result?.code == 200 ? result.data : null)
        return result
    }

-    cmdquery(sender: org.bukkit.entity.Player) {
+    private cmdquery(sender: org.bukkit.entity.Player) {
        let info = this.queryUser(sender)
        if (info.code !== 200) {
            return this.logger.sender(sender, '§4查询异常! §cError: ' + info.msg)
@@ -648,11 +714,12 @@ export class MiaoReward extends interfaces.Plugin {
            `§6签    到: §b${data.sign}`,
            `§6视频广告: §b${data.video}`,
            `§6盒子广告: §b${data.box}`,
+            `§6积木广告: §b${data.block}`,
            '§6==========================='
        ])
    }

-    private httpPost(url, data) {
+    public httpPost(url, data) {
        let startTime = Date.now()
        let result = http.post(url, data)
        console.debug(`
@@ -664,7 +731,7 @@ CAST TIME   : ${Date.now() - startTime}`)
        return result
    }

-    private createQrCodeMapItem() {
+    private createQrCodeMapItem(name: string = '手机QQ扫描二维码') {
        let item: org.bukkit.inventory.ItemStack
        item = new org.bukkit.inventory.ItemStack(org.bukkit.Material.FILLED_MAP || org.bukkit.Material.MAP)
        let meta = <org.bukkit.inventory.meta.MapMeta>item.getItemMeta()
@@ -675,7 +742,7 @@ CAST TIME   : ${Date.now() - startTime}`)
        } else {
            item.setDurability(this.zeroMapView.getId())
        }
-        meta.setDisplayName('§c请使用手机QQ扫描二维码!')
+        meta.setDisplayName(`§c${name}`)
        meta.setLore(["QRCODE"])
        item.setItemMeta(meta)
        return item
@@ -714,31 +781,33 @@ CAST TIME   : ${Date.now() - startTime}`)
    }

    @Listener()
-    PlayerJoinEvent(event: org.bukkit.event.player.PlayerJoinEvent) {
+    private PlayerJoinEvent(event: org.bukkit.event.player.PlayerJoinEvent) {
        const player = event.getPlayer()
        this.bungeeCordDetect(player)
        this.updatePlayerInfo(player)
-        this.taskManager.create(() => this.logger.sender(player, `§a本服已使用喵式奖励 §3可以看广告赚${this.config.coinName} §c/mrd help §b查看帮助!`)).later(50).submit()
+        if (this.config.joinTip) {
+            this.taskManager.create(() => this.logger.sender(player, `§a本服已使用喵式奖励 §3可以看广告赚${this.config.coinName} §c/mrd help §b查看帮助!`)).later(50).submit()
+        }
    }

    @Listener()
-    PlayerDropItemEvent(event: org.bukkit.event.player.PlayerDropItemEvent) {
+    private PlayerDropItemEvent(event: org.bukkit.event.player.PlayerDropItemEvent) {
        if (this.checkAndClear(event.getPlayer())) {
            event.setCancelled(true)
        }
    }

    @Listener()
-    PlayerItemHeldEvent(event: org.bukkit.event.player.PlayerItemHeldEvent) {
+    private PlayerItemHeldEvent(event: org.bukkit.event.player.PlayerItemHeldEvent) {
        this.checkAndClear(event.getPlayer())
    }

    @Listener()
-    PlayerQuitEvent(event: org.bukkit.event.player.PlayerQuitEvent) {
+    private PlayerQuitEvent(event: org.bukkit.event.player.PlayerQuitEvent) {
        this.checkAndClear(event.getPlayer())
    }

-    private cancelTask(player) {
+    public cancelTask(player) {
        if (!this.playerTaskCache.has(player.getName())) { return }
        this.checkAndClear(player)
        this.sendActionBar(player, "")
@@ -760,7 +829,7 @@ CAST TIME   : ${Date.now() - startTime}`)
        return false
    }

-    cmdhelp(sender: any) {
+    private cmdhelp(sender: any) {
        let help = [
            `§6====== ${this.config.prefix} §a帮助菜单 §6======`,
            `§6/mrd bind §a绑定圈云盒子`,
@@ -785,7 +854,7 @@ CAST TIME   : ${Date.now() - startTime}`)
    }

    @Tab()
-    tabmrd(sender: any, _command: any, args: string | any[]) {
+    private tabmrd(sender: any, _command: any, args: string | any[]) {
        if (args.length === 1) return ['help', 'bind', 'show', 'statistic', 'query', 'draw', 'ratio', 'rank', 'server']
        if (args.length === 2 && args[0] === "bind" && sender.isOp()) return ['server']
    }
--- a/packages/plugins/src/MiaoRobot.ts
+++ b/packages/plugins/src/MiaoRobot.ts
@@ -0,0 +1,95 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+/// <reference types="typescript" />
+// @ts-ignore
+require.clear('websocket/client')
+import { server } from '@ccms/api'
+import { Autowired, Container, ContainerInstance } from '@ccms/container'
+import { Cmd, JSPlugin, Tab, interfaces, PluginConfig, Config } from '@ccms/plugin'
+import { WebSocket } from '@ccms/websocket'
+
+const defaultConfig = {
+    address: '',
+    token: ''
+}
+//https://github3.mk-proxy.ml/-----https://github.com/Mrs4s/go-cqhttp/releases/download/v0.9.34/go-cqhttp-v0.9.34-linux-amd64
+@JSPlugin({ version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class MiaoRobot extends interfaces.Plugin {
+    @Autowired()
+    private server: server.Server
+
+    private client: WebSocket
+
+    @Config()
+    private config: PluginConfig & typeof defaultConfig = defaultConfig
+
+    load() {
+    }
+
+    private downloadRobot() {
+        //https://api.github.com/repos/Mrs4s/go-cqhttp/releases?per_page=1&page=1
+    }
+
+    enable() {
+    }
+
+    disable() {
+        this.cmdclose(this.server.getConsoleSender())
+    }
+
+    @Cmd({ autoMain: true })
+    mbot() { }
+
+    cmdconnect(sender: org.bukkit.entity.Player, address: string = this.config.address, token: string = this.config.token) {
+        if (!address || !token) {
+            return this.logger.sender(sender, '§4错误 请配置服务器地址和Token!')
+        }
+        this.cmdclose(sender)
+        try {
+            this.client = new WebSocket(address, '', { Authorization: `Bearer ${token}` })
+            this.initRobot(this.client)
+        } catch (error) {
+            console.ex(error)
+        }
+    }
+
+    private initRobot(client: WebSocket) {
+        client.onopen = () => {
+            this.logger.console(`§3连接到 §b${client.url} §a成功!`)
+        }
+        client.onmessage = (event) => {
+            let messageEvent = JSON.parse(event.data)
+            switch (messageEvent.post_type) {
+                case "message":
+                    this.logger.console(`§6接收到 §3群 §b${messageEvent.group_id} §2成员 §a${messageEvent.sender.nickname} §6的消息: §r${messageEvent.message}`)
+                    break
+            }
+        }
+        client.onclose = (event) => {
+            this.logger.console(`§4连接已断开 §6Code: §3${event.code} §6原因: §c${event.reason}!`)
+        }
+        client.onerror = (event) => {
+            this.logger.console(`§4发生错误: §r${event.error}`)
+            console.ex(event.error)
+        }
+    }
+
+    cmdclose(sender: org.bukkit.entity.Player) {
+        if (this.client && this.client.readyState != WebSocket.CLOSED) {
+            this.client.close(0, 'plugin close socket')
+        }
+    }
+
+    cmdsend(sender: org.bukkit.entity.Player, text: string) {
+        if (this.client) {
+            this.client.send(text)
+            this.logger.sender(sender, '§a发送成功!')
+        }
+    }
+
+    @Tab()
+    tabmbot(_sender: any, _command: string, _args: string[]) {
+        return []
+    }
+}
--- a/packages/plugins/src/MiaoScriptPackageManager.ts
+++ b/packages/plugins/src/MiaoScriptPackageManager.ts
@@ -11,12 +11,14 @@ let help = [
    '§6========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §bMiaoWoo §6=========',
    '§6/mspm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
    '§6/mspm §aload §e<插件名称>     §6-  §3安装本地插件',
-    '§6/mspm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
+    '§6/mspm §cunload §e<插件名称>   §6-  §3卸载已安装插件',
    '§6/mspm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
+    '§6/mspm §cdelete §e<插件名称>   §6-  §3删除已安装插件',
    '§6/mspm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
    '§6/mspm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
-    '§6/mspm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
-    '§6/mspm §arun §e<JS代码>        §6-  §3运行JS代码',
+    '§6/mspm §aupgrade §e[插件名称|system]  §6-  §3升级插件/§4框架(§csystem§3)',
+    '§6/mspm §arun §e[插件名称] §3<JS代码>        §6-  §3运行JS代码',
+    '§6/mspm §aprun  §e<JS代码>        §6-  §3运行JS代码',
    '§6/mspm §adeploy §e<插件名称>   §6-  §3发布插件',
    '§6/mspm §crestart             §6-  §4重启MiaoScript脚本引擎'
 ]
@@ -43,7 +45,7 @@ let langMap = {
    'plugin.name.empty': '§c请输入插件名称!',
    'cloud.update.finish': '§6成功从 §aMiaoScriptPackageCenter §6获取到 §a{length} §6个插件!',
    'cloud.not.exists': '§6当前 §aMiaoScriptPackageCenter §c不存在 §a{name} §c插件!',
-    'cloud.update.exists': '§6插件 §b{name} §a发现新版本 §3{new_version} §6当前版本 §3{old_version}!',
+    'cloud.update.exists': '§6插件 §b{name} §6版本 §3{old_version} §a发现更新 §3{new_version} §r{changelog}§6!',
    'download.start': '§6开始下载插件: §b{name} §6版本 §3{version}',
    'download.url': '§6插件下载地址: §b{url}',
    'download.finish': '§6插件 §b{name} §6版本 §3{version} §a下载完毕 开始加载 ...',
@@ -105,7 +107,7 @@ class SpongeFakeSender extends FakeSender {
    }
 }

-@JSPlugin({ prefix: 'PM', version: '1.3.1', author: 'MiaoWoo', source: __filename })
+@JSPlugin({ prefix: 'PM', version: '1.3.2', author: 'MiaoWoo', source: __filename })
 export class MiaoScriptPackageManager extends interfaces.Plugin {
    @Autowired()
    private pluginManager: pluginApi.PluginManager
@@ -132,6 +134,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
    public serverName: string
    private translate: Translate
    private channelOff: { off: () => void }
+    private subCommandCache = []

    load() {
        this.translate = new Translate({
@@ -139,6 +142,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
            fallbackMap
        })
        this.updateRepo(this.server.getConsoleSender())
+        this.subCommandCache = Object.keys(this).filter(c => c.startsWith('cmd') && typeof this[c] == "function")
    }

    @enable({ servers: [constants.ServerType.Bukkit, constants.ServerType.Sponge] })
@@ -329,6 +333,8 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
                try {
                    this.i18n(sender, 'upgrade.start')
                    base.delete(enginePath)
+                    // @ts-ignore
+                    require.setUpgradeMode?.(true)
                    this.cmdrestart(sender)
                } catch (ex) {
                    if (global.debug) {
@@ -356,6 +362,15 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
        }
    }

+    cmddelete(sender: any, name: string) {
+        if (this.checkPlugin(sender, name)) {
+            let plugin = this.pluginManager.getPlugins().get(name)
+            this.i18n(sender, 'plugin.delete.start', { name, version: plugin.description.version })
+            base.delete(plugin.description.source)
+            this.i18n(sender, 'plugin.delete.finish', { name, version: plugin.description.version })
+        }
+    }
+
    cmdreload(sender: any, name: string) {
        name = name || this.description.name
        this.reload(sender, name)
@@ -383,7 +398,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
    }

    cmdrestart(sender: any) {
-        setTimeout(() => {
+        this.taskManager.callSyncMethod(() => {
            if (this.serverType === "sponge") {
                this.server.dispatchConsoleCommand('sponge plugins reload')
                return
@@ -398,7 +413,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
                this.logger.sender(sender, "§3MiaoScript Engine §6Reload §cError! ERR: " + ex)
                this.logger.sender(sender, this.logger.stack(ex))
            }
-        }, 0)
+        })
    }

    cmdrun(sender: any, ...args: any[]) {
@@ -477,7 +492,7 @@ return eval(${JSON.stringify(code)});`)

    @Tab({ alias: ['gmspm', 'bungeemspm'] })
    tabmspm(_sender: any, _command: any, args: string | any[]) {
-        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'prun', 'sudo', 'help', 'create', 'deploy'] }
+        if (args.length === 1) { return ['list', 'install', 'update', 'load', 'unload', 'upgrade', 'reload', 'restart', 'run', 'prun', 'sudo', 'help', 'create', 'deploy'] }
        if (args.length > 1) {
            switch (args[0]) {
                case "list":
@@ -514,7 +529,12 @@ return eval(${JSON.stringify(code)});`)
                let cloudPlugin = this.packageCache[p.description.name]
                //§6插件名称: §b{name}\n§6版本: §a{version}\n§6作者: §3{author}\§6更新时间: §9{updated_at}
                if (cloudPlugin && cloudPlugin.version != p.description.version) {
-                    this.i18n(sender, 'cloud.update.exists', { name: p.description.name, new_version: cloudPlugin.version, old_version: p.description.version })
+                    this.i18n(sender, 'cloud.update.exists', {
+                        name: p.description.name,
+                        new_version: cloudPlugin.version,
+                        old_version: p.description.version,
+                        changelog: cloudPlugin.changelog || ''
+                    })
                }
            })
        }).async().submit()
--- a/packages/polyfill/.npmignore
+++ b/packages/polyfill/.npmignore
--- a/packages/polyfill/package.json
+++ b/packages/polyfill/package.json
@@ -1,7 +1,7 @@
 {
-    "name": "@ccms/ployfill",
-    "version": "0.12.0",
-    "description": "MiaoScript ployfill package",
+    "name": "@ccms/polyfill",
+    "version": "0.14.0",
+    "description": "MiaoScript polyfill package",
    "author": "MiaoWoo <admin@yumc.pw>",
    "homepage": "https://github.com/circlecloud/ms.git",
    "license": "ISC",
@@ -14,14 +14,15 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "dependencies": {
-        "@ccms/i18n": "^0.12.0",
-        "@ccms/nodejs": "^0.12.0",
-        "core-js": "^3.7.0"
+        "@ccms/i18n": "^0.14.0",
+        "@ccms/nashorn": "^0.14.0",
+        "@ccms/nodejs": "^0.14.0",
+        "core-js": "^3.9.1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.13.0",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/polyfill/src/es5-ext.ts
+++ b/packages/polyfill/src/es5-ext.ts
--- a/packages/polyfill/src/index.ts
+++ b/packages/polyfill/src/index.ts
@@ -1,15 +1,15 @@
 /// <reference types="@ccms/nashorn" />
 import '@ccms/nodejs'
 import i18n from '@ccms/i18n'
-let ployfillStartTime = new Date().getTime()
+let polyfillStartTime = new Date().getTime()
 i18n.initialize()
-console.i18n("ms.ployfill.initialize")
-require('./es5-ext')
-require('./node-shim')
-require('core-js')
+console.i18n("ms.polyfill.initialize")
+import './es5-ext'
+import './node-shim'
+import 'core-js'
 //@ts-ignore
 process.on('exit', () => require.disable())
 global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 global.setGlobal('Blob', require('blob-polyfill').Blob)
-console.i18n("ms.ployfill.completed", { time: (new Date().getTime() - ployfillStartTime) / 1000 })
+console.i18n("ms.polyfill.completed", { time: (new Date().getTime() - polyfillStartTime) / 1000 })
--- a/packages/polyfill/src/node-shim.ts
+++ b/packages/polyfill/src/node-shim.ts
@@ -1,8 +1,13 @@
 import { EventEmitter } from 'events'

+const System = Java.type('java.lang.System')
 const Thread = Java.type('java.lang.Thread')
+const InterruptedException = Java.type('java.lang.InterruptedException')
 const ThreadGroup = Java.type("java.lang.ThreadGroup")
 const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
+const Callable = Java.type('java.util.concurrent.Callable')
+const ThreadFactory = Java.type("java.util.concurrent.ThreadFactory")
+const TimeoutException = Java.type('java.util.concurrent.TimeoutException')
 const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor')
 const LinkedBlockingQueue = Java.type("java.util.concurrent.LinkedBlockingQueue")
 const TimeUnit = Java.type('java.util.concurrent.TimeUnit')
@@ -12,18 +17,24 @@ const JavaScriptTask = Java.type(base.getJavaScriptTaskClass().name)
 const threadCount = new AtomicInteger(0)
 const threadGroup = new ThreadGroup("@ccms/ployfill-micro-task")
 const microTaskPool = new ThreadPoolExecutor(
-    100, 200, 60, Packages.java.util.concurrent.TimeUnit.SECONDS,
+    100, 200, 60, TimeUnit.SECONDS,
    new LinkedBlockingQueue(300),
-    (run: any) => new Thread(threadGroup, run, "@ccms/micro-task-" + threadCount.incrementAndGet()),
-    new ThreadPoolExecutor.CallerRunsPolicy()
+    new ThreadFactory((run: any) => new Thread(threadGroup, run, "@ccms/micro-task-" + threadCount.incrementAndGet()))
 )
 class Process extends EventEmitter {
    env = {
        __noSuchProperty__: (prop) => {
-            return Packages.java.lang.System.getenv(prop)
+            return System.getenv(prop)
        }
    }
-    platform = Packages.java.lang.System.getProperty("os.name")
+    platform = System.getProperty("os.name")
+    constructor() {
+        super()
+        this.on('exit', () => {
+            console.log(`await microTaskPool termination! queueTask: ${microTaskPool.shutdownNow().size()} remainTask: ${threadGroup.activeCount()}`)
+            microTaskPool.awaitTermination(3000, TimeUnit.MILLISECONDS)
+        })
+    }
    on(event: string | symbol, listener: (...args: any[]) => void) {
        return super.on(event, (...args) => {
            try {
@@ -41,29 +52,44 @@ class Process extends EventEmitter {
        microTaskPool.execute(func)
    }
    exit(code: number) {
-        process.emit('exit', code)
-        console.log(`process exit await microTaskPool termination! queueTask: ${microTaskPool.shutdownNow().size()} remainTask: ${threadGroup.activeCount()}`)
-        microTaskPool.awaitTermination(3000, TimeUnit.MILLISECONDS)
+        console.log(`process exit by code ${code}!`)
+        this.emit('exit', code)
+    }
+
+    toString() {
+        return "[object process]"
    }
 }

 class EventLoop {
    private eventLoopMainThread = undefined
    private eventLoopTaskQueue = new DelayQueue()
+    private taskExecTimeout = 3
+    private fixedThreadPool = undefined

    constructor() {
+        this.taskExecTimeout = parseInt(process.env.MS_NODE_EVENT_LOOP_TIMEOUT) || 3
+        this.fixedThreadPool = new ThreadPoolExecutor(
+            1, 1, 0, TimeUnit.SECONDS,
+            new LinkedBlockingQueue(300),
+            new ThreadFactory((run: any) => {
+                let thread = new Thread(run, "@ccms/node-shim/event-loop-exec")
+                thread.setDaemon(true)
+                return thread
+            }))
        this.eventLoopMainThread = new Thread(() => {
            let task = undefined
            try {
-                while ((task = this.eventLoopTaskQueue.take()) != undefined) {
+                while (!this.eventLoopMainThread.isInterrupted()) {
+                    task = this.eventLoopTaskQueue.take()
                    try {
                        task.getTask()()
-                    } catch (error) {
+                    } catch (cause) {
                        try {
-                            process.emit('error', error)
+                            process.emit('error', cause)
                        } catch (error) {
-                            console.error(error)
-                            console.ex(error)
+                            console.error(cause)
+                            console.ex(cause)
                        }
                    }
                }
@@ -79,15 +105,52 @@ class EventLoop {
            }
        }, "@ccms/node-shim/event-loop")
        this.eventLoopMainThread.setDaemon(true)
-        process.on('exit', () => this.eventLoopMainThread.interrupt())
+        process.on('exit', () => {
+            this.eventLoopMainThread.interrupt()
+            this.fixedThreadPool.shutdownNow()
+            console.log(`await fixedThreadPool termination!`)
+            this.fixedThreadPool.awaitTermination(3000, TimeUnit.MILLISECONDS)
+        })
    }

    startEventLoop() {
        this.eventLoopMainThread.start()
    }

-    private putDelayTask(callback: Function, ms: number) {
-        this.eventLoopTaskQueue.put(new JavaScriptTask(callback, ms))
+    private putDelayTask(id: number, callback: Function, ms: number) {
+        this.eventLoopTaskQueue.put(new JavaScriptTask(id, callback, ms))
+    }
+
+    private limitTimeTask(name: string, callback: Function, ...args: any[]) {
+        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}!`) }
+        try {
+            this.fixedThreadPool.submit(new Callable({
+                call: () => {
+                    try {
+                        callback.apply(undefined, args)
+                    } catch (cause) {
+                        cause = cause.getCause && cause.getCause() || cause
+                        try {
+                            process.emit('error', cause)
+                        } catch (error) {
+                            console.error(cause)
+                            console.ex(cause)
+                        }
+                    }
+                }
+            })).get(this.taskExecTimeout, TimeUnit.SECONDS)
+        } catch (error) {
+            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!`)
+            }
+            throw error.getCause && error.getCause() || error
+        }
    }

    private timeoutCount = new AtomicInteger(0)
@@ -96,9 +159,9 @@ class EventLoop {
        let taskId = this.timeoutCount.incrementAndGet()
        this.timeoutTasks[taskId] = callback
        console.trace(`create setTimeout task ${taskId} => ${callback}`)
-        this.putDelayTask(() => {
+        this.putDelayTask(taskId, () => {
            if (this.timeoutTasks[taskId]) {
-                callback(...args)
+                this.limitTimeTask(`setTimeout-${taskId}`, callback, ...args)
            } else {
                console.trace(`ignore setTimeout ${ms}ms task ${taskId} because it's cancelled!`)
            }
@@ -117,13 +180,13 @@ class EventLoop {
        console.trace(`create setInterval ${ms}ms task ${taskId} => ${callback}`)
        let intervalTask = () => {
            if (this.intervalTasks[taskId]) {
-                callback(...args)
-                this.putDelayTask(intervalTask, ms)
+                this.limitTimeTask(`setInterval-${taskId}`, callback, ...args)
+                this.putDelayTask(taskId, intervalTask, ms)
            } else {
                console.trace(`ignore setInterval task ${taskId} because it's cancelled!`)
            }
        }
-        this.putDelayTask(intervalTask, ms)
+        this.putDelayTask(taskId, intervalTask, ms)
        return taskId
    }
    clearInterval(taskId: number) {
@@ -131,13 +194,14 @@ class EventLoop {
    }
 }
 global.setGlobal('process', new Process(), {})
+Object.defineProperty(process, require('core-js/es/symbol/to-string-tag'), { value: '[object process]' })
 const eventLoop = new EventLoop()
-global.setGlobal('eventLoop', eventLoop, {})
+Object.defineProperty(process, 'eventLoop', { value: eventLoop })
 eventLoop.startEventLoop()
 global.setGlobal('queueMicrotask', (func: any) => microTaskPool.execute(func), {})
 global.setGlobal('setTimeout', eventLoop.setTimeout.bind(eventLoop), {})
 global.setGlobal('clearTimeout', eventLoop.clearTimeout.bind(eventLoop), {})
-global.setGlobal('setImmediate', (callback: (...args: any[]) => void, ...args: any[]) => eventLoop.setTimeout(callback, 0, ...args), {})
-global.setGlobal('clearImmediate ', eventLoop.clearTimeout.bind(eventLoop), {})
 global.setGlobal('setInterval', eventLoop.setInterval.bind(eventLoop), {})
 global.setGlobal('clearInterval', eventLoop.clearInterval.bind(eventLoop), {})
+global.setGlobal('setImmediate', (callback: (...args: any[]) => void, ...args: any[]) => eventLoop.setTimeout(callback, 0, ...args), { writable: true })
+global.setGlobal('clearImmediate ', eventLoop.clearTimeout.bind(eventLoop), { writable: true })
--- a/packages/polyfill/src/proxy.ts
+++ b/packages/polyfill/src/proxy.ts
@@ -1,4 +1,4 @@
-import { ProxyHandle } from '@ccms/nashorn'
+import type { ProxyHandle } from '@ccms/nashorn'

 // Nashorn JSAdapter See https://wiki.openjdk.java.net/display/Nashorn/Nashorn+extensions#Nashornextensions-JSAdapterconstructor
 let createProxy = eval(`
--- a/packages/polyfill/src/task.ts
+++ b/packages/polyfill/src/task.ts
--- a/packages/polyfill/src/xml-http-request.ts
+++ b/packages/polyfill/src/xml-http-request.ts
--- a/packages/polyfill/tsconfig.json
+++ b/packages/polyfill/tsconfig.json
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/protocol",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript protocol package",
    "keywords": [
        "miaoscript",
@@ -22,6 +22,6 @@
    "devDependencies": {
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/sponge/package.json
+++ b/packages/sponge/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/sponge",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript api package",
    "keywords": [
        "miaoscript",
@@ -22,11 +22,11 @@
        "@javatypes/sponge-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/spring/package.json
+++ b/packages/spring/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/spring",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript spring package",
    "keywords": [
        "miaoscript",
@@ -21,12 +21,12 @@
    "devDependencies": {
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/common": "^0.12.0",
-        "@ccms/container": "^0.12.0",
-        "@ccms/database": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/common": "^0.14.0",
+        "@ccms/container": "^0.14.0",
+        "@ccms/database": "^0.14.0"
    }
 }
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/web",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript web package",
    "keywords": [
        "miaoscript",
@@ -26,10 +26,10 @@
        "@javatypes/tomcat": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    },
    "dependencies": {
-        "@ccms/api": "^0.12.0",
-        "@ccms/container": "^0.12.0"
+        "@ccms/api": "^0.14.0",
+        "@ccms/container": "^0.14.0"
    }
 }
--- a/packages/websocket/package.json
+++ b/packages/websocket/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@ccms/websocket",
-    "version": "0.12.0",
+    "version": "0.14.0",
    "description": "MiaoScript websocket package",
    "keywords": [
        "miaoscript",
@@ -19,10 +19,10 @@
        "test": "echo \"Error: run tests from root\" && exit 1"
    },
    "devDependencies": {
-        "@ccms/nashorn": "^0.12.0",
+        "@ccms/nashorn": "^0.14.0",
        "@javatypes/tomcat-websocket-api": "^0.0.3",
        "reflect-metadata": "^0.1.13",
        "rimraf": "^3.0.2",
-        "typescript": "^4.0.5"
+        "typescript": "^4.2.3"
    }
 }
--- a/packages/websocket/src/client/index.ts
+++ b/packages/websocket/src/client/index.ts
@@ -0,0 +1,98 @@
+
+import { EventEmitter } from 'events'
+import { Transport } from './transport'
+import { CloseEvent, ErrorEvent, Event, EventType, MessageEvent, WebSocketHeader } from './interface'
+
+export class WebSocketManager {
+    private clients = new Map<string, WebSocket>()
+
+    constructor() {
+        process.on('exit', () => {
+            for (const client of this.clients.values()) {
+                client.close(0, `client ${client.id} close connect`)
+            }
+            this.clients.clear()
+        })
+    }
+
+    add(client: WebSocket) {
+        this.clients.set(client.id, client)
+    }
+    del(client: WebSocket) {
+        this.clients.delete(client.id)
+    }
+}
+
+export const managers = new WebSocketManager()
+
+export class WebSocket extends EventEmitter {
+    public static CONNECTING = 0
+    public static OPEN = 1
+    public static CLOSING = 2
+    public static CLOSED = 3
+    public binaryType: 'blob' | 'arraybuffer'
+
+    protected _url: string
+    protected _headers: WebSocketHeader = {}
+
+    private client: Transport
+
+    constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
+        super()
+        this._url = url
+        this._headers = headers
+        try {
+            let TransportImpl = require('./netty').NettyWebSocket
+            this.client = new TransportImpl(url, subProtocol, headers)
+        } catch (error) {
+            console.error('create websocket impl error: ' + error)
+            console.ex(error)
+            return
+        }
+        this.client.on('open', (event) => {
+            this.onopen?.(event)
+            managers.add(this)
+        })
+        this.client.on('message', (event) => this.onmessage?.(event))
+        this.client.on('close', (event) => {
+            this.onclose?.(event)
+            managers.del(this)
+        })
+        this.client.on('error', (event) => this.onerror?.(event))
+        setTimeout(() => this.client.connect(), 20)
+    }
+    get id() {
+        return this.client.id
+    }
+    get bufferedAmount() {
+        throw new Error("Method not implemented.")
+    }
+    get extensions() {
+        throw new Error("Method not implemented.")
+    }
+    get protocol() {
+        return this.client.protocol
+    }
+    get readyState() {
+        return this.client.readyStatus
+    }
+    get url() {
+        return this._url
+    }
+    public onopen: (event: Event) => void
+    public onmessage: (event: MessageEvent) => void
+    public onclose: (event: CloseEvent) => void
+    public onerror: (event: ErrorEvent) => void
+
+    addEventListener(event: EventType, callback: () => void) {
+        this[`on${event.toLowerCase()}`] = callback
+        this.client.on(event, callback)
+    }
+    public send(data: any) {
+        this.client.send(data)
+    }
+    public close(code?: number, reason?: string) {
+        this.client.close(code, reason)
+        this.removeAllListeners()
+    }
+}
--- a/packages/websocket/src/client/interface.ts
+++ b/packages/websocket/src/client/interface.ts
@@ -0,0 +1,27 @@
+
+export interface WebSocketHeader {
+    [key: string]: string
+}
+
+export type EventType =
+    | 'close'
+    | 'error'
+    | 'message'
+    | 'open'
+export interface Event {
+
+}
+export interface MessageEvent extends Event {
+    data: any
+    origin?: string
+    lastEventId?: string
+    source?: string
+    ports?: string
+}
+export interface ErrorEvent extends Event {
+    error: Error
+}
+export interface CloseEvent extends Event {
+    code: number
+    reason: string
+}
--- a/packages/websocket/src/client/netty/adapter/handler.ts
+++ b/packages/websocket/src/client/netty/adapter/handler.ts
@@ -0,0 +1,24 @@
+const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')
+export abstract class WebSocketClientHandlerAdapter {
+    private _Handler
+    constructor() {
+        let WebSocketClientHandlerAdapterImpl = Java.extend(SimpleChannelInboundHandler, {
+            isSharable: this.isSharable.bind(this),
+            handlerAdded: this.handlerAdded.bind(this),
+            channelActive: this.channelActive.bind(this),
+            channelInactive: this.channelInactive.bind(this),
+            channelRead0: this.channelRead0.bind(this),
+            exceptionCaught: this.exceptionCaught.bind(this)
+        })
+        this._Handler = new WebSocketClientHandlerAdapterImpl()
+    }
+    abstract isSharable(): void
+    abstract handlerAdded(ctx: any): void
+    abstract channelActive(ctx: any): void
+    abstract channelInactive(ctx: any): void
+    abstract channelRead0(ctx: any, msg: any): void
+    abstract exceptionCaught(ctx: any, cause: Error): void
+    getHandler() {
+        return this._Handler
+    }
+}
--- a/packages/websocket/src/client/netty/handler.ts
+++ b/packages/websocket/src/client/netty/handler.ts
@@ -0,0 +1,63 @@
+import { EventEmitter } from 'events'
+import { NettyWebSocket } from '.'
+import { WebSocketClientHandlerAdapter } from './adapter/handler'
+
+const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
+const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
+const CloseWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.CloseWebSocketFrame')
+const FullHttpResponse = Java.type('io.netty.handler.codec.http.FullHttpResponse')
+
+export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
+    public handshaker: any
+    public handshakeFuture: any//ChannelPromise
+    private client: NettyWebSocket
+    constructor(handshaker: any, client: NettyWebSocket) {
+        super()
+        this.handshaker = handshaker
+        this.client = client
+    }
+    isSharable() {
+        return true
+    }
+    handlerAdded(ctx: any) {
+        console.trace(`${ctx} handlerAdded`)
+        this.handshakeFuture = ctx.newPromise()
+    }
+    channelActive(ctx: any) {
+        console.trace(`${ctx} channelActive`)
+        this.handshaker.handshake(ctx.channel())
+    }
+    channelInactive(ctx: any) {
+        console.trace(`${ctx} channelInactive`)
+        this.client.onclose({ code: 0, reason: 'server connection channel inactive!' })
+    }
+    channelRead0(ctx: any, msg: any) {
+        console.trace(`${ctx} channelRead0 ${msg}`)
+        let ch = ctx.channel()
+        if (!this.handshaker.isHandshakeComplete()) {
+            // web socket client connected
+            this.handshaker.finishHandshake(ch, msg)
+            this.handshakeFuture.setSuccess()
+            return
+        }
+
+        if (msg instanceof FullHttpResponse) {
+            let response = msg
+            throw new Error(`Unexpected FullHttpResponse (getStatus=${response.getStatus()}, content=${response.content().toString(CharsetUtil.UTF_8)})`)
+        }
+
+        let frame = msg
+        if (frame instanceof TextWebSocketFrame) {
+            this.client.onmessage({ data: frame.text() })
+        } else if (frame instanceof CloseWebSocketFrame) {
+            this.client.onclose({ code: 0, reason: 'server send CloseWebSocketFrame!' })
+        }
+    }
+    exceptionCaught(ctx: any, cause: Error) {
+        console.trace(`${ctx} exceptionCaught ${cause}`)
+        this.client.onerror({ error: cause })
+        if (!this.handshakeFuture.isDone()) {
+            this.handshakeFuture.setFailure(cause)
+        }
+    }
+}
--- a/packages/websocket/src/client/netty/index.ts
+++ b/packages/websocket/src/client/netty/index.ts
@@ -0,0 +1,88 @@
+
+import { WebSocketHeader } from '../interface'
+import { Transport } from '../transport'
+import { WebSocketClientHandler } from './handler'
+
+const URI = Java.type('java.net.URI')
+const Epoll = Java.type('io.netty.channel.epoll.Epoll')
+const Bootstrap = Java.type('io.netty.bootstrap.Bootstrap')
+const ChannelFutureListener = Java.type('io.netty.channel.ChannelFutureListener')
+
+const NioEventLoopGroup = Java.type('io.netty.channel.nio.NioEventLoopGroup')
+const NioSocketChannel = Java.type('io.netty.channel.socket.nio.NioSocketChannel')
+
+const EpollEventLoopGroup = Java.type('io.netty.channel.epoll.EpollEventLoopGroup')
+const EpollSocketChannel = Java.type('io.netty.channel.epoll.EpollSocketChannel')
+
+const WebSocketClientHandshakerFactory = Java.type('io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory')
+const WebSocketVersion = Java.type('io.netty.handler.codec.http.websocketx.WebSocketVersion')
+
+const HttpClientCodec = Java.type('io.netty.handler.codec.http.HttpClientCodec')
+const HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAggregator')
+const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
+const CloseWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.CloseWebSocketFrame')
+
+const ChannelInitializer = Java.type('io.netty.channel.ChannelInitializer')
+const DefaultHttpHeaders = Java.type('io.netty.handler.codec.http.DefaultHttpHeaders')
+
+const epull = Epoll.isAvailable()
+const group = epull ? new EpollEventLoopGroup() : new NioEventLoopGroup()
+const socketChannelClass = epull ? EpollSocketChannel.class : NioSocketChannel.class
+process.on('exit', () => group.shutdownGracefully())
+
+export class NettyWebSocket extends Transport {
+    private channel: any
+    private b = new Bootstrap();
+
+    constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
+        super(url, subProtocol, headers)
+    }
+    getId() {
+        return this.channel?.id() + ''
+    }
+    doConnect() {
+        let uri = URI.create(this._url)
+        let headers = new DefaultHttpHeaders()
+        for (const key of Object.getOwnPropertyNames(this._headers || {})) {
+            headers.add(key, this._headers[key])
+        }
+        // Connect with V13 (RFC 6455 aka HyBi-17). You can change it to V08 or V00.
+        // If you change it to V00, ping is not supported and remember to change
+        // HttpResponseDecoder to WebSocketHttpResponseDecoder in the pipeline.
+        let handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory
+            .newHandshaker(uri, WebSocketVersion.V13, null, false, headers), this)
+        this.b.group(group)
+            .channel(socketChannelClass)
+            .handler(new ChannelInitializer({
+                initChannel: (ch: any) => {
+                    let pipeline = ch.pipeline()
+                    pipeline.addLast("http-codec", new HttpClientCodec())
+                    pipeline.addLast("aggregator", new HttpObjectAggregator(65536))
+                    pipeline.addLast("websocket", handler.getHandler())
+                }
+            }))
+        this.b.connect(uri.getHost(), uri.getPort()).addListener(new ChannelFutureListener((future: any) => {
+            this.channel = future.sync().channel()
+            this.onconnection({})
+            handler.handshakeFuture.addListener(new ChannelFutureListener((future: any) => {
+                try {
+                    future.sync()
+                    this.onconnect({})
+                } catch (error) {
+                    console.debug(error)
+                }
+            }))
+        }))
+    }
+    doSend(text: string) {
+        this.channel.writeAndFlush(new TextWebSocketFrame(text))
+    }
+    doClose(code: number, reason: string) {
+        this.channel.writeAndFlush(new CloseWebSocketFrame())
+        this.channel.close()
+        this.channel.closeFuture().addListener(new ChannelFutureListener(() => console.debug(`NettyWebSocket close code: ${code} reason: ${reason}`)))
+    }
+    getChannel() {
+        return this.channel
+    }
+}
--- a/packages/websocket/src/client/transport.ts
+++ b/packages/websocket/src/client/transport.ts
@@ -0,0 +1,100 @@
+import { EventEmitter } from 'events'
+import { WebSocket } from './index'
+import { CloseEvent, ErrorEvent, Event, MessageEvent, WebSocketHeader } from './interface'
+
+export abstract class Transport extends EventEmitter {
+    protected _url: string
+    protected _state: number = WebSocket.CONNECTING
+    protected _protocol: string
+    protected _headers: WebSocketHeader = {}
+
+    constructor(uri: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
+        super()
+        this._url = uri
+        this._protocol = subProtocol
+        this._headers = headers
+    }
+
+    get id() {
+        return this.getId()
+    }
+
+    get protocol() {
+        return this._protocol
+    }
+
+    get readyStatus() {
+        return this._state
+    }
+
+    set readyStatus(state: number) {
+        this._state = state
+    }
+
+    connect() {
+        try {
+            this.doConnect()
+        } catch (error) {
+            this.onerror({ error })
+        }
+    }
+
+    send(text: string) {
+        try {
+            this.doSend(text)
+        } catch (error) {
+            this.onerror({ error })
+        }
+    }
+
+    close(code: number = 0, reason: string = '') {
+        if (this.readyStatus != WebSocket.CLOSING && this.readyStatus != WebSocket.CLOSED) {
+            this.readyStatus = WebSocket.CLOSING
+            try {
+                this.onclose({ code, reason })
+                this.doClose(code, reason)
+            } catch (error) {
+                this.onerror({ error })
+            }
+        } else {
+            console.debug(`${this.id} call close but state is ${this.readyStatus}`)
+        }
+    }
+
+    onconnection(event: Event) {
+        this._state == WebSocket.CONNECTING
+        this.emit('connecting', event)
+    }
+
+    onconnect(event: Event) {
+        console.debug(`${this.id} call onconnect`)
+        if (this.readyStatus != WebSocket.OPEN) {
+            this.readyStatus = WebSocket.OPEN
+            this.emit('open', event)
+        } else {
+            console.debug(`${this.id} call onconnect but state is ${this.readyStatus}`)
+        }
+    }
+
+    onmessage(event: MessageEvent) {
+        this.emit('message', event)
+    }
+
+    onerror(event: ErrorEvent) {
+        this.emit('error', event)
+    }
+
+    onclose(event: CloseEvent) {
+        if (this.readyStatus != WebSocket.CLOSED) {
+            this.readyStatus = WebSocket.CLOSED
+            this.emit('close', event)
+            this.removeAllListeners()
+        } else {
+            console.debug(`${this.id} call onclose but state is ${this.readyStatus} CloseEvent[code: ${event.code}, reason: ${event.reason}]`)
+        }
+    }
+    abstract getId()
+    abstract doConnect()
+    abstract doSend(text: string)
+    abstract doClose(code: number, reason: string)
+}
--- a/packages/websocket/src/index.ts
+++ b/packages/websocket/src/index.ts
@@ -45,3 +45,6 @@ let io: SocketStatic = function (pipeline: any, options: Partial<ServerOptions>)
 io.Instance = Symbol("@ccms/websocket")
 export default io
 export * from './socket-io'
+export * from './client'
+export * from './server'
+export * from './transport'
--- a/packages/websocket/src/netty/adapter/httprequest.ts
+++ b/packages/websocket/src/netty/adapter/httprequest.ts
@@ -3,18 +3,19 @@ const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInb
 const FullHttpRequestMatcher = TypeParameterMatcher.get(base.getClass('io.netty.handler.codec.http.FullHttpRequest'))

 export abstract class HttpRequestHandlerAdapter {
-    private _Handler;
+    private _Handler
    constructor() {
        let HttpRequestHandlerAdapterImpl = Java.extend(SimpleChannelInboundHandler, {
+            isSharable: () => true,
            acceptInboundMessage: (msg: any) => {
                return FullHttpRequestMatcher.match(msg)
            },
            channelRead0: this.channelRead0.bind(this)
        })
-        this._Handler = new HttpRequestHandlerAdapterImpl();
+        this._Handler = new HttpRequestHandlerAdapterImpl()
    }
-    abstract channelRead0(ctx: any, request: any);
+    abstract channelRead0(ctx: any, request: any)
    getHandler() {
-        return this._Handler;
+        return this._Handler
    }
 }
--- a/packages/websocket/src/netty/adapter/text_websocket_frame.ts
+++ b/packages/websocket/src/netty/adapter/text_websocket_frame.ts
@@ -6,6 +6,7 @@ export abstract class TextWebSocketFrameHandlerAdapter {
    private _Handler
    constructor() {
        let TextWebSocketFrameHandlerAdapterImpl = Java.extend(SimpleChannelInboundHandler, {
+            isSharable: () => true,
            userEventTriggered: this.userEventTriggered.bind(this),
            acceptInboundMessage: (msg: any) => {
                return TextWebSocketFrameMatcher.match(msg)
--- a/packages/websocket/src/netty/adapter/websocket.ts
+++ b/packages/websocket/src/netty/adapter/websocket.ts
@@ -4,6 +4,7 @@ export abstract class WebSocketHandlerAdapter {
    private _Handler
    constructor() {
        let ChannelInboundHandlerAdapterImpl = Java.extend(ChannelInboundHandlerAdapter, {
+            isSharable: () => true,
            channelRead: this.channelRead.bind(this),
            channelInactive: this.channelInactive.bind(this),
            channelUnregistered: this.exceptionCaught.bind(this),
--- a/packages/websocket/src/netty/index.ts
+++ b/packages/websocket/src/netty/index.ts
@@ -65,6 +65,5 @@ class NettyWebSocketServer extends EventEmitter {

 export {
    NettyWebSocketServer,
-    ServerEvent,
    NettyClient
 }
--- a/packages/websocket/src/server/index.ts
+++ b/packages/websocket/src/server/index.ts
@@ -0,0 +1,52 @@
+import { EventEmitter } from 'events'
+
+import { Transport } from '../transport'
+
+interface ServerOptions {
+    event?: EventEmitter
+    root?: string
+    /**
+     * name of the path to capture
+     * @default "/socket.io"
+     */
+    path: string
+}
+
+interface WebSocketServerImpl extends EventEmitter {
+    close(): void
+}
+
+export class WebSocketServer extends EventEmitter {
+    options: Partial<ServerOptions>
+    private websocketServer: WebSocketServerImpl
+
+    constructor(instance: any, options: Partial<ServerOptions>) {
+        super()
+        if (!instance) { throw new Error('instance can\'t be undefiend!') }
+        this.options = Object.assign({
+            event: new EventEmitter(),
+            path: '/ws',
+            root: root + '/wwwroot',
+        }, options)
+        this.selectServerImpl(instance)
+    }
+
+    on(event: "connect", cb: (transport: Transport) => void): this
+    on(event: "message", cb: (transport: Transport, text: string) => void): this
+    on(event: "disconnect", cb: (transport: Transport, reason: string) => void): this
+    on(event: "error", cb: (transport: Transport, cause: Error) => void): this
+    on(event: string, cb: (transport: Transport, extra?: any) => void): this {
+        this.websocketServer.on(event, cb)
+        return this
+    }
+
+    private selectServerImpl(instance: any) {
+        let WebSocketServerImpl = undefined
+        if (instance.class.name.startsWith('io.netty.channel')) {
+            WebSocketServerImpl = require("../netty").NettyWebSocketServer
+        } else {
+            WebSocketServerImpl = require("../tomcat").TomcatWebSocketServer
+        }
+        this.websocketServer = new WebSocketServerImpl(instance, this.options)
+    }
+}
--- a/packages/websocket/src/socket-io/client.ts
+++ b/packages/websocket/src/socket-io/client.ts
@@ -350,7 +350,7 @@ export class Client extends EventEmitter {
     *
     * @api private
     */
-    resetPingTimeout(timeout) {
+    resetPingTimeout(timeout: number) {
        clearTimeout(this.pingTimeoutTimer)
        this.pingTimeoutTimer = setTimeout(() => {
            if (this.conn.readyState === "closed") return
--- a/packages/websocket/src/socket-io/index.ts
+++ b/packages/websocket/src/socket-io/index.ts
@@ -4,8 +4,6 @@ import { ServerEvent } from './constants'
 import { Namespace } from './namespace'
 import { Client } from './client'
 import { Parser } from './parser'
-import { PacketTypes, SubPacketTypes } from './types'
-import { Packet } from './packet'
 import { Socket } from './socket'
 import { Adapter } from './adapter'
 import { Transport } from '../transport'
--- a/packages/websocket/src/tomcat/index.ts
+++ b/packages/websocket/src/tomcat/index.ts
@@ -5,9 +5,7 @@ import { ServerEvent } from '../socket-io/constants'
 import { ProxyBeanName } from './constants'
 import { TomcatClient } from './client'

-const WebSocketServerProxy = Java.type("pw.yumc.MiaoScript.websocket.WebSocketProxy")
 const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor')
-const ThreadPoolTaskExecutor = Java.type('org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor')

 type TomcatWebSocketSession = javax.websocket.Session

@@ -22,7 +20,7 @@ class TomcatWebSocketServer extends EventEmitter {
        this.beanFactory = beanFactory
        this.initThreadPool()
        try { this.beanFactory.destroySingleton(ProxyBeanName) } catch (error) { }
-        let NashornWebSocketServerProxy = Java.extend(WebSocketServerProxy, {
+        let NashornWebSocketServerProxy = Java.extend(Java.type("pw.yumc.MiaoScript.websocket.WebSocketProxy"), {
            onOpen: (session: TomcatWebSocketSession) => {
                let cid = `${session?.getId()}`
                let tomcatClient = new TomcatClient(this, session)
@@ -58,6 +56,7 @@ class TomcatWebSocketServer extends EventEmitter {
        this.beanFactory.registerSingleton(ProxyBeanName, new NashornWebSocketServerProxy())
    }
    private initThreadPool() {
+        const ThreadPoolTaskExecutor = Java.type('org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor')
        this.executor = new ThreadPoolTaskExecutor()
        this.executor.setCorePoolSize(10)
        this.executor.setMaxPoolSize(100)
@@ -76,6 +75,5 @@ class TomcatWebSocketServer extends EventEmitter {

 export {
    TomcatWebSocketServer,
-    ServerEvent,
    TomcatClient
 }
Author	SHA1	Message	Date
MiaoWoo	5c90ac3b1f	v0.14.0	2021-03-26 17:20:41 +08:00
MiaoWoo	653d7268cf	chorn: update depends version Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 17:20:22 +08:00
MiaoWoo	efa5e6d110	backup: plugins & docs Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 16:43:45 +08:00
MiaoWoo	ceb354f11e	feat: update client Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 16:43:14 +08:00
MiaoWoo	d97af356fd	fix: config value update error Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 16:42:45 +08:00
MiaoWoo	6fd7174ca5	refactor: optimize websocket server Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 16:42:02 +08:00
MiaoWoo	784ea2d65a	refactor: rename ployfill to polyfill Signed-off-by: MiaoWoo <admin@yumc.pw>	2021-03-26 16:18:11 +08:00
MiaoWoo	3ccc9b3d06	v0.13.0	2020-12-17 17:04:30 +08:00
MiaoWoo	beef57d85d	feat: backup plugins Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 17:02:46 +08:00
MiaoWoo	166b17b527	feat: export server & client Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 17:01:09 +08:00
MiaoWoo	d6ca19a56f	feat: add netty WebSocket client Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 17:00:27 +08:00
MiaoWoo	c61f87a449	feat: js task limit exec time default 3s Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 17:00:00 +08:00
MiaoWoo	ede3f83dd5	fix: java file lineNumer lose Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 16:59:06 +08:00
MiaoWoo	69ef3b3979	feat: add compile plugin info Signed-off-by: MiaoWoo <admin@yumc.pw>	2020-12-17 16:58:37 +08:00