v0.8.4

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

.npmignore

@@ -21,3 +21,4 @@ wallaby.js
 .theia
 type_definitions
 tsconfig.tsbuildinfo
+*.tsbuildinfo

lerna.json

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

packages/amqp/package.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,9 +19,9 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.8.2",
+        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.2",
+        "@ccms/container": "^0.8.4",
-        "@ccms/ployfill": "^0.8.2",
+        "@ccms/ployfill": "^0.8.4",
         "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.5"
+        "typescript": "^3.9.6"
     }
 }

packages/api/src/interfaces/plugin.ts

@@ -152,21 +152,21 @@ export namespace plugin {
     }
     export interface PluginMetadata extends BaseMetadata {
         /**
-         * 插件名称
+         * 插件名称 不填默认为类名
          */
-        name: string
+        name?: string
         /**
          * 前缀
          */
         prefix?: string
         /**
-         * 插件版本
+         * 插件版本 不填默认为 1.0.0
          */
-        version: string
+        version?: string
         /**
-         * 插件版本
+         * 插件作者 不填默认为 Unknow
          */
-        author: string | string[]
+        author?: string | string[]
         /**
          * 插件源文件 必须指定为 __filename
          */

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

@@ -1,5 +1,5 @@
 import * as reflect from '@ccms/common/dist/reflect'
-import { injectable } from '@ccms/container'
+import { injectable, inject } from '@ccms/container'
 
 import { NativePluginManager } from './native_plugin'
 import { constants } from '../../constants'
@@ -41,6 +41,23 @@ export namespace server {
         tabComplete?(sender: string | any, input: string, index?: number): string[]
     }
     @injectable()
+    export class ServerChecker {
+        @inject(ServerType)
+        private serverType: string
+        check(servers: string[]) {
+            // Not set servers -> allow
+            if (!servers || !servers.length) return true
+            // include !type -> deny
+            let denyServers = servers.filter(svr => svr.startsWith("!"))
+            if (denyServers.length !== 0) {
+                return !denyServers.includes(`!${this.serverType}`)
+            } else {
+                // only include -> allow
+                return servers.includes(this.serverType)
+            }
+        }
+    }
+    @injectable()
     export abstract class ReflectServer implements server.Server {
         protected pipeline: any
         protected rootLogger: any

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/spigot-api": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.2",
+        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/bukkit/src/channel.ts

@@ -8,18 +8,30 @@ const Messenger = Bukkit.getMessenger()
 @provideSingleton(channel.Channel)
 export class BukkitChannel extends channel.Channel {
     @inject(plugin.PluginInstance)
-    private pluginInstance: any;
+    private pluginInstance: any
 
-    send(player: any, channel: string, data: any) {
+    /**
-        player.sendPluginMessage(this.pluginInstance, channel, data);
+     * 给玩家发送通道消息
+     * @param player 接受消息的玩家
+     * @param channel 通道
+     * @param data 数据
+     */
+    send(player: any, channel: string, data: number[]) {
+        player.sendPluginMessage(this.pluginInstance, channel, data)
     }
+
+    /**
+     * 注册通道监听器
+     * @param channel 通道
+     * @param listener 监听器
+     */
     register(channel: string, listener: channel.ChannelListener) {
         Messenger.registerIncomingPluginChannel(this.pluginInstance, channel, new PluginMessageListener({
             onPluginMessageReceived: (/**String */ channel, /**Player */ player, /**byte[] */data) => {
                 listener(data, { channel, player, data })
             }
-        }));
+        }))
-        Messenger.registerOutgoingPluginChannel(this.pluginInstance, channel);
+        Messenger.registerOutgoingPluginChannel(this.pluginInstance, channel)
     }
     unregister(channel: string, listener: any) {
         Messenger.unregisterIncomingPluginChannel(this.pluginInstance, channel)

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/bungee-api": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.2",
+        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -26,6 +26,6 @@
     },
     "devDependencies": {
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     }
 }

packages/common/package.json

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

packages/common/src/reflect.ts

@@ -96,10 +96,7 @@ function types(values: any[], def?: any) {
 }
 
 function accessible<T extends java.lang.reflect.AccessibleObject>(accessible: T): T {
-    if (accessible === null) {
+    if (!accessible?.isAccessible()) {
-        return null
-    }
-    if (!accessible.isAccessible()) {
         accessible.setAccessible(true)
     }
     return accessible
@@ -143,7 +140,8 @@ function declaredMethod(clazz: java.lang.Class<any>, name: string, ...clazzs: ja
     let key = clazz.getName() + '.' + name + ':' + (clazzs || []).join(':')
     if (!methodCache[key]) {
         try {
-            methodCache[key] = clazz.getMethod(name, ...clazzs)
+            // @ts-ignore
+            methodCache[key] = clazz.getMethod(name, clazzs)
         } catch (ex) {
             try {
                 methodCache[key] = clazz.getDeclaredMethod(name, clazzs as any)

packages/compile/package.json

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

packages/container/package.json

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

packages/core/package.json

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

packages/core/src/index.ts

@@ -97,6 +97,7 @@ function initialize() {
         let type = detectServer()
         console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
         container.bind(server.ServerType).toConstantValue(type)
+        container.bind(server.ServerChecker).toSelf().inSingletonScope()
         console.i18n("ms.core.package.initialize", { scope: global.scope, type })
         require(`${global.scope}/${type}`).default(container)
         require(`${global.scope}/plugin`)

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "@javatypes/spring-jdbc": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/i18n/package.json

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

packages/keyvalue/package.json

@@ -0,0 +1,35 @@
+{
+    "name": "@ccms/keyvalue",
+    "version": "0.8.4",
+    "description": "MiaoScript keyvalue package",
+    "keywords": [
+        "miaoscript",
+        "minecraft",
+        "bukkit",
+        "sponge"
+    ],
+    "author": "MiaoWoo <admin@yumc.pw>",
+    "homepage": "https://github.com/circlecloud/ms.git",
+    "license": "ISC",
+    "main": "dist/index.js",
+    "scripts": {
+        "clean": "rimraf dist",
+        "watch": "tsc --watch",
+        "build": "yarn clean && tsc",
+        "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "dependencies": {
+        "@ccms/api": "^0.8.4",
+        "@ccms/common": "^0.8.4",
+        "@ccms/container": "^0.8.4"
+    },
+    "devDependencies": {
+        "@ccms/nashorn": "^0.8.4",
+        "@javatypes/amqp-client": "^0.0.2",
+        "@javatypes/spring-amqp": "^0.0.2",
+        "@javatypes/spring-rabbit": "^0.0.2",
+        "reflect-metadata": "^0.1.13",
+        "rimraf": "^3.0.2",
+        "typescript": "^3.9.6"
+    }
+}

packages/nashorn/package.json

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

packages/nashorn/src/index.ts

@@ -73,6 +73,7 @@ declare global {
     interface Console {
         ex(err: Error): void
         stack(err: Error, color?: boolean): string[]
+        sender(sender: any, ...args: any): void
         sender(...args: any): void
         console(...args: any): void
         i18n(name: string, ...params: any[]): void

packages/nodejs/package.json

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

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/nukkit-api": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.2",
+        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/ployfill/package.json

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

packages/plugin/package.json

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

packages/plugin/src/command.ts

@@ -0,0 +1,36 @@
+import { command, plugin, server } from '@ccms/api'
+import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import { getPluginCommandMetadata, getPluginTabCompleterMetadata } from './utils'
+
+@provideSingleton(PluginCommandManager)
+export class PluginCommandManager {
+    @inject(server.ServerChecker)
+    private ServerChecker: server.ServerChecker
+    @inject(command.Command)
+    private CommandManager: command.Command
+
+    constructor() {
+        process.on('plugin.before.enable', (plugin: plugin.Plugin) => this.registryCommand(plugin))
+        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryCommand(plugin))
+    }
+
+    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
+            })
+        }
+    }
+
+    private unregistryCommand(pluginInstance: plugin.Plugin) {
+        let cmds = getPluginCommandMetadata(pluginInstance)
+        cmds.forEach(cmd => {
+            this.CommandManager.off(pluginInstance, cmd.name)
+        })
+    }
+}

packages/plugin/src/config.ts

@@ -1,33 +1,75 @@
 import * as yaml from 'js-yaml'
+import * as fs from '@ccms/common/dist/fs'
+import { plugin } from '@ccms/api'
+import { getPluginConfigMetadata } from './utils'
 
 export interface PluginConfigLoader {
-    load(content: string): any;
+    load(content: string): any
-    dump(variable: any): string;
+    dump(variable: any): string
 }
 
 export class YamlPluginConfig implements PluginConfigLoader {
     load(content: string) {
-        return yaml.safeLoad(content);
+        return yaml.safeLoad(content)
     }
     dump(variable: any): string {
-        return yaml.safeDump(variable, { skipInvalid: true });
+        return yaml.safeDump(variable, { skipInvalid: true })
     }
 }
 
 export class JsonPluginConfig implements PluginConfigLoader {
     load(content: string) {
-        return JSON.parse(content);
+        return JSON.parse(content)
     }
     dump(variable: any): string {
-        return JSON.stringify(variable);
+        return JSON.stringify(variable)
     }
 }
 
-const configLoaderMap = new Map<string, PluginConfigLoader>();
+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);
+    return configLoaderMap.get(format)
+}
+
+function loadConfig(plugin: plugin.Plugin) {
+    let configs = getPluginConfigMetadata(plugin)
+    for (let [_, config] of configs) {
+        try {
+            let configFile = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, config.name + '.' + config.format)
+            let configFactory = getConfigLoader(config.format)
+            if (!fs.exists(configFile)) {
+                base.save(configFile, configFactory.dump(plugin[config.variable]))
+                console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: config.name, format: config.format })
+            } else {
+                plugin[config.variable] = configFactory.load(base.read(configFile))
+                plugin[config.variable].save = () => {
+                    let result = configFactory.dump(plugin[config.variable])
+                    base.save(configFile, result)
+                    console.debug(`[${plugin.description.name}] Save Config ${config.variable} to file ${configFile} result ${result}`)
+                }
+                console.debug(`[${plugin.description.name}] Load Config ${config.variable} from file ${configFile} result ${JSON.stringify(plugin[config.variable])}`)
+            }
+        } catch (error) {
+            console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
+            console.ex(error)
+        }
+    }
+}
+
+function saveConfig(plugin: plugin.Plugin) {
+    let configs = getPluginConfigMetadata(plugin)
+    for (let [_, config] of configs) {
+        try {
+            let configFile = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, config.name + '.' + config.format)
+            let configFactory = getConfigLoader(config.format)
+            if (!config.readonly) { base.save(configFile, configFactory.dump(plugin[config.variable])) }
+        } catch (error) {
+            console.i18n("ms.plugin.manager.config.save.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
+            console.ex(error)
+        }
+    }
 }
 
 function init() {
@@ -35,6 +77,8 @@ function init() {
     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/decorators.ts

@@ -8,10 +8,10 @@ import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata
  * MiaoScript plugin
  * @param metadata PluginMetadata
  */
-export function plugin(metadata: pluginApi.PluginMetadata) {
+export function plugin(metadata: pluginApi.PluginMetadata | any) {
     return function (target: any) {
-        metadata.target = target
+        if (!metadata.source) metadata = { souece: metadata }
-        metadata.type = "ioc"
+        metadata = { name: target.name, version: '1.0.0', author: 'Unknow', target, type: 'ioc', ...metadata }
         decorate(injectable(), target)
         Reflect.defineMetadata(METADATA_KEY.plugin, metadata, target)
         const previousMetadata: Map<string, pluginApi.PluginMetadata> = getPluginMetadatas()

packages/plugin/src/event.ts

@@ -0,0 +1,30 @@
+import { event, plugin, server } from '@ccms/api'
+import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import { getPluginListenerMetadata } from './utils'
+
+@provideSingleton(PluginEventManager)
+export class PluginEventManager {
+    @inject(server.ServerChecker)
+    private ServerChecker: server.ServerChecker
+    @inject(event.Event)
+    private EventManager: event.Event
+
+    constructor() {
+        process.on('plugin.before.enable', (plugin: plugin.Plugin) => this.registryListener(plugin))
+        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryListener(plugin))
+    }
+
+    private registryListener(pluginInstance: plugin.Plugin) {
+        let events = getPluginListenerMetadata(pluginInstance)
+        for (const event of events) {
+            // ignore space listener
+            if (!this.ServerChecker.check(event.servers)) { continue }
+            // here must bind this to pluginInstance
+            this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance))
+        }
+    }
+
+    private unregistryListener(pluginInstance: plugin.Plugin) {
+        this.EventManager.disable(pluginInstance)
+    }
+}

packages/plugin/src/manager.ts

@@ -1,11 +1,11 @@
 import i18n from '@ccms/i18n'
-import { plugin, server, command, event } from '@ccms/api'
+import { plugin, server, event } from '@ccms/api'
 import { inject, provideSingleton, Container, ContainerInstance } from '@ccms/container'
-import * as fs from '@ccms/common/dist/fs'
 
+import './config'
 import { interfaces } from './interfaces'
-import { getConfigLoader } from './config'
+import { PluginCommandManager } from './command'
-import { getPluginCommandMetadata, getPluginListenerMetadata, getPluginTabCompleterMetadata, getPluginConfigMetadata } from './utils'
+import { PluginEventManager } from './event'
 
 const Thread = Java.type('java.lang.Thread')
 
@@ -15,15 +15,16 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private container: Container
     @inject(plugin.PluginInstance)
     private pluginInstance: any
-    @inject(plugin.PluginFolder)
-    private pluginFolder: string
     @inject(server.ServerType)
     private serverType: string
-    @inject(command.Command)
-    private CommandManager: command.Command
     @inject(event.Event)
     private EventManager: event.Event
 
+    @inject(PluginCommandManager)
+    private commandManager: PluginCommandManager
+    @inject(PluginEventManager)
+    private eventManager: PluginEventManager
+
     private initialized: boolean = false
 
     private sacnnerMap: Map<string, plugin.PluginScanner>
@@ -38,6 +39,10 @@ export class PluginManagerImpl implements plugin.PluginManager {
 
         this.instanceMap = new Map()
         this.metadataMap = new Map()
+
+        // ignore unused
+        this.commandManager
+        this.eventManager
     }
 
     initialize() {
@@ -90,16 +95,18 @@ export class PluginManagerImpl implements plugin.PluginManager {
         console.i18n("ms.plugin.manager.stage", { stage, plugin: plugin.description.name, version: plugin.description.version, author: plugin.description.author })
     }
 
-    private runPluginStage(plugin: plugin.Plugin, stage: string, ext: Function) {
+    private runPluginStage(plugin: plugin.Plugin, stage: string) {
         if (!plugin) { throw new Error(`can't run runPluginStage ${stage} because plugin is ${plugin}`) }
         try {
             this.logStage(plugin, i18n.translate(`ms.plugin.manager.stage.${stage}`))
-            ext()
+            process.emit(`plugin.before.${stage}`, plugin)
             this.runCatch(plugin, stage)
             this.runCatch(plugin, `${this.serverType}${stage}`)
             plugin.description.loadMetadata.loader[stage](plugin)
+            process.emit(`plugin.after.${stage}`, plugin)
         } catch (ex) {
             console.i18n("ms.plugin.manager.stage.exec.error", { plugin: plugin.description.name, executor: stage, error: ex })
+            if (global.debug) { console.ex(ex) }
         }
     }
 
@@ -108,22 +115,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         if (loadMetadata.loaded) { throw new Error(`Plugin ${loadMetadata.name} is already loaded by ${loadMetadata.loader?.type}!`) }
         try {
             for (const [, loader] of this.loaderMap) {
-                try {
+                if (this.loaderRequirePlugin(loadMetadata, loader)?.loaded) return loadMetadata.metadata
-                    if (loader.require(loadMetadata).loaded) {
-                        loadMetadata.loader = loader
-                        let metadata = loadMetadata.metadata
-                        this.metadataMap.set(metadata.name, metadata)
-                        metadata.loadMetadata = loadMetadata
-                        return metadata
-                    }
-                } catch (error) {
-                    if (global.debug) {
-                        console.console(`§6Loader §b${loader.type} §6load §a${loadMetadata.file} §cerror. §4Err: §c${error}`)
-                        console.ex(error)
-                    } else {
-                        console.warn(`Loader ${loader.type} load ${loadMetadata.file} error. Err: ${error}`)
-                    }
-                }
             }
         } catch (error) {
             console.i18n("ms.plugin.manager.initialize.error", { name: loadMetadata.file, ex: error })
@@ -132,6 +124,29 @@ export class PluginManagerImpl implements plugin.PluginManager {
         console.console(`§6scanner: §b${loadMetadata.scanner.type} §ccan\'t load §6file §b${loadMetadata.file}. §eskip!`)
     }
 
+    private loaderRequirePlugin(loadMetadata: plugin.PluginLoadMetadata, loader: plugin.PluginLoader) {
+        try {
+            if (loader.require(loadMetadata).loaded) {
+                loadMetadata.loader = loader
+                let metadata = loadMetadata.metadata
+                if (this.metadataMap.has(metadata.name)) {
+                    let oldMetadata = this.metadataMap.get(metadata.name)
+                    throw new Error(`Plugin ${oldMetadata.name} is already load from ${oldMetadata.source}...`)
+                }
+                this.metadataMap.set(metadata.name, metadata)
+                metadata.loadMetadata = loadMetadata
+            }
+            return loadMetadata
+        } catch (error) {
+            if (global.debug) {
+                console.console(`§6Loader §b${loader.type} §6load §a${loadMetadata.file} §cerror. §4Err: §c${error}`)
+                console.ex(error)
+            } else {
+                console.warn(`Loader ${loader.type} load ${loadMetadata.file} error. Err: ${error}`)
+            }
+        }
+    }
+
     /**
      * 从文件加载插件
      * @param file java.io.File
@@ -139,44 +154,33 @@ export class PluginManagerImpl implements plugin.PluginManager {
     loadFromFile(file: string, scanner = this.sacnnerMap.get('file')): plugin.Plugin {
         if (!file) { throw new Error('plugin file can\'t be undefiend!') }
         if (!scanner) { throw new Error('plugin scanner can\'t be undefiend!') }
-        let metadata = this.loadPlugin(scanner.read(file))
+        let metadata = this.loadPlugin(scanner.load(scanner.read(file)))
-        let plugin = metadata.loadMetadata.loader.build(metadata)
+        let plugin = this.buildPlugin(metadata)
         this.load(plugin)
         this.enable(plugin)
         return plugin
     }
 
     load(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => {
+        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'load'))
-            this.runPluginStage(plugin, 'load', () => {
-                this.loadConfig(plugin)
-            })
-        })
     }
 
     enable(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => {
+        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'enable'))
-            this.runPluginStage(plugin, 'enable', () => {
-                this.registryCommand(plugin)
-                this.registryListener(plugin)
-            })
-        })
     }
 
     disable(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => {
-            this.runPluginStage(plugin, 'disable', () => {
+            this.runPluginStage(plugin, 'disable')
-                this.saveConfig(plugin)
+            this.metadataMap.delete(plugin.description.name)
-                this.unregistryCommand(plugin)
+            this.instanceMap.delete(plugin.description.name)
-                this.unregistryListener(plugin)
-            })
         })
     }
 
     reload(...args: any[]): void {
         this.checkAndGet(args[0]).forEach((pl: plugin.Plugin) => {
             this.disable(pl)
-            this.loadFromFile(pl.description.source.toString(), pl.description.loadMetadata.scanner)
+            this.loadFromFile(pl.description.loadMetadata.file, pl.description.loadMetadata.scanner)
         })
     }
 
@@ -206,102 +210,22 @@ export class PluginManagerImpl implements plugin.PluginManager {
         throw new Error(`Plugin ${JSON.stringify(name)} not exist!`)
     }
 
-    private allowProcess(servers: string[]) {
-        // Not set servers -> allow
-        if (!servers || !servers.length) return true
-        // include !type -> deny
-        let denyServers = servers.filter(svr => svr.startsWith("!"))
-        if (denyServers.length !== 0) {
-            return !denyServers.includes(`!${this.serverType}`)
-        } else {
-            // only include -> allow
-            return servers.includes(this.serverType)
-        }
-    }
-
     private buildPlugins() {
-        for (const [, metadata] of this.metadataMap) {
+        this.metadataMap.forEach((metadata) => {
-            let pluginInstance: plugin.Plugin
-            if (!this.loaderMap.has(metadata.type)) {
-                console.error(`§4无法加载插件 §c${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`)
-                continue
-            }
-            pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
-            if (!pluginInstance) { console.error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`); continue }
-            this.instanceMap.set(metadata.name, pluginInstance)
-        }
-    }
-
-    private loadConfig(plugin: plugin.Plugin) {
-        let configs = getPluginConfigMetadata(plugin)
-        for (let [_, config] of configs) {
             try {
-                let configFile = fs.concat(root, this.pluginFolder, plugin.description.name, config.name + '.' + config.format)
+                this.buildPlugin(metadata)
-                let configFactory = getConfigLoader(config.format)
-                if (!fs.exists(configFile)) {
-                    base.save(configFile, configFactory.dump(plugin[config.variable]))
-                    console.i18n("ms.plugin.manager.config.save.default", { plugin: plugin.description.name, name: config.name, format: config.format })
-                } else {
-                    plugin[config.variable] = configFactory.load(base.read(configFile))
-                    plugin[config.variable].save = () => {
-                        let result = configFactory.dump(plugin[config.variable])
-                        base.save(configFile, result)
-                        console.debug(`[${plugin.description.name}] Save Config ${config.variable} to file ${configFile} result ${result}`)
-                    }
-                    console.debug(`[${plugin.description.name}] Load Config ${config.variable} from file ${configFile} result ${JSON.stringify(plugin[config.variable])}`)
-                }
             } catch (error) {
-                console.i18n("ms.plugin.manager.config.load.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
+                console.error(error)
-                console.ex(error)
             }
-        }
-    }
-
-    private saveConfig(plugin: plugin.Plugin) {
-        let configs = getPluginConfigMetadata(plugin)
-        for (let [_, config] of configs) {
-            try {
-                let configFile = fs.concat(root, this.pluginFolder, plugin.description.name, config.name + '.' + config.format)
-                let configFactory = getConfigLoader(config.format)
-                if (!config.readonly) { base.save(configFile, configFactory.dump(plugin[config.variable])) }
-            } catch (error) {
-                console.i18n("ms.plugin.manager.config.save.error", { plugin: plugin.description.name, name: config.name, format: config.format, error })
-                console.ex(error)
-            }
-        }
-    }
-
-    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.allowProcess(cmd.servers)) { continue }
-            this.CommandManager.on(pluginInstance, cmd.name, {
-                cmd: pluginInstance[cmd.executor].bind(pluginInstance),
-                tab: tab ? pluginInstance[tab.executor].bind(pluginInstance) : undefined
-            })
-        }
-    }
-
-    private registryListener(pluginInstance: plugin.Plugin) {
-        let events = getPluginListenerMetadata(pluginInstance)
-        for (const event of events) {
-            // ignore space listener
-            if (!this.allowProcess(event.servers)) { continue }
-            // here must bind this to pluginInstance
-            this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance))
-        }
-    }
-
-    private unregistryCommand(pluginInstance: plugin.Plugin) {
-        let cmds = getPluginCommandMetadata(pluginInstance)
-        cmds.forEach(cmd => {
-            this.CommandManager.off(pluginInstance, cmd.name)
         })
     }
 
-    private unregistryListener(pluginInstance: plugin.Plugin) {
+    private buildPlugin(metadata: plugin.PluginMetadata) {
-        this.EventManager.disable(pluginInstance)
+        if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §c${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
+        let pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
+        if (!pluginInstance) { throw new Error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`) }
+        if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
+        this.instanceMap.set(metadata.name, pluginInstance)
+        return pluginInstance
     }
 }

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

@@ -44,7 +44,7 @@ export class JSFileScanner implements plugin.PluginScanner {
     }
 
     private updatePlugin(file: any) {
-        var update = fs.file(fs.file(file.parentFile, 'update'), file.name)
+        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/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -20,13 +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",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.2",
+        "@ccms/container": "^0.8.4",
-        "@ccms/plugin": "^0.8.2"
+        "@ccms/plugin": "^0.8.4"
     }
 }

packages/plugins/src/MiaoScriptPackageManager.ts

@@ -137,14 +137,15 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         }
     }
 
-    cmdupgrade(sender: any, name: string) {
+    cmdupgrade(sender: any, name: string, confirm: boolean) {
-        if (!name) { return this.i18n(sender, 'upgrade.confirm') }
+        if (name == "system") {
-        if (name == "comfirm") {
+            if (!confirm) { return this.i18n(sender, 'upgrade.confirm') }
-            let enginePath = fs.path(fs.file(fs.concat(root, 'node_modules', '@ccms')))
+            let enginePath = fs.path(fs.file(root, 'node_modules'))
             if (enginePath.startsWith(root)) {
                 base.delete(enginePath)
                 this.cmdrestart(sender)
             }
+            return
         }
         if (this.checkPlugin(sender, name)) {
             this.update(sender, name)
@@ -241,7 +242,7 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
                     name,
                     author: plugin.description.author,
                     version: plugin.description.version,
-                    source: base.read(plugin.description.source.toString())
+                    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 })
             }
@@ -263,8 +264,11 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
                     return ["install", "cloud"]
                 case "install":
                     return this.packageNameCache
-                case "update":
                 case "upgrade":
+                    if (args.length == 2) return ["system", ...this.pluginManager.getPlugins().keys()]
+                    if (args.length == 3 && args[1] == "system") return ["confirm"]
+                    return []
+                case "update":
                 case "load":
                 case "unload":
                 case "reload":

packages/plugins/src/MiaoSpring.ts

@@ -5,12 +5,47 @@ import { constants, database, plugin, web } from "@ccms/api"
 import { inject, ContainerInstance, Container, JSClass, postConstruct } from "@ccms/container"
 import { JSPlugin, interfaces, cmd } from "@ccms/plugin"
 import { DataBase, DataBaseManager } from '@ccms/database'
-import { Server, Context, RequestHandler, Controller, Get, Post, Param, Body } from '@ccms/web'
+import { Server, Context, RequestHandler, Controllers, Controller, Get, Post, Param, Body } from '@ccms/web'
 
 import * as fs from '@ccms/common/dist/fs'
 import * as reflect from '@ccms/common/dist/reflect'
 
-@JSPlugin({ name: 'MiaoSpring', prefix: 'MSpring', version: '1.0.1', author: 'MiaoWoo', servers: [constants.ServerType.Spring], source: __filename })
+@Controller()
+class PluginController {
+    @inject(plugin.PluginManager)
+    private pluginManager: plugin.PluginManager
+    @inject(database.DataBaseManager)
+    private databaseManager: DataBaseManager
+
+    private mainDB: DataBase
+
+    @postConstruct()
+    initialize() {
+        this.mainDB = this.databaseManager.getMainDatabase()
+    }
+
+    @Get()
+    list(@Param('install') install: boolean) {
+        if (install) {
+            return { status: 200, data: [...this.pluginManager.getPlugins().values()].map((plugin) => plugin.description), msg: '插件列表获取成功!' }
+        } else {
+            return { status: 200, data: this.mainDB.query<Plugin>("SELECT name FROM plugins WHERE deleted = 0") }
+        }
+    }
+    @Post()
+    deploy(@Body() info: Plugin) {
+        let plugin = this.mainDB.query<Plugin>("SELECT name FROM plugins WHERE name = ?", info.name)
+        if (plugin.length == 0) {
+            this.mainDB.update("INSERT INTO `plugins`(`name`, `source`) VALUES (?, ?)", info.name, info.source)
+            return { status: 200, msg: `插件 ${info.name} 新增成功!` }
+        } else {
+            this.mainDB.update("UPDATE `plugins` SET `source` = ? WHERE id = ?", info.source, plugin[0].id)
+            return { status: 200, msg: `插件 ${info.name} 更新成功!` }
+        }
+    }
+}
+
+@JSPlugin({ author: 'MiaoWoo', servers: [constants.ServerType.Spring], source: __filename })
 export class MiaoSpring extends interfaces.Plugin {
     @inject(ContainerInstance)
     private container: Container
@@ -40,6 +75,7 @@ export class MiaoSpring extends interfaces.Plugin {
         this.mappings = new Set()
     }
 
+    @Controllers(PluginController)
     enable() {
         this.registryDefault()
         this.registryPages()
@@ -173,6 +209,7 @@ export class MiaoSpring extends interfaces.Plugin {
             'pluginManager'
         ]
         let params = [
+            base.getInstance().getAutowireCapableBeanFactory(),
             this.mainDatabase,
             reflect,
             this.container,
@@ -187,6 +224,8 @@ return eval(${JSON.stringify(code)});`)
 
     disable() {
         Object.keys(this.mappings).forEach((r) => this.webServer.unregistryMapping(r))
+        this.webServer.unregistryInterceptor({ name: 'RedirectHandle' })
+        this.webServer.unregistryInterceptor({ name: 'StaticHandle' })
     }
 }
 
@@ -195,38 +234,3 @@ class Plugin {
     name: string
     source: string
 }
-
-@Controller()
-class PluginController {
-    @inject(plugin.PluginManager)
-    private pluginManager: plugin.PluginManager
-    @inject(database.DataBaseManager)
-    private databaseManager: DataBaseManager
-
-    private mainDB: DataBase
-
-    @postConstruct()
-    initialize() {
-        this.mainDB = this.databaseManager.getMainDatabase()
-    }
-
-    @Get()
-    list(@Param('install') install: boolean) {
-        if (install) {
-            return { status: 200, data: [...this.pluginManager.getPlugins().values()].map((plugin) => plugin.description), msg: '插件列表获取成功!' }
-        } else {
-            return { status: 200, data: this.mainDB.query<Plugin>("SELECT name FROM plugins WHERE deleted = 0") }
-        }
-    }
-    @Post()
-    deploy(@Body() info: Plugin) {
-        let plugin = this.mainDB.query<Plugin>("SELECT name FROM plugins WHERE name = ?", info.name)
-        if (plugin.length == 0) {
-            this.mainDB.update("INSERT INTO `plugins`(`name`, `source`) VALUES (?, ?)", info.name, info.source)
-            return { status: 200, msg: `插件 ${info.name} 新增成功!` }
-        } else {
-            this.mainDB.update("UPDATE `plugins` SET `source` = ? WHERE id = ?", info.source, plugin[0].id)
-            return { status: 200, msg: `插件 ${info.name} 更新成功!` }
-        }
-    }
-}

packages/plugins/src/MiaoWeb.ts

@@ -1,21 +1,6 @@
-import { constants, web } from "@ccms/api"
+import { constants } from "@ccms/api"
-import { inject } from "@ccms/container"
 import { plugin, interfaces } from "@ccms/plugin"
-import { Controller, Get, Server, Body, Post, Cookie, Header, Param } from "@ccms/web"
+import { Controllers, Controller, Get, Body, Post, Cookie, Header, Param } from "@ccms/web"
-
-@plugin({ name: 'MiaoWeb', version: '1.0.0', author: 'MiaoWoo', servers: [constants.ServerType.Spring], source: __filename })
-export class MiaoWeb extends interfaces.Plugin {
-    @inject(web.Server)
-    private webServer: Server
-
-    enable() {
-        this.webServer.registryController(TestController)
-    }
-
-    disable() {
-        this.webServer.unregistryController(TestController)
-    }
-}
 
 @Controller()
 export class TestController {
@@ -36,4 +21,11 @@ export class TestController {
         }
     }
 }
- 
+
+@plugin({ author: 'MiaoWoo', servers: [constants.ServerType.Spring], source: __filename })
+export class MiaoWeb extends interfaces.Plugin {
+    @Controllers(TestController)
+    enable() {
+
+    }
+}

packages/plugins/tsconfig.json

@@ -5,7 +5,9 @@
         "outDir": "dist",
         "skipLibCheck": true,
         "sourceMap": false,
-        "inlineSourceMap": true
+        "inlineSourceMap": true,
+        "declaration": false,
+        "declarationMap": false
     },
     "exclude": [
         "dist",

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/sponge-api": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.2",
+        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/spring/package.json

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

packages/spring/src/command.ts

@@ -7,10 +7,8 @@ import { CommandMap } from './internal/command'
 
 @provideSingleton(command.Command)
 export class SpringCommand extends command.Command {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
     @inject(CommandMap)
-    private commandMap: CommandMap = new CommandMap()
+    private commandMap: CommandMap
 
     protected create(plugin: any, command: string) {
         return this.commandMap.register(plugin, command)
@@ -22,6 +20,6 @@ export class SpringCommand extends command.Command {
         command.setExecutor(super.setExecutor(plugin, command, executor))
     }
     protected onTabComplete(plugin: any, command: any, tabCompleter: Function) {
-        command.setTabCompleter(super.setExecutor(plugin, command, tabCompleter))
+        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter))
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.8.2",
+    "version": "0.8.4",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -26,10 +26,10 @@
         "@javatypes/tomcat": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.5"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.2",
+        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.2"
+        "@ccms/container": "^0.8.4"
     }
 }

packages/web/src/decorators/index.ts

@@ -1,20 +1,29 @@
-import { decorate, injectable } from "@ccms/container"
+import { plugin } from '@ccms/api'
+import { decorate, injectable, getContainer } from "@ccms/container"
 
 import { METADATA_KEY, PARAM_TYPE } from '../constants'
 import { interfaces } from "../interfaces"
-import { addControllerMetadata, addControllerAction, addActionParam } from "./utils"
+import { addControllerMetadata, addControllerAction, addActionParam, getControllerMetadata } from "./utils"
+
+export const Controllers = (...controllers: any[]) => {
+    return (target: any, propertyKey: string) => {
+        for (const controller of controllers) {
+            addControllerMetadata(getControllerMetadata(controller), target)
+        }
+    }
+}
 
 export const Controller = (metadata?: string | interfaces.ControllerMetadata) => {
     return (target: any) => {
         if (!metadata) { metadata = target.name.toLowerCase().replace('controller', '') }
         if (typeof metadata === "string") { metadata = { path: metadata } }
+        metadata.target = target
         metadata.name = metadata.name || target.name
         metadata.path = metadata.path ?? `/${metadata}`
         metadata.path = metadata.path.startsWith('/') ? metadata.path : `/${metadata.path}`
         decorate(injectable(), target)
         Reflect.defineMetadata(METADATA_KEY.Controller, metadata, target)
         addControllerMetadata(metadata)
-        return
     }
 }
 
@@ -29,7 +38,6 @@ function action(method: interfaces.Method) {
             metadata.executor = propertyKey
             Reflect.defineMetadata(METADATA_KEY.Action, metadata, target[propertyKey])
             addControllerAction(target, propertyKey)
-            return
         }
     }
 }
@@ -50,7 +58,6 @@ function param(type: PARAM_TYPE) {
             metadata.index = index
             metadata.paramtype = Reflect.getMetadata("design:paramtypes", target, propertyKey)[index]
             addActionParam(target, propertyKey, metadata)
-            return
         }
     }
 }
@@ -72,7 +79,6 @@ function Middleware() {
             metadata.executor = propertyKey
             Reflect.defineMetadata(METADATA_KEY.Action, metadata, target[propertyKey])
             addControllerAction(target, propertyKey)
-            return
         }
     }
 }

packages/web/src/decorators/utils.ts

@@ -1,11 +1,13 @@
 import { interfaces } from '../interfaces'
 import { METADATA_KEY } from '../constants'
 
-export function getControllerMetadatas(): interfaces.ControllerMetadata[] {
+export function getControllerMetadatas(target: any = Reflect): Map<string, interfaces.ControllerMetadata> {
-    return Reflect.getMetadata(METADATA_KEY.Controller, Reflect) || []
+    return Reflect.getMetadata(METADATA_KEY.Controller, target) || new Map<string, interfaces.ControllerMetadata>()
 }
-export function addControllerMetadata(metadata: interfaces.ControllerMetadata) {
+export function addControllerMetadata(metadata: interfaces.ControllerMetadata, target: any = Reflect) {
-    Reflect.defineMetadata(METADATA_KEY.Controller, [metadata, ...getControllerMetadatas()], Reflect)
+    let metadatas = getControllerMetadatas(target)
+    metadatas.set(metadata.name, metadata)
+    Reflect.defineMetadata(METADATA_KEY.Controller, metadatas, target)
 }
 export function getControllerActions(target: any): string[] {
     return Reflect.getMetadata(METADATA_KEY.Action, target.constructor) || []

packages/web/src/interfaces/metadata.ts

@@ -19,7 +19,7 @@ export namespace interfaces {
         /**
          * 对象
          */
-        target?: string
+        target?: any
     }
     export interface ControllerMetadata extends WebMetadata {
 

packages/web/src/server.ts

@@ -1,11 +1,11 @@
 import * as querystring from 'querystring'
 
-import { web } from '@ccms/api'
+import { web, plugin } from '@ccms/api'
 import { provideSingleton, JSClass, postConstruct, Container, ContainerInstance, inject } from '@ccms/container'
 
 import { WebProxyBeanName, FilterProxyBeanName, METADATA_KEY, PARAM_TYPE } from './constants'
 import { Context, InterceptorAdapter, RequestHandler, interfaces } from './interfaces'
-import { getControllerActions, getActionMetadata, getControllerMetadata, getActionParams } from './decorators'
+import { getControllerActions, getActionMetadata, getControllerMetadata, getActionParams, getControllerMetadatas } from './decorators'
 
 const HttpServletRequestWrapper = Java.type('javax.servlet.http.HttpServletRequestWrapper')
 const HttpServletResponseWrapper = Java.type('javax.servlet.http.HttpServletResponseWrapper')
@@ -25,6 +25,7 @@ export class Server {
     private StreamUtils = org.springframework.util.StreamUtils
     private ResponseEntity = org.springframework.http.ResponseEntity
 
+    private controllerActions: Map<string, interfaces.ActionMetadata[]>
     private interceptors: Map<string, InterceptorAdapter>
     private methodMappings: Map<string, Map<string, RequestHandler>>
 
@@ -33,9 +34,12 @@ export class Server {
     @postConstruct()
     initialization() {
         this.beanFactory = base.getInstance().getAutowireCapableBeanFactory()
+        this.controllerActions = new Map()
         this.interceptors = new Map()
         this.methodMappings = new Map()
         this.start()
+        process.on('plugin.after.enable', (plugin: plugin.Plugin) => this.registryPlugin(plugin))
+        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.unregistryPlugin(plugin))
     }
 
     start() {
@@ -52,23 +56,36 @@ export class Server {
         }
     }
 
+    registryPlugin(plugin: plugin.Plugin) {
+        let controllers = getControllerMetadatas(plugin).values()
+        for (const controller of controllers) {
+            console.debug(`Plugin ${plugin.description.name} Registry Controller ${controller.name}.`)
+            this.registryController(controller.target)
+        }
+    }
+
+    unregistryPlugin(plugin: plugin.Plugin) {
+        let controllers = getControllerMetadatas(plugin).values()
+        for (const controller of controllers) {
+            console.debug(`Plugin ${plugin.description.name} Unregistry Controller ${controller.name}.`)
+            this.unregistryController(controller.target)
+        }
+    }
+
     registryController(target: any) {
         if (!target) { throw new Error('Controller can\'t be undefiend!') }
         let controllerMetadata = getControllerMetadata(target)
         if (!controllerMetadata) { throw new Error(`Controller ${target.name} must have @Controller decorator!`) }
-        try {
+        target = this.bindController(target)
-            this.container.rebind(METADATA_KEY.Controller).to(target).inSingletonScope().whenTargetNamed(target.name)
-        } catch{
-            this.container.bind(METADATA_KEY.Controller).to(target).inSingletonScope().whenTargetNamed(target.name)
-        }
-        target = this.container.getNamed(METADATA_KEY.Controller, target.name)
         let actions = getControllerActions(target)
+        this.controllerActions.set(controllerMetadata.name, [])
         for (const action of actions) {
             let actionMetadata = getActionMetadata(target, action)
+            this.controllerActions.get(controllerMetadata.name).push(actionMetadata)
             let path = `${controllerMetadata.path || ''}${actionMetadata.path || ''}`
             if (!path) throw new Error(`Controller ${controllerMetadata.name} Action ${actionMetadata.name} path is empty!`)
             if (!this.methodMappings.has(path)) { this.methodMappings.set(path, new Map()) }
-            console.debug(`Controller ${controllerMetadata.name} Registry ${path} to ${actionMetadata.executor || '<anonymous>'} Action function.`)
+            console.debug(`Controller ${controllerMetadata.name} Registry ${path} Action to ${actionMetadata.executor || '<anonymous>'} function.`)
             this.methodMappings.get(path).set(actionMetadata.method || 'ALL', (ctx: Context) => {
                 let args = []
                 let params = getActionParams(target, action)
@@ -97,22 +114,28 @@ export class Server {
         }
     }
 
+    private bindController(target: any) {
+        try {
+            this.container.rebind(METADATA_KEY.Controller).to(target).inSingletonScope().whenTargetNamed(target.name)
+        } catch{
+            this.container.bind(METADATA_KEY.Controller).to(target).inSingletonScope().whenTargetNamed(target.name)
+        }
+        return this.container.getNamed(METADATA_KEY.Controller, target.name)
+    }
+
     unregistryController(target: any) {
         if (!target) { throw new Error('Controller can\'t be undefiend!') }
         let controllerMetadata = getControllerMetadata(target)
         if (!controllerMetadata) { throw new Error(`Controller ${target.name} must have @Controller decorator!`) }
-        try {
+        if (!this.controllerActions.has(controllerMetadata.name)) { return console.warn(`Controller ${controllerMetadata.name} not registry!`) }
-            target = this.container.getNamed(METADATA_KEY.Controller, target.name)
+        let actions = this.controllerActions.get(controllerMetadata.name)
-        } catch (error) {
+        for (const actionMetadata of actions) {
-            throw new Error(`Controller ${target.name} not registry! err: ${error}`)
-        }
-        let actions = getControllerActions(target)
-        for (const action of actions) {
-            let actionMetadata = getActionMetadata(target, action)
             let path = `${controllerMetadata.path || ''}${actionMetadata.path || ''}`
             if (!this.methodMappings.has(path)) { continue }
             this.methodMappings.get(path).delete(actionMetadata.method)
+            console.debug(`Controller ${controllerMetadata.name} Unregistry ${path} Action.`)
         }
+        this.controllerActions.delete(controllerMetadata.name)
     }
 
     registryMapping(path: string, handler: RequestHandler) {
@@ -130,7 +153,9 @@ export class Server {
         this.interceptors.set(interceptor.name, interceptor)
     }
 
-    unregistryInterceptor(interceptor: InterceptorAdapter) {
+    unregistryInterceptor(interceptor: string | InterceptorAdapter) {
+        if (typeof interceptor === "string") { interceptor = { name: interceptor } }
+        console.debug(`Unregistry ${interceptor.name} Interceptor.`)
         this.interceptors.delete(interceptor.name)
     }
 
@@ -170,12 +195,12 @@ export class Server {
     //     return wrapper
     // }
 
-    private notFound(method: string, path: string) {
+    private notFound(ctx: Context) {
         return {
             status: 404,
             msg: "handlerMapping Not Found!",
-            method,
+            method: ctx.request.getMethod(),
-            path,
+            path: ctx.request.getRequestURI(),
             timestamp: Date.now()
         }
     }
@@ -184,12 +209,7 @@ export class Server {
         try { this.beanFactory.destroySingleton(WebProxyBeanName) } catch (ex) { }
         var WebServerProxyNashorn = Java.extend(this.WebServerProxy, {
             process: (req: javax.servlet.http.HttpServletRequest, resp: javax.servlet.http.HttpServletResponse) => {
-                let path = req.getRequestURI()
+                let ctx: Context = { request: req, response: resp, params: {}, body: {} }
-                if (!this.methodMappings.has(path)) return this.notFound(req.getMethod(), path)
-                let mappings = this.methodMappings.get(req.getRequestURI())
-                let handler = mappings.get(req.getMethod()) || mappings.get("ALL")
-                if (!handler) return this.notFound(req.getMethod(), path)
-                let ctx: Context = { request: req, response: resp, params: {}, body: {}, handler }
                 ctx.url = req.getRequestURI()
                 // @ts-ignore
                 ctx.headers = { __noSuchProperty__: (name: string) => req.getHeader(name) }
@@ -250,6 +270,10 @@ export class Server {
                 }
             }
         }
+        let path = ctx.request.getRequestURI()
+        if (!this.methodMappings.has(path)) return this.notFound(ctx)
+        let mappings = this.methodMappings.get(ctx.request.getRequestURI())
+        ctx.handler = mappings.get(ctx.request.getMethod()) || mappings.get("ALL")
         ctx.result = this.execRequestHandle(ctx)
         for (const [_, interceptor] of this.interceptors) {
             if (interceptor.postHandle) {
@@ -283,6 +307,7 @@ Handle   Time   : ${Date.now() - startTime}ms
     }
 
     private execRequestHandle(ctx: Context) {
+        if (!ctx.handler) return this.notFound(ctx)
         try {
             return ctx.handler(ctx)
         } catch (error) {

packages/websocket/package.json

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

tsconfig.json

@@ -7,6 +7,7 @@
         "module": "commonjs",
         "strict": true,
         "strictNullChecks": false,
+        "importHelpers": true,
         "sourceMap": true,
         "declaration": true,
         "declarationMap": true,