v0.9.8

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.3",
+    "version": "0.9.8",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/amqp/package.json

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

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[]
@@ -27,4 +27,4 @@ export class MessageListenerContainerAdapter {
     getHandler() {
         return this._Handler
     }
-}
+}

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
     }
@@ -86,4 +86,4 @@ export class SimpleMessageHandler extends ChannelAwareMessageListenerAdapter {
     onMessage(content: any, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
         return this.handler(content, message, channel)
     }
-}
+}

packages/api/package.json

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

packages/api/src/channel.ts

@@ -1,4 +1,4 @@
-import { injectable, inject, provideSingleton } from "@ccms/container"
+import { injectable } from "@ccms/container"
 
 export namespace channel {
     /**
@@ -63,156 +63,4 @@ export namespace channel {
          */
         abstract unregister(channel: string, listener?: any): void
     }
-    export namespace proxy {
-        const CHANNEL_NAME = "BungeeCord"
-        const ByteArrayOutputStream = Java.type('java.io.ByteArrayOutputStream')
-        const DataOutputStream = Java.type('java.io.DataOutputStream')
-        const ByteStreams = Java.type('com.google.common.io.ByteStreams')
-        namespace bungeecord {
-            export class SubChannelBuilder {
-                private channel: Channel
-                private player: any
-                private params: string[]
-                constructor(channel: Channel, player: any) {
-                    this.channel = channel
-                    this.player = player
-                    this.params = []
-                }
-                connect(server: string) {
-                    this.params.push("Connect")
-                    this.params.push(server)
-                }
-                connectOther(player: string, server: string) {
-                    this.params.push("ConnectOther")
-                    this.params.push(player)
-                    this.params.push(server)
-                }
-                ip() {
-                    this.params.push("IP")
-                }
-                ipOther(player: string) {
-                    this.params.push("IPOther")
-                    this.params.push(player)
-                }
-                playerCount(server: string | "ALL") {
-                    this.params.push("PlayerCount")
-                    this.params.push(server)
-                }
-                /**
-                 * 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)
-                }
-                /**
-                 * 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) {
-                    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)
-                    }
-                    this.channel.send(this.player, CHANNEL_NAME, byteArray.toByteArray())
-                }
-                private finalSend() {
-                    return {
-                        send: this.send.bind(this)
-                    }
-                }
-            }
-        }
-        @provideSingleton(BungeeCord)
-        export class BungeeCord {
-            @inject(Channel)
-            private channel: Channel
-            /**
-             * 获得代理
-             * @param player 玩家
-             */
-            for(player: any): bungeecord.SubChannelBuilder {
-                return new bungeecord.SubChannelBuilder(this.channel, player)
-            }
-        }
-    }
 }

packages/api/src/command.ts

@@ -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)
@@ -62,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/index.ts

@@ -3,6 +3,7 @@ import "@ccms/nashorn"
 export * from './chat'
 export * from './task'
 export * from './event'
+export * from './proxy'
 export * from './console'
 export * from './channel'
 export * from './command'

packages/api/src/proxy.ts

@@ -0,0 +1,160 @@
+import { provideSingleton, Autowired } 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 {
+        @Autowired()
+        private channel: channel.Channel
+        /**
+         * 获得代理
+         * @param player 玩家
+         */
+        for(player: any): bungeecord.SubChannelBuilder {
+            return new bungeecord.SubChannelBuilder(this.channel, player)
+        }
+    }
+}

packages/api/src/task.ts

@@ -29,7 +29,6 @@ export namespace task {
             if (plugin) { return this.pluginCreate(plugin, task) }
             return task
         }
-        abstract create0(func: Function): task.Task
         /**
          * 在主线程执行代码
          * @param func 执行内容
@@ -42,7 +41,8 @@ export namespace task {
             if (plugin) { return this.pluginDisable(plugin) }
             this.disable0()
         }
-        abstract disable0()
+        protected abstract create0(func: Function): task.Task
+        protected abstract disable0()
     }
     /**
      * 任务抽象
@@ -116,7 +116,7 @@ export namespace task {
          * 提交任务
          * @param args 任务参数
          */
-        abstract submit0(...args: any[]): Cancelable
+        protected abstract submit0(...args: any[]): Cancelable
     }
     /**
      * 返可取消的对象

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     }
 }

packages/bukkit/src/chat.ts

@@ -14,6 +14,10 @@ export class BukkitChat extends chat.Chat {
         this.sendJson(sender, { text: message }, 2)
     }
     sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 20, time: number = 100, fadeOut: number = 20) {
-        sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
+        try {
+            sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
+        } catch (error) {
+            sender.sendTitle(title, subtitle)
+        }
     }
 }

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()

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     }
 }

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) {
-        Bungee.unregisterChannel(channel);
-        listener.off();
+    unregister(channel: string, off: any) {
+        Bungee.unregisterChannel(channel)
+        off()
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.9.0",
+    "version": "0.9.4",
     "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.16.0"
     },
     "devDependencies": {
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     }
 }

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 address = process.argv[4] || '192.168.2.5:25577'
-let realAddress = address.split(":");
-let client = createConnection(realAddress[0], parseInt(realAddress[1] || "25565"), username)
+let password = process.argv[3] || ''
+let version = process.argv[4] || '1.12.2'
+let readAddress = process.argv[5] || '192.168.2.5:25577'
+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
 }
 
-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)
-})
+function attachCommon(client) {
+    client.on('error', (error) => {
+        console.log("Client Error", error)
+    })
+    client.on('end', (resone) => {
+        console.log("Client End Resone:", resone)
+        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)
-            break;
+            client = commandLineCreateClient()
+            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.3",
+    "version": "0.9.8",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.3",
-        "@javatypes/jdk": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.9.0",
+    "version": "0.9.4",
     "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.3"
     }
 }

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.3",
+        "@ccms/nashorn": "^0.9.8",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     },
     "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"
 
@@ -59,22 +59,21 @@ export const JSClass = (className: string) => {
  * 自动注入实例由平台实现
  * @param className 类名
  */
-export const Autowired = (className?: string | any) => {
+export const Autowired = (className?: any) => {
     return function (target: any, propertyKey: string, index?: number) {
         let container = getContainer()
-        let type = Reflect.getMetadata('design:type', target, propertyKey)
-        if (type && type !== Object) {
-            try {
-                return target[propertyKey] = container.getNamed(type, className || propertyKey)
-            } catch (error) {
-                try {
-                    return target[propertyKey] = container.get(type)
-                } catch (error) {
-                }
-            }
+        if (className && (className instanceof Symbol || className instanceof Function)) {
+            return inject(className)(target, propertyKey, index)
         }
-        if (container.isBound(ioc.Autowired)) {
+        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}`)
         }
     }
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     }
 }

packages/i18n/package.json

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

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,18 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.3",
-        "@javatypes/amqp-client": "^0.0.2",
-        "@javatypes/spring-amqp": "^0.0.2",
-        "@javatypes/spring-rabbit": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/amqp-client": "^0.0.3",
+        "@javatypes/spring-amqp": "^0.0.3",
+        "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     },
     "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" />
-/// <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'
+export { }

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.3",
+    "version": "0.9.8",
     "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.3"
     }
 }

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);

packages/nodejs/package.json

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

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     }
 }

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();
-const File = Java.type("java.io.File");
+let Nukkit: cn.nukkit.Server = base.getInstance().getServer()
+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/ployfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/ployfill",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3",
-        "@ccms/nodejs": "^0.9.3",
+        "@ccms/i18n": "^0.9.8",
+        "@ccms/nodejs": "^0.9.8",
         "core-js": "^3.6.5"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.3",
+        "@ccms/nashorn": "^0.9.8",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     }
 }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3",
-        "@ccms/i18n": "^0.9.3",
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/i18n": "^0.9.8",
         "js-yaml": "^3.14.0"
     }
 }

packages/plugin/src/command.ts

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

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,93 @@ 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 function getConfigLoader(format: string) {
-    if (!configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
-    return configLoaderMap.get(format)
+export interface PluginConfig {
+    /**
+     * Save Config to File
+     */
+    readonly save?: () => void
+    /**
+     * Reload Config from File
+     */
+    readonly reload?: () => void
+    [key: string]: any
 }
 
-function loadConfig(plugin: plugin.Plugin) {
-    let configs = getPluginConfigMetadata(plugin)
-    for (let [_, config] of configs) {
+@provideSingleton(PluginConfigManager)
+export class PluginConfigManager {
+    private configLoaderMap = new Map<string, PluginConfigLoader>()
+
+    constructor() {
+        this.configLoaderMap.set("json", new JsonPluginConfig())
+        let yaml = new YamlPluginConfig()
+        this.configLoaderMap.set("yml", yaml)
+        this.configLoaderMap.set("yaml", yaml)
+        process.on('plugin.before.load', this.loadConfig.bind(this))
+        process.on('plugin.after.disable', this.saveConfig.bind(this))
+    }
+
+    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) {
+            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 {
-            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 })
+            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 {
-                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])}`)
+                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: config.name, format: config.format, error })
+            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.format, error })
             console.ex(error)
         }
     }
-}
 
-function saveConfig(plugin: plugin.Plugin) {
-    let configs = getPluginConfigMetadata(plugin)
-    for (let [_, config] of configs) {
+    private saveConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
         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])) }
+            if (metadata.readonly) { console.debug(`[${plugin.description.name}] Skip Save Config ${metadata.variable} Because it's readonly!`) }
+            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: config.name, format: config.format, 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
         }
     }
 }
-
-function init() {
-    configLoaderMap.set("json", new JsonPluginConfig())
-    let yaml = new YamlPluginConfig()
-    configLoaderMap.set("yml", yaml)
-    configLoaderMap.set("yaml", yaml)
-    process.on('plugin.before.load', loadConfig)
-    process.on('plugin.after.load', saveConfig)
-}
-
-init()

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,13 +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)
-        previousMetadata.set(metadata.name, metadata)
-        metadata.alias?.forEach((name) => previousMetadata.set(name, metadata))
-        Reflect.defineMetadata(METADATA_KEY.cmd, previousMetadata, target.constructor)
+        Reflect.defineMetadata(METADATA_KEY.cmd, [metadata, ...getPluginCommandMetadata(target)], target.constructor)
     }
 }
 
@@ -48,10 +46,11 @@ 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)
@@ -67,8 +66,7 @@ export function listener(metadata: interfaces.ListenerMetadata = {}) {
         metadata.name = metadata.name || key
         metadata.target = target
         metadata.executor = key
-        const previousMetadata: interfaces.ListenerMetadata[] = getPluginListenerMetadata(target)
-        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...previousMetadata], target.constructor)
+        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...getPluginListenerMetadata(target)], target.constructor)
         Reflect.defineMetadata(METADATA_KEY.listener, metadata, target[key])
     }
 }
@@ -79,7 +77,8 @@ 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.filename = metadata.filename ?? metadata.name + '.' + metadata.format
+        let previousMetadata = getPluginConfigMetadata(target)
         previousMetadata.set(metadata.name, metadata)
         Reflect.defineMetadata(METADATA_KEY.config, previousMetadata, target.constructor)
     }
@@ -90,8 +89,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, ...previousMetadata], target.constructor)
+            Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...getPluginStageMetadata(target, stage)], target.constructor)
         }
     }
 }

packages/plugin/src/event.ts

@@ -1,24 +1,31 @@
 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)
-    private ServerChecker: server.ServerChecker
-    @inject(event.Event)
+    @Autowired()
     private EventManager: event.Event
+    @Autowired()
+    private ServerChecker: server.ServerChecker
 
     constructor() {
-        process.on('plugin.before.enable', (plugin: plugin.Plugin) => this.registryListener(plugin))
-        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryListener(plugin))
+        process.on('plugin.before.enable', this.registryListener.bind(this))
+        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
             let exec = event.target[event.executor]
             let execBinded = exec.bind(pluginInstance)

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

@@ -75,5 +75,13 @@ export namespace interfaces {
          * 是否为只读(关闭时将不会自动保存)
          */
         readonly?: boolean
+        /**
+         * 配置文件名称
+         */
+        filename?: string
+        /**
+         * 配置文件全路径
+         */
+        file?: any
     }
 }

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

@@ -1,5 +1,5 @@
 import { plugin, server } from "@ccms/api"
-import { inject, ContainerInstance, Container, provideSingletonNamed } from "@ccms/container"
+import { inject, ContainerInstance, Container, provideSingletonNamed, Autowired } from "@ccms/container"
 
 import { interfaces } from "../interfaces"
 import { getPluginStageMetadata, getPluginSources } from "../utils"
@@ -11,7 +11,7 @@ export class IocLoader implements plugin.PluginLoader {
     type: string = LOADER_TYPE_NAME
     @inject(ContainerInstance)
     private container: Container
-    @inject(server.ServerChecker)
+    @Autowired()
     private serverChecker: server.ServerChecker
 
     private pluginMetadataMap: Map<string, plugin.PluginMetadata>
@@ -69,7 +69,7 @@ export class IocLoader implements plugin.PluginLoader {
                 console.i18n('ms.plugin.manager.build.duplicate', { exists: pluginInstance.description.source, source: metadata.source })
             }
             this.container.rebind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
-        } catch{
+        } catch {
             this.container.bind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
         }
     }

packages/plugin/src/manager.ts

@@ -1,12 +1,13 @@
 import i18n from '@ccms/i18n'
 import { plugin, server, event } from '@ccms/api'
-import { inject, provideSingleton, Container, ContainerInstance } from '@ccms/container'
+import { inject, provideSingleton, Container, ContainerInstance, Autowired } from '@ccms/container'
 
 import './config'
 import { interfaces } from './interfaces'
 import { PluginTaskManager } from './task'
 import { PluginEventManager } from './event'
 import { PluginCommandManager } from './command'
+import { PluginConfigManager } from './config'
 
 const Thread = Java.type('java.lang.Thread')
 
@@ -18,16 +19,17 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private pluginInstance: any
     @inject(server.ServerType)
     private serverType: string
-    @inject(event.Event)
-    private EventManager: event.Event
-    @inject(server.ServerChecker)
+
+    @Autowired()
     private serverChecker: server.ServerChecker
 
-    @inject(PluginTaskManager)
+    @Autowired()
     private taskManager: PluginTaskManager
-    @inject(PluginEventManager)
+    @Autowired()
     private eventManager: PluginEventManager
-    @inject(PluginCommandManager)
+    @Autowired()
+    private configManager: PluginConfigManager
+    @Autowired()
     private commandManager: PluginCommandManager
 
     private initialized: boolean = false
@@ -48,6 +50,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         // ignore unused
         this.taskManager
         this.eventManager
+        this.configManager
         this.commandManager
     }
 
@@ -55,7 +58,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         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}...`)

packages/plugin/src/task.ts

@@ -1,9 +1,9 @@
 import { plugin, task } from '@ccms/api'
-import { provideSingleton, inject } from '@ccms/container'
+import { provideSingleton, Autowired } from '@ccms/container'
 
 @provideSingleton(PluginTaskManager)
 export class PluginTaskManager {
-    @inject(task.TaskManager)
+    @Autowired()
     private taskManager: task.TaskManager
 
     constructor() {

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/MiaoReward.md

@@ -14,7 +14,12 @@
 - 玩家兑换公告![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)
 ## 插件命令
 ```
 >mrd
@@ -36,15 +41,89 @@
 ## 插件安装/配置
 
 ### 基础准备工作
-- 申请内测服务器账号
 - QQ搜索小程序 `圈云盒子` 并登录
+- 申请内测服务器账号
+  - 个人中心 => 配置面板 => 圈云盒子客服群
+  - 打开群详情 加群
+
+### 接下来就是赚钱的操作
+
 ### 服务器准备工作
-- 先安装 `MiaoScript` [站内地址]()
-- 执行 `mpm install MiaoReward`
+- 打开 [圈云盒子管理后台](https://reward.yumc.pw)
+- 先安装 `MiaoScript` [站内地址](https://www.mcbbs.net/thread-774401-1-1.html)
+  - 可以通过 Yum 快速安装 `/yum install MiaoScript`
+- 等待 MiaoScript 引擎启动完成(首次启动可能需要10-20秒 依赖于您的网络环境)
+- 执行 `/mspm install MiaoReward`
+
 ### 绑定服务器
+- 由于当前框架存在BUG 请先执行 `/mspm reload MiaoReward` 生成配置文件
 - 执行 `/mrd bind server`
 - 使用QQ扫码
 - 选择需要绑定的服务器
 - 完成绑定
+- 配置服务器兑换比例
+- 执行 `/mrd ratio 0.001` (最低为 1:0.0001)
+- 执行兑换比例确认指令
 - 执行 `/mrd server` 查看服务器信息
-- 如需绑定多台 可以直接复制绑定之后的 `MiaoScript/plugins/MiaoReward/config.yml` 文件到多台服务器上 然后 `/mrd reload` 重载插件
+- 如果群组服需要绑定多台服务器(前提是每个服务器都有玩家在)
+  - 执行 `/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包管理中心](http://ms.yumc.pw/api/plugin/download/name/MiaoReward)
+
+## Roadmap
+- 绑定服务器(已完成)
+- 绑定玩家(已完成)
+- 兑换喵币(已完成)
+- 自助开通服务器(开发中)
+- 自助兑换RMB(开发中)
+- 自助提现(开发中)

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -20,16 +20,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spring-data-redis": "^0.0.2",
-        "@javatypes/spring-web": "^0.0.2",
-        "@javatypes/tomcat": "^0.0.2",
+        "@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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/container": "^0.9.3",
-        "@ccms/plugin": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/plugin": "^0.9.8"
     }
 }

packages/plugins/src/MiaoChat.ts

@@ -2,8 +2,8 @@
 /// <reference types="@javatypes/spigot-api" />
 /// <reference types="@javatypes/sponge-api" />
 
-import { server, plugin as pluginApi, channel, constants, chat } from '@ccms/api'
-import { inject, optional } from '@ccms/container'
+import { server, channel, constants, chat } from '@ccms/api'
+import { optional, Autowired } from '@ccms/container'
 import { plugin, interfaces, cmd, listener, tab, config, enable } from '@ccms/plugin'
 import Tellraw from '@ccms/common/dist/tellraw'
 
@@ -52,12 +52,13 @@ class MiaoMessage {
 
 @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(chat.Chat)
+    @optional()
+    @Autowired()
     private chat: chat.Chat
-    @inject(channel.Channel)
-    @optional() private Channel: channel.Channel
+    @Autowired()
+    private Channel: channel.Channel
 
     private channelOff: { off: () => void }
 
@@ -176,6 +177,10 @@ export class MiaoChat extends interfaces.Plugin {
     }
 
     bukkitenable() {
+        if (!this.chat) {
+            this.logger.console('§4消息管理器注入失败 请检查当前服务器是否兼容...')
+            this.AsyncPlayerChatEvent['off']()
+        }
         // 尝试加载 Bukkit 的 PlaceholderAPI
         try {
             //@ts-ignore
@@ -187,6 +192,10 @@ 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')
@@ -227,13 +236,13 @@ 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)
         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)
         sender.sendMessage(JSON.stringify({ command, ...args }))
@@ -243,12 +252,12 @@ 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(), () => 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)

packages/plugins/src/MiaoConsole.ts

@@ -250,7 +250,7 @@ export class MiaoConsole extends interfaces.Plugin {
             client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
         })
         client.on('tabComplate', (input, index, callback) => {
-            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index))
+            callback?.(this.command.tabComplete(this.server.getConsoleSender(), input, index) || [])
         })
         client.on('exec', (code) => {
             try {

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,16 +9,16 @@ import http from '@ccms/common/dist/http'
 
 let help = [
     '§6========= §6[§aMiaoScriptPackageManager§6] 帮助 §aBy §bMiaoWoo §6=========',
-    '§6/mpm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
-    '§6/mpm §aload §e<插件名称>     §6-  §3安装本地插件',
-    '§6/mpm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
-    '§6/mpm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
-    '§6/mpm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
-    '§6/mpm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
-    '§6/mpm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
-    '§6/mpm §arun §e<JS代码>        §6-  §3运行JS代码',
-    '§6/mpm §adeploy §e<插件名称>   §6-  §3发布插件',
-    '§6/mpm §crestart             §6-  §4重启MiaoScript脚本引擎'
+    '§6/mspm §ainstall §e<插件名称>  §6-  §3安装仓库插件',
+    '§6/mspm §aload §e<插件名称>     §6-  §3安装本地插件',
+    '§6/mspm §aunload §e<插件名称>   §6-  §3卸载已安装插件',
+    '§6/mspm §areload §e<插件名称>   §6-  §3重载已安装插件(无名称则重载自身)',
+    '§6/mspm §alist [i]            §6-  §3列出仓库插件[已安装的插件]',
+    '§6/mspm §aupdate §e[插件名称]   §6-  §3更新插件(无名称则更新源)',
+    '§6/mspm §aupgrade §e[插件名称]  §6-  §3升级插件/框架(§4无名称则升级框架§3)',
+    '§6/mspm §arun §e<JS代码>        §6-  §3运行JS代码',
+    '§6/mspm §adeploy §e<插件名称>   §6-  §3发布插件',
+    '§6/mspm §crestart             §6-  §4重启MiaoScript脚本引擎'
 ]
 
 let langMap = {
@@ -27,9 +26,15 @@ let langMap = {
     '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} §6版本: §a{version}\n§6作者: §3{author} §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} §6版本: §a{version}\n§6作者: §3{author} §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.start': '§c开始卸载 §6插件 §b{name} §6版本 §3{version}!',
     'plugin.unload.finish': '§6插件 §b{name} §6版本 §3{version} §a已卸载!',
@@ -42,6 +47,7 @@ let langMap = {
     'download.start': '§6开始下载插件: §b{name} §6版本 §3{version}',
     'download.url': '§6插件下载地址: §b{url}',
     'download.finish': '§6插件 §b{name} §6版本 §3{version} §a下载完毕 开始加载 ...',
+    'install.already': '§6插件 §b{name} §6版本 §3{version} §c已安装在服务器 §3更新请用 update 命令!',
     'install.finish': '§6插件 §b{name} §6版本 §3{version} §a安装成功!',
     'update.finish': '§6插件 §b{name} §6版本 §3{version} §a更新成功!',
     'upgrade.confirm': '§6您正在尝试更新 §bMiaoScript §c核心 §6请执行 §b/mpm §aupgrade §cconfirm §6确认执行!',
@@ -49,6 +55,7 @@ let langMap = {
     'deploy.token.not.exists': '§4请先配置发布Token!',
     'deploy.success': '§6插件 §b{name} §6版本 §3{version} §a发布成功! §6服务器返回: §a{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没有返回结果!',
@@ -66,34 +73,54 @@ class FakeSender {
         let FakeSenderAdapter = Java.extend(superclass, {
             getName: () => this.name,
             isOp: () => true,
-            sendMessage: (message) => this.plugin.sendBungeeCordMessage(this.name, `§6[§3BPM§6][§a${this.plugin.serverName}§6] ${message}`)
+            hasPermission: () => true,
+            sendMessage: (message) => this.sendMessage(message)
         })
         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.0', author: 'MiaoWoo', source: __filename })
 export class MiaoScriptPackageManager extends interfaces.Plugin {
-    @inject(plugin.PluginManager)
+    @Autowired()
     private pluginManager: pluginApi.PluginManager
-    @inject(task.TaskManager)
+    @Autowired()
     private taskManager: task.TaskManager
-    @inject(server.ServerType)
+    @Autowired(server.ServerType)
     private serverType: string
-    @inject(server.Server)
+    @Autowired()
     private server: server.Server
-    @inject(pluginApi.PluginFolder)
+    @Autowired(pluginApi.PluginFolder)
     private pluginFolder: string
-    @inject(channel.Channel)
-    @optional() private channel: channel.Channel
+    @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
 
@@ -139,36 +166,27 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
 
     private bungeeCordDetect(player) {
         if (player) {
-            let byteArray = new this.ByteArrayOutputStream()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("GetServer")
-            this.channel.send(player, "BungeeCord", byteArray.toByteArray())
+            this.bungee.for(player).getServer().send()
         }
     }
     private bungeeCordForward(player, command) {
         if (player) {
-            let byteArray = new this.ByteArrayOutputStream()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("Forward")
-            out.writeUTF("ALL")
-            out.writeUTF("MiaoScriptPackageManager")
-            out.writeUTF(JSON.stringify(command))
-            this.channel.send(player, "BungeeCord", byteArray.toByteArray())
+            this.bungee.for(player).forward("ALL", "MiaoScriptPackageManager", command).send()
         }
     }
     private readForward(input) {
         let message = JSON.parse(input.readUTF())
         let fakeSender = this.getProxySender(message.sender)
         this.taskManager.create(() => this.main(fakeSender, message.command, message.args)).async().submit()
-        this.logger.sender(fakeSender, `§6命令 §b/mpm ${message.args?.join?.(' ')} §a执行成功!`)
+        this.logger.sender(fakeSender, `§6命令 §b/mspm ${message.args?.join?.(' ')} §a执行成功!`)
     }
 
     private getProxySender(name: string) {
         switch (this.serverType) {
             case constants.ServerType.Bukkit:
-                return new FakeSender(name, this, Java.type('org.bukkit.command.CommandSender')).getHandler()
+                return new BukkitFakeSender(name, this).getHandler()
             case constants.ServerType.Sponge:
-                return new FakeSender(name, this, Java.type('org.spongepowered.api.command.CommandSource')).getHandler()
+                return new SpongeFakeSender(name, this).getHandler()
             default:
                 return this.server.getConsoleSender()
         }
@@ -193,12 +211,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     sendBungeeCordMessage(sender, message) {
         let players = this.server.getOnlinePlayers()
         if (players.length) {
-            let byteArray = new this.ByteArrayOutputStream()
-            let out = new this.DataOutputStream(byteArray)
-            out.writeUTF("Message")
-            out.writeUTF(sender)
-            out.writeUTF(message)
-            this.channel.send(players[0], "BungeeCord", byteArray.toByteArray())
+            this.bungee.for(players[0]).message(sender, message).send()
         }
     }
 
@@ -207,23 +220,23 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     }
 
     @Cmd({ servers: [`!${constants.ServerType.Bungee}`] })
-    bmpm(sender: any, command: string, args: string[]) {
-        if (!sender?.isOp()) { return this.i18n(sender, 'main.command.no.permission') }
-        if (!this.isBungeeCord) return this.logger.sender(sender, '§c当前服务器尚未检测到BungeeCord链接...')
+    gmspm(sender: any, command: string, args: string[]) {
+        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, `§6[§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({ servers: [constants.ServerType.Bungee] })
-    mpmanager(sender: any, command: string, args: string[]) {
-        if (!sender?.isOp()) { return this.i18n(sender, 'main.command.no.permission') }
+    bungeemspm(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()
     }
 
     @Cmd({ servers: [`!${constants.ServerType.Bungee}`] })
-    mpm(sender: any, command: string, args: string[]) {
-        if (!sender?.isOp()) { return this.i18n(sender, 'main.command.no.permission') }
+    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()
     }
 
@@ -252,6 +265,18 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         ])
     }
 
+    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)) {
@@ -278,7 +303,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     cmdinstall(sender: any, name: string) {
         if (!name) { return this.i18n(sender, 'plugin.name.empty') }
         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, () => {
@@ -376,14 +401,27 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         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',
@@ -404,8 +442,8 @@ if (this.serverType == "spring") {
     var db = dbm.getMainDatabase()
     var df = base.getInstance().getAutowireCapableBeanFactory()
 }
-return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
-        return tfunc.apply(this, params) + ''
+return eval(${JSON.stringify(code)});`)
+        return tfunc.apply(_this, params)
     }
 
     cmddeploy(sender: any, name: any) {
@@ -419,7 +457,7 @@ 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()
     }
@@ -433,9 +471,9 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
         }
     }
 
-    @Tab({ alias: ['bmpm'] })
-    tabmpm(sender: any, command: any, args: string | any[]) {
-        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'help', 'create', 'deploy'] }
+    @Tab({ alias: ['gmspm', 'bungeemspm'] })
+    tabmspm(_sender: any, _command: any, args: string | any[]) {
+        if (args.length === 1) { return ['list', 'install', 'update', 'upgrade', 'reload', 'restart', 'run', 'prun', 'sudo', 'help', 'create', 'deploy'] }
         if (args.length > 1) {
             switch (args[0]) {
                 case "list":
@@ -446,6 +484,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":

packages/sponge/package.json

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

packages/sponge/src/command.ts

@@ -49,11 +49,11 @@ class SimpleCommandCallable {
         this.callable = new CommandCallable({
             //CommandResult process(CommandSource source, String arguments) throws CommandException
             process: (sender: any, args) => {
-                return this.executor(sender, '', command, Java.to(args.split(" ").filter(e => e))) ? CommandResult.success() : CommandResult.empty()
+                return this.executor(sender, '', command, Java.to(args.split(" "))) ? CommandResult.success() : CommandResult.empty()
             },
             //List<String> getSuggestions(CommandSource source, String arguments, @Nullable  Location<World> targetPosition) throws CommandException
             getSuggestions: (sender: any, args, target) => {
-                return this.tabCompleter(sender, '', command, Java.to(args.split(" ").filter(e => e)))
+                return this.tabCompleter(sender, '', command, Java.to(args.split(" ")))
             },
             //boolean testPermission(CommandSource source)
             testPermission: () => {

packages/sponge/src/index.ts

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

packages/sponge/src/server.ts

@@ -35,10 +35,10 @@ export class SpongeServer extends server.ReflectServer {
         if (typeof sender === 'string') {
             sender = this.getPlayer(sender)
         }
-        return Sponge.getCommandManager().process(sender, command).getQueryResult().get() != 0
+        return Sponge.getCommandManager().process(sender, command).getSuccessCount().get() != 0
     }
     dispatchConsoleCommand(command: string): boolean {
-        return Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command).getQueryResult().get() != 0
+        return Sponge.getCommandManager().process(Sponge.getServer().getConsole(), command).getSuccessCount().get() != 0
     }
     getPluginsFolder(): string {
         return this.pluginsFolder
@@ -55,10 +55,4 @@ export class SpongeServer extends server.ReflectServer {
     getRootLogger() {
         return this.rootLogger
     }
-    sendJson(sender: string | any, json: string): void {
-        if (typeof sender === "string") {
-            sender = this.getPlayer(sender)
-        }
-        sender.sendMessage(TextSerializers.JSON.deserialize(json))
-    }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/common": "^0.9.3",
-        "@ccms/container": "^0.9.3",
-        "@ccms/database": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/common": "^0.9.8",
+        "@ccms/container": "^0.9.8",
+        "@ccms/database": "^0.9.8"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,17 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/jdk": "^0.0.2",
-        "@javatypes/spring-beans": "^0.0.2",
-        "@javatypes/spring-core": "^0.0.2",
-        "@javatypes/spring-web": "^0.0.2",
-        "@javatypes/tomcat": "^0.0.2",
+        "@javatypes/jdk": "^0.0.3",
+        "@javatypes/spring-beans": "^0.0.3",
+        "@javatypes/spring-core": "^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.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.9.3",
-        "@ccms/container": "^0.9.3"
+        "@ccms/api": "^0.9.8",
+        "@ccms/container": "^0.9.8"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.9.3",
+    "version": "0.9.8",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.9.3",
-        "@javatypes/tomcat-websocket-api": "^0.0.2",
+        "@ccms/nashorn": "^0.9.8",
+        "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^4.0.3"
     }
 }