v0.9.0

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

.npmignore

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

doc/MCBBS.MD

@@ -4,3 +4,8 @@
 - 更新日志 [![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.6.7",
+    "version": "0.9.0",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [
@@ -10,6 +10,7 @@
             "stream": true
         },
         "publish": {
+            "access": "public",
             "registry": "https://repo.yumc.pw/repository/npm-hosted/"
         }
     }

package.json

@@ -12,13 +12,14 @@
         "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 --registry https://registry.npmjs.org\" --scope=\"@ccms/!(client|plugins|types)\"",
+        "np": "lerna exec \"npm publish --access=public --registry https://registry.npmjs.org\" --scope=\"@ccms/!(client|plugins)\"",
-        "lp": "lerna publish"
+        "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
+        "lp": "lerna publish --registry https://registry.npmjs.org"
     },
     "workspaces": [
         "packages/*"
     ],
     "devDependencies": {
-        "lerna": "^3.21.0"
+        "lerna": "^3.22.1"
     }
 }

packages/amqp/package.json

@@ -0,0 +1,35 @@
+{
+    "name": "@ccms/amqp",
+    "version": "0.9.0",
+    "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.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
+    },
+    "devDependencies": {
+        "@ccms/nashorn": "^0.9.0",
+        "@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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,89 @@
+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

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

packages/amqp/src/index.ts

@@ -0,0 +1,34 @@
+/// <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

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

packages/amqp/src/manager.ts

@@ -0,0 +1,18 @@
+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

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

packages/api/package.json

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

packages/api/src/chat.ts

@@ -0,0 +1,19 @@
+export namespace chat {
+    export abstract class Chat {
+        sendMessage(sender: any, message: string) {
+            throw new Error("Method not implemented.")
+        }
+        sendActionBar(sender: any, message: string) {
+            throw new Error("Method not implemented.")
+        }
+        clearActionBar(sender: any) {
+            this.sendActionBar(sender, '')
+        }
+        sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+            throw new Error("Method not implemented.")
+        }
+        clearTitle(sender: any) {
+            this.sendTitle(sender, '', '', 0, 0, 0)
+        }
+    }
+}

packages/api/src/command.ts

@@ -1,5 +1,6 @@
 import i18n from '@ccms/i18n'
-import { injectable } from "@ccms/container";
+import { injectable } from "@ccms/container"
+import { plugin } from './interfaces'
 
 export namespace command {
     @injectable()
@@ -10,16 +11,17 @@ export namespace command {
          * @param name 命令
          * @param exec 执行器
          */
-        on(plugin: any, name: string, exec: { cmd: Function, tab?: Function }) {
+        on(plugin: plugin.Plugin, name: string, exec: { cmd: Function, tab?: Function }) {
-            var cmd = this.create(plugin, name);
+            var cmd = this.create(plugin, name)
+            if (!cmd) { throw Error("") }
             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)
             }
         }
         /**
@@ -27,40 +29,40 @@ export namespace command {
          * @param plugin 插件
          * @param name 命令
          */
-        off(plugin: any, name: string) {
+        off(plugin: plugin.Plugin, 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: any, command: string);
+        protected abstract create(plugin: plugin.Plugin, command: string): any
-        protected abstract remove(plugin: any, command: string);
+        protected abstract remove(plugin: plugin.Plugin, command: string): void
-        protected abstract onCommand(plugin: any, command: any, executor: Function);
+        protected abstract onCommand(plugin: plugin.Plugin, command: any, executor: Function)
-        protected abstract onTabComplete(plugin: any, command: any, tabCompleter: Function);
+        protected abstract onTabComplete(plugin: plugin.Plugin, command: any, tabCompleter: Function)
-        protected setExecutor(plugin: any, command: any, executor: Function) {
+        protected setExecutor(plugin: plugin.Plugin, command: any, executor: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    return executor(sender, command, Java.from(args));
+                    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: any, command: any, tabCompleter: Function) {
+        protected setTabCompleter(plugin: plugin.Plugin, command: any, tabCompleter: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    var token = args[args.length - 1];
+                    var token = args[args.length - 1]
-                    var complete = tabCompleter(sender, command, Java.from(args)) || [];
+                    var complete = tabCompleter(sender, command, Java.from(args)) || []
-                    return this.copyPartialMatches(complete, token);
+                    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.ex(ex)
-                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)]);
+                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { sender: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
-                    return [];
+                    return []
                 }
             }
         }
@@ -70,7 +72,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 Arrays = Java.type('java.util.Arrays')
-const Level = Java.type('java.util.logging.Level');
+const Level = Java.type('java.util.logging.Level')
-const Paths = Java.type('java.nio.file.Paths');
+const Paths = Java.type('java.nio.file.Paths')
-const ignoreLogPrefix = ['java.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.'];
+const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
 
 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 sourceMaps: { [key: string]: SourceMapBuilder } = {}
-    private static sourceFileMaps: { [key: string]: string } = {};
+    private static sourceFileMaps: { [key: string]: string } = {}
-    private _name: string = '';
+    private _name: string = ''
-    private _level: LogLevel = LogLevel.INFO;
+    private _level: LogLevel = LogLevel.INFO
 
-    protected logger: any;
+    protected logger: any
-    protected prefix: string = '§6[§bMiaoScript§6]§r ';
+    protected prefix: string = '§6[§bMiaoScript§6]§r '
 
     constructor(name?: string) {
-        this.name = name;
+        this.name = name
-        this.logger = global.logger;
+        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,55 +95,63 @@ 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]
+                    // lastLine is similar //# sourceMappingURL=data:application/json;base64,
                     if (lastLine.startsWith('//# sourceMappingURL=')) {
-                        let sourceContent = null;
+                        let sourceContent = null
-                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1];
+                        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) {
             console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
+            if (global.debug) {
+                console.ex(error)
+            }
         }
         return {
             fileName,
             lineNumber
         }
     }
-    stack(ex: Error): string[] {
+    stack(ex: Error, color: boolean = true): string[] {
-        let stack = ex.getStackTrace();
+        let stack = ex.getStackTrace()
-        let cache = ['§c' + ex];
+        let cache = [(color ? '§c' : '') + ex]
         //@ts-ignore
         if (stack.class) {
             stack = Arrays.asList(stack)
         }
         stack.forEach(trace => {
-            if (!trace.fileName || trace.fileName.startsWith('jar:file:')) { return }
+            if (!trace.fileName || trace.fileName.startsWith('jar:file:') || trace.fileName.startsWith('file:')) { return }
             if (trace.className.startsWith('<')) {
                 let { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
                 if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
-                cache.push(`    §e->§c ${fileName} => §4${trace.methodName}:${lineNumber}`)
+                if (color) {
+                    cache.push(`    §e->§c ${fileName}:${lineNumber} => §4${trace.methodName}`)
+                } else {
+                    cache.push(`    -> ${fileName}:${lineNumber} => ${trace.methodName}`)
+                }
             } else {
-                let className = trace.className;
+                let className = trace.className
-                var fileName = trace.fileName as string;
+                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)
@@ -151,70 +159,74 @@ export class MiaoScriptConsole implements Console {
                 } else {
                     for (let prefix in ignoreLogPrefix) {
                         if (className.startsWith(ignoreLogPrefix[prefix])) {
-                            return;
+                            return
                         }
                     }
                 }
-                cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`);
+                if (color) {
+                    cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`)
+                } else {
+                    cache.push(`    -> ${className}.${trace.methodName}(${fileName}:${lineNumber})`)
+                }
             }
-        });
+        })
-        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,6 +11,7 @@ export namespace constants {
         Bukkit = 'bukkit',
         Sponge = 'sponge',
         Nukkit = 'nukkit',
-        Bungee = 'bungee'
+        Bungee = 'bungee',
+        Spring = 'spring'
     }
 }

packages/api/src/event.ts

@@ -4,7 +4,7 @@
 import i18n from '@ccms/i18n'
 import { injectable, unmanaged } from '@ccms/container'
 
-const Thread = Java.type('java.lang.Thread');
+const Thread = Java.type('java.lang.Thread')
 
 export namespace event {
     /**
@@ -30,7 +30,7 @@ export namespace event {
         protected baseEventDir = '';
 
         constructor(@unmanaged() baseEventDir: string) {
-            this.baseEventDir = baseEventDir;
+            this.baseEventDir = baseEventDir
         }
 
         /**
@@ -39,74 +39,74 @@ export namespace event {
          *     org.spongepowered.api.event.game.GameRegistryEvent.Register => gameregistryevent$register
          */
         mapEventName() {
-            if (this.baseEventDir === "") { throw new Error(i18n.translate('ms.api.event.empty.event.dir')); }
+            if (this.baseEventDir === "") { throw new Error(i18n.translate('ms.api.event.empty.event.dir')) }
-            let count = 0;
+            let count = 0
-            let jar = this.getJarFile(this.baseEventDir);
+            let jar = this.getJarFile(this.baseEventDir)
-            let entries = jar.entries();
+            let entries = jar.entries()
             while (entries.hasMoreElements()) {
-                let entry = entries.nextElement();
+                let entry = entries.nextElement()
-                let name = entry.name;
+                let name = entry.name
                 if (name.startsWith(this.baseEventDir) && name.endsWith(".class")) {
                     // replace name to qualifiedName
-                    let qualifiedName = name.replaceAll('/', '.');
+                    let qualifiedName = name.replaceAll('/', '.')
                     try {
-                        let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6));
+                        let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6))
                         if (this.isValidEvent(clazz)) {
-                            let simpleName = this.class2Name(clazz).toLowerCase();
+                            let simpleName = this.class2Name(clazz).toLowerCase()
-                            console.trace(i18n.translate("ms.api.event.mapping", { canonicalName: clazz.canonicalName, simpleName }));
+                            console.trace(i18n.translate("ms.api.event.mapping", { canonicalName: clazz.canonicalName, simpleName }))
-                            this.mapEvent[simpleName] = clazz;
+                            this.mapEvent[simpleName] = clazz
-                            count++;
+                            count++
                         }
                     } catch (ex) {
                         //ignore already loaded class
                     }
                 }
             }
-            return count;
+            return count
         }
 
         getJarFile(resource: string, loader?: any) {
-            let dirs = (loader || Thread.currentThread().getContextClassLoader()).getResources(resource);
+            let dirs = (loader || Thread.currentThread().getContextClassLoader()).getResources(resource)
             if (dirs.hasMoreElements()) {
-                let url = dirs.nextElement();
+                let url = dirs.nextElement()
-                if (url.protocol === "jar") { return url.openConnection().jarFile; }
+                if (url.protocol === "jar") { return url.openConnection().jarFile }
             }
             throw new Error(i18n.translate("ms.api.event.resource.not.found", { resource }))
         }
 
         class2Name(clazz: any) {
-            return clazz.simpleName;
+            return clazz.simpleName
         }
 
         name2Class(name: any, event: string) {
-            let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event'];
+            let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event']
             if (!eventCls) {
                 try {
-                    eventCls = base.getClass(eventCls);
+                    eventCls = base.getClass(eventCls)
-                    this.mapEvent[event] = eventCls;
+                    this.mapEvent[event] = eventCls
                 } catch (ex) {
                     console.i18n("ms.api.event.not.found", { name, event })
-                    return;
+                    return
                 }
             }
-            return eventCls;
+            return eventCls
         }
 
         execute(name, exec, eventCls) {
             return (...args: any[]) => {
                 try {
-                    let event = args[args.length - 1];
+                    let event = args[args.length - 1]
                     if (eventCls.isAssignableFrom(event.getClass())) {
                         let time = Date.now()
-                        exec(event);
+                        exec(event)
-                        let cost = Date.now() - time;
+                        let cost = Date.now() - time
                         if (cost > 20) {
                             console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
                         }
                     }
                 } catch (ex) {
                     console.i18n("ms.api.event.execute.error", { name, event: this.class2Name(eventCls), ex })
-                    console.ex(ex);
+                    console.ex(ex)
                 }
             }
         }
@@ -120,34 +120,34 @@ export namespace event {
         * @param ignoreCancel
         */
         listen(plugin: any, event: string, exec: (event: any) => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) {
-            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"));
+            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"))
-            var name = plugin.description.name;
+            var name = plugin.description.name
-            var eventCls = this.name2Class(name, event);
+            var eventCls = this.name2Class(name, event)
-            if (!eventCls) { return; }
+            if (!eventCls) { return }
             if (typeof priority === 'boolean') {
-                ignoreCancel = priority;
+                ignoreCancel = priority
-                priority = EventPriority.NORMAL;
+                priority = EventPriority.NORMAL
             }
-            priority = priority || EventPriority.NORMAL;
+            priority = priority || EventPriority.NORMAL
-            ignoreCancel = ignoreCancel || false;
+            ignoreCancel = ignoreCancel || false
             // noinspection JSUnusedGlobalSymbols
-            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel);
+            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel)
-            var listenerMap = this.listenerMap;
+            var listenerMap = this.listenerMap
             // add to cache Be used for close plugin to close event
-            if (!listenerMap[name]) listenerMap[name] = [];
+            if (!listenerMap[name]) listenerMap[name] = []
             var offExec = () => {
-                this.unregister(eventCls, listener);
+                this.unregister(eventCls, listener)
-                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls) }));
+                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
-            };
+            }
             var off = {
                 event: eventCls,
                 listener: listener,
                 off: offExec
-            };
+            }
-            listenerMap[name].push(off);
+            listenerMap[name].push(off)
             // noinspection JSUnresolvedVariable
-            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls) }));
+            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
-            return off;
+            return off
         }
 
         /**
@@ -155,10 +155,10 @@ export namespace event {
          * @param plugin 插件
          */
         disable(plugin: any) {
-            var eventCache = this.listenerMap[plugin.description.name];
+            var eventCache = this.listenerMap[plugin.description.name]
             if (eventCache) {
-                eventCache.forEach(t => t.off());
+                eventCache.forEach(t => t.off())
-                delete this.listenerMap[plugin.description.name];
+                delete this.listenerMap[plugin.description.name]
             }
         }
 
@@ -166,7 +166,7 @@ export namespace event {
          * 判断
          * @param clazz 事件类
          */
-        abstract isValidEvent(clazz: any): boolean;
+        abstract isValidEvent(clazz: any): boolean
         /**
          * 注册事件
          * @param eventCls 事件类
@@ -174,12 +174,12 @@ export namespace event {
          * @param priority 优先级
          * @param ignoreCancel 是否忽略已取消的事件
          */
-        abstract register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean): any;
+        abstract register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean): any
         /**
          * 取消监听事件
          * @param event 事件
          * @param listener 监听器
          */
-        abstract unregister(event: any, listener: any): void;
+        abstract unregister(event: any, listener: any): void
     }
 }

packages/api/src/index.ts

@@ -1,4 +1,6 @@
 import "@ccms/nashorn"
+
+export * from './chat'
 export * from './task'
 export * from './event'
 export * from './console'

packages/api/src/interfaces/amqp.ts

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,5 @@
+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,2 +1,5 @@
+export * from './web'
+export * from './amqp'
 export * from './plugin'
 export * from './server'
+export * from './database'

packages/api/src/interfaces/plugin.ts

@@ -2,73 +2,186 @@ 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;
+        scan(folder: string): void
-        build(): void;
+        build(): void
-        loadFromFile(file: string): Plugin;
+        loadFromFile(file: string, scanner?: plugin.PluginScanner): Plugin
-        load(...args: any[]): void;
+        load(...args: any[]): void
-        enable(...args: any[]): void;
+        enable(...args: any[]): void
-        disable(...args: any[]): void;
+        disable(...args: any[]): void
-        reload(...args: any[]): void;
+        reload(...args: any[]): void
-        getPlugins(): Map<string, any>;
+        getPlugin(name: string): plugin.Plugin
+        getPlugins(): Map<string, plugin.Plugin>
     }
-    export interface Plugin {
+    export const PluginScanner = Symbol("PluginScanner")
-        description: PluginMetadata;
+    /**
-        logger: Console;
+     * 插件加载元信息
-        load(): void;
+     */
-        enable(): void;
+    export interface PluginLoadMetadata {
-        disable(): void;
-    }
-    interface BaseMetadata {
         /**
-         * 名称 为空则为对象名称
+         * 插件加载类型
          */
-        name?: string;
+        type: string
-        /**
-         * 支持的服务器列表 为空则代表所有
-         */
-        servers?: string[];
-    }
-    export interface PluginMetadata extends BaseMetadata {
         /**
          * 插件名称
          */
-        name: 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
+    }
+    export interface Plugin {
+        description: PluginMetadata
+        logger: Console
+        load(): void
+        enable(): void
+        disable(): void
+    }
+    export interface BaseMetadata {
+        /**
+         * 名称 为空则为对象名称
+         */
+        name?: string
+        /**
+         * 支持的服务器列表 为空则代表所有
+         */
+        servers?: string[]
+    }
+    export interface PluginMetadata extends BaseMetadata {
+        /**
+         * 插件名称 不填默认为类名
+         */
+        name?: string
         /**
          * 前缀
          */
-        prefix?: string;
+        prefix?: string
         /**
-         * 插件版本
+         * 插件版本 不填默认为 1.0.0
          */
-        version: string;
+        version?: string
         /**
-         * 插件版本
+         * 插件作者 不填默认为 Unknow
          */
-        author: string | string[];
+        author?: string | string[]
         /**
          * 插件源文件 必须指定为 __filename
          */
-        source: string;
+        source: string
+        /**
+         * 插件类型 默认为 ioc 执行 MiaoScript 加载逻辑
+         */
+        type?: string
+        /**
+         * 插件加载信息
+         */
+        loadMetadata?: PluginLoadMetadata
         /**
          * 插件本体
          */
-        target?: any;
+        target?: any
     }
 }

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

@@ -1,37 +1,160 @@
+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;
+        getVersion(): string
-        getPlayer(name: string): any;
+        getPlayer(name: string): any
-        getOnlinePlayers(): any[];
+        getOnlinePlayers(): any[]
-        getConsoleSender(): any;
+        getConsoleSender(): any
-        getService(service: string): any;
+        getService(service: string): any
-        dispatchCommand(sender: string | any, command: string): boolean;
+        dispatchCommand(sender: string | any, command: string): boolean
-        dispatchConsoleCommand(command: string): boolean;
+        dispatchConsoleCommand(command: string): boolean
-        getPluginsFolder(): string;
+        getPluginsFolder(): string
-        getNativePluginManager(): NativePluginManager;
+        getNativePluginManager(): NativePluginManager
-        getNettyPipeline(): any;
+        getDedicatedServer?(): any
-        getRootLogger(): any;
+        getNettyPipeline(): any
-        sendJson(sender: string | any, json: object | string): void;
+        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!") }
+        }
     }
 }

packages/api/src/interfaces/web.ts

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

packages/api/src/task.ts

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

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,14 @@
         "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.2"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.6.7",
+        "@ccms/api": "^0.9.0",
-        "@ccms/common": "^0.6.7",
+        "@ccms/common": "^0.9.0",
-        "@ccms/container": "^0.6.7"
+        "@ccms/container": "^0.9.0"
     }
 }

packages/bukkit/src/channel.ts

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

packages/bukkit/src/chat.ts

@@ -0,0 +1,16 @@
+import { chat } from '@ccms/api'
+import { provideSingleton } from '@ccms/container'
+import bukkitChat from './enhance/chat'
+
+@provideSingleton(chat.Chat)
+export class BukkitChat extends chat.Chat {
+    sendMessage(sender: any, message: string) {
+        bukkitChat.send(sender, { text: message }, 0)
+    }
+    sendActionBar(sender: any, message: string) {
+        bukkitChat.send(sender, { text: message }, 2)
+    }
+    sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+        sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
+    }
+}

packages/bukkit/src/enhance/chat.ts

@@ -1,29 +1,28 @@
 /*global Java, base, module, exports, require*/
-var nmsChatSerializerClass;
+let ChatSerializer: any
-var nmsChatSerializerMethod;
+let nmsChatSerializerMethodName: string
-var packetTypeConstructor;
+let PacketPlayOutChat: any
-var nmsChatMessageTypeClass;
+let chatMessageTypes: any
-var chatMessageTypes;
 
-var RemapUtils;
+let RemapUtils: any
 
-var playerConnectionFieldName;
+let playerConnectionFieldName: string
-var sendPacketMethod;
+let sendPacketMethodName: string
 
-var downgrade = false;
+let downgrade = false
 /**
  * 获取NMS版本
  */
 //@ts-ignore
-var nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3];
+let nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3]
 /**
  * 获取NMS类
  */
-function nmsCls(name) {
+function nmsCls(name: string) {
     return base.getClass(['net.minecraft.server', nmsVersion, name].join('.'))
 }
 
-function remapMethod(clazz: any, origin: string, test: string, params) {
+function remapMethod(clazz: any, origin: string, test: string, params: any) {
     try {
         return clazz.getMethod(origin, params)
     } catch (ex) {
@@ -49,66 +48,57 @@ function remapFieldName(clazz: any, origin: string, test: string) {
 
 function init() {
     try {
-        RemapUtils = Java.type('catserver.server.remapper.RemapUtils');
+        RemapUtils = Java.type('catserver.server.remapper.RemapUtils')
     } catch (ex) {
     }
-    nmsChatSerializerClass = nmsCls(nmsVersion.split("_")[1] > 7 ? "IChatBaseComponent$ChatSerializer" : "ChatSerializer");
+    let nmsChatSerializerClass = nmsCls(nmsVersion.split("_")[1] > 7 ? "IChatBaseComponent$ChatSerializer" : "ChatSerializer")
-    nmsChatSerializerMethod = remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
+    let nmsChatSerializerMethod = remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
-    var packetTypeClass = nmsCls("PacketPlayOutChat");
+    nmsChatSerializerMethodName = nmsChatSerializerMethod.getName()
-    Java.from(packetTypeClass.constructors).forEach(function(c) {
+    ChatSerializer = Java.type(nmsChatSerializerClass.getName())
+    let packetTypeClass = nmsCls("PacketPlayOutChat")
+    PacketPlayOutChat = Java.type(packetTypeClass.getName())
+    let packetTypeConstructor: { parameterTypes: any[] }
+    Java.from(packetTypeClass.constructors).forEach(function (c) {
         if (c.parameterTypes.length === 2) {
             packetTypeConstructor = c
         }
-    });
+    })
-    nmsChatMessageTypeClass = packetTypeConstructor.parameterTypes[1];
+    let nmsChatMessageTypeClass = packetTypeConstructor.parameterTypes[1]
     if (nmsChatMessageTypeClass.isEnum()) {
-        chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants();
+        chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
-    } else {
-        switch (nmsChatMessageTypeClass.name) {
-            case "int":
-                //@ts-ignore
-                nmsChatMessageTypeClass = java.lang.Integer;
-                break;
-            case "byte":
-                //@ts-ignore
-                nmsChatMessageTypeClass = java.lang.Byte;
-                break;
-        }
     }
-    var entityPlayerClass = nmsCls('EntityPlayer');
+    let playerConnectionField = remapFieldName(nmsCls('EntityPlayer'), 'playerConnection', 'field_71135_a')
-    var packetClass = nmsCls('Packet');
-    var playerConnectionField = remapFieldName(entityPlayerClass, 'playerConnection', 'field_71135_a')
     playerConnectionFieldName = playerConnectionField.getName()
-    sendPacketMethod = remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', packetClass)
+    sendPacketMethodName = remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', nmsCls('Packet')).getName()
 }
 
-function json(sender, json) {
+function json(sender: { name: string }, json: string) {
     if (downgrade) {
         return '/tellraw ' + sender.name + ' ' + json
     } else {
-        send(sender, json, 0);
+        send(sender, json, 0)
-        return false;
+        return false
     }
 }
 
-function send(sender, json, type) {
+function send(sender: any, json: any, type: number) {
-    //@ts-ignore
+    sendPacket(sender, new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type]))
-    sendPacket(sender, packetTypeConstructor.newInstance(nmsChatSerializerMethod.invoke(null, json), chatMessageTypes == null ? nmsChatMessageTypeClass.valueOf(java.lang.String.valueOf(type)) : chatMessageTypes[type]))
 }
 
-function sendPacket(player, p) {
+function sendPacket(player: { handle: { [x: string]: { [x: string]: (arg0: any) => void } } }, p: any) {
-    sendPacketMethod.invoke(player.handle[playerConnectionFieldName], p)
+    player.handle[playerConnectionFieldName][sendPacketMethodName](p)
 }
 
 try {
-    init();
+    init()
 } catch (ex) {
     org.bukkit.Bukkit.getConsoleSender().sendMessage(`§6[§cMS§6][§bbukkit§6][§achat§6] §cNMS Inject Error §4${ex} §cDowngrade to Command Mode...`)
-    downgrade = true;
+    downgrade = true
 }
 
 let chat = {
-    json
+    json,
+    send
 }
 
 export default chat

packages/bukkit/src/index.ts

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

packages/bukkit/src/server.ts

@@ -1,20 +1,18 @@
 import { server, constants } from '@ccms/api'
-import { provideSingleton } from '@ccms/container';
+import { provideSingleton } from '@ccms/container'
 
 import * as reflect from '@ccms/common/dist/reflect'
 import chat from './enhance/chat'
 
-let Bukkit = org.bukkit.Bukkit;
+let Bukkit = org.bukkit.Bukkit
 
 @provideSingleton(server.Server)
-export class BukkitServer implements server.Server {
+export class BukkitServer extends server.ReflectServer {
-    private pluginsFolder: string;
+    private pluginsFolder: string
-    private pipeline: any;
-    private rootLogger: any;
 
     constructor() {
-        this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath();
+        super()
-        this.reflect()
+        this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath()
     }
 
     getPlayer(name: string) {
@@ -42,61 +40,27 @@ export class BukkitServer implements server.Server {
         return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command)
     }
     getPluginsFolder(): string {
-        return this.pluginsFolder;
+        return this.pluginsFolder
     }
     getNativePluginManager() {
-        return Bukkit.getPluginManager() as any;
+        return Bukkit.getPluginManager() as any
+    }
+    getDedicatedServer() {
+        return reflect.on(Bukkit.getServer()).get('console').get()
     }
     getNettyPipeline() {
-        return this.pipeline;
+        return this.pipeline
     }
     getRootLogger() {
-        return this.rootLogger;
+        return this.rootLogger
     }
     sendJson(sender: string | any, json: object | string): void {
         if (typeof sender === "string") {
             sender = this.getPlayer(sender)
         }
-        let result = chat.json(sender, json)
+        let result = chat.json(sender, typeof json == "string" ? json : JSON.stringify(json))
         if (result !== false) {
             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,10 +23,8 @@ export class BukkitTaskManager implements task.TaskManager {
 }
 
 export class BukkitTask extends task.Task {
-    submit(): task.Cancelable {
+    submit(...args: any[]): task.Cancelable {
-        let run = new BukkitRunnable({
+        let run = new BukkitRunnable({ run: () => this.run(...args) })
-            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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,14 @@
         "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.2"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.6.7",
+        "@ccms/api": "^0.9.0",
-        "@ccms/common": "^0.6.7",
+        "@ccms/common": "^0.9.0",
-        "@ccms/container": "^0.6.7"
+        "@ccms/container": "^0.9.0"
     }
 }

packages/bungee/src/index.ts

@@ -1,4 +1,4 @@
-/// <reference types="@ccms/types/dist/typings/bungee" />
+/// <reference types="@javatypes/bungee-api" />
 
 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(): task.Cancelable {
+    submit(...args: any[]): task.Cancelable {
-        let run = new Runnable({ run: () => this.run() })
+        let run = new Runnable({ run: () => this.run(...args) })
         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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "minecraft-protocol": "^1.11.0"
+        "minecraft-protocol": "^1.13.0"
     },
     "devDependencies": {
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     }
 }

packages/common/package.json

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

packages/common/src/reflect.ts

@@ -1,196 +1,202 @@
+/// <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 NoSuchFieldException = Java.type('java.lang.NoSuchFieldException')
-const methodCache = [];
+const methodCache = []
 
 class Reflect {
-    private obj: any;
+    private obj: java.lang.Object
-    private class: any
+    private class: java.lang.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.obj = null
-            this.class = obj;
+            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(...args: any[]) {
+    method(name: string, ...args: java.lang.Class<any>[]) {
-        return declaredMethod(this.class, args[0], types(args.slice(1)));
+        return declaredMethod(this.class, name, ...args)
     }
 
     methods() {
-        return Java.from(declaredMethods(this.class));
+        return Java.from(declaredMethods(this.class))
     }
 
-    field(name): Reflect {
+    field(name: string | java.lang.String): Reflect {
         try {
             // Try getting a public field
-            let field = this.class.field(name);
+            let field = this.class.getField(name)
-            return on(field.get(this.obj));
+            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) {
+    fields(declared = false): java.lang.reflect.Field[] {
-        return Java.from(declared ? this.class.declaredFields : this.class.fields);
+        return Java.from(declared ? this.class.getDeclaredFields() : this.class.getFields())
     }
 
     values(declared = false) {
-        let cache = {};
+        return this.fields(declared).reduce((cache, field) => { return cache[field.getName()] = this.field(field.getName()).get() }, {}) as any
-        this.fields(declared).forEach(fed => cache[fed.name] = this.field(fed.name).get())
-        return cache;
     }
 
-    call(...args): Reflect {
+    call(...args: any[]): Reflect {
-        let params = args.slice(1);
+        let params = args.slice(1)
-        let method = accessible(declaredMethod(this.class, args[0], types(params)));
+        let method = accessible(declaredMethod(this.class, args[0], ...types(params)))
-        let result = method.invoke(this.get(), params);
+        let result = method.invoke(this.get(), params)
-        return result && on(result);
+        return result && on(result)
-    };
+    }
 
-    get(...args): Reflect | any {
+    get(): any
-        return args.length === 1 ? this.field(args[0]) : this.obj;
+    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)
+        }
+    }
 
-    // noinspection JSUnusedGlobalSymbols
+    set(name: any, value: any): Reflect {
-    set(name, value): Reflect {
+        accessible(declaredField(this.class, name)).set(this.obj, value)
-        accessible(declaredField(this.class, name)).set(this.obj, value);
+        return this
-        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, def?) {
+function types(values: any[], def?: any) {
     if (values === null) {
-        return [];
+        return []
     }
-    let result: any[] = [];
+    let result: java.lang.Class<any>[] = []
-    values.forEach(t => result.push((t || def) ? JavaObject.class : t instanceof JavaClass ? t : t.class));
+    values.forEach(t => result.push((t || def) ? JavaObject.class : t instanceof JavaClass ? t : t.class))
-    return result;
+    return result
 }
 
-function accessible(accessible) {
+function accessible<T extends java.lang.reflect.AccessibleObject>(accessible: T): T {
-    if (accessible === null) {
+    if (!accessible?.isAccessible()) {
-        return null;
+        accessible.setAccessible(true)
     }
-    if (!accessible.isAccessible()) {
+    return accessible
-        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, name) {
+function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.String) {
     if (!clazz) { throw Error(`target class can't be ${clazz}!`) }
-    let target = clazz;
+    let target = clazz
-    let field = null;
+    let field = null
     // noinspection JSUnresolvedVariable
     while (target !== JavaObject.class) {
         try {
-            field = target.getDeclaredField(name);
+            field = target.getDeclaredField(name)
-            if (field !== null) { break; }
+            if (field !== null) { break }
         } catch (e) {
-            if (target === undefined) { break; }
+            if (target === undefined) { break }
-            target = target.getSuperclass();
+            target = target.getSuperclass()
         }
     }
     if (field === null) {
-        throw new NoSuchFieldException(name + " is not found in " + clazz.name);
+        throw new NoSuchFieldException(name + " is not found in " + clazz.getName())
     }
-    return field;
+    return field
 }
 
-function declaredMethod(clazz, name, clazzs) {
+function declaredMethod(clazz: java.lang.Class<any>, name: string, ...clazzs: java.lang.Class<any>[]): java.lang.reflect.Method {
-    let key = clazz.name + '.' + name + ':' + (clazzs || []).join(':');
+    let key = clazz.getName() + '.' + name + ':' + (clazzs || []).join(':')
     if (!methodCache[key]) {
         try {
-            methodCache[key] = clazz.getMethod(name, clazzs);
+            // @ts-ignore
+            methodCache[key] = clazz.getMethod(name, clazzs)
         } catch (ex) {
             try {
-                methodCache[key] = clazz.getDeclaredMethod(name, clazzs);
+                methodCache[key] = clazz.getDeclaredMethod(name, clazzs as any)
             } catch (ex) {
                 for (const m of Java.from(declaredMethods(clazz))) {
-                    if (m.name == name) {
+                    if (m.getName() == name) {
-                        methodCache[key] = m;
+                        methodCache[key] = m
-                        break;
+                        break
                     }
                 }
             }
         }
     }
-    return methodCache[key];
+    return methodCache[key]
 }
 
-function declaredMethods(clazz) {
+function declaredMethods(clazz: java.lang.Class<any>) {
-    return clazz.declaredMethods;
+    return clazz.getDeclaredMethods()
 }
 
-let classMethodsCache: any[] = [];
+let classMethodsCache: any[] = []
 
 function mapToObject(javaObj) {
     if (!javaObj || !javaObj.class) { throw new TypeError(`参数 ${javaObj} 不是一个Java对象!`) }
-    let target = {};
+    let target = {}
-    getJavaObjectMethods(javaObj).forEach(t => mapMethod(target, javaObj, t));
+    getJavaObjectMethods(javaObj).forEach(t => mapMethod(target, javaObj, t))
-    return target;
+    return target
 }
 
 function getJavaObjectMethods(javaObj) {
-    let className = javaObj.class.name;
+    let className = javaObj.class.name
     if (!classMethodsCache[className]) {
-        let names: any[] = [];
+        let names: any[] = []
-        let methods = javaObj.class.methods;
+        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

@@ -0,0 +1,32 @@
+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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -21,6 +21,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     }
 }

packages/container/package.json

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

packages/container/src/constants.ts

@@ -0,0 +1,7 @@
+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 ContainerInstance = Symbol.for("@ccms/ioc:Container")
-const INJECTION = Symbol.for("INJECTION");
+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);
+    Reflect.defineMetadata(ContainerInstance, container, Reflect)
-    _container = container;
+    return _container = container
 }
 
 function getContainer(): Container {
-    return _container || Reflect.getMetadata(ContainerInstance, Reflect)
+    return _container || initContainer(new Container())
 }
 
 function makePropertyInjectDecorator(doCache: boolean) {
-    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>) {
+    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>) {
-        return function(proto: any, key: string): void {
+        return function (proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().get(serviceIdentifier);
+                return getContainer().get(serviceIdentifier)
-            };
+            }
-            _proxyGetter(proto, key, resolve, doCache);
+            _proxyGetter(proto, key, resolve, doCache)
-        };
+        }
-    };
+    }
 }
 
 function makePropertyInjectNamedDecorator(doCache: boolean) {
-    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>, named: string) {
+    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>, named: string) {
-        return function(proto: any, key: string): void {
+        return function (proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().getNamed(serviceIdentifier, named);
+                return getContainer().getNamed(serviceIdentifier, named)
-            };
+            }
-            _proxyGetter(proto, key, resolve, doCache);
+            _proxyGetter(proto, key, resolve, doCache)
-        };
+        }
-    };
+    }
 }
 
 function makePropertyInjectTaggedDecorator(doCache: boolean) {
-    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>, key: string, value: any) {
+    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>, key: string, value: any) {
-        return function(proto: any, propertyName: string): void {
+        return function (proto: any, propertyName: string): void {
             let resolve = () => {
-                return getContainer().getTagged(serviceIdentifier, key, value);
+                return getContainer().getTagged(serviceIdentifier, key, value)
-            };
+            }
-            _proxyGetter(proto, propertyName, resolve, doCache);
+            _proxyGetter(proto, propertyName, resolve, doCache)
-        };
+        }
-    };
+    }
 }
 
 function makePropertyMultiInjectDecorator(doCache: boolean) {
-    return function(serviceIdentifier: interfaces.ServiceIdentifier<any>) {
+    return function (serviceIdentifier: interfaces.ServiceIdentifier<any>) {
-        return function(proto: any, key: string): void {
+        return function (proto: any, key: string): void {
             let resolve = () => {
-                return getContainer().getAll(serviceIdentifier);
+                return getContainer().getAll(serviceIdentifier)
-            };
+            }
-            _proxyGetter(proto, key, resolve, doCache);
+            _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,25 +1,91 @@
-import "reflect-metadata";
+/// <reference types="@ccms/nashorn" />
-import { initContainer } from './decorators'
-import { interfaces, Container } from 'inversify';
-import { fluentProvide } from 'inversify-binding-decorators';
 
-const provideNamed = (identifier: interfaces.ServiceIdentifier<any>, name: string) => {
+import "reflect-metadata"
-    return fluentProvide(identifier).whenTargetNamed(name).done();
+import { initContainer, getContainer } from './decorators'
-};
+import { interfaces, Container } from 'inversify'
+import { fluentProvide } from 'inversify-binding-decorators'
+import { ioc } from "./constants"
 
-const provideSingleton = (identifier: interfaces.ServiceIdentifier<any>) => {
+/**
-    return fluentProvide(identifier).inSingletonScope().done();
+ * 注册一个命名对象
-};
+ * @param identifier 标识符
+ * @param name 名称
+ */
+export const provideNamed = (identifier: interfaces.ServiceIdentifier<any>, name: string) => {
+    return fluentProvide(identifier).whenTargetNamed(name).done()
+}
 
-const DefaultContainer = new Container();
+/**
-initContainer(DefaultContainer);
+ * 注册一个单例对象
+ * @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)
 
 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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -21,11 +21,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.6.7",
+        "@ccms/api": "^0.9.0",
-        "@ccms/container": "^0.6.7"
+        "@ccms/container": "^0.9.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -4,7 +4,6 @@ import { plugin, server, task, constants } from '@ccms/api'
 import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ccms/container'
 console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() - containerStartTime) / 1000 })
 import http from '@ccms/common/dist/http'
-import { EventEmitter } from 'events'
 
 @provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {
@@ -26,17 +25,16 @@ 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, async: boolean = false) => {
+        global.setGlobal('setTimeout', (func: Function, tick: number, ...args: any[]) => {
-            this.taskManager.create(func).later(tick).async(async).submit()
+            return this.taskManager.create(func).later(tick).submit(...args)
         }, { writable: false, configurable: false })
-        global.setGlobal('setInterval', (func: Function, tick: number, async: boolean = false) => {
+        global.setGlobal('setInterval', (func: Function, tick: number, ...args: any[]) => {
-            this.taskManager.create(func).timer(tick).async(async).submit()
+            return this.taskManager.create(func).timer(tick).submit(...args)
         }, { writable: false, configurable: false })
     }
 
@@ -54,8 +52,7 @@ class MiaoScriptCore {
         console.i18n("ms.core.engine.disable")
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
-        //@ts-ignore
+        process.exit(0)
-        require.disable()
     }
 }
 
@@ -80,6 +77,11 @@ 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...')
 }
 
@@ -94,6 +96,7 @@ function initialize() {
         let type = detectServer()
         console.i18n("ms.core.initialize.detect", { scope: global.scope, type })
         container.bind(server.ServerType).toConstantValue(type)
+        container.bind(server.ServerChecker).toSelf().inSingletonScope()
         console.i18n("ms.core.package.initialize", { scope: global.scope, type })
         require(`${global.scope}/${type}`).default(container)
         require(`${global.scope}/plugin`)

packages/database/.npmignore

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

packages/database/package.json

@@ -0,0 +1,31 @@
+{
+    "name": "@ccms/database",
+    "version": "0.9.0",
+    "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.9.0",
+        "@ccms/container": "^0.9.0"
+    }
+}

packages/database/src/constants.ts

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

packages/database/src/database.ts

@@ -0,0 +1,90 @@
+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

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

packages/database/src/index.ts

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

packages/database/src/manager.ts

@@ -0,0 +1,53 @@
+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

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

packages/database/tsconfig.json

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

packages/i18n/languages/zh_cn.yml

@@ -21,8 +21,8 @@ ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失
 ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
 ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
 ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
-ms.api.event.register: "[{name}] 注册事件 {event}"
+ms.api.event.register: "[{name}] 注册事件 {event} => {exec}"
-ms.api.event.unregister: "[{name}] 注销事件 {event}"
+ms.api.event.unregister: "[{name}] 注销事件 {event} => {exec}"
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."

packages/i18n/package.json

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

packages/keyvalue/.npmignore

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

packages/keyvalue/package.json

@@ -0,0 +1,36 @@
+{
+    "name": "@ccms/keyvalue",
+    "version": "0.9.0",
+    "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.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
+    },
+    "devDependencies": {
+        "@ccms/nashorn": "^0.9.0",
+        "@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"
+    },
+    "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
+}

packages/keyvalue/src/adapter/admin.ts

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

packages/keyvalue/src/adapter/callback.ts

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

packages/keyvalue/src/adapter/connection.ts

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

packages/keyvalue/src/adapter/container.ts

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

packages/keyvalue/src/adapter/converter.ts

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

packages/keyvalue/src/adapter/index.ts

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

packages/keyvalue/src/adapter/listener.ts

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

packages/keyvalue/src/adapter/template.ts

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

packages/keyvalue/src/admin.ts

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

packages/keyvalue/src/constants.ts

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

packages/keyvalue/src/index.ts

@@ -0,0 +1,34 @@
+/// <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/keyvalue/src/listener.ts

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

packages/keyvalue/src/manager.ts

@@ -0,0 +1,18 @@
+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/keyvalue/tsconfig.json

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

packages/nashorn/build.sh

@@ -1,12 +0,0 @@
-# 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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,6 +22,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     }
 }

packages/nashorn/src/build.ts

@@ -1,200 +0,0 @@
-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,79 +1,86 @@
 declare global {
-    const __FILE__: string;
+    const __FILE__: string
-    const __LINE__: number;
+    const __LINE__: number
-    const __DIR__: string;
+    const __DIR__: string
-    let Packages: any;
+    const Packages: any
 
-    function print(...message: any[]): void;
+    function print(...message: any[]): void
-    function load(script: string | object);
+    function load(script: string | object)
-    function loadWithNewGlobal(script: string | object);
+    function loadWithNewGlobal(script: string | object)
-    function exit(code?: number);
+    function exit(code?: number)
-    function quit(code?: number);
+    function quit(code?: number)
-    function JavaImporter(...className: string[]);
+    function JavaImporter(...className: string[])
 
     namespace Java {
-        function type(clazz: string): any;
+        function type<T = any>(clazz: string): T
-        function from(javaObj: any): any[];
+        function from<T = any>(javaObj: T[]): T[]
-        function to(array: any[]): any;
+        function to<T = any>(array: T[], type?: T): T[]
-        function extend(...parentTypes: any[]);
+        function extend(...parentTypes: any[]): any
+        function synchronized(func: () => void, lock: any): Function
+        function asJSONCompatible<T = any>(obj: T): T
         //@ts-ignore
         // function super(type: any);
     }
 
     interface Error {
-        readonly lineNumber?: number;
+        readonly class?: any
-        readonly columnNumber?: number;
+        readonly lineNumber?: number
-        readonly fileName?: string;
+        readonly columnNumber?: number
-        dumpStack?: Function;
+        readonly fileName?: string
-        printStackTrace?: Function;
+        dumpStack?: Function
-        getStackTrace?: () => any[];
+        printStackTrace?: Function
+        getStackTrace?: () => any[]
     }
 
     interface String {
-        trimLeft(): string;
+        trimLeft(): string
-        trimRight(): string;
+        trimRight(): string
     }
 
     interface Object {
-        setPrototypeOf(obj: object, prototype: object): void;
+        setPrototypeOf(obj: object, prototype: object): void
-        bindProperties(to: object, from: object): void;
+        bindProperties(to: object, from: object): void
     }
 
     namespace NodeJS {
         interface Global {
-            scope: string;
+            scope: string
-            logger: any;
+            logger: any
-            debug: boolean;
+            debug: boolean
-            level: string;
+            level: string
-            eventCenter: EventEmitter;
+            NashornEngineStartTime: number
-            NashornEngineStartTime: number;
+            setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void
-            setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void;
+            noop: () => void
-            noop: () => void;
+            console: Console
-            console: Console;
+        }
+        interface Process {
+            on(event: string, listener: any): this
+            emit(event: string, ...message: any): this
         }
     }
-    var root: string;
+    const root: string
-    var base: Core;
+    const base: Core
-    var ScriptEngineContextHolder: any;
+    const ScriptEngineContextHolder: any
-    function engineLoad(str: string): any;
+    function engineLoad(str: string | { script: string, name: string }): any
     interface Core {
-        getClass(name: String): any;
+        getClass(name: String): any
-        getProxyClass(): any;
+        getProxyClass(): any
-        getInstance(): any;
+        getInstance(): any
-        read(path: string): string;
+        read(path: string): string
-        save(path: string, content: string): void;
+        save(path: string, content: string): void
-        delete(path: string): void;
+        delete(path: string): void
     }
     interface Console {
-        ex(err: Error): void;
+        ex(err: Error): void
-        stack(err: Error): string[];
+        stack(err: Error, color?: boolean): string[]
-        sender(...args: any): void;
+        sender(sender: any, ...args: any): void
-        console(...args: any): void;
+        sender(...args: any): void
-        i18n(name: string, ...params: 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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
+        "@ccms/nashorn": "^0.9.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
-    },
-    "dependencies": {
-        "@ccms/nashorn": "^0.6.7"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,14 @@
         "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.2"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.6.7",
+        "@ccms/api": "^0.9.0",
-        "@ccms/common": "^0.6.7",
+        "@ccms/common": "^0.9.0",
-        "@ccms/container": "^0.6.7"
+        "@ccms/container": "^0.9.0"
     }
 }

packages/nukkit/src/index.ts

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

packages/nukkit/src/task.ts

@@ -21,10 +21,8 @@ export class NukkitTaskManager implements task.TaskManager {
 }
 
 export class NukkitTask extends task.Task {
-    submit(): task.Cancelable {
+    submit(...args: any[]): task.Cancelable {
-        let run = new NukkitRunnable({
+        let run = new NukkitRunnable({ run: () => this.run(...args) })
-            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.6.7",
+    "version": "0.9.0",
     "description": "MiaoScript ployfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "homepage": "https://github.com/circlecloud/ms.git",
@@ -14,13 +14,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/i18n": "^0.6.7",
+        "@ccms/i18n": "^0.9.0",
-        "@ccms/nashorn": "^0.6.7",
+        "@ccms/nodejs": "^0.9.0",
         "core-js": "^3.6.5"
     },
     "devDependencies": {
+        "@ccms/nashorn": "^0.9.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     }
 }

packages/ployfill/src/index.ts

@@ -1,13 +1,15 @@
 /// <reference types="@ccms/nashorn" />
-
+import '@ccms/nodejs'
 import i18n from '@ccms/i18n'
-let ployfillStartTime = new Date().getTime();
+let ployfillStartTime = new Date().getTime()
-i18n.initialize();
+i18n.initialize()
-console.i18n("ms.ployfill.initialize");
+console.i18n("ms.ployfill.initialize")
-require('./es5-ext');
+require('./es5-ext')
-require('core-js');
+require('./node-shim')
-require('./node-shim');
+require('core-js')
+//@ts-ignore
+process.on('exit', () => require.disable())
 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,8 +1,37 @@
-global.setGlobal('process', {
+import { EventEmitter } from 'events'
-    env: {
+
+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 = {
         __noSuchProperty__: (prop) => {
             return Packages.java.lang.System.getenv(prop)
         }
-    },
+    }
-    platform: Packages.java.lang.System.getProperty("os.name")
+    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), {})

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.6.7",
+    "version": "0.9.0",
     "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.3",
+        "@types/js-yaml": "^3.12.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^3.9.2"
+        "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.6.7",
+        "@ccms/api": "^0.9.0",
-        "@ccms/common": "^0.6.7",
+        "@ccms/common": "^0.9.0",
-        "@ccms/container": "^0.6.7",
+        "@ccms/container": "^0.9.0",
-        "@ccms/i18n": "^0.6.7",
+        "@ccms/i18n": "^0.9.0",
-        "js-yaml": "^3.13.1"
+        "js-yaml": "^3.14.0"
     }
 }

packages/plugin/src/command.ts

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

packages/plugin/src/config.ts

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

packages/plugin/src/decorators.ts

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

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

packages/plugin/src/index.ts

@@ -1,3 +1,15 @@
+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'