v0.6.7

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

.npmignore

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

doc/MCBBS.MD

@@ -4,8 +4,3 @@
 - 更新日志 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=CHANGELOG&color=green)](https://docs.yumc.pw/MiaoScript/CHANGELOG.html)
 - 安装文档 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=MiaoDoc%20USER&color=red)](https://docs.yumc.pw/MiaoScript/1-user/1.1-check-env.html)
 - 开发文档 [![Build Status](https://ci.yumc.pw/job/Minecraft/job/MiaoScript/badge/icon?style=flat-square&subject=MiaoScript&status=MiaoDoc%20DEVELOP&color=darkred)](https://docs.yumc.pw/MiaoScript/2-develop/1.1-check-env.html)
-- 兼容服务端 Spigot CatServer Sponge BungeeCord Nukkit(没错 他还兼容Nukkit)
-
-### 腐竹版本（开发中）
-
-- 先上几张图

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.8.4",
+    "version": "0.6.7",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [
@@ -10,7 +10,6 @@
             "stream": true
         },
         "publish": {
-            "access": "public",
             "registry": "https://repo.yumc.pw/repository/npm-hosted/"
         }
     }

package.json

@@ -12,14 +12,13 @@
         "build": "lerna run build --scope=\"@ccms/!(plugins)\"",
         "build:plugins": "lerna run build --scope=\"@ccms/plugins\"",
         "ug": "yarn upgrade-interactive --latest",
-        "np": "lerna exec \"npm publish --access=public --registry https://registry.npmjs.org\" --scope=\"@ccms/!(client|plugins)\"",
-        "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
-        "lp": "lerna publish --registry https://registry.npmjs.org"
+        "np": "lerna exec \"npm publish --registry https://registry.npmjs.org\" --scope=\"@ccms/!(client|plugins|types)\"",
+        "lp": "lerna publish"
     },
     "workspaces": [
         "packages/*"
     ],
     "devDependencies": {
-        "lerna": "^3.22.1"
+        "lerna": "^3.21.0"
     }
 }

packages/amqp/package.json

@@ -1,35 +0,0 @@
-{
-    "name": "@ccms/amqp",
-    "version": "0.8.4",
-    "description": "MiaoScript amqp 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/amqp/src/adapter/admin.ts

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

packages/amqp/src/adapter/callback.ts

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

packages/amqp/src/adapter/connection.ts

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

packages/amqp/src/adapter/container.ts

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

packages/amqp/src/adapter/converter.ts

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

packages/amqp/src/adapter/index.ts

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

packages/amqp/src/adapter/listener.ts

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

packages/amqp/src/adapter/template.ts

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

packages/amqp/src/admin.ts

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

packages/amqp/src/constants.ts

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

packages/amqp/src/index.ts

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

packages/amqp/src/listener.ts

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

packages/amqp/src/manager.ts

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

packages/amqp/tsconfig.json

@@ -1,7 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "baseUrl": "src",
-        "outDir": "dist"
-    }
-}

packages/api/package.json

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

packages/api/src/command.ts

@@ -1,6 +1,5 @@
 import i18n from '@ccms/i18n'
-import { injectable } from "@ccms/container"
-import { plugin } from './interfaces'
+import { injectable } from "@ccms/container";
 
 export namespace command {
     @injectable()
@@ -11,17 +10,16 @@ export namespace command {
          * @param name 命令
          * @param exec 执行器
          */
-        on(plugin: plugin.Plugin, name: string, exec: { cmd: Function, tab?: Function }) {
-            var cmd = this.create(plugin, name)
-            if (!cmd) { throw Error("") }
+        on(plugin: any, name: string, exec: { cmd: Function, tab?: Function }) {
+            var cmd = this.create(plugin, name);
             console.debug(i18n.translate("ms.api.command.register", { plugin: plugin.description.name, name, cmd }))
             if (exec.cmd && typeof exec.cmd === "function") {
-                this.onCommand(plugin, cmd, exec.cmd)
+                this.onCommand(plugin, cmd, exec.cmd);
             } else {
                 throw Error(i18n.translate("ms.api.command.register.input.error", { exec: exec.cmd }))
             }
             if (exec.tab && typeof exec.tab === "function") {
-                this.onTabComplete(plugin, cmd, exec.tab)
+                this.onTabComplete(plugin, cmd, exec.tab);
             }
         }
         /**
@@ -29,40 +27,40 @@ export namespace command {
          * @param plugin 插件
          * @param name 命令
          */
-        off(plugin: plugin.Plugin, name: string) {
+        off(plugin: any, name: string) {
             console.debug(i18n.translate("ms.api.command.unregister", { plugin: plugin.description.name, name }))
-            this.remove(plugin, name)
+            this.remove(plugin, name);
         }
 
-        protected abstract create(plugin: plugin.Plugin, command: string): any
-        protected abstract remove(plugin: plugin.Plugin, command: string): void
-        protected abstract onCommand(plugin: plugin.Plugin, command: any, executor: Function)
-        protected abstract onTabComplete(plugin: plugin.Plugin, command: any, tabCompleter: Function)
-        protected setExecutor(plugin: plugin.Plugin, command: any, executor: Function) {
+        protected abstract create(plugin: any, command: string);
+        protected abstract remove(plugin: any, command: string);
+        protected abstract onCommand(plugin: any, command: any, executor: Function);
+        protected abstract onTabComplete(plugin: any, command: any, tabCompleter: Function);
+        protected setExecutor(plugin: any, command: any, executor: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    return executor(sender, command, Java.from(args))
+                    return executor(sender, command, Java.from(args));
                 } catch (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)
+                    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)])
                     }
-                    return true
+                    return true;
                 }
             }
         }
-        protected setTabCompleter(plugin: plugin.Plugin, command: any, tabCompleter: Function) {
+        protected setTabCompleter(plugin: any, command: any, tabCompleter: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    var token = args[args.length - 1]
-                    var complete = tabCompleter(sender, command, Java.from(args)) || []
-                    return this.copyPartialMatches(complete, token)
+                    var token = args[args.length - 1];
+                    var complete = tabCompleter(sender, command, Java.from(args)) || [];
+                    return this.copyPartialMatches(complete, token);
                 } catch (ex) {
                     console.i18n("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
-                    console.ex(ex)
-                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
-                    return []
+                    console.ex(ex);
+                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)]);
+                    return [];
                 }
             }
         }
@@ -72,7 +70,7 @@ export namespace command {
                 if (typeof e === "string" && e.toLowerCase().startsWith(token.toLowerCase())) {
                     array.push(e)
                 }
-            })
+            });
             return array
         }
     }

packages/api/src/console.ts

@@ -2,10 +2,10 @@ import i18m from '@ccms/i18n'
 import { SourceMapBuilder } from 'source-map-builder'
 import * as base64 from 'base64-js'
 
-const Arrays = Java.type('java.util.Arrays')
-const Level = Java.type('java.util.logging.Level')
-const Paths = Java.type('java.nio.file.Paths')
-const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
+const Arrays = Java.type('java.util.Arrays');
+const Level = Java.type('java.util.logging.Level');
+const Paths = Java.type('java.nio.file.Paths');
+const ignoreLogPrefix = ['java.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.'];
 
 enum LogLevel {
     ALL,
@@ -19,19 +19,19 @@ enum LogLevel {
 }
 
 export class MiaoScriptConsole implements Console {
-    Console: NodeJS.ConsoleConstructor
+    Console: NodeJS.ConsoleConstructor;
 
-    private static sourceMaps: { [key: string]: SourceMapBuilder } = {}
-    private static sourceFileMaps: { [key: string]: string } = {}
-    private _name: string = ''
-    private _level: LogLevel = LogLevel.INFO
+    private static sourceMaps: { [key: string]: SourceMapBuilder } = {};
+    private static sourceFileMaps: { [key: string]: string } = {};
+    private _name: string = '';
+    private _level: LogLevel = LogLevel.INFO;
 
-    protected logger: any
-    protected prefix: string = '§6[§bMiaoScript§6]§r '
+    protected logger: any;
+    protected prefix: string = '§6[§bMiaoScript§6]§r ';
 
     constructor(name?: string) {
-        this.name = name
-        this.logger = global.logger
+        this.name = name;
+        this.logger = global.logger;
         if (global.debug) {
             this._level = LogLevel.DEBUG
         }
@@ -41,36 +41,36 @@ export class MiaoScriptConsole implements Console {
     }
 
     get name() {
-        return this._name
+        return this._name;
     }
 
     set name(name: string) {
         if (name) {
-            this._name = `[${name}] `
+            this._name = `[${name}] `;
             // noinspection JSUnusedGlobalSymbols
-            this.prefix = `§6[§cMS§6][§b${name}§6]§r `
+            this.prefix = `§6[§cMS§6][§b${name}§6]§r `;
         }
     }
     log(...args: any[]): void {
-        this.logger.info(this.name + args.join(' '))
+        this.logger.info(this.name + args.join(' '));
     }
     info(...args: any[]) {
-        this.logger.info(this.name + args.join(' '))
+        this.logger.info(this.name + args.join(' '));
     }
     warn(...args: any[]) {
-        this.logger.warning(this.name + args.join(' '))
+        this.logger.warning(this.name + args.join(' '));
     }
     error(...args: any[]) {
-        this.logger.log(Level.SEVERE, this.name + args.join(' '))
+        this.logger.log(Level.SEVERE, this.name + args.join(' '));
     }
     debug(...args: any[]) {
         if (global.debug) {
-            this.logger.info(this.name + '[DEBUG] ' + args.join(' '))
+            this.logger.info(this.name + '[DEBUG] ' + args.join(' '));
         }
     }
     trace(...args: any[]): void {
         if (this._level <= LogLevel.TRACE) {
-            this.logger.info(this.name + '[TRACE] ' + args.join(' '))
+            this.logger.info(this.name + '[TRACE] ' + args.join(' '));
         }
     }
     sender(...args) {
@@ -95,29 +95,29 @@ export class MiaoScriptConsole implements Console {
             if (fileName.endsWith('js')) {
                 if (MiaoScriptConsole.sourceMaps[fileName] === undefined) {
                     MiaoScriptConsole.sourceMaps[fileName] = null
-                    let sourceLine = base.read(fileName).split('\n')
+                    let sourceLine = base.read(fileName).split('\n');
                     let lastLine = sourceLine[sourceLine.length - 1]
                     if (lastLine.startsWith('//# sourceMappingURL=')) {
-                        let sourceContent = null
-                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1]
-                        if (sourceMappingURL.startsWith('data:application/jsonbase64,')) {
+                        let sourceContent = null;
+                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1];
+                        if (sourceMappingURL.startsWith('data:application/json;base64,')) {
                             sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
                         } else if (sourceMappingURL.startsWith('http')) {
                             // TODO
                         } else {
-                            let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile()
+                            let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile();
                             if (file.exists()) { sourceContent = base.read(file) }
                         }
                         if (sourceContent) {
                             MiaoScriptConsole.sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
-                            MiaoScriptConsole.sourceFileMaps[fileName] = Paths.get(fileName, '..', MiaoScriptConsole.sourceMaps[fileName].sources[0]).toFile().getCanonicalPath()
+                            MiaoScriptConsole.sourceFileMaps[fileName] = Paths.get(fileName, '..', MiaoScriptConsole.sourceMaps[fileName].sources[0]).toFile().getCanonicalPath();
                         }
                     }
                 }
                 if (MiaoScriptConsole.sourceMaps[fileName]) {
-                    let sourceMapping = MiaoScriptConsole.sourceMaps[fileName].getSource(lineNumber, 25, true, true)
+                    let sourceMapping = MiaoScriptConsole.sourceMaps[fileName].getSource(lineNumber, 25, true, true);
                     fileName = MiaoScriptConsole.sourceFileMaps[fileName]
-                    if (sourceMapping && lineNumber != sourceMapping.mapping.sourceLine) { lineNumber = sourceMapping.mapping.sourceLine }
+                    if (sourceMapping && lineNumber != sourceMapping.mapping.sourceLine) { lineNumber = sourceMapping.mapping.sourceLine; }
                 }
             }
         } catch (error) {
@@ -128,26 +128,22 @@ export class MiaoScriptConsole implements Console {
             lineNumber
         }
     }
-    stack(ex: Error, color: boolean = true): string[] {
-        let stack = ex.getStackTrace()
-        let cache = [(color ? '§c' : '') + ex]
+    stack(ex: Error): string[] {
+        let stack = ex.getStackTrace();
+        let cache = ['§c' + ex];
         //@ts-ignore
         if (stack.class) {
             stack = Arrays.asList(stack)
         }
         stack.forEach(trace => {
-            if (!trace.fileName || trace.fileName.startsWith('jar:file:') || trace.fileName.startsWith('file:')) { return }
+            if (!trace.fileName || trace.fileName.startsWith('jar:file:')) { return }
             if (trace.className.startsWith('<')) {
                 let { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
                 if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
-                if (color) {
-                    cache.push(`    §e->§c ${fileName}:${lineNumber} => §4${trace.methodName}`)
-                } else {
-                    cache.push(`    -> ${fileName}:${lineNumber} => ${trace.methodName}`)
-                }
+                cache.push(`    §e->§c ${fileName} => §4${trace.methodName}:${lineNumber}`)
             } else {
-                let className = trace.className
-                var fileName = trace.fileName as string
+                let className = trace.className;
+                var fileName = trace.fileName as string;
                 if (className.startsWith('jdk.nashorn.internal.scripts')) {
                     className = className.substr(className.lastIndexOf('$') + 1)
                     var { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
@@ -155,74 +151,70 @@ export class MiaoScriptConsole implements Console {
                 } else {
                     for (let prefix in ignoreLogPrefix) {
                         if (className.startsWith(ignoreLogPrefix[prefix])) {
-                            return
+                            return;
                         }
                     }
                 }
-                if (color) {
-                    cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`)
-                } else {
-                    cache.push(`    -> ${className}.${trace.methodName}(${fileName}:${lineNumber})`)
-                }
+                cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`);
             }
-        })
-        return cache
+        });
+        return cache;
     }
     assert(value: any, message?: string, ...optionalParams: any[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     clear(): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     count(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     countReset(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     dir(obj: any, options?: NodeJS.InspectOptions): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     dirxml(...data: any[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     group(...label: any[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     groupCollapsed(...label: any[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     groupEnd(): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     table(tabularData: any, properties?: string[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     time(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     timeEnd(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     timeLog(label?: string, ...data: any[]): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     markTimeline(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     profile(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     profileEnd(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     timeStamp(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     timeline(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
     timelineEnd(label?: string): void {
-        throw new Error("Method not implemented.")
+        throw new Error("Method not implemented.");
     }
 }

packages/api/src/constants.ts

@@ -11,7 +11,6 @@ export namespace constants {
         Bukkit = 'bukkit',
         Sponge = 'sponge',
         Nukkit = 'nukkit',
-        Bungee = 'bungee',
-        Spring = 'spring'
+        Bungee = 'bungee'
     }
 }

packages/api/src/interfaces/amqp.ts

@@ -1,7 +0,0 @@
-export namespace amqp {
-    export const Manager = Symbol('AmqpManager')
-    export namespace rabbit {
-        export const Admin = Symbol('RabbitAdmin')
-        export const Template = Symbol('RabbitTemplate')
-    }
-}

packages/api/src/interfaces/database.ts

@@ -1,5 +0,0 @@
-export namespace database {
-    export const DataBaseManager = Symbol("DataBaseManager");
-    export const DataSource = Symbol("DataSource");
-    export const DataBase = Symbol("DataBase");
-}

packages/api/src/interfaces/index.ts

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

packages/api/src/interfaces/plugin.ts

@@ -2,186 +2,73 @@ export namespace plugin {
     /**
      * MiaoScript Plugin
      */
-    export const Plugin = Symbol("Plugin")
+    export const Plugin = Symbol("Plugin");
     /**
      * MiaoScript Plugin Folder
      */
-    export const PluginFolder = Symbol("PluginFolder")
+    export const PluginFolder = Symbol("PluginFolder");
     /**
      * Runtime Plugin Instance
      */
-    export const PluginInstance = Symbol("PluginInstance")
+    export const PluginInstance = Symbol("PluginInstance");
     /**
      * MiaoScript Plugin Manager Symbol
      */
-    export const PluginManager = Symbol("PluginManager")
+    export const PluginManager = Symbol("PluginManager");
     /**
      * MiaoScript Plugin Manager Interface
      */
     export interface PluginManager {
-        scan(folder: string): void
-        build(): void
-        loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin
-        load(...args: any[]): void
-        enable(...args: any[]): void
-        disable(...args: any[]): void
-        reload(...args: any[]): void
-        getPlugin(name: string): plugin.Plugin
-        getPlugins(): Map<string, plugin.Plugin>
-    }
-    export const PluginScanner = Symbol("PluginScanner")
-    /**
-     * 插件加载元信息
-     */
-    export interface PluginLoadMetadata {
-        /**
-         * 插件加载类型
-         */
-        type: string
-        /**
-         * 插件名称
-         */
-        name?: string
-        /**
-         * 插件文件
-         */
-        file?: string
-        /**
-         * 插件实例
-         */
-        instance?: any
-        /**
-         * 插件元信息
-         */
-        metadata?: PluginMetadata
-        /**
-         * 插件扫描器
-         */
-        scanner: PluginScanner
-        /**
-         * 插件加载器
-         */
-        loader?: PluginLoader
-        /**
-         * 是否已加载
-         */
-        loaded?: boolean
-        [key: string]: any
-    }
-    /**
-     * 插件扫描器
-     */
-    export interface PluginScanner {
-        /**
-         * 扫描器类型
-         */
-        type: string
-        /**
-         * 扫描插件目录 返回插件加载元信息列表
-         * @param target 扫描目标
-         */
-        scan(target: any): PluginLoadMetadata[]
-        /**
-         * 读取插件 返回插件加载元信息
-         * @param target 
-         */
-        read(target: any): PluginLoadMetadata
-        /**
-         * 加载扫描到的目标
-         * @param target 加载目标
-         */
-        load(target: PluginLoadMetadata): PluginLoadMetadata
-    }
-    export const PluginLoader = Symbol("PluginLoader")
-    /**
-     * 插件加载器
-     */
-    export interface PluginLoader {
-        /**
-         * 加载器类型
-         */
-        type: string
-        /**
-         * 加载插件 获取元数据
-         * @param target 加载目标
-         * @param result 扫描器加载的结果
-         */
-        require(loadMetadata: PluginLoadMetadata): PluginLoadMetadata
-        /**
-         * 构建插件
-         * @param metadata 插件元信息
-         */
-        build(metadata: PluginMetadata): Plugin
-        /**
-         * Load 阶段
-         * @param plugin 插件
-         */
-        load(plugin: Plugin): void
-        /**
-         * Enable 阶段
-         * @param plugin 插件
-         */
-        enable(plugin: Plugin): void
-        /**
-         * Disable 阶段
-         * @param plugin 插件
-         */
-        disable(plugin: Plugin): void
-        /**
-         * Reload 阶段
-         * @param plugin 插件
-         */
-        reload(plugin: Plugin): void
+        scan(folder: string): void;
+        build(): void;
+        loadFromFile(file: string): Plugin;
+        load(...args: any[]): void;
+        enable(...args: any[]): void;
+        disable(...args: any[]): void;
+        reload(...args: any[]): void;
+        getPlugins(): Map<string, any>;
     }
     export interface Plugin {
-        description: PluginMetadata
-        logger: Console
-        load(): void
-        enable(): void
-        disable(): void
+        description: PluginMetadata;
+        logger: Console;
+        load(): void;
+        enable(): void;
+        disable(): void;
     }
-    export interface BaseMetadata {
+    interface BaseMetadata {
         /**
          * 名称 为空则为对象名称
          */
-        name?: string
+        name?: string;
         /**
          * 支持的服务器列表 为空则代表所有
          */
-        servers?: string[]
+        servers?: string[];
     }
     export interface PluginMetadata extends BaseMetadata {
         /**
-         * 插件名称 不填默认为类名
+         * 插件名称
          */
-        name?: string
+        name: string;
         /**
          * 前缀
          */
-        prefix?: string
+        prefix?: string;
         /**
-         * 插件版本 不填默认为 1.0.0
+         * 插件版本
          */
-        version?: string
+        version: string;
         /**
-         * 插件作者 不填默认为 Unknow
+         * 插件版本
          */
-        author?: string | string[]
+        author: string | string[];
         /**
          * 插件源文件 必须指定为 __filename
          */
-        source: string
-        /**
-         * 插件类型 默认为 ioc 执行 MiaoScript 加载逻辑
-         */
-        type?: string
-        /**
-         * 插件加载信息
-         */
-        loadMetadata?: PluginLoadMetadata
+        source: string;
         /**
          * 插件本体
          */
-        target?: any
+        target?: any;
     }
 }

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

@@ -1,160 +1,37 @@
-import * as reflect from '@ccms/common/dist/reflect'
-import { injectable, inject } from '@ccms/container'
-
 import { NativePluginManager } from './native_plugin'
-import { constants } from '../../constants'
 
 export namespace server {
     /**
      * Runtime ServerType
      */
-    export const ServerType = Symbol("ServerType")
+    export const ServerType = Symbol("ServerType");
     /**
      * Runtime Console
      */
-    export const Console = Symbol("Console")
+    export const Console = Symbol("Console");
     /**
      * MiaoScript Server
      */
-    export const Server = Symbol("Server")
+    export const Server = Symbol("Server");
     /**
      * Runtime Server Instance
      */
-    export const ServerInstance = Symbol("ServerInstance")
+    export const ServerInstance = Symbol("ServerInstance");
     /**
      * MiaoScript Server
      */
     export interface Server {
-        getVersion(): string
-        getPlayer(name: string): any
-        getOnlinePlayers(): any[]
-        getConsoleSender(): any
-        getService(service: string): any
-        dispatchCommand(sender: string | any, command: string): boolean
-        dispatchConsoleCommand(command: string): boolean
-        getPluginsFolder(): string
-        getNativePluginManager(): NativePluginManager
-        getDedicatedServer?(): any
-        getNettyPipeline(): any
-        getRootLogger(): any
-        sendJson(sender: string | any, json: object | string): void
-        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
-
-        constructor() {
-            this.reflect()
-        }
-
-        getVersion(): string {
-            throw new Error("Method not implemented.")
-        }
-        getPlayer(name: string) {
-            throw new Error("Method not implemented.")
-        }
-        getOnlinePlayers(): any[] {
-            throw new Error("Method not implemented.")
-        }
-        getConsoleSender() {
-            throw new Error("Method not implemented.")
-        }
-        getService(service: string) {
-            throw new Error("Method not implemented.")
-        }
-        dispatchCommand(sender: any, command: string): boolean {
-            throw new Error("Method not implemented.")
-        }
-        dispatchConsoleCommand(command: string): boolean {
-            throw new Error("Method not implemented.")
-        }
-        getPluginsFolder(): string {
-            throw new Error("Method not implemented.")
-        }
-        getNativePluginManager(): NativePluginManager {
-            throw new Error("Method not implemented.")
-        }
-        getDedicatedServer() {
-            throw new Error("Method not implemented.")
-        }
-        getNettyPipeline() {
-            throw new Error("Method not implemented.")
-        }
-        getRootLogger() {
-            throw new Error("Method not implemented.")
-        }
-        sendJson(sender: any, json: string | object): void {
-            throw new Error("Method not implemented.")
-        }
-        tabComplete?(sender: any, input: string, index?: number): string[] {
-            throw new Error("Method not implemented.")
-        }
-        protected reflect() {
-            try {
-                let consoleServer = this.getDedicatedServer()
-                this.reflectPipeline(consoleServer)
-                this.reflectRootLogger(consoleServer)
-            } catch (error) {
-                console.error('Error When Reflect MinecraftServer!', error)
-                console.ex(error)
-            }
-        }
-        protected reflectPipeline(consoleServer: any) {
-            let connection: any
-            let promise: any
-            for (const method of constants.Reflect.Method.getServerConnection) {
-                try {
-                    connection = reflect.on(consoleServer).call(method).get()
-                    if (connection.class.name.indexOf('ServerConnection') !== -1
-                        || connection.class.name.indexOf('NetworkSystem') !== -1) { break }
-                    connection = undefined
-                } catch (error) { }
-            }
-            if (!connection) { console.error("Can't found ServerConnection!"); return }
-            for (const field of constants.Reflect.Field.listeningChannels) {
-                try {
-                    promise = reflect.on(connection).get(field).get().get(0)
-                    if (promise.class.name.indexOf('Promise') !== -1) { break }
-                    promise = undefined
-                } catch (error) { }
-            }
-            if (!promise) { console.error("Can't found listeningChannels!"); return }
-            this.pipeline = reflect.on(promise).get('channel').get().pipeline()
-        }
-        protected reflectRootLogger(consoleServer: any) {
-            try {
-                this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
-            } catch (error) {
-                try { this.rootLogger = reflect.on(consoleServer).get(0).get().parent } catch (error) { }
-            }
-            if (this.rootLogger && this.rootLogger.class.name.indexOf('Logger') === -1) {
-                console.error('Error Logger Class: ' + this.rootLogger.class.name)
-                this.rootLogger = undefined
-            }
-            // get root logger
-            for (let index = 0; index < 5 && this.rootLogger.parent; index++) {
-                this.rootLogger = this.rootLogger.parent
-            }
-            if (!this.rootLogger) { console.error("Can't found rootLogger!") }
-        }
+        getVersion(): string;
+        getPlayer(name: string): any;
+        getOnlinePlayers(): any[];
+        getConsoleSender(): any;
+        getService(service: string): any;
+        dispatchCommand(sender: string | any, command: string): boolean;
+        dispatchConsoleCommand(command: string): boolean;
+        getPluginsFolder(): string;
+        getNativePluginManager(): NativePluginManager;
+        getNettyPipeline(): any;
+        getRootLogger(): any;
+        sendJson(sender: string | any, json: object | string): void;
     }
 }

packages/api/src/interfaces/web.ts

@@ -1,3 +0,0 @@
-export namespace web {
-    export const Server = Symbol('Server')
-}

packages/api/src/task.ts

@@ -58,9 +58,9 @@ export namespace task {
             return this;
         }
 
-        protected run(...args: any[]): void {
+        protected run(): void {
             try {
-                this.func(...args);
+                this.func();
             } catch (ex) {
                 console.console('§4插件执行任务时发生错误', ex)
                 console.ex(ex);
@@ -69,9 +69,8 @@ export namespace task {
 
         /**
          * 提交任务
-         * @param args 任务参数
          */
-        abstract submit(...args: any[]): Cancelable;
+        abstract submit(): Cancelable;
     }
     /**
      * 返可取消的对象

packages/bukkit/package.json

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

packages/bukkit/src/channel.ts

@@ -8,30 +8,18 @@ const Messenger = Bukkit.getMessenger()
 @provideSingleton(channel.Channel)
 export class BukkitChannel extends channel.Channel {
     @inject(plugin.PluginInstance)
-    private pluginInstance: any
+    private pluginInstance: any;
 
-    /**
-     * 给玩家发送通道消息
-     * @param player 接受消息的玩家
-     * @param channel 通道
-     * @param data 数据
-     */
-    send(player: any, channel: string, data: number[]) {
-        player.sendPluginMessage(this.pluginInstance, channel, data)
+    send(player: any, channel: string, data: any) {
+        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/bukkit/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference types="@javatypes/spigot-api" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
 
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'

packages/bukkit/src/server.ts

@@ -7,12 +7,14 @@ import chat from './enhance/chat'
 let Bukkit = org.bukkit.Bukkit;
 
 @provideSingleton(server.Server)
-export class BukkitServer extends server.ReflectServer {
+export class BukkitServer implements server.Server {
     private pluginsFolder: string;
+    private pipeline: any;
+    private rootLogger: any;
 
     constructor() {
-        super();
         this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath();
+        this.reflect()
     }
 
     getPlayer(name: string) {
@@ -45,9 +47,6 @@ export class BukkitServer extends server.ReflectServer {
     getNativePluginManager() {
         return Bukkit.getPluginManager() as any;
     }
-    getDedicatedServer() {
-        return reflect.on(Bukkit.getServer()).get('console').get()
-    }
     getNettyPipeline() {
         return this.pipeline;
     }
@@ -63,4 +62,41 @@ export class BukkitServer extends server.ReflectServer {
             this.dispatchConsoleCommand(result)
         }
     }
+
+    private reflect() {
+        let consoleServer = reflect.on(Bukkit.getServer()).get('console').get()
+        this.reflectPipeline(consoleServer)
+        this.reflectRootLogger(consoleServer)
+    }
+
+    private reflectPipeline(consoleServer: any) {
+        let connection: any;
+        let promise: any;
+        for (const method of constants.Reflect.Method.getServerConnection) {
+            try {
+                connection = reflect.on(consoleServer).call(method).get()
+                if (connection.class.name.indexOf('ServerConnection') !== -1
+                    || connection.class.name.indexOf('NetworkSystem') !== -1) { break; }
+                connection = undefined;
+            } catch (error) { }
+        }
+        if (!connection) { console.error("Can't found ServerConnection!"); return }
+        for (const field of constants.Reflect.Field.listeningChannels) {
+            try {
+                promise = reflect.on(connection).get(field).get().get(0);
+                if (promise.class.name.indexOf('Promise') !== -1) { break; }
+                promise = undefined;
+            } catch (error) { }
+        }
+        if (!promise) { console.error("Can't found listeningChannels!"); return }
+        this.pipeline = reflect.on(promise).get('channel').get().pipeline()
+    }
+
+    private reflectRootLogger(consoleServer: any) {
+        try {
+            this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
+        } catch (error) {
+            console.error("Can't found rootLogger!")
+        }
+    }
 }

packages/bukkit/src/task.ts

@@ -23,8 +23,10 @@ export class BukkitTaskManager implements task.TaskManager {
 }
 
 export class BukkitTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
-        let run = new BukkitRunnable({ run: () => this.run(...args) })
+    submit(): task.Cancelable {
+        let run = new BukkitRunnable({
+            run: () => this.run()
+        })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
             return run[funcName](this.plugin, this.laterTime, this.interval)

packages/bungee/package.json

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

packages/bungee/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'

packages/bungee/src/task.ts

@@ -22,8 +22,8 @@ export class BungeeTaskManager implements task.TaskManager {
 }
 
 export class BungeeTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
-        let run = new Runnable({ run: () => this.run(...args) })
+    submit(): task.Cancelable {
+        let run = new Runnable({ run: () => this.run() })
         if (this.isAsync) {
             return this.plugin.getProxy().getScheduler().runAsync(this.plugin, run)
         }

packages/client/package.json

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

packages/common/package.json

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

packages/common/src/reflect.ts

@@ -1,202 +1,196 @@
-/// <reference types="@javatypes/jdk" />
-
 /**
  * 反射工具类
  * Created by MiaoWoo on 2017/2/9 0009.
  */
-const JavaClass = Java.type('java.lang.Class')
+const JavaClass = Java.type('java.lang.Class');
 const JavaObject = Java.type('java.lang.Object')
-const NoSuchFieldException = Java.type('java.lang.NoSuchFieldException')
-const methodCache = []
+const NoSuchFieldException = Java.type('java.lang.NoSuchFieldException');
+const methodCache = [];
 
 class Reflect {
-    private obj: java.lang.Object
-    private class: java.lang.Class<any>
+    private obj: any;
+    private class: any
 
     constructor(obj: any) {
         // if (obj === undefined || obj === null) { throw Error(`reflect object can't be ${obj}!`) }
         if (obj instanceof JavaClass) {
-            this.obj = null
-            this.class = obj
+            this.obj = null;
+            this.class = obj;
         } else {
-            this.obj = obj
+            this.obj = obj;
             if (obj !== null && obj !== undefined && obj.class) {
-                this.class = obj.class
+                this.class = obj.class;
             }
         }
     }
 
-    method(name: string, ...args: java.lang.Class<any>[]) {
-        return declaredMethod(this.class, name, ...args)
+    method(...args: any[]) {
+        return declaredMethod(this.class, args[0], types(args.slice(1)));
     }
 
     methods() {
-        return Java.from(declaredMethods(this.class))
+        return Java.from(declaredMethods(this.class));
     }
 
-    field(name: string | java.lang.String): Reflect {
+    field(name): Reflect {
         try {
             // Try getting a public field
-            let field = this.class.getField(name)
-            return on(field.get(this.obj))
+            let field = this.class.field(name);
+            return on(field.get(this.obj));
         } catch (ex) {
             // Try again, getting a non-public field
-            return on(accessible(declaredField(this.class, name)).get(this.obj))
+            return on(accessible(declaredField(this.class, name)).get(this.obj));
         }
-    }
+    };
 
-    fields(declared = false): java.lang.reflect.Field[] {
-        return Java.from(declared ? this.class.getDeclaredFields() : this.class.getFields())
+    fields(declared = false) {
+        return Java.from(declared ? this.class.declaredFields : this.class.fields);
     }
 
     values(declared = false) {
-        return this.fields(declared).reduce((cache, field) => { return cache[field.getName()] = this.field(field.getName()).get() }, {}) as any
+        let cache = {};
+        this.fields(declared).forEach(fed => cache[fed.name] = this.field(fed.name).get())
+        return cache;
     }
 
-    call(...args: any[]): Reflect {
-        let params = args.slice(1)
-        let method = accessible(declaredMethod(this.class, args[0], ...types(params)))
-        let result = method.invoke(this.get(), params)
-        return result && on(result)
-    }
+    call(...args): Reflect {
+        let params = args.slice(1);
+        let method = accessible(declaredMethod(this.class, args[0], types(params)));
+        let result = method.invoke(this.get(), params);
+        return result && on(result);
+    };
 
-    get(): any
-    get(index: number, declared?: boolean): Reflect
-    get(prop: string): Reflect
-    get(param?: string | number, declared: boolean = true): Reflect | any {
-        if (param == undefined || param == null) return this.obj
-        if (typeof param == "number") {
-            return on(accessible(this.fields(declared)[param]).get(this.obj))
-        }
-        if (typeof param == "string") {
-            return this.field(param)
-        }
-    }
+    get(...args): Reflect | any {
+        return args.length === 1 ? this.field(args[0]) : this.obj;
+    };
 
-    set(name: any, value: any): Reflect {
-        accessible(declaredField(this.class, name)).set(this.obj, value)
-        return this
-    }
+    // noinspection JSUnusedGlobalSymbols
+    set(name, value): Reflect {
+        accessible(declaredField(this.class, name)).set(this.obj, value);
+        return this;
+    };
 
     create(...args): Reflect {
-        return on(declaredConstructor(this.class, args).newInstance(args))
-    }
+        return on(declaredConstructor(this.class, args).newInstance(args));
+    };
 }
 
 /**
  * Get an array of types for an array of objects
  */
-function types(values: any[], def?: any) {
+function types(values, def?) {
     if (values === null) {
-        return []
+        return [];
     }
-    let result: java.lang.Class<any>[] = []
-    values.forEach(t => result.push((t || def) ? JavaObject.class : t instanceof JavaClass ? t : t.class))
-    return result
+    let result: any[] = [];
+    values.forEach(t => result.push((t || def) ? JavaObject.class : t instanceof JavaClass ? t : t.class));
+    return result;
 }
 
-function accessible<T extends java.lang.reflect.AccessibleObject>(accessible: T): T {
-    if (!accessible?.isAccessible()) {
-        accessible.setAccessible(true)
+function accessible(accessible) {
+    if (accessible === null) {
+        return null;
     }
-    return accessible
+    if (!accessible.isAccessible()) {
+        accessible.setAccessible(true);
+    }
+    return accessible;
 }
 
 function declaredConstructor(clazz, param) {
-    let constructor
+    let constructor;
     try {
-        constructor = clazz.getDeclaredConstructor(types(param))
+        constructor = clazz.getDeclaredConstructor(types(param));
     } catch (ex) {
         try {
-            constructor = clazz.getDeclaredConstructor(types(param, true))
+            constructor = clazz.getDeclaredConstructor(types(param, true));
         } catch (ex) {
-            constructor = clazz.getDeclaredConstructors()[0]
+            constructor = clazz.getDeclaredConstructors()[0];
         }
     }
-    return accessible(constructor)
+    return accessible(constructor);
 }
 
-function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.String) {
+function declaredField(clazz, name) {
     if (!clazz) { throw Error(`target class can't be ${clazz}!`) }
-    let target = clazz
-    let field = null
+    let target = clazz;
+    let field = null;
     // noinspection JSUnresolvedVariable
     while (target !== JavaObject.class) {
         try {
-            field = target.getDeclaredField(name)
-            if (field !== null) { break }
+            field = target.getDeclaredField(name);
+            if (field !== null) { break; }
         } catch (e) {
-            if (target === undefined) { break }
-            target = target.getSuperclass()
+            if (target === undefined) { break; }
+            target = target.getSuperclass();
         }
     }
     if (field === null) {
-        throw new NoSuchFieldException(name + " is not found in " + clazz.getName())
+        throw new NoSuchFieldException(name + " is not found in " + clazz.name);
     }
-    return field
+    return field;
 }
 
-function declaredMethod(clazz: java.lang.Class<any>, name: string, ...clazzs: java.lang.Class<any>[]): java.lang.reflect.Method {
-    let key = clazz.getName() + '.' + name + ':' + (clazzs || []).join(':')
+function declaredMethod(clazz, name, clazzs) {
+    let key = clazz.name + '.' + name + ':' + (clazzs || []).join(':');
     if (!methodCache[key]) {
         try {
-            // @ts-ignore
-            methodCache[key] = clazz.getMethod(name, clazzs)
+            methodCache[key] = clazz.getMethod(name, clazzs);
         } catch (ex) {
             try {
-                methodCache[key] = clazz.getDeclaredMethod(name, clazzs as any)
+                methodCache[key] = clazz.getDeclaredMethod(name, clazzs);
             } catch (ex) {
                 for (const m of Java.from(declaredMethods(clazz))) {
-                    if (m.getName() == name) {
-                        methodCache[key] = m
-                        break
+                    if (m.name == name) {
+                        methodCache[key] = m;
+                        break;
                     }
                 }
             }
         }
     }
-    return methodCache[key]
+    return methodCache[key];
 }
 
-function declaredMethods(clazz: java.lang.Class<any>) {
-    return clazz.getDeclaredMethods()
+function declaredMethods(clazz) {
+    return clazz.declaredMethods;
 }
 
-let classMethodsCache: any[] = []
+let classMethodsCache: any[] = [];
 
 function mapToObject(javaObj) {
     if (!javaObj || !javaObj.class) { throw new TypeError(`参数 ${javaObj} 不是一个Java对象!`) }
-    let target = {}
-    getJavaObjectMethods(javaObj).forEach(t => mapMethod(target, javaObj, t))
-    return target
+    let target = {};
+    getJavaObjectMethods(javaObj).forEach(t => mapMethod(target, javaObj, t));
+    return target;
 }
 
 function getJavaObjectMethods(javaObj) {
-    let className = javaObj.class.name
+    let className = javaObj.class.name;
     if (!classMethodsCache[className]) {
-        let names: any[] = []
-        let methods = javaObj.class.methods
+        let names: any[] = [];
+        let methods = javaObj.class.methods;
         for (let i in methods) {
-            names.push(methods[i].name)
+            names.push(methods[i].name);
         }
-        classMethodsCache[className] = names
+        classMethodsCache[className] = names;
     }
-    return classMethodsCache[className]
+    return classMethodsCache[className];
 }
 
 function mapMethod(target, source, name) {
     target[name] = function __SimpleDynamicMethod__(...args) {
         if (args.length > 0) {
-            return source[name](args)
+            return source[name](args);
         } else {
-            return source[name]()
+            return source[name]();
         }
-    }
+    };
 }
 
 function on(obj) {
     // if (!obj || !obj.class) { throw new TypeError(`参数 ${obj} 不是一个Java对象!`) }
-    return new Reflect(obj)
+    return new Reflect(obj);
 }
 
 export = {

packages/common/src/thread-pool.ts

@@ -1,32 +0,0 @@
-const Thread = Java.type('java.lang.Thread')
-const ThreadGroup = Java.type("java.lang.ThreadGroup")
-const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
-const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor')
-const LinkedBlockingQueue = Java.type("java.util.concurrent.LinkedBlockingQueue")
-
-interface ThreadPoolConfig {
-    corePoolSize?: number
-    maximumPoolSize?: number
-    keepAliveTime?: number
-    workQueueSize?: number
-    groupName: string
-}
-
-export default {
-    create(config: ThreadPoolConfig): java.util.concurrent.ThreadPoolExecutor {
-        let threadCount = new AtomicInteger(0)
-        config = {
-            corePoolSize: 10,
-            maximumPoolSize: 100,
-            keepAliveTime: 60,
-            workQueueSize: 500,
-            ...config
-        }
-        return new ThreadPoolExecutor(
-            config.corePoolSize, config.maximumPoolSize, config.keepAliveTime, Packages.java.util.concurrent.TimeUnit.SECONDS,
-            new LinkedBlockingQueue(config.workQueueSize),
-            (run: any) => new Thread(new ThreadGroup(config.groupName), run, config.groupName + "-" + threadCount.incrementAndGet()),
-            new ThreadPoolExecutor.CallerRunsPolicy()
-        )
-    }
-}

packages/compile/package.json

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

packages/container/package.json

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

packages/container/src/constants.ts

@@ -1,7 +0,0 @@
-export namespace ioc {
-    export const Autowired = Symbol('Autowired')
-    export const Resource = Symbol('Resource')
-    export const JavaClass = Symbol('JavaClass')
-    export const JavaInstance = Symbol('JavaInstance')
-    export const JavaStaticClass = Symbol('JavaStaticClass')
-}

packages/container/src/decorators.ts

@@ -1,9 +1,9 @@
-import { interfaces, Container } from "inversify"
+import { interfaces, Container } from "inversify";
 
-let _container: Container
+let _container: Container;
 
-const ContainerInstance = Symbol.for("@ccms/ioc:Container")
-const INJECTION = Symbol.for("INJECTION")
+const ContainerInstance = Symbol.for("@ccms/ioc:Container");
+const INJECTION = Symbol.for("INJECTION");
 
 function _proxyGetter(
     proto: any,
@@ -13,17 +13,17 @@ function _proxyGetter(
 ) {
     function getter(this: object) {
         if (doCache && !Reflect.hasMetadata(INJECTION, this, key)) {
-            Reflect.defineMetadata(INJECTION, resolve(), this, key)
+            Reflect.defineMetadata(INJECTION, resolve(), this, key);
         }
         if (Reflect.hasMetadata(INJECTION, this, key)) {
-            return Reflect.getMetadata(INJECTION, this, key)
+            return Reflect.getMetadata(INJECTION, this, key);
         } else {
-            return resolve()
+            return resolve();
         }
     }
 
     function setter(this: object, newVal: any) {
-        Reflect.defineMetadata(INJECTION, newVal, this, key)
+        Reflect.defineMetadata(INJECTION, newVal, this, key);
     }
 
     Object.defineProperty(proto, key, {
@@ -31,63 +31,63 @@ function _proxyGetter(
         enumerable: true,
         get: getter,
         set: setter
-    })
+    });
 }
 
 function initContainer(container: Container) {
-    Reflect.defineMetadata(ContainerInstance, container, Reflect)
-    return _container = container
+    Reflect.defineMetadata(ContainerInstance, container, Reflect);
+    _container = container;
 }
 
 function getContainer(): Container {
-    return _container || initContainer(new Container())
+    return _container || Reflect.getMetadata(ContainerInstance, Reflect)
 }
 
 function makePropertyInjectDecorator(doCache: boolean) {
-    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>) {
-        return function (proto: any, key: string): void {
+    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>) {
+        return function(proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().get(serviceIdentifier)
-            }
-            _proxyGetter(proto, key, resolve, doCache)
-        }
-    }
+                return getContainer().get(serviceIdentifier);
+            };
+            _proxyGetter(proto, key, resolve, doCache);
+        };
+    };
 }
 
 function makePropertyInjectNamedDecorator(doCache: boolean) {
-    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>, named: string) {
-        return function (proto: any, key: string): void {
+    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>, named: string) {
+        return function(proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().getNamed(serviceIdentifier, named)
-            }
-            _proxyGetter(proto, key, resolve, doCache)
-        }
-    }
+                return getContainer().getNamed(serviceIdentifier, named);
+            };
+            _proxyGetter(proto, key, resolve, doCache);
+        };
+    };
 }
 
 function makePropertyInjectTaggedDecorator(doCache: boolean) {
-    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>, key: string, value: any) {
-        return function (proto: any, propertyName: string): void {
+    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>, key: string, value: any) {
+        return function(proto: any, propertyName: string): void {
             let resolve = () => {
-                return getContainer().getTagged(serviceIdentifier, key, value)
-            }
-            _proxyGetter(proto, propertyName, resolve, doCache)
-        }
-    }
+                return getContainer().getTagged(serviceIdentifier, key, value);
+            };
+            _proxyGetter(proto, propertyName, resolve, doCache);
+        };
+    };
 }
 
 function makePropertyMultiInjectDecorator(doCache: boolean) {
-    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>) {
-        return function (proto: any, key: string): void {
+    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>) {
+        return function(proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().getAll(serviceIdentifier)
-            }
-            _proxyGetter(proto, key, resolve, doCache)
-        }
-    }
+                return getContainer().getAll(serviceIdentifier);
+            };
+            _proxyGetter(proto, key, resolve, doCache);
+        };
+    };
 }
 
-let doCache = true
+let doCache = true;
 
 let lazyInject = makePropertyInjectDecorator(doCache)
 let lazyInjectNamed = makePropertyInjectNamedDecorator(doCache)
@@ -102,4 +102,4 @@ export {
     lazyInjectNamed,
     lazyInjectTagged,
     lazyMultiInject
-}
+};

packages/container/src/index.ts

@@ -1,91 +1,25 @@
-/// <reference types="@ccms/nashorn" />
+import "reflect-metadata";
+import { initContainer } from './decorators'
+import { interfaces, Container } from 'inversify';
+import { fluentProvide } from 'inversify-binding-decorators';
 
-import "reflect-metadata"
-import { initContainer, getContainer } from './decorators'
-import { interfaces, Container } from 'inversify'
-import { fluentProvide } from 'inversify-binding-decorators'
-import { ioc } from "./constants"
+const provideNamed = (identifier: interfaces.ServiceIdentifier<any>, name: string) => {
+    return fluentProvide(identifier).whenTargetNamed(name).done();
+};
 
-/**
- * 注册一个命名对象
- * @param identifier 标识符
- * @param name 名称
- */
-export const provideNamed = (identifier: interfaces.ServiceIdentifier<any>, name: string) => {
-    return fluentProvide(identifier).whenTargetNamed(name).done()
-}
+const provideSingleton = (identifier: interfaces.ServiceIdentifier<any>) => {
+    return fluentProvide(identifier).inSingletonScope().done();
+};
 
-/**
- * 注册一个单例对象
- * @param identifier 标识符
- */
-export const provideSingleton = (identifier: interfaces.ServiceIdentifier<any>) => {
-    return fluentProvide(identifier).inSingletonScope().done()
-}
-
-/**
- * 注册一个单例对象
- * @param identifier 标识符
- */
-export const provideSingletonNamed = (identifier: interfaces.ServiceIdentifier<any>, name: string) => {
-    return fluentProvide(identifier).inSingletonScope().whenTargetNamed(name).done()
-}
-
-/**
- * 获得一个 java.lang.Class
- * @param className Java全类名
- */
-export const JavaClass = (className: string) => {
-    return function (target: any, propertyKey: string, index?: number) {
-        try { target[propertyKey] = Java.type(className).class; return } catch (error) { }
-        try { target[propertyKey] = base.getClass(className); return } catch (error) { }
-        console.warn('JavaClass Inject target', target, 'propertyKey', propertyKey, 'failed!')
-    }
-}
-
-/**
- * 获得一个JS的Java类
- * @param className Java 全类名
- */
-export const JSClass = (className: string) => {
-    return function (target: any, propertyKey: string, index?: number) {
-        try { target[propertyKey] = Java.type(className); return } catch (error) { }
-        try { target[propertyKey] = base.getClass(className).static; return } catch (error) { }
-        console.warn('JSClass Inject target', target, 'propertyKey', propertyKey, 'failed!')
-    }
-}
-
-/**
- * 自动注入实例由平台实现
- * @param className 类名
- */
-export const Autowired = (className?: string | any) => {
-    return function (target: any, propertyKey: string) {
-        target[propertyKey] = getContainer().getNamed(ioc.Autowired, className || propertyKey)
-    }
-}
-
-/**
- * 自动注入资源由平台实现
- * @param className 类名
- */
-export const Resource = (resourceName?: string | any) => {
-    return function (target: any, propertyKey: string) {
-        target[propertyKey] = getContainer().getNamed(ioc.Resource, resourceName || propertyKey)
-    }
-}
-
-export const reduceMetadata = (ctx: interfaces.Context): any => {
-    return ctx.currentRequest.target.metadata.reduce((result, entry, index) => {
-        result[entry.key] = entry.value
-        return result
-    }, {})
-}
-
-export const DefaultContainer = new Container()
-initContainer(DefaultContainer)
+const DefaultContainer = new Container();
+initContainer(DefaultContainer);
 
 export * from 'inversify'
-export * from './constants'
 export * from './decorators'
 export * from 'inversify-binding-decorators'
+export {
+    fluentProvide,
+    provideNamed,
+    provideSingleton,
+    DefaultContainer
+};

packages/core/package.json

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

packages/core/src/index.ts

@@ -26,16 +26,17 @@ class MiaoScriptCore {
     }
 
     loadServerConsole() {
+        global.setGlobal('eventCenter', new EventEmitter(), { writable: false, configurable: false });
         //@ts-ignore
         global.setGlobal('console', new this.Console(), { writable: false, configurable: false })
     }
 
     loadTaskFunction() {
-        global.setGlobal('setTimeout', (func: Function, tick: number, ...args: any[]) => {
-            return this.taskManager.create(func).later(tick).submit(...args)
+        global.setGlobal('setTimeout', (func: Function, tick: number, async: boolean = false) => {
+            this.taskManager.create(func).later(tick).async(async).submit()
         }, { writable: false, configurable: false })
-        global.setGlobal('setInterval', (func: Function, tick: number, ...args: any[]) => {
-            return this.taskManager.create(func).timer(tick).submit(...args)
+        global.setGlobal('setInterval', (func: Function, tick: number, async: boolean = false) => {
+            this.taskManager.create(func).timer(tick).async(async).submit()
         }, { writable: false, configurable: false })
     }
 
@@ -53,7 +54,8 @@ class MiaoScriptCore {
         console.i18n("ms.core.engine.disable")
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
-        process.exit(0)
+        //@ts-ignore
+        require.disable()
     }
 }
 
@@ -78,11 +80,6 @@ function detectServer(): constants.ServerType {
         return constants.ServerType.Bungee
     } catch (ex) {
     }
-    try {
-        Java.type("org.springframework.boot.SpringApplication")
-        return constants.ServerType.Spring
-    } catch (ex) {
-    }
     throw Error('Unknow Server Type...')
 }
 
@@ -97,7 +94,6 @@ 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/.npmignore

@@ -1 +0,0 @@
-../../.npmignore

packages/database/package.json

@@ -1,31 +0,0 @@
-{
-    "name": "@ccms/database",
-    "version": "0.8.4",
-    "description": "MiaoScript database 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"
-    },
-    "devDependencies": {
-        "@javatypes/spring-jdbc": "^0.0.2",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
-    },
-    "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.4"
-    }
-}

packages/database/src/constants.ts

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

packages/database/src/database.ts

@@ -1,90 +0,0 @@
-import { Model } from './model'
-
-const HikariDataSource = Java.type('com.zaxxer.hikari.HikariDataSource')
-const HikariConfig = Java.type('com.zaxxer.hikari.HikariConfig')
-const JdbcTemplate = Java.type('org.springframework.jdbc.core.JdbcTemplate')
-
-/**
- * 数据库配置
- */
-export interface DataBaseConfig {
-    /**
-     * 数据库连接串
-     */
-    url: string | javax.sql.DataSource
-    /**
-     * 数据库驱动
-     */
-    driverClassName?: string
-    /**
-     * 用户名
-     */
-    username?: string
-    /**
-     * 密码
-     */
-    password?: string
-}
-
-/**
- * 数据库封装类
- */
-export class DataBase {
-    private dataSource: javax.sql.DataSource
-    private jdbcTemplate: org.springframework.jdbc.core.JdbcTemplate
-
-    constructor(dbConfig: DataBaseConfig) {
-        if (!dbConfig.url) { throw new Error('DataBase url can\'t be null!') }
-        this.createDataSource(dbConfig)
-        this.initialize()
-    }
-
-    private createDataSource(dbConfig: DataBaseConfig) {
-        if (typeof dbConfig.url === "string") {
-            if (!dbConfig.username || !dbConfig.password) {
-                throw new Error('DataBase username or password can\'t be null!')
-            }
-            let config = new HikariConfig()
-            if (dbConfig.driverClassName) {
-                config.setDriverClassName(dbConfig.driverClassName)
-            }
-            config.setUsername(dbConfig.username)
-            config.setPassword(dbConfig.password)
-            config.setJdbcUrl(dbConfig.url)
-            this.dataSource = new HikariDataSource(config)
-        } else {
-            this.dataSource = dbConfig.url
-        }
-    }
-
-    private initialize() {
-        this.jdbcTemplate = new JdbcTemplate(this.dataSource)
-    }
-
-    /**
-     * 执行SQL查询
-     * @param sql SQL语句
-     */
-    query<T>(sql: string, ...args: any[]): Array<T> {
-        let startTime = Date.now()
-        let result = Java.from<any>(this.jdbcTemplate.queryForList(sql, args))
-        console.debug(java.lang.String.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
-        return result
-    }
-
-    /**
-     * 执行SQL更新
-     * @param sql SQL语句
-     */
-    update(sql: string, ...args: any[]): number {
-        let startTime = Date.now()
-        let result = this.jdbcTemplate.update(sql, args)
-        console.debug(java.lang.String.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
-        return result
-    }
-
-    close() {
-        //@ts-ignore
-        this.dataSource.close()
-    }
-}

packages/database/src/decorators.ts

@@ -1,7 +0,0 @@
-import 'reflect-metadata'
-
-export function id() {
-    return (target: Object, propertyKey: string | symbol) => void {
-        
-    }
-}

packages/database/src/index.ts

@@ -1,6 +0,0 @@
-/// <reference types="@ccms/nashorn" />
-/// <reference types="@javatypes/jdk" />
-/// <reference types="@javatypes/spring-jdbc" />
-
-export * from './database'
-export * from './manager'

packages/database/src/manager.ts

@@ -1,53 +0,0 @@
-import { plugin, database } from '@ccms/api'
-import { provideSingleton, inject, postConstruct } from '@ccms/container'
-import { DataBase, DataBaseConfig } from './database'
-
-@provideSingleton(database.DataBaseManager)
-export class DataBaseManager {
-    @inject(plugin.PluginInstance)
-    private instance: any
-
-    private beanFactory: any
-    private mainDatabase: DataBase
-    private databases: { [key: string]: DataBase } = {}
-
-    @postConstruct()
-    initialize() {
-        try {
-            this.beanFactory = this.instance.getAutowireCapableBeanFactory()
-            let mainDatasource = this.beanFactory.getBean(Packages.javax.sql.DataSource.class)
-            this.mainDatabase = new DataBase({ url: mainDatasource })
-        } catch (error) {
-            console.ex(error)
-        }
-    }
-
-    /**
-     * 获得主数据库
-     * Get MainDatabase
-     */
-    getMainDatabase() {
-        return this.mainDatabase
-    }
-
-    /**
-     * 创建数据库
-     * Create A Database Instance
-     * @param name 数据库名称 用于代码 database Name use at code
-     * @param config 数据库配置
-     */
-    createDatabase(name: string, config: DataBaseConfig) {
-        Java.synchronized(() => {
-            if (this.databases[name]) return this.databases[name]
-            return this.databases[name] = new DataBase(config)
-        }, this.databases)()
-    }
-
-    getDatabase(name: string) {
-        return this.databases[name]
-    }
-
-    disable() {
-        Object.values(this.databases).forEach((ds) => ds?.close())
-    }
-}

packages/database/src/model.ts

@@ -1,11 +0,0 @@
-import { DataBase } from "./database"
-
-export class Model<T> {
-    constructor(private database: DataBase) {
-
-    }
-    queryForList(): Array<T> {
-        
-        return []
-    }
-}

packages/database/tsconfig.json

@@ -1,7 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "baseUrl": "src",
-        "outDir": "dist"
-    }
-}

packages/i18n/package.json

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

packages/keyvalue/package.json

@@ -1,35 +0,0 @@
-{
-    "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/build.sh

@@ -0,0 +1,12 @@
+# sponge bukkit jdk bungee nukkit
+TYPE=nukkit
+TARGET=../types/dist/typings
+npx tsc src/build.ts --outDir dist
+cd dist
+rm -rf temp
+mkdir -p temp
+node build.js ${TYPE}
+cd ../
+rm -rf ${TARGET}/${TYPE}
+mkdir -p ${TARGET}/${TYPE}
+cp dist/temp/* ${TARGET}/${TYPE}/ -R

packages/nashorn/package.json

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

packages/nashorn/src/build.ts

@@ -0,0 +1,200 @@
+import * as fs from "fs";
+
+function convertJson2TypeDefiend(infile: string, outDir: string) {
+    const file = infile.split(".json")[0];
+    const json = fs.readFileSync(`${inDir}/${file}.json`).toString();
+    const obj = JSON.parse(json);
+    const qnas: string[] = obj.qualifiedName.split(".");
+    let closeBuk = 0;
+    let temp = `declare namespace ${qnas[0]} {\n`;
+    closeBuk++;
+    const nms = qnas.slice(1, qnas.length - 1);
+    for (const nm of nms) {
+        temp += `${'    '.repeat(closeBuk)}namespace ${nm.replace('function', 'function$')} {\n`;
+        closeBuk++;
+    }
+    let classModifier = formatClassModifier(obj.modifiers)
+    temp += `${'    '.repeat(closeBuk)}// @ts-ignore\n`
+    temp += `${'    '.repeat(closeBuk)}${classModifier}${qnas[qnas.length - 1]}`
+    let isInterface = classModifier.includes('interface')
+    let safeInterface = [];
+    for (const ifs of obj.interfaces) {
+        if (!ifs.qualifiedName.startsWith('java')) {
+            safeInterface.push(ifs)
+        }
+    }
+    if (isInterface) {
+        if (safeInterface.length > 0) {
+            temp += ' extends '
+            for (const ifs of safeInterface) {
+                temp += ifs.qualifiedName;
+                temp += ', '
+            }
+            temp = temp.substr(0, temp.length - 2);
+        }
+    } else {
+        temp += `${(obj.superclass) ? (' extends ' + (obj.superclass.qualifiedName == "<any>" ? "object" : obj.superclass.qualifiedName)) : ''}`;
+        if (safeInterface.length > 0) {
+            temp += ' implements '
+            for (const ifs of safeInterface) {
+                temp += ifs.qualifiedName;
+                temp += ', '
+            }
+            temp = temp.substr(0, temp.length - 2);
+        }
+    }
+    temp += ' {\n'
+    closeBuk++;
+    for (const constructor of obj.constructors) {
+        temp += `${formatDoc(constructor.docString, closeBuk)}${'    '.repeat(closeBuk)}// @ts-ignore\n${'    '.repeat(closeBuk)}constructor(${formatParameters(constructor.parameters)})\n`;
+    }
+
+    let members = [];
+
+    let methods = '';
+    for (const method of obj.methods) {
+        let methodModifier = isInterface ? '' : replaceModifiers(method.modifiers, classModifier.includes('abstract'))
+        if (!whiteKey.includes(method.name)) {
+            if (members[method.name] && methodModifier.includes('abstract')) {
+                continue;
+            }
+            members[method.name] = methodModifier;
+        }
+        methods += `${formatDoc(method.docString, closeBuk)}${'    '.repeat(closeBuk)}// @ts-ignore\n${'    '.repeat(closeBuk)}${methodModifier} ${method.name}(${formatParameters(method.parameters)}): ${mappingType(method.returnType.type)};\n`;
+    }
+
+    let fields = '';
+    for (const field of obj.fields) {
+        if (members[field.name]) {
+            continue;
+        }
+        fields += `${'    '.repeat(closeBuk)}// @ts-ignore\n${'    '.repeat(closeBuk)}${isInterface ? '' : replaceModifiers(field.modifiers)} ${field.name}: ${mappingType(field.type ? field.type.type : "any")};\n`;
+    }
+
+    temp += fields + methods;
+
+    for (let index = 0; index < closeBuk; index++) {
+        temp += `${'    '.repeat(closeBuk - index - 1)}}\n`;
+    }
+
+    fs.writeFileSync(`${outDir}/${file}.${suffix}`, temp);
+    return `${file}.${suffix}`;
+}
+
+function formatClassModifier(modifiers: string) {
+    let tempm = modifiers.replace('public', '').replace('static', '').replace('final', '').trim();
+    if (!modifiers.includes('interface')) { tempm += ' class' }
+    return tempm.length > 0 ? (tempm + ' ') : '';
+}
+
+function formatDoc(doc: string, closeBuk: number) {
+    let middleDoc = '';
+    for (const line of doc.split('\n')) {
+        if (line.trim().length != 0) {
+            middleDoc += `${'    '.repeat(closeBuk)} * ${line.trim()}\n`
+        }
+    }
+    return middleDoc.length > 0 ? `${'    '.repeat(closeBuk)}/**\n${middleDoc}${'    '.repeat(closeBuk)} */\n` : '';
+}
+
+function replaceModifiers(modifiers: string, absClass = false): string {
+    // modifiers = modifiers.replace(' final', ' readonly');
+    modifiers = modifiers.split(" final")[0];
+    modifiers = modifiers.split(" native")[0];
+    modifiers = modifiers.split(" volatile")[0];
+    modifiers = modifiers.split(" transient")[0];
+    modifiers = modifiers.split(" synchronized")[0];
+    if (!absClass) {
+        modifiers = modifiers.split(" abstract")[0];
+    }
+    return modifiers;
+}
+
+function formatParameters(params: any[]) {
+    let tempParam = '';
+    for (const p of params) {
+        tempParam += `${mappingName(p.name)}: ${mappingType(p.type ? p.type.qualifiedName : 'any')}, `
+    }
+    return tempParam.substr(0, tempParam.length - 2);
+}
+
+const nameMap = [];
+nameMap['function'] = 'func'
+nameMap['in'] = 'input'
+nameMap['var'] = 'variable'
+
+function mappingName(name: string) {
+    if (whiteKey.includes(name)) { return name }
+    let outName = nameMap[name] || name || '';
+    return outName;
+}
+
+let whiteKey = ['shift', "map", 'filter', 'values', 'valueOf', 'toString', 'length', 'includes', 'entries', 'keys', 'join', 'fill']
+
+const typeMap = [];
+typeMap['int'] = 'number';
+typeMap['int[]'] = 'number[]';
+typeMap['int[][]'] = 'number[][]';
+typeMap['byte'] = 'number';
+typeMap['byte[]'] = 'number[]';
+typeMap['double'] = 'number';
+typeMap['double[]'] = 'number[]';
+typeMap['short'] = 'number';
+typeMap['short[]'] = 'number[]';
+typeMap['float'] = 'number';
+typeMap['float[]'] = 'number[]';
+typeMap['long'] = 'number';
+typeMap['long[]'] = 'number[]';
+typeMap['<any>'] = 'any';
+typeMap['char'] = 'string';
+typeMap['char[]'] = 'string[]';
+typeMap['java.lang.String'] = "string";
+// typeMap['java.util.Date'] = 'any /*java.util.Date*/'
+// typeMap['java.util.List'] = 'any[] /*java.util.List*/'
+// typeMap['java.util.Set'] = 'any[] /*java.util.Set*/'
+// typeMap['java.util.Collection'] = 'any[] /*java.util.Collection*/'
+// typeMap['java.util.Map'] = 'Map<any, any> /*java.util.Map*/'
+// Sponge
+typeMap['Vectori'] = 'any /*Vector3i*/'
+typeMap['Vectord'] = 'any /*Vector3d*/'
+typeMap['Vectorf'] = 'any /*Vector3f*/'
+typeMap['Vector2i'] = 'any /*Vector2i*/'
+typeMap['Vector2d'] = 'any /*Vector2d*/'
+typeMap['Vector2f'] = 'any /*Vector2f*/'
+typeMap['Vector3i'] = 'any /*Vector3i*/'
+typeMap['Vector3d'] = 'any /*Vector3d*/'
+typeMap['Vector3f'] = 'any /*Vector3f*/'
+typeMap['Type'] = 'any /*Type*/'
+typeMap['Gson'] = 'any /*Gson*/'
+typeMap['Logger'] = 'any /*Logger*/'
+typeMap['MethodVisitor'] = 'any /*MethodVisitor*/'
+typeMap['ConfigurationNode'] = 'any /*ConfigurationNode*/'
+typeMap['TypeSerializerCollection'] = 'any /*TypeSerializerCollection*/'
+typeMap['Quaterniond'] = 'any /*Quaterniond*/'
+typeMap['Matrix2d'] = 'any /*Matrix2d*/'
+typeMap['Matrix3d'] = 'any /*Matrix3d*/'
+typeMap['Matrix4d'] = 'any /*Matrix4d*/'
+
+function mappingType(type: string): string {
+    let outType = typeMap[type] || type || 'any';
+    if (outType.indexOf('.') != -1) {
+        if (outType.startsWith('java.') || outType.startsWith('org.') || outType.startsWith('net.') || outType.startsWith('cn.')) {
+
+        } else {
+            outType = `any /*${outType}*/`
+        }
+    }
+    return outType.replace('function', 'function$');
+}
+
+var args = process.argv.splice(2)
+
+const suffix = 'd.ts'
+const inDir = `../docs/${args[0]}`
+const outDir = "./temp";
+const files = fs.readdirSync(inDir);
+let index = '';
+for (const file of files) {
+    index += `/// <reference path="./${convertJson2TypeDefiend(file, outDir)}" />\n`;
+}
+fs.writeFileSync(`${outDir}/index.${suffix}`, index);

packages/nashorn/src/index.ts

@@ -1,86 +1,79 @@
 declare global {
-    const __FILE__: string
-    const __LINE__: number
-    const __DIR__: string
-    const Packages: any
+    const __FILE__: string;
+    const __LINE__: number;
+    const __DIR__: string;
+    let Packages: any;
 
-    function print(...message: any[]): void
-    function load(script: string | object)
-    function loadWithNewGlobal(script: string | object)
-    function exit(code?: number)
-    function quit(code?: number)
-    function JavaImporter(...className: string[])
+    function print(...message: any[]): void;
+    function load(script: string | object);
+    function loadWithNewGlobal(script: string | object);
+    function exit(code?: number);
+    function quit(code?: number);
+    function JavaImporter(...className: string[]);
 
     namespace Java {
-        function type<T = any>(clazz: string): T
-        function from<T = any>(javaObj: T[]): T[]
-        function to<T = any>(array: T[], type?: T): T[]
-        function extend(...parentTypes: any[]): any
-        function synchronized(func: () => void, lock: any): Function
-        function asJSONCompatible<T = any>(obj: T): T
+        function type(clazz: string): any;
+        function from(javaObj: any): any[];
+        function to(array: any[]): any;
+        function extend(...parentTypes: any[]);
         //@ts-ignore
         // function super(type: any);
     }
 
     interface Error {
-        readonly class?: any
-        readonly lineNumber?: number
-        readonly columnNumber?: number
-        readonly fileName?: string
-        dumpStack?: Function
-        printStackTrace?: Function
-        getStackTrace?: () => any[]
+        readonly lineNumber?: number;
+        readonly columnNumber?: number;
+        readonly fileName?: string;
+        dumpStack?: Function;
+        printStackTrace?: Function;
+        getStackTrace?: () => any[];
     }
 
     interface String {
-        trimLeft(): string
-        trimRight(): string
+        trimLeft(): string;
+        trimRight(): string;
     }
 
     interface Object {
-        setPrototypeOf(obj: object, prototype: object): void
-        bindProperties(to: object, from: object): void
+        setPrototypeOf(obj: object, prototype: object): void;
+        bindProperties(to: object, from: object): void;
     }
 
     namespace NodeJS {
         interface Global {
-            scope: string
-            logger: any
-            debug: boolean
-            level: string
-            NashornEngineStartTime: number
-            setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void
-            noop: () => void
-            console: Console
-        }
-        interface Process {
-            on(event: string, listener: any): this
-            emit(event: string, ...message: any): this
+            scope: string;
+            logger: any;
+            debug: boolean;
+            level: string;
+            eventCenter: EventEmitter;
+            NashornEngineStartTime: number;
+            setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void;
+            noop: () => void;
+            console: Console;
         }
     }
-    const root: string
-    const base: Core
-    const ScriptEngineContextHolder: any
-    function engineLoad(str: string | { script: string, name: string }): any
+    var root: string;
+    var base: Core;
+    var ScriptEngineContextHolder: any;
+    function engineLoad(str: string): any;
     interface Core {
-        getClass(name: String): any
-        getProxyClass(): any
-        getInstance(): any
-        read(path: string): string
-        save(path: string, content: string): void
-        delete(path: string): void
+        getClass(name: String): any;
+        getProxyClass(): any;
+        getInstance(): any;
+        read(path: string): string;
+        save(path: string, content: string): void;
+        delete(path: string): void;
     }
     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
+        ex(err: Error): void;
+        stack(err: Error): string[];
+        sender(...args: any): void;
+        console(...args: any): void;
+        i18n(name: string, ...params: any[]): void;
     }
     interface ProxyConstructor {
-        newProxy<T extends object>(target: T, handler: ProxyHandler<T>): T
+        newProxy<T extends object>(target: T, handler: ProxyHandler<T>): T;
     }
 }
 
-export { }
+export { };

packages/nodejs/package.json

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

packages/nukkit/package.json

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

packages/nukkit/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference types="@javatypes/nukkit-api" />
+/// <reference types="@ccms/types/dist/typings/nukkit" />
 
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'

packages/nukkit/src/task.ts

@@ -21,8 +21,10 @@ export class NukkitTaskManager implements task.TaskManager {
 }
 
 export class NukkitTask extends task.Task {
-    submit(...args: any[]): task.Cancelable {
-        let run = new NukkitRunnable({ run: () => this.run(...args) })
+    submit(): task.Cancelable {
+        let run = new NukkitRunnable({
+            run: () => this.run()
+        })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
             run[funcName](this.plugin, this.laterTime, this.interval);

packages/ployfill/package.json

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

packages/ployfill/src/index.ts

@@ -1,15 +1,13 @@
 /// <reference types="@ccms/nashorn" />
-import '@ccms/nodejs'
+
 import i18n from '@ccms/i18n'
-let ployfillStartTime = new Date().getTime()
-i18n.initialize()
-console.i18n("ms.ployfill.initialize")
-require('./es5-ext')
-require('./node-shim')
-require('core-js')
-//@ts-ignore
-process.on('exit', () => require.disable())
+let ployfillStartTime = new Date().getTime();
+i18n.initialize();
+console.i18n("ms.ployfill.initialize");
+require('./es5-ext');
+require('core-js');
+require('./node-shim');
 global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 global.setGlobal('Blob', require('blob-polyfill').Blob)
-console.i18n("ms.ployfill.completed", { time: (new Date().getTime() - ployfillStartTime) / 1000 })
+console.i18n("ms.ployfill.completed", { time: (new Date().getTime() - ployfillStartTime) / 1000 });

packages/ployfill/src/node-shim.ts

@@ -1,37 +1,8 @@
-import { EventEmitter } from 'events'
-
-const Thread = Java.type('java.lang.Thread')
-const ThreadGroup = Java.type("java.lang.ThreadGroup")
-const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
-const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor')
-const LinkedBlockingQueue = Java.type("java.util.concurrent.LinkedBlockingQueue")
-
-const threadCount = new AtomicInteger(0)
-const threadGroup = new ThreadGroup("@ccms/ployfill-micro-task")
-const microTaskPool = new ThreadPoolExecutor(
-    10, 100, 60, Packages.java.util.concurrent.TimeUnit.SECONDS,
-    new LinkedBlockingQueue(500),
-    (run: any) => new Thread(threadGroup, run, "@ccms/micro-task-" + threadCount.incrementAndGet()),
-    new ThreadPoolExecutor.CallerRunsPolicy()
-)
-
-class Process extends EventEmitter {
-    env = {
+global.setGlobal('process', {
+    env: {
         __noSuchProperty__: (prop) => {
             return Packages.java.lang.System.getenv(prop)
         }
-    }
-    platform = Packages.java.lang.System.getProperty("os.name")
-    nextTick(func: Function) {
-        microTaskPool.execute(func)
-    }
-    queueMicrotask(func: Function) {
-        microTaskPool.execute(func)
-    }
-    exit(code: number) {
-        process.emit('exit', code)
-        microTaskPool.shutdown()
-    }
-}
-global.setGlobal('process', new Process(), {})
-global.setGlobal('queueMicrotask', (func: any) => microTaskPool.execute(func), {})
+    },
+    platform: Packages.java.lang.System.getProperty("os.name")
+}, {})

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.8.4",
+    "version": "0.6.7",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@types/js-yaml": "^3.12.5",
+        "@types/js-yaml": "^3.12.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.6"
+        "typescript": "^3.9.2"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4",
-        "@ccms/i18n": "^0.8.4",
-        "js-yaml": "^3.14.0"
+        "@ccms/api": "^0.6.7",
+        "@ccms/common": "^0.6.7",
+        "@ccms/container": "^0.6.7",
+        "@ccms/i18n": "^0.6.7",
+        "js-yaml": "^3.13.1"
     }
 }

packages/plugin/src/command.ts

@@ -1,36 +0,0 @@
-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,75 +1,33 @@
 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
-    dump(variable: any): string
+    load(content: string): any;
+    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)
-}
-
-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)
-        }
-    }
+    return configLoaderMap.get(format);
 }
 
 function init() {
@@ -77,8 +35,6 @@ 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

@@ -1,5 +1,4 @@
-import { plugin as pluginApi } from "@ccms/api"
-import { injectable, decorate } from "@ccms/container"
+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'
@@ -8,19 +7,19 @@ import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata
  * MiaoScript plugin
  * @param metadata PluginMetadata
  */
-export function plugin(metadata: pluginApi.PluginMetadata | any) {
+export function plugin(metadata: interfaces.PluginMetadata) {
     return function (target: any) {
-        if (!metadata.source) metadata = { souece: metadata }
-        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()
-        previousMetadata.set(metadata.name, metadata)
-        Reflect.defineMetadata(METADATA_KEY.plugin, previousMetadata, Reflect)
-        const previousSources: Map<string, pluginApi.PluginMetadata> = getPluginSources()
-        previousSources.set(metadata.source.toString(), metadata)
-        Reflect.defineMetadata(METADATA_KEY.souece, previousSources, Reflect)
-    }
+        metadata.target = target;
+        metadata.type = "ioc";
+        decorate(injectable(), target);
+        Reflect.defineMetadata(METADATA_KEY.plugin, metadata, target);
+        const previousMetadata: Map<string, interfaces.PluginMetadata> = getPluginMetadatas();
+        previousMetadata.set(metadata.name, metadata);
+        Reflect.defineMetadata(METADATA_KEY.plugin, previousMetadata, Reflect);
+        const previousSources: Map<string, interfaces.PluginMetadata> = getPluginSources();
+        previousSources.set(metadata.source.toString(), metadata);
+        Reflect.defineMetadata(METADATA_KEY.souece, previousSources, Reflect);
+    };
 }
 
 /**
@@ -29,13 +28,13 @@ export function plugin(metadata: pluginApi.PluginMetadata | any) {
  */
 export function cmd(metadata: interfaces.CommandMetadata = {}) {
     return function (target: any, key: string, value: any) {
-        metadata.name = metadata.name || key
-        metadata.executor = key
+        metadata.name = metadata.name || key;
+        metadata.executor = key;
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
         const previousMetadata: Map<string, interfaces.CommandMetadata> = getPluginCommandMetadata(target)
-        previousMetadata.set(metadata.name, metadata)
-        Reflect.defineMetadata(METADATA_KEY.cmd, previousMetadata, target.constructor)
-    }
+        previousMetadata.set(metadata.name, metadata);
+        Reflect.defineMetadata(METADATA_KEY.cmd, previousMetadata, target.constructor);
+    };
 }
 
 /**
@@ -44,14 +43,14 @@ export function cmd(metadata: interfaces.CommandMetadata = {}) {
  */
 export function tab(metadata: interfaces.CommandMetadata = {}) {
     return function (target: any, key: string, value: any) {
-        metadata.name = metadata.name || (key.startsWith('tab') ? key.split('tab', 2)[1] : key)
-        if (!metadata.name) { return }
-        metadata.executor = key
+        metadata.name = metadata.name || (key.startsWith('tab') ? key.split('tab', 2)[1] : key);
+        if (!metadata.name) { return; }
+        metadata.executor = key;
         metadata.paramtypes = Reflect.getMetadata("design:paramtypes", target, key)
         const previousMetadata: Map<string, interfaces.CommandMetadata> = getPluginTabCompleterMetadata(target)
         previousMetadata.set(metadata.name, metadata)
-        Reflect.defineMetadata(METADATA_KEY.tab, previousMetadata, target.constructor)
-    }
+        Reflect.defineMetadata(METADATA_KEY.tab, previousMetadata, target.constructor);
+    };
 }
 
 /**
@@ -60,35 +59,40 @@ export function tab(metadata: interfaces.CommandMetadata = {}) {
  */
 export function listener(metadata: interfaces.ListenerMetadata = {}) {
     return function (target: any, key: string, value: any) {
-        metadata.name = metadata.name || key
-        metadata.executor = key
+        metadata.name = metadata.name || key;
+        metadata.executor = key;
         const previousMetadata: interfaces.ListenerMetadata[] = getPluginListenerMetadata(target)
-        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...previousMetadata], target.constructor)
-    }
+        Reflect.defineMetadata(METADATA_KEY.listener, [metadata, ...previousMetadata], target.constructor);
+    };
 }
 
-export function config(metadata: interfaces.ConfigMetadata = {}) {
+export function config(metadata: interfaces.ConfigMetadata = { version: 1, format: 'yml' }) {
     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.name = metadata.name || key;
+        metadata.variable = key;
         const previousMetadata: Map<string, interfaces.ConfigMetadata> = getPluginConfigMetadata(target)
-        previousMetadata.set(metadata.name, metadata)
-        Reflect.defineMetadata(METADATA_KEY.config, previousMetadata, target.constructor)
+        previousMetadata.set(metadata.name, metadata);
+        Reflect.defineMetadata(METADATA_KEY.config, previousMetadata, target.constructor);
     }
 }
 
-function stage(stage: string) {
-    return (metadata: interfaces.ExecMetadata = {}) => {
-        return function (target: any, key: string, value: any) {
-            metadata.name = metadata.name || key
-            metadata.executor = key
-            const previousMetadata: interfaces.ExecMetadata[] = getPluginStageMetadata(target, stage)
-            Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...previousMetadata], target.constructor)
-        }
-    }
+function stage(metadata: interfaces.ExecMetadata = {}, stage: string) {
+    return function (target: any, key: string, value: any) {
+        metadata.name = metadata.name || key;
+        metadata.executor = key;
+        const previousMetadata: interfaces.ExecMetadata[] = getPluginStageMetadata(target, stage)
+        Reflect.defineMetadata(METADATA_KEY.stage[stage], [metadata, ...previousMetadata], target.constructor);
+    };
+}
+
+export function load(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'load')
+}
+
+export function enable(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'enable')
+}
+
+export function disable(metadata: interfaces.ExecMetadata = {}) {
+    return stage(metadata, 'disable')
 }
-export const load = stage('load')
-export const enable = stage('enable')
-export const disable = stage('disable')

packages/plugin/src/event.ts

@@ -1,30 +0,0 @@
-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/index.ts

@@ -1,15 +1,3 @@
-import './scanner/file-scanner'
-import './loader/ioc-loader'
-import './loader/basic-loader'
-
 export * from './manager'
 export * from './decorators'
 export * from './interfaces'
-
-export {
-    plugin as JSPlugin,
-    cmd as Cmd,
-    tab as Tab,
-    listener as Listener,
-    config as Config
-} from './decorators'

packages/plugin/src/interfaces.ts

@@ -1,14 +1,14 @@
-import { server, MiaoScriptConsole, event, plugin } from "@ccms/api"
-import { injectable, inject, postConstruct } from "@ccms/container"
-import { getPluginMetadata } from "./utils"
+import { server, MiaoScriptConsole, event } from "@ccms/api";
+import { injectable, inject, postConstruct } from "@ccms/container";
+import { getPluginMetadata } from "./utils";
 
 export namespace interfaces {
     @injectable()
-    export abstract class Plugin implements plugin.Plugin {
-        public description: plugin.PluginMetadata
-        public logger: Console
+    export abstract class Plugin {
+        public description: PluginMetadata;
+        public logger: Console;
         @inject(server.Console)
-        private Console: MiaoScriptConsole
+        private Console: MiaoScriptConsole;
 
         constructor() {
             this.description = getPluginMetadata(this)
@@ -24,49 +24,86 @@ export namespace interfaces {
         public enable() { }
         public disable() { }
     }
-    export interface ExecMetadata extends plugin.BaseMetadata {
+    interface BaseMetadata {
+        /**
+         * 名称 为空则为对象名称
+         */
+        name?: string;
+        /**
+         * 支持的服务器列表 为空则代表所有
+         */
+        servers?: string[];
+    }
+    export interface PluginMetadata extends BaseMetadata {
+        /**
+         * 插件名称
+         */
+        name: string;
+        /**
+         * 前缀
+         */
+        prefix?: string;
+        /**
+         * 插件版本
+         */
+        version: string;
+        /**
+         * 插件版本
+         */
+        author: string | string[];
+        /**
+         * 插件源文件 必须指定为 __filename
+         */
+        source: string;
+        /**
+         * 插件类型 默认为 ioc 执行 MiaoScript 加载逻辑
+         */
+        type?: string;
+        /**
+         * 插件本体
+         */
+        target?: any;
+    }
+    export interface ExecMetadata extends BaseMetadata {
         /**
          * 执行器
          */
-        executor?: string
+        executor?: string;
     }
     export interface CommandMetadata extends ExecMetadata {
-        /**
-         * 命令描述
-         */
-        description?: string
         /**
          * 参数列表
          */
-        paramtypes?: string[]
+        paramtypes?: string[];
     }
     export interface ListenerMetadata extends ExecMetadata {
         /**
          * 监听优先级
          */
-        priority?: event.EventPriority
+        priority?: event.EventPriority;
         /**
          * 是否忽略已取消的事件
          */
-        ignoreCancel?: boolean
+        ignoreCancel?: boolean;
+
     }
-    export interface ConfigMetadata extends plugin.BaseMetadata {
+    export interface ConfigMetadata extends BaseMetadata {
         /**
          * 配置文件版本号
          */
-        version?: number
+        version?: number;
         /**
          * 实体变量名称
          */
-        variable?: string
+        variable?: string;
         /**
          * 配置文件格式 默认 yml
          */
-        format?: string
+        format?: string;
         /**
          * 是否为只读(关闭时将不会自动保存)
          */
-        readonly?: boolean
+        readonly?: boolean;
     }
-    export type PluginLike = Plugin | string
+    export type PluginLike = Plugin | string;
 }

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

@@ -1,29 +0,0 @@
-import { plugin } from "@ccms/api"
-import { provideSingleton } from "@ccms/container"
-
-@provideSingleton(plugin.PluginLoader)
-export class BasicLoader implements plugin.PluginLoader {
-    type: string = 'basic'
-
-    private pluginRequireMap: Map<string, any>
-
-    constructor() {
-        this.pluginRequireMap = new Map()
-    }
-    require(loadMetadata: plugin.PluginLoadMetadata) {
-        let metadata = loadMetadata.instance?.description
-        if (metadata?.type == this.type) {
-            loadMetadata.metadata = metadata
-            loadMetadata.loaded = true
-            this.pluginRequireMap.set(metadata.source.toString(), loadMetadata.instance)
-        }
-        return loadMetadata
-    }
-    build(metadata: plugin.PluginMetadata) {
-        return this.pluginRequireMap.get(metadata.source.toString())
-    }
-    load(plugin: plugin.Plugin): void { }
-    enable(plugin: plugin.Plugin): void { }
-    disable(plugin: plugin.Plugin): void { }
-    reload(plugin: plugin.Plugin): void { }
-}

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

@@ -1,102 +0,0 @@
-import { plugin, server } from "@ccms/api"
-import { inject, ContainerInstance, Container, provideSingleton } from "@ccms/container"
-
-import { interfaces } from "../interfaces"
-import { getPluginStageMetadata, getPluginSources } from "../utils"
-
-@provideSingleton(plugin.PluginLoader)
-export class IocLoader implements plugin.PluginLoader {
-    type: string = 'ioc'
-    @inject(ContainerInstance)
-    private container: Container
-    @inject(server.ServerType)
-    private serverType: string
-
-    private pluginMetadataMap: Map<string, plugin.PluginMetadata>
-
-    constructor() {
-        this.pluginMetadataMap = getPluginSources()
-    }
-
-    require(loadMetadata: plugin.PluginLoadMetadata) {
-        let metadata = this.pluginMetadataMap.get(loadMetadata.file.toString())
-        if (metadata && metadata.type == this.type) {
-            loadMetadata.metadata = metadata
-            loadMetadata.loaded = true
-        }
-        return loadMetadata
-    }
-
-    build(metadata: plugin.PluginMetadata) {
-        if (!this.allowProcess(metadata.servers)) { return }
-        let pluginInstance: plugin.Plugin
-        try {
-            this.bindPlugin(metadata)
-            pluginInstance = this.container.getNamed<plugin.Plugin>(plugin.Plugin, metadata.name)
-            if (!(pluginInstance instanceof interfaces.Plugin)) {
-                console.i18n('ms.plugin.manager.build.not.extends', { source: metadata.source })
-                return
-            }
-        } catch (ex) {
-            console.i18n("ms.plugin.manager.initialize.error", { name: metadata.name, ex })
-            console.ex(ex)
-        }
-        return pluginInstance
-    }
-
-    load(plugin: plugin.Plugin): void {
-        this.stage(plugin, 'load')
-    }
-    enable(plugin: plugin.Plugin): void {
-        this.stage(plugin, 'enable')
-    }
-    disable(plugin: plugin.Plugin): void {
-        this.stage(plugin, 'disable')
-    }
-    reload(plugin: plugin.Plugin): void {
-        this.disable(plugin)
-        //@ts-ignore
-        require(plugin.description.source, { cache: false })
-        this.load(plugin)
-        this.enable(plugin)
-    }
-
-    private bindPlugin(metadata: plugin.PluginMetadata) {
-        try {
-            let pluginInstance = this.container.getNamed<plugin.Plugin>(plugin.Plugin, metadata.name)
-            if (pluginInstance.description.source + '' !== metadata.source + '') {
-                console.i18n('ms.plugin.manager.build.duplicate', { exists: pluginInstance.description.source, source: metadata.source })
-            }
-            this.container.rebind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
-        } catch{
-            this.container.bind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
-        }
-    }
-
-    private allowProcess(servers: string[]) {
-        // Not set servers -> allow
-        if (!servers || !servers.length) return true
-        // include !type -> deny
-        let denyServers = servers.filter(svr => svr.startsWith("!"))
-        if (denyServers.length !== 0) {
-            return !denyServers.includes(`!${this.serverType}`)
-        } else {
-            // only include -> allow
-            return servers.includes(this.serverType)
-        }
-    }
-
-    private stage(pluginInstance: plugin.Plugin, stageName: string) {
-        let stages = getPluginStageMetadata(pluginInstance, stageName)
-        for (const stage of stages) {
-            if (!this.allowProcess(stage.servers)) { continue }
-            console.i18n("ms.plugin.manager.stage.exec", { plugin: pluginInstance.description.name, name: stage.executor, stage: stageName, servers: stage.servers })
-            try {
-                pluginInstance[stage.executor].apply(pluginInstance)
-            } catch (error) {
-                console.i18n("ms.plugin.manager.stage.exec.error", { plugin: pluginInstance.description.name, executor: stage.executor, error })
-                console.ex(error)
-            }
-        }
-    }
-}

packages/plugin/src/manager.ts

@@ -1,11 +1,11 @@
 import i18n from '@ccms/i18n'
-import { plugin, server, event } from '@ccms/api'
+import { plugin, server, command, event } from '@ccms/api'
 import { inject, provideSingleton, Container, ContainerInstance } from '@ccms/container'
+import * as fs from '@ccms/common/dist/fs'
 
-import './config'
+import { getPluginMetadatas, getPluginCommandMetadata, getPluginListenerMetadata, getPlugin, getPluginTabCompleterMetadata, getPluginConfigMetadata, getPluginStageMetadata, getPluginSources } from './utils'
 import { interfaces } from './interfaces'
-import { PluginCommandManager } from './command'
-import { PluginEventManager } from './event'
+import { getConfigLoader } from './config'
 
 const Thread = Java.type('java.lang.Thread')
 
@@ -15,181 +15,103 @@ 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>
-    private loaderMap: Map<string, plugin.PluginLoader>
-
-    private instanceMap: Map<string, plugin.Plugin>
-    private metadataMap: Map<string, plugin.PluginMetadata>
-
-    constructor() {
-        this.sacnnerMap = new Map()
-        this.loaderMap = new Map()
-
-        this.instanceMap = new Map()
-        this.metadataMap = new Map()
-
-        // ignore unused
-        this.commandManager
-        this.eventManager
-    }
+    private pluginRequireMap: Map<string, any>
+    private pluginInstanceMap: Map<string, interfaces.Plugin>
+    private pluginMetadataMap: Map<string, interfaces.PluginMetadata>
 
     initialize() {
-        if (this.pluginInstance === undefined) { throw new Error("Can't found Plugin Instance!") }
-        if (this.initialized !== true) {
+        if (this.pluginInstance !== null && this.initialized !== true) {
+            // 如果plugin不等于null 则代表是正式环境
             console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
             console.i18n('ms.plugin.event.map', { count: this.EventManager.mapEventName().toFixed(0), type: this.serverType })
-            let pluginScanner = this.container.getAll<plugin.PluginScanner>(plugin.PluginScanner)
-            pluginScanner.forEach((scanner) => {
-                console.debug(`loading plugin sacnner ${scanner.type}...`)
-                this.sacnnerMap.set(scanner.type, scanner)
-            })
-            let pluginLoaders = this.container.getAll<plugin.PluginLoader>(plugin.PluginLoader)
-            pluginLoaders.forEach((loader) => {
-                console.debug(`loading plugin loader ${loader.type}...`)
-                this.loaderMap.set(loader.type, loader)
-            })
+            this.pluginRequireMap = new Map()
+            this.pluginInstanceMap = new Map()
+            this.pluginMetadataMap = getPluginSources()
             this.initialized = true
-            process.emit('plugin.initialize')
         }
     }
 
     scan(folder: string): void {
-        if (!folder) { throw new Error('plugin scan folder can\'t be empty!') }
         this.initialize()
-        for (const [, scanner] of this.sacnnerMap) {
-            try {
-                scanner.scan(folder).forEach(loadMetadata => {
-                    try {
-                        this.loadPlugin(scanner.load(loadMetadata))
-                    } catch (error) {
-                        console.error(`plugin scanner ${scanner.type} load ${loadMetadata.name} occurred error ${error}`)
-                        console.ex(error)
-                    }
-                })
-            } catch (error) {
-                console.error(`plugin scanner ${scanner.type} occurred error ${error}`)
-                console.ex(error)
-            }
-        }
-        process.emit('plugin.scan', folder)
+        var plugin = fs.file(root, folder)
+        var files = this.scanFolder(plugin)
+        this.loadPlugins(files)
     }
 
     build(): void {
         this.buildPlugins()
-        process.emit('plugin.build')
     }
 
-    private logStage(plugin: plugin.Plugin, stage: string) {
+    private logStage(plugin: interfaces.Plugin, stage: string) {
         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) {
-        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}`))
-            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) }
-        }
-    }
-
-    private loadPlugin(loadMetadata: plugin.PluginLoadMetadata) {
-        if (!loadMetadata) { throw new Error('loadMetadata can\'t be undefiend when loadPlugin!') }
-        if (loadMetadata.loaded) { throw new Error(`Plugin ${loadMetadata.name} is already loaded by ${loadMetadata.loader?.type}!`) }
-        try {
-            for (const [, loader] of this.loaderMap) {
-                if (this.loaderRequirePlugin(loadMetadata, loader)?.loaded) return loadMetadata.metadata
-            }
-        } catch (error) {
-            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) {
-        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}`)
-            }
-        }
+    private runPluginStage(plugin: interfaces.Plugin, stage: string, ext: Function) {
+        this.logStage(plugin, i18n.translate(`ms.plugin.manager.stage.${stage}`))
+        ext()
+        this.runCatch(plugin, stage)
+        this.runCatch(plugin, `${this.serverType}${stage}`)
+        this.execPluginStage(plugin, stage)
     }
 
     /**
      * 从文件加载插件
      * @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!') }
-        let metadata = this.loadPlugin(scanner.load(scanner.read(file)))
-        let plugin = this.buildPlugin(metadata)
+    loadFromFile(file: string): interfaces.Plugin {
+        let metadata = this.loadPlugin(file)
+        let plugin = this.buildPlugin(metadata && metadata.description ? metadata.description : this.pluginMetadataMap.get(file.toString()))
         this.load(plugin)
         this.enable(plugin)
         return plugin
     }
 
     load(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'load'))
+        this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
+            this.runPluginStage(plugin, 'load', () => {
+                this.loadConfig(plugin)
+            })
+        })
     }
 
     enable(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'enable'))
+        this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
+            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.metadataMap.delete(plugin.description.name)
-            this.instanceMap.delete(plugin.description.name)
+        this.checkAndGet(args[0]).forEach((plugin: interfaces.Plugin) => {
+            this.runPluginStage(plugin, 'disable', () => {
+                this.saveConfig(plugin)
+                this.unregistryCommand(plugin)
+                this.unregistryListener(plugin)
+            })
         })
     }
 
     reload(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((pl: plugin.Plugin) => {
+        this.checkAndGet(args[0]).forEach((pl: interfaces.Plugin) => {
             this.disable(pl)
-            this.loadFromFile(pl.description.loadMetadata.file, pl.description.loadMetadata.scanner)
+            this.loadFromFile(pl.description.source)
         })
     }
 
-    getPlugin(name: string) {
-        return this.instanceMap.get(name)
-    }
-
     getPlugins() {
-        return this.instanceMap
+        return this.pluginInstanceMap
     }
 
     private runCatch(pl: any, func: string) {
@@ -201,31 +123,213 @@ 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 == 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] }
+    private checkAndGet(name: string | interfaces.Plugin | undefined | any): Map<string, interfaces.Plugin> | interfaces.Plugin[] {
+        if (name == this.pluginInstanceMap) { return this.pluginInstanceMap }
+        if (typeof name == 'string' && this.pluginInstanceMap.has(name)) { return [this.pluginInstanceMap.get(name)] }
+        if (name instanceof interfaces.Plugin) { return [name as interfaces.Plugin] }
+        if (name.description || name.description.name) { return [name as interfaces.Plugin] }
         throw new Error(`Plugin ${JSON.stringify(name)} not exist!`)
     }
 
-    private buildPlugins() {
-        this.metadataMap.forEach((metadata) => {
+    private scanFolder(folder: any): string[] {
+        var files = []
+        console.i18n('ms.plugin.manager.scan', { folder })
+        this.checkUpdateFolder(folder)
+        // must check file is exist maybe is a illegal symbolic link file
+        fs.list(folder).forEach((file: any) => file.toFile().exists() ? files.push(file.toFile()) : void 0)
+        return files
+    }
+
+    /**
+     * 更新插件
+     * @param path
+     */
+    private checkUpdateFolder(path: any) {
+        var update = fs.file(path, "update")
+        if (!update.exists()) {
+            update.mkdirs()
+        }
+    }
+
+    private loadPlugins(files: any[]): void {
+        this.loadJsPlugins(files)
+    }
+
+    /**
+    * JS类型插件预加载
+    */
+    private loadJsPlugins(files: any[]) {
+        files.filter(file => file.name.endsWith(".js")).forEach(file => {
             try {
-                this.buildPlugin(metadata)
-            } catch (error) {
-                console.error(error)
+                this.loadPlugin(file)
+            } catch (ex) {
+                console.i18n("ms.plugin.manager.initialize.error", { name: file.name, ex })
+                console.ex(ex)
             }
         })
     }
 
-    private buildPlugin(metadata: plugin.PluginMetadata) {
-        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)
+    private loadPlugin(file: any) {
+        this.updatePlugin(file)
+        return this.createPlugin(file.toString())
+    }
+
+    private updatePlugin(file: any) {
+        var update = 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)
+        }
+    }
+
+    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 createPlugin(file: string) {
+        //@ts-ignore
+        let instance = require(file, { cache: false })
+        this.pluginRequireMap.set(file, instance)
+        return instance
+    }
+
+    private buildPlugins() {
+        let metadatas = []
+        let pluginMetadatas = getPluginMetadatas()
+        for (const [_, metadata] of pluginMetadatas) { metadatas.push(metadata) }
+        for (const [_, instance] of this.pluginRequireMap) { if (instance.description) { this.buildPlugin(instance.description) } }
+        for (const metadata of metadatas) {
+            if (!this.allowProcess(metadata.servers)) { continue }
+            this.buildPlugin(metadata)
+        }
+    }
+
+    private buildPlugin(metadata: interfaces.PluginMetadata) {
+        let pluginInstance: interfaces.Plugin
+        switch (metadata.type) {
+            case "ioc":
+                try {
+                    this.bindPlugin(metadata)
+                    pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
+                    if (!(pluginInstance instanceof interfaces.Plugin)) {
+                        console.i18n('ms.plugin.manager.build.not.extends', { source: metadata.source })
+                        return
+                    }
+                } catch (ex) {
+                    console.i18n("ms.plugin.manager.initialize.error", { name: metadata.name, ex })
+                    console.ex(ex)
+                }
+                break
+            case "basic":
+                pluginInstance = this.pluginRequireMap.get(metadata.source.toString())
+                break
+            default:
+                throw new Error('§4不支持的插件类型 请检查加载器是否正常启用!')
+        }
+        this.pluginInstanceMap.set(metadata.name, pluginInstance)
         return pluginInstance
     }
+
+    private bindPlugin(metadata: interfaces.PluginMetadata) {
+        try {
+            let pluginInstance = this.container.getNamed<interfaces.Plugin>(plugin.Plugin, metadata.name)
+            if (pluginInstance.description.source + '' !== metadata.source + '') {
+                console.i18n('ms.plugin.manager.build.duplicate', { exists: pluginInstance.description.source, source: metadata.source })
+            }
+            this.container.rebind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
+        } catch{
+            this.container.bind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
+        }
+    }
+
+    private loadConfig(plugin: interfaces.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 (!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 = () => base.save(configFile, configFactory.dump(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)
+            }
+        }
+    }
+
+    private saveConfig(plugin: interfaces.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: interfaces.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: interfaces.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: interfaces.Plugin) {
+        let cmds = getPluginCommandMetadata(pluginInstance)
+        cmds.forEach(cmd => {
+            this.CommandManager.off(pluginInstance, cmd.name)
+        })
+    }
+
+    private unregistryListener(pluginInstance: interfaces.Plugin) {
+        this.EventManager.disable(pluginInstance)
+    }
+
+    private execPluginStage(pluginInstance: interfaces.Plugin, stageName: string) {
+        let stages = getPluginStageMetadata(pluginInstance, stageName)
+        for (const stage of stages) {
+            if (!this.allowProcess(stage.servers)) { continue }
+            console.i18n("ms.plugin.manager.stage.exec", { plugin: pluginInstance.description.name, name: stage.executor, stage: stageName, servers: stage.servers })
+            try {
+                pluginInstance[stage.executor].apply(pluginInstance)
+            } catch (error) {
+                console.i18n("ms.plugin.manager.stage.exec.error", { plugin: pluginInstance.description.name, executor: stage.executor, error })
+                console.ex(error)
+            }
+        }
+    }
 }

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

@@ -1,54 +0,0 @@
-import { plugin } from "@ccms/api"
-import * as fs from '@ccms/common/dist/fs'
-import { provideSingletonNamed } from "@ccms/container"
-
-@provideSingletonNamed(plugin.PluginScanner, 'file')
-export class JSFileScanner implements plugin.PluginScanner {
-    type: string = 'file'
-
-    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)
-        //@ts-ignore
-        metadata.instance = require(metadata.file.toString(), { cache: false })
-        return metadata
-    }
-
-    private scanFolder(folder: any): string[] {
-        var files = []
-        console.i18n('ms.plugin.manager.scan', { folder })
-        this.checkUpdateFolder(folder)
-        // must check file is exist maybe is a illegal symbolic link file
-        fs.list(folder).forEach((path: any) => {
-            let file = path.toFile()
-            if (file.exists() && file.getName().endsWith(".js")) {
-                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

@@ -1,79 +1,78 @@
-import { plugin } from '@ccms/api'
 import { interfaces } from './interfaces'
 import { METADATA_KEY } from './constants'
 
-const pluginSourceCache = new Map<string, plugin.PluginMetadata>()
+const pluginSourceCache = new Map<string, interfaces.PluginMetadata>();
 
 function getPlugins() {
-    return [...getPluginMetadatas().values()].map((target) => target.target)
+    return [...getPluginMetadatas().values()].map((target) => target.target);
 }
 
 function getPlugin(name: string) {
-    return getPluginMetadatas().get(name)
+    return getPluginMetadatas().get(name);
 }
 
 function getPluginSources() {
-    let pluginSources: Map<string, plugin.PluginMetadata> = Reflect.getMetadata(
+    let pluginSources: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
         METADATA_KEY.souece,
         Reflect
-    ) || pluginSourceCache
-    return pluginSources
+    ) || pluginSourceCache;
+    return pluginSources;
 }
 
 function getPluginMetadatas() {
-    let pluginMetadatas: Map<string, plugin.PluginMetadata> = Reflect.getMetadata(
+    let pluginMetadatas: Map<string, interfaces.PluginMetadata> = Reflect.getMetadata(
         METADATA_KEY.plugin,
         Reflect
-    ) || new Map<string, plugin.PluginMetadata>()
-    return pluginMetadatas
+    ) || new Map<string, interfaces.PluginMetadata>();
+    return pluginMetadatas;
 }
 
 function getPluginMetadata(target: any) {
-    let pluginMetadata: plugin.PluginMetadata = Reflect.getMetadata(
+    let pluginMetadata: interfaces.PluginMetadata = Reflect.getMetadata(
         METADATA_KEY.plugin,
         target.constructor
-    ) || {}
-    return pluginMetadata
+    ) || {};
+    return pluginMetadata;
 }
 
 function getPluginCommandMetadata(target: any) {
     let commandMetadata: Map<string, interfaces.CommandMetadata> = Reflect.getMetadata(
         METADATA_KEY.cmd,
         target.constructor
-    ) || new Map<string, interfaces.CommandMetadata>()
-    return commandMetadata
+    ) || new Map<string, interfaces.CommandMetadata>();
+    return commandMetadata;
 }
 
 function getPluginTabCompleterMetadata(target: any) {
     let tabcompleterMetadata: Map<string, interfaces.CommandMetadata> = Reflect.getMetadata(
         METADATA_KEY.tab,
         target.constructor
-    ) || new Map<string, interfaces.CommandMetadata>()
-    return tabcompleterMetadata
+    ) || new Map<string, interfaces.CommandMetadata>();
+    return tabcompleterMetadata;
 }
 
 function getPluginListenerMetadata(target: any) {
     let listnerMetadata: interfaces.ListenerMetadata[] = Reflect.getMetadata(
         METADATA_KEY.listener,
         target.constructor
-    ) || []
-    return listnerMetadata
+    ) || [];
+    return listnerMetadata;
 }
 
 function getPluginConfigMetadata(target: any) {
     let configMetadata: Map<string, interfaces.ConfigMetadata> = Reflect.getMetadata(
         METADATA_KEY.config,
         target.constructor
-    ) || new Map<string, interfaces.ConfigMetadata>()
-    return configMetadata
+    ) || new Map<string, interfaces.ConfigMetadata>();
+    return configMetadata;
 }
 
 function getPluginStageMetadata(target: any, stage: string) {
     let stageMetadata: interfaces.ExecMetadata[] = Reflect.getMetadata(
         METADATA_KEY.stage[stage],
         target.constructor
-    ) || []
-    return stageMetadata
+    ) || [];
+    return stageMetadata;
 }
 
 export {

packages/plugins/docs/MiaoConsole.md

@@ -1,60 +0,0 @@
-## 前言
-
-> 各位开发 在调试Minecraft插件的时候 是不是经常面临下列情况
-- 编译等半天 重启等半天 测试找不到问题
-- 后台 IDE SCP/FTP 来回切换
-
-### 什么是MiaoConsole
-- MiaoConsole 是 基于 MiaoScript 开发的 在线调试工具
-- 通过复用 Minecraft的Netty 通道 实现服务器端口 在线调试(并不是Java的调试哦)
-
-### 工具动图
-
-![](https://i.loli.net/2020/05/15/YxjRVZ7yGS5aHKT.gif)
-![](https://i.loli.net/2020/05/15/vTWSZlYD4nmpwKr.gif)
-
-### MiaoConsole 有哪些功能
-- 无需编译 上传等步骤 实时在线debug
-- 实时转发服务端日志 无需来回切换
-- 基于Nashorn的动态脚本语言
-- 基于TypeScript的自动补全逻辑(以实现BungeeCord Sponge Bukkit的API全自动补全)
-
-### MiaoConsole 的兼容性
-- 跨端兼容 Sponge Bukkit BungeeCord
-  - Bukkit 支持 1.12.2 +(由于1.12.2以下版本Netty版本过老需要适配 后续兼容到1.7.10)
-  - Sponge 理论上全兼容
-  - CatServer 暂未测试 理论上兼容 1.12.2
-  - BungeeCord ~~终端转发暂未兼容~~ 已经能兼容了
-
-### 安装教程
-- 安装MiaoScript [下载地址](http://w.yumc.pw/free.html#MiaoScript-download)
-- 首次启动 等待加载基础环境类库
-- 执行 `mpm i MiaoConsole`
-
-### 使用教程
-- 执行 `mconsole token` 获得临时Token
-- 打开 `http://ms.yumc.pw/console.html`
-- 在地址栏输入服务器地址 需要带上端口
-- 在Token栏输入获取到的Token
-- 点击链接即可
-
-### 终端使用
-- 支持实时传输服务器日志到终端
-- 直接在终端输入命令 会转发到服务器
-- 目前暂不支持命令自动补全
-- 支持命令历史
-
-### 代码编辑器使用
-- 支持 Java 的 lang包和util包自动补全
-- 支持服务端所有代码补全
-- 注意 暂时不支持自动导入包 所以需要手动输入全类名
-- 快捷键说明(选中代码后 只会执行选中部分)
-  - Ctrl + R 执行代码
-  - Ctrl + E 执行命令
-  - Ctrl + Q 切换代码页
-
-### RoadMap
-- 支持命令自动补全
-- 支持常用的开发脚本
-- 支持快捷操作服务器数据
-- 支持在线编辑服务器文件(开发了一半)

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.8.4",
+    "version": "0.6.7",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -20,16 +20,13 @@
         "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.6"
+        "typescript": "^3.9.2"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.4",
-        "@ccms/plugin": "^0.8.4"
+        "@ccms/api": "^0.6.7",
+        "@ccms/container": "^0.6.7",
+        "@ccms/plugin": "^0.6.7"
     }
 }

packages/plugins/src/HelloWorld.ts

@@ -1,6 +1,7 @@
-/// <reference types="@javatypes/bungee-api" />
-/// <reference types="@javatypes/spigot-api" />
-/// <reference types="@javatypes/sponge-api" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
+/// <reference types="@ccms/types/dist/typings/nukkit" />
 
 import { server } from '@ccms/api';
 import { inject } from '@ccms/container';

packages/plugins/src/MiaoChat.ts

@@ -1,6 +1,6 @@
-/// <reference types="@javatypes/bungee-api" />
-/// <reference types="@javatypes/spigot-api" />
-/// <reference types="@javatypes/sponge-api" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
 import { server, plugin as pluginApi, channel, constants } from '@ccms/api'
 import { inject, optional } from '@ccms/container';

packages/plugins/src/MiaoConsole.ts

@@ -1,4 +1,6 @@
-/// <reference types="@ccms/nashorn" />
+/// <reference types="@ccms/types/dist/typings/bukkit" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
+/// <reference types="@ccms/types/dist/typings/bungee" />
 
 import { plugin as pluginApi, server, task, constants } from '@ccms/api'
 import { plugin, interfaces, cmd, tab, enable, config, disable } from '@ccms/plugin'
@@ -35,31 +37,23 @@ export class MiaoConsole extends interfaces.Plugin {
     private pluginFolder: string
 
     private token: string
-    private instance: any
+    private pipeline: any
     private socketIOServer: SocketIOServer
     private rootLogger: any
     private appender: any
     private handler: any
 
-    private logCache: string[] = []
-
     @config()
     private secret = { token: undefined }
 
     load() {
         if (this.secret.token) {
             this.token = this.secret.token
-            this.logger.console(`§c已从配置文件加载永久Token §4请注意服务器安全!`)
+            this.logger.console(`§4已从配置文件加载永久Token 请注意服务器安全!`)
         } else {
             this.token = Java.type('java.util.UUID').randomUUID().toString()
             this.logger.console(`§6已生成随机Token: §3${this.token} §c重启后或重新生成后失效!`)
         }
-        process.on('message', (msg) => {
-            this.logCache.push(msg)
-            if (this.logCache.length > 30) {
-                this.logCache = this.logCache.slice(this.logCache.length - 30, this.logCache.length)
-            }
-        })
     }
 
     @cmd()
@@ -104,19 +98,15 @@ export class MiaoConsole extends interfaces.Plugin {
     enable() {
         let count = 0
         let wait = this.task.create(() => {
-            this.instance = this.server.getNettyPipeline()
-            if (this.instance) {
-                wait?.cancel()
+            this.pipeline = this.server.getNettyPipeline()
+            if (this.pipeline) {
+                wait.cancel()
                 this.createSocketIOServer()
                 this.startSocketIOServer()
-                return
             }
-            if (count++ > 5) {
-                wait?.cancel()
-                this.logger.console('§cNetty通道注入失败 §4所有功能将无法使用！')
-                return
-            }
-        }).later(20).timer(20).submit()
+            if (count > 30) { wait.cancel() }
+            count++
+        }).later(20).timer(40).submit()
         this.rootLogger = this.server.getRootLogger()
     }
 
@@ -124,13 +114,8 @@ export class MiaoConsole extends interfaces.Plugin {
     addLog4jForward() {
         if (this.rootLogger) {
             let AbstractAppender = Java.type('org.apache.logging.log4j.core.appender.AbstractAppender')
-            let Level = Java.type('org.apache.logging.log4j.Level')
             let ProxyAppender = Java.extend(AbstractAppender, {
-                append: (logEvent) => {
-                    if (logEvent.level.intLevel() <= Level.INFO.intLevel()) {
-                        process.emit('message', logEvent.getMessage().getFormattedMessage())
-                    }
-                }
+                append: (logEvent) => global.eventCenter.emit('log', logEvent.getMessage().getFormattedMessage())
             })
             this.appender = new ProxyAppender("ProxyLogger", null, null)
             this.appender.start()
@@ -140,11 +125,11 @@ export class MiaoConsole extends interfaces.Plugin {
     }
 
     @enable({ servers: [constants.ServerType.Bungee] })
-    addLoggerForward() {
+    addJavaLoggerForward() {
         if (this.rootLogger) {
             let AbstractHandler = Java.type('java.util.logging.Handler')
             let ProxyHandler = Java.extend(AbstractHandler, {
-                publish: (record) => process.emit('message', record.getMessage()),
+                publish: (record) => global.eventCenter.emit('log', record.getMessage()),
                 flush: () => { },
                 close: () => { }
             })
@@ -153,27 +138,10 @@ export class MiaoConsole extends interfaces.Plugin {
         }
     }
 
-    private LOGBACK_APPENDER_NAME = "NashornProxyAppender"
-
-    @enable({ servers: [constants.ServerType.Spring] })
-    addLogbackForward() {
-        if (this.rootLogger) {
-            let AppenderBase = Java.type('ch.qos.logback.core.AppenderBase')
-            let ProxyAppender = Java.extend(AppenderBase, {
-                append: (logEvent) => process.emit('message', logEvent.getFormattedMessage())
-            })
-            this.appender = new ProxyAppender()
-            this.appender.start()
-            this.appender.setName(this.LOGBACK_APPENDER_NAME)
-            this.appender.setContext(this.rootLogger.getLoggerContext())
-            this.rootLogger.addAppender(this.appender)
-        }
-    }
-
     disable() {
         if (this.socketIOServer) {
             this.socketIOServer.close()
-            process.removeAllListeners('message')
+            global.eventCenter.removeAllListeners('log')
         }
         if (this.container.isBound(io.Instance)) {
             this.container.unbind(io.Instance)
@@ -191,7 +159,7 @@ export class MiaoConsole extends interfaces.Plugin {
     }
 
     @disable({ servers: [constants.ServerType.Bungee] })
-    removeLoggerForward() {
+    removeJavaLoggerForward() {
         try {
             this.rootLogger.removeHandler(this.handler)
         } catch (error) {
@@ -199,17 +167,8 @@ export class MiaoConsole extends interfaces.Plugin {
         }
     }
 
-    @disable({ servers: [constants.ServerType.Spring] })
-    removeLogbackForward() {
-        try {
-            this.rootLogger.detachAppender(this.LOGBACK_APPENDER_NAME)
-        } catch (error) {
-            console.ex(error)
-        }
-    }
-
     createSocketIOServer() {
-        this.socketIOServer = io(this.instance, {
+        this.socketIOServer = io(this.pipeline, {
             path: '/ws',
             root: fs.concat(root, 'wwwroot')
         })
@@ -218,7 +177,7 @@ export class MiaoConsole extends interfaces.Plugin {
 
     startSocketIOServer() {
         let namespace = this.socketIOServer.of('/MiaoConsole')
-        process.on('message', (msg) => namespace.emit('log', msg))
+        global.eventCenter.on('log', (msg) => namespace.emit('log', msg))
         namespace.on('connect', (client: SocketIOSocket) => {
             if (!this.token) {
                 this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
@@ -226,93 +185,66 @@ export class MiaoConsole extends interfaces.Plugin {
                 client.disconnect(true)
                 return
             }
+            this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4Token: §c********`)
             if (this.token != client.handshake.query.token) {
-                this.logger.console(`§6客户端 §b${client.id} §c无效请求 §4请提供正确Token后再次连接!`)
+                this.logger.console(`§6客户端 §b${client.id} §4无效请求 请提供正确Token后再次连接!`)
                 client.emit('unauthorized')
                 client.disconnect(true)
                 return
             }
-            this.initWebSocketClient(client)
-            this.logCache.forEach(msg => client.emit('log', msg))
             this.logger.console(`§6客户端 §b${client.id} §a新建连接 ${this.rootLogger ? '启动日志转发' : '§4转发日志启动失败'}...`)
-        })
-    }
-
-    private initWebSocketClient(client: SocketIOSocket) {
-        client.on('type', (fn) => {
-            fn && fn(this.serverType)
-            client.emit('log', `Currect Server Version is ${this.server.getVersion()}`)
-        })
-        client.on('command', (cmd) => {
-            setTimeout(() => this.server.dispatchConsoleCommand(cmd), 0)
-            client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
-        })
-        client.on('tabComplate', (input, index, callback) => {
-            callback && callback(this.server.tabComplete(this.server.getConsoleSender(), input, index))
-        })
-        client.on('exec', (code) => {
-            try {
-                client.emit('log', this.runCode(code, client.nsp, client))
-            } catch (ex) {
-                client.emit('log', `§4代码执行异常 错误: ${ex}\n${console.stack(ex).join('\n')}`)
-            }
-        })
-        client.on('edit', (file: string, fn) => {
-            fn && fn(base.read(file), suffixMap[file.split('.', 2)[1]])
-        })
-        client.on('save', (name: string, content: string, fn) => {
-            this.logger.console(`§6客户端 §b${client.id} §6请求更新插件 §a${name} §6...`)
-            let file = fs.concat(root, this.pluginFolder, name + '.js')
-            if (!fs.exists(file)) { return fn('§6插件 §a' + name + ' §6尚未安装 §c请先创建空文件 或安装插件!') }
-            try {
-                base.save(file, content)
-                this.pluginManager.reload(name)
-                fn('§6插件 §a' + name + ' §6更新成功!')
-            } catch (error) {
+            client.on('type', (fn) => {
+                fn && fn(this.serverType)
+                client.emit('log', `Currect Server Version is ${this.server.getVersion()}`)
+            })
+            client.on('command', (cmd) => {
+                setTimeout(() => this.server.dispatchConsoleCommand(cmd), 0)
+                client.emit('log', `§6命令: §b${cmd} §a执行成功!`)
+            })
+            client.on('exec', (code) => {
+                try {
+                    client.emit('log', this.runCode(code, namespace, client))
+                } catch (ex) {
+                    client.emit('log', `§4代码执行异常 错误: ${ex}\n${console.stack(ex).join('\n')}`)
+                }
+            })
+            client.on('edit', (file: string, fn) => {
+                fn && fn(base.read(file), suffixMap[file.split('.', 2)[1]])
+            })
+            client.on('save', (name: string, content: string, fn) => {
+                this.logger.console(`§6客户端 §b${client.id} §6请求更新插件 §a${name} §6...`)
+                let file = fs.concat(root, this.pluginFolder, name + '.js')
+                if (!fs.exists(file)) { return fn('§6插件 §a' + name + ' §6尚未安装 §c请先创建空文件 或安装插件!') }
+                try {
+                    base.save(file, content)
+                    this.pluginManager.reload(name)
+                    fn('§6插件 §a' + name + ' §6更新成功!')
+                } catch (error) {
+                    this.logger.error(error)
+                    fn('§6插件 §a' + name + ' §4更新异常 错误: ' + error)
+                }
+            })
+            client.on('error', (error) => {
+                this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
                 this.logger.error(error)
-                fn('§6插件 §a' + name + ' §4更新异常 错误: ' + error)
-            }
-        })
-        client.on('ls', (file: string, fn) => {
-            let dir = fs.file(file)
-            if (!dir.isDirectory()) {
-                return fn(undefined, `${file} 不是一个目录!`)
-            }
-            fn(fs.list(dir))
-        })
-        client.on('error', (error) => {
-            this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
-            this.logger.error(error)
-        })
-        client.on('disconnect', () => {
-            this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+            })
+            client.on('disconnect', () => {
+                this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+            })
         })
+        this.logger.info('Netty Channel Pipeline Inject MiaoDetectHandler Successful!')
     }
 
     private runCode(code: string, namespace: any, client: any) {
-        let paramNames = [
-            'namespace',
-            'client',
-            'reflect',
-            'container',
-            'pluginManager'
-        ]
-        let params = [
-            namespace,
-            client,
-            reflect,
-            this.container,
-            this.pluginManager
-        ]
-        let tfunc = new Function(
-            ...paramNames,
-            `var api = require('@ccms/api');
-if (this.serverType == "spring") {
-    var dbm = container.get(api.database.DataBaseManager)
-    var db = dbm.getMainDatabase()
-    var bf = base.getInstance().getAutowireCapableBeanFactory()
-}
-return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
-        return this.task.callSyncMethod(() => tfunc.apply(this, params)) + ''
+        let tfunc = new Function('namespace', 'client', `
+        var reflect = require('@ccms/common/dist/reflect');
+        var tempconcent = '';
+        function print(text) {
+            tempconcent += text + "\\n"
+        }
+        var result = eval(${JSON.stringify(code)});
+        return tempconcent + result
+        `)
+        return this.task.callSyncMethod(() => tfunc.apply(this, [namespace, client])) + ''
     }
 }

packages/plugins/src/MiaoPluginManager.ts

@@ -1,4 +1,4 @@
-/// <reference types="@javatypes/jdk" />
+/// <reference types="@ccms/types" />
 
 import { task, server } from "@ccms/api";
 import { inject } from "@ccms/container";

packages/plugins/src/MiaoProtocol.ts

@@ -1,30 +0,0 @@
-import { task, server, constants } from "@ccms/api";
-import { inject } from "@ccms/container";
-import { plugin, interfaces, cmd } from "@ccms/plugin";
-
-import http from '@ccms/common/dist/http'
-import * as fs from '@ccms/common/dist/fs'
-
-@plugin({ name: 'MiaoProtocol', prefix: 'MPTL', version: '1.0.0', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
-export class MiaoProtocol extends interfaces.Plugin {
-    @inject(server.Server)
-    private server: server.Server;
-    @inject(task.TaskManager)
-    private taskManager: task.TaskManager;
-
-    private pipeline: any
-
-    enable() {
-        let count = 0
-        let wait = this.taskManager.create(() => {
-            this.pipeline = this.server.getNettyPipeline()
-            if (this.pipeline) {
-                wait.cancel()
-            } else if (count++ > 30) {
-                wait.cancel()
-                this.logger.console('§cNetty通道注入失败 §4所有功能将无法使用！')
-            }
-        }).later(20).timer(40).submit()
-    }
-
-}

packages/plugins/src/MiaoScriptPackageManager.ts

@@ -1,11 +1,10 @@
 import { plugin as pluginApi, task, server } from '@ccms/api'
 
 import { Translate } from '@ccms/i18n'
-import { inject, DefaultContainer as container } from '@ccms/container'
+import { inject } from '@ccms/container';
 import { interfaces, plugin, cmd, tab } from '@ccms/plugin'
 
 import * as fs from '@ccms/common/dist/fs'
-import * as reflect from '@ccms/common/dist/reflect'
 import http from '@ccms/common/dist/http'
 
 let help = [
@@ -20,7 +19,7 @@ let help = [
     '§6/mpm §arun §e<JS代码>        §6-  §3运行JS代码',
     '§6/mpm §adeploy §e<插件名称>   §6-  §3发布插件',
     '§6/mpm §crestart             §6-  §4重启MiaoScript脚本引擎'
-]
+];
 
 let langMap = {
     'main.command.not.exists': '§4未知的子命令: §c{command}',
@@ -54,20 +53,20 @@ let fallbackMap = langMap
 @plugin({ name: 'MiaoScriptPackageManager', prefix: 'PM', version: '1.0.1', author: 'MiaoWoo', source: __filename })
 export class MiaoScriptPackageManager extends interfaces.Plugin {
     @inject(pluginApi.PluginManager)
-    private pluginManager: pluginApi.PluginManager
+    private pluginManager: pluginApi.PluginManager;
     @inject(task.TaskManager)
-    private taskManager: task.TaskManager
+    private taskManager: task.TaskManager;
     @inject(server.ServerType)
-    private serverType: string
+    private serverType: string;
     @inject(server.Server)
     private server: server.Server
     @inject(pluginApi.PluginFolder)
-    private pluginFolder: string
+    private pluginFolder: string;
 
     private packageCache: any[] = [];
     private packageNameCache: string[] = [];
 
-    private translate: Translate
+    private translate: Translate;
 
     load() {
         this.translate = new Translate({
@@ -79,7 +78,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
 
     @cmd()
     mpm(sender: any, command: string, args: string[]) {
-        this.taskManager.create(() => this.main(sender, command, args)).async().submit()
+        this.taskManager.create(() => this.main(sender, command, args)).async().submit();
     }
 
     i18n(sender: any, name: string, params?: any) {
@@ -91,65 +90,64 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         if (!this[cmdKey]) {
             this.i18n(sender, 'main.command.not.exists', { command: args[0] })
             this.i18n(sender, 'main.command.help.tip', { command })
-            return
+            return;
         }
         args.shift()
-        this[cmdKey](sender, ...args)
+        this[cmdKey](sender, ...args);
     }
 
     cmdhelp(sender: any) {
-        this.logger.sender(sender, help)
+        this.logger.sender(sender, help);
     }
 
     cmdload(sender: any, name: string) {
-        let pluginFile = fs.concat(__dirname + '', name)
+        let pluginFile = fs.concat(__dirname + '', name);
         if (!fs.exists(pluginFile)) {
             this.i18n(sender, 'plugin.not.exists', { name: `${name}(${pluginFile})` })
-            return
+            return;
         }
-        this.pluginManager.loadFromFile(fs.file(pluginFile))
+        this.pluginManager.loadFromFile(fs.file(pluginFile));
     }
 
     cmdlist(sender: any, type: string = 'cloud') {
         if (type == "i" || type == "install") {
             this.i18n(sender, 'list.install.header')
             this.pluginManager.getPlugins().forEach((plugin) => {
-                this.i18n(sender, 'list.install.body', plugin.description)
+                this.i18n(sender, 'list.install.body', plugin.description);
             })
         } else {
             this.i18n(sender, 'list.header')
             for (var pkgName in this.packageCache) {
-                this.i18n(sender, 'list.body', this.packageCache[pkgName])
+                this.i18n(sender, 'list.body', this.packageCache[pkgName]);
             }
         }
     }
 
     cmdinstall(sender: any, name: string) {
         if (!name) { return this.i18n(sender, 'plugin.name.empty') }
-        this.download(sender, name)
+        this.download(sender, name);
     }
 
     cmdupdate(sender: any, name: string) {
         if (name) {
-            this.update(sender, name)
+            this.update(sender, name);
         } else {
             this.updateRepo(sender)
         }
     }
 
-    cmdupgrade(sender: any, name: string, confirm: boolean) {
-        if (name == "system") {
-            if (!confirm) { return this.i18n(sender, 'upgrade.confirm') }
-            let enginePath = fs.path(fs.file(root, 'node_modules'))
+    cmdupgrade(sender: any, name: string) {
+        if (!name) { return this.i18n(sender, 'upgrade.confirm'); }
+        if (name == "comfirm") {
+            let enginePath = fs.path(fs.file(fs.concat(root, 'node_modules', '@ccms')))
             if (enginePath.startsWith(root)) {
-                base.delete(enginePath)
-                this.cmdrestart(sender)
+                base.delete(enginePath);
+                this.cmdrestart(sender);
             }
-            return
         }
         if (this.checkPlugin(sender, name)) {
-            this.update(sender, name)
-            this.pluginManager.reload(name)
+            this.update(sender, name);
+            this.pluginManager.reload(name);
         }
     }
 
@@ -163,7 +161,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
     cmdreload(sender: any, name: string) {
         name = name || this.description.name
         if (this.checkPlugin(sender, name)) {
-            this.pluginManager.reload(name)
+            this.pluginManager.reload(name);
             this.i18n(sender, 'plugin.reload.finish', { name })
         }
     }
@@ -186,63 +184,38 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
             return
         }
         try {
-            this.logger.sender(sender, '§6Reloading §3MiaoScript Engine...')
-            ScriptEngineContextHolder.disableEngine()
-            Packages.java.lang.System.gc()
-            ScriptEngineContextHolder.enableEngine()
-            this.logger.sender(sender, '§3MiaoScript Engine §6Reload §aSuccessful...')
+            this.logger.sender(sender, '§6Reloading §3MiaoScript Engine...');
+            ScriptEngineContextHolder.disableEngine();
+            Packages.java.lang.System.gc();
+            ScriptEngineContextHolder.enableEngine();
+            this.logger.sender(sender, '§3MiaoScript Engine §6Reload §aSuccessful...');
         } catch (ex) {
-            this.logger.sender(sender, "§3MiaoScript Engine §6Reload §cError! ERR: " + ex)
-            this.logger.sender(sender, this.logger.stack(ex))
+            this.logger.sender(sender, "§3MiaoScript Engine §6Reload §cError! ERR: " + ex);
+            this.logger.sender(sender, this.logger.stack(ex));
         }
     }
 
     cmdrun(sender: any, ...args: any[]) {
         try {
-            let script = args.join(' ')
+            let script = args.join(' ');
             this.i18n(sender, 'run.script', { script })
-            let result = this.runCode(script, sender)
+            let result = eval(script);
             this.i18n(sender, 'run.result', { result: result == undefined ? this.translate.translate('run.noresult') : result + '' })
         } catch (ex) {
-            this.logger.sender(sender, this.logger.stack(ex))
+            this.logger.sender(sender, this.logger.stack(ex));
         }
     }
 
-    private runCode(code: string, sender: any) {
-        let paramNames = [
-            'sender',
-            'reflect',
-            'container',
-            'pluginManager'
-        ]
-        let params = [
-            sender,
-            reflect,
-            container,
-            this.pluginManager
-        ]
-        let tfunc = new Function(
-            ...paramNames,
-            `var api = require('@ccms/api');
-if (this.serverType == "spring") {
-    var dbm = container.get(api.database.DataBaseManager)
-    var db = dbm.getMainDatabase()
-    var df = base.getInstance().getAutowireCapableBeanFactory()
-}
-return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
-        return tfunc.apply(this, params) + ''
-    }
-
     cmddeploy(sender: any, name: any) {
         if (!process.env.AccessToken) { return this.i18n(sender, 'deploy.token.not.exists') }
         this.taskManager.create(() => {
             if (this.checkPlugin(sender, name)) {
-                let plugin: pluginApi.Plugin = this.pluginManager.getPlugins().get(name)
+                let plugin: interfaces.Plugin = this.pluginManager.getPlugins().get(name);
                 let result = http.post("http://ms.yumc.pw/api/plugin/deploy?access_token=" + process.env.AccessToken, {
                     name,
                     author: plugin.description.author,
                     version: plugin.description.version,
-                    source: base.read((plugin.description.source || plugin.description.loadMetadata.file).toString())
+                    source: base.read(plugin.description.source.toString())
                 })
                 this.i18n(sender, result.code == 200 ? 'deploy.success' : 'deploy.fail', { name, msg: result.msg })
             }
@@ -251,7 +224,7 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
 
     update(sender: any, name: string) {
         if (this.checkCloudPlugin(sender, name)) {
-            this.download(sender, name, true)
+            this.download(sender, name, true);
         }
     }
 
@@ -263,28 +236,25 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
                 case "list":
                     return ["install", "cloud"]
                 case "install":
-                    return this.packageNameCache
-                case "upgrade":
-                    if (args.length == 2) return ["system", ...this.pluginManager.getPlugins().keys()]
-                    if (args.length == 3 && args[1] == "system") return ["confirm"]
-                    return []
+                    return this.packageNameCache;
                 case "update":
+                case "upgrade":
                 case "load":
                 case "unload":
                 case "reload":
                 case "deploy":
-                    return [...this.pluginManager.getPlugins().keys()]
+                    return [...this.pluginManager.getPlugins().keys()];
             }
         }
     }
 
     updateRepo(sender: any) {
         this.taskManager.create(() => {
-            let result = http.get('http://ms.yumc.pw/api/plugin/list')
-            for (const pl of result.data) { this.packageCache[pl.name] = pl }
-            this.packageNameCache = Object.keys(this.packageCache)
+            let result = http.get('http://ms.yumc.pw/api/plugin/list');
+            for (const pl of result.data) { this.packageCache[pl.name] = pl; }
+            this.packageNameCache = Object.keys(this.packageCache);
             this.i18n(sender, 'cloud.update.finish', { length: this.packageNameCache.length })
-        }).async().submit()
+        }).async().submit();
     }
 
     download(sender: any, name: string, update: boolean = false) {

packages/plugins/src/MiaoSpring.ts

@@ -1,236 +0,0 @@
-/// <reference types="@javatypes/tomcat" />
-/// <reference types="@javatypes/spring-web" />
-
-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, 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'
-
-@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
-    @inject(plugin.PluginManager)
-    private pluginManager: plugin.PluginManager
-    @inject(database.DataBaseManager)
-    private databaseManager: DataBaseManager
-    @inject(web.Server)
-    private webServer: Server
-
-    @JSClass('org.springframework.http.HttpStatus')
-    private HttpStatus: org.springframework.http.HttpStatus
-
-    private ResponseEntity = org.springframework.http.ResponseEntity
-
-    private mainDatabase: DataBase
-    private mappings: Set<string>
-
-    @cmd()
-    mspring(sender: any) {
-        this.pluginManager.reload(this)
-        this.logger.sender(sender, "§a插件重载完成!")
-    }
-
-    load() {
-        this.mainDatabase = this.databaseManager.getMainDatabase()
-        this.mappings = new Set()
-    }
-
-    @Controllers(PluginController)
-    enable() {
-        this.registryDefault()
-        this.registryPages()
-        this.registryDatabase()
-    }
-
-    registryMapping(path: string, handler: RequestHandler) {
-        this.mappings.add(path)
-        this.webServer.registryMapping(path, handler)
-    }
-
-    registryDefault() {
-        const foundMap = ["/node_modules/amis/sdk/sdk.js", 'https://houtai.baidu.com/v2/jssdk', "/node_modules/amis/sdk/sdk.css", 'https://houtai.baidu.com/v2/csssdk']
-        this.webServer.registryInterceptor({
-            name: 'RedirectHandle',
-            preHandle: (ctx: Context) => {
-                const index = foundMap.indexOf(ctx.request.getRequestURI())
-                if (index != -1) {
-                    return this.ResponseEntity.status(this.HttpStatus.FOUND).header('Location', foundMap[index + 1]).build()
-                }
-            }
-        })
-        this.webServer.registryInterceptor({
-            name: 'StaticHandle',
-            preHandle: (ctx: Context) => {
-                let type = ctx.headers['Accept'] || ''
-                if (type == '*/*' || type.includes('text/css') || type.includes('text/html')) {
-                    let filePath = fs.concat(root, 'wwwroot', (ctx.request.getRequestURI() == '/' ? 'index.html' : ctx.request.getRequestURI()))
-                    let fileType = 'text/html;charset=utf-8'
-                    if (!fs.exists(filePath)) { filePath = filePath + '.html' }
-                    if (fs.exists(filePath)) {
-                        if (filePath.endsWith('.js')) { fileType = 'application/javascript' }
-                        if (filePath.endsWith('.css')) { fileType = 'text/css' }
-                        return this.ResponseEntity.ok().header('Content-Type', fileType).body(base.read(filePath))
-                    }
-                }
-            }
-        })
-        this.registryMapping('/api/eval', (ctx: Context) => {
-            try {
-                return { status: 200, data: this.runCode(ctx.body + ''), msg: '代码执行成功!' }
-            } catch (error) {
-                return { status: 500, data: console.stack(error, false), msg: '代码执行异常!' }
-            }
-        })
-    }
-
-    private registryPages() {
-        this.registryMapping('/api/page/list', () => {
-            return { status: 0, data: { rows: this.mainDatabase.query('SELECT `id`, `type`, `name`, `content` FROM `pages` WHERE `deleted` = 0') } }
-        })
-        this.registryMapping('/api/page/get', (ctx: Context) => {
-            let name = decodeURIComponent(`${ctx.params.name}`)
-            let varable = undefined
-            if (!name) { return { status: 400, msg: '名称不能为空!' } }
-            if (name.includes('|')) {
-                const temp = `${name}`.split('|')
-                name = temp[0]
-                varable = temp[1].replace(/'/ig, '"')
-            }
-            let result = this.mainDatabase.query<any>('SELECT content FROM `pages` WHERE name = ?', name)
-            if (!result.length) { return { status: 404, msg: `'页面配置 ${name} 不存在!` } }
-            let content = result[0].content
-            if (varable) {
-                let varObj = JSON.parse(varable)
-                for (const key in varObj) {
-                    content = content.replace(new RegExp(`{{${key}}}`, 'ig'), varObj[key])
-                }
-            }
-            return { status: 0, data: JSON.parse(content) }
-        })
-        this.registryMapping('/api/page/add', (ctx: Context) => {
-            let body = ctx.body
-            if (typeof body.content !== "string") { body.content = JSON.stringify(body.content) }
-            this.mainDatabase.update("INSERT INTO `pages`(`type`, `name`, `content`) VALUES (?, ?, ?)", body.type || 1, body.name, body.content)
-            return { status: 0, msg: `${body.name} 新增成功!` }
-        })
-        this.registryMapping('/api/page/update', (ctx: Context) => {
-            if (!ctx.params.id) { return { status: 400, msg: 'ID 不能为空!' } }
-            const body = ctx.body
-            if (typeof body.content !== "string") { body.content = JSON.stringify(body.content) }
-            this.mainDatabase.update("UPDATE `pages` SET `name` = ?, `content` = ? WHERE id = ?", body.name, body.content, ctx.params.id)
-            return { status: 0, msg: `${body.name} 更新成功!` }
-        })
-        this.registryMapping('/api/page/delete', (ctx: Context) => {
-            if (!ctx.params.name) { return { status: 400, msg: '页面 名称 不能为空!' } }
-            this.mainDatabase.update("UPDATE `pages` SET `name` = CONCAT(name, '_deleted'), deleted = 1 WHERE name = ?", ctx.params.name)
-            return { status: 0, msg: `${ctx.params.name} 删除成功!` }
-        })
-    }
-
-    private configTable = "config"
-
-    private registryDatabase() {
-        this.registryMapping('/api/config/list', (ctx: Context) => {
-            return { status: 0, data: this.mainDatabase.query('SELECT id, name, label, url, driver, username, password FROM `' + this.configTable + '` WHERE deleted = 0 AND type = ?', ctx.params.type || 0) }
-        })
-        this.registryMapping('/api/config/get', (ctx: Context) => {
-            let name = ctx.params.name
-            if (!name) { return { status: 400, msg: '名称不能为空!' } }
-            let result = this.mainDatabase.query('SELECT id, name, label, url, driver, username, password FROM `' + this.configTable + '` WHERE `name` = ?', name)
-            if (!result.length) { return { status: 404, msg: `配置 ${name} 不存在!` } }
-            return { status: 0, data: result[0] }
-        })
-        this.registryMapping('/api/config/add', (ctx: Context) => {
-            let body = ctx.body
-            if (!body.name) { return { status: 400, msg: '名称不能为空!' } }
-            this.mainDatabase.update(
-                'INSERT INTO `' + this.configTable + '`(`type`, `name`, `label`, `url`, `driver`, `username`, `password`) VALUES (?, ?, ?, ?, ?, ?, ?)',
-                ctx.params.type || 0, body.name, body.label || '', body.url, body.driver || '', body.username || '', body.password || ''
-            )
-            return { status: 0, msg: `配置 ${body.name} 新增成功!` }
-        })
-        this.registryMapping('/api/config/update', (ctx: Context) => {
-            if (!ctx.params.id) { return { status: 400, msg: 'ID 不能为空!' } }
-            let body = ctx.body
-            this.mainDatabase.update(
-                'UPDATE `' + this.configTable + '` SET `name` = ?, `label` = ?, `url` = ?, `driver` = ?, `username` = ?, `password` = ? WHERE `id` = ?',
-                body.name, body.label || '', body.url, body.driver || '', body.username || '', body.password || '', ctx.params.id
-            )
-            return { status: 0, msg: `配置 ${body.name} 更新成功!` }
-        })
-    }
-
-    private runCode(code: string) {
-        let paramNames = [
-            'beanFactory',
-            'mainDatabase',
-            'reflect',
-            'container',
-            'pluginManager'
-        ]
-        let params = [
-            base.getInstance().getAutowireCapableBeanFactory(),
-            this.mainDatabase,
-            reflect,
-            this.container,
-            this.pluginManager
-        ]
-        let tfunc = new Function(
-            ...paramNames,
-            `var api = require('@ccms/api');
-return eval(${JSON.stringify(code)});`)
-        return tfunc.apply(this, params)
-    }
-
-    disable() {
-        Object.keys(this.mappings).forEach((r) => this.webServer.unregistryMapping(r))
-        this.webServer.unregistryInterceptor({ name: 'RedirectHandle' })
-        this.webServer.unregistryInterceptor({ name: 'StaticHandle' })
-    }
-}
-
-class Plugin {
-    id: number
-    name: string
-    source: string
-}

packages/plugins/src/MiaoWeb.ts

@@ -1,31 +0,0 @@
-import { constants } from "@ccms/api"
-import { plugin, interfaces } from "@ccms/plugin"
-import { Controllers, Controller, Get, Body, Post, Cookie, Header, Param } from "@ccms/web"
-
-@Controller()
-export class TestController {
-    @Get()
-    public get() {
-        return 'test'
-    }
-    @Post()
-    public post(@Body() body: any,
-        @Cookie('test') testCookie,
-        @Header('Accept') testHeader,
-        @Param("name") param) {
-        return {
-            body,
-            testCookie,
-            testHeader,
-            param
-        }
-    }
-}
-
-@plugin({ author: 'MiaoWoo', servers: [constants.ServerType.Spring], source: __filename })
-export class MiaoWeb extends interfaces.Plugin {
-    @Controllers(TestController)
-    enable() {
-
-    }
-}

packages/plugins/src/SearchRanking.ts

@@ -1,215 +0,0 @@
-/// <reference types="@javatypes/spring-data-redis" />
-
-import { constants, plugin as pluginApi, amqp, server, web } from '@ccms/api'
-import { plugin, interfaces, cmd } from '@ccms/plugin'
-import { AmqpAdmin, ConnectionFactoryAdapter, AmqpManager } from '@ccms/amqp'
-import { inject, Autowired, ContainerInstance, Container } from '@ccms/container'
-import { Server, Controller, Get, Param, METADATA_KEY } from '@ccms/web'
-
-const SearchRankingAmqpAdmin = Symbol('SearchRanking-AmqpAdmin')
-
-const EXCHANGE_NAME = `search.ranking.${process.env.SPRING_CLOUD_CONFIG_PROFILE || 'dev'}`
-const QUEUE_NAME = `search.ranking.${process.env.SPRING_CLOUD_CONFIG_PROFILE || 'dev'}`
-const ROUTER_KEY = `search.ranking.${process.env.SPRING_CLOUD_CONFIG_PROFILE || 'dev'}`
-
-@plugin({ name: SearchRanking.name, version: SearchRanking.version, author: SearchRanking.author, servers: SearchRanking.servers, source: __filename })
-export class SearchRanking extends interfaces.Plugin {
-    public static version = '1.0.0'
-    public static author = 'MiaoWoo'
-    public static servers = [constants.ServerType.Spring]
-
-    @inject(ContainerInstance)
-    private container: Container
-    @inject(pluginApi.PluginManager)
-    private pluginManager: pluginApi.PluginManager
-    @inject(amqp.Manager)
-    private amqpManager: AmqpManager
-    @inject(server.Server)
-    private Server: server.Server
-    @inject(web.Server)
-    private webServer: Server
-
-    @Autowired()
-    private redisTemplate: org.springframework.data.redis.core.RedisTemplate<string, any>
-
-    private amqpAdmin: AmqpAdmin
-    private listener: org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
-
-    load() {
-        let connection = new ConnectionFactoryAdapter({
-            url: 'amqp://rabbitmq.c.sixi.com:5672',
-            username: 'root',
-            password: 'SixiMQ2018@'
-        })
-        let template = this.amqpManager.createTemplate(connection)
-        this.amqpAdmin = this.amqpManager.createAdmin(template)
-    }
-
-    enable() {
-        this.amqpAdmin.declareQueueAndBindExchange(QUEUE_NAME, EXCHANGE_NAME, ROUTER_KEY)
-        this.amqpAdmin.declareBinding(QUEUE_NAME, 'client.topic.exchange', `cmd_res.${ROUTER_KEY}`)
-        this.listener = this.amqpAdmin.createContainer<string>(QUEUE_NAME, (content, _message, _channel) => {
-            let searchResult = JSON.parse(content)
-            if (searchResult.type == "company") {
-                this.logger.info(content)
-                return
-            }
-            this.redisTemplate.opsForValue().set(searchResult.reqData.cacheKey, searchResult)
-            this.logger.sender(this.Server.getConsoleSender(), `§6查询任务完成! §b关键词: §r${searchResult.reqData.keywords}`)
-        })
-        this.container.bind(SearchRankingAmqpAdmin).toConstantValue(this.amqpAdmin)
-        this.listener.start()
-        this.webServer.registryController(SearchRankingController)
-    }
-
-    disable() {
-        this.container.unbind(SearchRankingAmqpAdmin)
-        this.listener.stop()
-        this.webServer.unregistryController(SearchRankingController)
-    }
-
-    @cmd()
-    sr(sender: any, cmd: string, args: string[]) {
-        let cmdKey = 'cmd' + (args[0] || 'help')
-        if (!this[cmdKey]) {
-            this.logger.sender(sender, `§4子命令 ${args[0]} 不存在!`)
-            return
-        }
-        args.shift()
-        this[cmdKey](sender, ...args)
-    }
-
-    cmdrun(sender: any, ...args: string[]) {
-        sender.sendMessage(eval(args.join(' ')))
-    }
-
-    cmdreload() {
-        this.pluginManager.reload(this)
-    }
-
-    cmdsearch(sender: any, keyword: string, type: "sale" | "normal" = "sale", time: number) {
-        this.logger.sender(sender, this.container.getNamed<SearchRankingController>(METADATA_KEY.Controller, SearchRankingController.name).cacheAndSearch(keyword, type, time)?.msg)
-    }
-}
-
-@Controller({ path: '/api', name: SearchRankingController.name })
-class SearchRankingController {
-    @Autowired()
-    private redisTemplate: org.springframework.data.redis.core.RedisTemplate<string, any>
-
-    @inject(SearchRankingAmqpAdmin)
-    private amqpAdmin: AmqpAdmin
-
-    @Get()
-    public search(
-        @Param({ name: 'keyword', require: true, message: '查询关键词不得为空!' }) keyword: string,
-        @Param("type") type: string = 'normal',
-        @Param('time') time: number = 60 * 60 * 24 * 15
-    ) {
-        return this.cacheAndSearch(keyword, type as any, time * 1000)
-    }
-
-    @Get("/search/ranking")
-    public searchRanking(
-        @Param({ name: 'keyword', require: true, message: '查询关键词不得为空!' }) keyword: string,
-        @Param("shopName") shopName: string = 'normal',
-        @Param("type") type: string = 'normal',
-        @Param('time') time: number = 60 * 60 * 24 * 15
-    ) {
-        return this.sendSearchRankingCmd(keyword, shopName, type as any, time * 1000)
-    }
-
-    @Get('/search/company')
-    public searchCompany(
-        @Param('url') url: string
-    ) {
-        this.amqpAdmin.getTemplate().convertAndSend('client.topic.exchange', 'cmd_req', {
-            cmd: 'scout._1688CompanyInfo',
-            data: {
-                type: 'company',
-                url: url,
-                cacheKey: 'SearchRanking:company'
-            },
-            resRouteSuffix: ROUTER_KEY,
-            target: {}
-        })
-    }
-
-    public cacheAndSearch(keyword: string, type: string = "sale", time: number = 15 * 24 * 60 * 60 * 1000) {
-        let cacheKey = this.getCacheKey(keyword, type)
-        if (this.redisTemplate.hasKey(cacheKey)) {
-            let lastSearchTime = this.redisTemplate.opsForValue().get(cacheKey)
-            if (Date.now() - lastSearchTime > time) {
-                return this.createKeyworkSearch(keyword, type)
-            }
-            let lastSearchKey = this.getResultCacheKey(keyword, type, lastSearchTime)
-            if (!this.redisTemplate.hasKey(lastSearchKey)) {
-                return { status: 202, msg: `关键词: ${keyword} 排名类型: ${type} 缓存Key: ${lastSearchKey} 查询任务尚未完成...` }
-            }
-            return {
-                status: 200,
-                msg: `关键词: ${keyword} 排名类型: ${type} 查询时间: ${new Date(lastSearchTime).toLocaleString()} 查询已完成!`,
-                data: this.redisTemplate.opsForValue().get(lastSearchKey)
-            }
-        }
-        return this.createKeyworkSearch(keyword, type)
-    }
-
-    private createKeyworkSearch(keyword: string, type: string) {
-        let cacheDate = Date.now()
-        this.redisTemplate.opsForValue().set(this.getCacheKey(keyword, type), cacheDate)
-        this.sendSearchCmd(keyword, type, cacheDate)
-        return { status: 201, msg: `关键词: ${keyword} 排名类型: ${type} 查询任务以创建...`, createTime: cacheDate }
-    }
-
-    private createRankingSearch(keyword: string, shopName: string, type: string) {
-        let cacheDate = Date.now()
-        this.redisTemplate.opsForValue().set(this.getCacheKey(keyword, type), cacheDate)
-        this.sendSearchRankingCmd(keyword, shopName, type, cacheDate)
-        return { status: 201, msg: `关键词: ${keyword} 店铺名称: ${shopName} 排名类型: ${type} 查询任务以创建...`, createTime: cacheDate }
-    }
-
-    private sendSearchCmd(keywords: string, type: string, dateCache: number) {
-        this.amqpAdmin.getTemplate().convertAndSend('client.topic.exchange', 'cmd_req', {
-            cmd: 'scout._1688Search',
-            data: {
-                keywords: keywords,
-                parameter: type == "sale" ? {
-                    descendOrder: true,
-                    sortType: 'va_rmdarkgmv30rt',
-                    button_click: 'top'
-                } : {},
-                cacheKey: this.getResultCacheKey(keywords, type, dateCache)
-            },
-            resRouteSuffix: ROUTER_KEY,
-            target: {}
-        })
-    }
-
-    private sendSearchRankingCmd(keywords: string, shopName: string, type: string, cacheTime: number) {
-        this.amqpAdmin.getTemplate().convertAndSend('client.topic.exchange', 'cmd_req', {
-            cmd: 'scout._1688Ranking',
-            data: {
-                keywords: keywords,
-                selector: {
-                    shopName
-                },
-                cacheKey: this.getResultCacheKey(keywords, type, cacheTime),
-                cacheTime
-            },
-            resRouteSuffix: ROUTER_KEY,
-            target: {}
-        })
-    }
-    /**
-     * 获得关键词+类型的上次查询时间
-     * @param keywords 关键词
-     * @param type 类型
-     */
-    private getCacheKey(keywords: string, type: string) {
-        return `SearchRanking:${keywords}:${type}`
-    }
-    private getResultCacheKey(keywords: string, type: string, date: number) {
-        return `SearchRanking:${keywords}:${type}:${date}`
-    }
-}

packages/plugins/tsconfig.json

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

packages/sponge/package.json

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

packages/sponge/src/command.ts

@@ -1,80 +1,80 @@
-import { command, plugin } from "@ccms/api"
-import { inject, provideSingleton } from "@ccms/container"
+import { command, plugin } from "@ccms/api";
+import { inject, provideSingleton } from "@ccms/container";
 
-let Sponge = Java.type('org.spongepowered.api.Sponge')
-let Text = Java.type('org.spongepowered.api.text.Text')
-var CommandCallable = Java.type('org.spongepowered.api.command.CommandCallable')
-var CommandResult = Java.type('org.spongepowered.api.command.CommandResult')
-var Optional = Java.type('java.util.Optional')
+let Sponge = Java.type('org.spongepowered.api.Sponge');
+let Text = Java.type('org.spongepowered.api.text.Text');
+var CommandCallable = Java.type('org.spongepowered.api.command.CommandCallable');
+var CommandResult = Java.type('org.spongepowered.api.command.CommandResult');
+var Optional = Java.type('java.util.Optional');
 
 @provideSingleton(command.Command)
 export class SpongeCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
-    private commandMapping: any[] = []
+    private commandMapping: any[] = [];
 
     create(plugin: any, command: string) {
-        let commandKey = this.getCommandKey(plugin, command)
-        let commandCallable = new SimpleCommandCallable(command)
-        this.commandMapping[commandKey] = Sponge.getCommandManager().register(this.pluginInstance, commandCallable.callable, command, commandKey).orElse(null)
-        return commandCallable
+        let commandKey = this.getCommandKey(plugin, command);
+        let commandCallable = new SimpleCommandCallable(command);
+        this.commandMapping[commandKey] = Sponge.getCommandManager().register(this.pluginInstance, commandCallable.callable, command, commandKey).orElse(null);
+        return commandCallable;
     }
     remove(plugin: any, command: string) {
-        var commandKey = this.getCommandKey(plugin, command)
+        var commandKey = this.getCommandKey(plugin, command);
         if (this.commandMapping[commandKey]) {
-            Sponge.getCommandManager().removeMapping(this.commandMapping[commandKey])
-            delete this.commandMapping[commandKey]
+            Sponge.getCommandManager().removeMapping(this.commandMapping[commandKey]);
+            delete this.commandMapping[commandKey];
         }
     }
-    onCommand(plugin: plugin.Plugin, command: any, executor: Function) {
-        command.setExecutor(super.setExecutor(plugin, command, executor))
+    onCommand(plugin: any, command: any, executor: Function) {
+        command.setExecutor(super.setExecutor(plugin, command, executor));
     }
-    onTabComplete(plugin: plugin.Plugin, command: any, tabCompleter: Function) {
-        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter))
+    onTabComplete(plugin: any, command: any, tabCompleter: Function) {
+        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter));
     }
 
     private getCommandKey(plugin: any, command: string) {
-        return plugin.description.name.toLowerCase() + ":" + command
+        return plugin.description.name.toLowerCase() + ":" + command;
     }
 }
 
 class SimpleCommandCallable {
-    public callable: any
-    private name: string
-    private executor: Function
-    private tabCompleter: Function
+    public callable: any;
+    private name: string;
+    private executor: Function;
+    private tabCompleter: Function;
 
     constructor(command: string, description: string = '暂无描述!') {
-        this.name = command
+        this.name = command;
         this.callable = new CommandCallable({
-            //CommandResult process(CommandSource source, String arguments) throws CommandException
+            //CommandResult process(CommandSource source, String arguments) throws CommandException;
             process: (sender: any, args) => {
-                return this.executor(sender, '', command, Java.to(args.split(" ").filter(e => e))) ? CommandResult.success() : CommandResult.empty()
+                return this.executor(sender, '', command, Java.to(args.split(" ").filter(e => e))) ? CommandResult.success() : CommandResult.empty();
             },
-            //List<String> getSuggestions(CommandSource source, String arguments, @Nullable  Location<World> targetPosition) throws CommandException
+            //List<String> getSuggestions(CommandSource source, String arguments, @Nullable  Location<World> targetPosition) throws CommandException;
             getSuggestions: (sender: any, args, target) => {
-                return this.tabCompleter(sender, '', command, Java.to(args.split(" ").filter(e => e)))
+                return this.tabCompleter(sender, '', command, Java.to(args.split(" ").filter(e => e)));
             },
-            //boolean testPermission(CommandSource source)
+            //boolean testPermission(CommandSource source);
             testPermission: () => {
-                return true
+                return true;
             },
-            //Optional<Text> getShortDescription(CommandSource source)
+            //Optional<Text> getShortDescription(CommandSource source);
             getShortDescription: () => {
-                return Optional.of(Text.of(description))
+                return Optional.of(Text.of(description));
             },
-            //Optional<Text> getHelp(CommandSource source)
+            //Optional<Text> getHelp(CommandSource source);
             getHelp: () => {
-                return Optional.of(Text.of(""))
+                return Optional.of(Text.of(""));
             },
-            //Text getUsage(CommandSource source)
+            //Text getUsage(CommandSource source);
             getUsage: () => {
-                return Text.of('')
+                return Text.of('');
             }
         })
     }
 
-    setExecutor = (executor: Function) => this.executor = executor
-    setTabCompleter = (tabCompleter: Function) => this.tabCompleter = tabCompleter
+    setExecutor = (executor: Function) => this.executor = executor;
+    setTabCompleter = (tabCompleter: Function) => this.tabCompleter = tabCompleter;
     toString = () => `Sponge SimpleCommandCallable(${this.name})`
 }

packages/sponge/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference types="@javatypes/sponge-api" />
+/// <reference types="@ccms/types/dist/typings/sponge" />
 
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'