v0.20.0

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

.npmignore

@@ -1,3 +1,4 @@
+src
 test
 typings
 bundled

lerna.json

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

package.json

@@ -13,7 +13,8 @@
         "ug": "yarn upgrade-interactive --latest",
         "np": "./script/push.sh",
         "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
-        "lp": "lerna publish --registry https://registry.npmjs.org"
+        "lp": "lerna publish --registry https://registry.npmjs.org",
+        "lpb": "lerna publish --registry https://registry.npmjs.org --canary --pre-dist-tag beta"
     },
     "workspaces": [
         "packages/*"

packages/amqp/package.json

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

packages/api/package.json

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

packages/api/src/command.ts

@@ -44,12 +44,37 @@ export namespace command {
         protected setExecutor(plugin: plugin.Plugin, command: any, executor: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    return executor(sender, command, Java.from(args))
+                    let time = Date.now()
+                    let result = executor(sender, command, Java.from(args))
+                    let cost = Date.now() - time
+                    if (cost > global.ScriptSlowExecuteTime) {
+                        console.i18n("ms.api.command.execute.slow", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            cost
+                        })
+                    }
+                    return result
                 } catch (ex: any) {
-                    console.i18n("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
+                    console.i18n("ms.api.command.execute.error", {
+                        player: sender.name,
+                        plugin: plugin.description.name,
+                        command,
+                        args: Java.from(args).join(' '),
+                        ex
+                    })
                     console.ex(ex)
                     if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            ex
+                        }),
+                        ...console.stack(ex)])
                     }
                     return true
                 }
@@ -58,13 +83,42 @@ export namespace command {
         protected setTabCompleter(plugin: plugin.Plugin, command: any, tabCompleter: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
+                    let time = Date.now()
                     var token = args[args.length - 1]
                     var complete = tabCompleter(sender, command, Java.from(args)) || []
-                    return this.copyPartialMatches(complete, token)
+                    let result = this.copyPartialMatches(complete, token)
+                    let cost = Date.now() - time
+                    if (cost > global.ScriptSlowExecuteTime) {
+                        console.i18n("ms.api.command.tab.completer.slow", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            cost
+                        })
+                    }
+                    return result
                 } catch (ex: any) {
-                    console.i18n("ms.api.command.tab.completer.error", { player: 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", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                    if (sender.name != 'CONSOLE') {
+                        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/event.ts

@@ -100,7 +100,7 @@ export namespace event {
                         let time = Date.now()
                         exec(event)
                         let cost = Date.now() - time
-                        if (cost > 20) {
+                        if (cost > global.ScriptSlowExecuteTime) {
                             console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
                         }
                     }
@@ -133,7 +133,12 @@ export namespace event {
             // @ts-ignore
             let executor = exec.name || exec.executor || '[anonymous]'
             // noinspection JSUnusedGlobalSymbols
-            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel)
+            var listener = this.register(
+                eventCls,
+                this.execute(name, exec, eventCls),
+                priority,
+                ignoreCancel
+            )
             var listenerMap = this.listenerMap
             // add to cache Be used for close plugin to close event
             if (!listenerMap[name]) listenerMap[name] = []
@@ -141,11 +146,21 @@ export namespace event {
                 if (off['offed']) return
                 off['offed'] = true
                 this.unregister(eventCls, listener)
-                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: executor }))
+                console.debug(i18n.translate("ms.api.event.unregister", {
+                    name,
+                    event: this.class2Name(eventCls),
+                    exec: executor
+                }))
             }
             listenerMap[name].push(off)
             // noinspection JSUnresolvedVariable
-            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: executor }))
+            console.debug(i18n.translate("ms.api.event.register", {
+                name,
+                event: this.class2Name(eventCls),
+                exec: executor,
+                priority,
+                ignore: ignoreCancel
+            }))
             return off
         }
 

packages/api/src/plugin.ts

@@ -20,7 +20,7 @@ export namespace plugin {
     export abstract class PluginManager {
         abstract scan(folder: string): void
         abstract build(): void
-        abstract loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin
+        abstract loadFromFile(file: string, ext?: any): Plugin
         abstract load(...args: any[]): void
         abstract enable(...args: any[]): void
         abstract disable(...args: any[]): void

packages/api/src/server.ts

@@ -40,13 +40,13 @@ export namespace server {
         get(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
-        load(name: string): boolean {
+        enable(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
-        unload(name: string): boolean {
+        disable(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
-        reload(name: string): boolean {
+        reload(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
         delete(name: string): boolean {

packages/bukkit/package.json

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

packages/bukkit/src/channel.ts

@@ -1,7 +1,7 @@
 import { channel, plugin } from '@ccms/api'
 import { inject, provideSingleton } from '@ccms/container'
 
-const Bukkit = org.bukkit.Bukkit
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 const PluginMessageListener = Java.type("org.bukkit.plugin.messaging.PluginMessageListener")
 const Messenger = Bukkit.getMessenger()
 

packages/bukkit/src/chat.ts

@@ -1,9 +1,12 @@
 import { chat } from '@ccms/api'
 import { provideSingleton } from '@ccms/container'
-import bukkitChat from './enhance/chat'
+import bukkitChat from './internal/chat'
 
 @provideSingleton(chat.Chat)
 export class BukkitChat extends chat.Chat {
+    get handle(): any {
+        return bukkitChat
+    }
     sendJson(sender: any, json: string | object, type = 0) {
         bukkitChat.send(sender, typeof json === "string" ? json : JSON.stringify(json), type)
     }

packages/bukkit/src/command.ts

@@ -1,35 +1,38 @@
 import '@ccms/nashorn'
 
 import { command, plugin } from '@ccms/api'
-import * as reflect from '@ccms/common/dist/reflect'
 import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import * as reflect from '@ccms/common/dist/reflect'
 
-let Bukkit = org.bukkit.Bukkit
-let TabCompleter = Java.type('org.bukkit.command.TabCompleter')
-let PluginCommand = Java.type('org.bukkit.command.PluginCommand')
-let CommandExecutor = Java.type('org.bukkit.command.CommandExecutor')
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
+const TabCompleter = Java.type('org.bukkit.command.TabCompleter')
+const PluginCommand = Java.type('org.bukkit.command.PluginCommand')
+const CommandExecutor = Java.type('org.bukkit.command.CommandExecutor')
 
 @provideSingleton(command.Command)
 export class BukkitCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
     private commandMap: any
+    private knownCommands: any
 
     @postConstruct()
     init() {
         this.commandMap = reflect.on(Bukkit.getPluginManager()).get('commandMap').get()
+        this.knownCommands = reflect.on(this.commandMap).get('knownCommands').get()
     }
     create(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
-        if (cmd && cmd instanceof PluginCommand) { return cmd };
+        if (cmd instanceof PluginCommand) { return cmd };
         cmd = reflect.on(PluginCommand).create(command, this.pluginInstance).get()
         this.commandMap.register(plugin.description.name, cmd)
         return cmd
     }
     remove(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
-        if (cmd && cmd instanceof PluginCommand) {
+        if (cmd instanceof PluginCommand) {
             cmd.unregister(this.commandMap)
+            this.knownCommands.remove(command)
         }
     }
     tabComplete(sender: any, input: string, index?: number): string[] {

packages/bukkit/src/console.ts

@@ -1,20 +1,20 @@
 import { MiaoScriptConsole } from '@ccms/api'
 
-let Bukkit = org.bukkit.Bukkit;
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 
 export class BukkitConsole extends MiaoScriptConsole {
     sender(sender, ...args) {
         if (!(sender instanceof Java.type('org.bukkit.command.CommandSender'))) {
             this.error(`First parameter ${sender} not instanceof org.bukkit.command.CommandSender can't send message!`)
-            return;
+            return
         }
         if (Object.prototype.toString.call(args[0]) === "[object Array]") {
             args[0].forEach(line => sender.sendMessage(this.prefix + line))
         } else {
-            sender.sendMessage(this.prefix + args.join(' '));
+            sender.sendMessage(this.prefix + args.join(' '))
         }
     }
     console(...args: string[]): void {
-        this.sender(Bukkit.getConsoleSender(), args.join(' '));
+        this.sender(Bukkit.getConsoleSender(), args.join(' '))
     }
 }

packages/bukkit/src/event.ts

@@ -1,13 +1,13 @@
 import { event, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container';
+import { inject, provideSingleton } from '@ccms/container'
 import * as reflect from '@ccms/common/dist/reflect'
 
-const Bukkit = Java.type("org.bukkit.Bukkit");
-const Event = Java.type("org.bukkit.event.Event");
-const Modifier = Java.type("java.lang.reflect.Modifier");
-const Listener = Java.type("org.bukkit.event.Listener");
-const EventPriority = Java.type("org.bukkit.event.EventPriority");
-const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor");
+const Bukkit = Java.type("org.bukkit.Bukkit")
+const Event = Java.type("org.bukkit.event.Event")
+const Modifier = Java.type("java.lang.reflect.Modifier")
+const Listener = Java.type("org.bukkit.event.Listener")
+const EventPriority = Java.type("org.bukkit.event.EventPriority")
+const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor")
 
 @provideSingleton(event.Event)
 export class BukkitEvent extends event.Event {
@@ -15,7 +15,7 @@ export class BukkitEvent extends event.Event {
     private pluginInstance: any
 
     constructor() {
-        super('org/bukkit/event');
+        super('org/bukkit/event')
     }
 
     getJarFile(resource: string) {
@@ -27,10 +27,10 @@ export class BukkitEvent extends event.Event {
             // 访问符为Public
             Modifier.isPublic(clazz.getModifiers()) &&
             // 不是抽象类
-            !Modifier.isAbstract(clazz.getModifiers());
+            !Modifier.isAbstract(clazz.getModifiers())
     }
     register(eventCls: any, exec: Function, priority: event.EventPriority, ignoreCancel: boolean) {
-        let listener = new Listener({});
+        let listener = new Listener({})
         Bukkit.pluginManager.registerEvent(
             eventCls,
             listener,
@@ -39,10 +39,10 @@ export class BukkitEvent extends event.Event {
                 execute: exec
             }),
             this.pluginInstance,
-            ignoreCancel);
-        return listener;
+            ignoreCancel)
+        return listener
     }
     unregister(event: any, listener: any): void {
-        reflect.on(event).call('getHandlerList').get().unregister(listener);
+        reflect.on(event).call('getHandlerList').get().unregister(listener)
     }
 }

packages/bukkit/src/internal/chat.ts

@@ -29,17 +29,16 @@ abstract class BukkitChatInvoke {
             this.ChatSerializer = Java.type(nmsChatSerializerClass.getName())
             let packetTypeClass = this.getPacketPlayOutChatClass()
             this.PacketPlayOutChat = Java.type(packetTypeClass.getName())
-            let packetTypeConstructor: { parameterTypes: any[] }
             let constructors = packetTypeClass.constructors
-            Java.from(constructors).forEach(function (c) {
-                if (c.parameterTypes.length === 2 || c.parameterTypes.length === 3) {
-                    packetTypeConstructor = c
+            for (const constructor of Java.from(constructors)) {
+                let parameterTypes = constructor.parameterTypes
+                if (parameterTypes.length === 2 || parameterTypes.length === 3) {
+                    let nmsChatMessageTypeClass = parameterTypes[1]
+                    if (nmsChatMessageTypeClass.isEnum()) {
+                        this.chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
+                        break
+                    }
                 }
-            })
-            let parameterTypes = packetTypeConstructor.parameterTypes
-            let nmsChatMessageTypeClass = parameterTypes[1]
-            if (nmsChatMessageTypeClass.isEnum()) {
-                this.chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
             }
             let playerConnectionField = this.getPlayerConnectionField()
             this.playerConnectionFieldName = playerConnectionField.getName()
@@ -151,8 +150,9 @@ class BukkitChatInvoke_1_17_1 extends BukkitChatInvoke_1_16_5 {
 }
 
 try {
-    //@ts-ignore
-    let nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3]
+    let Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
+    // @ts-ignore
+    let nmsVersion = Bukkit.getServer().class.name.split('.')[3]
     let nmsSubVersion = nmsVersion.split("_")[1]
     if (nmsSubVersion >= 8) {
         bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
@@ -168,6 +168,7 @@ try {
 }
 
 let chat = {
+    invoke: bukkitChatInvoke,
     json: bukkitChatInvoke.json.bind(bukkitChatInvoke),
     send: bukkitChatInvoke.send.bind(bukkitChatInvoke)
 }

packages/bukkit/src/particle.ts

@@ -1,5 +1,5 @@
 import { provideSingleton } from '@ccms/container'
-import { particle, plugin } from '@ccms/api'
+import { particle } from '@ccms/api'
 
 @provideSingleton(particle.ParticleManager)
 export class BukkitParticleManager extends particle.ParticleManager {

packages/bukkit/src/plugin.ts

@@ -19,6 +19,22 @@ export class BukkitNativePluginManager extends server.NativePluginManager {
     get(name: string): server.NativePlugin {
         return this.convert(this.bukkitPluginManager.getPlugin(name))
     }
+    enable(name: string): server.NativePlugin {
+        let origin = this.bukkitPluginManager.getPlugin(name)
+        if (!origin) { throw new Error(`Native Plugin ${name} not found.`) }
+        if (!origin.isEnabled()) {
+            this.bukkitPluginManager.enablePlugin(origin)
+        }
+        return this.convert(origin)
+    }
+    disable(name: string): server.NativePlugin {
+        let origin = this.bukkitPluginManager.getPlugin(name)
+        if (!origin) { throw new Error(`Native Plugin ${name} not found.`) }
+        if (origin.isEnabled()) {
+            this.bukkitPluginManager.disablePlugin(origin)
+        }
+        return this.convert(origin)
+    }
 
     private convert(plugin: org.bukkit.plugin.Plugin): server.NativePlugin {
         if (!plugin) return plugin as any

packages/bukkit/src/server.ts

@@ -1,10 +1,9 @@
-import { server, constants } from '@ccms/api'
+import { server } from '@ccms/api'
 import { provideSingleton } from '@ccms/container'
 
 import * as reflect from '@ccms/common/dist/reflect'
-import chat from './enhance/chat'
 
-let Bukkit: typeof org.bukkit.Bukkit = org.bukkit.Bukkit
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 
 @provideSingleton(server.Server)
 export class BukkitServer extends server.ReflectServer {

packages/bukkit/src/task.ts

@@ -1,5 +1,5 @@
 import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container'
+import { provideSingleton } from '@ccms/container'
 
 const Bukkit = Java.type('org.bukkit.Bukkit')
 const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable')

packages/bungee/package.json

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

packages/client/package.json

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

packages/common/package.json

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

packages/compile/package.json

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

packages/container/package.json

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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.18.0",
+    "version": "0.20.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,8 +24,8 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.18.0",
-        "@ccms/container": "^0.18.0"
+        "@ccms/api": "^0.20.0",
+        "@ccms/container": "^0.20.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -17,17 +17,22 @@ class MiaoScriptCore {
     private pluginManager: plugin.PluginManager
 
     enable() {
+        process.emit('core.before.enable')
         this.loadServerConsole()
         this.loadPlugins()
+        process.emit('core.after.enable')
         return () => this.disable()
     }
 
     loadServerConsole() {
+        process.emit('core.before.load.console')
         //@ts-ignore
         global.setGlobal('console', new this.Console(), { writable: false, configurable: false })
+        process.emit('core.after.load.console')
     }
 
     loadPlugins() {
+        process.emit('core.before.load.plugins')
         let loadPluginStartTime = new Date().getTime()
         console.i18n("ms.core.plugin.initialize")
         this.pluginManager.scan(this.pluginFolder)
@@ -35,15 +40,25 @@ class MiaoScriptCore {
         this.pluginManager.load(this.pluginManager.getPlugins())
         this.pluginManager.enable(this.pluginManager.getPlugins())
         console.i18n("ms.core.plugin.completed", { time: (new Date().getTime() - loadPluginStartTime) / 1000 })
+        process.emit('core.after.load.plugins')
     }
 
     disable() {
+        process.emit('core.before.disable')
         let disableStartTime = Date.now()
         console.i18n("ms.core.engine.disable")
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
+        process.emit('core.after.disable')
+        loadCoreScript('exit')
+        process.emit('core.before.exit')
         process.exit(0)
-        console.i18n("ms.core.engine.disable.finish", { version: 'v' + global.ScriptEngineVersion, time: (new Date().getTime() - disableStartTime) / 1000 })
+        console.i18n("ms.core.engine.disable.finish", {
+            loader: base.version,
+            version: 'v' + global.ScriptEngineVersion,
+            time: (new Date().getTime() - disableStartTime) / 1000
+        })
+        process.emit('core.after.exit')
     }
 }
 
@@ -76,30 +91,64 @@ function detectServer(): constants.ServerType {
     throw Error('Unknow Server Type...')
 }
 
+function loadCoreScript(name) {
+    try {
+        let scriptname = name + (global.debug ? '-debug' : '')
+        engineLoad({
+            script: http.get(`https://ms.yumc.pw/api/plugin/download/name/${scriptname}`),
+            name: `core/${scriptname}.js`
+        })
+    } catch (error: any) {
+        if (global.debug) {
+            console.debug(error)
+            console.ex(error)
+        }
+    }
+}
+
 function initialize() {
+    process.emit('core.before.initialize')
+    global.ScriptSlowExecuteTime = 50
     global.ScriptEngineVersion = require('../package.json').version
-    try { engineLoad({ script: http.get("http://ms.yumc.pw/api/plugin/download/name/initialize"), name: 'core/initialize.js' }) } catch (error: any) { console.debug(error) }
+    global.setGlobal('loadCoreScript', loadCoreScript)
+    loadCoreScript('initialize')
     try {
         let corePackageStartTime = new Date().getTime()
         container.bind(ContainerInstance).toConstantValue(container)
         container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
         container.bind(plugin.PluginFolder).toConstantValue('plugins')
         let type = detectServer()
+
+        process.emit('core.before.initialize.detect')
         console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
         container.bind(server.ServerType).toConstantValue(type)
         container.bind(server.ServerChecker).toSelf().inSingletonScope()
         container.bind(server.NativePluginManager).toSelf().inSingletonScope()
+        process.emit('core.after.initialize.detect')
+
+        process.emit('core.before.package.initialize')
         console.i18n("ms.core.package.initialize", { scope: global.scope, type })
         require(`${global.scope}/${type}`).default(container)
         require(`${global.scope}/plugin`)
         container.load(buildProviderModule())
         console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
+        process.emit('core.after.package.initialize')
+
         let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-        console.i18n("ms.core.engine.completed", { version: 'v' + global.ScriptEngineVersion, time: (Date.now() - global.ScriptEngineStartTime) / 1000 })
+        console.i18n("ms.core.engine.completed", {
+            loader: base.version,
+            version: 'v' + global.ScriptEngineVersion,
+            time: (Date.now() - global.ScriptEngineStartTime) / 1000
+        })
+        process.emit('core.after.initialize')
         return disable
     } catch (error: any) {
-        console.i18n("ms.core.initialize.error", { error })
-        console.ex(error)
+        if (console.console) {
+            console.i18n("ms.core.initialize.error", { error })
+            console.ex(error)
+        } else {
+            error.printStackTrace()
+        }
         return () => console.i18n('ms.core.engine.disable.abnormal')
     }
 }

packages/core/src/initialize.js

@@ -1,38 +0,0 @@
-function initialize() {
-    var mspmc = 'http://ms.yumc.pw/api/plugin/download/name/'
-
-    var http = require('@ccms/common/dist/http').default
-    var fs = require('@ccms/common/dist/fs')
-
-    var pluginFolder = fs.concat(root, 'plugins')
-    var updateFolder = fs.concat(pluginFolder, 'update')
-    var pluginFile = fs.concat(pluginFolder, 'MiaoScriptPackageManager.js')
-    if (!fs.exists(pluginFile)) {
-        fs.mkdirs(pluginFile)
-        base.save(fs.concat(updateFolder, 'MiaoScriptPackageManager.auto.install'), '.')
-    }
-    fs.list(updateFolder).forEach(function (path) {
-        var file = path.toFile()
-        if (file.exists()) {
-            var filename = file.getName()
-            if (filename.endsWith(".auto.install")) {
-                var pluginName = filename.replace('.auto.install', '')
-                var pluginFile = fs.concat(pluginFolder, pluginName + '.js')
-                if (!fs.exists(pluginFile)) {
-                    var pluginTemp = pluginFile + '.tmp'
-                    http.download(mspmc + pluginName, pluginTemp)
-                    fs.move(pluginTemp, pluginFile, true)
-                }
-                base.delete(file)
-            }
-        }
-    })
-    var core = http.get('https://registry.npmmirror.com/@ccms/core')
-    if (base.VERSION && global.ScriptEngineVersion != core['dist-tags']['latest']) {
-        var Paths = Java.type('java.nio.file.Paths')
-        base.save(Paths.get(root, "upgrade"), core['dist-tags']['latest'])
-        console.info('@ccms/core found new version ' + core['dist-tags']['latest'] + ' will upgrade after reboot!')
-    }
-    console.debug('initialize finish!')
-}
-initialize()

packages/database/package.json

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

packages/i18n/languages/en.yml

@@ -12,6 +12,7 @@ ms.core.plugin.initialize: "Initialization MiaoScript Plugin System. Please wait
 ms.core.plugin.completed: "MiaoScript Plugin System loading completed({time}s)!"
 ms.core.engine.completed: "MiaoScript ScriptEngine loading completed... Done({time}s)!"
 ms.core.engine.disable: "Disable MiaoScript Engine..."
+ms.core.engine.disable.finish: "MiaoScript framework {loader} engine {version} 关闭完成... 耗时({time}s)!"
 ms.core.engine.disable.abnormal: "abnormal Initialization MiaoScript Engine. Skip disable step..."
 
 ms.api.event.resource.not.found: "Can't Mapping Event Because not found Resources {resource}!"
@@ -21,16 +22,20 @@ ms.api.event.not.found: "§6Plugin §b{name} §6register {event} error. event no
 ms.api.event.execute.slow: "§cWARN! §6Plugin §b{name} §6execute §d{event} §6evnet §ccost §4{cost}ms !"
 ms.api.event.execute.error: "§6Plugin §b{name} §6execute §d{event} §6event error §4{ex}"
 ms.api.event.listen.plugin.name.empty: "Plugin name can't be empty!"
-ms.api.event.register: "[{name}] register event {event}"
+ms.api.event.register: "[{name}] register event {event} priority {priority} ignoreCancelled {ignore}"
 ms.api.event.unregister: "[{name}] unregister event {event}"
+
 ms.api.command.register.input.error: "CommandExec Must be a function... Input: {exec}"
 ms.api.command.register: "[{plugin}] register command {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] unregister command {name}..."
+ms.api.command.execute.slow: "§cWarn. §6Player §a{player} §6exec §b{plugin} §6Plugin §d{command} {args} §6Command §cCost §4{cost}ms !"
 ms.api.command.execute.error: "§6Player {player} §6exec §b{plugin} §6Plugin Command §d{command} {args} §6error §4{ex}"
+ms.api.command.tab.completer.slow: "§cWarn. §6Player §a{player} §6exec §b{plugin} §6Plugin §d{command} {args} §6TabComplete §cCost §4{cost}ms !"
 ms.api.command.tab.completer.error: "§6Player {player} §6exec §b{plugin} §6Plugin TabComplete §d{command} {args} §6error §4{ex}"
 
 ms.plugin.initialize: "Initialization MiaoScript Plugin System: Plugin: {plugin} Loader: {loader}..."
 ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."
+ms.plugin.event.map.error: "Mapping {type} Event Failed. Error: {error}"
 ms.plugin.manager.scan: "Scanner {scanner} Scanning Plugins in {folder} ..."
 ms.plugin.manager.scan.finish: "Scanner {scanner} Found {size} Plugins in {folder} Start Build..."
 ms.plugin.manager.initialize.error: "§6Plugin §b{name} §6initialize error §4{ex}"

packages/i18n/languages/zh_cn.yml

@@ -10,9 +10,9 @@ ms.core.package.initialize: "初始化 MiaoScript 扩展 {scope}/core {scope}/{t
 ms.core.package.completed: "MiaoScript 扩展 {scope}/core {scope}/{type} {scope}/plugin 加载完成 耗时({time}s)"
 ms.core.plugin.initialize: "MiaoScript 开始引导插件系统. 请稍候..."
 ms.core.plugin.completed: "MiaoScript 插件加载完毕 耗时({time}s)!"
-ms.core.engine.completed: "MiaoScript 脚本引擎 {version} 加载完毕... 耗时({time}s)!"
+ms.core.engine.completed: "MiaoScript 框架 {loader} 引擎 {version} 加载完毕... 耗时({time}s)!"
 ms.core.engine.disable: "MiaoScript 关闭脚本引擎 请稍候..."
-ms.core.engine.disable.finish: "MiaoScript 脚本引擎 {version} 关闭完成... 耗时({time}s)!"
+ms.core.engine.disable.finish: "MiaoScript 框架 {loader} 引擎 {version} 关闭完成... 耗时({time}s)!"
 ms.core.engine.disable.abnormal: "引擎异常启动或初始化未完成 跳过关闭流程..."
 
 ms.api.event.resource.not.found: "无法映射事件 未找到资源文件 {resource}!"
@@ -22,16 +22,20 @@ ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失
 ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
 ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
 ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
-ms.api.event.register: "[{name}] 注册事件 {event} => 执行器 {exec}"
+ms.api.event.register: "[{name}] 注册事件 {event} => 执行器 {exec} 优先级 {priority} 忽略取消 {ignore}"
 ms.api.event.unregister: "[{name}] 注销事件 {event} => 执行器 {exec}"
+
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."
+ms.api.command.execute.slow: "§c注意! §6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6命令 §c耗时 §4{cost}ms !"
 ms.api.command.execute.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6命令时发生异常 §4{ex}"
+ms.api.command.tab.completer.slow: "§c注意! §6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全 §c耗时 §4{cost}ms !"
 ms.api.command.tab.completer.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全时发生异常 §4{ex}"
 
 ms.plugin.initialize: "初始化 MiaoScript 插件系统: 实例: {plugin} 加载器: {loader}..."
 ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
+ms.plugin.event.map.error: "映射 {type} 事件 异常 将无法使用事件简称. Error: {error}"
 ms.plugin.manager.scan: "扫描器 {scanner} 扫描 {folder} 中的插件..."
 ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始构建..."
 ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"

packages/i18n/package.json

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

packages/keyvalue/package.json

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

packages/molang/package.json

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

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.18.0",
+    "version": "0.20.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",

packages/nashorn/src/index.ts

@@ -50,6 +50,7 @@ declare global {
             debug: boolean
             level: string
             ScriptEngineVersion: string
+            ScriptSlowExecuteTime: number
             ScriptEngineStartTime: number
             setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void
             noop: () => void
@@ -65,6 +66,7 @@ declare global {
     const ScriptEngineContextHolder: any
     function engineLoad(str: string | { script: string, name: string }): any
     interface Core {
+        version: string
         getClass(name: String): any
         getProxyClass(): any
         getJavaScriptTaskClass(): any

packages/nodejs/package.json

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

packages/nukkit/package.json

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

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.18.0",
+    "version": "0.20.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
+        "@types/crypto-js": "^4.1.1",
         "@types/js-yaml": "^4.0.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.18.0",
-        "@ccms/common": "^0.18.0",
-        "@ccms/container": "^0.18.0",
-        "@ccms/i18n": "^0.18.0",
-        "js-yaml": "^4.1.0",
-        "yaml": "^1.10.2"
+        "@ccms/api": "^0.20.0",
+        "@ccms/common": "^0.20.0",
+        "@ccms/container": "^0.20.0",
+        "@ccms/i18n": "^0.20.0",
+        "crypto-js": "^4.1.1",
+        "js-yaml": "^4.1.0"
     }
 }

packages/plugin/src/command.ts

@@ -35,7 +35,15 @@ export class PluginCommandManager {
 
     private unregistryCommand(pluginInstance: plugin.Plugin) {
         let cmds = getPluginCommandMetadata(pluginInstance)
-        cmds.forEach(cmd => this.CommandManager.off(pluginInstance, cmd.name))
+        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.off(pluginInstance, command)
+            }
+        }
     }
 
     private generateAutoMainCommand(pluginInstance: plugin.Plugin, cmd: interfaces.CommandMetadata, tab: interfaces.CommandMetadata) {
@@ -46,17 +54,47 @@ export class PluginCommandManager {
             cmdExecutor = (sender: any, command: string, args: string[]) => {
                 let subcommand = args[0]
                 let cmdKey = 'cmd' + subcommand
-                if (pluginInstance[cmdKey]) {
-                    args.shift()
-                    return pluginInstance[cmdKey].apply(pluginInstance, [sender, ...args])
-                } else if (pluginInstance['cmdmain']) {
-                    return pluginInstance['cmdmain'].apply(pluginInstance, [sender, ...args])
+                if (!cmdSubCache.includes(subcommand)) {
+                    if (!pluginInstance[cmd.executor].apply(pluginInstance, [sender, command, args])) {
+                        subcommand && pluginInstance.logger.sender(sender, '§4未知的子命令: §c' + subcommand)
+                        pluginInstance.logger.sender(
+                            sender,
+                            pluginInstance['cmdhelp'] ?
+                                `§6请执行 §b/${command} §ahelp §6查看帮助!` :
+                                [
+                                    `§6插件: §b${pluginInstance.description.name}`,
+                                    `§6版本: §a${pluginInstance.description.version}`
+                                ]
+                        )
+                    }
+                    return
                 }
-                pluginInstance.logger.sender(sender, '§4未知的子命令: §c' + subcommand)
-                pluginInstance['cmdhelp'] && pluginInstance.logger.sender(sender, `§6请执行 §b/${command} §ahelp §6查看帮助!`)
+                let subcommandexec = pluginInstance[cmdKey]
+                let permission: string
+                if (cmd.permission && sender.hasPermission) {
+                    if (typeof cmd.permission == "string") {
+                        permission = cmd.permission as string
+                    } else {
+                        permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}.${subcommand || 'main'}`
+                    }
+                    if (!sender.hasPermission(permission)) {
+                        return pluginInstance.logger.sender(sender, `§c你需要 ${permission} 权限 才可执行此命令.`)
+                    }
+                }
+                args.shift()
+                return subcommandexec.apply(pluginInstance, [sender, ...args])
             }
             let originCompleter = cmdCompleter
             cmdCompleter = (sender: any, command: string, args: string[]) => {
+                let permission: string
+                if (cmd.permission && sender.hasPermission) {
+                    if (typeof cmd.permission == "string") {
+                        permission = cmd.permission as string
+                    } else {
+                        permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}`
+                    }
+                    if (!sender.hasPermission(permission)) { return [] }
+                }
                 return (args.length == 1 ? cmdSubCache : []).concat(originCompleter?.apply(pluginInstance, [sender, command, args]) || [])
             }
         }

packages/plugin/src/config.ts

@@ -1,59 +1,36 @@
-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 { Autowired, Container, ContainerInstance, postConstruct, provideSingleton } from '@ccms/container'
+
+import * as fs from '@ccms/common/dist/fs'
 
 import { interfaces } from './interfaces'
 import { getPluginConfigMetadata } from './utils'
 
-export interface PluginConfigLoader {
-    load(content: string): any
-    dump(variable: any): string
-}
-
-export class YamlPluginConfig implements PluginConfigLoader {
-    load(content: string) {
-        return yaml.load(content)
-    }
-    dump(variable: any): string {
-        return yaml.dump(variable, { skipInvalid: true, lineWidth: 120 })
-    }
-}
-
-export class JsonPluginConfig implements PluginConfigLoader {
-    load(content: string) {
-        return JSON.parse(content)
-    }
-    dump(variable: any): string {
-        return JSON.stringify(variable, undefined, 4)
-    }
-}
-
-export interface PluginConfig {
-    /**
-     * Save Config to File
-     */
-    readonly save?: () => void
-    /**
-     * Reload Config from File
-     */
-    readonly reload?: () => void
-    [key: string]: any
-}
+import { PluginConfigLoader } from './config/interfaces'
+import './config/loader/json-loader'
+import './config/loader/yaml-loader'
 
 @provideSingleton(PluginConfigManager)
 export class PluginConfigManager {
+    @Autowired(ContainerInstance)
+    private container: Container
+
     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))
     }
 
+    @postConstruct()
+    initialize() {
+        let configLoader = this.container.getAll<PluginConfigLoader>(PluginConfigLoader)
+        configLoader.forEach((scanner) => {
+            console.debug(`loading config loader ${scanner.type}...`)
+            this.configLoaderMap.set(scanner.type, scanner)
+        })
+    }
+
     getConfigLoader(format: string) {
         if (!this.configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
         return this.configLoaderMap.get(format)
@@ -73,12 +50,19 @@ export class PluginConfigManager {
         }
     }
 
-    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
+    createConfig(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 })
+        return value
+    }
+
+    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
+        Object.defineProperty(plugin, metadata.variable, {
+            value: this.createConfig(plugin, metadata, value),
+            configurable: true
+        })
     }
 
     private loadConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
@@ -86,37 +70,50 @@ export class PluginConfigManager {
             let defaultValue = metadata.default ?? plugin[metadata.variable]
             let configValue = defaultValue || {}
             if (defaultValue) {
-                metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)
+                metadata.file = fs.concat(
+                    fs.file(plugin.description.loadMetadata.file).parent,
+                    plugin.description.name,
+                    metadata.filename
+                )
                 let configLoader = this.getConfigLoader(metadata.format)
                 if (!fs.exists(metadata.file)) {
                     base.save(metadata.file, configLoader.dump(defaultValue))
-                    console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: metadata.name, format: metadata.format })
+                    console.i18n("ms.plugin.manager.config.save.default", {
+                        plugin: plugin.description.name,
+                        name: metadata.name,
+                        format: metadata.format
+                    })
                 } else {
                     configValue = configLoader.load(base.read(metadata.file)) || {}
-                    if (defaultValue && this.setDefaultValue(configValue, defaultValue)) {
+                    if (defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
                         base.save(metadata.file, configLoader.dump(configValue))
                     }
-                    console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>\n${JSON.stringify(configValue, undefined, 4).substr(0, 500)}`)
+                    console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>
+${JSON.stringify(configValue, undefined, 4).substring(0, 500)}`)
                 }
             }
             this.defienConfigProp(plugin, metadata, configValue)
         } catch (error: any) {
-            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.format, error })
+            console.i18n("ms.plugin.manager.config.load.error", {
+                plugin: plugin.description.name,
+                name: metadata.name,
+                format: metadata.format,
+                error
+            })
             console.ex(error)
         }
     }
 
-    private setDefaultValue(configValue, defaultValue) {
+    private setDefaultValue(configValue, defaultValue, deepCopy) {
         let needSave = false
         for (const key of Object.keys(defaultValue)) {
             // 当配置文件不存在当前属性时才进行赋值
-            if (!Object.prototype.hasOwnProperty.call(configValue, key) && key != '____deep_copy____') {
+            if (!Object.prototype.hasOwnProperty.call(configValue, key)) {
                 configValue[key] = defaultValue[key]
                 needSave = true
-            } else if (Object.prototype.toString.call(configValue[key]) == "[object Object]"
-                && Object.prototype.hasOwnProperty.call(defaultValue[key], '____deep_copy____')) {
-                // 对象需要递归检测 如果对象内存在 ____deep_copy____ 那就忽略设置
-                needSave ||= this.setDefaultValue(configValue[key], defaultValue[key])
+            } else if (Object.prototype.toString.call(configValue[key]) == "[object Object]" && deepCopy) {
+                // 对象需要递归检测
+                needSave ||= this.setDefaultValue(configValue[key], defaultValue[key], deepCopy)
             }
         }
         return needSave
@@ -127,10 +124,16 @@ export class PluginConfigManager {
             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.substr(0, 500)}`)
+            console.debug(`[${plugin.description.name}] Save Config ${metadata.variable} to file ${metadata.file} =>
+${result.substring(0, 500)}`)
             return true
         } catch (error: any) {
-            console.i18n("ms.plugin.manager.config.save.error", { plugin: plugin.description.name, name: metadata.name, format: metadata.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
         }

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

@@ -0,0 +1,65 @@
+import * as fs from '@ccms/common/dist/fs'
+
+import { PluginConfig, PluginConfigLoader } from './interfaces'
+
+export class PluginFileConfig implements PluginConfig {
+    private loader: PluginConfigLoader
+    private file: string
+    constructor(loader: PluginConfigLoader, file: string, def = {}) {
+        this.loader = loader
+        this.file = file
+        if (fs.exists(file)) {
+            this.reload()
+        } else {
+            Object.assign(this, def)
+        }
+        this.initialize()
+    }
+
+    initialize() {
+    }
+
+    save() {
+        base.save(this.file, this.loader.dump(this))
+    }
+
+    reload() {
+        Object.assign(this, this.loader.load(base.read(this.file)))
+    }
+}
+
+export class PluginConfigFolder {
+    private loader: PluginConfigLoader
+    private folder: string
+
+    private configCache = new Map<string, PluginFileConfig>()
+
+    constructor(loader: PluginConfigLoader, folder: string) {
+        this.loader = loader
+        this.folder = folder
+    }
+
+    createConfig(path: string, def = {}) {
+        return new PluginFileConfig(this.loader, path, def)
+    }
+
+    getConfig(name: string, def = {}) {
+        let path = fs.concat(this.folder, name)
+        if (!this.configCache.has(path)) {
+            this.configCache.set(path, this.createConfig(path, def))
+        }
+        return this.configCache.get(path)
+    }
+
+    clear() {
+        this.configCache.clear()
+    }
+
+    save() {
+        this.configCache.forEach((config) => config.save())
+    }
+
+    reload() {
+        this.configCache.forEach((config) => config.reload())
+    }
+}

packages/plugin/src/config/interfaces.ts

@@ -0,0 +1,18 @@
+export const PluginConfigLoader = Symbol.for('PluginConfigLoader')
+export interface PluginConfigLoader {
+    type: string
+    load(content: string): any
+    dump(variable: any): string
+}
+
+export interface PluginConfig {
+    /**
+     * Save Config to File
+     */
+    readonly save?: () => void
+    /**
+     * Reload Config from File
+     */
+    readonly reload?: () => void
+    [key: string]: any
+}

packages/plugin/src/config/loader/json-loader.ts

@@ -0,0 +1,18 @@
+import { provideSingletonNamed } from '@ccms/container'
+
+import { PluginConfigLoader } from '../interfaces'
+
+const LOADER_TYPE_NAME = 'json'
+
+@provideSingletonNamed(PluginConfigLoader, LOADER_TYPE_NAME)
+export class JsonPluginConfig implements PluginConfigLoader {
+    type: string = LOADER_TYPE_NAME
+
+    load(content: string) {
+        return JSON.parse(content)
+    }
+
+    dump(variable: any): string {
+        return JSON.stringify(variable, undefined, 4)
+    }
+}

packages/plugin/src/config/loader/yaml-loader.ts

@@ -0,0 +1,19 @@
+import * as yaml from 'js-yaml'
+import { provideSingletonNamed } from '@ccms/container'
+
+import { PluginConfigLoader } from '../interfaces'
+
+const LOADER_TYPE_NAME = 'yml'
+
+@provideSingletonNamed(PluginConfigLoader, LOADER_TYPE_NAME)
+export class YamlPluginConfig implements PluginConfigLoader {
+    type: string = LOADER_TYPE_NAME
+
+    load(content: string) {
+        return yaml.load(content)
+    }
+
+    dump(variable: any): string {
+        return yaml.dump(variable, { skipInvalid: true, lineWidth: 120 })
+    }
+}

packages/plugin/src/constants.ts

@@ -5,6 +5,7 @@ export const METADATA_KEY = {
     tab: Symbol.for("@ccms/plugin:tab"),
     listener: Symbol.for("@ccms/plugin:listener"),
     config: Symbol.for("@ccms/plugin:config"),
+    playerdata: Symbol.for("@ccms/plugin:playerdata"),
     stage: {
         load: Symbol.for("@ccms/plugin:stage:load"),
         enable: Symbol.for("@ccms/plugin:stage:enable"),

packages/plugin/src/decorators.ts

@@ -2,7 +2,7 @@ import { plugin as pluginApi } from "@ccms/api"
 import { injectable, decorate } from "@ccms/container"
 import { interfaces } from './interfaces'
 import { METADATA_KEY } from './constants'
-import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPluginTabCompleterMetadata, getPluginConfigMetadata, getPluginStageMetadata, getPluginSources } from './utils'
+import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPluginTabCompleterMetadata, getPluginConfigMetadata, getPluginStageMetadata, getPluginSources, getPluginPlayerDataMetadata } from './utils'
 
 /**
  * MiaoScript plugin
@@ -84,6 +84,21 @@ export function config(metadata: interfaces.ConfigMetadata = {}) {
     }
 }
 
+export function playerdata(metadata: interfaces.PlayerDataMetadata = {}) {
+    return function (target: any, key: string) {
+        metadata.name = metadata.name || key
+        metadata.variable = key
+        metadata.version = metadata.version ?? 1
+        metadata.format = metadata.format ?? 'yml'
+        metadata.autosave = metadata.autosave ?? false
+        metadata.filename = metadata.filename ?? "username"
+        metadata.dir = metadata.dir ?? "playerdata"
+        let previousMetadata = getPluginPlayerDataMetadata(target)
+        previousMetadata.set(metadata.name, metadata)
+        Reflect.defineMetadata(METADATA_KEY.playerdata, previousMetadata, target.constructor)
+    }
+}
+
 function stage(stage: string) {
     return (metadata: interfaces.ExecMetadata = {}) => {
         return function (target: any, key: string, value: any) {

packages/plugin/src/index.ts

@@ -1,4 +1,6 @@
-import './scanner/file-scanner'
+import './scanner/ms-scanner'
+import './scanner/js-scanner'
+
 import './loader/ioc-loader'
 import './loader/basic-loader'
 
@@ -12,5 +14,6 @@ export {
     cmd as Cmd,
     tab as Tab,
     listener as Listener,
-    config as Config
+    config as Config,
+    playerdata as PlayerData
 } from './decorators'

packages/plugin/src/interfaces.ts

@@ -59,6 +59,10 @@ export namespace interfaces {
          * 自动化主命令
          */
         autoMain?: boolean
+        /**
+         * 子命令权限效验
+         */
+        permission?: boolean | string
     }
     export interface ListenerMetadata extends ExecMetadata {
         /**
@@ -100,4 +104,38 @@ export namespace interfaces {
          */
         file?: any
     }
+    export interface PlayerDataMetadata extends plugin.BaseMetadata {
+        /**
+         * 配置文件版本号
+         */
+        version?: number
+        /**
+         * 默认配置
+         */
+        default?: any
+        /**
+         * 实体变量名称
+         */
+        variable?: string
+        /**
+         * 配置文件格式 默认 yml
+         */
+        format?: string
+        /**
+         * 自动保存 默认为 false
+         */
+        autosave?: boolean
+        /**
+         * 配置文件名称 默认玩家名称
+         */
+        filename?: "username" | "uuid"
+        /**
+         * 配置文件目录 默认 playerdata
+         */
+        dir?: string
+        /**
+         * 配置文件子目录 默认为空
+         */
+        subdir?: string
+    }
 }

packages/plugin/src/manager.ts

@@ -64,8 +64,13 @@ export class PluginManagerImpl implements plugin.PluginManager {
     initialize() {
         if (this.pluginInstance === undefined) { throw new Error("Can't found Plugin Instance!") }
         if (this.initialized !== true) {
+            process.emit('plugin.manager.before.initialize', this)
             console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
-            console.i18n('ms.plugin.event.map', { count: this.eventManager.mapEventName(), type: this.serverType })
+            try {
+                console.i18n('ms.plugin.event.map', { count: this.eventManager.mapEventName(), type: this.serverType })
+            } catch (error) {
+                console.i18n('ms.plugin.event.map.error', { error })
+            }
             let pluginScanner = this.container.getAll<plugin.PluginScanner>(plugin.PluginScanner)
             pluginScanner.forEach((scanner) => {
                 console.debug(`loading plugin sacnner ${scanner.type}...`)
@@ -77,13 +82,14 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 this.loaderMap.set(loader.type, loader)
             })
             this.initialized = true
-            process.emit('plugin.initialize')
+            process.emit('plugin.manager.after.initialize', this)
         }
     }
 
     scan(folder: string): void {
         if (!folder) { throw new Error('plugin scan folder can\'t be empty!') }
         this.initialize()
+        process.emit('plugin.manager.before.scan', folder, this)
         for (const [, scanner] of this.sacnnerMap) {
             try {
                 console.i18n('ms.plugin.manager.scan', { scanner: scanner.type, folder })
@@ -102,12 +108,13 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 console.ex(error)
             }
         }
-        process.emit('plugin.scan', folder)
+        process.emit('plugin.manager.after.scan', folder, this)
     }
 
     build(): void {
+        process.emit('plugin.manager.before.build', this)
         this.buildPlugins()
-        process.emit('plugin.build')
+        process.emit('plugin.manager.after.build', this)
     }
 
     private logStage(plugin: plugin.Plugin, stage: string) {
@@ -132,6 +139,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private loadPlugin(loadMetadata: plugin.PluginLoadMetadata) {
         if (!loadMetadata) { throw new Error('loadMetadata can\'t be undefiend when loadPlugin!') }
         if (loadMetadata.loaded) { throw new Error(`Plugin file ${loadMetadata.file} is already loaded by ${loadMetadata.loader?.type}!`) }
+        process.emit(`plugin.before.require`, loadMetadata)
         try {
             for (const [, loader] of this.loaderMap) {
                 if (this.loaderRequirePlugin(loadMetadata, loader)?.loaded) return loadMetadata.metadata
@@ -140,7 +148,6 @@ export class PluginManagerImpl implements plugin.PluginManager {
             console.i18n("ms.plugin.manager.initialize.error", { name: loadMetadata.file, ex: error })
             console.ex(error)
         }
-        console.console(`§6scanner: §b${loadMetadata.scanner.type} §ccan\'t load §6file §b${loadMetadata.file}. §eskip!`)
     }
 
     private loaderRequirePlugin(loadMetadata: plugin.PluginLoadMetadata, loader: plugin.PluginLoader) {
@@ -154,6 +161,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 }
                 this.metadataMap.set(metadata.name, metadata)
                 metadata.loadMetadata = loadMetadata
+                process.emit(`plugin.after.require`, loadMetadata)
             }
             return loadMetadata
         } catch (error: any) {
@@ -169,6 +177,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private loadAndRequirePlugin(loadMetadata: plugin.PluginLoadMetadata) {
         let startTime = Date.now()
         let metadata = this.loadPlugin(loadMetadata.scanner.load(loadMetadata))
+        if (!metadata) { throw new Error('load plugin metadata failed.') }
         console.i18n('ms.plugin.manager.build', {
             name: loadMetadata.metadata.name,
             version: loadMetadata.metadata.version,
@@ -184,11 +193,14 @@ export class PluginManagerImpl implements plugin.PluginManager {
      * 从文件加载插件
      * @param file java.io.File
      */
-    loadFromFile(file: string, scanner = this.sacnnerMap.get('file')): plugin.Plugin {
-        if (!file) { throw new Error('plugin file can\'t be undefiend!') }
-        if (!scanner) { throw new Error('plugin scanner can\'t be undefiend!') }
+    loadFromFile(file: string, ext: any = 'js'): plugin.Plugin {
+        if (!file) { throw new Error('plugin file can\'t be undefiend.') }
+        let scanner = this.sacnnerMap.get(ext)
+        if (!scanner) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
         let metadata = this.loadAndRequirePlugin(scanner.read(file))
-        let plugin = this.buildPlugin(metadata)
+        this.buildPlugin(metadata)
+        let plugin = metadata.target
+        if (!plugin) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
         this.load(plugin)
         this.enable(plugin)
         return plugin
@@ -213,7 +225,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
     reload(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((pl: plugin.Plugin) => {
             this.disable(pl)
-            this.loadFromFile(pl.description.loadMetadata.file, pl.description.loadMetadata.scanner)
+            this.loadFromFile(pl.description.loadMetadata.file, pl.description.loadMetadata.scanner.type)
         })
     }
 
@@ -235,12 +247,12 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
 
     private checkAndGet(name: string | plugin.Plugin | undefined | any): Map<string, plugin.Plugin> | plugin.Plugin[] {
-        if (name === undefined) throw new Error(`checkAndGet Plugin can't be undefiend!`)
+        if (name === undefined) throw new Error(`checkAndGet Plugin can't be undefiend.`)
         if (name == this.instanceMap) { return this.instanceMap }
         if (typeof name == 'string' && this.instanceMap.has(name)) { return [this.instanceMap.get(name)] }
         if (name instanceof interfaces.Plugin) { return [name as plugin.Plugin] }
         if (name.description?.name) { return [name as plugin.Plugin] }
-        throw new Error(`Plugin ${JSON.stringify(name)} not exist!`)
+        throw new Error(`Plugin ${JSON.stringify(name)} not exist.`)
     }
 
     private buildPlugins() {
@@ -248,10 +260,10 @@ export class PluginManagerImpl implements plugin.PluginManager {
             if (metadata?.depends?.length) {
                 this.lazyMetadataMap.set(key, metadata)
             } else {
-                this.buildPlugin(metadata)
+                this.tryBuildPlugin(metadata)
             }
         })
-        this.lazyMetadataMap.forEach((metadata, key) => this.buildPlugin(metadata))
+        this.lazyMetadataMap.forEach((metadata, key) => this.tryBuildPlugin(metadata))
     }
 
     private checkDepends(depends: string | string[]) {
@@ -266,22 +278,30 @@ export class PluginManagerImpl implements plugin.PluginManager {
         for (const depend of depends) { if (!this.nativePluginManager.has(depend)) loseDepends.push(depend) }
         return loseDepends
     }
-    private buildPlugin(metadata: plugin.PluginMetadata) {
+
+    private tryBuildPlugin(metadata: plugin.PluginMetadata) {
         try {
-            if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
-            if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
-            if (!this.serverChecker.check(metadata.servers)) { throw new Error(`§6插件 §b${metadata.name} §c服务器类型不兼容(${metadata.servers.join(',')}) §6忽略加载...`) }
-            let loseDepends = this.checkDepends(metadata.depends) || []
-            if (loseDepends.length) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查脚本依赖 §3[${loseDepends.join(',')}] §4是否安装完整!`) }
-            let loseNativeDepends = this.checkNativeDepends(metadata.nativeDepends) || []
-            if (loseNativeDepends.length) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查插件依赖 §3[${loseNativeDepends.join(',')}] §4是否安装完整!`) }
-            let pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
-            if (!pluginInstance) { throw new Error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`) }
-            this.instanceMap.set(metadata.name, pluginInstance)
-            return pluginInstance
+            return this.buildPlugin(metadata)
         } catch (error: any) {
             console.console(`§4无法加载插件 §b${metadata.name} §4构建插件失败!`)
             console.ex(error)
         }
     }
+
+    private buildPlugin(metadata: plugin.PluginMetadata) {
+        process.emit(`plugin.before.build`, metadata)
+        if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
+        if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
+        if (!this.serverChecker.check(metadata.servers)) { throw new Error(`§6插件 §b${metadata.name} §c服务器类型不兼容(${metadata.servers.join(',')}) §6忽略加载...`) }
+        let loseDepends = this.checkDepends(metadata.depends) || []
+        if (loseDepends.length) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查脚本依赖 §3[${loseDepends.join(',')}] §4是否安装完整!`) }
+        let loseNativeDepends = this.checkNativeDepends(metadata.nativeDepends) || []
+        if (loseNativeDepends.length) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查插件依赖 §3[${loseNativeDepends.join(',')}] §4是否安装完整!`) }
+        let pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
+        if (!pluginInstance) { throw new Error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`) }
+        metadata.target = pluginInstance
+        this.instanceMap.set(metadata.name, pluginInstance)
+        process.emit(`plugin.after.build`, metadata, pluginInstance)
+        return pluginInstance
+    }
 }

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

@@ -2,7 +2,7 @@ import { plugin } from "@ccms/api"
 import * as fs from '@ccms/common/dist/fs'
 import { provideSingletonNamed } from "@ccms/container"
 
-const SCANNER_TYPE_NAME = 'file'
+const SCANNER_TYPE_NAME = 'js'
 
 @provideSingletonNamed(plugin.PluginScanner, SCANNER_TYPE_NAME)
 export class JSFileScanner implements plugin.PluginScanner {

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

@@ -0,0 +1,132 @@
+import { plugin } from "@ccms/api"
+import http from '@ccms/common/dist/http'
+import { provideSingletonNamed } from "@ccms/container"
+
+import * as fs from '@ccms/common/dist/fs'
+
+import * as Utf8 from "crypto-js/enc-utf8"
+import * as AES from "crypto-js/aes"
+
+const SCANNER_TYPE_NAME = 'ms'
+
+@provideSingletonNamed(plugin.PluginScanner, SCANNER_TYPE_NAME)
+export class SecretJSFileScanner implements plugin.PluginScanner {
+    type: string = SCANNER_TYPE_NAME
+
+    constructor() {
+        global.setGlobal('MiaoScriptPackageCenterQQCache', {})
+        global.setGlobal('MiaoScriptPackageCenterInfoCache', {})
+        global.setGlobal('MiaoScriptPackageCenterTokenCache', {})
+        global.setGlobal('MiaoScriptPackageCenterResultCache', {})
+    }
+
+    scan(target: any): plugin.PluginLoadMetadata[] {
+        return this.scanFolder(fs.concat(root, target)).map((file) => this.read(file))
+    }
+
+    read(file: any): plugin.PluginLoadMetadata {
+        return { file, type: this.type, scanner: this, loaded: false }
+    }
+
+    load(metadata: plugin.PluginLoadMetadata): plugin.PluginLoadMetadata {
+        if (metadata.type !== this.type) { return }
+        this.updatePlugin(metadata.file)
+        let encryptPlugin: any
+        // @ts-ignore load plugin not use cache
+        metadata.instance = require(metadata.file.toString(), {
+            cache: false,
+            beforeCompile: (source: string) => {
+                try {
+                    encryptPlugin = JSON.parse(source)
+                } catch (error) {
+                    encryptPlugin = require(metadata.file.toString())
+                }
+                if (!encryptPlugin || !encryptPlugin.encrypt) {
+                    let filename = metadata.file.toString()
+                    filename = filename.startsWith(root) ? filename.split(root)[1] : filename
+                    throw new Error(`无效的加密插件: ${filename}.`)
+                }
+                let qq = encryptPlugin.qq
+                let token = this.decrypt(encryptPlugin.token, qq, encryptPlugin.timestamp)
+                global.MiaoScriptPackageCenterQQCache[encryptPlugin.name] = qq
+                global.MiaoScriptPackageCenterInfoCache[encryptPlugin.name] = encryptPlugin
+                global.MiaoScriptPackageCenterTokenCache[encryptPlugin.name] = token
+                let encrypt = encryptPlugin.encrypt
+                try {
+                    let needUpdate = Date.now() / 1000 - encryptPlugin.timestamp > 3 * 24 * 60 * 60
+                    console.console(`§6[§b圈云授权系统§6] §6加密插件: §b${encryptPlugin.name} §e授权效验中...`)
+                    let result = http.post('https://ms.yumc.pw/api/plugin/check', {
+                        "pid": encryptPlugin.pid,
+                        "qq": qq,
+                        "token": token,
+                        "source": needUpdate
+                    })
+                    if (!result) { throw new Error(`授权服务器请求失败.`) }
+                    global.MiaoScriptPackageCenterResultCache[encryptPlugin.name] = result
+                    if (result.code != 200) {
+                        throw new Error(`授权效验失败: ${result.msg}.`)
+                    }
+                    console.console(`§6[§b圈云授权系统§6] §6加密插件: §b${encryptPlugin.name} §a授权效验通过 正在构建插件...`)
+                    if (needUpdate) {
+                        if (!result.data) {
+                            throw new Error(`授权效验失败: 服务器返回异常数据.`)
+                        }
+                        base.save(metadata.file, result.data.encrypt)
+                        return result.data.source
+                    }
+                    return this.decrypt(encrypt, qq, token)
+                } catch (error) {
+                    console.console(`§6[§b圈云授权系统§6] §6加密插件: §b${encryptPlugin.name} §c授权效验失败: §4${error}.`)
+                }
+                if (Date.now() / 1000 - encryptPlugin.timestamp > 7 * 24 * 60 * 60) {
+                    throw new Error(`授权效验失败: 离线授权已过期.`)
+                }
+                console.console(`§6[§b圈云授权系统§6] §6加密插件: §b${encryptPlugin.name} §e离线授权效验通过 正在解密插件...`)
+                let decrypt = this.decrypt(encrypt, qq, token)
+                console.console(`§6[§b圈云授权系统§6] §6加密插件: §b${encryptPlugin.name} §a离线解密成功 正在构建插件...`)
+                return decrypt
+            },
+            afterCompile: () => {
+                delete global.MiaoScriptPackageCenterResultCache[encryptPlugin.name].data
+                global.MiaoScriptPackageCenterResultCache[encryptPlugin.name].timestamp = Date.now()
+            }
+        })
+        return metadata
+    }
+
+    private decrypt(encrypt: string, key: string, iv: string) {
+        return AES.decrypt(encrypt,
+            Utf8.parse(`${key}`.padEnd(16, "\0").substring(0, 16)), {
+            iv: Utf8.parse(`${iv}`.padEnd(16, "\0").substring(0, 16))
+        }).toString(Utf8)
+    }
+
+    private scanFolder(folder: any): string[] {
+        var files = []
+        this.checkUpdateFolder(folder)
+        // must check file is exist maybe is a illegal symbolic link file
+        fs.list(folder).forEach((path: any) => {
+            let file = path.toFile()
+            if (file.exists() && file.getName().endsWith(".ms")) {
+                files.push(file)
+            }
+        })
+        return files
+    }
+
+    private checkUpdateFolder(path: any) {
+        var update = fs.file(path, "update")
+        if (!update.exists()) {
+            update.mkdirs()
+        }
+    }
+
+    private updatePlugin(file: any) {
+        var update = fs.file(fs.file(fs.file(file).parentFile, 'update'), file.name)
+        if (update.exists()) {
+            console.i18n("ms.plugin.manager.build.update", { name: file.name })
+            fs.move(update, file, true)
+        }
+    }
+
+}

packages/plugin/src/utils.ts

@@ -67,7 +67,13 @@ function getPluginConfigMetadata(target: any) {
     ) || new Map<string, interfaces.ConfigMetadata>()
     return configMetadata
 }
-
+function getPluginPlayerDataMetadata(target: any) {
+    let playerdataMetadata: Map<string, interfaces.ConfigMetadata> = Reflect.getMetadata(
+        METADATA_KEY.playerdata,
+        target.constructor
+    ) || new Map<string, interfaces.ConfigMetadata>()
+    return playerdataMetadata
+}
 function getPluginStageMetadata(target: any, stage: string) {
     let stageMetadata: interfaces.ExecMetadata[] = Reflect.getMetadata(
         METADATA_KEY.stage[stage],
@@ -86,5 +92,6 @@ export {
     getPluginTabCompleterMetadata,
     getPluginListenerMetadata,
     getPluginConfigMetadata,
+    getPluginPlayerDataMetadata,
     getPluginStageMetadata
 }

packages/polyfill/package.json

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

packages/protocol/package.json

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

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.18.0",
+    "version": "0.20.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.18.0",
-        "@ccms/common": "^0.18.0",
-        "@ccms/container": "^0.18.0"
+        "@ccms/api": "^0.20.0",
+        "@ccms/common": "^0.20.0",
+        "@ccms/container": "^0.20.0"
     }
 }

packages/spring/package.json

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

packages/web/package.json

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

packages/websocket/package.json

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

packages/websocket/src/engine.io/index.ts

@@ -2,7 +2,6 @@
  * Module dependencies.
  */
 
-import * as server from "../server"
 // const http = require("http")
 // const Server = require("./server")
 import { Server } from './server'
@@ -18,7 +17,7 @@ import { Server } from './server'
 
 function attach(srv, options) {
     const engine = new Server(options)
-    engine.attach(server.attach(srv, options), options)
+    engine.attach(srv, options)
     return engine
 }
 

packages/websocket/src/index.ts

@@ -1,6 +1,7 @@
 /// <reference types="@ccms/nashorn" />
 /// <reference types="@javatypes/tomcat-websocket-api" />
 
+import * as server from './server'
 import { Server, ServerOptions } from './socket.io'
 
 interface SocketIOStatic {
@@ -38,9 +39,21 @@ interface SocketIOStatic {
 
 type SocketStatic = SocketIOStatic & { Instance?: symbol }
 
+let singletonServer: Server
+
 // @ts-ignore
-let io: SocketStatic = function (pipeline: any, options: Partial<ServerOptions>) {
-    return new Server(pipeline, options)
+let io: SocketStatic = function io(pipeline: any, options: Partial<JavaServerOptions>, singleton = true) {
+    if (singleton) {
+        if (!singletonServer) {
+            singletonServer = new Server(server.attach(pipeline, options), options)
+            process.emit('websocket.create', singletonServer)
+            process.on('exit', () => {
+                singletonServer.close()
+            })
+        }
+        return singletonServer
+    }
+    return new Server(server.attach(pipeline, options), options)
 }
 io.Instance = Symbol("@ccms/websocket")
 export default io

packages/websocket/src/server/index.ts

@@ -19,6 +19,7 @@ export enum ServerEvent {
 export interface JavaServerOptions extends ServerOptions {
     event?: EventEmitter
     root?: string
+    httpRequestHandler?: (ctx, request) => void
 }
 
 export abstract class WebSocketServer extends EventEmitter {
@@ -30,7 +31,6 @@ export abstract class WebSocketServer extends EventEmitter {
         this.instance = instance
         this.options = options
         this.clients = new Map()
-        console.debug('create websocket server from ' + this.constructor.name)
         this.initialize()
     }
     protected onconnect(handler: any) {
@@ -56,7 +56,7 @@ export abstract class WebSocketServer extends EventEmitter {
         if (this.clients.has(id)) {
             this.clients.has(id) && callback(this.clients.get(id))
         } else {
-            console.debug('ignore execute', handler, 'callback', callback)
+            console.trace('ignore execute', handler, 'callback', callback)
         }
     }
     public close() {
@@ -75,7 +75,7 @@ export const attach = (instance, options) => {
     options = Object.assign({
         event: new EventEmitter(),
         path: '/ws',
-        root: root + '/wwwroot',
+        root: root + Java.type("java.io.File").separatorChar + 'wwwroot',
     }, options)
     let WebSocketServerImpl = undefined
     if (instance.class.name.startsWith('io.netty.channel')) {
@@ -83,5 +83,6 @@ export const attach = (instance, options) => {
     } else {
         WebSocketServerImpl = require("./tomcat").TomcatWebSocketServer
     }
+    console.debug('create websocket server from ' + WebSocketServerImpl.name)
     return new WebSocketServerImpl(instance, options)
 }

packages/websocket/src/server/netty/httprequest.ts

@@ -23,40 +23,46 @@ export class HttpRequestHandler extends HttpRequestHandlerAdapter {
         super()
         this.root = options.root
         this.ws = options.path
+        if (options.httpRequestHandler) {
+            this.httpRequestHandler = options.httpRequestHandler
+        }
     }
     channelRead0(ctx: any, request: any) {
         if (request.getUri().startsWith(this.ws)) {
             ctx.channel().attr(AttributeKeys.Request).set(request)
             ctx.fireChannelRead(request.retain())
         } else {
-            ctx.executor().execute(new Runnable({
-                run: () => {
-                    if (HttpHeaders.is100ContinueExpected(request)) {
-                        ctx.writeAndFlush(new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.CONTINUE))
-                    }
-                    let filename = request.getUri().split('?')[0].substr(1)
-                    let file = new File(this.root, filename || 'index.html')
-                    if (!file.exists() || !file.isFile()) {
-                        ctx.write(new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.NOT_FOUND))
-                        ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(ChannelFutureListener.CLOSE)
-                        return
-                    }
-                    let response = new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.OK)
-                    response.headers().set(HttpHeaders.Names.CONTENT_TYPE, "text/html charset=UTF-8")
-                    let raf = new RandomAccessFile(file, 'r')
-                    let keepAlive = HttpHeaders.isKeepAlive(request)
-                    if (keepAlive) {
-                        response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, file.length())
-                        response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE)
-                    }
-                    ctx.write(response)
-                    ctx.write(new DefaultFileRegion(raf.getChannel(), 0, raf.length()))
-                    let future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
-                    if (!keepAlive) {
-                        future.addListener(ChannelFutureListener.CLOSE)
-                    }
-                }
-            }))
+            this.httpRequestHandler(ctx, request)
         }
     }
+    httpRequestHandler(ctx: any, request: any) {
+        ctx.executor().execute(new Runnable({
+            run: () => {
+                if (HttpHeaders.is100ContinueExpected(request)) {
+                    ctx.writeAndFlush(new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.CONTINUE))
+                }
+                let filename = request.getUri().split('?')[0].substr(1)
+                let file = new File(this.root, filename || 'index.html')
+                if (!file.exists() || !file.isFile()) {
+                    ctx.write(new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.NOT_FOUND))
+                    ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT).addListener(ChannelFutureListener.CLOSE)
+                    return
+                }
+                let response = new DefaultHttpResponse(request.getProtocolVersion(), HttpResponseStatus.OK)
+                response.headers().set(HttpHeaders.Names.CONTENT_TYPE, "text/html charset=UTF-8")
+                let raf = new RandomAccessFile(file, 'r')
+                let keepAlive = HttpHeaders.isKeepAlive(request)
+                if (keepAlive) {
+                    response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, file.length())
+                    response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE)
+                }
+                ctx.write(response)
+                ctx.write(new DefaultFileRegion(raf.getChannel(), 0, raf.length()))
+                let future = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT)
+                if (!keepAlive) {
+                    future.addListener(ChannelFutureListener.CLOSE)
+                }
+            }
+        }))
+    }
 }