v0.28.0-beta.10

.gitignore

@@ -1,9 +1,4 @@
 .yarn*
 .vscode
-.theia
 node_modules
 dist
-package-lock.json
-yarn.lock
-packages/nashorn/docs
-!packages/types/dist

.npmignore

@@ -1,25 +0,0 @@
-src
-test
-typings
-bundled
-build
-coverage
-docs
-wiki
-gulpfile.js
-bower.json
-karma.conf.js
-tsconfig.json
-typings.json
-CONTRIBUTING.md
-ISSUE_TEMPLATE.md
-PULL_REQUEST_TEMPLATE.md
-tslint.json
-wallaby.js
-.travis.yml
-.gitignore
-.vscode
-.theia
-type_definitions
-tsconfig.tsbuildinfo
-*.tsbuildinfo

.npmrc

@@ -0,0 +1 @@
+# shamefully-hoist = true

lerna.json

@@ -1,9 +1,6 @@
 {
-  "version": "0.28.0-beta.2",
-  "npmClient": "yarn",
-  "packages": [
-    "packages/*"
-  ],
+  "version": "0.28.0-beta.10",
+  "npmClient": "pnpm",
   "command": {
     "run": {
       "stream": true

package.json

@@ -6,23 +6,30 @@
     "author": "MiaoWoo <admin@yumc.pw>",
     "license": "MIT",
     "scripts": {
-        "bs": "lerna bootstrap",
+        "bs": "pnpm install",
         "clean": "lerna run clean",
         "watch": "lerna run watch --parallel",
         "build": "lerna run build",
-        "ug": "yarn upgrade-interactive",
+        "ug": "pnpm up -r -i",
         "np": "./script/push.sh",
         "lsp": "npm login -scope=@ccms",
         "lp": "lerna publish --force-publish",
-        "lpb": "lerna publish --preid beta --dist-tag beta --force-publish",
+        "lpb": "lerna publish prerelease --preid beta --dist-tag beta --force-publish",
         "lpc": "lerna publish --canary --preid beta --pre-dist-tag beta --force-publish",
-        "lpf": "lerna publish from-package --yes",
-        "sync": "./script/sync.sh"
+        "lpf": "lerna publish from-package --dist-tag beta --yes",
+        "sync": "./script/sync.sh",
+        "postpublish": "pnpm sync"
     },
-    "workspaces": [
-        "packages/*"
-    ],
     "devDependencies": {
-        "lerna": "^7.1.4"
+        "@ccms/nashorn": "^0.28.0-beta.3",
+        "@javatypes/jdk": "^0.0.3",
+        "@lerna-lite/cli": "^2.6.0",
+        "@lerna-lite/publish": "^2.6.0",
+        "@lerna-lite/run": "^2.6.0",
+        "@types/node": "^20.8.8",
+        "reflect-metadata": "^0.1.13",
+        "rimraf": "^5.0.5",
+        "tslib": "^2.6.2",
+        "typescript": "^5.2.2"
     }
-}
+}

packages/amqp/.npmignore

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

packages/amqp/package.json

@@ -1,35 +0,0 @@
-{
-    "name": "@ccms/amqp",
-    "version": "0.28.0-beta.2",
-    "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.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
-    },
-    "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "@javatypes/amqp-client": "^0.0.3",
-        "@javatypes/spring-amqp": "^0.0.3",
-        "@javatypes/spring-rabbit": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
-    }
-}

packages/amqp/src/adapter/admin.ts

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

packages/amqp/src/adapter/callback.ts

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

packages/amqp/src/adapter/connection.ts

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

packages/amqp/src/adapter/container.ts

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

packages/amqp/src/adapter/converter.ts

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

packages/amqp/src/adapter/index.ts

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

packages/amqp/src/adapter/listener.ts

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

packages/amqp/src/adapter/template.ts

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

packages/amqp/src/admin.ts

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

packages/amqp/src/constants.ts

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

packages/amqp/src/index.ts

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

packages/amqp/src/listener.ts

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

packages/amqp/src/manager.ts

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

packages/api/.npmignore

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -12,23 +12,26 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2",
-        "@ccms/polyfill": "^0.28.0-beta.2",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10",
+        "@ccms/i18n": "^0.28.0-beta.10",
+        "@ccms/polyfill": "^0.28.0-beta.10",
         "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
-        "@types/base64-js": "^1.3.0",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@types/base64-js": "^1.3.0"
     }
 }

packages/api/src/amqp.ts

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

packages/api/src/command.ts

@@ -9,8 +9,7 @@ export namespace command {
          * first time script engine need optimize jit code
          * so ignore first slow exec notify
          */
-        private cacheSlowCommandKey = {};
-        private cacheSlowCompleteKey = {};
+        private cacheSlowKeys = {};
 
         /**
          * 注册插件命令
@@ -53,32 +52,13 @@ export namespace command {
                 try {
                     let time = Date.now()
                     let result = executor(sender, command, Java.from(args))
-                    let cost = Date.now() - time
-                    if (cost > global.ScriptSlowExecuteTime) {
-                        let commandKey = `${plugin.description.name}-${command}-${sender.name}`
-                        if (!this.cacheSlowCommandKey[commandKey]) { return this.cacheSlowCommandKey[commandKey] = cost }
-                        console.i18n("ms.api.command.execute.slow", {
-                            player: sender.name,
-                            plugin: plugin.description.name,
-                            command,
-                            args: Java.from(args).join(' '),
-                            cost
-                        })
-                    }
+                    this.checkSlow(Date.now() - time,
+                        "ms.api.command.execute.slow",
+                        plugin, command, sender, args)
                     return result
                 } catch (ex: any) {
-                    let message = i18n.translate("ms.api.command.execute.error", {
-                        player: sender.name,
-                        plugin: plugin.description.name,
-                        command,
-                        args: Java.from(args).join(' '),
-                        ex
-                    })
-                    console.console(message)
-                    console.ex(ex)
-                    if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [message, ...console.stack(ex)])
-                    }
+                    this.printError(ex, "ms.api.command.execute.error",
+                        plugin, command, sender, args)
                     return true
                 }
             }
@@ -90,36 +70,18 @@ export namespace command {
                     var token = args[args.length - 1]
                     var complete = tabCompleter(sender, command, Java.from(args)) || []
                     let result = this.copyPartialMatches(complete, token)
-                    let cost = Date.now() - time
-                    if (cost > global.ScriptSlowExecuteTime) {
-                        let completerKey = `${plugin.description.name}-${command}-${sender.name}`
-                        if (!this.cacheSlowCompleteKey[completerKey]) { return this.cacheSlowCompleteKey[completerKey] = cost }
-                        console.i18n("ms.api.command.tab.completer.slow", {
-                            player: sender.name,
-                            plugin: plugin.description.name,
-                            command,
-                            args: Java.from(args).join(' '),
-                            cost
-                        })
-                    }
+                    this.checkSlow(Date.now() - time,
+                        "ms.api.command.tab.completer.slow",
+                        plugin, command, sender, args)
                     return result
                 } catch (ex: any) {
-                    let message = i18n.translate("ms.api.command.tab.completer.error", {
-                        player: sender.name,
-                        plugin: plugin.description.name,
-                        command,
-                        args: Java.from(args).join(' '),
-                        ex
-                    })
-                    console.console(message)
-                    console.ex(ex)
-                    if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [message, ...console.stack(ex)])
-                    }
+                    this.printError(ex, "ms.api.command.tab.completer.error",
+                        plugin, command, sender, args)
                     return []
                 }
             }
         }
+
         protected copyPartialMatches(complete: string[], token: string, array: string[] = []): string[] {
             if (!token) { return complete }
             complete.forEach(function (e) {
@@ -129,5 +91,35 @@ export namespace command {
             })
             return array
         }
+
+        private checkSlow(cost: number, key: string, plugin: plugin.Plugin, command: string, sender: any, args: any[]) {
+            if (cost > global.ScriptSlowExecuteTime) {
+                let completerKey = `${plugin.description.name}-${key}-${command}-${sender.name}`
+                if (!this.cacheSlowKeys[completerKey]) {
+                    return this.cacheSlowKeys[completerKey] = cost
+                }
+                console.i18n(key, {
+                    player: sender.name,
+                    plugin: plugin.description.name,
+                    command,
+                    args: Java.from(args).join(' '),
+                    cost
+                })
+            }
+        }
+        private printError(error: Error, key: string, plugin: plugin.Plugin, command: string, sender: any, args: any[]) {
+            let message = i18n.translate(key, {
+                player: sender.name,
+                plugin: plugin.description.name,
+                command,
+                args: Java.from(args).join(' '),
+                error
+            })
+            console.console(message)
+            console.ex(error)
+            if (sender.name != 'CONSOLE') {
+                console.sender(sender, [message, ...console.stack(error)])
+            }
+        }
     }
 }

packages/api/src/console.ts

@@ -26,6 +26,7 @@ global.setGlobal('MiaoScriptSourceFileMaps', sourceFileMaps)
 
 export namespace jsconsole {
     export function readSourceMap(fileName: string, lineNumber: any) {
+        if (lineNumber == 1) return { fileName, lineNumber }
         try {
             if (fileName.endsWith('js') || fileName.endsWith('ms')) {
                 if (sourceMaps[fileName] === undefined) {
@@ -68,10 +69,7 @@ export namespace jsconsole {
                 console.ex(error)
             }
         }
-        return {
-            fileName,
-            lineNumber
-        }
+        return { fileName, lineNumber }
     }
 
     export function getStackTrace(ex: Error, color: boolean = true): string[] {

packages/api/src/index.ts

@@ -1,7 +1,5 @@
 import "@ccms/nashorn"
 
-export * from './web'
-export * from './amqp'
 export * from './chat'
 export * from './task'
 export * from './item'

packages/api/src/plugin.ts

@@ -19,14 +19,23 @@ export namespace plugin {
     @injectable()
     export abstract class PluginManager {
         abstract scan(folder: string): void
-        abstract build(): void
         abstract loadFromFile(file: string, ext?: any): Plugin
-        abstract load(...args: any[]): void
-        abstract enable(...args: any[]): void
-        abstract disable(...args: any[]): void
-        abstract reload(...args: any[]): void
+        abstract require(loadMetadata: PluginLoadMetadata): PluginMetadata
+        abstract build(metadata: PluginMetadata): Plugin
+        abstract rebuild(plugin: plugin.Plugin): void
+        abstract load(plugin: plugin.Plugin): void
+        abstract enable(plugin: plugin.Plugin): void
+        abstract disable(plugin: plugin.Plugin): void
+        abstract reload(plugin: plugin.Plugin): void
+        abstract has(name: string): boolean
+        abstract get(name: string): plugin.Plugin
         abstract getPlugin(name: string): plugin.Plugin
         abstract getPlugins(): Map<string, plugin.Plugin>
+        abstract buildPlugins(): void
+        abstract rebuildPlugins(): void
+        abstract loadPlugins(): void
+        abstract enablePlugins(): void
+        abstract disablePlugins(): void
     }
     export const PluginScanner = Symbol("PluginScanner")
     /**
@@ -38,9 +47,13 @@ export namespace plugin {
          */
         type: string
         /**
-         * 插件文件
+         * 插件文件(java.io.File)
          */
-        file?: string
+        file?: any
+        /**
+         * 插件规范路径 canonicalPath
+         */
+        path?: string
         /**
          * 插件实例
          */
@@ -122,11 +135,6 @@ export namespace plugin {
          * @param plugin 插件
          */
         disable?(plugin: Plugin): void
-        /**
-         * Reload 阶段
-         * @param plugin 插件
-         */
-        reload?(plugin: Plugin): void
     }
     export interface Plugin {
         description: PluginMetadata

packages/api/src/task.ts

@@ -14,6 +14,7 @@ export namespace task {
 
         constructor() {
             this.taskId = new AtomicInteger(0)
+            process.on('core.disable', () => { this.disable() })
             process.on('task.finish', (task: task.Task) => {
                 let taskId = task.getTaskId()
                 this.cacheTasks.delete(taskId)
@@ -24,30 +25,6 @@ export namespace task {
             })
         }
 
-        protected pluginCreate(plugin: plugin.Plugin, task: task.Task) {
-            if (!this.pluginCacheTasks.has(plugin.description.name)) {
-                this.pluginCacheTasks.set(plugin.description.name, new Map())
-            }
-            this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
-            return task
-        }
-
-        protected pluginDisable(plugin: plugin.Plugin) {
-            if (this.pluginCacheTasks.has(plugin.description.name)) {
-                this.pluginCacheTasks.get(plugin.description.name).forEach((task) => {
-                    task.cancel()
-                })
-                this.pluginCacheTasks.delete(plugin.description.name)
-            }
-        }
-
-        /**
-         * 获得自增的任务ID
-         */
-        protected nextId() {
-            return this.taskId.incrementAndGet()
-        }
-
         /**
          * 创建任务
          * @param func 任务内容
@@ -75,6 +52,28 @@ export namespace task {
             if (plugin) { return this.pluginDisable(plugin) }
             this.disable0()
         }
+
+        protected pluginCreate(plugin: plugin.Plugin, task: task.Task) {
+            if (!this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.set(plugin.description.name, new Map())
+            }
+            this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
+            return task
+        }
+
+        protected pluginDisable(plugin: plugin.Plugin) {
+            if (this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.get(plugin.description.name).forEach((task) => task.cancel())
+                this.pluginCacheTasks.delete(plugin.description.name)
+            }
+        }
+
+        /**
+         * 获得自增的任务ID
+         */
+        protected nextId() {
+            return this.taskId.incrementAndGet()
+        }
         protected abstract create0(owner: plugin.Plugin, func: Function, id: number): task.Task
         protected abstract disable0()
     }
@@ -97,6 +96,9 @@ export namespace task {
             this.owner = owner
             this.func = func
             this.taskId = id
+            this.on('finish', () => {
+                process.emit('task.finish', this)
+            })
         }
 
         getOwner() {
@@ -151,8 +153,9 @@ export namespace task {
                 this.func(...args)
                 this.emit('after', this)
             } catch (error: any) {
-                this.emit('error', error)
-                if (!error.processed) {
+                try {
+                    this.emit('error', error)
+                } catch (ignore) {
                     console.console('§4插件执行任务时发生错误', error)
                     console.ex(error)
                     this.cancel()
@@ -164,7 +167,6 @@ export namespace task {
         }
 
         protected finish() {
-            process.emit('task.finish', this)
             this.emit('finish', this)
         }
 
@@ -181,7 +183,7 @@ export namespace task {
          * 提交任务
          * @param args 任务参数
          */
-        protected abstract submit0(...args: any[]): any
+        protected abstract submit0(...args: any[]): Cancelable
         /**
          * 取消任务
          */

packages/api/src/web.ts

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

packages/bukkit/.npmignore

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

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -12,21 +12,23 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spigot-api": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@javatypes/spigot-api": "^0.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10"
     }
 }

packages/bungee/.npmignore

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

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -12,21 +12,23 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/bungee-api": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@javatypes/bungee-api": "^0.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10"
     }
 }

packages/common/.npmignore

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

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript common package",
     "keywords": [
         "miaoscript",
@@ -12,18 +12,20 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "@javatypes/jdk": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@ccms/nashorn": "^0.28.0-beta.10",
+        "@javatypes/jdk": "^0.0.3"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/compile/.npmignore

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

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -12,15 +12,15 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "devDependencies": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
     }
 }

packages/container/.npmignore

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

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -12,17 +12,19 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@ccms/nashorn": "^0.28.0-beta.10"
     },
     "dependencies": {
         "inversify": "^6.0.1",

packages/container/src/index.ts

@@ -32,18 +32,28 @@ export const provideSingletonNamed = (identifier: interfaces.ServiceIdentifier<a
     return fluentProvide(identifier).inSingletonScope().whenTargetNamed(name).done()
 }
 
+export function getJavaClass(className: string) {
+    try { return Java.type(className).class; return } catch (error: any) { }
+    try { return base.getClass(className); return } catch (error: any) { }
+}
+
 /**
  * 获得一个 java.lang.Class
  * @param className Java全类名
  */
 export const JavaClass = (className: string) => {
     return function (target: object, propertyKey: string, index?: number) {
-        try { target[propertyKey] = Java.type(className).class; return } catch (error: any) { }
-        try { target[propertyKey] = base.getClass(className); return } catch (error: any) { }
-        console.warn('JavaClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
+        _proxyGetter(target, propertyKey, () => {
+            return getJavaClass(className) || console.warn('JavaClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
+        }, true)
     }
 }
 
+export function getJSClass(className: string) {
+    try { return Java.type(className) } catch (error: any) { }
+    try { return base.getClass(className).static } catch (error: any) { }
+}
+
 /**
  * 获得一个JS的Java类
  * @param className Java 全类名
@@ -51,9 +61,7 @@ export const JavaClass = (className: string) => {
 export const JSClass = (className: string) => {
     return function (target: object, propertyKey: string, index?: number) {
         _proxyGetter(target, propertyKey, () => {
-            try { return Java.type(className) } catch (error: any) { }
-            try { return base.getClass(className).static } catch (error: any) { }
-            console.warn('JSClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
+            return getJSClass(className) || console.warn('JSClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
         }, true)
     }
 }

packages/core/.npmignore

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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript core package",
     "keywords": [
         "miaoscript",
@@ -12,20 +12,28 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
-        "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "watch": "pnpm rollup -c rollup.config.js --watch",
+        "build": "pnpm clean && pnpm rollup -c rollup.config.js",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@rollup/plugin-typescript": "^11.1.5",
+        "rollup": "^2.79.1",
+        "rollup-obfuscator": "^3.0.2",
+        "rollup-plugin-peer-deps-external": "^2.2.4"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10",
+        "js-yaml": "^4.1.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/rollup.config.js

@@ -0,0 +1,49 @@
+import typescript from '@rollup/plugin-typescript'
+import peerDepsExternal from 'rollup-plugin-peer-deps-external'
+import { obfuscator } from 'rollup-obfuscator'
+
+import pkg from './package.json'
+
+const external = ['path', 'fs', 'typescript', 'tslib']
+/**
+ * @type {import('rollup').RollupOptions}
+ */
+export default {
+    input: 'src/index.ts',
+    plugins: [
+        peerDepsExternal(),
+        typescript(),
+        obfuscator({
+            compact: true,
+            deadCodeInjection: true,
+            deadCodeInjectionThreshold: 1,
+            identifierNamesGenerator: 'mangled-shuffled',
+            numbersToExpressions: true,
+            simplify: true,
+            stringArray: true,
+            stringArrayThreshold: 1,
+            stringArrayEncoding: ['rc4'],
+            stringArrayCallsTransform: true,
+            stringArrayCallsTransformThreshold: 1,
+            stringArrayWrappersChainedCalls: true,
+            stringArrayWrappersParametersMaxCount: 3,
+            sourceMap: true,
+            sourceMapSourcesMode: 'sources',
+            inputFileName: `${pkg.name}.ts`,
+            transformObjectKeys: true,
+            unicodeEscapeSequence: true,
+            target: 'browser-no-eval'
+        }),
+    ],
+    external,
+    treeshake: false,
+    output: [
+        {
+            format: 'cjs',
+            interop: "auto",
+            exports: "named",
+            sourcemap: true,
+            file: pkg.main || `dist/${pkg.name}.js`
+        }
+    ]
+}

packages/core/src/index.ts

@@ -6,7 +6,6 @@ console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() -
 import * as yaml from 'js-yaml'
 import http from '@ccms/common/dist/http'
 import * as fs from '@ccms/common/dist/fs'
-import { VersionUtils } from '@ccms/common/dist/version'
 
 const UUID = Java.type('java.util.UUID')
 const MiaoScriptAPI = Java.type('pw.yumc.MiaoScript.api.MiaoScriptAPI')
@@ -15,22 +14,18 @@ const MiaoScriptAPI = Java.type('pw.yumc.MiaoScript.api.MiaoScriptAPI')
 class MiaoScriptCore {
     @Autowired(server.Console)
     private Console: Console
-    @Autowired(plugin.PluginFolder)
-    private pluginFolder: string
-    @Autowired()
-    private taskManager: task.TaskManager
     @Autowired()
     private pluginManager: plugin.PluginManager
 
     enable() {
-        process.emit('core.before.enable')
+        process.emit('core.before.enable', this)
         this.loadServerConsole()
         try {
             MiaoScriptAPI.setPluginManager(this.pluginManager)
         } catch (error) {
         }
-        this.loadPlugins()
-        process.emit('core.after.enable')
+        process.emit('core.enable', this)
+        process.emit('core.after.enable', this)
         console.i18n("ms.core.engine.completed", {
             loader: base.version,
             version: 'v' + global.ScriptEngineVersion,
@@ -40,40 +35,28 @@ class MiaoScriptCore {
     }
 
     loadServerConsole() {
-        process.emit('core.before.load.console')
+        process.emit('core.before.load.console', this)
         //@ts-ignore
         global.setGlobal('console', new this.Console(), { writable: false, configurable: false })
-        process.emit('core.after.load.console')
-    }
-
-    loadPlugins() {
-        process.emit('core.before.load.plugins')
-        let loadPluginStartTime = new Date().getTime()
-        console.i18n("ms.core.plugin.initialize")
-        this.pluginManager.scan(this.pluginFolder)
-        this.pluginManager.build()
-        this.pluginManager.load(this.pluginManager.getPlugins())
-        this.pluginManager.enable(this.pluginManager.getPlugins())
-        console.i18n("ms.core.plugin.completed", { time: (new Date().getTime() - loadPluginStartTime) / 1000 })
-        process.emit('core.after.load.plugins')
+        process.emit('core.after.load.console', this)
     }
 
     disable() {
-        process.emit('core.before.disable')
+        process.emit('core.before.disable', this)
         let disableStartTime = Date.now()
         console.i18n("ms.core.engine.disable")
-        this.pluginManager.disable(this.pluginManager.getPlugins())
-        this.taskManager.disable()
-        process.emit('core.after.disable')
+        process.emit('core.disable', this)
+        process.emit('core.after.disable', this)
         loadCoreScript('exit')
-        process.emit('core.before.exit')
+        process.emit('core.before.exit', this)
         process.exit(0)
+        process.emit('core.exit', this)
         console.i18n("ms.core.engine.disable.finish", {
             loader: base.version,
             version: 'v' + global.ScriptEngineVersion,
             time: (new Date().getTime() - disableStartTime) / 1000
         })
-        process.emit('core.after.exit')
+        process.emit('core.after.exit', this)
     }
 }
 
@@ -166,14 +149,12 @@ function initialize() {
     global.setGlobal('loadCoreScript', loadCoreScript)
     loadCoreScript('initialize')
     try {
-        let core = createCore()
-        return VersionUtils.isGreaterOrEqual(base.version, '0.22.0') ? core : core.enable()
+        return createCore()
     } catch (error: any) {
-        let core = { enable: () => () => console.i18n('ms.core.engine.disable.abnormal') }
         console.i18n("core.initialize.error", { error })
         jsconsole.getStackTrace(error, false).forEach(line => console.log(line))
         process.emit('core.initialize.error')
-        return VersionUtils.isGreaterOrEqual(base.version, '0.22.0') ? core : core.enable()
+        return { enable: () => () => console.i18n('ms.core.engine.disable.abnormal') }
     } finally {
         process.emit('core.after.initialize')
     }

packages/database/.npmignore

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

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -12,20 +12,22 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/spring-jdbc": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@javatypes/spring-jdbc": "^0.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10"
     }
 }

packages/i18n/.npmignore

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

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -12,18 +12,21 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map",
+        "languages"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "@types/js-yaml": "^4.0.5",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@ccms/nashorn": "^0.28.0-beta.10",
+        "@types/js-yaml": "^4.0.5"
     },
     "dependencies": {
         "js-yaml": "^4.1.0"

packages/keyvalue/.npmignore

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

packages/keyvalue/package.json

@@ -1,36 +0,0 @@
-{
-    "name": "@ccms/keyvalue",
-    "version": "0.28.0-beta.2",
-    "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.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
-    },
-    "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "@javatypes/amqp-client": "^0.0.3",
-        "@javatypes/spring-amqp": "^0.0.3",
-        "@javatypes/spring-rabbit": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
-    },
-    "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
-}

packages/keyvalue/src/index.ts

@@ -1,3 +0,0 @@
-/// <reference types="@ccms/nashorn" />
-/// <reference types="@javatypes/jdk" />
-export { }

packages/keyvalue/tsconfig.json

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

packages/molang/package.json

@@ -1,13 +1,18 @@
 {
     "name": "@ccms/molang",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "A fast parser for Minecraft's MoLang",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "repository": {
@@ -21,9 +26,6 @@
     },
     "homepage": "https://github.com/solvedDev/MoLang#readme",
     "devDependencies": {
-        "@types/node": "^18.13.0",
-        "rimraf": "^4.1.2",
-        "tslib": "^2.5.0",
-        "typescript": "^4.9.5"
+        "@types/node": "^18.17.15"
     }
 }

packages/nashorn/.npmignore

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

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript nashorn package",
     "keywords": [
         "miaoscript",
@@ -13,15 +13,15 @@
     "license": "ISC",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "devDependencies": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
     }
 }

packages/nodejs/.npmignore

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

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -12,18 +12,19 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "tslib": "^2.5.0",
-        "typescript": "^4.9.5"
+        "@ccms/nashorn": "^0.28.0-beta.10"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nodejs/src/events/index.ts

@@ -145,8 +145,8 @@ EventEmitter.prototype.emit = function emit(type) {
         if (er.error instanceof Error || er.error instanceof Throwable) {
             throw er.error; // Unhandled 'error' event
         }
-        if (er.cause instanceof Error || er.error instanceof Throwable) {
-            throw er.error; // Unhandled 'error' event
+        if (er.cause instanceof Error || er.cause instanceof Throwable) {
+            throw er.cause; // Unhandled 'error' event
         }
         // At least give some kind of context to the user
         var err = new Error('Unhandled error.' + (er ? ' (' + (er.message || er.error || er.cause || er) + ')' : ''));

packages/nodejs/src/util/index.ts

@@ -715,6 +715,7 @@ function callbackify(original) {
         // implications (stack, `uncaughtException`, `async_hooks`)
         // @ts-ignore
         original.apply(this, args)
+            // @ts-ignore
             .then(function (ret) { process.nextTick(cb.bind(null, null, ret)) },
                 function (rej) { process.nextTick(callbackifyOnRejected.bind(null, rej, cb)) });
     }

packages/nukkit/.npmignore

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

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -12,21 +12,23 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/nukkit-api": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@javatypes/nukkit-api": "^0.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10"
     }
 }

packages/plugin/.npmignore

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

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript plugin package",
     "keywords": [
         "miaoscript",
@@ -12,25 +12,27 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@types/crypto-js": "^4.1.1",
-        "@types/js-yaml": "^4.0.5",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@types/crypto-js": "^4.1.2",
+        "@types/js-yaml": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2",
-        "@ccms/i18n": "^0.28.0-beta.2",
-        "@ccms/verify": "^0.25.1",
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10",
+        "@ccms/i18n": "^0.28.0-beta.10",
+        "@ccms/verify": "^0.26.1",
         "crypto-js": "^4.1.1",
         "js-yaml": "^4.1.0"
     }

packages/plugin/src/config.ts

@@ -13,6 +13,8 @@ import './config/loader'
 export class PluginConfigManager {
     @Autowired(ContainerInstance)
     private container: Container
+    @Autowired(plugin.PluginFolder)
+    private pluginFolder: string
 
     private configLoaderMap = new Map<string, PluginConfigLoader>()
 
@@ -31,7 +33,7 @@ export class PluginConfigManager {
     }
 
     getConfigLoader(format: string) {
-        if (!this.configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
+        if (!this.configLoaderMap.has(format)) { throw new Error(`unsupport config format ${format} !`) }
         return this.configLoaderMap.get(format)
     }
 
@@ -68,7 +70,8 @@ export class PluginConfigManager {
         try {
             let defaultValue = metadata.default ?? plugin[metadata.variable]
             metadata.file = fs.concat(
-                fs.file(plugin.description.loadMetadata.file).parent,
+                root,
+                this.pluginFolder,
                 plugin.description.name,
                 metadata.filename
             )
@@ -85,7 +88,7 @@ export class PluginConfigManager {
             if (metadata.migrate && defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
                 base.save(metadata.file, configLoader.dump(configValue))
             }
-            console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file}`)
+            console.debug(`[${plugin.description.name}] load config ${metadata.variable} from file ${metadata.file}`)
             this.defienConfigProp(plugin, metadata, configValue)
         } catch (error: any) {
             console.i18n("ms.plugin.manager.config.load.error", {
@@ -118,7 +121,7 @@ export class PluginConfigManager {
             metadata.file = fs.concat(fs.file(plugin.description.loadMetadata.file).parent, plugin.description.name, metadata.filename)
             let result = this.getConfigLoader(metadata.format).dump(plugin[metadata.variable])
             base.save(metadata.file, result)
-            console.debug(`[${plugin.description.name}] Save Config ${metadata.variable} to file ${metadata.file} =>
+            console.debug(`[${plugin.description.name}] save config ${metadata.variable} to file ${metadata.file} =>
 ${result.substring(0, 500)}`)
             return true
         } catch (error: any) {

packages/plugin/src/event.ts

@@ -51,7 +51,7 @@ export class PluginEventManager {
         listener.off = off
     }
 
-    private unregistryListener(pluginInstance: plugin.Plugin, listener: any = pluginInstance) {
+    public unregistryListener(pluginInstance: plugin.Plugin, listener: any = pluginInstance) {
         if (listener && listener.off) {
             listener.off()
         }

packages/plugin/src/interfaces.ts

@@ -1,6 +1,8 @@
-import { server, MiaoScriptConsole, event, plugin } from "@ccms/api"
-import { injectable, inject, postConstruct } from "@ccms/container"
+import { server, MiaoScriptConsole, event, plugin, task, command } from "@ccms/api"
+import { injectable, inject, postConstruct, Autowired } from "@ccms/container"
 import { getPluginMetadata } from "./utils"
+import { PluginEventManager } from "./event"
+import { PluginCommandManager } from "./command"
 
 const File = Java.type('java.io.File')
 
@@ -11,6 +13,12 @@ export namespace interfaces {
         public logger: MiaoScriptConsole
         @inject(server.Console)
         private Console: MiaoScriptConsole
+        @Autowired()
+        private taskManager: task.TaskManager
+        @Autowired()
+        private eventManager: PluginEventManager
+        @Autowired()
+        private commandManager: PluginCommandManager
 
         constructor() {
             this.description = getPluginMetadata(this)
@@ -28,10 +36,42 @@ export namespace interfaces {
             return dataFolder.getAbsolutePath()
         }
 
-        public registryCommand(executor: any) { }
-        public unregistryCommand(executor: any) { }
-        public registryListener(listener: any) { }
-        public unregistryListener(listener: any) { }
+        /**
+         * 注册命令
+         * @param executor 命令执行器
+         */
+        public registryCommand(executor: any) {
+            this.commandManager.registryCommand(this, executor)
+        }
+        /**
+         * 注销命令
+         * @param executor 命令执行器
+         */
+        public unregistryCommand(executor: any) {
+            this.commandManager.unregistryCommand(this, executor)
+        }
+        /**
+         * 注册事件
+         * @param listener 事件监听器
+         */
+        public registryListener(listener: any) {
+            this.eventManager.registryListener(this, listener)
+        }
+        /**
+         * 注销事件
+         * @param listener 事件监听器
+         */
+        public unregistryListener(listener: any) {
+            this.eventManager.unregistryListener(this, listener)
+        }
+        /**
+         * 创建任务
+         * @param func 任务内容
+         * @returns 任务
+         */
+        public createTask(func: Function) {
+            return this.taskManager.create(func, this)
+        }
 
         public load() { }
         public enable() { }

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

@@ -17,11 +17,11 @@ export class BasicLoader implements plugin.PluginLoader {
         if (metadata?.type == this.type) {
             loadMetadata.metadata = metadata
             loadMetadata.loaded = true
-            this.pluginRequireMap.set(metadata.source.toString(), loadMetadata.instance)
+            this.pluginRequireMap.set(loadMetadata.path, loadMetadata.instance)
         }
         return loadMetadata
     }
     build(metadata: plugin.PluginMetadata) {
-        return this.pluginRequireMap.get(metadata.source.toString())
+        return this.pluginRequireMap.get(metadata.loadMetadata.path)
     }
 }

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

@@ -21,8 +21,8 @@ export class IocLoader implements plugin.PluginLoader {
     }
 
     require(loadMetadata: plugin.PluginLoadMetadata) {
-        let metadata = this.pluginMetadataMap.get(loadMetadata.file.toString())
-        if (metadata && metadata.type == this.type) {
+        let metadata = this.pluginMetadataMap.get(loadMetadata.path)
+        if (metadata?.type == this.type) {
             loadMetadata.metadata = metadata
             loadMetadata.loaded = true
         }
@@ -54,13 +54,6 @@ export class IocLoader implements plugin.PluginLoader {
     disable(plugin: plugin.Plugin): void {
         this.stage(plugin, 'disable')
     }
-    reload(plugin: plugin.Plugin): void {
-        this.disable(plugin)
-        //@ts-ignore
-        require(plugin.description.source, { cache: false })
-        this.load(plugin)
-        this.enable(plugin)
-    }
 
     private bindPlugin(metadata: plugin.PluginMetadata) {
         if (this.container.isBoundNamed(plugin.Plugin, metadata.name)) {

packages/plugin/src/manager.ts

@@ -18,6 +18,8 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private pluginInstance: any
     @Autowired(server.ServerType)
     private serverType: string
+    @Autowired(plugin.PluginFolder)
+    private pluginFolder: string
 
     @Autowired()
     private serverChecker: server.ServerChecker
@@ -58,6 +60,21 @@ export class PluginManagerImpl implements plugin.PluginManager {
         this.eventManager
         this.configManager
         this.commandManager
+        process.on('core.enable', (core) => {
+            process.emit('core.before.load.plugins')
+            let loadPluginStartTime = new Date().getTime()
+            console.i18n("ms.core.plugin.initialize")
+            process.emit('core.load.plugins', this.pluginFolder)
+            console.i18n("ms.core.plugin.completed", { time: (new Date().getTime() - loadPluginStartTime) / 1000 })
+            process.emit('core.after.load.plugins')
+        })
+        process.on('core.load.plugins', (pluginFolder) => {
+            this.scan(pluginFolder)
+            this.buildPlugins()
+            this.loadPlugins()
+            this.enablePlugins()
+        })
+        process.on('core.disable', () => { this.disablePlugins() })
     }
 
     initialize() {
@@ -86,7 +103,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
 
     scan(folder: string): void {
-        if (!folder) { throw new Error('plugin scan folder can\'t be empty!') }
+        if (!folder) { throw new Error("plugin scan folder can't be undefiend.") }
         this.initialize()
         process.emit('plugin.manager.before.scan', folder, this)
         for (const [, scanner] of this.sacnnerMap) {
@@ -96,7 +113,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 console.i18n('ms.plugin.manager.scan.finish', { scanner: scanner.type, folder, size: loadMetadatas.length })
                 for (const loadMetadata of loadMetadatas) {
                     try {
-                        this.loadAndRequirePlugin(loadMetadata)
+                        this.require(loadMetadata)
                     } catch (error: any) {
                         console.console(`§c扫描器 §4${scanner.type} §c文件 §4${loadMetadata.file.toString().replace(root, '')} §c编译失败 请提供下列错误给开发者`)
                         console.ex(error)
@@ -109,12 +126,6 @@ export class PluginManagerImpl implements plugin.PluginManager {
         process.emit('plugin.manager.after.scan', folder, this)
     }
 
-    build(): void {
-        process.emit('plugin.manager.before.build', this)
-        this.buildPlugins()
-        process.emit('plugin.manager.after.build', this)
-    }
-
     private logStage(plugin: plugin.Plugin, stage: string) {
         console.i18n("ms.plugin.manager.stage", { stage, plugin: plugin.description.name, version: plugin.description.version, author: plugin.description.author })
     }
@@ -134,9 +145,9 @@ export class PluginManagerImpl implements plugin.PluginManager {
         }
     }
 
-    private loadPlugin(loadMetadata: plugin.PluginLoadMetadata) {
-        if (!loadMetadata) { throw new Error('loadMetadata can\'t be undefiend when loadPlugin!') }
-        if (loadMetadata.loaded) { throw new Error(`Plugin file ${loadMetadata.file} is already loaded by ${loadMetadata.loader?.type}!`) }
+    private loadPlugin(loadMetadata: plugin.PluginLoadMetadata): plugin.PluginMetadata {
+        if (!loadMetadata) { throw new Error("loadMetadata can't be undefiend when loadPlugin.") }
+        if (loadMetadata.loaded) { throw new Error(`plugin file ${loadMetadata.file} is already loaded by ${loadMetadata.loader?.type}.`) }
         process.emit(`plugin.before.require`, loadMetadata)
         try {
             for (const [, loader] of this.loaderMap) {
@@ -145,6 +156,8 @@ export class PluginManagerImpl implements plugin.PluginManager {
         } catch (error: any) {
             console.i18n("ms.plugin.manager.initialize.error", { name: loadMetadata.file, ex: error })
             console.ex(error)
+        } finally {
+            process.emit(`plugin.after.require`, loadMetadata)
         }
     }
 
@@ -155,19 +168,18 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 let metadata = loadMetadata.metadata
                 if (this.metadataMap.has(metadata.name) && this.instanceMap.has(metadata.name)) {
                     let oldMetadata = this.metadataMap.get(metadata.name)
-                    throw new Error(`Plugin ${oldMetadata.name} is already load from ${oldMetadata.source}...`)
+                    throw new Error(`plugin ${oldMetadata.name} is already load from ${oldMetadata.source}.`)
                 }
                 this.metadataMap.set(metadata.name, metadata)
                 metadata.loadMetadata = loadMetadata
-                process.emit(`plugin.after.require`, loadMetadata)
             }
             return loadMetadata
         } catch (error: any) {
             if (global.debug) {
-                console.console(`§6Loader §b${loader.type} §6load §a${loadMetadata.file} §cerror. §4Err: §c${error}`)
+                console.console(`§6loader §b${loader.type} §6load §a${loadMetadata.file} §cerror. §4Err: §c${error}`)
                 console.ex(error)
             } else {
-                console.warn(`Loader ${loader.type} load ${loadMetadata.file} error. Err: ${error}`)
+                console.warn(`loader ${loader.type} load ${loadMetadata.file} error. Err: ${error}`)
             }
         }
     }
@@ -175,10 +187,10 @@ export class PluginManagerImpl implements plugin.PluginManager {
     private loadAndRequirePlugin(loadMetadata: plugin.PluginLoadMetadata) {
         let startTime = Date.now()
         let metadata = this.loadPlugin(loadMetadata.scanner.load(loadMetadata))
-        if (!metadata) { throw new Error('load plugin metadata failed.') }
+        if (!metadata) { throw new Error(`can't load plugin from metadata: ${JSON.stringify(loadMetadata)}`) }
         console.i18n('ms.plugin.manager.build', {
-            name: loadMetadata.metadata.name,
-            version: loadMetadata.metadata.version,
+            name: metadata.name,
+            version: metadata.version,
             file: loadMetadata.file.toString().replace(root, ''),
             scanner: loadMetadata.scanner.type,
             loader: loadMetadata.loader.type,
@@ -192,39 +204,54 @@ export class PluginManagerImpl implements plugin.PluginManager {
      * @param file java.io.File
      */
     loadFromFile(file: string, ext: any = 'js'): plugin.Plugin {
-        if (!file) { throw new Error('plugin file can\'t be undefiend.') }
+        if (!file) { throw new Error("plugin file can't be undefiend.") }
         let scanner = this.sacnnerMap.get(ext)
-        if (!scanner) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
+        if (!scanner) { throw new Error(`scanner ${ext} can't found in sacnnerMap.`) }
         let metadata = this.loadAndRequirePlugin(scanner.read(file))
         this.buildPlugin(metadata)
         let plugin = metadata.target
-        if (!plugin) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
+        if (!plugin) { throw new Error(`loader ${metadata.loadMetadata.loader.type} build plugin ${metadata.name} failed.`) }
         this.load(plugin)
         this.enable(plugin)
         return plugin
     }
 
-    load(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'load'))
+    load(plugin: plugin.Plugin): void {
+        this.runPluginStage(plugin, 'load')
     }
 
-    enable(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => this.runPluginStage(plugin, 'enable'))
+    enable(plugin: plugin.Plugin): void {
+        this.runPluginStage(plugin, 'enable')
     }
 
-    disable(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((plugin: plugin.Plugin) => {
-            this.runPluginStage(plugin, 'disable')
-            this.metadataMap.delete(plugin.description.name)
-            this.instanceMap.delete(plugin.description.name)
-        })
+    disable(plugin: plugin.Plugin): void {
+        this.runPluginStage(plugin, 'disable')
+        this.metadataMap.delete(plugin.description.name)
+        this.instanceMap.delete(plugin.description.name)
     }
 
-    reload(...args: any[]): void {
-        this.checkAndGet(args[0]).forEach((pl: plugin.Plugin) => {
-            this.disable(pl)
-            this.loadFromFile(pl.description.loadMetadata.file, pl.description.loadMetadata.scanner.type)
-        })
+    reload(plugin: plugin.Plugin): void {
+        this.rebuild(plugin)
+    }
+
+    require(loadMetadata: plugin.PluginLoadMetadata): plugin.PluginMetadata {
+        return this.loadAndRequirePlugin(loadMetadata)
+    }
+
+    build(metadata: plugin.PluginMetadata): plugin.Plugin {
+        try {
+            return this.buildPlugin(metadata)
+        } catch (error: any) {
+            console.ex(error)
+        }
+    }
+
+    rebuild(plugin: plugin.Plugin): void {
+        if (!plugin) { throw new Error(`can't run reload plugin because plugin is ${plugin}`) }
+        this.disable(plugin)
+        let loadMetadata = plugin.description.loadMetadata
+        delete require.cache[loadMetadata.path]
+        this.loadFromFile(loadMetadata.file)
     }
 
     has(name: string) {
@@ -232,44 +259,63 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
 
     get(name: string) {
-        return this.instanceMap.get(name) || null
+        return this.instanceMap.get(name)
     }
 
     getPlugin(name: string) {
-        return this.instanceMap.get(name) || null
+        return this.instanceMap.get(name)
     }
 
     getPlugins() {
         return this.instanceMap
     }
 
-    private runCatch(pl: any, func: string) {
-        try {
-            if (pl[func]) pl[func].call(pl)
-        } catch (ex: any) {
-            console.i18n("ms.plugin.manager.stage.exec.error", { plugin: pl.description.name, executor: func, error: ex })
-            console.ex(ex)
+    buildPlugins() {
+        process.emit('plugin.manager.before.build', this)
+        for (const [key, metadata] of this.metadataMap) {
+            if (metadata.depends?.length) {
+                this.lazyMetadataMap.set(key, metadata)
+            } else {
+                this.build(metadata)
+            }
+        }
+        for (const metadata of this.lazyMetadataMap.values()) {
+            this.build(metadata)
+        }
+        process.emit('plugin.manager.after.build', this)
+    }
+
+    rebuildPlugins() {
+        for (const plugin of this.instanceMap.values()) {
+            this.rebuild(plugin)
         }
     }
 
-    private checkAndGet(name: string | plugin.Plugin | undefined | any): Map<string, plugin.Plugin> | plugin.Plugin[] {
-        if (name === undefined) throw new Error(`checkAndGet Plugin can't be undefiend.`)
-        if (name == this.instanceMap) { return this.instanceMap }
-        if (typeof name == 'string' && this.instanceMap.has(name)) { return [this.instanceMap.get(name)] }
-        if (name instanceof interfaces.Plugin) { return [name as plugin.Plugin] }
-        if (name.description?.name) { return [name as plugin.Plugin] }
-        throw new Error(`Plugin ${JSON.stringify(name)} not exist.`)
+    loadPlugins() {
+        for (const plugin of this.instanceMap.values()) {
+            this.load(plugin)
+        }
     }
 
-    private buildPlugins() {
-        this.metadataMap.forEach((metadata, key) => {
-            if (metadata?.depends?.length) {
-                this.lazyMetadataMap.set(key, metadata)
-            } else {
-                this.tryBuildPlugin(metadata)
-            }
-        })
-        this.lazyMetadataMap.forEach((metadata, key) => this.tryBuildPlugin(metadata))
+    enablePlugins() {
+        for (const plugin of this.instanceMap.values()) {
+            this.enable(plugin)
+        }
+    }
+
+    disablePlugins() {
+        for (const plugin of this.instanceMap.values()) {
+            this.disable(plugin)
+        }
+    }
+
+    private runCatch(plugin: any, fn: string) {
+        try {
+            if (plugin[fn]) plugin[fn].call(plugin)
+        } catch (ex: any) {
+            console.i18n("ms.plugin.manager.stage.exec.error", { plugin: plugin.description.name, executor: fn, error: ex })
+            console.ex(ex)
+        }
     }
 
     private checkDepends(depends: string | string[]) {
@@ -280,18 +326,11 @@ export class PluginManagerImpl implements plugin.PluginManager {
     }
     private checkNativeDepends(depends: string | string[]) {
         if (!depends) return []
-        let loseDepends = []
-        for (const depend of depends) { if (!this.nativePluginManager.has(depend)) loseDepends.push(depend) }
-        return loseDepends
+        let loseNativeDepends = []
+        for (const depend of depends) { if (!this.nativePluginManager.has(depend)) loseNativeDepends.push(depend) }
+        return loseNativeDepends
     }
 
-    private tryBuildPlugin(metadata: plugin.PluginMetadata) {
-        try {
-            return this.buildPlugin(metadata)
-        } catch (error: any) {
-            console.ex(error)
-        }
-    }
 
     private buildPlugin(metadata: plugin.PluginMetadata) {
         process.emit(`plugin.before.build`, metadata)
@@ -304,6 +343,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         if (loseNativeDepends.length) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查插件依赖 §3[${loseNativeDepends.join(',')}] §4是否安装完整!`) }
         let pluginInstance = this.loaderMap.get(metadata.type).build(metadata)
         if (!pluginInstance) { throw new Error(`§4加载器 §c${metadata.type} §4加载插件 §c${metadata.name} §4失败!`) }
+        process.emit(`plugin.build`, pluginInstance)
         metadata.target = pluginInstance
         this.instanceMap.set(metadata.name, pluginInstance)
         process.emit(`plugin.after.build`, metadata, pluginInstance)

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

@@ -13,15 +13,21 @@ export class JSFileScanner implements plugin.PluginScanner {
     }
 
     read(file: any): plugin.PluginLoadMetadata {
-        return { file, type: this.type, scanner: this, loaded: false }
+        return {
+            file,
+            path: file.canonicalPath || file.toString(),
+            type: this.type,
+            scanner: this,
+            loaded: false
+        }
     }
 
-    load(metadata: plugin.PluginLoadMetadata): plugin.PluginLoadMetadata {
-        if (metadata.type !== this.type) { return }
-        this.updatePlugin(metadata.file)
-        //@ts-ignore load plugin not use cache
-        metadata.instance = require(metadata.file.toString(), { cache: false })
-        return metadata
+    load(loadMetadata: plugin.PluginLoadMetadata): plugin.PluginLoadMetadata {
+        if (loadMetadata.type !== this.type) { return }
+        this.updatePlugin(loadMetadata.file)
+        delete require.cache[loadMetadata.path]
+        loadMetadata.instance = require(loadMetadata.path)
+        return loadMetadata
     }
 
     private scanFolder(folder: any): string[] {
@@ -45,7 +51,7 @@ export class JSFileScanner implements plugin.PluginScanner {
     }
 
     private updatePlugin(file: any) {
-        var update = fs.file(fs.file(fs.file(file).parentFile, 'update'), file.name)
+        var update = fs.file(fs.concat(file.parentFile, 'update', file.name))
         if (update.exists()) {
             console.i18n("ms.plugin.manager.build.update", { name: file.name })
             fs.move(update, file, true)

packages/polyfill/.npmignore

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

packages/polyfill/package.json

@@ -1,27 +1,29 @@
 {
     "name": "@ccms/polyfill",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript polyfill package",
     "author": "MiaoWoo <admin@yumc.pw>",
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/i18n": "^0.28.0-beta.2",
-        "@ccms/nodejs": "^0.28.0-beta.2",
-        "core-js": "^3.27.2"
+        "@ccms/i18n": "^0.28.0-beta.10",
+        "@ccms/nodejs": "^0.28.0-beta.10",
+        "core-js": "^3.33.2"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.2",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@ccms/nashorn": "^0.28.0-beta.10"
     }
 }

packages/polyfill/src/core-js.ts

@@ -0,0 +1,241 @@
+'use strict';
+// @ts-ignore
+require.internal.versionLockModules['core-js'] = '3.32.2'
+import 'core-js/modules/es.symbol';
+import 'core-js/modules/es.symbol.description';
+import 'core-js/modules/es.symbol.async-iterator';
+import 'core-js/modules/es.symbol.has-instance';
+import 'core-js/modules/es.symbol.is-concat-spreadable';
+import 'core-js/modules/es.symbol.iterator';
+import 'core-js/modules/es.symbol.match';
+import 'core-js/modules/es.symbol.match-all';
+import 'core-js/modules/es.symbol.replace';
+import 'core-js/modules/es.symbol.search';
+import 'core-js/modules/es.symbol.species';
+import 'core-js/modules/es.symbol.split';
+import 'core-js/modules/es.symbol.to-primitive';
+import 'core-js/modules/es.symbol.to-string-tag';
+import 'core-js/modules/es.symbol.unscopables';
+import 'core-js/modules/es.array.at';
+import 'core-js/modules/es.array.concat';
+import 'core-js/modules/es.array.copy-within';
+import 'core-js/modules/es.array.every';
+import 'core-js/modules/es.array.fill';
+import 'core-js/modules/es.array.filter';
+import 'core-js/modules/es.array.find';
+import 'core-js/modules/es.array.find-index';
+import 'core-js/modules/es.array.find-last';
+import 'core-js/modules/es.array.find-last-index';
+import 'core-js/modules/es.array.flat';
+import 'core-js/modules/es.array.flat-map';
+import 'core-js/modules/es.array.for-each';
+import 'core-js/modules/es.array.from';
+import 'core-js/modules/es.array.includes';
+import 'core-js/modules/es.array.index-of';
+import 'core-js/modules/es.array.is-array';
+import 'core-js/modules/es.array.iterator';
+import 'core-js/modules/es.array.join';
+import 'core-js/modules/es.array.last-index-of';
+import 'core-js/modules/es.array.map';
+import 'core-js/modules/es.array.of';
+import 'core-js/modules/es.array.push';
+import 'core-js/modules/es.array.reduce';
+import 'core-js/modules/es.array.reduce-right';
+import 'core-js/modules/es.array.reverse';
+import 'core-js/modules/es.array.slice';
+import 'core-js/modules/es.array.some';
+import 'core-js/modules/es.array.sort';
+import 'core-js/modules/es.array.species';
+import 'core-js/modules/es.array.splice';
+import 'core-js/modules/es.array.to-reversed';
+import 'core-js/modules/es.array.to-sorted';
+import 'core-js/modules/es.array.to-spliced';
+import 'core-js/modules/es.array.unscopables.flat';
+import 'core-js/modules/es.array.unscopables.flat-map';
+import 'core-js/modules/es.array.unshift';
+import 'core-js/modules/es.array.with';
+import 'core-js/modules/es.array-buffer.constructor';
+import 'core-js/modules/es.array-buffer.is-view';
+import 'core-js/modules/es.array-buffer.slice';
+import 'core-js/modules/es.data-view';
+import 'core-js/modules/es.date.get-year';
+import 'core-js/modules/es.date.now';
+import 'core-js/modules/es.date.set-year';
+import 'core-js/modules/es.date.to-gmt-string';
+import 'core-js/modules/es.date.to-iso-string';
+import 'core-js/modules/es.date.to-json';
+import 'core-js/modules/es.date.to-primitive';
+import 'core-js/modules/es.date.to-string';
+import 'core-js/modules/es.escape';
+import 'core-js/modules/es.function.bind';
+import 'core-js/modules/es.function.has-instance';
+import 'core-js/modules/es.function.name';
+import 'core-js/modules/es.global-this';
+import 'core-js/modules/es.json.stringify';
+import 'core-js/modules/es.json.to-string-tag';
+import 'core-js/modules/es.map';
+import 'core-js/modules/es.math.acosh';
+import 'core-js/modules/es.math.asinh';
+import 'core-js/modules/es.math.atanh';
+import 'core-js/modules/es.math.cbrt';
+import 'core-js/modules/es.math.clz32';
+import 'core-js/modules/es.math.cosh';
+import 'core-js/modules/es.math.expm1';
+import 'core-js/modules/es.math.fround';
+import 'core-js/modules/es.math.hypot';
+import 'core-js/modules/es.math.imul';
+import 'core-js/modules/es.math.log10';
+import 'core-js/modules/es.math.log1p';
+import 'core-js/modules/es.math.log2';
+import 'core-js/modules/es.math.sign';
+import 'core-js/modules/es.math.sinh';
+import 'core-js/modules/es.math.tanh';
+import 'core-js/modules/es.math.to-string-tag';
+import 'core-js/modules/es.math.trunc';
+import 'core-js/modules/es.number.constructor';
+import 'core-js/modules/es.number.epsilon';
+import 'core-js/modules/es.number.is-finite';
+import 'core-js/modules/es.number.is-integer';
+import 'core-js/modules/es.number.is-nan';
+import 'core-js/modules/es.number.is-safe-integer';
+import 'core-js/modules/es.number.max-safe-integer';
+import 'core-js/modules/es.number.min-safe-integer';
+import 'core-js/modules/es.number.parse-float';
+import 'core-js/modules/es.number.parse-int';
+import 'core-js/modules/es.number.to-exponential';
+import 'core-js/modules/es.number.to-fixed';
+import 'core-js/modules/es.number.to-precision';
+import 'core-js/modules/es.object.assign';
+import 'core-js/modules/es.object.create';
+import 'core-js/modules/es.object.define-getter';
+import 'core-js/modules/es.object.define-properties';
+import 'core-js/modules/es.object.define-property';
+import 'core-js/modules/es.object.define-setter';
+import 'core-js/modules/es.object.entries';
+import 'core-js/modules/es.object.freeze';
+import 'core-js/modules/es.object.from-entries';
+import 'core-js/modules/es.object.get-own-property-descriptor';
+import 'core-js/modules/es.object.get-own-property-descriptors';
+import 'core-js/modules/es.object.get-own-property-names';
+import 'core-js/modules/es.object.get-prototype-of';
+import 'core-js/modules/es.object.has-own';
+import 'core-js/modules/es.object.is';
+import 'core-js/modules/es.object.is-extensible';
+import 'core-js/modules/es.object.is-frozen';
+import 'core-js/modules/es.object.is-sealed';
+import 'core-js/modules/es.object.keys';
+import 'core-js/modules/es.object.lookup-getter';
+import 'core-js/modules/es.object.lookup-setter';
+import 'core-js/modules/es.object.prevent-extensions';
+import 'core-js/modules/es.object.proto';
+import 'core-js/modules/es.object.seal';
+import 'core-js/modules/es.object.values';
+import 'core-js/modules/es.parse-float';
+import 'core-js/modules/es.parse-int';
+import 'core-js/modules/es.promise';
+import 'core-js/modules/es.promise.all-settled';
+import 'core-js/modules/es.promise.any';
+import 'core-js/modules/es.promise.finally';
+import 'core-js/modules/es.reflect.apply';
+import 'core-js/modules/es.reflect.construct';
+import 'core-js/modules/es.reflect.define-property';
+import 'core-js/modules/es.reflect.delete-property';
+import 'core-js/modules/es.reflect.get';
+import 'core-js/modules/es.reflect.get-own-property-descriptor';
+import 'core-js/modules/es.reflect.get-prototype-of';
+import 'core-js/modules/es.reflect.has';
+import 'core-js/modules/es.reflect.is-extensible';
+import 'core-js/modules/es.reflect.own-keys';
+import 'core-js/modules/es.reflect.prevent-extensions';
+import 'core-js/modules/es.reflect.set';
+import 'core-js/modules/es.reflect.set-prototype-of';
+import 'core-js/modules/es.reflect.to-string-tag';
+import 'core-js/modules/es.regexp.constructor';
+import 'core-js/modules/es.regexp.dot-all';
+import 'core-js/modules/es.regexp.exec';
+import 'core-js/modules/es.regexp.flags';
+import 'core-js/modules/es.regexp.sticky';
+import 'core-js/modules/es.regexp.test';
+import 'core-js/modules/es.regexp.to-string';
+import 'core-js/modules/es.set';
+import 'core-js/modules/es.string.at-alternative';
+import 'core-js/modules/es.string.code-point-at';
+import 'core-js/modules/es.string.ends-with';
+import 'core-js/modules/es.string.from-code-point';
+import 'core-js/modules/es.string.includes';
+import 'core-js/modules/es.string.is-well-formed';
+import 'core-js/modules/es.string.iterator';
+import 'core-js/modules/es.string.match';
+import 'core-js/modules/es.string.match-all';
+import 'core-js/modules/es.string.pad-end';
+import 'core-js/modules/es.string.pad-start';
+import 'core-js/modules/es.string.raw';
+import 'core-js/modules/es.string.repeat';
+import 'core-js/modules/es.string.replace';
+import 'core-js/modules/es.string.replace-all';
+import 'core-js/modules/es.string.search';
+import 'core-js/modules/es.string.split';
+import 'core-js/modules/es.string.starts-with';
+import 'core-js/modules/es.string.substr';
+import 'core-js/modules/es.string.to-well-formed';
+import 'core-js/modules/es.string.trim';
+import 'core-js/modules/es.string.trim-end';
+import 'core-js/modules/es.string.trim-start';
+import 'core-js/modules/es.string.anchor';
+import 'core-js/modules/es.string.big';
+import 'core-js/modules/es.string.blink';
+import 'core-js/modules/es.string.bold';
+import 'core-js/modules/es.string.fixed';
+import 'core-js/modules/es.string.fontcolor';
+import 'core-js/modules/es.string.fontsize';
+import 'core-js/modules/es.string.italics';
+import 'core-js/modules/es.string.link';
+import 'core-js/modules/es.string.small';
+import 'core-js/modules/es.string.strike';
+import 'core-js/modules/es.string.sub';
+import 'core-js/modules/es.string.sup';
+import 'core-js/modules/es.typed-array.float32-array';
+import 'core-js/modules/es.typed-array.float64-array';
+import 'core-js/modules/es.typed-array.int8-array';
+import 'core-js/modules/es.typed-array.int16-array';
+import 'core-js/modules/es.typed-array.int32-array';
+import 'core-js/modules/es.typed-array.uint8-array';
+import 'core-js/modules/es.typed-array.uint8-clamped-array';
+import 'core-js/modules/es.typed-array.uint16-array';
+import 'core-js/modules/es.typed-array.uint32-array';
+import 'core-js/modules/es.typed-array.at';
+import 'core-js/modules/es.typed-array.copy-within';
+import 'core-js/modules/es.typed-array.every';
+import 'core-js/modules/es.typed-array.fill';
+import 'core-js/modules/es.typed-array.filter';
+import 'core-js/modules/es.typed-array.find';
+import 'core-js/modules/es.typed-array.find-index';
+import 'core-js/modules/es.typed-array.find-last';
+import 'core-js/modules/es.typed-array.find-last-index';
+import 'core-js/modules/es.typed-array.for-each';
+import 'core-js/modules/es.typed-array.from';
+import 'core-js/modules/es.typed-array.includes';
+import 'core-js/modules/es.typed-array.index-of';
+import 'core-js/modules/es.typed-array.iterator';
+import 'core-js/modules/es.typed-array.join';
+import 'core-js/modules/es.typed-array.last-index-of';
+import 'core-js/modules/es.typed-array.map';
+import 'core-js/modules/es.typed-array.of';
+import 'core-js/modules/es.typed-array.reduce';
+import 'core-js/modules/es.typed-array.reduce-right';
+import 'core-js/modules/es.typed-array.reverse';
+import 'core-js/modules/es.typed-array.set';
+import 'core-js/modules/es.typed-array.slice';
+import 'core-js/modules/es.typed-array.some';
+import 'core-js/modules/es.typed-array.sort';
+import 'core-js/modules/es.typed-array.subarray';
+import 'core-js/modules/es.typed-array.to-locale-string';
+import 'core-js/modules/es.typed-array.to-reversed';
+import 'core-js/modules/es.typed-array.to-sorted';
+import 'core-js/modules/es.typed-array.to-string';
+import 'core-js/modules/es.typed-array.with';
+import 'core-js/modules/es.unescape';
+import 'core-js/modules/es.weak-map';
+import 'core-js/modules/es.weak-set';
+
+module.exports = require('core-js/internals/path');

packages/polyfill/src/index.ts

@@ -7,7 +7,7 @@ console.i18n("ms.polyfill.initialize")
 import './openjdk-nashorn-shim'
 import './es5-ext'
 import './node-shim'
-import 'core-js'
+import './core-js'
 //@ts-ignore
 process.on('exit', () => require.disable())
 global.setGlobal('Proxy', require('./proxy').Proxy)

packages/polyfill/src/node-shim.ts

@@ -18,10 +18,17 @@ const JavaScriptTask = Java.type(base.getJavaScriptTaskClass().name)
 const threadCount = new AtomicInteger(0)
 const threadGroup = new ThreadGroup("@ccms/micro-task")
 const microTaskPool = new ThreadPoolExecutor(
-    100, 200, 60, TimeUnit.SECONDS,
-    new LinkedBlockingQueue(1024),
+    16, 32, 64, TimeUnit.SECONDS,
+    new LinkedBlockingQueue(64),
     new ThreadFactory((run: any) => new Thread(threadGroup, run, "@ccms/micro-task-" + threadCount.incrementAndGet()))
 )
+
+declare global {
+    interface Function {
+        thread: any;
+    }
+}
+
 class Process extends EventEmitter {
     readonly version = base.version
     readonly versions = []
@@ -45,11 +52,13 @@ class Process extends EventEmitter {
     execArgv = ''
     execPath = ''
 
+    private queueMicrotaskExecuteTimeout = 5000
+
     constructor() {
         super()
         this.on('exit', () => {
             console.log(`await microTaskPool termination! queueTask: ${microTaskPool.shutdownNow().size()} remainTask: ${threadGroup.activeCount()}`)
-            microTaskPool.awaitTermination(3000, TimeUnit.MILLISECONDS)
+            microTaskPool.awaitTermination(this.queueMicrotaskExecuteTimeout, TimeUnit.MILLISECONDS)
         })
     }
     on(event: string | symbol, listener: (...args: any[]) => void) {
@@ -67,18 +76,34 @@ class Process extends EventEmitter {
         })
     }
     nextTick(callback: Function, ...args: any[]): void {
-        microTaskPool.execute(() => {
-            try {
-                callback(args)
-            } catch (origin: any) {
-                try {
-                    super.emit('error', origin)
-                } catch (error: any) {
-                    console.ex(origin)
-                    console.ex(error)
+        try {
+            microTaskPool.submit(new Callable({
+                call: () => {
+                    callback.thread = Thread.currentThread();
+                    try {
+                        callback(args)
+                    } catch (origin: any) {
+                        try {
+                            super.emit('error', origin)
+                        } catch (error: any) {
+                            console.ex(origin)
+                            console.ex(error)
+                        }
+                    }
                 }
+            })).get(this.queueMicrotaskExecuteTimeout, TimeUnit.MILLISECONDS)
+        } catch (error: any) {
+            if (error instanceof InterruptedException) {
+                return console.warn(`FixedThreadPool isInterrupted exit! Task ${callback.name || '<anonymous>'} exec exit!`)
             }
-        })
+            if (error instanceof TimeoutException) {
+                if (callback.thread instanceof Thread) {
+                    console.debug(console.stack(callback.thread as any))
+                }
+                return console.warn(`Task ${callback.name || '<anonymous>'} => ${callback} exec time greater than ${this.queueMicrotaskExecuteTimeout}ms!`)
+            }
+            throw error.getCause && error.getCause() || error
+        }
     }
     exit(code: number) {
         console.log(`process exit by code ${code}!`)
@@ -120,9 +145,6 @@ class Process extends EventEmitter {
         throw new Error('MiaoScript unsupport kill.')
         return true
     }
-    toString() {
-        return "[object process]"
-    }
 }
 
 class EventLoop {
@@ -135,8 +157,8 @@ class EventLoop {
     constructor() {
         this.taskExecuteTimeout = parseInt(process.env.MS_TASK_EXECUTE_TIMEOUT) || 3000
         this.fixedThreadPool = new ThreadPoolExecutor(
-            8, 16, 0, TimeUnit.SECONDS,
-            new LinkedBlockingQueue(1024),
+            4, 16, 32, TimeUnit.SECONDS,
+            new LinkedBlockingQueue(32),
             new ThreadFactory((run: any) => {
                 let thread = new Thread(run, "@ccms/event-loop-" + this.threadCount.incrementAndGet())
                 thread.setDaemon(true)
@@ -174,7 +196,7 @@ class EventLoop {
             this.eventLoopMainThread.interrupt()
             this.fixedThreadPool.shutdownNow()
             console.log(`await fixedThreadPool termination!`)
-            this.fixedThreadPool.awaitTermination(3000, TimeUnit.MILLISECONDS)
+            this.fixedThreadPool.awaitTermination(this.taskExecuteTimeout, TimeUnit.MILLISECONDS)
         })
     }
 
@@ -196,6 +218,7 @@ class EventLoop {
         try {
             this.fixedThreadPool.submit(new Callable({
                 call: () => {
+                    callback.thread = Thread.currentThread();
                     try {
                         callback.apply(undefined, args)
                     } catch (cause: any) {
@@ -214,6 +237,9 @@ class EventLoop {
                 return console.warn(`FixedThreadPool isInterrupted exit! Task ${name} exec exit!`)
             }
             if (error instanceof TimeoutException) {
+                if (callback.thread instanceof Thread) {
+                    console.debug(console.stack(callback.thread as any).join('\n'))
+                }
                 return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecuteTimeout}ms!`)
             }
             throw error.getCause && error.getCause() || error
@@ -261,7 +287,7 @@ class EventLoop {
     }
 }
 global.setGlobal('process', new Process(), {})
-Object.defineProperty(process, require('core-js/es/symbol/to-string-tag'), { value: '[object process]' })
+Object.defineProperty(process, require('core-js/es/symbol/to-string-tag'), { value: 'process' })
 const eventLoop = new EventLoop()
 Object.defineProperty(process, 'eventLoop', { value: eventLoop })
 eventLoop.startEventLoop()

packages/protocol/.npmignore

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

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",
@@ -13,15 +13,15 @@
     "license": "ISC",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "devDependencies": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
     }
 }

packages/qrcode/.npmignore

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

packages/qrcode/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/qrcode",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript qrcode package",
     "keywords": [
         "miaoscript",
@@ -12,15 +12,15 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "devDependencies": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
     }
 }

packages/runtime/package.json

@@ -0,0 +1,47 @@
+{
+    "private": true,
+    "name": "@ccms/runtime",
+    "version": "0.28.0-beta.10",
+    "description": "development runtime",
+    "keywords": [
+        "miaoscript",
+        "minecraft",
+        "bukkit",
+        "sponge"
+    ],
+    "author": "MiaoWoo <admin@yumc.pw>",
+    "homepage": "https://github.com/circlecloud/ms.git",
+    "license": "ISC",
+    "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
+    "scripts": {
+        "clean": "rimraf dist",
+        "watch": "tsc --watch",
+        "build": "pnpm clean && tsc",
+        "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "devDependencies": {
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/bukkit": "^0.28.0-beta.10",
+        "@ccms/bungee": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10",
+        "@ccms/core": "^0.28.0-beta.10",
+        "@ccms/database": "^0.28.0-beta.10",
+        "@ccms/i18n": "^0.28.0-beta.10",
+        "@ccms/molang": "^0.28.0-beta.10",
+        "@ccms/nashorn": "^0.28.0-beta.10",
+        "@ccms/nodejs": "^0.28.0-beta.10",
+        "@ccms/nukkit": "^0.28.0-beta.10",
+        "@ccms/plugin": "^0.28.0-beta.10",
+        "@ccms/polyfill": "^0.28.0-beta.10",
+        "@ccms/protocol": "^0.28.0-beta.10",
+        "@ccms/qrcode": "^0.28.0-beta.10",
+        "@ccms/sponge": "^0.28.0-beta.10",
+        "@ccms/websocket": "^0.28.0-beta.10"
+    }
+}

packages/sponge/.npmignore

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

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.28.0-beta.2",
+    "version": "0.28.0-beta.10",
     "description": "MiaoScript sponge package",
     "keywords": [
         "miaoscript",
@@ -12,21 +12,23 @@
     "homepage": "https://github.com/circlecloud/ms.git",
     "license": "ISC",
     "main": "dist/index.js",
+    "files": [
+        "dist/**/*.js",
+        "dist/**/*.ts",
+        "dist/**/*.map"
+    ],
     "scripts": {
         "clean": "rimraf dist",
         "watch": "tsc --watch",
-        "build": "yarn clean && tsc",
+        "build": "pnpm clean && tsc",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@javatypes/sponge-api": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
+        "@javatypes/sponge-api": "^0.0.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
+        "@ccms/api": "^0.28.0-beta.10",
+        "@ccms/common": "^0.28.0-beta.10",
+        "@ccms/container": "^0.28.0-beta.10"
     }
 }

packages/spring/.npmignore

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

packages/spring/package.json

@@ -1,32 +0,0 @@
-{
-    "name": "@ccms/spring",
-    "version": "0.28.0-beta.2",
-    "description": "MiaoScript spring 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": {
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
-    },
-    "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2",
-        "@ccms/database": "^0.28.0-beta.2"
-    }
-}

packages/spring/src/command.ts

@@ -1,28 +0,0 @@
-import '@ccms/nashorn'
-
-import { command, plugin } from '@ccms/api'
-import { inject, provideSingleton, postConstruct } from '@ccms/container'
-
-import { CommandMap } from './internal/command'
-
-@provideSingleton(command.Command)
-export class SpringCommand extends command.Command {
-    @inject(CommandMap)
-    private commandMap: CommandMap
-
-    protected create(plugin: any, command: string) {
-        return this.commandMap.register(plugin, command)
-    }
-    public tabComplete(sender: any, input: string, index?: number): string[] {
-        return this.commandMap.tabComplate(sender, input, index)
-    }
-    protected remove(plugin: any, command: string) {
-        this.commandMap.unregister(plugin, command)
-    }
-    protected onCommand(plugin: any, command: any, executor: Function) {
-        command.setExecutor(super.setExecutor(plugin, command, executor))
-    }
-    protected onTabComplete(plugin: any, command: any, tabCompleter: Function) {
-        command.setTabCompleter(super.setTabCompleter(plugin, command, tabCompleter))
-    }
-}

packages/spring/src/console.ts

@@ -1,58 +0,0 @@
-import { MiaoScriptConsole } from '@ccms/api'
-
-var colorMap = []
-colorMap['0'] = '38;5;0'
-colorMap['1'] = '38;5;4'
-colorMap['2'] = '38;5;2'
-colorMap['3'] = '38;5;6'
-colorMap['4'] = '38;5;1'
-colorMap['5'] = '38;5;5'
-colorMap['6'] = '38;5;3'
-colorMap['7'] = '38;5;7'
-colorMap['8'] = '38;5;8'
-colorMap['9'] = '38;5;12'
-colorMap['a'] = '38;5;10'
-colorMap['b'] = '38;5;14'
-colorMap['c'] = '38;5;9'
-colorMap['d'] = '38;5;13'
-colorMap['e'] = '38;5;11'
-colorMap['f'] = '38;5;15'
-colorMap['r'] = '0'
-colorMap['l'] = '1'
-colorMap['n'] = '4'
-var regexMap = []
-for (const c in colorMap) {
-    regexMap[colorMap[c]] = new RegExp(`§${c}`, "g")
-}
-function mcColor2ANSI(str: string) {
-    for (const regex in regexMap) {
-        str = str.replace(regexMap[regex], `\u001b[${regex}m`)
-    }
-    return str
-}
-
-export class SpringConsole extends MiaoScriptConsole {
-    error(...args: any[]) {
-        this.logger.error(args.join(' '))
-    }
-    warn(...args: any[]) {
-        this.logger.warn(args.join(' '))
-    }
-    sender(sender: any, ...args: any[]) {
-        sender = sender || {
-            sendMessage: (message: string) => console.console(message)
-        }
-        if (!sender.sendMessage) {
-            this.error('第一个参数未实现 sendMessage 无法发送消息!')
-            return
-        }
-        if (Object.prototype.toString.call(args[0]) === '[object Array]') {
-            args[0].forEach(line => sender.sendMessage(this.prefix + line))
-        } else {
-            sender.sendMessage(this.prefix + args.join(' '))
-        }
-    }
-    console(...args: string[]): void {
-        this.logger.info(mcColor2ANSI(args.join(' ') + '§r'))
-    }
-}

packages/spring/src/event.ts

@@ -1,24 +0,0 @@
-import { event, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container'
-
-@provideSingleton(event.Event)
-export class SpringEvent extends event.Event {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
-
-    constructor() {
-        super('');
-    }
-    mapEventName() {
-        return 0;
-    }
-    isValidEvent(clazz: any): boolean {
-        throw new Error("Method not implemented.");
-    }
-    register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean) {
-        throw new Error("Method not implemented.");
-    }
-    unregister(event: any, listener: any): void {
-        throw new Error("Method not implemented.");
-    }
-}

packages/spring/src/index.ts

@@ -1,30 +0,0 @@
-import { server } from '@ccms/api'
-import { ioc, Container, reduceMetadata } from '@ccms/container'
-
-import { SpringConsole } from './console'
-import './event'
-import './server'
-import './command'
-import './task'
-
-const toString = {}.toString
-
-export default function SpringImpl(container: Container) {
-    try {
-        require('@ccms/web')
-        require('@ccms/amqp')
-        require('@ccms/database')
-        require('./internal/scanner/mysql-scanner')
-    } catch (error: any) {
-        console.ex(error)
-    }
-    const beanFactory = base.getInstance().getAutowireCapableBeanFactory()
-    container.bind(server.Console).toConstantValue(SpringConsole)
-    container.rebind(ioc.Autowired).toDynamicValue((ctx) => {
-        var metadata: any = reduceMetadata(ctx)
-        let key = toString.call(metadata.named)
-        if (key === "[object Function]" || key === "[object Symbol]") { return container.get(metadata.named) }
-        if (key === '[object jdk.internal.dynalink.beans.StaticClass]') { metadata.named = metadata.named.class }
-        return beanFactory.getBean(metadata.named)
-    })
-}

packages/spring/src/internal/command.ts

@@ -1,79 +0,0 @@
-import { provideSingleton } from "@ccms/container"
-import { plugin } from "@ccms/api"
-
-type CommandExec = (sender: any, _: any, command: string, args: string[]) => boolean
-type TabCompleter = (sender: any, _: any, command: string, args: string[]) => string[]
-type CommandStore = { [key: string]: SpringCommand }
-
-@provideSingleton(CommandMap)
-export class CommandMap {
-    private commands: CommandStore = {}
-    private pluginCommands: { [key: string]: CommandStore } = {}
-
-    register(plugin: plugin.Plugin, command: string) {
-        let springCommand = new SpringCommand(plugin, command)
-        this.commands[command] = springCommand
-        if (!this.pluginCommands[plugin.description.name]) { this.pluginCommands[plugin.description.name] = {} }
-        this.pluginCommands[plugin.description.name][command] = springCommand
-        return springCommand
-    }
-
-    unregister(plugin: plugin.Plugin, command: string) {
-        delete this.commands[command]
-        delete this.pluginCommands[plugin.description.name][command]
-    }
-
-    dispatch(sender: any, command: string, args: string[]): boolean {
-        if (command === "help") {
-            sender.sendMessage('§e--------- §rHelp: Index §e---------------------------')
-            sender.sendMessage('Use /help [n] to get page n of help.')
-            for (const cmdName of Object.getOwnPropertyNames(this.commands)) {
-                sender.sendMessage(`§6/${cmdName}: §rA command provided by plugin §b${this.commands[cmdName].plugin.description.name}§r.`)
-            }
-            return
-        }
-        let exists = this.commands[command]
-        if (exists) {
-            try {
-                return exists.executor(sender, '', command, Java.to(args))
-            } catch (error: any) {
-                console.ex(error)
-            }
-            return true
-        } else {
-            sender.sendMessage && sender.sendMessage(`Unknown command. Type "/help" for help.`)
-            return false
-        }
-    }
-
-    tabComplate(sender: any, input: string, index?: number): string[] {
-        if (index == 0) { return Object.keys(this.commands).concat('help') }
-        let [command, ...args] = input.split(' ')
-        let exists = this.commands[command]
-        if (exists && exists.tabCompleter) {
-            try {
-                if (args.length !== index) { args.push('') }
-                return exists.tabCompleter(sender, '', command, Java.to(args))
-            } catch (error: any) {
-                console.ex(error)
-            }
-        }
-        return []
-    }
-}
-
-export class SpringCommand {
-    public plugin: plugin.Plugin
-    public name: string
-    public executor: CommandExec
-    public tabCompleter: TabCompleter
-
-    constructor(plugin: plugin.Plugin, command: string, description: string = '暂无描述!') {
-        this.plugin = plugin
-        this.name = command
-    }
-
-    setExecutor = (executor: CommandExec) => this.executor = executor
-    setTabCompleter = (tabCompleter: TabCompleter) => this.tabCompleter = tabCompleter
-    toString = () => `SpringCommand(${this.name})`
-}

packages/spring/src/internal/scanner/mysql-scanner.ts

@@ -1,48 +0,0 @@
-import { plugin, database } from '@ccms/api'
-import { DataBaseManager } from '@ccms/database'
-import { provideSingleton, inject } from '@ccms/container'
-
-import * as fs from '@ccms/common/dist/fs'
-
-interface MySQLPlugin {
-    name: string
-    source: string
-}
-
-@provideSingleton(plugin.PluginScanner)
-export class MySQLScanner implements plugin.PluginScanner {
-    type: string = "mysql"
-
-    private cacheDir = 'mysql-plugin-cache'
-    private cacheFileMap: Map<string, MySQLPlugin> = new Map()
-    private target: string
-
-    @inject(database.DataBaseManager)
-    private databaseManager: DataBaseManager
-
-    scan(target: any): plugin.PluginLoadMetadata[] {
-        this.target = target
-        let plugins = this.databaseManager.getMainDatabase().query<MySQLPlugin>(`SELECT name FROM ${this.target} WHERE LENGTH(source) != 0 AND deleted = 0`)
-        return plugins.map(p => this.read(p))
-    }
-    read(mysqlPlugin: MySQLPlugin): plugin.PluginLoadMetadata {
-        // if invoke this function from loadFromFile mysqlPlugin is a string need read from cache
-        if (typeof mysqlPlugin == "string") {
-            if (!this.cacheFileMap.has(mysqlPlugin)) { throw new Error(`this file ${mysqlPlugin} is not read from mysql-scanner. can't reload from this scanner!`) }
-            mysqlPlugin = this.cacheFileMap.get(mysqlPlugin)
-        }
-        let cacheFile = fs.concat(root, this.cacheDir, `${mysqlPlugin.name}.js`)
-        this.cacheFileMap.set(cacheFile, mysqlPlugin)
-        return { name: mysqlPlugin.name, file: cacheFile, type: this.type, mysqlPlugin, scanner: this }
-    }
-    load(metadata: plugin.PluginLoadMetadata) {
-        if (metadata.type !== this.type) { return }
-        var plugin: any = this.databaseManager.getMainDatabase().query<MySQLPlugin>(`SELECT source FROM ${this.target} WHERE name = ? AND deleted = 0`, metadata.name)
-        if (plugin.length == 0) { throw new Error(`[MySQLScanner] plugin ${metadata.name} not found at mysql database...`) }; plugin = plugin[0]
-        if (!plugin.source) { throw new Error(`[MySQLScanner] plugin ${metadata.name} source can\'t be undefiend or empty...`) }
-        base.save(metadata.file, plugin.source)
-        //@ts-ignore
-        metadata.instance = require(metadata.file, { cache: false })
-        return metadata
-    }
-}

packages/spring/src/server.ts

@@ -1,43 +0,0 @@
-import { constants, server } from '@ccms/api'
-import { provideSingleton, postConstruct, Autowired, Container, ContainerInstance } from '@ccms/container'
-import { CommandMap } from './internal/command'
-
-@provideSingleton(server.Server)
-export class SpringServer extends server.Server {
-    @Autowired(ContainerInstance)
-    private container: Container
-    @Autowired()
-    private commandMap: CommandMap
-
-    private nettyPipeline = base.getInstance().getAutowireCapableBeanFactory()
-    private rootLogger = Packages.org.slf4j.LoggerFactory.getLogger("root") || global.logger
-
-    @postConstruct()
-    initialize() {
-        this.container.bind(constants.ServiceIdentifier.NettyPipeline).toConstantValue(this.nettyPipeline)
-        this.container.bind(constants.ServiceIdentifier.RootLogger).toConstantValue(this.rootLogger)
-    }
-
-    getVersion(): string {
-        return "SpringFramework"
-    }
-    getConsoleSender() {
-        return {
-            name: 'CONSOLE',
-            sendMessage: (message: string) => console.console(message)
-        }
-    }
-    dispatchCommand(sender: any, command: string): boolean {
-        let cmd_args = command.split(" ")
-        return this.commandMap.dispatch(sender, cmd_args.shift(), cmd_args || [])
-    }
-    dispatchConsoleCommand(command: string): boolean {
-        return this.dispatchCommand(this.getConsoleSender(), command)
-    }
-    getNettyPipeline() {
-        return this.nettyPipeline
-    }
-    getRootLogger() {
-        return this.rootLogger
-    }
-}

packages/spring/src/task.ts

@@ -1,95 +0,0 @@
-import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container'
-import thread_pool from '@ccms/common/dist/thread-pool'
-
-const AtomicBoolean = Java.type("java.util.concurrent.atomic.AtomicBoolean")
-const Thread = Java.type('java.lang.Thread')
-
-@provideSingleton(task.TaskManager)
-export class SpringTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
-
-    private tasks: { [s: string]: task.Cancelable }
-    private executor: java.util.concurrent.ThreadPoolExecutor
-
-    constructor() {
-        super()
-        this.tasks = {}
-        this.executor = thread_pool.create({
-            groupName: '@ccms/spring'
-        })
-    }
-
-    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-        return new SpringTask(owner, func, id, this)
-    }
-    callSyncMethod(func: Function): any {
-        return func()
-    }
-    disable0() {
-        Object.values(this.tasks).forEach((task) => task?.cancel())
-        this.executor.shutdown()
-    }
-    nextId() {
-        return this.taskId.incrementAndGet()
-    }
-    submit(id: number, task: SpringTask, func: Function) {
-        this.tasks[id] = task
-        this.executor.execute(func as any)
-    }
-    cancel(id: number) {
-        delete this.tasks[id]
-    }
-}
-
-export class SpringTask extends task.Task {
-    private id: number
-    private taskManager: SpringTaskManager
-    private running = new AtomicBoolean(true)
-
-    constructor(owner: plugin.Plugin, func: Function, id: number, taskManager: SpringTaskManager) {
-        super(owner, func, id)
-        this.id = taskManager.nextId()
-        this.taskManager = taskManager
-    }
-
-    run(...args: any[]) {
-        if (this.laterTime > 0) {
-            try {
-                Thread.sleep(this.laterTime)
-            } catch (ex: any) {
-                Thread.currentThread().interrupt()
-            }
-        }
-        while (this.running.get()) {
-            try {
-                this.func(...args)
-            } catch (ex: any) {
-                console.error("Task exec error:", ex)
-                console.ex(ex)
-            }
-            // If we have a interval of 0 or less, only run once
-            if (this.interval <= 0) { break }
-            try {
-                Thread.sleep(this.interval)
-            } catch (ex: any) {
-                Thread.currentThread().interrupt()
-            }
-        }
-        this.cancel()
-    }
-
-    cancel0() {
-        var wasRunning = this.running.getAndSet(false)
-        if (wasRunning) {
-            this.taskManager.cancel(this.id)
-            return true
-        }
-        return false
-    }
-
-    submit0(...args: any[]) {
-        this.taskManager.submit(this.id, this, () => this.run(...args))
-    }
-}

packages/spring/tsconfig.json

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

packages/web/.npmignore

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

packages/web/package.json

@@ -1,35 +0,0 @@
-{
-    "name": "@ccms/web",
-    "version": "0.28.0-beta.2",
-    "description": "MiaoScript web 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/jdk": "^0.0.3",
-        "@javatypes/spring-beans": "^0.0.3",
-        "@javatypes/spring-core": "^0.0.3",
-        "@javatypes/spring-web": "^0.0.3",
-        "@javatypes/tomcat": "^0.0.3",
-        "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
-        "typescript": "^4.9.5"
-    },
-    "dependencies": {
-        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.2"
-    }
-}

packages/web/src/constants.ts

@@ -1,16 +0,0 @@
-export const WebProxyBeanName = 'webServerProxy'
-export const FilterProxyBeanName = 'webFilterProxy'
-export const METADATA_KEY = {
-    Controller: Symbol("@ccms/web:Controller"),
-    Action: Symbol("@ccms/web:Action"),
-    Param: Symbol("@ccms/web:Param"),
-    Middleware: Symbol("@ccms/web:Middleware"),
-}
-export enum PARAM_TYPE {
-    QUERY = 'QUERY',
-    BODY = 'BODY',
-    HEADER = 'HEADER',
-    COOKIE = 'COOKIE',
-    REQUEST = 'REQUEST',
-    RESPONSE = 'RESPONSE',
-}

packages/web/src/decorators/index.ts

@@ -1,86 +0,0 @@
-import { plugin } from '@ccms/api'
-import { decorate, injectable, getContainer } from "@ccms/container"
-
-import { METADATA_KEY, PARAM_TYPE } from '../constants'
-import { interfaces } from "../interfaces"
-import { addControllerMetadata, addControllerAction, addActionParam, getControllerMetadata } from "./utils"
-
-export const Controllers = (...controllers: any[]) => {
-    return (target: any, propertyKey: string) => {
-        for (const controller of controllers) {
-            addControllerMetadata(getControllerMetadata(controller), target)
-        }
-    }
-}
-
-export const Controller = (metadata?: string | interfaces.ControllerMetadata) => {
-    return (target: any) => {
-        if (!metadata) { metadata = target.name.toLowerCase().replace('controller', '') }
-        if (typeof metadata === "string") { metadata = { path: metadata } }
-        metadata.target = target
-        metadata.name = metadata.name || target.name
-        metadata.path = metadata.path ?? `/${metadata}`
-        metadata.path = metadata.path.startsWith('/') ? metadata.path : `/${metadata.path}`
-        decorate(injectable(), target)
-        Reflect.defineMetadata(METADATA_KEY.Controller, metadata, target)
-        addControllerMetadata(metadata)
-    }
-}
-
-function action(method: interfaces.Method) {
-    return (metadata?: string | interfaces.ActionMetadata) => {
-        return (target: any, propertyKey: string) => {
-            if (!metadata) { metadata = propertyKey.toLowerCase() }
-            if (typeof metadata === "string") { metadata = { path: metadata } }
-            metadata.path = metadata.path ?? `/${propertyKey}`
-            metadata.path = metadata.path.startsWith('/') ? metadata.path : `/${metadata.path}`
-            metadata.method = method
-            metadata.executor = propertyKey
-            Reflect.defineMetadata(METADATA_KEY.Action, metadata, target[propertyKey])
-            addControllerAction(target, propertyKey)
-        }
-    }
-}
-export const Action = action('ALL')
-export const Get = action('GET')
-export const Post = action('POST')
-export const Put = action('PUT')
-export const Patch = action('PATCH')
-export const Head = action('HEAD')
-export const Delete = action('DELETE')
-
-function param(type: PARAM_TYPE) {
-    return (metadata?: string | interfaces.ParamMetadata) => {
-        return (target: any, propertyKey: string, index: number) => {
-            if (!metadata) { metadata = `${propertyKey}-${index}` }
-            if (typeof metadata === "string") { metadata = { name: metadata } }
-            metadata.type = type
-            metadata.index = index
-            metadata.paramtype = Reflect.getMetadata("design:paramtypes", target, propertyKey)[index]
-            addActionParam(target, propertyKey, metadata)
-        }
-    }
-}
-export const Request = param(PARAM_TYPE.REQUEST)
-export const Response = param(PARAM_TYPE.RESPONSE)
-export const Header = param(PARAM_TYPE.HEADER)
-export const Cookie = param(PARAM_TYPE.COOKIE)
-export const Query = param(PARAM_TYPE.QUERY)
-export const Param = param(PARAM_TYPE.QUERY)
-export const Body = param(PARAM_TYPE.BODY)
-
-function Middleware() {
-    return (metadata?: string | interfaces.ActionMetadata) => {
-        return (target: any, propertyKey: string) => {
-            if (!metadata) { metadata = propertyKey.toLowerCase() }
-            if (typeof metadata === "string") { metadata = { path: metadata } }
-            metadata.path = metadata.path ?? `/${propertyKey}`
-            metadata.path = metadata.path.startsWith('/') ? metadata.path : `/${metadata.path}`
-            metadata.executor = propertyKey
-            Reflect.defineMetadata(METADATA_KEY.Action, metadata, target[propertyKey])
-            addControllerAction(target, propertyKey)
-        }
-    }
-}
-
-export * from './utils'

packages/web/src/decorators/utils.ts

@@ -1,29 +0,0 @@
-import { interfaces } from '../interfaces'
-import { METADATA_KEY } from '../constants'
-
-export function getControllerMetadatas(target: any = Reflect): Map<string, interfaces.ControllerMetadata> {
-    return Reflect.getMetadata(METADATA_KEY.Controller, target) || new Map<string, interfaces.ControllerMetadata>()
-}
-export function addControllerMetadata(metadata: interfaces.ControllerMetadata, target: any = Reflect) {
-    let metadatas = getControllerMetadatas(target)
-    metadatas.set(metadata.name, metadata)
-    Reflect.defineMetadata(METADATA_KEY.Controller, metadatas, target)
-}
-export function getControllerActions(target: any): string[] {
-    return Reflect.getMetadata(METADATA_KEY.Action, target.constructor) || []
-}
-export function addControllerAction(target: any, propertyKey: string) {
-    Reflect.defineMetadata(METADATA_KEY.Action, [propertyKey, ...getControllerActions(target)], target.constructor)
-}
-export function getControllerMetadata(target: any): interfaces.ControllerMetadata {
-    return Reflect.getMetadata(METADATA_KEY.Controller, target)
-}
-export function getActionMetadata(target: any, propertyKey: string): interfaces.ActionMetadata {
-    return Reflect.getMetadata(METADATA_KEY.Action, target[propertyKey])
-}
-export function getActionParams(target: any, propertyKey: string): interfaces.ParamMetadata[] {
-    return Reflect.getMetadata(METADATA_KEY.Param, target[propertyKey]) || []
-}
-export function addActionParam(target: any, propertyKey: string, metadata: interfaces.ParamMetadata) {
-    Reflect.defineMetadata(METADATA_KEY.Param, [metadata, ...getActionParams(target, propertyKey)], target[propertyKey])
-}