v0.10.1

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

.editorconfig

@@ -0,0 +1,12 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.9.1",
+    "version": "0.10.1",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,17 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.0",
+        "@ccms/nashorn": "^0.10.1",
-        "@javatypes/amqp-client": "^0.0.2",
+        "@javatypes/amqp-client": "^0.0.3",
-        "@javatypes/spring-amqp": "^0.0.2",
+        "@javatypes/spring-amqp": "^0.0.3",
-        "@javatypes/spring-rabbit": "^0.0.2",
+        "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     }
 }

packages/amqp/src/adapter/container.ts

@@ -2,7 +2,7 @@ import { ConnectionFactoryAdapter, ConnectionFactory } from "./connection"
 import { ChannelAwareMessageListenerAdapter, ChannelAwareMessageListener } from "./listener"
 
 export const SimpleMessageListenerContainer = org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-export const AcknowledgeMode: org.springframework.amqp.core.AcknowledgeMode = Java.type('org.springframework.amqp.core.AcknowledgeMode')
+export const AcknowledgeMode = org.springframework.amqp.core.AcknowledgeMode
 interface ContainerConfig {
     connectionFactory: ConnectionFactoryAdapter | typeof ConnectionFactory
     queueNames: string[]

packages/amqp/src/admin.ts

@@ -46,7 +46,7 @@ export class AmqpAdmin {
     }
 
     declareBinding(queue: string, exchange: string, routerKey: string, argument: any = null) {
-        let binding = new this.Binding(queue, this.DestinationType.QUEUE, exchange, routerKey, argument)
+        let binding = new this.Binding(queue, org.springframework.amqp.core.Binding.DestinationType.QUEUE, exchange, routerKey, argument)
         this.amqpAdmin.declareBinding(binding)
         return this
     }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/ployfill": "^0.9.0",
+        "@ccms/ployfill": "^0.10.1",
-        "base64-js": "^1.3.1",
+        "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
         "@types/base64-js": "^1.3.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     }
 }

packages/api/src/channel.ts

@@ -1,4 +1,4 @@
-import { injectable } from "@ccms/container";
+import { injectable } from "@ccms/container"
 
 export namespace channel {
     /**
@@ -17,32 +17,32 @@ export namespace channel {
          * @param exec 执行器
          */
         listen(plugin: any, channel: string, exec: ChannelListener) {
-            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError('Plugin can\'t be undefiend!');
+            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError('Plugin can\'t be undefiend!')
-            let name = plugin.description.name;
+            let name = plugin.description.name
             let listener = this.register(channel, exec)
-            if (!this.listenerMap[name]) this.listenerMap[name] = [];
+            if (!this.listenerMap[name]) this.listenerMap[name] = []
             let offExec = () => {
-                this.unregister(channel, listener);
+                this.unregister(channel, listener)
-                console.debug(`[${name}] unregister channel ${channel}`);
+                console.debug(`[${name}] unregister channel ${channel}`)
-            };
+            }
             var off = {
                 channel,
                 listener,
                 off: offExec
-            };
+            }
-            this.listenerMap[name].push(off);
+            this.listenerMap[name].push(off)
-            console.debug(`[${name}] register channel ${channel} => ${exec.name || '[anonymous]'}`);
+            console.debug(`[${name}] register channel ${channel} => ${exec.name || '[anonymous]'}`)
-            return off;
+            return off
         }
         /**
          * 关闭插件注册的通道
          * @param plugin 插件
          */
         disable(plugin: any) {
-            var channelCache = this.listenerMap[plugin.description.name];
+            var channelCache = this.listenerMap[plugin.description.name]
             if (channelCache) {
-                channelCache.forEach(t => t.off());
+                channelCache.forEach(t => t.off())
-                delete this.listenerMap[plugin.description.name];
+                delete this.listenerMap[plugin.description.name]
             }
         }
         /**

packages/api/src/chat.ts

@@ -1,5 +1,17 @@
+import { injectable } from '@ccms/container'
+
 export namespace chat {
+    @injectable()
     export abstract class Chat {
+        /**
+         * sendJsonChat
+         * @param sender reciver
+         * @param json json
+         * @param type chat Type 0: chat 1: system 2: actionBar
+         */
+        sendJson(sender: any, json: string | object, type = 0) {
+            throw new Error("Method not implemented.")
+        }
         sendMessage(sender: any, message: string) {
             throw new Error("Method not implemented.")
         }
@@ -9,7 +21,7 @@ export namespace chat {
         clearActionBar(sender: any) {
             this.sendActionBar(sender, '')
         }
-        sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+        sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 20, time: number = 100, fadeOut: number = 20) {
             throw new Error("Method not implemented.")
         }
         clearTitle(sender: any) {

packages/api/src/command.ts

@@ -1,6 +1,6 @@
 import i18n from '@ccms/i18n'
 import { injectable } from "@ccms/container"
-import { plugin } from './interfaces'
+import { plugin } from './plugin'
 
 export namespace command {
     @injectable()
@@ -13,7 +13,7 @@ export namespace command {
          */
         on(plugin: plugin.Plugin, name: string, exec: { cmd: Function, tab?: Function }) {
             var cmd = this.create(plugin, name)
-            if (!cmd) { throw Error("") }
+            if (!cmd) { throw Error(`Plugin ${plugin.description.name} can't create Command ${name}!`) }
             console.debug(i18n.translate("ms.api.command.register", { plugin: plugin.description.name, name, cmd }))
             if (exec.cmd && typeof exec.cmd === "function") {
                 this.onCommand(plugin, cmd, exec.cmd)
@@ -24,6 +24,9 @@ export namespace command {
                 this.onTabComplete(plugin, cmd, exec.tab)
             }
         }
+        public tabComplete(sender: any, input: string, index?: number): string[] {
+            throw new Error("Method not implemented.")
+        }
         /**
          * 取消命令注册
          * @param plugin 插件
@@ -59,9 +62,9 @@ export namespace command {
                     var complete = tabCompleter(sender, command, Java.from(args)) || []
                     return this.copyPartialMatches(complete, token)
                 } catch (ex) {
-                    console.i18n("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
+                    console.i18n("ms.api.command.tab.completer.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
                     console.ex(ex)
-                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
                     return []
                 }
             }

packages/api/src/console.ts

@@ -133,6 +133,7 @@ export class MiaoScriptConsole implements Console {
         }
     }
     stack(ex: Error, color: boolean = true): string[] {
+        if (!ex) return []
         let stack = ex.getStackTrace()
         let cache = [(color ? '§c' : '') + ex]
         //@ts-ignore

packages/api/src/constants.ts

@@ -1,4 +1,14 @@
 export namespace constants {
+    export namespace ServiceIdentifier {
+        /**
+         * Runtime Server NettyPipeline
+         */
+        export const NettyPipeline = Symbol("NettyPipeline")
+        /**
+         * Runtime Server RootLogger
+         */
+        export const RootLogger = Symbol("RootLogger")
+    }
     export namespace Reflect {
         export const Method = {
             getServerConnection: [/*spigot 1.8.8*/'aq',/*spigot 1.12.2*/ 'an', /*spigot 1.14.4+*/'getServerConnection', /*catserver 1.12.2*/'func_147137_ag']

packages/api/src/event.ts

@@ -130,23 +130,22 @@ export namespace event {
             }
             priority = priority || EventPriority.NORMAL
             ignoreCancel = ignoreCancel || false
+            // @ts-ignore
+            let executor = exec.name || exec.executor || '[anonymous]'
             // noinspection JSUnusedGlobalSymbols
             var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel)
             var listenerMap = this.listenerMap
             // add to cache Be used for close plugin to close event
             if (!listenerMap[name]) listenerMap[name] = []
-            var offExec = () => {
+            var off = () => {
+                if (off['offed']) return
+                off['offed'] = true
                 this.unregister(eventCls, listener)
-                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
+                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: executor }))
-            }
-            var off = {
-                event: eventCls,
-                listener: listener,
-                off: offExec
             }
             listenerMap[name].push(off)
             // noinspection JSUnresolvedVariable
-            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
+            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: executor }))
             return off
         }
 
@@ -157,7 +156,7 @@ export namespace event {
         disable(plugin: any) {
             var eventCache = this.listenerMap[plugin.description.name]
             if (eventCache) {
-                eventCache.forEach(t => t.off())
+                eventCache.forEach(off => off())
                 delete this.listenerMap[plugin.description.name]
             }
         }

packages/api/src/index.ts

@@ -1,10 +1,15 @@
 import "@ccms/nashorn"
 
+export * from './web'
+export * from './amqp'
 export * from './chat'
 export * from './task'
 export * from './event'
+export * from './proxy'
+export * from './plugin'
+export * from './server'
 export * from './console'
 export * from './channel'
 export * from './command'
+export * from './database'
 export * from './constants'
-export * from './interfaces'

packages/api/src/interfaces/index.ts

@@ -1,5 +0,0 @@
-export * from './web'
-export * from './amqp'
-export * from './plugin'
-export * from './server'
-export * from './database'

packages/api/src/interfaces/server/native_plugin.ts

@@ -1,6 +0,0 @@
-export interface NativePluginManager {
-    load(name: string): boolean;
-    unload(name: string): boolean;
-    reload(name: string): boolean;
-    delete(name: string): boolean;
-}

packages/api/src/plugin.ts

@@ -1,3 +1,5 @@
+import { injectable } from '@ccms/container'
+
 export namespace plugin {
     /**
      * MiaoScript Plugin
@@ -11,23 +13,20 @@ export namespace plugin {
      * Runtime Plugin Instance
      */
     export const PluginInstance = Symbol("PluginInstance")
-    /**
-     * MiaoScript Plugin Manager Symbol
-     */
-    export const PluginManager = Symbol("PluginManager")
     /**
      * MiaoScript Plugin Manager Interface
      */
-    export interface PluginManager {
+    @injectable()
-        scan(folder: string): void
+    export abstract class PluginManager {
-        build(): void
+        abstract scan(folder: string): void
-        loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin
+        abstract build(): void
-        load(...args: any[]): void
+        abstract loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin
-        enable(...args: any[]): void
+        abstract load(...args: any[]): void
-        disable(...args: any[]): void
+        abstract enable(...args: any[]): void
-        reload(...args: any[]): void
+        abstract disable(...args: any[]): void
-        getPlugin(name: string): plugin.Plugin
+        abstract reload(...args: any[]): void
-        getPlugins(): Map<string, plugin.Plugin>
+        abstract getPlugin(name: string): plugin.Plugin
+        abstract getPlugins(): Map<string, plugin.Plugin>
     }
     export const PluginScanner = Symbol("PluginScanner")
     /**
@@ -38,10 +37,6 @@ export namespace plugin {
          * 插件加载类型
          */
         type: string
-        /**
-         * 插件名称
-         */
-        name?: string
         /**
          * 插件文件
          */
@@ -116,22 +111,22 @@ export namespace plugin {
          * Load 阶段
          * @param plugin 插件
          */
-        load(plugin: Plugin): void
+        load?(plugin: Plugin): void
         /**
          * Enable 阶段
          * @param plugin 插件
          */
-        enable(plugin: Plugin): void
+        enable?(plugin: Plugin): void
         /**
          * Disable 阶段
          * @param plugin 插件
          */
-        disable(plugin: Plugin): void
+        disable?(plugin: Plugin): void
         /**
          * Reload 阶段
          * @param plugin 插件
          */
-        reload(plugin: Plugin): void
+        reload?(plugin: Plugin): void
     }
     export interface Plugin {
         description: PluginMetadata
@@ -167,6 +162,14 @@ export namespace plugin {
          * 插件作者 不填默认为 Unknow
          */
         author?: string | string[]
+        /**
+         * 脚本依赖
+         */
+        depends?: string[]
+        /**
+         * 插件依赖
+         */
+        nativeDepends?: string[]
         /**
          * 插件源文件 必须指定为 __filename
          */

packages/api/src/proxy.ts

@@ -0,0 +1,161 @@
+import { provideSingleton, Autowired, optional } from '@ccms/container'
+import { channel } from './channel'
+
+export namespace proxy {
+    const ByteArrayOutputStream = Java.type('java.io.ByteArrayOutputStream')
+    const DataOutputStream = Java.type('java.io.DataOutputStream')
+    namespace bungeecord {
+        const CHANNEL_NAME = "BungeeCord"
+        export class SubChannelBuilder {
+            private channel: channel.Channel
+            private player: any
+            private params: string[]
+            constructor(channel: channel.Channel, player: any) {
+                this.channel = channel
+                this.player = player
+                this.params = []
+            }
+            connect(server: string) {
+                this.params.push("Connect")
+                this.params.push(server)
+                return this.finalSend()
+            }
+            connectOther(player: string, server: string) {
+                this.params.push("ConnectOther")
+                this.params.push(player)
+                this.params.push(server)
+                return this.finalSend()
+            }
+            ip() {
+                this.params.push("IP")
+                return this.finalSend()
+            }
+            ipOther(player: string) {
+                this.params.push("IPOther")
+                this.params.push(player)
+                return this.finalSend()
+            }
+            playerCount(server: string | "ALL") {
+                this.params.push("PlayerCount")
+                this.params.push(server)
+                return this.finalSend()
+            }
+            /**
+             * Get a list of players connected on a certain server, or on ALL the servers.
+             * @param server count server
+             * Response:
+             * String server = in.readUTF(); // The name of the server you got the player list of, as given in args.
+             * String[] playerList = in.readUTF().split(", ");
+             */
+            playerList(server: string | "ALL") {
+                this.params.push("PlayerList")
+                this.params.push(server)
+                return this.finalSend()
+            }
+            /**
+             * Get a list of server name strings, as defined in BungeeCord's config.yml
+             * Response:
+             * String[] serverList = in.readUTF().split(", ");
+             */
+            getServers() {
+                this.params.push("GetServers")
+                return this.finalSend()
+            }
+            /**
+             * Get this server's name, as defined in BungeeCord's config.yml
+             */
+            getServer() {
+                this.params.push("GetServer")
+                return this.finalSend()
+            }
+            broadcast(message: string) {
+                this.message("ALL", message)
+                return this.finalSend()
+            }
+            /**
+             * Send a message (as in, a chat message) to the specified player.
+             * @param player who reciver message
+             * @param message message content
+             */
+            message(player: string | "ALL", message: string) {
+                this.params.push("Message")
+                this.params.push(player)
+                this.params.push(message)
+                return this.finalSend()
+            }
+            /**
+             * Send a raw message (as in, a chat message) to the specified player. The advantage of this method over Message is that you can include click events and hover events.
+             * @param player who reciver message
+             * @param message message content
+             */
+            messageRaw(player: string | "ALL", json: string) {
+                this.params.push("MessageRaw")
+                this.params.push(player)
+                this.params.push(json)
+                return this.finalSend()
+            }
+            forwardAll(channel: string, data: any) {
+                return this.forward("ALL", channel, data)
+            }
+            /**
+             * Send a custom plugin message to said server. This is one of the most useful channels ever.
+             * Remember, the sending and receiving server(s) need to have a player online.
+             * @param server reciver
+             * @param channel channelName
+             * @param data data
+             */
+            forward(server: string | "ALL", channel: string, data: any) {
+                this.params.push("Forward")
+                this.params.push(server)
+                this.params.push(channel)
+                this.params.push(typeof data === "string" ? data : JSON.stringify(data))
+                return this.finalSend()
+            }
+            /**
+             * Send a custom plugin message to said server. This is one of the most useful channels ever.
+             * Remember, the sending and receiving server(s) need to have a player online.
+             * @param server reciver
+             * @param channel channelName
+             * @param data data
+             */
+            forwardToPlayer(server: string | "ALL", channel: string, data: any) {
+                this.params.push("Forward")
+                this.params.push(server)
+                this.params.push(channel)
+                this.params.push(typeof data === "string" ? data : JSON.stringify(data))
+                return this.finalSend()
+            }
+            generic(...args: string[]) {
+                args && this.params.concat(...args)
+                return this.finalSend()
+            }
+            private send(...middlewares: ((out: java.io.DataOutputStream) => void)[]) {
+                let byteArray = new ByteArrayOutputStream()
+                let out = new DataOutputStream(byteArray)
+                this.params.forEach(utf => out.writeUTF(utf))
+                for (let middleware of middlewares) {
+                    middleware(out)
+                }
+                return this.channel.send(this.player, CHANNEL_NAME, byteArray.toByteArray())
+            }
+            private finalSend() {
+                return {
+                    send: this.send.bind(this)
+                }
+            }
+        }
+    }
+    @provideSingleton(BungeeCord)
+    export class BungeeCord {
+        @optional()
+        @Autowired()
+        private channel: channel.Channel
+        /**
+         * 获得代理
+         * @param player 玩家
+         */
+        for(player: any): bungeecord.SubChannelBuilder {
+            return new bungeecord.SubChannelBuilder(this.channel, player)
+        }
+    }
+}

packages/api/src/server.ts

@@ -1,8 +1,7 @@
 import * as reflect from '@ccms/common/dist/reflect'
-import { injectable, inject } from '@ccms/container'
+import { injectable, Autowired, ContainerInstance, Container, postConstruct } from '@ccms/container'
 
-import { NativePluginManager } from './native_plugin'
+import { constants } from './constants'
-import { constants } from '../../constants'
 
 export namespace server {
     /**
@@ -13,37 +12,72 @@ export namespace server {
      * Runtime Console
      */
     export const Console = Symbol("Console")
-    /**
-     * MiaoScript Server
-     */
-    export const Server = Symbol("Server")
     /**
      * Runtime Server Instance
      */
     export const ServerInstance = Symbol("ServerInstance")
+    @injectable()
+    export abstract class NativePluginManager {
+        has(name: string): boolean {
+            return true
+        }
+        load(name: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+        unload(name: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+        reload(name: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+        delete(name: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+    }
     /**
      * MiaoScript Server
      */
-    export interface Server {
+    @injectable()
-        getVersion(): string
+    export abstract class Server {
-        getPlayer(name: string): any
+        getVersion(): string {
-        getOnlinePlayers(): any[]
+            throw new Error("Method not implemented.")
-        getConsoleSender(): any
+        }
-        getService(service: string): any
+        getPlayer(name: string): any {
-        dispatchCommand(sender: string | any, command: string): boolean
+            throw new Error("Method not implemented.")
-        dispatchConsoleCommand(command: string): boolean
+        }
-        getPluginsFolder(): string
+        getOnlinePlayers(): any[] {
-        getNativePluginManager(): NativePluginManager
+            throw new Error("Method not implemented.")
-        getDedicatedServer?(): any
+        }
-        getNettyPipeline(): any
+        getConsoleSender(): any {
-        getRootLogger(): any
+            throw new Error("Method not implemented.")
-        sendJson(sender: string | any, json: object | string): void
+        }
-        tabComplete?(sender: string | any, input: string, index?: number): string[]
+        getService(service: string): any {
+            throw new Error("Method not implemented.")
+        }
+        dispatchCommand(sender: string | any, command: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+        dispatchConsoleCommand(command: string): boolean {
+            throw new Error("Method not implemented.")
+        }
+        getPluginsFolder(): string {
+            throw new Error("Method not implemented.")
+        }
+        getDedicatedServer?(): any {
+            throw new Error("Method not implemented.")
+        }
+        getNettyPipeline(): any {
+            throw new Error("Method not implemented.")
+        }
+        getRootLogger(): any {
+            throw new Error("Method not implemented.")
+        }
     }
     @injectable()
     export class ServerChecker {
-        @inject(ServerType)
+        @Autowired(ServerType)
         private serverType: string
+
         check(servers: string[]) {
             // Not set servers -> allow
             if (!servers || !servers.length) return true
@@ -58,56 +92,18 @@ export namespace server {
         }
     }
     @injectable()
-    export abstract class ReflectServer implements server.Server {
+    export abstract class ReflectServer extends server.Server {
+        @Autowired(ContainerInstance)
+        private container: Container
+
         protected pipeline: any
         protected rootLogger: any
 
         constructor() {
-            this.reflect()
+            super()
         }
 
-        getVersion(): string {
+        @postConstruct()
-            throw new Error("Method not implemented.")
-        }
-        getPlayer(name: string) {
-            throw new Error("Method not implemented.")
-        }
-        getOnlinePlayers(): any[] {
-            throw new Error("Method not implemented.")
-        }
-        getConsoleSender() {
-            throw new Error("Method not implemented.")
-        }
-        getService(service: string) {
-            throw new Error("Method not implemented.")
-        }
-        dispatchCommand(sender: any, command: string): boolean {
-            throw new Error("Method not implemented.")
-        }
-        dispatchConsoleCommand(command: string): boolean {
-            throw new Error("Method not implemented.")
-        }
-        getPluginsFolder(): string {
-            throw new Error("Method not implemented.")
-        }
-        getNativePluginManager(): NativePluginManager {
-            throw new Error("Method not implemented.")
-        }
-        getDedicatedServer() {
-            throw new Error("Method not implemented.")
-        }
-        getNettyPipeline() {
-            throw new Error("Method not implemented.")
-        }
-        getRootLogger() {
-            throw new Error("Method not implemented.")
-        }
-        sendJson(sender: any, json: string | object): void {
-            throw new Error("Method not implemented.")
-        }
-        tabComplete?(sender: any, input: string, index?: number): string[] {
-            throw new Error("Method not implemented.")
-        }
         protected reflect() {
             try {
                 let consoleServer = this.getDedicatedServer()
@@ -127,7 +123,11 @@ export namespace server {
                     if (connection.class.name.indexOf('ServerConnection') !== -1
                         || connection.class.name.indexOf('NetworkSystem') !== -1) { break }
                     connection = undefined
-                } catch (error) { }
+                } catch (error) {
+                    if (global.debug) {
+                        console.ex(error)
+                    }
+                }
             }
             if (!connection) { console.error("Can't found ServerConnection!"); return }
             for (const field of constants.Reflect.Field.listeningChannels) {
@@ -135,16 +135,30 @@ export namespace server {
                     promise = reflect.on(connection).get(field).get().get(0)
                     if (promise.class.name.indexOf('Promise') !== -1) { break }
                     promise = undefined
-                } catch (error) { }
+                } catch (error) {
+                    if (global.debug) {
+                        console.ex(error)
+                    }
+                }
             }
             if (!promise) { console.error("Can't found listeningChannels!"); return }
             this.pipeline = reflect.on(promise).get('channel').get().pipeline()
+            this.container.bind(constants.ServiceIdentifier.NettyPipeline).toConstantValue(this.pipeline)
         }
         protected reflectRootLogger(consoleServer: any) {
             try {
                 this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
             } catch (error) {
-                try { this.rootLogger = reflect.on(consoleServer).get(0).get().parent } catch (error) { }
+                if (global.debug) {
+                    console.ex(error)
+                }
+                try {
+                    this.rootLogger = reflect.on(consoleServer).get(0).get().parent
+                } catch (error) {
+                    if (global.debug) {
+                        console.ex(error)
+                    }
+                }
             }
             if (this.rootLogger && this.rootLogger.class.name.indexOf('Logger') === -1) {
                 console.error('Error Logger Class: ' + this.rootLogger.class.name)
@@ -155,6 +169,7 @@ export namespace server {
                 this.rootLogger = this.rootLogger.parent
             }
             if (!this.rootLogger) { console.error("Can't found rootLogger!") }
+            this.container.bind(constants.ServiceIdentifier.RootLogger).toConstantValue(this.rootLogger)
         }
     }
 }

packages/api/src/task.ts

@@ -1,34 +1,105 @@
+import { plugin } from './index'
+import { injectable } from '@ccms/container'
+
+const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
+
 export namespace task {
-    export const TaskManager = Symbol('TaskManager')
+    @injectable()
-    export interface TaskManager {
+    export abstract class TaskManager {
+        protected taskId: java.util.concurrent.atomic.AtomicInteger
+        protected cacheTasks = new Map<number, task.Task>()
+        protected pluginCacheTasks = new Map<string, Map<number, task.Task>>()
+
+        constructor() {
+            this.taskId = new AtomicInteger(0)
+            process.on('task.finish', (task: task.Task) => {
+                let taskId = task.getTaskId()
+                this.cacheTasks.delete(taskId)
+                let ownerName = task.getOwner()?.description.name
+                if (ownerName && this.pluginCacheTasks.has(ownerName)) {
+                    this.pluginCacheTasks.get(ownerName).delete(taskId)
+                }
+            })
+        }
+
+        protected pluginCreate(plugin: plugin.Plugin, task: task.Task) {
+            if (!this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.set(plugin.description.name, new Map())
+            }
+            this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
+            return task
+        }
+
+        protected pluginDisable(plugin: plugin.Plugin) {
+            if (this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.get(plugin.description.name).forEach((task) => {
+                    task.cancel()
+                })
+                this.pluginCacheTasks.delete(plugin.description.name)
+            }
+        }
+
+        /**
+         * 获得自增的任务ID
+         */
+        protected nextId() {
+            return this.taskId.incrementAndGet()
+        }
+
         /**
          * 创建任务
          * @param func 任务内容
          */
-        create(func: Function): task.Task;
+        create(func: Function, plugin?: plugin.Plugin): task.Task {
+            if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !') };
+            let task = this.create0(plugin, func, this.nextId())
+            this.cacheTasks.set(task.getTaskId(), task)
+            if (plugin) { return this.pluginCreate(plugin, task) }
+            return task
+        }
+        cancel(taskId: number) {
+            if (!this.cacheTasks.has(taskId)) { throw new Error(`Task ${taskId} not found!`) }
+            this.cacheTasks.get(taskId).cancel()
+        }
         /**
          * 在主线程执行代码
          * @param func 执行内容
          */
-        callSyncMethod(func: Function): any;
+        abstract callSyncMethod(func: Function): any
         /**
          * 关闭任务管理器
          */
-        disable();
+        disable(plugin?: plugin.Plugin) {
+            if (plugin) { return this.pluginDisable(plugin) }
+            this.disable0()
+        }
+        protected abstract create0(owner: plugin.Plugin, func: Function, id: number): task.Task
+        protected abstract disable0()
     }
     /**
      * 任务抽象
      */
-    export abstract class Task {
+    export abstract class Task implements Cancelable {
-        protected plugin: any;
+        protected func: Function
-        protected func: Function;
         protected isAsync: boolean = false;
         protected laterTime: number = 0;
         protected interval: number = 0;
+        protected owner: plugin.Plugin
+        protected taskId: number
+        protected innerTask: any
 
-        constructor(plugin: any, func: Function) {
+        constructor(owner: plugin.Plugin, func: Function, id: number) {
-            this.plugin = plugin;
+            this.owner = owner
-            this.func = func;
+            this.func = func
+            this.taskId = id
+        }
+
+        getOwner() {
+            return this.owner
+        }
+
+        getTaskId() {
+            return this.taskId
         }
 
         /**
@@ -36,8 +107,8 @@ export namespace task {
          * @param isAsync 是否异步
          */
         async(isAsync: boolean = true): task.Task {
-            this.isAsync = isAsync;
+            this.isAsync = isAsync
-            return this;
+            return this
         }
 
         /**
@@ -45,8 +116,8 @@ export namespace task {
          * @param tick 延时 Tick
          */
         later(tick: number): task.Task {
-            this.laterTime = tick;
+            this.laterTime = tick
-            return this;
+            return this
         }
 
         /**
@@ -54,16 +125,26 @@ export namespace task {
          * @param tick 循环时间 Tick
          */
         timer(tick: number): task.Task {
-            this.interval = tick;
+            this.interval = tick
-            return this;
+            return this
+        }
+
+        /**
+         * 取消任务
+         */
+        cancel(): boolean {
+            let result = this.cancel0()
+            process.emit('task.finish', this)
+            return result
         }
 
         protected run(...args: any[]): void {
             try {
-                this.func(...args);
+                this.func(...args)
+                !this.interval && process.emit('task.finish', this)
             } catch (ex) {
                 console.console('§4插件执行任务时发生错误', ex)
-                console.ex(ex);
+                console.ex(ex)
             }
         }
 
@@ -71,12 +152,27 @@ export namespace task {
          * 提交任务
          * @param args 任务参数
          */
-        abstract submit(...args: any[]): Cancelable;
+        submit(...args: any[]): Cancelable {
+            this.innerTask = this.submit0(...args)
+            return this
+        }
+
+        /**
+         * 提交任务
+         * @param args 任务参数
+         */
+        protected abstract submit0(...args: any[]): any
+        /**
+         * 取消任务
+         */
+        protected cancel0(): boolean {
+            return this.innerTask?.cancel()
+        }
     }
     /**
      * 返可取消的对象
      */
     export interface Cancelable {
-        cancel(): boolean;
+        cancel(): boolean
     }
 }

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.9.1",
+    "version": "0.10.1",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -19,14 +19,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spigot-api": "^0.0.2",
+        "@javatypes/spigot-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/bukkit/src/channel.ts

@@ -9,7 +9,7 @@ const Messenger = Bukkit.getMessenger()
 export class BukkitChannel extends channel.Channel {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
-
+    private cacheChannel = new Map<string, any[]>()
     /**
      * 给玩家发送通道消息
      * @param player 接受消息的玩家
@@ -26,15 +26,29 @@ export class BukkitChannel extends channel.Channel {
      * @param listener 监听器
      */
     register(channel: string, listener: channel.ChannelListener) {
-        Messenger.registerIncomingPluginChannel(this.pluginInstance, channel, new PluginMessageListener({
+        if (!this.cacheChannel.has(channel)) this.cacheChannel.set(channel, [])
+        this.cacheChannel.get(channel).push(listener)
+        let pluginMessageListener = new PluginMessageListener({
             onPluginMessageReceived: (/**String */ channel, /**Player */ player, /**byte[] */data) => {
+                try {
                     listener(data, { channel, player, data })
+                } catch (error) {
+                    console.ex(error)
                 }
-        }))
+            }
+        })
+        Messenger.registerIncomingPluginChannel(this.pluginInstance, channel, pluginMessageListener)
         Messenger.registerOutgoingPluginChannel(this.pluginInstance, channel)
+        return pluginMessageListener
     }
     unregister(channel: string, listener: any) {
-        Messenger.unregisterIncomingPluginChannel(this.pluginInstance, channel)
+        if (!this.cacheChannel.has(channel)) return
+        let cacheListener = this.cacheChannel.get(channel)
+        cacheListener = cacheListener.filter(l => l != listener)
+        Messenger.unregisterIncomingPluginChannel(this.pluginInstance, channel, listener)
+        if (cacheListener.length == 0) {
+            this.cacheChannel.delete(channel)
             Messenger.unregisterOutgoingPluginChannel(this.pluginInstance, channel)
         }
     }
+}

packages/bukkit/src/chat.ts

@@ -4,13 +4,20 @@ import bukkitChat from './enhance/chat'
 
 @provideSingleton(chat.Chat)
 export class BukkitChat extends chat.Chat {
+    sendJson(sender: any, json: string | object, type = 0) {
+        bukkitChat.send(sender, typeof json === "string" ? json : JSON.stringify(json), type)
+    }
     sendMessage(sender: any, message: string) {
-        bukkitChat.send(sender, { text: message }, 0)
+        this.sendJson(sender, { text: message }, 0)
     }
     sendActionBar(sender: any, message: string) {
-        bukkitChat.send(sender, { text: message }, 2)
+        this.sendJson(sender, { text: message }, 2)
     }
-    sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+    sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 20, time: number = 100, fadeOut: number = 20) {
+        try {
             sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
+        } catch (error) {
+            sender.sendTitle(title, subtitle)
+        }
     }
 }

packages/bukkit/src/command.ts

@@ -4,44 +4,47 @@ import { command, plugin } from '@ccms/api'
 import * as reflect from '@ccms/common/dist/reflect'
 import { provideSingleton, postConstruct, inject } from '@ccms/container'
 
-let Bukkit = org.bukkit.Bukkit;
+let Bukkit = org.bukkit.Bukkit
-let TabCompleter = Java.type('org.bukkit.command.TabCompleter');
+let TabCompleter = Java.type('org.bukkit.command.TabCompleter')
-let PluginCommand = Java.type('org.bukkit.command.PluginCommand');
+let PluginCommand = Java.type('org.bukkit.command.PluginCommand')
-let CommandExecutor = Java.type('org.bukkit.command.CommandExecutor');
+let CommandExecutor = Java.type('org.bukkit.command.CommandExecutor')
 
 @provideSingleton(command.Command)
 export class BukkitCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
-    private commandMap: any;
+    private commandMap: any
 
     @postConstruct()
     init() {
-        this.commandMap = reflect.on(Bukkit.getPluginManager()).get('commandMap').get();
+        this.commandMap = reflect.on(Bukkit.getPluginManager()).get('commandMap').get()
     }
     create(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
         if (cmd && cmd instanceof PluginCommand) { return cmd };
-        cmd = reflect.on(PluginCommand).create(command, this.pluginInstance).get();
+        cmd = reflect.on(PluginCommand).create(command, this.pluginInstance).get()
-        this.commandMap.register(plugin.description.name, cmd);
+        this.commandMap.register(plugin.description.name, cmd)
-        return cmd;
+        return cmd
     }
     remove(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
         if (cmd && cmd instanceof PluginCommand) {
-            cmd.unregister(this.commandMap);
+            cmd.unregister(this.commandMap)
         }
     }
+    tabComplete(sender: any, input: string, index?: number): string[] {
+        return Java.from(this.commandMap.tabComplete(sender, input))
+    }
     onCommand(plugin: any, command: any, executor: Function) {
         // 必须指定需要实现的接口类型 否则MOD服会报错
         command.setExecutor(new CommandExecutor({
             onCommand: super.setExecutor(plugin, command, executor)
-        }));
+        }))
     }
     onTabComplete(plugin: any, command: any, tabCompleter: Function) {
         // 必须指定需要实现的接口类型 否则MOD服会报错
         command.setTabCompleter(new TabCompleter({
             onTabComplete: super.setTabCompleter(plugin, command, tabCompleter)
-        }));
+        }))
     }
 }

packages/bukkit/src/enhance/chat.ts

@@ -9,6 +9,7 @@ let RemapUtils: any
 let playerConnectionFieldName: string
 let sendPacketMethodName: string
 
+let above_1_16 = false
 let downgrade = false
 /**
  * 获取NMS版本
@@ -59,12 +60,18 @@ function init() {
     let packetTypeClass = nmsCls("PacketPlayOutChat")
     PacketPlayOutChat = Java.type(packetTypeClass.getName())
     let packetTypeConstructor: { parameterTypes: any[] }
-    Java.from(packetTypeClass.constructors).forEach(function (c) {
+    let constructors = packetTypeClass.constructors
+    Java.from(constructors).forEach(function (c) {
         if (c.parameterTypes.length === 2) {
             packetTypeConstructor = c
         }
+        if (c.parameterTypes.length === 3) {
+            packetTypeConstructor = c
+            above_1_16 = true
+        }
     })
-    let nmsChatMessageTypeClass = packetTypeConstructor.parameterTypes[1]
+    let parameterTypes = packetTypeConstructor.parameterTypes
+    let nmsChatMessageTypeClass = parameterTypes[1]
     if (nmsChatMessageTypeClass.isEnum()) {
         chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
     }
@@ -83,7 +90,13 @@ function json(sender: { name: string }, json: string) {
 }
 
 function send(sender: any, json: any, type: number) {
-    sendPacket(sender, new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type]))
+    let packet
+    if (above_1_16) {
+        packet = new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type], sender.getUniqueId())
+    } else {
+        packet = new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type])
+    }
+    sendPacket(sender, packet)
 }
 
 function sendPacket(player: { handle: { [x: string]: { [x: string]: (arg0: any) => void } } }, p: any) {

packages/bukkit/src/index.ts

@@ -3,13 +3,14 @@
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'
 
-import { BukkitConsole } from './console';
+import { BukkitConsole } from './console'
-import './event';
+import './chat'
-import './server';
+import './task'
-import './command';
+import './event'
-import './channel';
+import './server'
-import './task';
+import './command'
+import './channel'
 
 export default function BukkitImpl(container: Container) {
-    container.bind(server.Console).toConstantValue(BukkitConsole);
+    container.bind(server.Console).toConstantValue(BukkitConsole)
 }

packages/bukkit/src/server.ts

@@ -16,13 +16,13 @@ export class BukkitServer extends server.ReflectServer {
     }
 
     getPlayer(name: string) {
-        return Bukkit.getPlayer(name)
+        return Bukkit.getPlayerExact(name)
     }
     getVersion(): string {
         return Bukkit.getVersion()
     }
     getOnlinePlayers() {
-        return Bukkit.getOnlinePlayers() as unknown as any[]
+        return Bukkit.getOnlinePlayers()
     }
     getConsoleSender() {
         return Bukkit.getConsoleSender()
@@ -54,13 +54,4 @@ export class BukkitServer extends server.ReflectServer {
     getRootLogger() {
         return this.rootLogger
     }
-    sendJson(sender: string | any, json: object | string): void {
-        if (typeof sender === "string") {
-            sender = this.getPlayer(sender)
-        }
-        let result = chat.json(sender, typeof json == "string" ? json : JSON.stringify(json))
-        if (result !== false) {
-            this.dispatchConsoleCommand(result)
-        }
-    }
 }

packages/bukkit/src/task.ts

@@ -1,35 +1,31 @@
 import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container';
+import { inject, provideSingleton } from '@ccms/container'
 
-const Bukkit = Java.type('org.bukkit.Bukkit');
+const Bukkit = Java.type('org.bukkit.Bukkit')
-const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable');
+const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable')
 const Callable = Java.type('java.util.concurrent.Callable')
 
 @provideSingleton(task.TaskManager)
-export class BukkitTaskManager implements task.TaskManager {
+export class BukkitTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any;
+        return new BukkitTask(owner, func, id)
-
-    create(func: Function): task.Task {
-        if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !'); };
-        return new BukkitTask(this.pluginInstance, func);
     }
     callSyncMethod(func: Function): any {
-        return Bukkit.getScheduler().callSyncMethod(this.pluginInstance, new Callable({ call: () => func() })).get()
+        return Bukkit.getScheduler().callSyncMethod(base.getInstance(), new Callable({ call: () => func() })).get()
     }
-    disable() {
+    disable0() {
-        Bukkit.getScheduler().cancelTasks(this.pluginInstance);
+        Bukkit.getScheduler().cancelTasks(base.getInstance())
     }
 }
 
 export class BukkitTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
+    submit0(...args: any[]): task.Cancelable {
         let run = new BukkitRunnable({ run: () => this.run(...args) })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
-            return run[funcName](this.plugin, this.laterTime, this.interval)
+            return run[funcName](base.getInstance(), this.laterTime, this.interval)
         } else {
-            return run[funcName](this.plugin, this.laterTime)
+            return run[funcName](base.getInstance(), this.laterTime)
         }
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -19,14 +19,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/bungee-api": "^0.0.2",
+        "@javatypes/bungee-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/bungee/src/channel.ts

@@ -6,20 +6,20 @@ const Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
 @provideSingleton(channel.Channel)
 export class BungeeChannel extends channel.Channel {
     @inject(event.Event)
-    private eventManager: event.Event;
+    private eventManager: event.Event
 
     send(player: any, channel: string, data: any) {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
     }
     register(channel: string, listener: channel.ChannelListener) {
-        Bungee.registerChannel(channel);
+        Bungee.registerChannel(channel)
         // console.console('§6[§eWARN§6] §eMiaoScript channel in BungeeCord only register. you need self hanler PluginMessageEvent!')
         return this.eventManager.listen({ description: { name: channel } }, "PluginMessageEvent", (event: net.md_5.bungee.api.event.PluginMessageEvent) => {
             listener(event.getData(), event)
         })
     }
-    unregister(channel: string, listener: any) {
+    unregister(channel: string, off: any) {
-        Bungee.unregisterChannel(channel);
+        Bungee.unregisterChannel(channel)
-        listener.off();
+        off()
     }
 }

packages/bungee/src/server.ts

@@ -3,29 +3,29 @@ import { provideSingleton, inject, postConstruct } from '@ccms/container'
 
 import * as reflect from '@ccms/common/dist/reflect'
 
-let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy();
+let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
 
 @provideSingleton(server.Server)
 export class BungeeServer implements server.Server {
-    private pluginsFolder: string;
+    private pluginsFolder: string
-    private pipeline: any;
+    private pipeline: any
-    private rootLogger: any;
+    private rootLogger: any
 
     @inject(task.TaskManager)
     private task: task.TaskManager
 
     constructor() {
-        this.pluginsFolder = Bungee.getPluginsFolder().getCanonicalPath();
+        this.pluginsFolder = Bungee.getPluginsFolder().getCanonicalPath()
     }
 
     @postConstruct()
     initialize() {
-        let count = 0;
+        let count = 0
         let wait = this.task.create(() => {
             try {
                 // @ts-ignore
                 this.pipeline = reflect.on(base.getInstance().getProxy()).get('listeners').get().toArray()[0].pipeline()
-                wait.cancel();
+                wait.cancel()
             } catch (ex) {
                 count++
                 if (count > 50) {
@@ -44,7 +44,7 @@ export class BungeeServer implements server.Server {
     }
 
     getPlayer(name: string) {
-        return Bungee.getPlayer(name);
+        return Bungee.getPlayer(name)
     }
     getVersion(): string {
         return Bungee.getVersion()
@@ -56,7 +56,7 @@ export class BungeeServer implements server.Server {
         return Bungee.getConsole()
     }
     getService(service: string) {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
     }
     dispatchCommand(sender: string | any, command: string): boolean {
         if (typeof sender === 'string') {
@@ -68,18 +68,15 @@ export class BungeeServer implements server.Server {
         return Bungee.getPluginManager().dispatchCommand(Bungee.getConsole(), command)
     }
     getPluginsFolder(): string {
-        return this.pluginsFolder;
+        return this.pluginsFolder
     }
     getNativePluginManager() {
         return Bungee.getPluginManager() as any
     }
     getNettyPipeline() {
-        return this.pipeline;
+        return this.pipeline
     }
     getRootLogger() {
-        return this.rootLogger;
+        return this.rootLogger
-    }
-    sendJson(sender: string | any, json: string): void {
-        throw new Error("Method not implemented.");
     }
 }

packages/bungee/src/task.ts

@@ -1,36 +1,32 @@
 import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container';
+import { inject, provideSingleton } from '@ccms/container'
 
 var Runnable = Java.type('java.lang.Runnable')
 let TimeUnit = Java.type('java.util.concurrent.TimeUnit')
 
 @provideSingleton(task.TaskManager)
-export class BungeeTaskManager implements task.TaskManager {
+export class BungeeTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any;
+        return new BungeeTask(owner, func, id)
-
-    create(func: Function): task.Task {
-        if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !'); };
-        return new BungeeTask(this.pluginInstance, func);
     }
     callSyncMethod(func: Function): any {
-        return func();
+        return func()
     }
-    disable() {
+    disable0() {
-        this.pluginInstance.getProxy().getScheduler().cancel(this.pluginInstance)
+        base.getInstance().getProxy().getScheduler().cancel(base.getInstance())
     }
 }
 
 export class BungeeTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
+    submit0(...args: any[]): task.Cancelable {
         let run = new Runnable({ run: () => this.run(...args) })
         if (this.isAsync) {
-            return this.plugin.getProxy().getScheduler().runAsync(this.plugin, run)
+            return base.getInstance().getProxy().getScheduler().runAsync(base.getInstance(), run)
         }
         if (this.interval) {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
         } else {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, TimeUnit.MILLISECONDS)
         }
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "minecraft-protocol": "^1.13.0"
+        "minecraft-protocol": "^1.19.0"
     },
     "devDependencies": {
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     }
 }

packages/client/src/event.ts

@@ -3,12 +3,12 @@ import { $ } from './color'
 export function attachEvents(client) {
     client.on('chat', (packet) => {
         // Listen for chat messages and echo them back.
-        var jsonMsg = JSON.parse(packet.message);
+        var jsonMsg = JSON.parse(packet.message)
         console.log($(jsonMsg))
     })
     client.on('state', (newState, oldState) => {
         console.log('Client Change State', oldState, 'to', newState)
-        let targetServer = process.argv[3]
+        let targetServer = process.argv[6]
         if (newState == "play" && targetServer) {
             setTimeout(() => {
                 client.write('chat', {
@@ -24,4 +24,10 @@ export function attachEvents(client) {
         } else if (packet.health > 0) {
         }
     })
+    client.on('kick_disconnect', (packet) => {
+        console.log($(packet.reason))
+    })
+    client.on('disconnect', (packet) => {
+        console.log($(packet.reason))
+    })
 }

packages/client/src/index.ts

@@ -5,33 +5,52 @@ import { attachForge } from './forge'
 import { attachEvents } from './event'
 
 let username = process.argv[2] || 'Mr_jtb'
-let version = process.argv[3] || '1.12.2'
+let password = process.argv[3] || ''
-let address = process.argv[4] || '192.168.2.5:25577'
+let version = process.argv[4] || '1.12.2'
-let realAddress = address.split(":");
+let readAddress = process.argv[5] || '192.168.2.5:25577'
-let client = createConnection(realAddress[0], parseInt(realAddress[1] || "25565"), username)
+let realAddress = readAddress.split(":")
+let address = realAddress[0]
+let port = parseInt(realAddress[1] || "25565")
+let client = commandLineCreateClient()
 
-function createConnection(host: string, port: number, username: string) {
+function commandLineCreateClient() {
+    return createConnection(address, port, username, password)
+}
+
+function createConnection(host: string, port: number, username: string, password: string) {
     let client = createClient({
         version,
         host,
         port,
         username,
-        skipValidation: true
+        password,
+        clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
+        //@ts-ignore
+        authServer: 'https://mcsso.yumc.pw/api/yggdrasil/authserver',
+        sessionServer: 'https://mcsso.yumc.pw/api/yggdrasil/sessionserver'
     })
 
+    attachCommon(client)
     attachForge(client)
     attachEvents(client)
-    return client;
+    return client
 }
 
+function attachCommon(client) {
     client.on('error', (error) => {
         console.log("Client Error", error)
     })
-
     client.on('end', (resone) => {
         console.log("Client End Resone:", resone)
-    client = createConnection('192.168.2.5', 25577, username)
+        if (`${resone}` != "SocketClosed") {
+            setTimeout(() => {
+                client = commandLineCreateClient()
+            }, 500)
+        } else {
+            process.exit(0)
+        }
     })
+}
 
 const rl = createInterface({
     input: process.stdin,
@@ -54,22 +73,22 @@ const rl = createInterface({
 rl.on('line', function (line) {
     switch (line) {
         case "":
-            break;
+            break
         case "eval":
-            break;
+            break
         case "write":
-            break;
+            break
         case "/respawn":
             client.write('client_command', { payload: 0 })
-            break;
+            break
         case "//reco":
             client.end("")
-            client = createConnection('192.168.2.5', 25577, username)
+            client = commandLineCreateClient()
-            break;
+            break
         case "//quit":
             console.info('Disconnected')
             client.end("")
-            break;
+            break
         case "//end":
             console.info('Forcibly ended client')
             process.exit(0)

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.0",
+        "@ccms/nashorn": "^0.10.1",
-        "@javatypes/jdk": "^0.0.2",
+        "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/common/src/http.ts

@@ -1,7 +1,9 @@
+import * as querystring from 'querystring'
+
 const URL = Java.type('java.net.URL')
-const Paths = Java.type('java.nio.file.Paths');
+const Paths = Java.type('java.nio.file.Paths')
-const Files = Java.type('java.nio.file.Files');
+const Files = Java.type('java.nio.file.Files')
-const StandardCopyOption = Java.type('java.nio.file.StandardCopyOption');
+const StandardCopyOption = Java.type('java.nio.file.StandardCopyOption')
 
 export type Method =
     | 'get' | 'GET'
@@ -13,36 +15,49 @@ export type Method =
     | 'patch' | 'PATCH'
 
 interface RequestConfig {
-    url?: string;
+    url?: string
-    method?: Method;
+    method?: Method
-    headers?: { [key: string]: string };
+    headers?: { [key: string]: string }
-    params?: { [key: string]: string };
+    params?: { [key: string]: string }
-    data?: any;
+    data?: any
 }
 
 function request(config: RequestConfig) {
     // @ts-ignore
-    let xhr = new XMLHttpRequest();
+    let xhr = new XMLHttpRequest()
-    xhr.open(config.method, config.url, false);
+    xhr.open(config.method, config.url, false)
     for (const header in config.headers) {
-        xhr.setRequestHeader(header, config.headers[header]);
+        xhr.setRequestHeader(header, config.headers[header])
     }
-    xhr.send(typeof config.data === "string" ? config.data : JSON.stringify(config.data));
+    let body = config.data
-    if ((xhr.getResponseHeader("Content-Type") + '').indexOf('application/json') != -1) {
+    if (body && typeof body !== "string") {
+        switch (config.headers['Content-Type']) {
+            case "application/json":
+                body = JSON.stringify(body)
+                break
+            case "application/x-www-form-urlencoded":
+                body = querystring.encode(body)
+                break
+        }
+    }
+    xhr.send(body)
+    if (xhr.getResponseHeader("Content-Type").indexOf('application/json') != -1) {
         xhr.responseType = "json"
     }
-    return xhr.get();
+    return xhr.get()
 }
 
 function download(url: string, target: string) {
     console.debug(`Start Download file ${target} from ${url}....`)
-    Files.copy(new URL(url).openStream(), Paths.get(target), StandardCopyOption.REPLACE_EXISTING);
+    Files.copy(new URL(url).openStream(), Paths.get(target), StandardCopyOption.REPLACE_EXISTING)
     console.debug(`File ${target} Download Complate...`)
 }
 
 function _proxy(method: Method) {
-    return function (url: string, data?: any, config?: RequestConfig) {
+    return function (url: string, data?: any, config: RequestConfig = {}) {
-        return request({ url, method, data, ...config });
+        if (!config.headers) { config.headers = {} }
+        config.headers['Content-Type'] = config.headers['Content-Type'] ?? 'application/json'
+        return request({ url, method, data, ...config })
     }
 }
 

packages/common/src/reflect.ts

@@ -1,14 +1,15 @@
 /// <reference types="@javatypes/jdk" />
 
+const JavaClass = Java.type('java.lang.Class')
+const JavaObject = Java.type('java.lang.Object')
+const NoSuchFieldException = Java.type('java.lang.NoSuchFieldException')
+const fieldCache = new Map<string, java.lang.reflect.Field>()
+const methodCache = new Map<string, java.lang.reflect.Method>()
+
 /**
  * 反射工具类
  * Created by MiaoWoo on 2017/2/9 0009.
  */
-const JavaClass = Java.type('java.lang.Class')
-const JavaObject = Java.type('java.lang.Object')
-const NoSuchFieldException = Java.type('java.lang.NoSuchFieldException')
-const methodCache = []
-
 class Reflect {
     private obj: java.lang.Object
     private class: java.lang.Class<any>
@@ -34,23 +35,34 @@ class Reflect {
         return Java.from(declaredMethods(this.class))
     }
 
-    field(name: string | java.lang.String): Reflect {
+    field(nameOrIndex: string | java.lang.String | number, declared = false): java.lang.reflect.Field {
+        if (nameOrIndex == undefined || nameOrIndex == null) throw new Error(`reflect field name can't be ${nameOrIndex} from ${this.class.getName()}!`)
+        let key = this.class.getName() + ':' + nameOrIndex + ':' + declared
+        if (fieldCache.has(key)) {
+            return fieldCache.get(key)
+        }
+        let field = null
+        if (typeof nameOrIndex == "number") {
+            field = this.fields(declared)[nameOrIndex]
+        } else {
             try {
                 // Try getting a public field
-            let field = this.class.getField(name)
+                field = this.class.getField(nameOrIndex)
-            return on(field.get(this.obj))
             } catch (ex) {
                 // Try again, getting a non-public field
-            return on(accessible(declaredField(this.class, name)).get(this.obj))
+                field = declaredField(this.class, nameOrIndex)
             }
         }
+        if (!field) throw new Error(`can't reflect field ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} from ${this.class.getName()}!`)
+        return accessible(field)
+    }
 
     fields(declared = false): java.lang.reflect.Field[] {
         return Java.from(declared ? this.class.getDeclaredFields() : this.class.getFields())
     }
 
     values(declared = false) {
-        return this.fields(declared).reduce((cache, field) => { return cache[field.getName()] = this.field(field.getName()).get() }, {}) as any
+        return this.fields(declared).reduce((cache, field) => { return cache[field.getName()] = this.get(field.getName()).get() }, {}) as any
     }
 
     call(...args: any[]): Reflect {
@@ -64,17 +76,12 @@ class Reflect {
     get(index: number, declared?: boolean): Reflect
     get(prop: string): Reflect
     get(param?: string | number, declared: boolean = true): Reflect | any {
-        if (param == undefined || param == null) return this.obj
+        if (arguments.length === 0) return this.obj
-        if (typeof param == "number") {
+        return on(this.field(param, declared).get(this.obj))
-            return on(accessible(this.fields(declared)[param]).get(this.obj))
-        }
-        if (typeof param == "string") {
-            return this.field(param)
-        }
     }
 
-    set(name: any, value: any): Reflect {
+    set(param: string | number, value: any, declared: boolean = true): Reflect {
-        accessible(declaredField(this.class, name)).set(this.obj, value)
+        this.field(param, declared).set(this.obj, value)
         return this
     }
 
@@ -136,64 +143,43 @@ function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.Str
     return field
 }
 
-function declaredMethod(clazz: java.lang.Class<any>, name: string, ...clazzs: java.lang.Class<any>[]): java.lang.reflect.Method {
+function declaredMethod(clazz: java.lang.Class<any>, nameOrIndex: string | number, ...clazzs: java.lang.Class<any>[]): java.lang.reflect.Method {
-    let key = clazz.getName() + '.' + name + ':' + (clazzs || []).join(':')
+    let key = clazz.getName() + '.' + nameOrIndex + ':' + (clazzs || []).map(c => c.getName()).join(':')
-    if (!methodCache[key]) {
+    if (methodCache.has(key)) { return methodCache.get(key) }
+    if (typeof nameOrIndex === "number") {
+        methodCache.set(key, declaredMethods(clazz)[nameOrIndex])
+    } else {
         try {
-            // @ts-ignore
+            methodCache.set(key, clazz.getMethod(nameOrIndex, clazzs as any))
-            methodCache[key] = clazz.getMethod(name, clazzs)
         } catch (ex) {
             try {
-                methodCache[key] = clazz.getDeclaredMethod(name, clazzs as any)
+                methodCache.set(key, clazz.getDeclaredMethod(nameOrIndex, clazzs as any))
             } catch (ex) {
                 for (const m of Java.from(declaredMethods(clazz))) {
-                    if (m.getName() == name) {
+                    if (m.getName() == nameOrIndex) {
-                        methodCache[key] = m
+                        methodCache.set(key, m)
                         break
                     }
                 }
             }
         }
     }
-    return methodCache[key]
+    if (!methodCache.has(key)) throw new Error(`can't reflect method ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} from ${clazz.getName()}!`)
+    return methodCache.get(key)
 }
 
 function declaredMethods(clazz: java.lang.Class<any>) {
     return clazz.getDeclaredMethods()
 }
 
-let classMethodsCache: any[] = []
-
 function mapToObject(javaObj) {
-    if (!javaObj || !javaObj.class) { throw new TypeError(`参数 ${javaObj} 不是一个Java对象!`) }
+    if (!Java.isJavaObject(javaObj)) { throw new TypeError(`参数 ${javaObj} 不是一个Java对象!`) }
-    let target = {}
+    let target = Proxy.newProxy(javaObj, {
-    getJavaObjectMethods(javaObj).forEach(t => mapMethod(target, javaObj, t))
+        apply: (target, name, args) => { return args ? javaObj[name](args) : javaObj[name]() }
+    })
     return target
 }
 
-function getJavaObjectMethods(javaObj) {
-    let className = javaObj.class.name
-    if (!classMethodsCache[className]) {
-        let names: any[] = []
-        let methods = javaObj.class.methods
-        for (let i in methods) {
-            names.push(methods[i].name)
-        }
-        classMethodsCache[className] = names
-    }
-    return classMethodsCache[className]
-}
-
-function mapMethod(target, source, name) {
-    target[name] = function __SimpleDynamicMethod__(...args) {
-        if (args.length > 0) {
-            return source[name](args)
-        } else {
-            return source[name]()
-        }
-    }
-}
-
 function on(obj) {
     // if (!obj || !obj.class) { throw new TypeError(`参数 ${obj} 不是一个Java对象!`) }
     return new Reflect(obj)

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -21,6 +21,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     }
 }

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.0",
+        "@ccms/nashorn": "^0.10.1",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
         "inversify": "^5.0.1",

packages/container/src/index.ts

@@ -2,7 +2,7 @@
 
 import "reflect-metadata"
 import { initContainer, getContainer } from './decorators'
-import { interfaces, Container } from 'inversify'
+import { interfaces, Container, inject, named } from 'inversify'
 import { fluentProvide } from 'inversify-binding-decorators'
 import { ioc } from "./constants"
 
@@ -36,10 +36,10 @@ export const provideSingletonNamed = (identifier: interfaces.ServiceIdentifier<a
  * @param className Java全类名
  */
 export const JavaClass = (className: string) => {
-    return function (target: any, propertyKey: string, index?: number) {
+    return function (target: object, propertyKey: string, index?: number) {
         try { target[propertyKey] = Java.type(className).class; return } catch (error) { }
         try { target[propertyKey] = base.getClass(className); return } catch (error) { }
-        console.warn('JavaClass Inject target', target, 'propertyKey', propertyKey, 'failed!')
+        console.warn('JavaClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
     }
 }
 
@@ -48,10 +48,10 @@ export const JavaClass = (className: string) => {
  * @param className Java 全类名
  */
 export const JSClass = (className: string) => {
-    return function (target: any, propertyKey: string, index?: number) {
+    return function (target: object, propertyKey: string, index?: number) {
         try { target[propertyKey] = Java.type(className); return } catch (error) { }
         try { target[propertyKey] = base.getClass(className).static; return } catch (error) { }
-        console.warn('JSClass Inject target', target, 'propertyKey', propertyKey, 'failed!')
+        console.warn('JSClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
     }
 }
 
@@ -59,9 +59,22 @@ export const JSClass = (className: string) => {
  * 自动注入实例由平台实现
  * @param className 类名
  */
-export const Autowired = (className?: string | any) => {
+export const Autowired = (className?: any) => {
-    return function (target: any, propertyKey: string) {
+    return function (target: any, propertyKey: string, index?: number) {
-        target[propertyKey] = getContainer().getNamed(ioc.Autowired, className || propertyKey)
+        let container = getContainer()
+        if (className && (className instanceof Symbol || className instanceof Function)) {
+            return inject(className)(target, propertyKey, index)
+        }
+        let type = Reflect.getMetadata('design:type', target, propertyKey)
+        if (type && type !== Object && !Java.isJavaObject(type)) {
+            inject(type)(target, propertyKey, index)
+            named(className || propertyKey)(target, propertyKey, index)
+        } else if (container.isBound(ioc.Autowired)) {
+            console.debug('Autowired', 'ioc.Autowired', 'named', className || propertyKey)
+            target[propertyKey] = container.getNamed(ioc.Autowired, className || propertyKey)
+        } else {
+            throw new Error(`No matching bindings found for target: ${target.constructor.name} type: ${type} named: ${className || propertyKey}`)
+        }
     }
 }
 
@@ -70,7 +83,7 @@ export const Autowired = (className?: string | any) => {
  * @param className 类名
  */
 export const Resource = (resourceName?: string | any) => {
-    return function (target: any, propertyKey: string) {
+    return function (target: any, propertyKey: string, index?: number) {
         target[propertyKey] = getContainer().getNamed(ioc.Resource, resourceName || propertyKey)
     }
 }
@@ -82,8 +95,18 @@ export const reduceMetadata = (ctx: interfaces.Context): any => {
     }, {})
 }
 
+function initAutowired(container: Container) {
+    container.bind(ioc.Autowired).toDynamicValue((ctx) => {
+        var metadata: any = reduceMetadata(ctx)
+        let key = Object.toString.call(metadata.named)
+        if (key === "[object Function]" || key === "[object Symbol]") { return container.get(metadata.named) }
+        return undefined
+    })
+}
+
 export const DefaultContainer = new Container()
 initContainer(DefaultContainer)
+initAutowired(DefaultContainer)
 
 export * from 'inversify'
 export * from './constants'

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -21,11 +21,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -49,10 +49,12 @@ class MiaoScriptCore {
     }
 
     disable() {
+        let disableStartTime = Date.now()
         console.i18n("ms.core.engine.disable")
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
         process.exit(0)
+        console.i18n("ms.core.engine.disable.finish", { version: 'v' + global.ScriptEngineVersion, time: (new Date().getTime() - disableStartTime) / 1000 })
     }
 }
 
@@ -86,7 +88,7 @@ function detectServer(): constants.ServerType {
 }
 
 function initialize() {
-    // @ts-ignore
+    global.ScriptEngineVersion = require('../package.json').version
     try { engineLoad({ script: http.get("http://ms.yumc.pw/api/plugin/download/name/initialize"), name: 'core/initialize.js' }) } catch (error) { console.debug(error) }
     try {
         let corePackageStartTime = new Date().getTime()
@@ -97,13 +99,14 @@ function initialize() {
         console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
         container.bind(server.ServerType).toConstantValue(type)
         container.bind(server.ServerChecker).toSelf().inSingletonScope()
+        container.bind(server.NativePluginManager).toSelf().inSingletonScope()
         console.i18n("ms.core.package.initialize", { scope: global.scope, type })
         require(`${global.scope}/${type}`).default(container)
         require(`${global.scope}/plugin`)
         container.load(buildProviderModule())
         console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
         let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-        console.i18n("ms.core.engine.completed", { time: (Date.now() - global.NashornEngineStartTime) / 1000 })
+        console.i18n("ms.core.engine.completed", { version: 'v' + global.ScriptEngineVersion, time: (Date.now() - global.ScriptEngineStartTime) / 1000 })
         return disable
     } catch (error) {
         console.i18n("ms.core.initialize.error", { error })

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spring-jdbc": "^0.0.2",
+        "@javatypes/spring-jdbc": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/i18n/languages/zh_cn.yml

@@ -10,8 +10,9 @@ ms.core.package.initialize: "初始化 MiaoScript 扩展 {scope}/core {scope}/{t
 ms.core.package.completed: "MiaoScript 扩展 {scope}/core {scope}/{type} {scope}/plugin 加载完成 耗时({time}s)"
 ms.core.plugin.initialize: "MiaoScript 开始引导插件系统. 请稍候..."
 ms.core.plugin.completed: "MiaoScript 插件加载完毕 耗时({time}s)!"
-ms.core.engine.completed: "MiaoScript 脚本引擎 加载完毕... 耗时({time}s)!"
+ms.core.engine.completed: "MiaoScript 脚本引擎 {version} 加载完毕... 耗时({time}s)!"
-ms.core.engine.disable: "关闭 MiaoScript 引擎..."
+ms.core.engine.disable: "MiaoScript 关闭脚本引擎 请稍候..."
+ms.core.engine.disable.finish: "MiaoScript 脚本引擎 {version} 关闭完成... 耗时({time}s)!"
 ms.core.engine.disable.abnormal: "引擎异常启动或初始化未完成 跳过关闭流程..."
 
 ms.api.event.resource.not.found: "无法映射事件 未找到资源文件 {resource}!"
@@ -21,8 +22,8 @@ ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失
 ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
 ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
 ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
-ms.api.event.register: "[{name}] 注册事件 {event} => {exec}"
+ms.api.event.register: "[{name}] 注册事件 {event} => 执行器 {exec}"
-ms.api.event.unregister: "[{name}] 注销事件 {event} => {exec}"
+ms.api.event.unregister: "[{name}] 注销事件 {event} => 执行器 {exec}"
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."

packages/i18n/package.json

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

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,18 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.0",
+        "@ccms/nashorn": "^0.10.1",
-        "@javatypes/amqp-client": "^0.0.2",
+        "@javatypes/amqp-client": "^0.0.3",
-        "@javatypes/spring-amqp": "^0.0.2",
+        "@javatypes/spring-amqp": "^0.0.3",
-        "@javatypes/spring-rabbit": "^0.0.2",
+        "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
 }

packages/keyvalue/src/adapter/admin.ts

@@ -1,17 +0,0 @@
-import { ConnectionFactoryAdapter } from "./connection"
-import { RabbitTemplateAdapter } from "./template"
-import { JSClass } from "@ccms/container"
-
-export const RabbitAdmin = Java.type('org.springframework.amqp.rabbit.core.RabbitAdmin')
-
-export class RabbitAdminAdapter {
-    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
-    private RabbitAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitAdmin
-    constructor(config: RabbitTemplateAdapter | org.springframework.amqp.rabbit.core.RabbitTemplate | ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory) {
-        this._Handler = new RabbitAdmin((config instanceof RabbitTemplateAdapter || config instanceof ConnectionFactoryAdapter) ? config.getHandler() : config)
-    }
-    getHandler(): org.springframework.amqp.rabbit.core.RabbitAdmin {
-        return this._Handler
-    }
-}

packages/keyvalue/src/adapter/callback.ts

@@ -1,30 +0,0 @@
-export const ConfirmCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback')
-export const ReturnCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback')
-
-export abstract class ConfirmCallbackAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback
-    constructor() {
-        let ConfirmCallbackImpl = Java.extend(ReturnCallback, {
-            confirm: (correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string) => this.confirm(correlationData, ack, cause)
-        })
-        this._Handler = new ConfirmCallbackImpl()
-    }
-    abstract confirm(correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string)
-    getHandler() {
-        return this._Handler
-    }
-}
-
-export abstract class ReturnCallbackAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback
-    constructor() {
-        let ReturnCallbackImpl = Java.extend(ReturnCallback, {
-            returnedMessage: (message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string) => this.returnedMessage(message, replyCode, replyText, exchange, routingKey)
-        })
-        this._Handler = new ReturnCallbackImpl()
-    }
-    abstract returnedMessage(message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string)
-    getHandler() {
-        return this._Handler
-    }
-}

packages/keyvalue/src/adapter/connection.ts

@@ -1,31 +0,0 @@
-import threadPool from '@ccms/common/dist/thread-pool'
-
-export const ConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.ConnectionFactory')
-const CachingConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.CachingConnectionFactory')
-interface ConnectionConfig {
-    url: string,
-    username?: string,
-    password?: string,
-    publisherConfirms?: boolean
-    cacheSize?: number
-}
-
-export class ConnectionFactoryAdapter {
-    private _Handler: org.springframework.amqp.rabbit.connection.CachingConnectionFactory
-
-    constructor(config: ConnectionConfig) {
-        if (!config.url) { throw new Error('Connection UrI Can\'t be undefiend!') }
-        config = { publisherConfirms: true, cacheSize: 50, ...config }
-        this._Handler = new CachingConnectionFactory(new java.net.URI(config.url))
-        config.username && this._Handler.setUsername(config.username)
-        config.password && this._Handler.setPassword(config.password)
-        this._Handler.setPublisherConfirms(config.publisherConfirms)
-        this._Handler.setExecutor(threadPool.create({
-            groupName: '@ccms/amqp-rabbit'
-        }))
-        this._Handler.setChannelCacheSize(config.cacheSize)
-    }
-    getHandler() {
-        return this._Handler
-    }
-}

packages/keyvalue/src/adapter/container.ts

@@ -1,30 +0,0 @@
-import { ConnectionFactoryAdapter, ConnectionFactory } from "./connection"
-import { ChannelAwareMessageListenerAdapter, ChannelAwareMessageListener } from "./listener"
-
-export const SimpleMessageListenerContainer = org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-export const AcknowledgeMode: org.springframework.amqp.core.AcknowledgeMode = Java.type('org.springframework.amqp.core.AcknowledgeMode')
-interface ContainerConfig {
-    connectionFactory: ConnectionFactoryAdapter | typeof ConnectionFactory
-    queueNames: string[]
-    messageListener: ChannelAwareMessageListenerAdapter | typeof ChannelAwareMessageListener
-    maxConcurrentConsumers?: number
-    concurrentConsumers?: number
-    acknowledgeMode?: org.springframework.amqp.core.AcknowledgeMode
-}
-
-export class MessageListenerContainerAdapter {
-    private _Handler: org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-    constructor(config: ContainerConfig) {
-        config = { concurrentConsumers: 5, maxConcurrentConsumers: 10, acknowledgeMode: AcknowledgeMode.AUTO, ...config }
-        this._Handler = new SimpleMessageListenerContainer(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
-        //@ts-ignore
-        this._Handler.setQueueNames(config.queueNames)
-        this._Handler.setMaxConcurrentConsumers(config.maxConcurrentConsumers)
-        this._Handler.setConcurrentConsumers(config.concurrentConsumers)
-        this._Handler.setAcknowledgeMode(config.acknowledgeMode)
-        this._Handler.setMessageListener(config.messageListener instanceof ChannelAwareMessageListenerAdapter ? config.messageListener.getHandler() : config.messageListener)
-    }
-    getHandler() {
-        return this._Handler
-    }
-}

packages/keyvalue/src/adapter/converter.ts

@@ -1,37 +0,0 @@
-const JavaString = Java.type('java.lang.String')
-const MessageProperties = org.springframework.amqp.core.MessageProperties
-const Message = org.springframework.amqp.core.Message
-
-export const MessageConverter = Java.type('org.springframework.amqp.support.converter.MessageConverter')
-
-export class MessageConverterAdapter {
-    private _Handler: org.springframework.amqp.support.converter.MessageConverter
-    constructor() {
-        var MessageConverterImpl = Java.extend(MessageConverter, {
-            toMessage: (object: any, messageProperties: org.springframework.amqp.core.MessageProperties) => this.toMessage(object, messageProperties),
-            fromMessage: (message: org.springframework.amqp.core.Message) => this.fromMessage(message)
-        })
-        this._Handler = new MessageConverterImpl()
-    }
-    toMessage(object: any, messageProperties: org.springframework.amqp.core.MessageProperties) {
-        if (typeof object == "string") {
-            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN)
-            return new Message(new JavaString(object).getBytes(), messageProperties)
-        } else {
-            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON)
-            return new Message(new JavaString(JSON.stringify(object)).getBytes(), messageProperties)
-        }
-    }
-    fromMessage(message: org.springframework.amqp.core.Message) {
-        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_TEXT_PLAIN) {
-            return new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding())
-        }
-        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
-            return JSON.parse(new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding()))
-        }
-        return message
-    }
-    getHandler() {
-        return this._Handler
-    }
-}

packages/keyvalue/src/adapter/index.ts

@@ -1,7 +0,0 @@
-export * from './admin'
-export * from './callback'
-export * from './connection'
-export * from './container'
-export * from './converter'
-export * from './listener'
-export * from './template'

packages/keyvalue/src/adapter/listener.ts

@@ -1,49 +0,0 @@
-const JavaString = Java.type('java.lang.String')
-export const MessageProperties = org.springframework.amqp.core.MessageProperties
-export const ChannelAwareMessageListener = Java.type('org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener')
-export const AmqpRejectAndDontRequeueException = org.springframework.amqp.AmqpRejectAndDontRequeueException
-export const Channel: com.rabbitmq.client.Channel = Java.type('com.rabbitmq.client.Channel')
-export const Message = org.springframework.amqp.core.Message
-export type MessageHandler<T> = (content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => any
-export abstract class ChannelAwareMessageListenerAdapter<T = any> {
-    private _Handler: org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener
-    constructor(manual: boolean = false) {
-        let ChannelAwareMessageListenerImpl = Java.extend(ChannelAwareMessageListener, {
-            onMessage: (message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => {
-                let content = new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding() || "UTF-8")
-                try {
-                    if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
-                        content = JSON.parse(content)
-                    }
-                } catch (error) {
-                    if (manual) {
-                        channel.basicReject(message.getMessageProperties().getDeliveryTag(), true)
-                    } else {
-                        throw new AmqpRejectAndDontRequeueException(`${error}`, error)
-                    }
-                }
-                manual ? this.manualOnMessage(content, message, channel) : this.onMessage(content, message, channel)
-            }
-        })
-        this._Handler = new ChannelAwareMessageListenerImpl()
-    }
-    abstract onMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any
-    onError(error: Error, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any { }
-    getHandler() {
-        return this._Handler
-    }
-    private manualOnMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
-        let deliveryTag = message.getMessageProperties().getDeliveryTag()
-        try {
-            if (this.onMessage(content, message, channel)) {
-                channel.basicAck(deliveryTag, false)
-            } else if (message.getMessageProperties().getRedelivered()) {
-                channel.basicReject(deliveryTag, true)
-            } else {
-                channel.basicNack(deliveryTag, false, true)
-            }
-        } catch (error) {
-            channel.basicReject(deliveryTag, this.onError(error, message, channel))
-        }
-    }
-}

packages/keyvalue/src/adapter/template.ts

@@ -1,27 +0,0 @@
-import { MessageConverterAdapter } from "./converter"
-import { ConnectionFactoryAdapter } from "./connection"
-import { ConfirmCallbackAdapter, ReturnCallbackAdapter } from "./callback"
-
-export const RabbitTemplate = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate')
-
-interface TemplateConfig {
-    connectionFactory: ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory
-    confirmCallback?: ConfirmCallbackAdapter
-    returnCallback?: ReturnCallbackAdapter
-    messageConverter?: MessageConverterAdapter
-}
-export class RabbitTemplateAdapter {
-    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate
-    constructor(config: TemplateConfig) {
-        config = { messageConverter: new MessageConverterAdapter(), ...config }
-        console.debug(JSON.stringify(config))
-        this._Handler = new RabbitTemplate(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
-        config.returnCallback && this._Handler.setReturnCallback(config.returnCallback.getHandler())
-        config.confirmCallback && this._Handler.setConfirmCallback(config.confirmCallback.getHandler())
-        config.messageConverter && this._Handler.setMessageConverter(config.messageConverter.getHandler())
-    }
-
-    getHandler() {
-        return this._Handler
-    }
-}

packages/keyvalue/src/admin.ts

@@ -1,89 +0,0 @@
-import { JSClass } from "@ccms/container"
-import { RabbitAdminAdapter, MessageListenerContainerAdapter, AcknowledgeMode, MessageHandler, ChannelAwareMessageListenerAdapter } from "./adapter"
-
-export class AmqpAdmin {
-    @JSClass('org.springframework.amqp.core.TopicExchange')
-    private TopicExchange: typeof org.springframework.amqp.core.TopicExchange
-    @JSClass('org.springframework.amqp.core.Queue')
-    private Queue: typeof org.springframework.amqp.core.Queue
-    @JSClass('org.springframework.amqp.core.Binding')
-    private Binding: typeof org.springframework.amqp.core.Binding
-    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
-    private RabbitAdmin: typeof org.springframework.amqp.rabbit.core.RabbitAdmin
-    @JSClass('org.springframework.amqp.core.Binding.DestinationType')
-    private DestinationType: org.springframework.amqp.core.Binding.DestinationType
-
-    private amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
-
-    constructor(amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin | any) {
-        if (amqpAdmin instanceof this.RabbitAdmin) {
-            this.amqpAdmin = amqpAdmin
-        } else if (amqpAdmin instanceof RabbitAdminAdapter) {
-            this.amqpAdmin = amqpAdmin.getHandler()
-        } else {
-            this.amqpAdmin = new RabbitAdminAdapter(amqpAdmin).getHandler()
-        }
-    }
-
-    getHandler() {
-        return this.amqpAdmin
-    }
-
-    getQueueProperties(name: string) {
-        return this.amqpAdmin.getQueueProperties(name)
-    }
-
-    declareExchange(name: string) {
-        let exchange = new this.TopicExchange(name, true, false)
-        this.amqpAdmin.declareExchange(exchange)
-        return this
-    }
-
-    declareQueue(name: string) {
-        let queue = new this.Queue(name, true)
-        this.amqpAdmin.declareQueue(queue)
-        return this
-    }
-
-    declareBinding(queue: string, exchange: string, routerKey: string, argument: any = null) {
-        let binding = new this.Binding(queue, this.DestinationType.QUEUE, exchange, routerKey, argument)
-        this.amqpAdmin.declareBinding(binding)
-        return this
-    }
-
-    declareQueueAndBindExchange(queue: string, exchange: string, routerKey: string) {
-        return this.declareQueue(queue).declareExchange(exchange).declareBinding(queue, exchange, routerKey)
-    }
-
-    createContainer<T>(queue: string, listener: MessageHandler<T>, acknowledgeMode = AcknowledgeMode.AUTO) {
-        let connection = this.amqpAdmin.getRabbitTemplate().getConnectionFactory()
-        return new MessageListenerContainerAdapter({
-            connectionFactory: connection,
-            queueNames: [queue],
-            messageListener: new SimpleMessageHandler(listener),
-            acknowledgeMode: acknowledgeMode
-        }).getHandler()
-    }
-
-    send()
-    send() {
-
-    }
-
-    getTemplate() {
-        return this.amqpAdmin.getRabbitTemplate()
-    }
-
-    close() {
-        this.getTemplate().stop()
-    }
-}
-
-export class SimpleMessageHandler extends ChannelAwareMessageListenerAdapter {
-    constructor(private handler: MessageHandler<any>) {
-        super()
-    }
-    onMessage(content: any, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
-        return this.handler(content, message, channel)
-    }
-}

packages/keyvalue/src/constants.ts

@@ -1,3 +0,0 @@
-export const METADATA_KEY = {
-
-}

packages/keyvalue/src/index.ts

@@ -1,34 +1,3 @@
 /// <reference types="@ccms/nashorn" />
 /// <reference types="@javatypes/jdk" />
-/// <reference types="@javatypes/spring-amqp" />
+export { }
-/// <reference types="@javatypes/spring-rabbit" />
-/// <reference types="@javatypes/amqp-client" />
-
-import { amqp } from '@ccms/api'
-import { getContainer, reduceMetadata } from '@ccms/container'
-
-function init() {
-    const beanFactory = base.getInstance().getAutowireCapableBeanFactory()
-    getContainer().bind(amqp.rabbit.Template).toDynamicValue((ctx) => {
-        let metadata = reduceMetadata(ctx)
-        if (!metadata.named) {
-            return beanFactory.getBean('rabbitTemplate')
-        } else {
-            return beanFactory.getBean(`${metadata.named}-rabbitTemplate`)
-        }
-    })
-    getContainer().bind(amqp.rabbit.Admin).toDynamicValue((ctx) => {
-        let metadata = reduceMetadata(ctx)
-        if (!metadata.named) {
-            return beanFactory.getBean('rabbitAdmin')
-        } else {
-            return beanFactory.getBean(`${metadata.named}-rabbitAdmin`)
-        }
-    })
-}
-init()
-
-export * from './admin'
-export * from './adapter'
-export * from './manager'
-export * from './constants'

packages/keyvalue/src/listener.ts

@@ -1,5 +0,0 @@
-export class AmqpListener {
-    constructor() {
-
-    }
-}

packages/keyvalue/src/manager.ts

@@ -1,18 +0,0 @@
-import { amqp } from "@ccms/api"
-import { provideSingleton } from "@ccms/container"
-
-import { ConnectionFactoryAdapter, RabbitTemplateAdapter, RabbitAdminAdapter } from "./adapter"
-import { AmqpAdmin } from "./admin"
-
-@provideSingleton(amqp.Manager)
-export class AmqpManager {
-    createConnection(url: string, username: string, password: string) {
-        return new ConnectionFactoryAdapter({ url, username, password })
-    }
-    createTemplate(adapter: ConnectionFactoryAdapter) {
-        return new RabbitTemplateAdapter({ connectionFactory: adapter })
-    }
-    createAdmin(adapter: RabbitTemplateAdapter | ConnectionFactoryAdapter) {
-        return new AmqpAdmin(new RabbitAdminAdapter(adapter))
-    }
-}

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,6 +22,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     }
 }

packages/nashorn/src/index.ts

@@ -17,6 +17,7 @@ declare global {
         function to<T = any>(array: T[], type?: T): T[]
         function extend(...parentTypes: any[]): any
         function synchronized(func: () => void, lock: any): Function
+        function isJavaObject(obj: any): boolean
         function asJSONCompatible<T = any>(obj: T): T
         //@ts-ignore
         // function super(type: any);
@@ -48,7 +49,8 @@ declare global {
             logger: any
             debug: boolean
             level: string
-            NashornEngineStartTime: number
+            ScriptEngineVersion: string
+            ScriptEngineStartTime: number
             setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void
             noop: () => void
             console: Console
@@ -79,8 +81,18 @@ declare global {
         i18n(name: string, ...params: any[]): void
     }
     interface ProxyConstructor {
-        newProxy<T extends object>(target: T, handler: ProxyHandler<T>): T
+        newProxy<T extends object>(target: T, handler: ProxyHandle<T>): T
     }
 }
-
+export interface ProxyHandle<T = any> extends ProxyHandler<any> {
+    setPrototypeOf?(target: T, v: any): any
+    // get: (target: any, name: string) => any
+    // set: (target: any, name: string, value: any) => boolean
+    // construct: (target: any, ...args: any[]) => any
+    // has: (target: any, name: string) => boolean
+    // ownKeys: (target: any) => string[]
+    values?: (target: T) => any[]
+    // call: (target: any, name: string, ...args: any[]) => any
+    // deleteProperty: (target: any, name: string) => boolean
+}
 export { }

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.0",
+        "@ccms/nashorn": "^0.10.1",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.9.0",
+    "version": "0.10.1",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -19,14 +19,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/nukkit-api": "^0.0.2",
+        "@javatypes/nukkit-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/nukkit/src/console.ts

@@ -1,21 +1,25 @@
 import { MiaoScriptConsole } from '@ccms/api'
 
-let Nukkit = base.getInstance().getServer();
+let Nukkit = base.getInstance().getServer()
+let LogLevel = Java.type('cn.nukkit.utils.LogLevel')
 let CommandSender = Java.type('cn.nukkit.command.CommandSender')
 
 export class NukkitConsole extends MiaoScriptConsole {
     sender(sender, ...args) {
         if (!(sender instanceof CommandSender)) {
             this.error(`First parameter ${sender} not instanceof cn.nukkit.command.CommandSender can't send message!`)
-            return;
+            return
         }
         if (Object.prototype.toString.call(args[0]) === "[object Array]") {
             args[0].forEach(line => sender.sendMessage(this.prefix + line))
         } else {
-            sender.sendMessage(this.prefix + args.join(' '));
+            sender.sendMessage(this.prefix + args.join(' '))
         }
     }
     console(...args: string[]): void {
-        this.sender(Nukkit.getConsoleSender(), args.join(' '));
+        this.sender(Nukkit.getConsoleSender(), args.join(' '))
+    }
+    error(...args: any[]) {
+        this.logger.log(LogLevel.ERROR, this.name + args.join(' '))
     }
 }

packages/nukkit/src/server.ts

@@ -1,25 +1,25 @@
 import { server } from '@ccms/api'
-import { provideSingleton } from '@ccms/container';
+import { provideSingleton } from '@ccms/container'
 
-let Nukkit: cn.nukkit.Server = base.getInstance().getServer();
+let Nukkit: cn.nukkit.Server = base.getInstance().getServer()
-const File = Java.type("java.io.File");
+const File = Java.type("java.io.File")
 
 @provideSingleton(server.Server)
 export class NukkitServer implements server.Server {
-    private pluginsFolder: string;
+    private pluginsFolder: string
 
     constructor() {
         this.pluginsFolder = new File(base.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getParentFile().getCanonicalPath()
     }
 
     getPlayer(name: string) {
-        return Nukkit.getPlayer(name)
+        return Nukkit.getPlayerExact(name)
     }
     getVersion(): string {
         return Nukkit.getVersion()
     }
     getOnlinePlayers() {
-        return Nukkit.getOnlinePlayers() as unknown as any[]
+        return Nukkit.getOnlinePlayers().values()
     }
     getConsoleSender() {
         return Nukkit.getConsoleSender()
@@ -37,18 +37,15 @@ export class NukkitServer implements server.Server {
         return Nukkit.dispatchCommand(Nukkit.getConsoleSender(), command)
     }
     getPluginsFolder(): string {
-        return this.pluginsFolder;
+        return this.pluginsFolder
     }
     getNativePluginManager() {
-        return Nukkit.getPluginManager() as any;
+        return Nukkit.getPluginManager() as any
     }
     getNettyPipeline() {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
     }
     getRootLogger() {
         return Packages.org.apache.logging.log4j.LogManager.getRootLogger()
     }
-    sendJson(sender: string | any, json: object | string): void {
-        throw new Error("Method not implemented.");
-    }
 }

packages/nukkit/src/task.ts

@@ -1,34 +1,29 @@
 import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container';
+import { inject, provideSingleton } from '@ccms/container'
 
-const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable');
+const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable')
 
 @provideSingleton(task.TaskManager)
-export class NukkitTaskManager implements task.TaskManager {
+export class NukkitTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any;
+        return new NukkitTask(owner, func, id)
-
-    create(func: Function): task.Task {
-        if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !'); };
-        return new NukkitTask(this.pluginInstance, func);
     }
     callSyncMethod(func: Function): any {
         return func()
     }
-    disable() {
+    disable0() {
-        base.getInstance().getServer().getScheduler().cancelTask(this.pluginInstance)
+        base.getInstance().getServer().getScheduler().cancelTask(base.getInstance())
     }
 }
 
 export class NukkitTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
+    submit0(...args: any[]): task.Cancelable {
         let run = new NukkitRunnable({ run: () => this.run(...args) })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
-            run[funcName](this.plugin, this.laterTime, this.interval);
+            return run[funcName](base.getInstance(), this.laterTime, this.interval)
         } else {
-            run[funcName](this.plugin, this.laterTime);
+            return run[funcName](base.getInstance(), this.laterTime)
-        }
+        }
-        return run;
     }
 }

packages/ployfill/package.json

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

packages/ployfill/src/node-shim.ts

@@ -22,6 +22,19 @@ class Process extends EventEmitter {
         }
     }
     platform = Packages.java.lang.System.getProperty("os.name")
+    on(event: string | symbol, listener: (...args: any[]) => void) {
+        return super.on(event, (...args) => {
+            try {
+                listener(...args)
+            } catch (error) {
+                try {
+                    super.emit('error', error)
+                } catch (error) {
+                    console.ex(error)
+                }
+            }
+        })
+    }
     nextTick(func: Function) {
         microTaskPool.execute(func)
     }

packages/ployfill/src/proxy.ts

@@ -1,17 +1,9 @@
+import { ProxyHandle } from '@ccms/nashorn'
+
 // Nashorn JSAdapter See https://wiki.openjdk.java.net/display/Nashorn/Nashorn+extensions#Nashornextensions-JSAdapterconstructor
 let createProxy = eval(`
     function(handle){ return new JSAdapter(handle) }
 `)
-export interface ProxyHandle extends ProxyHandler<any> {
-    // get: (target: any, name: string) => any
-    // set: (target: any, name: string, value: any) => boolean
-    // construct: (target: any, ...args: any[]) => any
-    // has: (target: any, name: string) => boolean
-    // ownKeys: (target: any) => string[]
-    values: (target: any) => any[];
-    // call: (target: any, name: string, ...args: any[]) => any
-    // deleteProperty: (target: any, name: string) => boolean
-}
 export class Proxy {
     static newProxy(target: any, handle: Partial<ProxyHandle>): any {
         return new Proxy(target, handle)

packages/ployfill/src/xml-http-request.ts

@@ -1,39 +1,39 @@
 import '@ccms/nashorn'
 
-const URL = Java.type("java.net.URL");
+const URL = Java.type("java.net.URL")
-const Files = Java.type("java.nio.file.Files");
+const Files = Java.type("java.nio.file.Files")
-const StandardCopyOption = Java.type("java.nio.file.StandardCopyOption");
+const StandardCopyOption = Java.type("java.nio.file.StandardCopyOption")
-const JavaString = Java.type("java.lang.String");
+const JavaString = Java.type("java.lang.String")
-const SecureRandom = Java.type("java.security.SecureRandom");
+const SecureRandom = Java.type("java.security.SecureRandom")
-const SSLContext = Java.type("javax.net.ssl.SSLContext");
+const SSLContext = Java.type("javax.net.ssl.SSLContext")
-const HttpsURLConnection = Java.type("javax.net.ssl.HttpsURLConnection");
+const HttpsURLConnection = Java.type("javax.net.ssl.HttpsURLConnection")
-const HostnameVerifier = Java.type("javax.net.ssl.HostnameVerifier");
+const HostnameVerifier = Java.type("javax.net.ssl.HostnameVerifier")
-const X509TrustManager = Java.type("javax.net.ssl.X509TrustManager");
+const X509TrustManager = Java.type("javax.net.ssl.X509TrustManager")
 
-const SocketTimeoutException = Java.type('java.net.SocketTimeoutException');
+const SocketTimeoutException = Java.type('java.net.SocketTimeoutException')
 
-const Callable = Java.type('java.util.concurrent.Callable');
+const Callable = Java.type('java.util.concurrent.Callable')
 const Executors = Java.type('java.util.concurrent.Executors')
 
 const UTF_8 = "UTF-8"
 
-const TrustAnyHostnameVerifier = new HostnameVerifier({ verify: () => true });
+const TrustAnyHostnameVerifier = new HostnameVerifier({ verify: () => true })
 
 const SSLSocketFactory = function initSSLSocketFactory() {
-    let sslContext = SSLContext.getInstance("TLS");
+    let sslContext = SSLContext.getInstance("TLS")
     sslContext.init(null, [new X509TrustManager({
         getAcceptedIssuers: () => null,
         checkClientTrusted: () => { },
         checkServerTrusted: () => { }
-    })], new SecureRandom());
+    })], new SecureRandom())
-    return sslContext.getSocketFactory();
+    return sslContext.getSocketFactory()
-}();
+}()
 
 interface Future<T> {
-    cancel(): boolean;
+    cancel(): boolean
-    isCancelled(): boolean;
+    isCancelled(): boolean
-    isDone(): boolean;
+    isDone(): boolean
-    get(): T;
+    get(): T
 }
 
 enum ReadyState {
@@ -50,14 +50,14 @@ type RequestMethod =
     | 'options' | 'OPTIONS'
     | 'post' | 'POST'
     | 'put' | 'PUT'
-    | 'patch' | 'PATCH';
+    | 'patch' | 'PATCH'
 type ResponseType =
     | 'arraybuffer'
     | 'blob'
     | 'document'
     | 'json'
     | 'text'
-    | 'stream';
+    | 'stream'
 type EventType =
     | 'load'
     | 'error'
@@ -65,191 +65,191 @@ type EventType =
     | 'progress'
     | 'timeout'
     | 'loadend'
-    | 'loadstart';
+    | 'loadstart'
-type HttpHeader = { [key: string]: string };
+type HttpHeader = { [key: string]: string }
 
 
-const executor = Executors.newCachedThreadPool();
+const executor = Executors.newCachedThreadPool()
 
 export class XMLHttpRequest {
-    private _timeout: number;
+    private _timeout: number
     private _responseType: ResponseType = 'text';
-    private _withCredentials: boolean;
+    private _withCredentials: boolean
 
     private _readyState: ReadyState = ReadyState.UNSENT;
 
-    private _method: RequestMethod;
+    private _method: RequestMethod
-    private _url: string;
+    private _url: string
-    private _async: boolean;
+    private _async: boolean
-    private _mimeType: string;
+    private _mimeType: string
     private _requestHeaders: HttpHeader = {};
 
     private _status: number = 0;
     private _statusText: string = null;
-    private _response: any;
+    private _response: any
-    private _responseText: any;
+    private _responseText: any
-    private _responseURL: string;
+    private _responseURL: string
     private _responseHeaders: HttpHeader = {};
 
     private _connection = null;
 
     get timeout() {
-        return this._timeout;
+        return this._timeout
     }
     set timeout(timeout: number) {
         this._timeout = timeout
     }
     get readyState() {
-        return this._readyState;
+        return this._readyState
     }
     set responseType(type: ResponseType) {
-        this._responseType = type;
+        this._responseType = type
     }
     get responseType() {
-        return this._responseType;
+        return this._responseType
     }
 
     get status() {
-        return this._status;
+        return this._status
     }
     get statusText() {
-        return this._statusText;
+        return this._statusText
     }
     get response() {
-        return this._response || this.get();
+        return this._response || this.get()
     }
     get responseText() {
-        return this._responseText;
+        return this._responseText
     }
     get responseXML() {
-        return this._response;
+        return this._response
     }
     get responseURL() {
-        return this._responseURL;
+        return this._responseURL
     }
 
-    public onload: () => void;
+    public onload: () => void
-    public onerror: (ex: Error) => void;
+    public onerror: (ex: Error) => void
-    public onabort: () => void;
+    public onabort: () => void
-    public onprogress: () => void;
+    public onprogress: () => void
-    public ontimeout: (ex: Error) => void;
+    public ontimeout: (ex: Error) => void
-    public onloadend: () => void;
+    public onloadend: () => void
-    public onloadstart: () => void;
+    public onloadstart: () => void
-    public onreadystatechange: () => void;
+    public onreadystatechange: () => void
 
     setRequestHeader(key: string, val: string) {
-        this._requestHeaders[key] = val;
+        this._requestHeaders[key] = val
     }
     getResponseHeader(key: string): string {
-        return this._responseHeaders[key];
+        return this._responseHeaders[key]
     }
     getAllResponseHeaders(): any {
-        return this._responseHeaders;
+        return this._responseHeaders
     }
     addEventListener(event: EventType, callback: Function) {
-        this[`on${event.toLowerCase()}`] = callback;
+        this[`on${event.toLowerCase()}`] = callback
     }
     overrideMimeType(mimeType: string) {
-        this._mimeType = mimeType;
+        this._mimeType = mimeType
     }
     open(method: RequestMethod, url: string, async: boolean = true, user?: string, password?: string) {
         if (this._readyState !== ReadyState.UNSENT) { throw new Error(`Error Status ${this._readyState}!`) }
 
-        this._method = method;
+        this._method = method
-        this._url = url;
+        this._url = url
-        this._async = async;
+        this._async = async
 
         this._connection = new URL(this._url).openConnection()
         if (this._connection instanceof HttpsURLConnection) {
-            this._connection.setHostnameVerifier(TrustAnyHostnameVerifier);
+            this._connection.setHostnameVerifier(TrustAnyHostnameVerifier)
-            this._connection.setSSLSocketFactory(SSLSocketFactory);
+            this._connection.setSSLSocketFactory(SSLSocketFactory)
         }
-        this._connection.setRequestMethod(this._method);
+        this._connection.setRequestMethod(this._method)
-        this._connection.setDoOutput(true);
+        this._connection.setDoOutput(true)
-        this._connection.setDoInput(true);
+        this._connection.setDoInput(true)
-        this._connection.setConnectTimeout(this._timeout);
+        this._connection.setConnectTimeout(this._timeout)
-        this._connection.setReadTimeout(this._timeout);
+        this._connection.setReadTimeout(this._timeout)
 
-        this.setReadyState(ReadyState.OPENED);
+        this.setReadyState(ReadyState.OPENED)
     }
     send(body?: string | object): Future<string> {
         for (const header in this._requestHeaders) {
-            this._connection.setRequestProperty(header, this._requestHeaders[header]);
+            this._connection.setRequestProperty(header, this._requestHeaders[header])
         }
         if (this._readyState !== ReadyState.OPENED) { throw new Error(`Error Status ${this._readyState}!`) }
-        let future = executor.submit(new Callable({ call: () => this._send(body) }));
+        let future = executor.submit(new Callable({ call: () => this._send(body) }))
         if (!this._async) { future.get() }
-        return future;
+        return future
     }
     get() {
         if (this._response === undefined) {
             switch (this._responseType) {
                 case "json":
-                    return this._response = JSON.parse(this._responseText);
+                    return this._response = JSON.parse(this._responseText)
                 case "text":
-                    return this._response = this._responseText;
+                    return this._response = this._responseText
                 default:
                     throw Error(`Unsupport ResponseType: ${this._responseType} !`)
             }
         }
-        return this._response;
+        return this._response
     }
     abort() {
-        this._connection.disconnect();
+        this._connection.disconnect()
-        this.onabort && this.onabort();
+        this.onabort && this.onabort()
     }
 
     private _send(body?: string | object) {
         try {
-            this._connection.connect();
+            this._connection.connect()
-            this.onloadstart && this.onloadstart();
+            this.onloadstart && this.onloadstart()
             if (body) {
-                let bodyType = Object.prototype.toString.call(body);
+                let bodyType = Object.prototype.toString.call(body)
                 if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string!`) }
-                var out = this._connection.getOutputStream();
+                var out = this._connection.getOutputStream()
-                out.write(new JavaString(body).getBytes(UTF_8));
+                out.write(new JavaString(body).getBytes(UTF_8))
-                out.flush();
+                out.flush()
-                out.close();
+                out.close()
             }
-            this.setReadyState(ReadyState.LOADING);
+            this.setReadyState(ReadyState.LOADING)
-            this._status = this._connection.getResponseCode();
+            this._status = this._connection.getResponseCode()
-            this._statusText = this._connection.getResponseMessage();
+            this._statusText = this._connection.getResponseMessage()
             if (this._status >= 0 && this._status < 300) {
-                this._responseText = this.readOutput(this._connection.getInputStream());
+                this._responseText = this.readOutput(this._connection.getInputStream())
             } else if (this._status >= 300 && this._status < 400) {
-                this._responseURL = this.getResponseHeader('Location');
+                this._responseURL = this.getResponseHeader('Location')
             } else {
-                this._responseText = this.readOutput(this._connection.getErrorStream());
+                this._responseText = this.readOutput(this._connection.getErrorStream())
             }
-            this.setResponseHeaders(this._connection.getHeaderFields());
+            this.setResponseHeaders(this._connection.getHeaderFields())
-            this.onloadend && this.onloadend();
+            this.onloadend && this.onloadend()
         } catch (ex) {
             if (ex instanceof SocketTimeoutException && this.ontimeout) {
                 return this.ontimeout(ex)
             } else if (this.onerror) {
-                return this.onerror(ex);
+                return this.onerror(ex)
             }
-            throw ex;
+            throw ex
         } finally {
-            this._connection.disconnect();
+            this._connection.disconnect()
-            this.setReadyState(ReadyState.DONE);
+            this.setReadyState(ReadyState.DONE)
         }
     }
 
     private setResponseHeaders(header: any) {
         header.forEach((key: string | number, value: string | any[]) => {
-            this._responseHeaders[key] = value[value.length - 1]
+            this._responseHeaders[key + ''] = value[value.length - 1] + ''
-        });
+        })
     }
 
     private setReadyState(state: ReadyState) {
-        this._readyState = state;
+        this._readyState = state
-        this.onreadystatechange && this.onreadystatechange();
+        this.onreadystatechange && this.onreadystatechange()
     }
 
     private readOutput(input: any) {
-        var tempFile = Files.createTempFile('xhr', '.response');
+        var tempFile = Files.createTempFile('xhr', '.response')
-        Files.copy(input, tempFile, StandardCopyOption['REPLACE_EXISTING']); tempFile.toFile().deleteOnExit();
+        Files.copy(input, tempFile, StandardCopyOption['REPLACE_EXISTING']); tempFile.toFile().deleteOnExit()
-        return new JavaString(Files.readAllBytes(tempFile), 'UTF-8');
+        return new JavaString(Files.readAllBytes(tempFile), 'UTF-8')
     }
 }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.9.1",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,13 +22,13 @@
         "@types/js-yaml": "^3.12.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.9.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.9.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/i18n": "^0.9.0",
+        "@ccms/i18n": "^0.10.1",
         "js-yaml": "^3.14.0"
     }
 }

packages/plugin/src/command.ts

@@ -1,36 +1,40 @@
 import { command, plugin, server } from '@ccms/api'
-import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import { provideSingleton, Autowired } from '@ccms/container'
 import { getPluginCommandMetadata, getPluginTabCompleterMetadata } from './utils'
 
 @provideSingleton(PluginCommandManager)
 export class PluginCommandManager {
-    @inject(server.ServerChecker)
+    @Autowired()
-    private ServerChecker: server.ServerChecker
-    @inject(command.Command)
     private CommandManager: command.Command
+    @Autowired()
+    private ServerChecker: server.ServerChecker
 
     constructor() {
-        process.on('plugin.before.enable', (plugin: plugin.Plugin) => this.registryCommand(plugin))
+        process.on('plugin.before.enable', this.registryCommand.bind(this))
-        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryCommand(plugin))
+        process.on('plugin.after.disable', this.unregistryCommand.bind(this))
     }
 
     private registryCommand(pluginInstance: plugin.Plugin) {
         let cmds = getPluginCommandMetadata(pluginInstance)
         let tabs = getPluginTabCompleterMetadata(pluginInstance)
-        for (const [_, cmd] of cmds) {
+        for (const cmd of cmds) {
-            let tab = tabs.get(cmd.name)
+            if (!this.ServerChecker.check(cmd.servers)) {
-            if (!this.ServerChecker.check(cmd.servers)) { continue }
+                console.debug(`[${pluginInstance.description.name}] ${cmd.target.constructor.name} incompatible command ${cmd.name} server(${cmd.servers}) ignore.`)
-            this.CommandManager.on(pluginInstance, cmd.name, {
+                continue
+            }
+            for (let command of [cmd.name, ...cmd.alias]) {
+                this.CommandManager.on(pluginInstance, command, {
                     cmd: pluginInstance[cmd.executor].bind(pluginInstance),
-                tab: tab ? pluginInstance[tab.executor].bind(pluginInstance) : undefined
+                    tab: tabs.has(command) ?
+                        pluginInstance[tabs.get(command).executor].bind(pluginInstance) :
+                        console.debug(`[${pluginInstance.description.name}] command ${cmd.name} is not registry tabCompleter`)
                 })
             }
         }
+    }
 
     private unregistryCommand(pluginInstance: plugin.Plugin) {
         let cmds = getPluginCommandMetadata(pluginInstance)
-        cmds.forEach(cmd => {
+        cmds.forEach(cmd => this.CommandManager.off(pluginInstance, cmd.name))
-            this.CommandManager.off(pluginInstance, cmd.name)
-        })
     }
 }

packages/plugin/src/config.ts

@@ -1,6 +1,9 @@
 import * as yaml from 'js-yaml'
 import * as fs from '@ccms/common/dist/fs'
 import { plugin } from '@ccms/api'
+import { provideSingleton } from '@ccms/container'
+
+import { interfaces } from './interfaces'
 import { getPluginConfigMetadata } from './utils'
 
 export interface PluginConfigLoader {
@@ -13,7 +16,7 @@ export class YamlPluginConfig implements PluginConfigLoader {
         return yaml.safeLoad(content)
     }
     dump(variable: any): string {
-        return yaml.safeDump(variable, { skipInvalid: true })
+        return yaml.safeDump(variable, { skipInvalid: true, lineWidth: 120 })
     }
 }
 
@@ -22,63 +25,92 @@ export class JsonPluginConfig implements PluginConfigLoader {
         return JSON.parse(content)
     }
     dump(variable: any): string {
-        return JSON.stringify(variable)
+        return JSON.stringify(variable, undefined, 4)
     }
 }
 
-const configLoaderMap = new Map<string, PluginConfigLoader>()
+export interface PluginConfig {
-
+    /**
-export function getConfigLoader(format: string) {
+     * Save Config to File
-    if (!configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
+     */
-    return configLoaderMap.get(format)
+    readonly save?: () => void
+    /**
+     * Reload Config from File
+     */
+    readonly reload?: () => void
+    [key: string]: any
 }
 
-function loadConfig(plugin: plugin.Plugin) {
+@provideSingleton(PluginConfigManager)
-    let configs = getPluginConfigMetadata(plugin)
+export class PluginConfigManager {
-    for (let [_, config] of configs) {
+    private configLoaderMap = new Map<string, PluginConfigLoader>()
-        try {
-            let configFile = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, config.name + '.' + config.format)
-            let configFactory = getConfigLoader(config.format)
-            if (!fs.exists(configFile)) {
-                base.save(configFile, configFactory.dump(plugin[config.variable]))
-                console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: config.name, format: config.format })
-            } else {
-                Object.defineProperty(plugin, config.variable, { value: configFactory.load(base.read(configFile)) })
-                plugin[config.variable].save = () => {
-                    let result = configFactory.dump(plugin[config.variable])
-                    base.save(configFile, result)
-                    console.debug(`[${plugin.description.name}] Save Config ${config.variable} to file ${configFile} result ${result}`)
-                }
-                console.debug(`[${plugin.description.name}] Load Config ${config.variable} from file ${configFile} result ${JSON.stringify(plugin[config.variable])}`)
-            }
-        } catch (error) {
-            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
-            console.ex(error)
-        }
-    }
-}
 
-function saveConfig(plugin: plugin.Plugin) {
+    constructor() {
-    let configs = getPluginConfigMetadata(plugin)
+        this.configLoaderMap.set("json", new JsonPluginConfig())
-    for (let [_, config] of configs) {
-        try {
-            let configFile = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, config.name + '.' + config.format)
-            let configFactory = getConfigLoader(config.format)
-            if (!config.readonly) { base.save(configFile, configFactory.dump(plugin[config.variable])) }
-        } catch (error) {
-            console.i18n("ms.plugin.manager.config.save.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
-            console.ex(error)
-        }
-    }
-}
-
-function init() {
-    configLoaderMap.set("json", new JsonPluginConfig())
         let yaml = new YamlPluginConfig()
-    configLoaderMap.set("yml", yaml)
+        this.configLoaderMap.set("yml", yaml)
-    configLoaderMap.set("yaml", yaml)
+        this.configLoaderMap.set("yaml", yaml)
-    process.on('plugin.before.load', loadConfig)
+        process.on('plugin.before.load', this.loadConfig.bind(this))
-    process.on('plugin.after.load', saveConfig)
+        process.on('plugin.after.disable', this.saveConfig.bind(this))
     }
 
-init()
+    getConfigLoader(format: string) {
+        if (!this.configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
+        return this.configLoaderMap.get(format)
+    }
+
+    loadConfig(plugin: plugin.Plugin) {
+        let configs = getPluginConfigMetadata(plugin)
+        for (let [_, config] of configs) {
+            this.loadConfig0(plugin, config)
+        }
+    }
+
+    saveConfig(plugin: plugin.Plugin) {
+        let configs = getPluginConfigMetadata(plugin)
+        for (let [_, config] of configs) {
+            config.autosave && this.saveConfig0(plugin, config)
+        }
+    }
+
+    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
+        Object.defineProperties(value, {
+            'save': { value: () => this.saveConfig0(plugin, metadata) },
+            'reload': { value: () => this.loadConfig0(plugin, metadata) }
+        })
+        Object.defineProperty(plugin, metadata.variable, { value })
+    }
+
+    private loadConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
+        try {
+            metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)
+            let configLoader = this.getConfigLoader(metadata.format)
+            let value = plugin[metadata.variable]
+            if (!fs.exists(metadata.file)) {
+                base.save(metadata.file, configLoader.dump(value))
+                console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: metadata.name, format: metadata.format })
+            } 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)}`)
+            }
+            this.defienConfigProp(plugin, metadata, value)
+        } catch (error) {
+            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.format, error })
+            console.ex(error)
+        }
+    }
+
+    private saveConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
+        try {
+            metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)
+            let result = this.getConfigLoader(metadata.format).dump(plugin[metadata.variable])
+            base.save(metadata.file, result)
+            console.debug(`[${plugin.description.name}] Save Config ${metadata.variable} to file ${metadata.file} =>\n${result}`)
+            return true
+        } catch (error) {
+            console.i18n("ms.plugin.manager.config.save.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.format, error })
+            console.ex(error)
+            return false
+        }
+    }
+}

packages/plugin/src/constants.ts

@@ -1,6 +1,6 @@
 export const METADATA_KEY = {
     plugin: Symbol.for("@ccms/plugin:plugin"),
-    souece: Symbol.for("@ccms/plugin:souece"),
+    source: Symbol.for("@ccms/plugin:source"),
     cmd: Symbol.for("@ccms/plugin:cmd"),
     tab: Symbol.for("@ccms/plugin:tab"),
     listener: Symbol.for("@ccms/plugin:listener"),
@@ -10,4 +10,4 @@ export const METADATA_KEY = {
         enable: Symbol.for("@ccms/plugin:stage:enable"),
         disable: Symbol.for("@ccms/plugin:stage:disable")
     }
-};
+}

packages/plugin/src/decorators.ts

@@ -19,7 +19,7 @@ export function plugin(metadata: pluginApi.PluginMetadata | any) {
         Reflect.defineMetadata(METADATA_KEY.plugin, previousMetadata, Reflect)
         const previousSources: Map<string, pluginApi.PluginMetadata> = getPluginSources()
         previousSources.set(metadata.source.toString(), metadata)
-        Reflect.defineMetadata(METADATA_KEY.souece, previousSources, Reflect)
+        Reflect.defineMetadata(METADATA_KEY.source, previousSources, Reflect)
     }
 }
 
@@ -30,11 +30,11 @@ export function plugin(metadata: pluginApi.PluginMetadata | any) {
 export function cmd(metadata: interfaces.CommandMetadata = {}) {
     return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || key
+        metadata.alias = metadata.alias || []
+        metadata.target = target
         metadata.executor = key
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
-        const previousMetadata: Map<string, interfaces.CommandMetadata> = getPluginCommandMetadata(target)
+        Reflect.defineMetadata(METADATA_KEY.cmd, [metadata, ...getPluginCommandMetadata(target)], target.constructor)
-        previousMetadata.set(metadata.name, metadata)
-        Reflect.defineMetadata(METADATA_KEY.cmd, previousMetadata, target.constructor)
     }
 }
 
@@ -46,10 +46,13 @@ export function tab(metadata: interfaces.CommandMetadata = {}) {
     return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || (key.startsWith('tab') ? key.split('tab', 2)[1] : key)
         if (!metadata.name) { return }
+        metadata.alias = metadata.alias || []
+        metadata.target = target
         metadata.executor = key
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
-        const previousMetadata: Map<string, interfaces.CommandMetadata> = getPluginTabCompleterMetadata(target)
+        let previousMetadata = getPluginTabCompleterMetadata(target)
         previousMetadata.set(metadata.name, metadata)
+        metadata.alias?.forEach((name) => previousMetadata.set(name, metadata))
         Reflect.defineMetadata(METADATA_KEY.tab, previousMetadata, target.constructor)
     }
 }
@@ -61,9 +64,10 @@ export function tab(metadata: interfaces.CommandMetadata = {}) {
 export function listener(metadata: interfaces.ListenerMetadata = {}) {
     return function (target: any, key: string, value: any) {
         metadata.name = metadata.name || key
+        metadata.target = target
         metadata.executor = key
-        const previousMetadata: interfaces.ListenerMetadata[] = getPluginListenerMetadata(target)
+        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...getPluginListenerMetadata(target)], target.constructor)
-        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...previousMetadata], target.constructor)
+        Reflect.defineMetadata(METADATA_KEY.listener, metadata, target[key])
     }
 }
 
@@ -73,7 +77,9 @@ export function config(metadata: interfaces.ConfigMetadata = {}) {
         metadata.variable = key
         metadata.version = metadata.version ?? 1
         metadata.format = metadata.format ?? 'yml'
-        const previousMetadata: Map<string, interfaces.ConfigMetadata> = getPluginConfigMetadata(target)
+        metadata.autosave = metadata.autosave ?? false
+        metadata.filename = metadata.filename ?? metadata.name + '.' + metadata.format
+        let previousMetadata = getPluginConfigMetadata(target)
         previousMetadata.set(metadata.name, metadata)
         Reflect.defineMetadata(METADATA_KEY.config, previousMetadata, target.constructor)
     }
@@ -84,8 +90,7 @@ function stage(stage: string) {
         return function (target: any, key: string, value: any) {
             metadata.name = metadata.name || key
             metadata.executor = key
-            const previousMetadata: interfaces.ExecMetadata[] = getPluginStageMetadata(target, stage)
+            Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...getPluginStageMetadata(target, stage)], target.constructor)
-            Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...previousMetadata], target.constructor)
         }
     }
 }

packages/plugin/src/event.ts

@@ -1,26 +1,36 @@
 import { event, plugin, server } from '@ccms/api'
-import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import { provideSingleton, Autowired } from '@ccms/container'
 import { getPluginListenerMetadata } from './utils'
 
 @provideSingleton(PluginEventManager)
 export class PluginEventManager {
-    @inject(server.ServerChecker)
+    @Autowired()
-    private ServerChecker: server.ServerChecker
-    @inject(event.Event)
     private EventManager: event.Event
+    @Autowired()
+    private ServerChecker: server.ServerChecker
 
     constructor() {
-        process.on('plugin.before.enable', (plugin: plugin.Plugin) => this.registryListener(plugin))
+        process.on('plugin.before.enable', this.registryListener.bind(this))
-        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryListener(plugin))
+        process.on('plugin.after.disable', this.unregistryListener.bind(this))
+    }
+
+    mapEventName() {
+        return this.EventManager.mapEventName().toFixed(0)
     }
 
     private registryListener(pluginInstance: plugin.Plugin) {
         let events = getPluginListenerMetadata(pluginInstance)
         for (const event of events) {
             // ignore space listener
-            if (!this.ServerChecker.check(event.servers)) { continue }
+            if (!this.ServerChecker.check(event.servers)) {
+                console.debug(`[${pluginInstance.description.name}] ${event.target.constructor.name} incompatible event ${event.name} server(${event.servers}) ignore.`)
+                continue
+            }
             // here must bind this to pluginInstance
-            this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance), event.priority, event.ignoreCancel)
+            let exec = event.target[event.executor]
+            let execBinded = exec.bind(pluginInstance)
+            execBinded.executor = event.executor
+            exec.off = this.EventManager.listen(pluginInstance, event.name, execBinded, event.priority, event.ignoreCancel)
         }
     }
 

packages/plugin/src/index.ts

@@ -6,6 +6,8 @@ export * from './manager'
 export * from './decorators'
 export * from './interfaces'
 
+export { PluginConfig } from './config'
+
 export {
     plugin as JSPlugin,
     cmd as Cmd,

packages/plugin/src/interfaces.ts

@@ -25,12 +25,20 @@ export namespace interfaces {
         public disable() { }
     }
     export interface ExecMetadata extends plugin.BaseMetadata {
+        /**
+         * 执行器所在对象 用于绑定this
+         */
+        target?: any
         /**
          * 执行器
          */
         executor?: string
     }
     export interface CommandMetadata extends ExecMetadata {
+        /**
+         * 命令别名
+         */
+        alias?: string[]
         /**
          * 命令描述
          */
@@ -64,9 +72,16 @@ export namespace interfaces {
          */
         format?: string
         /**
-         * 是否为只读(关闭时将不会自动保存)
+         * 自动保存 默认为 false
          */
-        readonly?: boolean
+        autosave?: boolean
+        /**
+         * 配置文件名称
+         */
+        filename?: string
+        /**
+         * 配置文件全路径
+         */
+        file?: any
     }
-    export type PluginLike = Plugin | string
 }

packages/plugin/src/loader/basic-loader.ts

@@ -1,9 +1,11 @@
 import { plugin } from "@ccms/api"
-import { provideSingleton } from "@ccms/container"
+import { provideSingletonNamed } from "@ccms/container"
 
-@provideSingleton(plugin.PluginLoader)
+const LOADER_TYPE_NAME = 'basic'
+
+@provideSingletonNamed(plugin.PluginLoader, LOADER_TYPE_NAME)
 export class BasicLoader implements plugin.PluginLoader {
-    type: string = 'basic'
+    type: string = LOADER_TYPE_NAME
 
     private pluginRequireMap: Map<string, any>
 
@@ -22,8 +24,4 @@ export class BasicLoader implements plugin.PluginLoader {
     build(metadata: plugin.PluginMetadata) {
         return this.pluginRequireMap.get(metadata.source.toString())
     }
-    load(plugin: plugin.Plugin): void { }
-    enable(plugin: plugin.Plugin): void { }
-    disable(plugin: plugin.Plugin): void { }
-    reload(plugin: plugin.Plugin): void { }
 }

packages/plugin/src/loader/ioc-loader.ts

@@ -1,16 +1,18 @@
 import { plugin, server } from "@ccms/api"
-import { inject, ContainerInstance, Container, provideSingleton } from "@ccms/container"
+import { inject, ContainerInstance, Container, provideSingletonNamed, Autowired } from "@ccms/container"
 
 import { interfaces } from "../interfaces"
 import { getPluginStageMetadata, getPluginSources } from "../utils"
 
-@provideSingleton(plugin.PluginLoader)
+const LOADER_TYPE_NAME = 'ioc'
+
+@provideSingletonNamed(plugin.PluginLoader, LOADER_TYPE_NAME)
 export class IocLoader implements plugin.PluginLoader {
-    type: string = 'ioc'
+    type: string = LOADER_TYPE_NAME
     @inject(ContainerInstance)
     private container: Container
-    @inject(server.ServerType)
+    @Autowired()
-    private serverType: string
+    private serverChecker: server.ServerChecker
 
     private pluginMetadataMap: Map<string, plugin.PluginMetadata>
 
@@ -28,7 +30,6 @@ export class IocLoader implements plugin.PluginLoader {
     }
 
     build(metadata: plugin.PluginMetadata) {
-        if (!this.allowProcess(metadata.servers)) { return }
         let pluginInstance: plugin.Plugin
         try {
             this.bindPlugin(metadata)
@@ -73,23 +74,10 @@ export class IocLoader implements plugin.PluginLoader {
         }
     }
 
-    private allowProcess(servers: string[]) {
-        // Not set servers -> allow
-        if (!servers || !servers.length) return true
-        // include !type -> deny
-        let denyServers = servers.filter(svr => svr.startsWith("!"))
-        if (denyServers.length !== 0) {
-            return !denyServers.includes(`!${this.serverType}`)
-        } else {
-            // only include -> allow
-            return servers.includes(this.serverType)
-        }
-    }
-
     private stage(pluginInstance: plugin.Plugin, stageName: string) {
         let stages = getPluginStageMetadata(pluginInstance, stageName)
         for (const stage of stages) {
-            if (!this.allowProcess(stage.servers)) { continue }
+            if (!this.serverChecker.check(stage.servers)) { continue }
             console.i18n("ms.plugin.manager.stage.exec", { plugin: pluginInstance.description.name, name: stage.executor, stage: stageName, servers: stage.servers })
             try {
                 pluginInstance[stage.executor].apply(pluginInstance)

packages/plugin/src/manager.ts

@@ -1,29 +1,38 @@
 import i18n from '@ccms/i18n'
-import { plugin, server, event } from '@ccms/api'
+import { plugin, server } from '@ccms/api'
-import { inject, provideSingleton, Container, ContainerInstance } from '@ccms/container'
+import { provideSingleton, Container, ContainerInstance, Autowired } from '@ccms/container'
 
 import './config'
 import { interfaces } from './interfaces'
-import { PluginCommandManager } from './command'
+import { PluginTaskManager } from './task'
 import { PluginEventManager } from './event'
+import { PluginCommandManager } from './command'
+import { PluginConfigManager } from './config'
 
 const Thread = Java.type('java.lang.Thread')
 
 @provideSingleton(plugin.PluginManager)
 export class PluginManagerImpl implements plugin.PluginManager {
-    @inject(ContainerInstance)
+    @Autowired(ContainerInstance)
     private container: Container
-    @inject(plugin.PluginInstance)
+    @Autowired(plugin.PluginInstance)
     private pluginInstance: any
-    @inject(server.ServerType)
+    @Autowired(server.ServerType)
     private serverType: string
-    @inject(event.Event)
-    private EventManager: event.Event
 
-    @inject(PluginCommandManager)
+    @Autowired()
-    private commandManager: PluginCommandManager
+    private serverChecker: server.ServerChecker
-    @inject(PluginEventManager)
+    @Autowired()
+    private nativePluginManager: server.NativePluginManager
+
+    @Autowired()
+    private taskManager: PluginTaskManager
+    @Autowired()
     private eventManager: PluginEventManager
+    @Autowired()
+    private configManager: PluginConfigManager
+    @Autowired()
+    private commandManager: PluginCommandManager
 
     private initialized: boolean = false
 
@@ -41,15 +50,17 @@ export class PluginManagerImpl implements plugin.PluginManager {
         this.metadataMap = new Map()
 
         // ignore unused
-        this.commandManager
+        this.taskManager
         this.eventManager
+        this.configManager
+        this.commandManager
     }
 
     initialize() {
         if (this.pluginInstance === undefined) { throw new Error("Can't found Plugin Instance!") }
         if (this.initialized !== true) {
             console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
-            console.i18n('ms.plugin.event.map', { count: this.EventManager.mapEventName().toFixed(0), type: this.serverType })
+            console.i18n('ms.plugin.event.map', { count: this.eventManager.mapEventName(), type: this.serverType })
             let pluginScanner = this.container.getAll<plugin.PluginScanner>(plugin.PluginScanner)
             pluginScanner.forEach((scanner) => {
                 console.debug(`loading plugin sacnner ${scanner.type}...`)
@@ -74,7 +85,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
                     try {
                         this.loadPlugin(scanner.load(loadMetadata))
                     } catch (error) {
-                        console.error(`plugin scanner ${scanner.type} load ${loadMetadata.name} occurred error ${error}`)
+                        console.error(`plugin scanner ${scanner.type} load ${loadMetadata.file} occurred error ${error}`)
                         console.ex(error)
                     }
                 })
@@ -102,7 +113,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
             process.emit(`plugin.before.${stage}`, plugin)
             this.runCatch(plugin, stage)
             this.runCatch(plugin, `${this.serverType}${stage}`)
-            plugin.description.loadMetadata.loader[stage](plugin)
+            plugin.description.loadMetadata.loader[stage]?.(plugin)
             process.emit(`plugin.after.${stage}`, plugin)
         } catch (ex) {
             console.i18n("ms.plugin.manager.stage.exec.error", { plugin: plugin.description.name, executor: stage, error: ex })
@@ -112,7 +123,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
 
     private loadPlugin(loadMetadata: plugin.PluginLoadMetadata) {
         if (!loadMetadata) { throw new Error('loadMetadata can\'t be undefiend when loadPlugin!') }
-        if (loadMetadata.loaded) { throw new Error(`Plugin ${loadMetadata.name} is already loaded by ${loadMetadata.loader?.type}!`) }
+        if (loadMetadata.loaded) { throw new Error(`Plugin file ${loadMetadata.file} is already loaded by ${loadMetadata.loader?.type}!`) }
         try {
             for (const [, loader] of this.loaderMap) {
                 if (this.loaderRequirePlugin(loadMetadata, loader)?.loaded) return loadMetadata.metadata
@@ -129,7 +140,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
             if (loader.require(loadMetadata).loaded) {
                 loadMetadata.loader = loader
                 let metadata = loadMetadata.metadata
-                if (this.metadataMap.has(metadata.name)) {
+                if (this.metadataMap.has(metadata.name) && this.instanceMap.has(metadata.name)) {
                     let oldMetadata = this.metadataMap.get(metadata.name)
                     throw new Error(`Plugin ${oldMetadata.name} is already load from ${oldMetadata.source}...`)
                 }
@@ -215,16 +226,30 @@ export class PluginManagerImpl implements plugin.PluginManager {
             try {
                 this.buildPlugin(metadata)
             } catch (error) {
-                console.error(error)
+                console.console(`§4无法加载插件 §b${metadata.name} §4构建插件失败!`)
+                console.ex(error)
             }
         })
     }
 
+    private checkDepends(depends: string | string[]) {
+        if (!depends) return true
+        for (const depend of depends) { if (!this.metadataMap.has(depend)) return false }
+        return true
+    }
+    private checkNativeDepends(depends: string | string[]) {
+        if (!depends) return true
+        for (const depend of depends) { if (!this.nativePluginManager.has(depend)) return false }
+        return true
+    }
     private buildPlugin(metadata: plugin.PluginMetadata) {
-        if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §c${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
+        if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
+        if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
+        if (!this.serverChecker.check(metadata.servers)) { throw new Error(`§6插件 §b${metadata.name} §c服务器类型不兼容(${metadata.servers.join(',')}) §6忽略加载...`) }
+        if (!this.checkDepends(metadata.depends)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查依赖 §3${metadata.depends.join(',')} §4是否安装完整!`) }
+        if (!this.checkNativeDepends(metadata.nativeDepends)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查插件依赖 §3${metadata.nativeDepends.join(',')} §4是否安装完整!`) }
         let pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
         if (!pluginInstance) { throw new Error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`) }
-        if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
         this.instanceMap.set(metadata.name, pluginInstance)
         return pluginInstance
     }

packages/plugin/src/scanner/file-scanner.ts

@@ -2,9 +2,11 @@ import { plugin } from "@ccms/api"
 import * as fs from '@ccms/common/dist/fs'
 import { provideSingletonNamed } from "@ccms/container"
 
-@provideSingletonNamed(plugin.PluginScanner, 'file')
+const SCANNER_TYPE_NAME = 'file'
+
+@provideSingletonNamed(plugin.PluginScanner, SCANNER_TYPE_NAME)
 export class JSFileScanner implements plugin.PluginScanner {
-    type: string = 'file'
+    type: string = SCANNER_TYPE_NAME
 
     scan(target: any): plugin.PluginLoadMetadata[] {
         return this.scanFolder(fs.concat(root, target)).map((file) => this.read(file))

packages/plugin/src/task.ts

@@ -0,0 +1,16 @@
+import { plugin, task } from '@ccms/api'
+import { provideSingleton, Autowired } from '@ccms/container'
+
+@provideSingleton(PluginTaskManager)
+export class PluginTaskManager {
+    @Autowired()
+    private taskManager: task.TaskManager
+
+    constructor() {
+        process.on('plugin.after.disable', this.cancelTask.bind(this))
+    }
+
+    private cancelTask(pluginInstance: plugin.Plugin) {
+        this.taskManager.disable(pluginInstance)
+    }
+}

packages/plugin/src/utils.ts

@@ -14,7 +14,7 @@ function getPlugin(name: string) {
 
 function getPluginSources() {
     let pluginSources: Map<string, plugin.PluginMetadata> = Reflect.getMetadata(
-        METADATA_KEY.souece,
+        METADATA_KEY.source,
         Reflect
     ) || pluginSourceCache
     return pluginSources
@@ -37,10 +37,10 @@ function getPluginMetadata(target: any) {
 }
 
 function getPluginCommandMetadata(target: any) {
-    let commandMetadata: Map<string, interfaces.CommandMetadata> = Reflect.getMetadata(
+    let commandMetadata: interfaces.CommandMetadata[] = Reflect.getMetadata(
         METADATA_KEY.cmd,
         target.constructor
-    ) || new Map<string, interfaces.CommandMetadata>()
+    ) || []
     return commandMetadata
 }
 

packages/plugins/docs/MiaoBlockly.md

@@ -0,0 +1,67 @@
+# MiaoBlockly
+
+## 前言
+
+- 嗯 我又来了
+- 之前承诺的 MiaoScript 腐竹可以用的版本
+- 第一个 Demo 版本 MiaoBlockly 写完了
+
+### 什么是 MiaoBlockly
+
+#### ~~对于开发者~~(开发一般不会用这玩意儿)
+
+#### 对于腐竹
+- 可以在网页上开发一些简单的插件
+- 拖动方块就能实现了
+
+### 图片展示
+
+![image.png](https://i.loli.net/2020/10/22/R8nlf9WtVYDXoa3.png)
+
+### MiaoBlockly 的兼容性
+- 跨端兼容 Sponge Bukkit BungeeCord
+  - Bukkit 支持 1.12.2 +(由于1.12.2以下版本Netty版本过老需要适配 后续兼容到1.7.10)
+  - Sponge
+  - CatServer 1.12.2+
+  - BungeeCord
+
+### 安装教程
+- 安装 `MiaoConsole` [站内地址](https://www.mcbbs.net/thread-1129227-1-1.html) 没错 就是装 MiaoConsole
+- 因为 `MiaoBlockly` 底层还是运行的 js 只是用 `Blockly` 生成了代码而已
+- 需要 `MiaoConsole` 是因为需要和服务器通信
+
+### 使用教程
+- 查看启动日志 获取临时 `Token`
+  - 或者 执行 `mconsole token` 获得临时Token
+- 打开 `http://ms.yumc.pw/blockly.html`
+- 在地址栏输入服务器地址 需要带上端口
+- 在 Token 栏输入获取到的 Token
+- 点击链接即可
+
+### 编辑器使用
+- 默认界面有一个插件主体
+- 拖动积木 右侧会自动生成代码
+- 在代码界面 按下 `Ctrl + S` 代码会自动传送到服务器 并且重载插件
+- 更多功能还在开发
+
+### RoadMap
+- 开发聊天相关功能
+- 完善事件相关功能
+- 开发命令相关功能
+- 开发跨服相关功能
+- 统一各个端之间的事件(工作量较大 可能会咕咕咕)
+- 脚本商城 方便开发和腐竹之前的 PY 交易
+- 脚本打包成 Jar 方便部署
+
+### Miao系列插件
+
+- [[经济]MiaoReward —— 喵式奖励 让玩家看广告为服务器提供收入吧[1.7.10+全版本]](https://www.mcbbs.net/thread-1121423-1-1.html)
+- [[编程]MiaoBlockly —— 喵式积木 用简单的积木来写插件吧[1.12.2+全版本]](https://www.mcbbs.net/thread-1129411-1-1.html)
+- [[编程]MiaoConsole —— 喵式终端 通过MC端口直接控制服务器 调试插件[1.12.2+全版本]](https://www.mcbbs.net/thread-1129227-1-1.html)
+- [[管理]MiaoBind —— 喵式绑定 兼容SoulBound的绑定插件 支持自定义关键词[1.7+全版本]](https://www.mcbbs.net/thread-922072-1-1.html)
+- [[信息]MiaoBoard —— 喵式记分板 自定义动态记分板[1.7+全版本]](https://www.mcbbs.net/thread-631482-1-1.html)
+- [[聊天]MiaoChat —— 喵式聊天 多功能自定义聊天格式 新增支持跨服[1.7.10+全版本]](https://www.mcbbs.net/thread-631240-1-1.html)
+- [[菜单]MiaoMenu —— 喵式菜单 强大的自定义菜单 支持多种自定义操作[1.7+全版本]](https://www.mcbbs.net/thread-860047-1-1.html)
+- [[管理]YUM —— 全能的服务器插件管理工具 全自动安装插件 更新插件[1.7.2+全版本]](https://www.mcbbs.net/thread-701333-1-1.html)
+
+本插件所用所有代码均为原创,不存在借用/抄袭等行为

packages/plugins/docs/MiaoConsole.md

@@ -1,12 +1,24 @@
+# MiaoConsole
+
 ## 前言
 
 > 各位开发 在调试Minecraft插件的时候 是不是经常面临下列情况
 - 编译等半天 重启等半天 测试找不到问题
 - 后台 IDE SCP/FTP 来回切换
 
+> 各位腐竹 在开服的时候 是不是经常遇到下列情况
+- 修改一个配置文件 经常格式错误
+- 各种报错看不懂 插件依赖找不到
+
 ### 什么是 MiaoConsole
-- MiaoConsole 是 基于 MiaoScript 开发的 在线调试工具
+
-- 通过复用 Minecraft的Netty 通道 实现服务器端口 在线调试(并不是Java的调试哦)
+#### 对于开发者
+- MiaoConsole 是 基于 `MiaoScript` 开发的 在线调试工具
+- 通过复用 Minecraft 的 Netty 通道 实现服务器端口 `MiaoScript` 在线调试
+
+#### 对于腐竹
+- 可以在网页上实时看到服务器日志
+- 共享 Token 给插件开发者 让其帮助调试服务器
 
 ### 工具动图
 
@@ -27,12 +39,14 @@
   - BungeeCord ~~终端转发暂未兼容~~ 已经能兼容了
 
 ### 安装教程
-- 安装MiaoScript [下载地址](http://w.yumc.pw/free.html#MiaoScript-download)
+- 安装 `MiaoScript` [站内地址](https://www.mcbbs.net/thread-774401-1-1.html)
-- 首次启动 等待加载基础环境类库
+  - 如果你已经安装了 Yum 可以通过 Yum 快速安装 `/yum install MiaoScript`
-- 执行 `mpm i MiaoConsole`
+- 等待 MiaoScript 引擎启动完成(首次启动可能需要10-20秒 依赖于您的网络环境)
+- 执行 `mspm i MiaoConsole`
 
 ### 使用教程
-- 执行 `mconsole token` 获得临时Token
+- 查看启动日志 获取临时 `Token`
+  - 或者 执行 `mconsole token` 获得临时Token
 - 打开 `http://ms.yumc.pw/console.html`
 - 在地址栏输入服务器地址 需要带上端口
 - 在 Token 栏输入获取到的 Token
@@ -41,11 +55,11 @@
 ### 终端使用
 - 支持实时传输服务器日志到终端
 - 直接在终端输入命令 会转发到服务器
-- 目前暂不支持命令自动补全
+- 支持命令自动补全
 - 支持命令历史
 
 ### 代码编辑器使用
-- 支持 Java 的 lang包和util包自动补全
+- 支持 Java 的类自动补全
 - 支持服务端所有代码补全
 - 注意 暂时不支持自动导入包 所以需要手动输入全类名
 - 快捷键说明(选中代码后 只会执行选中部分)
@@ -53,8 +67,27 @@
   - Ctrl + E 执行命令
   - Ctrl + Q 切换代码页
 
+## 插件源码
+
+- [MiaoScript包管理中心](https://git.yumc.pw/circlecloud/ms/src/branch/master/packages/plugins/src/MiaoConsole.ts)
+
 ### RoadMap
-- 支持命令自动补全
+- 支持 Java 类的自动补全
-- 支持常用的开发脚本
+- 支持命令自动补全(已完成)
-- 支持快捷操作服务器数据
+- 支持常用的开发脚本(开发中)
+- 支持快捷操作服务器数据(开发中)
 - 支持在线编辑服务器文件(开发了一半)
+- 配置文件格式效验(开发中)
+
+### Miao系列插件
+
+- [[经济]MiaoReward —— 喵式奖励 让玩家看广告为服务器提供收入吧[1.7.10+全版本]](https://www.mcbbs.net/thread-1121423-1-1.html)
+- [[编程]MiaoBlockly —— 喵式积木 用简单的积木来写插件吧[1.12.2+全版本]](https://www.mcbbs.net/thread-1129411-1-1.html)
+- [[编程]MiaoConsole —— 喵式终端 通过MC端口直接控制服务器 调试插件[1.12.2+全版本]](https://www.mcbbs.net/thread-1129227-1-1.html)
+- [[管理]MiaoBind —— 喵式绑定 兼容SoulBound的绑定插件 支持自定义关键词[1.7+全版本]](https://www.mcbbs.net/thread-922072-1-1.html)
+- [[信息]MiaoBoard —— 喵式记分板 自定义动态记分板[1.7+全版本]](https://www.mcbbs.net/thread-631482-1-1.html)
+- [[聊天]MiaoChat —— 喵式聊天 多功能自定义聊天格式 新增支持跨服[1.7.10+全版本]](https://www.mcbbs.net/thread-631240-1-1.html)
+- [[菜单]MiaoMenu —— 喵式菜单 强大的自定义菜单 支持多种自定义操作[1.7+全版本]](https://www.mcbbs.net/thread-860047-1-1.html)
+- [[管理]YUM —— 全能的服务器插件管理工具 全自动安装插件 更新插件[1.7.2+全版本]](https://www.mcbbs.net/thread-701333-1-1.html)
+
+本插件所用所有代码均为原创,不存在借用/抄袭等行为

packages/plugins/docs/MiaoPlugin.md

@@ -0,0 +1,24 @@
+### Miao系列插件
+
+- [[经济]MiaoReward —— 喵式奖励 让玩家看广告为服务器提供收入吧[1.7.10+全版本]](https://www.mcbbs.net/thread-1121423-1-1.html)
+- [[编程]MiaoBlockly —— 喵式积木 用简单的积木来写插件吧[1.12.2+全版本]](https://www.mcbbs.net/thread-1129411-1-1.html)
+- [[编程]MiaoConsole —— 喵式终端 通过MC端口直接控制服务器 调试插件[1.12.2+全版本]](https://www.mcbbs.net/thread-1129227-1-1.html)
+- [[管理]MiaoBind —— 喵式绑定 兼容SoulBound的绑定插件 支持自定义关键词[1.7+全版本]](https://www.mcbbs.net/thread-922072-1-1.html)
+- [[信息]MiaoBoard —— 喵式记分板 自定义动态记分板[1.7+全版本]](https://www.mcbbs.net/thread-631482-1-1.html)
+- [[聊天]MiaoChat —— 喵式聊天 多功能自定义聊天格式 新增支持跨服[1.7.10+全版本]](https://www.mcbbs.net/thread-631240-1-1.html)
+- [[菜单]MiaoMenu —— 喵式菜单 强大的自定义菜单 支持多种自定义操作[1.7+全版本]](https://www.mcbbs.net/thread-860047-1-1.html)
+- [[管理]YUM —— 全能的服务器插件管理工具 全自动安装插件 更新插件[1.7.2+全版本]](https://www.mcbbs.net/thread-701333-1-1.html)
+
+[size=20px][b]Miao系列插件[/b][/size]
+
+[size=16px][list]
+[*][url=https://www.mcbbs.net/thread-1121423-1-1.html][经济]MiaoReward —— 喵式奖励 让玩家看广告为服务器提供收入吧[1.7.10+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-1129411-1-1.html][编程]MiaoBlockly —— 喵式积木 用简单的积木来写插件吧[1.12.2+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-1129227-1-1.html][编程]MiaoConsole —— 喵式终端 通过MC端口直接控制服务器 调试插件[1.12.2+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-922072-1-1.html][管理]MiaoBind —— 喵式绑定 兼容SoulBound的绑定插件 支持自定义关键词[1.7+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-631482-1-1.html][信息]MiaoBoard —— 喵式记分板 自定义动态记分板[1.7+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-631240-1-1.html][聊天]MiaoChat —— 喵式聊天 多功能自定义聊天格式 新增支持跨服[1.7.10+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-860047-1-1.html][菜单]MiaoMenu —— 喵式菜单 强大的自定义菜单 支持多种自定义操作[1.7+全版本][/url]
+[*][url=https://www.mcbbs.net/thread-701333-1-1.html][管理]YUM —— 全能的服务器插件管理工具 全自动安装插件 更新插件[1.7.2+全版本][/url][/list][/size]
+
+[size=16px]本插件所用所有代码均为原创,不存在借用/抄袭等行为[/size]

packages/plugins/docs/MiaoReward.md

@@ -0,0 +1,151 @@
+# MiaoReward
+
+## 插件简介
+- 还在为服务器收入不足而倒闭烦恼嘛
+- 还在为肝帝不氪金而烦恼嘛
+- 快来接入 喵式奖励
+- 通过QQ小程序广告 增加服务器收入
+
+### 先来一张近期的服务器提现订单
+
+![image.png](https://i.loli.net/2020/10/16/LmXAklot43WOy1P.png)
+
+## 插件展示
+
+> 多图预警 折叠了
+
+`[spoiler]`
+
+- 插件帮助![image.png](https://i.loli.net/2020/09/12/uNbwO2sCVriZzJx.png)
+- 扫码绑定![image.png](https://i.loli.net/2020/09/13/hOtyV8bP9kGeuCD.png)
+- 查看个人信息![image.png](https://i.loli.net/2020/09/12/bTLGjQC7eqxAUSi.png)
+- 兑换排行![image.png](https://i.loli.net/2020/09/12/zNbgKQChtj7IikD.png)
+- 玩家兑换公告![image.png](https://i.loli.net/2020/09/12/JWFoUtwXBSP6fcA.png)
+- 配置兑换比例![image.png](https://i.loli.net/2020/09/12/HpGVWErwZ7YTBxK.png)
+- 服务器信息查询![image.png](https://i.loli.net/2020/09/12/CbvSDfg4BF39PLI.png)
+- 玩家请求授权![image.png](https://i.loli.net/2020/09/24/QH6Dfp8RYJC5BtL.png)
+- 玩家扫码![image.png](https://i.loli.net/2020/09/24/LSuhamJ4ji12EzM.png)
+- 玩家扫码确认![image.png](https://i.loli.net/2020/09/24/sKjAl3tImg7buHe.png)
+- 玩家扫码兑换完成![image.png](https://i.loli.net/2020/09/24/JG2SBtgHLzNeaEO.png)
+- 腐竹扫码确认![image.png](https://i.loli.net/2020/09/24/c7sS18KJvQ3MRuZ.png)
+- 腐竹扫码完成![image.png](https://i.loli.net/2020/09/24/RtsoSdV7j6OmE8Q.png)
+
+`[/spoiler]`
+
+## 插件命令
+```
+>mrd
+[17:56:54 INFO]: [MS][MRD] ====== [广告系统] 帮助菜单 ======
+[17:56:54 INFO]: [MS][MRD] /mrd bind 绑定圈云盒子
+[17:56:54 INFO]: [MS][MRD] /mrd query 查询当前账户
+[17:56:54 INFO]: [MS][MRD] /mrd draw <兑换数量> 兑换点券
+[17:56:54 INFO]: [MS][MRD] 由于您是管理员 以为您展示额外命令
+[17:56:54 INFO]: [MS][MRD] /mrd bind server 绑定服务器
+[17:56:54 INFO]: [MS][MRD] /mrd ratio <兑换比例> 设置喵币/点券兑换比例
+[17:56:54 INFO]: [MS][MRD] /mrd statistic 近期收入统计
+[17:56:54 INFO]: [MS][MRD] /mrd rank <boardcast>(是否公告) 今日兑换排行
+[17:56:54 INFO]: [MS][MRD] /mrd server 当前服务器信息
+[17:56:54 INFO]: [MS][MRD] 兑换比例设置说明: 默认比例为 0.001 => 1000喵币 兑换 1点券
+[17:56:54 INFO]: [MS][MRD] 注意 设置比例后 玩家兑换点券数量不能少于 1点券
+[17:56:54 INFO]: [MS][MRD] 比如 设置了0.001 那就是 玩家至少 1000喵币 才能兑换!
+```
+
+## 接下来就是赚钱的操作
+
+## 插件安装/配置
+
+### 基础准备工作
+- QQ搜索小程序 `圈云盒子` 并登录
+- 申请内测服务器账号
+  - 个人中心 => 配置面板 => 圈云盒子客服群
+  - 打开群详情 加群
+
+### 申请账号
+- 打开 [圈云盒子管理后台](https://reward.yumc.pw)
+- 扫码登录 并且加入客服群
+- 创建一个服务器 等待管理员审核通过
+
+`[hide]`
+
+### 服务器准备工作
+- 安装 `MiaoScript` [站内地址](https://www.mcbbs.net/thread-774401-1-1.html)
+  - 如果你已经安装了 Yum 可以通过 Yum 快速安装 `/yum install MiaoScript`
+- 等待 MiaoScript 引擎启动完成(首次启动可能需要10-20秒 依赖于您的网络环境)
+- 执行 `/mspm install MiaoReward` 安装 MiaoReward 脚本插件
+- 完成安装
+
+### 绑定服务器
+- 执行 `/mrd bind server`
+- 使用QQ扫码 => 选择需要绑定的服务器 => 完成绑定
+- 配置服务器兑换比例
+- 执行 `/mrd ratio <兑换比例>` (最低为 1:0.0001)
+- 执行兑换比例确认指令
+- 执行 `/mrd server` 查看服务器信息
+- 如果群组服需要绑定多台服务器(前提是每个服务器都有玩家在)
+  - 执行 `/gmspm install MiaoReward` 批量安装
+  - 可以直接复制绑定之后的 `MiaoScript/plugins/MiaoReward/config.yml`
+  - 黏贴配置文件到所有需要绑定的服务器上
+  - 然后 `/gmspm reload MiaoReward` 批量重载插件
+
+### QQ群配置
+- 打开小程序
+- 登录
+- 个人中心 => 设置面板 => 添加到群应用 => 选择你的QQ群
+- 配置群快捷栏 个人中心 => 设置面板 => 查看设置群快捷栏
+- 配置结果![image.png](https://i.loli.net/2020/09/24/C5ReMOo29mFbVAl.png)
+
+### 玩家绑定账号
+- 执行 `/mrd bind`
+- 使用QQ扫码
+- 完成绑定
+- 执行 `/mrd query` 查询信息
+
+## 使用说明
+- 玩家可以通过下列方式获取喵币
+  - 签到 5-10 喵币
+  - 视频广告 5-15 喵币
+  - 盒子广告 5-15 喵币
+- 获得的喵币可以在服务器兑换成对应的奖励
+- 腐竹可以在平台将喵币兑换成RMB(兑换比例请加群联系客服详谈)
+- 登录小程序后 个人中心 => 配置面板 => 圈云盒子客服群
+
+## PAPI兼容
+- 目前已经兼容 PAPI 变量
+  - `%mrd_balance%` 玩家喵币
+  - `%mrd_sign%` 玩家签到(*/1)
+  - `%mrd_video%` 玩家视频观看次数(*/300)
+  - `%mrd_box%` 玩家盒子观看次数(*/300)
+- 如果玩家变量没有及时更新 执行 `/mrd query` 或 `重新登录游戏` 即可
+
+## 配置文件
+
+```yml
+# 服务器ID
+serverId: 16
+# 服务器Token
+serverToken: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+# 兑换指令
+drawCommand: 'p give %player_name% %amount%'
+# 冷却时间
+drawCooldown: 300
+# 提示前缀
+prefix: '§6[§b广告系统§6]§r'
+```
+
+## 插件源码
+
+- [MiaoScript包管理中心](https://git.yumc.pw/circlecloud/ms/src/branch/master/packages/plugins/src/MiaoReward.ts)
+
+`[/hide]`
+
+## 更新日志
+- 2020-10-12 完成提现功能
+- 2020-10-06 使用发包的方式展示地图
+
+## Roadmap
+- 绑定服务器(已完成)
+- 绑定玩家(已完成)
+- 兑换喵币(已完成)
+- [自助开通](https://reward.yumc.pw)服务器(已完成)
+- [自助兑换](https://reward.yumc.pw)RMB(已完成)
+- [自助提现](https://reward.yumc.pw)(已完成)

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.9.1",
+    "version": "0.10.1",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -20,16 +20,19 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spring-data-redis": "^0.0.2",
+        "@javatypes/bukkit-api": "^0.0.3",
-        "@javatypes/spring-web": "^0.0.2",
+        "@javatypes/bungee-api": "^0.0.3",
-        "@javatypes/tomcat": "^0.0.2",
+        "@javatypes/sponge-api": "^0.0.3",
+        "@javatypes/spring-data-redis": "^0.0.3",
+        "@javatypes/spring-web": "^0.0.3",
+        "@javatypes/tomcat": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.9.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/plugin": "^0.9.1"
+        "@ccms/plugin": "^0.10.1"
     }
 }

packages/plugins/src/McbbsPlugin.ts

@@ -0,0 +1,78 @@
+/// <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 { Server as SocketIOServer, Socket as SocketIOSocket, Namespace } from '@ccms/websocket'
+
+import * as fs from '@ccms/common/dist/fs'
+
+const FileFilter = Java.type('java.io.FileFilter')
+const ByteArrayInputStream = java.io.ByteArrayInputStream
+const ByteArrayOutputStream = java.io.ByteArrayOutputStream
+const StandardCharsets = Java.type("java.nio.charset.StandardCharsets")
+const GZIPInputStream = Java.type('java.util.zip.GZIPInputStream')
+const ByteArray = Java.type("byte[]")
+
+@JSPlugin({ version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class McbbsPlugin extends interfaces.Plugin {
+    @Autowired()
+    private Server: server.Server
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    private namespace: any
+
+    load() {
+    }
+
+    enable() {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        if (consolePlugin.socketIOServer) {
+            this.startWebSocketServer(consolePlugin.socketIOServer)
+        } else {
+            process.on('websocket.create', (server: SocketIOServer) => {
+                this.startWebSocketServer(server)
+            })
+        }
+    }
+
+    private startWebSocketServer(server: SocketIOServer) {
+        this.namespace = server.of('/McbbsPlugin')
+        this.namespace.on('connect', (client: SocketIOSocket) => {
+            this.initWebSocketClient(client)
+            this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
+        })
+    }
+
+    disable() {
+        this.namespace.close()
+    }
+
+    private initWebSocketClient(client: SocketIOSocket) {
+        client.on('ungzip', (content) => {
+
+        })
+
+        client.on('error', (error) => {
+            this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
+            this.logger.error(error)
+        })
+        client.on('disconnect', () => {
+            this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+        })
+    }
+
+    @Cmd()
+    msme(sender: any, command: string, args: string[]) {
+        this.logger.log(sender, command, args)
+        sender.sendMessage(JSON.stringify({ command, ...args }))
+    }
+
+    @Tab()
+    tabmsme(_sender: any, _command: string, _args: string[]) {
+        return ['world']
+    }
+}

packages/plugins/src/MiaoChat.ts

@@ -2,16 +2,16 @@
 /// <reference types="@javatypes/spigot-api" />
 /// <reference types="@javatypes/sponge-api" />
 
-import { server, plugin as pluginApi, channel, constants } from '@ccms/api'
+import { server, channel, constants, chat } from '@ccms/api'
-import { inject, optional } from '@ccms/container';
+import { optional, Autowired } from '@ccms/container'
 import { plugin, interfaces, cmd, listener, tab, config, enable } from '@ccms/plugin'
 import Tellraw from '@ccms/common/dist/tellraw'
 
-const ByteArrayInputStream = Java.type("java.io.ByteArrayInputStream");
+const ByteArrayInputStream = Java.type("java.io.ByteArrayInputStream")
-const ByteArrayOutputStream = Java.type("java.io.ByteArrayOutputStream");
+const ByteArrayOutputStream = Java.type("java.io.ByteArrayOutputStream")
-const StandardCharsets = Java.type("java.nio.charset.StandardCharsets");
+const StandardCharsets = Java.type("java.nio.charset.StandardCharsets")
-const GZIPInputStream = Java.type("java.util.zip.GZIPInputStream");
+const GZIPInputStream = Java.type("java.util.zip.GZIPInputStream")
-const GZIPOutputStream = Java.type("java.util.zip.GZIPOutputStream");
+const GZIPOutputStream = Java.type("java.util.zip.GZIPOutputStream")
 const BiConsumer = Java.type('java.util.function.BiConsumer')
 const ByteArray = Java.type("byte[]")
 
@@ -22,42 +22,45 @@ class MiaoMessage {
     private static MAX_MESSAGE_LENGTH = 32000;
 
     private static copy(input, output) {
-        let buffer = new ByteArray(1024);
+        let buffer = new ByteArray(1024)
-        let n: number;
+        let n: number
         while ((n = input.read(buffer)) != -1) {
-            output.write(buffer, 0, n);
+            output.write(buffer, 0, n)
         }
-        input.close();
+        input.close()
-        output.close();
+        output.close()
     }
     public static encode(input: any): any {
-        return new MiaoMessage(input).encode();
+        return new MiaoMessage(input).encode()
     }
     public static decode(input: any): MiaoMessage {
-        let baos = new ByteArrayOutputStream();
+        let baos = new ByteArrayOutputStream()
-        MiaoMessage.copy(new GZIPInputStream(new ByteArrayInputStream(input)), baos);
+        MiaoMessage.copy(new GZIPInputStream(new ByteArrayInputStream(input)), baos)
-        return new MiaoMessage(baos.toString(StandardCharsets.UTF_8.name()));
+        return new MiaoMessage(baos.toString(StandardCharsets.UTF_8.name()))
     }
 
     // private String json;
     constructor(public json: any) { }
 
     public encode(): any {
-        let baos = new ByteArrayOutputStream();
+        let baos = new ByteArrayOutputStream()
-        MiaoMessage.copy(new ByteArrayInputStream(this.json.getBytes(StandardCharsets.UTF_8)), new GZIPOutputStream(baos));
+        MiaoMessage.copy(new ByteArrayInputStream(this.json.getBytes(StandardCharsets.UTF_8)), new GZIPOutputStream(baos))
-        if (baos.size() > MiaoMessage.MAX_MESSAGE_LENGTH) { return null; }
+        if (baos.size() > MiaoMessage.MAX_MESSAGE_LENGTH) { return null }
-        return baos.toByteArray();
+        return baos.toByteArray()
     }
 }
 
 @plugin({ name: 'MiaoChat', version: '1.0.0', author: 'MiaoWoo', source: __filename })
 export class MiaoChat extends interfaces.Plugin {
-    @inject(server.Server)
+    @Autowired()
     private Server: server.Server
-    @inject(channel.Channel)
+    @optional()
-    @optional() private Channel: channel.Channel
+    @Autowired()
+    private chat: chat.Chat
+    @Autowired()
+    private Channel: channel.Channel
 
-    private channelOff: { off: () => void };
+    private channelOff: { off: () => void }
 
     @config()
     private config = {
@@ -129,34 +132,34 @@ export class MiaoChat extends interfaces.Plugin {
         }
     }
 
-    private chatFormats: any[];
+    private chatFormats: any[]
-    private styleFormats: any;
+    private styleFormats: any
     // 用于匹配 '[xx]' 聊天格式
     private FORMAT_PATTERN = /[\[]([^\[\]]+)[\]]/ig;
 
-    private PlaceholderAPI: { setPlaceholders: (player: any, str: string) => string };
+    private PlaceholderAPI: { setPlaceholders: (player: any, str: string) => string }
 
     load() {
-        this.chatFormats = Object.values(this.config.ChatFormats);
+        this.chatFormats = Object.values(this.config.ChatFormats)
-        this.chatFormats.sort(this.compare('index'));
+        this.chatFormats.sort(this.compare('index'))
-        this.initFormat(this.chatFormats);
+        this.initFormat(this.chatFormats)
-        this.styleFormats = this.config.StyleFormats;
+        this.styleFormats = this.config.StyleFormats
     }
 
     private compare(prop: string) {
-        return function (obj1: { [x: string]: any; }, obj2: { [x: string]: any; }) {
+        return function (obj1: { [x: string]: any }, obj2: { [x: string]: any }) {
-            var val1 = obj1[prop];
+            var val1 = obj1[prop]
-            var val2 = obj2[prop];
+            var val2 = obj2[prop]
             if (!isNaN(Number(val1)) && !isNaN(Number(val2))) {
-                val1 = Number(val1);
+                val1 = Number(val1)
-                val2 = Number(val2);
+                val2 = Number(val2)
             }
             if (val1 < val2) {
-                return -1;
+                return -1
             } else if (val1 > val2) {
-                return 1;
+                return 1
             } else {
-                return 0;
+                return 0
             }
         }
     }
@@ -164,7 +167,7 @@ export class MiaoChat extends interfaces.Plugin {
     enable() {
         this.PlaceholderAPI = {
             setPlaceholders: (player: any, string: string) => {
-                return string;
+                return string
             }
         }
     }
@@ -174,10 +177,14 @@ export class MiaoChat extends interfaces.Plugin {
     }
 
     bukkitenable() {
+        if (!this.chat) {
+            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
+            this.AsyncPlayerChatEvent['off']()
+        }
         // 尝试加载 Bukkit 的 PlaceholderAPI
         try {
             //@ts-ignore
-            this.PlaceholderAPI = base.getClass("me.clip.placeholderapi.PlaceholderAPI").static;
+            this.PlaceholderAPI = base.getClass("me.clip.placeholderapi.PlaceholderAPI").static
             this.logger.log('[PAPI] Found Bukkit PlaceholderAPI Hooking...')
         } catch (ex) {
             this.logger.console("§cCan't found me.clip.placeholderapi.PlaceholderAPI variable will not be replaced! Err: " + ex)
@@ -185,16 +192,20 @@ export class MiaoChat extends interfaces.Plugin {
     }
 
     spongeenable() {
+        if (!this.chat) {
+            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
+            this.MessageChannelEvent$Chat['off']()
+        }
         // 尝试加载 Sponge 的 PlaceholderAPI
         try {
-            var spongePapi = this.Server.getService('me.rojo8399.placeholderapi.PlaceholderService');
+            var spongePapi = this.Server.getService('me.rojo8399.placeholderapi.PlaceholderService')
-            var s = org.spongepowered.api.text.serializer.TextSerializers.formattingCode('§');
+            var s = org.spongepowered.api.text.serializer.TextSerializers.formattingCode('§')
             if (spongePapi) {
                 this.PlaceholderAPI = {
                     setPlaceholders: (player: any, string: string) => {
-                        return s.serialize(spongePapi.replacePlaceholders(string, player, player));
+                        return s.serialize(spongePapi.replacePlaceholders(string, player, player))
+                    }
                 }
-                };
                 this.logger.log('[PAPI] Found Sponge PlaceholderAPI Hooking...')
             }
         } catch (ex) {
@@ -213,7 +224,7 @@ export class MiaoChat extends interfaces.Plugin {
         this.channelOff = this.Channel?.listen(this, MiaoMessage.CHANNEL, (data, event: net.md_5.bungee.api.event.PluginMessageEvent) => {
             let bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
             if (event.getTag() == MiaoMessage.CHANNEL) {
-                let origin = event.getSender().getAddress();
+                let origin = event.getSender().getAddress()
                 bungee.getServers().forEach(new BiConsumer({
                     accept: (s, server) => {
                         if (server.getAddress() != origin && server.getPlayers().size() > 0) {
@@ -225,15 +236,15 @@ export class MiaoChat extends interfaces.Plugin {
         })
     }
 
-    @cmd({ servers: ["bungee"] })
+    @cmd({ servers: [constants.ServerType.Bungee] })
     mct(sender: any, command: string, args: string[]) {
-        this.logger.log(sender, command, args);
+        this.logger.log(sender, command, args)
         sender.sendMessage(JSON.stringify({ command, ...args }))
     }
 
-    @cmd({ servers: ["!bungee"] })
+    @cmd({ servers: [`!${constants.ServerType.Bungee}`] })
     mchat(sender: any, command: string, args: string[]) {
-        this.logger.log(sender, command, args);
+        this.logger.log(sender, command, args)
         sender.sendMessage(JSON.stringify({ command, ...args }))
     }
 
@@ -241,104 +252,99 @@ export class MiaoChat extends interfaces.Plugin {
     tabmchat(_sender: any, _command: string, _args: string[]) {
     }
 
-    @listener({ servers: ['bukkit'] })
+    @listener({ servers: [constants.ServerType.Bukkit] })
     AsyncPlayerChatEvent(event: org.bukkit.event.player.AsyncPlayerChatEvent) {
-        this.sendChat(event.getPlayer(), event.getMessage(), function () {
+        this.sendChat(event.getPlayer(), event.getMessage(), () => event.setCancelled(true))
-            event.setCancelled(true);
-        });
     }
 
-    @listener({ servers: ['sponge'] })
+    @listener({ servers: [constants.ServerType.Sponge] })
     MessageChannelEvent$Chat(event: org.spongepowered.api.event.message.MessageChannelEvent.Chat) {
         //@ts-ignore
-        var player = event.getCause().first(org.spongepowered.api.entity.living.player.Player.class).orElse(null);
+        var player = event.getCause().first(org.spongepowered.api.entity.living.player.Player.class).orElse(null)
         if (player == null) {
-            return;
+            return
         }
-        var plain = event.getRawMessage().toPlain();
+        var plain = event.getRawMessage().toPlain()
         if (plain.startsWith(Tellraw.duplicateChar)) {
-            return;
+            return
         }
-        this.sendChat(player, plain, function () {
+        this.sendChat(player, plain, () => event.setMessageCancelled(true))
-            event.setMessageCancelled(true)
-        });
     }
 
     initFormat(chatFormats: any[]) {
         chatFormats.forEach(chatFormat => {
-            var chat_format_str = chatFormat.format;
+            var chat_format_str = chatFormat.format
-            var temp = [];
+            var temp = []
-            var r: any[];
+            var r: any[]
             while (r = this.FORMAT_PATTERN.exec(chat_format_str)) {
-                temp.push(r[1]);
+                temp.push(r[1])
             }
-            var format_list = [];
+            var format_list = []
             temp.forEach(t => {
-                var arr = chat_format_str.split('[' + t + ']', 2);
+                var arr = chat_format_str.split('[' + t + ']', 2)
                 if (arr[0]) {
-                    format_list.push(arr[0]);
+                    format_list.push(arr[0])
                 }
-                format_list.push(t);
+                format_list.push(t)
-                chat_format_str = arr[1];
+                chat_format_str = arr[1]
-            });
+            })
             if (chat_format_str) {
-                format_list.push(chat_format_str);
+                format_list.push(chat_format_str)
             }
-            chatFormat.format_list = format_list;
+            chatFormat.format_list = format_list
         })
     }
 
-    sendChat(player: any, plain: string, callback: { (): void; }) {
+    sendChat(player: any, plain: string, callback: { (): void }) {
-        var chat_format = this.getChatFormat(player);
+        var chat_format = this.getChatFormat(player)
         if (!chat_format) {
-            console.debug('未获得用户', player.getName(), '的 ChatRule 跳过执行...');
+            console.debug('未获得用户', player.getName(), '的 ChatRule 跳过执行...')
-            return;
+            return
         }
-        callback();
+        callback()
-        var tr = Tellraw.create();
+        var tr = Tellraw.create()
         chat_format.format_list.forEach((format) => {
-            var style = this.styleFormats[format];
+            var style = this.styleFormats[format]
             if (style) {
-                tr.then(this.replace(player, style.text.replace(/&(\w)/g, '§$1')));
+                tr.then(this.replace(player, style.text.replace(/&(\w)/g, '§$1')))
                 if (style.hover) {
-                    tr.tip(this.replace(player, style.hover.join('\n')));
+                    tr.tip(this.replace(player, style.hover.join('\n')))
                 }
                 if (style.click && style.click.type && style.click.command) {
-                    var command = this.replace(player, style.click.command);
+                    var command = this.replace(player, style.click.command)
                     switch (style.click.type.toUpperCase()) {
                         case "COMMAND":
-                            tr.command(command);
+                            tr.command(command)
-                            break;
+                            break
                         case "OPENURL":
-                            tr.link(command);
+                            tr.link(command)
-                            break;
+                            break
                         case "SUGGEST":
-                            tr.suggest(command);
+                            tr.suggest(command)
-                            break;
+                            break
                         default:
                     }
                 }
             } else {
-                tr.then(this.replace(player, format));
+                tr.then(this.replace(player, format))
             }
-        });
+        })
         let json = tr.then(this.replace(player, plain)).json()
         this.sendChatAll(json)
         this.Channel?.send(player, MiaoMessage.CHANNEL, MiaoMessage.encode(json))
     }
 
     sendChatAll(json: string) {
-        this.Server.getOnlinePlayers().forEach(player => this.Server.sendJson(player, json))
+        this.Server.getOnlinePlayers().forEach(player => this.chat.sendJson(player, json))
     }
 
     getChatFormat(player: any) {
-        for (var i in this.chatFormats) {
+        for (let format of this.chatFormats) {
-            var format = this.chatFormats[i];
             if (player.hasPermission(format.permission)) {
-                return format;
+                return format
             }
         }
-        return null;
+        return null
     }
 
     replace(player: any, target: string) {

packages/plugins/src/MiaoCoin.ts

@@ -81,6 +81,7 @@ export class MiaoCoin extends interfaces.Plugin {
     }
 
     disable() {
+        // {"app":"com.tencent.autoreply","desc":"","view":"autoreply","ver":"0.0.0.1","prompt":"[动画表情]","meta":{"metadata":{"title":"点击蓝色字体有惊喜","buttons":[{"slot":1,"action_data":"我是傻逼","name":"点我","action":"notify"}],"type":"guest","token":"LAcV49xqyE57S17B8ZT6FU7odBveNMYJzux288tBD3c="}},"config":{"forward":1,"showSender":1}}
     }
 
     @Cmd()

packages/plugins/src/MiaoConsole.ts

@@ -1,8 +1,8 @@
 /// <reference types="@ccms/nashorn" />
 
-import { plugin as pluginApi, server, task, constants } from '@ccms/api'
+import { plugin as pluginApi, server, task, constants, command } from '@ccms/api'
-import { plugin, interfaces, cmd, tab, enable, config, disable } from '@ccms/plugin'
+import { plugin, interfaces, cmd, tab, enable, config, disable, PluginConfig } from '@ccms/plugin'
-import { inject, ContainerInstance, Container } from '@ccms/container'
+import { ContainerInstance, Container, Autowired } from '@ccms/container'
 import io, { Server as SocketIOServer, Socket as SocketIOSocket } from '@ccms/websocket'
 import * as fs from '@ccms/common/dist/fs'
 import * as reflect from '@ccms/common/dist/reflect'
@@ -19,20 +19,22 @@ let help = [
     '§6/mconsole §areload               §6-  §3重载插件',
 ]
 
-@plugin({ name: 'MiaoConsole', prefix: 'Console', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
+@plugin({ prefix: 'Console', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
 export class MiaoConsole extends interfaces.Plugin {
-    @inject(ContainerInstance)
+    @Autowired(ContainerInstance)
     private container: Container
-    @inject(server.ServerType)
+    @Autowired(server.ServerType)
     private serverType: string
-    @inject(server.Server)
+    @Autowired(pluginApi.PluginFolder)
-    private server: server.Server
-    @inject(task.TaskManager)
-    private task: task.TaskManager
-    @inject(pluginApi.PluginManager)
-    private pluginManager: pluginApi.PluginManager
-    @inject(pluginApi.PluginFolder)
     private pluginFolder: string
+    @Autowired()
+    private server: server.Server
+    @Autowired()
+    private command: command.Command
+    @Autowired()
+    private task: task.TaskManager
+    @Autowired()
+    private pluginManager: pluginApi.PluginManager
 
     private token: string
     private instance: any
@@ -44,7 +46,7 @@ export class MiaoConsole extends interfaces.Plugin {
     private logCache: string[] = []
 
     @config()
-    private secret = { token: undefined }
+    private secret: PluginConfig = { token: undefined }
 
     load() {
         if (this.secret.token) {
@@ -88,6 +90,7 @@ export class MiaoConsole extends interfaces.Plugin {
     cmdtoken(sender: any, sub: string, token: string) {
         if (sub == "set") {
             this.secret.token = this.token = token
+            this.secret.save()
             this.logger.sender(sender, '§a已保存§6服务器登录Token:§3', this.token, '§4请勿分享给其他人 防止服务器被攻击!')
             return
         }
@@ -183,8 +186,8 @@ export class MiaoConsole extends interfaces.Plugin {
     @disable({ servers: [constants.ServerType.Bukkit, constants.ServerType.Sponge] })
     removeLog4jForward() {
         try {
-            this.appender.stop()
+            this.appender?.stop()
-            this.rootLogger.removeAppender(this.appender)
+            this.rootLogger?.removeAppender(this.appender)
         } catch (error) {
             console.ex(error)
         }
@@ -193,7 +196,7 @@ export class MiaoConsole extends interfaces.Plugin {
     @disable({ servers: [constants.ServerType.Bungee] })
     removeLoggerForward() {
         try {
-            this.rootLogger.removeHandler(this.handler)
+            this.rootLogger?.removeHandler(this.handler)
         } catch (error) {
             console.ex(error)
         }
@@ -202,7 +205,7 @@ export class MiaoConsole extends interfaces.Plugin {
     @disable({ servers: [constants.ServerType.Spring] })
     removeLogbackForward() {
         try {
-            this.rootLogger.detachAppender(this.LOGBACK_APPENDER_NAME)
+            this.rootLogger?.detachAppender(this.LOGBACK_APPENDER_NAME)
         } catch (error) {
             console.ex(error)
         }
@@ -214,6 +217,7 @@ export class MiaoConsole extends interfaces.Plugin {
             root: fs.concat(root, 'wwwroot')
         })
         this.container.bind(io.Instance).toConstantValue(this.socketIOServer)
+        process.emit('websocket.create', this.socketIOServer)
     }
 
     startSocketIOServer() {
@@ -222,20 +226,19 @@ export class MiaoConsole extends interfaces.Plugin {
         namespace.on('connect', (client: SocketIOSocket) => {
             if (!this.token) {
                 this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
-                client.emit('unauthorized')
+                client.emit('unauthorized', () => client.disconnect(true))
-                client.disconnect(true)
                 return
             }
             if (this.token != client.handshake.query.token) {
                 this.logger.console(`§6客户端 §b${client.id} §c无效请求 §4请提供正确Token后再次连接!`)
-                client.emit('unauthorized')
+                client.emit('unauthorized', () => client.disconnect(true))
-                client.disconnect(true)
                 return
             }
             this.initWebSocketClient(client)
             this.logCache.forEach(msg => client.emit('log', msg))
             this.logger.console(`§6客户端 §b${client.id} §a新建连接 ${this.rootLogger ? '启动日志转发' : '§4转发日志启动失败'}...`)
         })
+        process.emit('websocket.start', this.socketIOServer)
     }
 
     private initWebSocketClient(client: SocketIOSocket) {
@@ -248,7 +251,7 @@ export class MiaoConsole extends interfaces.Plugin {
             client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
         })
         client.on('tabComplate', (input, index, callback) => {
-            callback && callback(this.server.tabComplete(this.server.getConsoleSender(), input, index))
+            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index) || [])
         })
         client.on('exec', (code) => {
             try {
@@ -278,7 +281,7 @@ export class MiaoConsole extends interfaces.Plugin {
             if (!dir.isDirectory()) {
                 return fn(undefined, `${file} 不是一个目录!`)
             }
-            fn(fs.list(dir))
+            fn(fs.list(dir).map(f => f.name))
         })
         client.on('error', (error) => {
             this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)

packages/plugins/src/MiaoExplorer.ts

@@ -0,0 +1,175 @@
+/// <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 { Server as SocketIOServer, Socket as SocketIOSocket, Namespace } from '@ccms/websocket'
+
+import * as fs from '@ccms/common/dist/fs'
+
+const FileFilter = Java.type('java.io.FileFilter')
+const ByteArrayInputStream = java.io.ByteArrayInputStream
+const ByteArrayOutputStream = java.io.ByteArrayOutputStream
+const StandardCharsets = Java.type("java.nio.charset.StandardCharsets")
+const GZIPInputStream = Java.type('java.util.zip.GZIPInputStream')
+const ByteArray = Java.type("byte[]")
+
+@JSPlugin({ prefix: 'Explorer', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class MiaoExplorer extends interfaces.Plugin {
+    @Autowired()
+    private Server: server.Server
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    private token: string
+    private namespace: any
+    private chunkCacheMap: Map<string, Array<string>>
+
+    load() {
+        this.chunkCacheMap = new Map()
+    }
+
+    enable() {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        if (consolePlugin.socketIOServer) {
+            this.startWebSocketServer(consolePlugin.socketIOServer)
+        } else {
+            process.on('websocket.create', (server: SocketIOServer) => {
+                this.startWebSocketServer(server)
+            })
+        }
+    }
+
+    private startWebSocketServer(server: SocketIOServer) {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        this.token = consolePlugin.token
+        this.namespace = server.of('/MiaoExplorer')
+        this.namespace.on('connect', (client: SocketIOSocket) => {
+            if (!this.token) {
+                this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
+                client.emit('unauthorized', () => client.disconnect(true))
+                return
+            }
+            if (this.token != client.handshake.query.token) {
+                this.logger.console(`§6客户端 §b${client.id} §c无效请求 §4请提供正确Token后再次连接!`)
+                client.emit('unauthorized', () => client.disconnect(true))
+                return
+            }
+            this.initWebSocketClient(client)
+            this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
+        })
+    }
+
+    disable() {
+        this.namespace.removeAllListeners('connect')
+        this.namespace.close()
+    }
+
+    private readDir(dir) {
+        let children = Java.from(dir.listFiles(new FileFilter({
+            accept: file => file.getName().endsWith('.yml') || file.isDirectory()
+        }))).sort().map(file => {
+            if (file.isDirectory()) {
+                let children = this.readDir(file)
+                if (!children.length) { return null }
+                return {
+                    label: file.getName(),
+                    value: fs.path(file),
+                    children,
+                    disabled: true
+                }
+            }
+            return {
+                label: file.getName(),
+                value: fs.path(file),
+                creatable: true,
+                editable: true,
+                removable: true,
+                deleteApi: "delete"
+            }
+        })
+        return children.filter(s => s)
+    }
+
+    private initWebSocketClient(client: SocketIOSocket) {
+        client.on('ls', (fn) => {
+            var pluginDirs = Java.from(fs.file('./plugins').listFiles(new FileFilter({
+                accept: dirs => dirs.isDirectory()
+            })))
+            let result = {
+                options: pluginDirs.sort().map(f => {
+                    let node: any = {
+                        label: f.getName(),
+                        value: fs.path(f)
+                    }
+                    let children = this.readDir(f)
+                    if (!children.length) {
+                        return null
+                    }
+                    node.children = children
+                    node.disabled = true
+                    return node
+                })
+            }
+            fn && fn(result.options.filter(s => s))
+        })
+        client.on('read', (file, callback) => {
+            callback?.(base.read(file))
+        })
+        client.on('chunk', (file, index, content, callback) => {
+            if (!this.chunkCacheMap.has(file)) {
+                this.chunkCacheMap.set(file, [])
+            }
+            this.chunkCacheMap.get(file)[index] = content
+            callback?.(true)
+        })
+        client.on('ungzip', (content) => {
+            try {
+                console.log(content)
+                let baos = new ByteArrayOutputStream()
+                let byte = java.util.Base64.getDecoder().decode(content)
+                let gzip = new GZIPInputStream(new ByteArrayInputStream(byte))
+                let buffer = new ByteArray(1024)
+                let n: number
+                while ((n = gzip.read(buffer)) != -1) {
+                    baos.write(buffer, 0, n)
+                }
+                gzip.close()
+                baos.close()
+                content = baos.toString(StandardCharsets.UTF_8.name())
+                this.logger.log(content)
+            } catch (error) {
+                console.ex(error)
+            }
+        })
+        client.on('save', (file, callback) => {
+            if (!this.chunkCacheMap.has(file)) {
+                return callback?.(false)
+            }
+            let content = this.chunkCacheMap.get(file).join('')
+            this.chunkCacheMap.delete(file)
+            base.save(file, content)
+            callback?.(true)
+        })
+        client.on('error', (error) => {
+            this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
+            this.logger.error(error)
+        })
+        client.on('disconnect', () => {
+            this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+        })
+    }
+
+    @Cmd()
+    msme(sender: any, command: string, args: string[]) {
+        this.logger.log(sender, command, args)
+        sender.sendMessage(JSON.stringify({ command, ...args }))
+    }
+
+    @Tab()
+    tabmsme(_sender: any, _command: string, _args: string[]) {
+        return ['world']
+    }
+}

packages/plugins/src/MiaoProtocol.ts

@@ -1,18 +1,31 @@
-import { task, server, constants } from "@ccms/api";
+import { task, server, constants } from "@ccms/api"
-import { inject } from "@ccms/container";
+import { Autowired, JSClass } from "@ccms/container"
-import { plugin, interfaces, cmd } from "@ccms/plugin";
+import { plugin, interfaces } from "@ccms/plugin"
 
-import http from '@ccms/common/dist/http'
+let createPacketAdapterFunction = eval(`
-import * as fs from '@ccms/common/dist/fs'
+function(cls, plugin, type, onPacketSending){
+    return new cls(plugin, type) {
+        onPacketSending: onPacketSending
+    }
+}
+`)
 
-@plugin({ name: 'MiaoProtocol', prefix: 'MPTL', version: '1.0.0', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+@plugin({ prefix: 'MPTL', version: '1.0.0', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
 export class MiaoProtocol extends interfaces.Plugin {
-    @inject(server.Server)
+    @Autowired()
-    private server: server.Server;
+    private server: server.Server
-    @inject(task.TaskManager)
+    @Autowired()
-    private taskManager: task.TaskManager;
+    private taskManager: task.TaskManager
+
+    @JSClass('com.comphenix.protocol.events.PacketAdapter')
+    private PacketAdapter
+    @JSClass('com.comphenix.protocol.PacketType')
+    private PacketType
+    @JSClass('com.comphenix.protocol.ProtocolLibrary')
+    private ProtocolLibrary
 
     private pipeline: any
+    private adapter: any
 
     enable() {
         let count = 0
@@ -25,6 +38,29 @@ export class MiaoProtocol extends interfaces.Plugin {
                 this.logger.console('§cNetty通道注入失败 §4所有功能将无法使用！')
             }
         }).later(20).timer(40).submit()
+        this.initPacketAdapter()
     }
 
+    disable() {
+        this.ProtocolLibrary.getProtocolManager().removePacketListener(this.adapter)
+    }
+
+    createPacketAdapter(onPacketSending: (event) => void) {
+        return createPacketAdapterFunction(this.PacketAdapter, base.getInstance(), [this.PacketType.Play.Server.MAP], onPacketSending)
+    }
+
+    initPacketAdapter() {
+        this.adapter = this.createPacketAdapter((event) => {
+            let integers = event.getPacket().getIntegers().getValues()
+            //             console.log(`ProtocolLib onPacketSending filter Map
+            // Player: ${event.getPlayer()}
+            // MapId: ${integers.get(0)}
+            // Short: ${event.getPacket().getShorts().read(0)}
+            // Bytes: ${event.getPacket().getByteArrays().read(0).length}
+            // `)
+            //Size: ${integers.get(3)}x${integers.get(4)}
+            // org.bukkit.map.MapPalette.imageToBytes()
+        })
+        this.ProtocolLibrary.getProtocolManager().addPacketListener(this.adapter)
+    }
 }

packages/plugins/src/MiaoReward.ts

@@ -1,106 +1,255 @@
-import { constants, task, server, channel } from "@ccms/api"
+import { constants, task, server, channel, chat, proxy } from "@ccms/api"
-import { JSPlugin, interfaces, Cmd, Tab, Listener, Config } from "@ccms/plugin"
+import { JSPlugin, interfaces, Cmd, Tab, Listener, Config, PluginConfig } from "@ccms/plugin"
 
 import { QRCode, QRErrorCorrectLevel } from '@ccms/common/dist/qrcode'
 
-import { inject, JSClass, optional } from '@ccms/container'
+import { Autowired, JSClass, optional } from '@ccms/container'
 import http from '@ccms/common/dist/http'
-import chat from '@ccms/bukkit/dist/enhance/chat'
-
-const MapView = Java.type('org.bukkit.map.MapView')
-const Bukkit = Java.type('org.bukkit.Bukkit')
-const MapRenderer = Java.type('org.bukkit.map.MapRenderer')
-const ItemStack = Java.type('org.bukkit.inventory.ItemStack')
-const Material = Java.type('org.bukkit.Material')
 
 const BufferedImage = Java.type('java.awt.image.BufferedImage')
-const Graphics2D = Java.type('java.awt.Graphics2D')
 const Color = Java.type('java.awt.Color')
-const Image = Java.type('java.awt.Image')
+const Bytes = Java.type('byte[]')
-const Font = Java.type('java.awt.Font')
-const RenderingHints = Java.type('java.awt.RenderingHints')
-
-class QRCodeRender {
-  private _proxy
-  constructor(image: any) {
-    const ProxyAdapter = Java.extend(MapRenderer, {
-      render: (_mapView, mapCanvas) => {
-        mapCanvas.drawImage(0, 0, image)
-      }
-    })
-    this._proxy = new ProxyAdapter()
-  }
-  getHandler() {
-    return this._proxy
-  }
-}
 
 interface PlaceholderAPI {
     registerPlaceholderHook: (key: string, onPlaceholderRequest: (player, s) => string) => void
+    unregisterPlaceholderHook: (key: string) => void
     setPlaceholders: (player: any, str: string) => string
 }
 
-@JSPlugin({ prefix: 'MRD', version: '1.1.0', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+interface UserInfo {
-export class MiaoReward extends interfaces.Plugin {
+    balance: number
-  private cacheBindUuid = ''
+    sign: string
-  private cacheTasks = new Map<number, task.Cancelable>()
+    video: string
-  private isBinding = false
+    box: string
-  private isBindingUser = 'unknow'
+}
-  private drawCooldown = new Map<string, number>()
 
-  @inject(server.Server)
+let createPacketAdapterFunction = eval(`
+function(cls, plugin, type, onPacketSending){
+    return new cls(plugin, type) {
+        onPacketSending: onPacketSending
+    }
+}`)
+
+@JSPlugin({ prefix: 'MRD', version: '1.4.2', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+export class MiaoReward extends interfaces.Plugin {
+    private serverInfo: any
+    private cacheBindUuid = ''
+    private zeroMapView = undefined
+    private playerImageCache = new Map<string, any>()
+    private playerTaskCache = new Map<string, task.Cancelable>()
+    private playerInfoCache = new Map<string, UserInfo>()
+
+    private downgrade = false
+
+    @Autowired()
+    private chat: chat.Chat
+    @Autowired()
     private server: server.Server
-  @inject(task.TaskManager)
+    @Autowired()
     private taskManager: task.TaskManager
-  @inject(channel.Channel)
+    @Autowired()
-  @optional() private Channel: channel.Channel
+    private channel: channel.Channel
+    @Autowired()
+    private bungee: proxy.BungeeCord
 
     @Config()
-  private 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%',
-    drawCooldown: 300
+            coinName: '点券'
         }
 
+    @JSClass('org.bukkit.Bukkit')
+    private Bukkit: any
+
     @JSClass('me.clip.placeholderapi.PlaceholderAPI')
     private PlaceholderAPI: PlaceholderAPI
     @JSClass('me.clip.placeholderapi.PlaceholderHook')
     private PlaceholderHook: any
 
+    @JSClass('com.comphenix.protocol.ProtocolLibrary')
+    private ProtocolLibrary: any
+    @JSClass('com.comphenix.protocol.PacketType')
+    private PacketType: any
+    @JSClass('com.comphenix.protocol.events.PacketAdapter')
+    private PacketAdapter: any
+
+    private adapter: any
+    private itemStackArrayLength: number
+
     private isBungeeCord = undefined
     private channelOff: { off: () => void }
 
     load() {
         this.config.prefix = this.config.prefix || '§6[§b广告系统§6]§r'
         this.config.drawCommand = this.config.drawCommand || 'p give %player_name% %amount%'
-    this.config.drawCooldown = this.config.drawCooldown || 300
+        if (!this.config.coinName) {
+            this.config.coinName = '点券'
+            this.config.save()
+        }
+        //@ts-ignore
+        this.logger.prefix = this.config.prefix
+        this.downgrade = this.Bukkit.server.class.name.split('.')[3] == "v1_7_R4"
+        this.updateServerInfo(null, () => this.updateOnlinePlayersInfo())
     }
 
+    private updateServerInfo(player?: any, cb?: () => void) {
+        this.taskManager.create(() => {
+            if (this.config.serverId) {
+                let result = this.httpPost(`https://reward.yumc.pw/server/server`, {
+                    id: this.config.serverId,
+                    token: this.config.serverToken
+                })
+                if (result.code == 200) {
+                    this.serverInfo = result.data
+                    if (player) this.bungee.for(player).forward("ALL", "MiaoReward", { type: "updateServerInfo", data: result.data }).send()
+                    cb?.()
+                }
+            }
+        }).async().submit()
+    }
+
+    private updateOnlinePlayersInfo() {
+        Java.from(this.server.getOnlinePlayers()).forEach(player => this.updatePlayerInfo(player))
+    }
+
+    private updatePlayerInfo(player: org.bukkit.entity.Player) {
+        this.taskManager.create(() => this.queryUser(player)).async().submit()
+    }
+
+    @JSClass('com.google.common.io.ByteStreams')
+    private ByteStreams: any
+
     enable() {
+        this.initPlaceholderAPI()
+        this.initBungeeCord()
+        this.initZeroMap()
+    }
+
+    private initBungeeCord() {
+        this.channelOff = this.channel?.listen(this, 'BungeeCord', (data) => {
+            if (!this.isBungeeCord) {
+                this.isBungeeCord = true
+            }
+            let input = this.ByteStreams.newDataInput(data)
+            let subChannel = input.readUTF()
+            switch (subChannel) {
+                case "GetServer":
+                    this.isBungeeCord = true
+                    let serverName = input.readUTF()
+                    break
+                case "MiaoReward":
+                    this.readForward(input)
+                    break
+            }
+        })
+        let players = this.server.getOnlinePlayers()
+        if (players.length) this.bungeeCordDetect(players[0])
+    }
+
+    private readForward(input) {
+        let message = JSON.parse(input.readUTF())
+        console.log(message)
+        switch (message.type) {
+            case "updateServerInfo":
+                this.serverInfo = message.data
+                console.console(this.config.prefix, '§6兑换比例已更新为:§a', message.data.ratio)
+                break
+        }
+    }
+
+    private initPlaceholderAPI() {
         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 "server":
+                        case "balance": return data.balance
-            case "bserver":
+                        case "sign": return data.sign
-            default:
+                        case "video": return data.video
+                        case "box": return data.box
+                        default: return "未知的参数: " + s
                     }
-          return "未知的参数"
                 }
             }))
         }
-    this.channelOff = this.Channel?.listen(this, 'BungeeCord', (data) => { this.isBungeeCord = true })
+    }
-    let players = this.server.getOnlinePlayers()
+
-    if (players.length) this.bungeeCordDetect(players[0])
+    private initZeroMap() {
+        this.taskManager.create(() => {
+            this.zeroMapView = this.Bukkit.getMap(0) || this.Bukkit.createMap(this.Bukkit.getWorlds()[0])
+            this.zeroMapView.setScale(org.bukkit.map.MapView.Scale.FARTHEST)
+            this.zeroMapView.getRenderers().clear()
+        }).submit()
+        var minecraftVersion = this.ProtocolLibrary.getProtocolManager().getMinecraftVersion()
+        this.itemStackArrayLength = minecraftVersion.getMinor() < 9 ? 45 : 46
+        this.initPacketAdapter()
+    }
+
+    createPacketAdapter(onPacketSending: (event) => void) {
+        return createPacketAdapterFunction(this.PacketAdapter, base.getInstance(), [this.PacketType.Play.Server.MAP], onPacketSending)
+    }
+
+    initPacketAdapter() {
+        this.adapter = this.createPacketAdapter((event) => {
+            let integers = event.getPacket().getIntegers().getValues()
+            let mapId = integers.get(0)
+            let player = event.getPlayer()
+            if (mapId == this.zeroMapView.getId() && this.playerImageCache.has(player.getName())) {
+                let bytes = this.playerImageCache.get(player.getName())
+                if (!this.downgrade) {
+                    event.getPacket().getByteArrays().write(0, bytes)
+                    event.getPacket().getIntegers().write(3, 128)
+                    event.getPacket().getIntegers().write(4, 128)
+                } else {
+                    // let xbytes = new Bytes(131)
+                    let origin = event.getPacket().getByteArrays().read(0)
+                    // xbytes[1] = origin[1]
+                    // xbytes[2] = origin[2]
+                    for (let y = 0; y < 128; ++y) {
+                        origin[y + 3] = bytes[y * 128 + origin[1]]
+                    }
+                    event.getPacket().getByteArrays().write(0, origin)
+                }
+            }
+        })
+        this.ProtocolLibrary.getProtocolManager().addPacketListener(this.adapter)
+    }
+
+    private sendWindowItems(player: org.bukkit.entity.Player, mapItem: any) {
+        var protocolManager = this.ProtocolLibrary.getProtocolManager()
+        try {
+            let ItemStackArray = Java.type('org.bukkit.inventory.ItemStack[]')
+            let arritemStack = new ItemStackArray(this.itemStackArrayLength)
+            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) {
+                packetContainer.getItemArrayModifier().write(0, arritemStack)
+            } else {
+                packetContainer.getItemListModifier().write(0, java.util.Arrays.asList(arritemStack))
+            }
+            protocolManager.sendServerPacket(player, packetContainer)
+        } catch (ex) {
+            console.ex(ex)
+        }
     }
 
     disable() {
-    this.cacheTasks.forEach(t => t.cancel())
+        this.PlaceholderAPI?.unregisterPlaceholderHook("mrd")
-    this.server.getOnlinePlayers().forEach(p => this.checkAndClear(p))
+        this.adapter && this.ProtocolLibrary.getProtocolManager().removePacketListener(this.adapter)
+        Java.from(this.server.getOnlinePlayers()).forEach(p => this.checkAndClear(p))
         this.channelOff?.off()
     }
 
@@ -117,18 +266,72 @@ 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) {
+        this.logger.sender(sender, '§a正在获取授权二维码...')
+        let scan = this.httpPost('https://reward.yumc.pw/auth/scan', { ...scanObj, type: scanType })
+        if (scan.code == 200) {
+            let sync = { scaned: false }
+            this.logger.sender(sender, `§a授权二维码获取成功 §c如地图无法扫描 §6请点击链接\n§3§n${scan.data.qrcode}`)
+            this.taskManager.create(() => {
+                let result = this.httpPost('https://reward.yumc.pw/auth/scanCheck', {
+                    token: scan.data.token,
+                    type: scanType,
+                    status: 'noscan'
+                })
+                sync.scaned = true
+                if (result.code == 200 && result.data.status == "scaned") {
+                    this.sendTitle(sender, "§3已扫码", "§a请在手机上确认")
+                    let result = this.httpPost('https://reward.yumc.pw/auth/scanCheck', {
+                        token: scan.data.token,
+                        type: scanType,
+                        status: 'scaned'
+                    })
+                    if (result.code == 200) {
+                        if (result.data.status == "confirm") {
+                            this.sendTitle(sender, '§3扫码完成')
+                            success(scan.data.token, result.data.user)
+                        } else if (result.data.status == "cancel") {
+                            this.sendTitle(sender, '§c已取消授权')
+                            cancel?.()
+                        } else if (result.data.status == "scaned") {
+                            this.sendTitle(sender, '§c授权操作超时')
+                            cancel?.()
+                        } else {
+                            this.sendTitle(sender, "§c未知的结果", result.data.status)
+                        }
+                    } else {
+                        this.sendTitle(sender, "§4扫码异常", result.msg)
+                    }
+                }
+                sync.scaned = true
+            }).async().submit()
+            this.setItemAndTp(sender, scan.data.url, sync)
+            this.sendTitle(sender, '')
+        } else {
+            this.logger.sender(sender, '§4授权二维码获取失败!')
+        }
+    }
+
+    private bindCheck(sender: org.bukkit.entity.Player) {
+        let scanning = this.playerTaskCache.has(sender.getName())
+        if (scanning) {
+            this.logger.sender(sender, "§4当前正在进行扫码 请稍候重试!")
+        }
+        return scanning
+    }
+
+    cmdopen(sender: org.bukkit.entity.Player) {
+        if (this.bindCheck(sender)) return
+        this.logger.sender(sender, '§a正在获取小程序二维码...')
+        let sync = { scaned: false }
+        this.setItemAndTp(sender, 'https://m.q.qq.com/a/p/1110360279?s=' + encodeURIComponent(`pages/my/index`), sync)
+        this.taskManager.create(() => sync.scaned = true).later(20 * 50).submit()
+    }
+
     cmdbind(sender: org.bukkit.entity.Player, server: boolean) {
-    if (this.isBinding) {
+        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
-      let bindUser = Bukkit.getPlayerExact(this.isBindingUser)
+        if (this.bindCheck(sender)) return
-      if (bindUser && bindUser.isOnline() && this.isQrCodeItem(bindUser.getItemInHand())[0]) {
-        return this.logger.sender(sender, "§c当前 §a" + this.isBindingUser + " §c玩家正在绑定账号 请稍候重试...")
-      }
-    }
-    if (sender.getItemInHand()?.getType() !== Material.AIR) { return this.logger.sender(sender, "§c请空手执行此命令!") }
-    this.isBinding = true
-    this.isBindingUser = sender.getDisplayName() || sender.getName()
         if (server) {
-      if (!sender.isOp()) { return this.logger.sender(sender, '§4您没有配置服务器的权限!') }
             this.bindServer(sender)
         } else {
             this.bindUser(sender)
@@ -136,12 +339,8 @@ export class MiaoReward extends interfaces.Plugin {
     }
 
     cmddraw(sender: org.bukkit.entity.Player, amount: number) {
-    if (this.drawCooldown.has(sender.getName())) {
+        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
-      let leftTime = this.config.drawCooldown - (Date.now() - this.drawCooldown.get(sender.getName())) / 1000
+        if (!this.playerInfoCache.has(sender.getName())) { return this.logger.sender(sender, '§c当前用户尚未绑定服务器玩家账号 请先执行 /mrd bind 绑定账号!') }
-      if (leftTime > 0) {
-        return this.logger.sender(sender, `§c点券兑换冷却中 剩余 ${leftTime} 秒!`)
-      }
-    }
         amount = Number(amount)
         if (!Number.isInteger(amount)) {
             return this.logger.sender(sender, '§4金额必须是数字!')
@@ -149,8 +348,33 @@ export class MiaoReward extends interfaces.Plugin {
         if (amount % 100 !== 0) {
             return this.logger.sender(sender, '§4金额必须是100倍数!')
         }
-    let address = `https://reward.yumc.pw/server/draw/id/${this.config.serverId}/token/${this.config.serverToken}/uuid/${sender.getUniqueId().toString()}/username/${sender.getName()}/amount/${amount}`
+        if (this.bindCheck(sender)) { return }
-    let draw = http.get(address)
+        this.scanAuth(sender,
+            'draw', {
+            title: '兑换授权',
+            content: [
+                "是否授权 " + this.serverInfo.name + " 兑换喵币",
+                "兑换玩家: " + sender.getName(),
+                "兑换数量: " + amount,
+                "兑换比例: " + parseFloat(this.serverInfo.ratio),
+                "预计到帐: " + (amount * this.serverInfo.ratio).toFixed(0),
+                "注意: 数据可能更新不及时 请以实际到账金额为准!"
+            ].join('\n')
+        }, (token: string) => {
+            this.drawCoin(sender, amount, token)
+        })
+    }
+
+    private drawCoin(sender: org.bukkit.entity.Player, amount: number, token: string) {
+        if (!token) return
+        let draw = this.httpPost('https://reward.yumc.pw/server/draw', {
+            id: this.config.serverId,
+            token: this.config.serverToken,
+            uuid: sender.getUniqueId().toString(),
+            username: sender.getName(),
+            amount,
+            userToken: token
+        })
         if (draw.code !== 200) {
             return this.sendError(sender, `§4兑换异常 §6服务器返回: §c${draw.msg}`)
         }
@@ -158,20 +382,21 @@ export class MiaoReward extends interfaces.Plugin {
         if (!drawAmount) {
             return this.sendError(sender, '§c服务器返回金额 ' + draw.data + ' 可能存在异常')
         }
-    let command = `p give ${sender.getName()} ${draw.data}`
+        this.taskManager.create(() => {
+            let command = this.config.drawCommand.replace('%player_name%', sender.getName()).replace('%amount%', draw.data)
             if (!this.server.dispatchConsoleCommand(command)) {
-      return this.sendError(sender, '§6执行命令 §3/' + command + ' §c可能存在异常')
+                return this.sendError(sender, ...draw.msg.split('\n').map(s => s.replace('点券', this.config.coinName)), `§6执行结果: §4已扣除 §c${amount} §4喵币`, `§6执行命令: §3/${command} §c可能存在异常`)
             }
-    this.logger.sender(sender, draw.msg.split('\n'))
+            this.logger.sender(sender, draw.msg.split('\n').map(s => s.replace('点券', this.config.coinName)))
-    this.drawCooldown.set(sender.getName(), Date.now())
+            this.sendBroadcast(sender, `${this.config.prefix}§6玩家 §b${sender.getName()} §6成功将 §a${amount}喵币 §6兑换成 §c${draw.data}${this.config.coinName}!`)
-    this.sendBoardcast(sender, `${this.config.prefix}§6玩家 §b${sender.getName()} §6成功将 §a${amount}喵币 §6兑换成 §c${draw.data}点券!`)
+            this.sendBroadcast(sender, `${this.config.prefix}§c/mrd help §b查看广告系统帮助 §6快来一起看广告赚${this.config.coinName}吧!`)
-    this.sendBoardcast(sender, `${this.config.prefix}§c/mrd help §b查看广告系统帮助 §6快来一起看广告赚点券吧!`)
+        }).submit()
     }
 
-  private sendError(sender, error) {
+    private sendError(sender: any, ...error: string[]) {
         return this.logger.sender(sender, [
             `§c========== ${this.config.prefix}§4兑换异常 §c==========`,
-      error,
+            ...error,
             `§6异常账号: §b${sender.getName()}`,
             `§6异常时间: §a${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`,
             `§c如果喵币被扣除且未得到奖励 请截图发往QQ群!`,
@@ -181,7 +406,10 @@ export class MiaoReward extends interfaces.Plugin {
 
     cmdrank(sender: any, boardcast: boolean) {
         if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
-    let result = http.get(`https://reward.yumc.pw/server/rank/id/${this.config.serverId}/token/${this.config.serverToken}`)
+        let result = this.httpPost(`https://reward.yumc.pw/server/rank`, {
+            id: this.config.serverId,
+            token: this.config.serverToken
+        })
         if (result.code !== 200) {
             return this.logger.sender(sender, `§c今日未查询到数据!`)
         }
@@ -191,7 +419,7 @@ export class MiaoReward extends interfaces.Plugin {
             `§6====== ${this.config.prefix} §a喵币兑换排行 §6======`,
         ]
         if (boardcast) {
-      ranks.forEach(l => this.sendBoardcast(sender, l))
+            ranks.forEach(l => this.sendBroadcast(sender, l))
         } else {
             this.logger.sender(sender, ranks)
         }
@@ -199,138 +427,219 @@ export class MiaoReward extends interfaces.Plugin {
 
     cmdserver(sender: any) {
         if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
-    let result = http.get(`https://reward.yumc.pw/server/server/id/${this.config.serverId}/token/${this.config.serverToken}`)
+        let result = this.httpPost(`https://reward.yumc.pw/server/server`, {
+            id: this.config.serverId,
+            token: this.config.serverToken
+        })
         if (result.code !== 200) {
             return this.logger.sender(sender, `§4操作异常 §6服务器返回: §c${result.msg}`)
         }
+        let data = result.data
         this.logger.sender(sender, [
             `§6====== ${this.config.prefix} §a服务器信息 §6======`,
-      `§6服务器: §a${result.data.name}`,
+            `§6服务器: §a${data.name}`,
-      `§6喵币余额: §b${result.data.score} §6喵币`,
+            `§6喵币余额: §b${data.score} §6喵币`,
-      `§6喵币比例: §b${result.data.ratio}`,
+            `§6喵币比例: §b${data.ratio}`,
-      `§6今日收入: §b${result.data.today} §6喵币`,
+            `§6今日收入: §b${data.today} §6喵币`,
             `§6====== ${this.config.prefix} §a服务器信息 §6======`,
         ])
     }
 
-  cmdratio(sender: any, ratio: number, confirm: string) {
+    cmdratio(sender: any, ratioStr: string, confirm: string) {
         if (!sender.isOp()) { return this.logger.sender(sender, '§4你没有此命令的权限!') }
-    let mbr = (1 / ratio).toFixed(4)
+        if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
+        let [ratio, mbr, msg] = this.ratio2string(ratioStr)
         if (!confirm) {
             return this.logger.sender(sender, [
-        '§4警告: 您正在设置服务器喵币/点券兑换比例 设置后将实时生效!',
+                `§4警告: 您正在设置服务器喵币/${this.config.coinName}兑换比例 设置后将实时生效!`,
-        `§6您设置的兑换比例为 §c${ratio} §6=> §a${mbr}喵币 §6兑换 §c1点券`,
+                `§6您设置的兑换比例为 ` + msg,
-        `§6玩家至少需要 §a${mbr}喵币 §6才可以兑换点券!`,
+                `§6玩家至少需要 §a${mbr}喵币 §6才可以兑换${this.config.coinName}!`,
                 `§6请执行 §b/mrd ratio §c${ratio} §econfirm §c确认修改!`
             ])
         }
         if (confirm != 'confirm') return this.logger.sender(sender, `§6请执行 §b/mrd ratio §c${ratio} §econfirm §c确认修改!`)
-    let result = http.get(`https://reward.yumc.pw/server/ratio/id/${this.config.serverId}/token/${this.config.serverToken}/ratio/${ratio}`)
+        this.scanAuth(sender, "ratio", {
+            title: `是否授权 ${this.serverInfo.name} 调整兑换比例`,
+            content: [
+                `操作玩家: ${sender.getName()}`,
+                `调整前: ${this.serverInfo.ratio}`,
+                `调整后: ${msg.replace(/§./ig, '')}`,
+                '调整结果实时生效!',
+                '跨服端 将自动同步比例!',
+                '非跨服端 请重载插件同步比例!'
+            ].join('\n')
+        }, (token) => {
+            let result = this.httpPost(`https://reward.yumc.pw/server/ratio`, {
+                id: this.config.serverId,
+                token: this.config.serverToken,
+                ratio,
+                userToken: token
+            })
             if (result.code !== 200) {
                 return this.logger.sender(sender, `§4操作异常 §6服务器返回: §c${result.msg}`)
             }
             this.logger.sender(sender, `§a操作成功 §6服务器返回: §a${result.msg}`)
-    this.sendBoardcast(sender, `${this.config.prefix} §6当前兑换比例已调整为 §c${ratio} §6=> §a${mbr}喵币 §6兑换 §c1点券!`)
+            this.updateServerInfo(sender)
+            this.sendBroadcast(sender, `${this.config.prefix} §6当前兑换比例已调整为 ` + msg)
+        })
     }
 
-  @JSClass('java.io.ByteArrayOutputStream')
+    cmdreload() {
-  private ByteArrayOutputStream
+        this.config.reload()
-  @JSClass('java.io.DataOutputStream')
+    }
-  private DataOutputStream
 
-  private sendBoardcast(player, message) {
+    private ratio2string(ratio) {
+        ratio = parseFloat(ratio)
+        if (ratio > 1) {
+            return [ratio, 1, `§c${ratio} §6就是 §a1喵币 §6=> §c${ratio}${this.config.coinName}!`]
+        }
+        let mbr = Math.round(1 / ratio * 10000) / 10000
+        return [ratio, mbr, `§c${ratio} §6就是 §a${mbr}喵币 §6=> §c1${this.config.coinName}!`]
+    }
+
+    private sendBroadcast(player, message) {
         if (!this.isBungeeCord) { return org.bukkit.Bukkit.broadcastMessage(message) }
-    let byteArray = new this.ByteArrayOutputStream()
+        this.bungee.for(player).broadcast(message).send()
-    let out = new this.DataOutputStream(byteArray)
-    out.writeUTF("Message")
-    out.writeUTF("ALL")
-    out.writeUTF(message)
-    player.sendPluginMessage(base.getInstance(), "BungeeCord", byteArray.toByteArray())
     }
 
     private bindServer(sender: org.bukkit.entity.Player) {
+        if (!sender.isOp()) { return this.logger.sender(sender, '§4您没有配置服务器的权限!') }
+        this.logger.sender(sender, '§a正在请求二维码 请稍候...')
         let scanObj = http.get(`https://reward.yumc.pw/server/scan`)
         if (scanObj.code !== 200) {
             return this.logger.sender(sender, '§c获取服务器绑定码失败! Error: ' + scanObj.msg)
         }
         this.cacheBindUuid = scanObj.data.uuid
-    this.setItemAndTp(sender, scanObj.data.url, () => {
+        let sync = { scaned: false }
-      let check = http.get(`https://reward.yumc.pw/server/check/token/${this.cacheBindUuid}`)
+        this.taskManager.create(() => {
+            let check = this.httpPost(`https://reward.yumc.pw/server/check`, {
+                token: this.cacheBindUuid,
+                sync: true
+            })
             if (check.code == 200) {
                 this.config.serverId = check.data.serverId
                 this.config.serverToken = check.data.serverToken
-        // @ts-ignore
                 this.config.save()
-        this.checkAndClear(sender)
                 this.logger.sender(sender, '§a已成功绑定服务器: §b' + check.data.serverName)
-        return true
+                this.updateServerInfo(sender)
+                this.updateOnlinePlayersInfo()
             }
-    })
+            sync.scaned = true
+        }).async().submit()
+        this.setItemAndTp(sender, scanObj.data.url, sync)
     }
 
     private bindUser(sender: org.bukkit.entity.Player) {
-    if (!this.config.serverId || !this.config.serverToken) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
+        if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
-    let check = http.get(`https://reward.yumc.pw/server/query?id=${this.config.serverId}&token=${this.config.serverToken}`)
+        let check = this.httpPost(`https://reward.yumc.pw/server/query`, {
+            id: this.config.serverId,
+            token: this.config.serverToken
+        })
         if (check.code !== 200) {
             return this.logger.sender(sender, '§4获取绑定参数异常! §cError: ' + check.msg)
         }
         let queryUser = this.queryUser(sender)
         if (queryUser.code == 200) {
-      return this.logger.sender(sender, ['§4当前用户已绑定! §c如需解绑 请联系腐竹!', '§b如需看广告请进QQ群 点击聊天框上的圈云盒子!'])
+            this.logger.sender(sender, ['§a当前用户已绑定! §3如需看广告请扫码进入!'])
+            return this.cmdopen(sender)
         }
+        this.logger.sender(sender, '§a正在请求二维码 请稍候...')
         let bindUrl = 'https://m.q.qq.com/a/p/1110360279?s=' + encodeURIComponent(`pages/my/index?bindType=user&serverId=${this.config.serverId}&uuid=${sender.getUniqueId().toString()}&username=${sender.getName()}`)
-    this.setItemAndTp(sender, bindUrl, () => {
+        let sync = { scaned: false, timeout: false }
-      let queryUser = this.queryUser(sender)
+        this.taskManager.create(() => {
+            let queryUser = this.queryUser(sender, true)
             if (queryUser.code == 200) {
                 this.sendResult(sender, '绑定成功', queryUser.data)
-        this.checkAndClear(sender)
+                sync.scaned = true
-        return true
             }
-    })
+        }).async().submit()
+        this.setItemAndTp(sender, bindUrl, sync)
     }
 
-  private setItemAndTp(sender: org.bukkit.entity.Player, content: string, func: () => boolean) {
+    private sendActionBar(sender, message) {
+        if (!this.downgrade) {
+            this.chat.sendActionBar(sender, message)
+        }
+    }
+
+    private sendTitle(sender, title, subtitle?) {
+        if (!title) return
+        if (this.downgrade) {
+            this.logger.sender(sender, `${title}${subtitle ? ` ${subtitle}` : ''}`)
+        } else {
+            this.chat.sendTitle(sender, title, subtitle)
+        }
+    }
+
+    private setItemAndTp(sender: org.bukkit.entity.Player, content: string, sync: { scaned: boolean }) {
         this.taskManager.create(() => {
-      let [id, item] = this.createQrCodeMapItem(content)
+            let bindingLeftTime = 55
-      let times = 0
             let task = this.taskManager.create(() => {
-        chat.send(sender, JSON.stringify({
+                try {
-          text: '§c§l请使用手机QQ扫描二维码绑定!'
+                    if (sync.scaned || !sender.isOnline() || !this.isHoldQrCodeItem(sender) || --bindingLeftTime < 0) {
-        }), 2)
+                        if (bindingLeftTime < 0) {
-        if (func() || !sender.isOnline()) {
+                            this.logger.sender(sender, '§c二维码已过期 请重新获取 如已扫码请忽略!')
                             task.cancel()
-          this.cacheTasks.delete(id)
-          this.isBinding = false
                         }
-        if (times++ > 120) {
+                        this.cancelTask(sender)
-          this.logger.sender(sender, '§c绑定超时!')
+                        return
-          this.checkAndClear(sender)
-          task.cancel()
-          this.cacheTasks.delete(id)
-          this.isBinding = false
                     }
-      }).async().later(20).timer(20).submit()
+                    this.sendActionBar(sender, `§c§l手机QQ扫描二维码 剩余 ${bindingLeftTime} 秒...`)
-      this.cacheTasks.set(id, task)
+                } catch (error) {
-      sender.setItemInHand(item)
+                    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()
+            }
+            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())
+            sender.sendMap(this.zeroMapView)
         }).submit()
     }
 
-  private queryUser(sender: org.bukkit.entity.Player) {
+    private queryUser(sender: org.bukkit.entity.Player, sync = false) {
-    return http.get(`https://reward.yumc.pw/server/queryUser/id/${this.config.serverId}/token/${this.config.serverToken}/uuid/${sender.getUniqueId().toString()}/username/${sender.getName()}`)
+        if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
+        let result = this.httpPost(`https://reward.yumc.pw/server/queryUser`, {
+            id: this.config.serverId,
+            token: this.config.serverToken,
+            uuid: sender.getUniqueId().toString(),
+            username: sender.getName(),
+            sync
+        })
+        if (result?.code == 200) {
+            this.playerInfoCache.set(sender.getName(), result.data)
+        }
+        return result
     }
 
     cmdquery(sender: org.bukkit.entity.Player) {
-    let check = this.queryUser(sender)
+        let info = this.queryUser(sender)
-    if (check.code !== 200) {
+        if (info.code !== 200) {
-      return this.logger.sender(sender, '§4查询异常! §cError: ' + check.msg)
+            return this.logger.sender(sender, '§4查询异常! §cError: ' + info.msg)
         }
-    this.sendResult(sender, '查询结果', check.data)
+        this.sendResult(sender, '查询结果', info.data)
     }
 
     private sendResult(sender: any, title: string, data: any) {
+        this.playerInfoCache.set(sender.getName(), data)
         this.logger.sender(sender, [
             `§6====== ${this.config.prefix} §a${title} §6======`,
             `§6用 户 名: §a${sender.getName()}`,
@@ -343,37 +652,43 @@ export class MiaoReward extends interfaces.Plugin {
         ])
     }
 
-  private createQrCodeMapItem(contents: string): [number, any] {
+    private httpPost(url, data) {
-    let view = Bukkit.createMap(Bukkit.getWorlds()[0])
+        let startTime = Date.now()
-    view.setScale(MapView.Scale.FARTHEST)
+        let result = http.post(url, data)
-    view.getRenderers().forEach(r => view.removeRenderer(r))
+        console.debug(`
-    view.addRenderer(new QRCodeRender(this.createQrcode(contents)).getHandler())
+====== HTTP POST ======
-    let item: org.bukkit.inventory.ItemStack = new ItemStack(Material.MAP)
+REQUEST URL : ${url}
-    let meta = item.getItemMeta()
+REQUEST DATA: ${JSON.stringify(data)}
-    meta.setDisplayName('§c请使用手机QQ扫描二维码绑定!')
+RESPONSE    : ${JSON.stringify(result)}
-    meta.setLore(["QRCODE"])
+CAST TIME   : ${Date.now() - startTime}`)
-    item.setDurability(view.getId())
+        return result
-    item.setItemMeta(meta)
-    return [view.getId(), item]
     }
 
-  private createQrcode(contents: string) {
+    private createQrCodeMapItem() {
+        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()
+        if (meta.setMapView) {
+            meta.setMapView(this.zeroMapView)
+        } else if (meta.setMapId) {
+            meta.setMapId(this.zeroMapView.getId())
+        } else {
+            item.setDurability(this.zeroMapView.getId())
+        }
+        meta.setDisplayName('§c请使用手机QQ扫描二维码!')
+        meta.setLore(["QRCODE"])
+        item.setItemMeta(meta)
+        return item
+    }
+
+    private createQrcode(content: string) {
         let bufferedImage = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB)
         let graphics2D = bufferedImage.getGraphics()
         graphics2D.setPaint(Color.WHITE)
         graphics2D.fillRect(0, 0, bufferedImage.getWidth(), bufferedImage.getHeight())
-    let qrcode = this.js2qr(contents)
+        let qrcode = this.js2qr(content)
         let startPoint = Math.round((bufferedImage.getWidth() - qrcode.getWidth()) / 2)
         graphics2D.drawImage(qrcode, startPoint, startPoint, null)
-    // let font = new Font("DejaVuSans", Font.PLAIN, 10)
-    // graphics2D.setFont(font)
-    // let fm = graphics2D.getFontMetrics(font)
-    // let text = "Use QQ Scan Bind!"
-    // let textWidth = fm.stringWidth(text)
-    // let widthX = (128 - textWidth) / 2
-    // graphics2D.setColor(Color.BLACK)
-    // graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB)
-    // graphics2D['drawString(java.lang.String, int, int)'](text, Math.round(widthX), 122)
         graphics2D.dispose()
         return bufferedImage
     }
@@ -392,53 +707,30 @@ export class MiaoReward extends interfaces.Plugin {
         return image
     }
 
-  // let byteArray = new this.ByteArrayOutputStream()
-  // let out = new this.DataOutputStream(byteArray)
-  // out.writeUTF("GetServer")
-  // player.sendPluginMessage(base.getInstance(), "BungeeCord", byteArray.toByteArray())
-
     private bungeeCordDetect(player) {
         if (this.isBungeeCord === undefined && player) {
-      let byteArray = new this.ByteArrayOutputStream()
+            this.bungee.for(player).getServer().send()
-      let out = new this.DataOutputStream(byteArray)
-      out.writeUTF("GetServer")
-      player.sendPluginMessage(base.getInstance(), "BungeeCord", byteArray.toByteArray())
         }
     }
 
     @Listener()
     PlayerJoinEvent(event: org.bukkit.event.player.PlayerJoinEvent) {
-    this.bungeeCordDetect(event.getPlayer())
+        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()
     }
 
     @Listener()
     PlayerDropItemEvent(event: org.bukkit.event.player.PlayerDropItemEvent) {
-    let [cancelled, id] = this.isQrCodeItem(event.getItemDrop().getItemStack())
+        if (this.checkAndClear(event.getPlayer())) {
-    if (id != null && id != undefined && cancelled) {
+            event.setCancelled(true)
-      event.getItemDrop().remove()
-      this.cancelTask(id)
         }
     }
 
     @Listener()
     PlayerItemHeldEvent(event: org.bukkit.event.player.PlayerItemHeldEvent) {
-    let inv = event.getPlayer().getInventory()
+        this.checkAndClear(event.getPlayer())
-    let [cancelled, id] = this.isQrCodeItem(inv.getItem(event.getPreviousSlot() as any))
-    if (id != null && id != undefined && cancelled) {
-      inv.setItem(event.getPreviousSlot(), null)
-      this.cancelTask(id)
-    }
-  }
-
-  @Listener()
-  InventoryClickEvent(event: org.bukkit.event.inventory.InventoryClickEvent) {
-    let item = event.getCurrentItem()
-    let [cancelled, id] = this.isQrCodeItem(item)
-    if (id != null && id != undefined && cancelled) {
-      event.getInventory().setItem(event.getSlot(), null)
-      this.cancelTask(id)
-      event.setCancelled(true)
-    }
     }
 
     @Listener()
@@ -446,44 +738,46 @@ export class MiaoReward extends interfaces.Plugin {
         this.checkAndClear(event.getPlayer())
     }
 
-  private cancelTask(id) {
+    private cancelTask(player) {
-    this.cacheTasks.get(id)?.cancel()
+        if (!this.playerTaskCache.has(player.getName())) { return }
-    this.cacheTasks.delete(id)
+        this.checkAndClear(player)
-    this.isBinding = false
+        this.sendActionBar(player, "")
+        player.updateInventory()
+        this.playerTaskCache.get(player.getName()).cancel()
+        this.playerTaskCache.delete(player.getName())
+        this.playerImageCache.delete(player.getName())
+    }
+
+    private isHoldQrCodeItem(player: org.bukkit.entity.Player) {
+        return this.playerImageCache.has(player.getName())
     }
 
     private checkAndClear(player: org.bukkit.entity.Player) {
-    if (this.isQrCodeItem(player.getItemInHand())[0]) {
+        if (this.isHoldQrCodeItem(player)) {
-      player.setItemInHand(null)
+            this.playerImageCache.delete(player.getName())
+            return true
         }
-  }
+        return false
-
-  private isQrCodeItem(item: org.bukkit.inventory.ItemStack): [boolean, number?] {
-    if (!item) { return [false] }
-    if ((item?.getType() == Material.MAP || item?.getType() == Material.FILLED_MAP) && item.hasItemMeta()) {
-      let meta = item.getItemMeta()
-      return [!!(Java.from(meta.getLore()).indexOf('QRCODE') != -1), item.getDurability()]
-    }
-    return [false]
     }
 
     cmdhelp(sender: any) {
         let help = [
             `§6====== ${this.config.prefix} §a帮助菜单 §6======`,
             `§6/mrd bind §a绑定圈云盒子`,
+            `§6/mrd open §a打开圈云盒子`,
             `§6/mrd query §a查询当前账户`,
-      `§6/mrd draw §e<兑换数量> §a兑换点券`
+            `§6/mrd draw §e<兑换数量> §a兑换${this.config.coinName}`
         ]
         if (sender.isOp()) {
             help = help.concat([
                 `§c由于您是管理员 以为您展示额外命令`,
                 `§6/mrd bind server §a绑定服务器`,
-        `§6/mrd ratio §e<兑换比例> §a设置喵币/点券兑换比例`,
+                `§6/mrd ratio §e<兑换比例> §a设置喵币/${this.config.coinName}兑换比例`,
                 `§6/mrd statistic §3近期收入统计`,
                 `§6/mrd rank <boardcast>(是否公告) §2今日兑换排行`,
                 `§6/mrd server §c当前服务器信息`,
-        `§6兑换比例设置说明: §b默认比例为 0.001 §6=> §a1000喵币 §6兑换 §c1点券`,
+                `§6兑换比例设置说明: §b默认比例为 0.001 §6=> §a1000喵币 §6兑换 §c1${this.config.coinName}`,
-        `§c注意 设置比例后 玩家兑换点券数量不能少于 1点券`,
+                `§c注意 设置比例后 玩家兑换${this.config.coinName}数量不能少于 1${this.config.coinName}`,
                 `§c比如 设置了0.001 那就是 玩家至少 1000喵币 才能兑换!`
             ])
         }
@@ -492,7 +786,7 @@ export class MiaoReward extends interfaces.Plugin {
 
     @Tab()
     tabmrd(sender: any, _command: any, args: string | any[]) {
-    if (args.length === 1) return ['help', 'bind', 'show', 'query', 'draw', 'ratio', 'rank', 'server']
+        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']
     }
 }

packages/plugins/src/MiaoScriptPackageManager.ts

@@ -1,7 +1,6 @@
-import { plugin as pluginApi, task, server, plugin, channel, constants } from '@ccms/api'
+import { plugin as pluginApi, task, server, channel, constants, proxy } from '@ccms/api'
-
 import { Translate } from '@ccms/i18n'
-import { inject, DefaultContainer as container, optional, JSClass } from '@ccms/container'
+import { DefaultContainer as container, JSClass, Autowired } from '@ccms/container'
 import { interfaces, JSPlugin, Cmd, Tab, enable, Listener, disable } from '@ccms/plugin'
 
 import * as fs from '@ccms/common/dist/fs'
@@ -10,41 +9,54 @@ import http from '@ccms/common/dist/http'
 
 let help = [
     '§6========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §bMiaoWoo §6=========',
-    '§6/mpm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
+    '§6/mspm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
-    '§6/mpm §aload §e<插件名称>     §6-  §3安装本地插件',
+    '§6/mspm §aload §e<插件名称>     §6-  §3安装本地插件',
-    '§6/mpm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
+    '§6/mspm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
-    '§6/mpm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
+    '§6/mspm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
-    '§6/mpm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
+    '§6/mspm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
-    '§6/mpm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
+    '§6/mspm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
-    '§6/mpm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
+    '§6/mspm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
-    '§6/mpm §arun §e<JS代码>        §6-  §3运行JS代码',
+    '§6/mspm §arun §e<JS代码>        §6-  §3运行JS代码',
-    '§6/mpm §adeploy §e<插件名称>   §6-  §3发布插件',
+    '§6/mspm §adeploy §e<插件名称>   §6-  §3发布插件',
-    '§6/mpm §crestart             §6-  §4重启MiaoScript脚本引擎'
+    '§6/mspm §crestart             §6-  §4重启MiaoScript脚本引擎'
 ]
 
 let langMap = {
     'main.command.not.exists': '§4未知的子命令: §c{command}',
     'main.command.help.tip': '§6请执行 §b/{command} §ahelp §6查看帮助!',
+    'main.command.no.permission': '§c你没有此命令的权限!',
     'list.install.header': '§6当前 §bMiaoScript §6已安装下列插件:',
-    'list.install.body': '§6插件名称: §b{name}\n§6版本: §a{version}\n§6作者: §3{author}\n§6来源: §c{from}',
+    'list.install.body': `§6┌插件名称: §b{name}
+§6├版本: §a{version}
+§6├作者: §3{author}
+§6└来源: §c{from}`,
     'list.header': '§6当前 §bMiaoScriptPackageCenter §6中存在下列插件:',
-    'list.body': '§6插件名称: §b{name}\n§6版本: §a{version}\n§6作者: §3{author}\n§6更新时间: §9{updated_at}',
+    'list.body': `§6┌插件名称: §b{name}
+§6├版本: §a{version}
+§6├作者: §3{author}
+§6└更新时间: §9{updated_at}`,
     'plugin.not.exists': '§6插件 §b{name} §c不存在!',
-    'plugin.unload.finish': '§6插件 §b{name} §a已卸载!',
+    'plugin.unload.start': '§c开始卸载 §6插件 §b{name} §6版本 §3{version}!',
-    'plugin.reload.finish': '§6插件 §b{name} §a重载完成!',
+    'plugin.unload.finish': '§6插件 §b{name} §6版本 §3{version} §a已卸载!',
+    'plugin.reload.start': '§a开始重载 §6插件 §b{name} §6版本 §3{version}!',
+    'plugin.reload.finish': '§6插件 §b{name} §6版本 §3{version} §a重载完成!',
     '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}!',
-    'download.start': '§6开始下载插件: §b{name}',
+    'download.start': '§6开始下载插件: §b{name} §6版本 §3{version}',
     'download.url': '§6插件下载地址: §b{url}',
-    'download.finish': '§6插件 §b{name} §a下载完毕 开始加载 ...',
+    'download.finish': '§6插件 §b{name} §6版本 §3{version} §a下载完毕 开始加载 ...',
-    'install.finish': '§6插件 §b{name} §a安装成功!',
+    'install.already': '§6插件 §b{name} §6版本 §3{version} §c已安装在服务器 §3更新请用 update 命令!',
-    'update.finish': '§6插件 §b{name} §a更新成功!',
+    'install.finish': '§6插件 §b{name} §6版本 §3{version} §a安装成功!',
-    'upgrade.confirm': '§6您正在尝试升级 §bMiaoScript §c核心 §6请执行 §b/mpm §aupgrade §cconfirm §6确认执行!',
+    'update.finish': '§6插件 §b{name} §6版本 §3{version} §a更新成功!',
+    'upgrade.confirm': '§6您正在尝试更新 §bMiaoScript §c核心 §6请执行 §b/mpm §aupgrade §cconfirm §6确认执行!',
+    'upgrade.start': '§6开始§a更新 §bMiaoScript §6核心 §c正在清理 node_modules 请稍候...',
+    'upgrade.failed': '§6尝试热更新 §bMiaoScript §c核心 §4失败! §6请重启服务器完成更新...',
     'deploy.token.not.exists': '§4请先配置发布Token!',
-    'deploy.success': '§6插件 §b{name} §a发布成功! §6服务器返回: §a{msg}',
+    'deploy.success': '§6插件 §b{name} §6版本 §3{version} §a发布成功! §6服务器返回: §a{msg}',
-    'deploy.fail': '§6插件 §b{name} §c发布失败! §6服务器返回: §c{msg}',
+    'deploy.fail': '§6插件 §b{name} §6版本 §3{version} §c发布失败! §6服务器返回: §c{msg}',
+    'prun.script': '§6指定插件:§b {name}',
     'run.script': '§b运行脚本:§r {script}',
     'run.result': '§a返回结果:§r {result}',
     'run.noresult': '§4没有返回结果!',
@@ -52,32 +64,72 @@ let langMap = {
 
 let fallbackMap = langMap
 
-@JSPlugin({ prefix: 'PM', version: '1.2.0', author: 'MiaoWoo', source: __filename })
+class FakeSender {
-export class MiaoScriptPackageManager extends interfaces.Plugin {
+    private _proxy
-    @inject(plugin.PluginManager)
+    private name: string
-    private pluginManager: pluginApi.PluginManager
+    private plugin: MiaoScriptPackageManager
-    @inject(task.TaskManager)
+    constructor(name: string, plugin: MiaoScriptPackageManager, superclass: any) {
-    private taskManager: task.TaskManager
+        this.name = name
-    @inject(server.ServerType)
+        this.plugin = plugin
-    private serverType: string
+        let FakeSenderAdapter = Java.extend(superclass, {
-    @inject(server.Server)
+            getName: () => this.name,
-    private server: server.Server
+            isOp: () => true,
-    @inject(pluginApi.PluginFolder)
+            hasPermission: () => true,
-    private pluginFolder: string
+            sendMessage: (message) => this.sendMessage(message)
-    @inject(channel.Channel)
+        })
-    @optional() private channel: channel.Channel
+        this._proxy = new FakeSenderAdapter()
+    }
+
+    sendMessage(message) {
+        return this.plugin.sendBungeeCordMessage(this.name, `§6[§3BPM§6][§a${this.plugin.serverName}§6] ${message}`)
+    }
+
+    getHandler() {
+        return this._proxy
+    }
+}
+
+class BukkitFakeSender extends FakeSender {
+    constructor(name: string, plugin: MiaoScriptPackageManager) {
+        super(name, plugin, Java.type('org.bukkit.command.CommandSender'))
+    }
+}
+
+class SpongeFakeSender extends FakeSender {
+    constructor(name: string, plugin: MiaoScriptPackageManager) {
+        super(name, plugin, Java.type('org.spongepowered.api.command.CommandSource'))
+    }
+
+    sendMessage(message) {
+        return super.sendMessage(message.content)
+    }
+}
+
+@JSPlugin({ prefix: 'PM', version: '1.3.1', author: 'MiaoWoo', source: __filename })
+export class MiaoScriptPackageManager extends interfaces.Plugin {
+    @Autowired()
+    private pluginManager: pluginApi.PluginManager
+    @Autowired()
+    private taskManager: task.TaskManager
+    @Autowired(server.ServerType)
+    private serverType: string
+    @Autowired()
+    private server: server.Server
+    @Autowired(pluginApi.PluginFolder)
+    private pluginFolder: string
+    @Autowired()
+    private channel: channel.Channel
+    @Autowired()
+    private bungee: proxy.BungeeCord
 
-    @JSClass('java.io.ByteArrayOutputStream')
-    private ByteArrayOutputStream: any
-    @JSClass('java.io.DataOutputStream')
-    private DataOutputStream: any
     @JSClass('com.google.common.io.ByteStreams')
     private ByteStreams: any
 
     private packageCache: any[] = [];
     private packageNameCache: string[] = [];
 
-    private serverName: string
+    private isBungeeCord = false
+    public serverName: string
     private translate: Translate
     private channelOff: { off: () => void }
 
@@ -96,6 +148,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
             let subChannel = input.readUTF()
             switch (subChannel) {
                 case "GetServer":
+                    this.isBungeeCord = true
                     this.serverName = input.readUTF()
                     break
                 case "MiaoScriptPackageManager":
@@ -114,27 +167,30 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
 
     private bungeeCordDetect(player) {
         if (player) {
-            let byteArray = new this.ByteArrayOutputStream()
+            this.bungee.for(player).getServer().send()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("GetServer")
-            player.sendPluginMessage(base.getInstance(), "BungeeCord", byteArray.toByteArray())
         }
     }
     private bungeeCordForward(player, command) {
         if (player) {
-            let byteArray = new this.ByteArrayOutputStream()
+            this.bungee.for(player).forward("ALL", "MiaoScriptPackageManager", command).send()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("Forward")
-            out.writeUTF("ALL")
-            out.writeUTF("MiaoScriptPackageManager")
-            out.writeUTF(JSON.stringify(command))
-            player.sendPluginMessage(base.getInstance(), "BungeeCord", byteArray.toByteArray())
         }
     }
     private readForward(input) {
         let message = JSON.parse(input.readUTF())
-        this.taskManager.create(() => this.main(this.server.getConsoleSender(), message.command, message.args)).async().submit()
+        let fakeSender = this.getProxySender(message.sender)
-        this.sendBungeeCordMessage(message.sender, `§6[§cMS§6][§bPM§6] [§3BPM§6][§a${this.serverName}§6] §6命令 §b/mpm ${message.args?.join?.(' ')} §a执行成功!`)
+        this.taskManager.create(() => this.main(fakeSender, message.command, message.args)).async().submit()
+        this.logger.sender(fakeSender, `§6命令 §b/mspm ${message.args?.join?.(' ')} §a执行成功!`)
+    }
+
+    private getProxySender(name: string) {
+        switch (this.serverType) {
+            case constants.ServerType.Bukkit:
+                return new BukkitFakeSender(name, this).getHandler()
+            case constants.ServerType.Sponge:
+                return new SpongeFakeSender(name, this).getHandler()
+            default:
+                return this.server.getConsoleSender()
+        }
     }
 
     @Listener({ servers: [constants.ServerType.Bukkit] })
@@ -147,20 +203,16 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
 
     @Listener({ servers: [constants.ServerType.Sponge] })
     ClientConnectionEvent$Join(event: org.spongepowered.api.event.network.ClientConnectionEvent.Join) {
+        this.bungeeCordDetect(event.getTargetEntity())
         if (event.getTargetEntity().hasPermission('ms.mpm.admin')) {
             this.updateRepo(event.getTargetEntity())
         }
     }
 
-    private sendBungeeCordMessage(sender, message) {
+    sendBungeeCordMessage(sender, message) {
         let players = this.server.getOnlinePlayers()
         if (players.length) {
-            let byteArray = new this.ByteArrayOutputStream()
+            this.bungee.for(players[0]).message(sender, message).send()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("Message")
-            out.writeUTF(sender)
-            out.writeUTF(message)
-            this.channel.send(players[0], "BungeeCord", byteArray.toByteArray())
         }
     }
 
@@ -168,16 +220,24 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         this.channelOff?.off()
     }
 
-    @Cmd()
+    @Cmd({ servers: [`!${constants.ServerType.Bungee}`] })
-    bmpm(sender: any, command: string, args: string[]) {
+    gmspm(sender: any, command: string, args: string[]) {
-        if (!sender.isOp()) { return this.logger.sender(sender, '§c你没有此命令的权限!') }
+        if (!sender.hasPermission('mspm.admin')) { return this.i18n(sender, 'main.command.no.permission') }
+        if (!this.isBungeeCord) return this.logger.sender(sender, '§c当前服务器尚未检测到 BungeeCord 链接...')
+        this.taskManager.create(() => this.main(sender, command, args)).async().submit()
         this.bungeeCordForward(sender, { sender: sender.getName(), command, args })
-        this.logger.sender(sender, `[§3BPM§6][§a${this.serverName}§6] §6命令 §b/mpm ${args.join?.(' ')} §a发布成功!`)
+        this.logger.sender(sender, `§6[§3BPM§6][§a${this.serverName}§6] §6命令 §b/mspm ${args.join?.(' ')} §a发布成功!`)
     }
 
-    @Cmd()
+    @Cmd({ servers: [constants.ServerType.Bungee] })
-    mpm(sender: any, command: string, args: string[]) {
+    bungeemspm(sender: any, command: string, args: string[]) {
-        if (!sender.isOp()) { return this.logger.sender(sender, '§c你没有此命令的权限!') }
+        if (!sender.hasPermission('mspm.admin')) { return this.i18n(sender, 'main.command.no.permission') }
+        this.taskManager.create(() => this.main(sender, command, args)).async().submit()
+    }
+
+    @Cmd({ servers: [`!${constants.ServerType.Bungee}`] })
+    mspm(sender: any, command: string, args: string[]) {
+        if (!sender.hasPermission('mspm.admin')) { return this.i18n(sender, 'main.command.no.permission') }
         this.taskManager.create(() => this.main(sender, command, args)).async().submit()
     }
 
@@ -200,6 +260,24 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         this.logger.sender(sender, help)
     }
 
+    cmdinfo(sender: any) {
+        this.logger.sender(sender, [
+
+        ])
+    }
+
+    cmdsudo(sender: any, name: string, ...args: string[]) {
+        this.taskManager.create(() => {
+            let player = this.server.getPlayer(name)
+            if (!player) {
+                return this.logger.sender(sender, `§4玩家 ${player.getName()} 不在线或不存在!`)
+            }
+            let command = args.join(' ')
+            this.server.dispatchCommand(player, command)
+            this.logger.sender(sender, `§6玩家 §a${player.getName()} §6命令 §b${command} §a执行完成!`)
+        }).submit()
+    }
+
     cmdload(sender: any, name: string) {
         let pluginFile = fs.concat(__dirname + '', name)
         if (!fs.exists(pluginFile)) {
@@ -225,7 +303,14 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
 
     cmdinstall(sender: any, name: string) {
         if (!name) { return this.i18n(sender, 'plugin.name.empty') }
-        this.download(sender, name)
+        if (this.pluginManager.getPlugins().has(name)) {
+            this.i18n(sender, 'install.already', { name, version: this.pluginManager.getPlugins().get(name).description.version })
+            return
+        }
+        this.download(sender, name, false, () => {
+            let plugin = this.pluginManager.loadFromFile(fs.concat(root, this.pluginFolder, name + '.js'))
+            this.i18n(sender, 'install.finish', { name, version: plugin.description.version })
+        })
     }
 
     cmdupdate(sender: any, name: string) {
@@ -241,29 +326,47 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
             if (!confirm) { return this.i18n(sender, 'upgrade.confirm') }
             let enginePath = fs.path(fs.file(root, 'node_modules'))
             if (enginePath.startsWith(root)) {
+                try {
+                    this.i18n(sender, 'upgrade.start')
                     base.delete(enginePath)
                     this.cmdrestart(sender)
+                } catch (ex) {
+                    if (global.debug) {
+                        console.ex(ex)
+                    }
+                    if (fs.exists(enginePath)) {
+                        this.i18n(sender, 'upgrade.failed')
+                        fs.create(fs.file(root, 'upgrade'))
+                    }
+                }
             }
             return
         }
         if (this.checkPlugin(sender, name)) {
-            this.update(sender, name)
+            this.update(sender, name, () => this.reload(sender, name))
-            this.pluginManager.reload(name)
         }
     }
 
     cmdunload(sender: any, name: string) {
         if (this.checkPlugin(sender, name)) {
-            this.pluginManager.disable(name)
+            let plugin = this.pluginManager.getPlugins().get(name)
-            this.i18n(sender, 'plugin.unload.finish', { name })
+            this.i18n(sender, 'plugin.unload.start', { name, version: plugin.description.version })
+            this.pluginManager.disable(plugin)
+            this.i18n(sender, 'plugin.unload.finish', { name, version: plugin.description.version })
         }
     }
 
     cmdreload(sender: any, name: string) {
         name = name || this.description.name
+        this.reload(sender, name)
+    }
+
+    private reload(sender: any, name: string) {
         if (this.checkPlugin(sender, name)) {
-            this.pluginManager.reload(name)
+            let plugin = this.pluginManager.getPlugins().get(name)
-            this.i18n(sender, 'plugin.reload.finish', { name })
+            this.i18n(sender, 'plugin.reload.start', { name, version: plugin.description.version })
+            this.pluginManager.reload(plugin)
+            this.i18n(sender, 'plugin.reload.finish', { name, version: this.pluginManager.getPlugins().get(name).description.version })
         }
     }
 
@@ -280,8 +383,9 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     }
 
     cmdrestart(sender: any) {
+        setTimeout(() => {
             if (this.serverType === "sponge") {
-            setTimeout(() => this.server.dispatchConsoleCommand('sponge plugins reload'), 0)
+                this.server.dispatchConsoleCommand('sponge plugins reload')
                 return
             }
             try {
@@ -294,20 +398,34 @@ 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[]) {
         try {
             let script = args.join(' ')
             this.i18n(sender, 'run.script', { script })
-            let result = this.runCode(script, sender)
+            let result = this.runCode(script, sender, this)
             this.i18n(sender, 'run.result', { result: result == undefined ? this.translate.translate('run.noresult') : result + '' })
         } catch (ex) {
             this.logger.sender(sender, this.logger.stack(ex))
         }
     }
 
-    private runCode(code: string, sender: any) {
+    cmdprun(sender: any, name: string, ...args: any[]) {
+        try {
+            if (!this.pluginManager.getPlugins().has(name)) { return this.logger.sender(sender, `§4插件 §c${name} §4不存在!`) }
+            let script = args.join(' ')
+            this.i18n(sender, 'prun.script', { name })
+            this.i18n(sender, 'run.script', { script })
+            let result = this.runCode(script, sender, this.pluginManager.getPlugins().get(name))
+            this.i18n(sender, 'run.result', { result: result == undefined ? this.translate.translate('run.noresult') : typeof result == "string" ? result : JSON.stringify(result) })
+        } catch (ex) {
+            this.logger.sender(sender, this.logger.stack(ex))
+        }
+    }
+
+    private runCode(code: string, sender: any, _this: any) {
         let paramNames = [
             'sender',
             'reflect',
@@ -328,8 +446,8 @@ if (this.serverType == "spring") {
     var db = dbm.getMainDatabase()
     var df = base.getInstance().getAutowireCapableBeanFactory()
 }
-return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
+return eval(${JSON.stringify(code)});`)
-        return tfunc.apply(this, params) + ''
+        return tfunc.apply(_this, params)
     }
 
     cmddeploy(sender: any, name: any) {
@@ -343,20 +461,23 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
                     version: plugin.description.version,
                     source: base.read((plugin.description.source || plugin.description.loadMetadata.file).toString())
                 })
-                this.i18n(sender, result.code == 200 ? 'deploy.success' : 'deploy.fail', { name, msg: result.msg })
+                this.i18n(sender, result.code == 200 ? 'deploy.success' : 'deploy.fail', { name, version: plugin.description.version, msg: result.msg })
             }
         }).async().submit()
     }
 
-    update(sender: any, name: string) {
+    private update(sender: any, name: string, callback?: () => void) {
         if (this.checkCloudPlugin(sender, name)) {
-            this.download(sender, name, true)
+            this.download(sender, name, true, () => {
+                this.i18n(sender, 'update.finish', { name, version: this.packageCache[name].version })
+                callback?.()
+            })
         }
     }
 
-    @Tab()
+    @Tab({ alias: ['gmspm', 'bungeemspm'] })
-    tabmpm(sender: any, command: any, args: string | any[]) {
+    tabmspm(_sender: any, _command: any, args: string | any[]) {
-        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'help', 'create', 'deploy'] }
+        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'prun', 'sudo', 'help', 'create', 'deploy'] }
         if (args.length > 1) {
             switch (args[0]) {
                 case "list":
@@ -367,6 +488,12 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
                     if (args.length == 2) return ["system", ...this.pluginManager.getPlugins().keys()]
                     if (args.length == 3 && args[1] == "system") return ["confirm"]
                     return []
+                case "prun":
+                    if (args.length == 2) return [...this.pluginManager.getPlugins().keys()]
+                    return []
+                case "sudo":
+                    if (args.length == 2) return Java.from(this.server.getOnlinePlayers()).map(p => p.getName())
+                    return []
                 case "update":
                 case "load":
                 case "unload":
@@ -393,19 +520,15 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
         }).async().submit()
     }
 
-    download(sender: any, name: string, update: boolean = false) {
+    download(sender: any, name: string, update: boolean, callback?: () => void) {
         this.taskManager.create(() => {
-            this.i18n(sender, 'download.start', { name })
+            let pluginPkg = this.packageCache[name]
-            this.i18n(sender, 'download.url', { url: this.packageCache[name].url })
+            this.i18n(sender, 'download.start', { name, version: pluginPkg.version })
+            this.i18n(sender, 'download.url', { url: pluginPkg.url })
             let pluginFile = update ? fs.concat(root, this.pluginFolder, 'update', name + '.js') : fs.concat(root, this.pluginFolder, name + '.js')
-            http.download(this.packageCache[name].url, pluginFile)
+            http.download(pluginPkg.url, pluginFile)
-            this.i18n(sender, 'download.finish', { name })
+            this.i18n(sender, 'download.finish', { name, version: pluginPkg.version })
-            if (!update) {
+            callback?.()
-                this.pluginManager.loadFromFile(fs.concat(root, this.pluginFolder, name + '.js'))
-                this.i18n(sender, 'install.finish', { name })
-            } else {
-                this.i18n(sender, 'update.finish', { name })
-            }
         }).async().submit()
     }
 }