v0.19.5

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

.gitignore

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

.npmignore

@@ -1,4 +1,3 @@
-src
 test
 typings
 bundled
@@ -23,4 +22,3 @@ wallaby.js
 type_definitions
 tsconfig.tsbuildinfo
 *.tsbuildinfo
-.rollup.cache

lerna.json

@@ -1,5 +1,6 @@
 {
-  "version": "0.27.4",
+    "version": "0.19.5",
+    "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [
         "packages/*"
@@ -7,9 +8,10 @@
     "command": {
         "run": {
             "stream": true
-    }
         },
-  "publishConfig": {
+        "publish": {
-    "access": "public"
+            "access": "public",
+            "registry": "https://repo.yumc.pw/repository/npm-hosted/"
+        }
     }
 }

package.json

@@ -10,19 +10,15 @@
         "clean": "lerna run clean",
         "watch": "lerna run watch --parallel",
         "build": "lerna run build",
-        "ug": "yarn upgrade-interactive",
+        "ug": "yarn upgrade-interactive --latest",
         "np": "./script/push.sh",
-        "lsp": "npm login -scope=@ccms",
+        "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
-        "lp": "lerna publish --verify-access --force-publish",
+        "lp": "lerna publish --registry https://registry.npmjs.org"
-        "lpb": "lerna publish --preid beta --dist-tag beta --verify-access --force-publish",
-        "lpc": "lerna publish --canary --preid beta --pre-dist-tag beta --verify-access --force-publish",
-        "lpf": "lerna publish from-package --yes",
-        "sync": "./script/sync.sh"
     },
     "workspaces": [
         "packages/*"
     ],
     "devDependencies": {
-        "lerna": "^7.1.4"
+        "lerna": "^4.0.0"
     }
 }

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,17 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "@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",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4",
+        "@ccms/container": "^0.19.0",
-        "@ccms/polyfill": "^0.27.4",
+        "@ccms/polyfill": "^0.19.0",
         "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",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/api/src/console.ts

@@ -5,7 +5,7 @@ import * as base64 from 'base64-js'
 const Arrays = Java.type('java.util.Arrays')
 const Level = Java.type('java.util.logging.Level')
 const Paths = Java.type('java.nio.file.Paths')
-const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.internal.dynalink.', 'jdk.nashorn.', 'org.openjdk.nashorn', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
+const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'org.openjdk.nashorn', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
 
 enum LogLevel {
     ALL,
@@ -18,114 +18,12 @@ enum LogLevel {
     OFF
 }
 
-const sourceMaps: { [key: string]: SourceMapBuilder } = {}
-const sourceFileMaps: { [key: string]: string } = {}
-
-global.setGlobal('MiaoScriptSourceMaps', sourceMaps)
-global.setGlobal('MiaoScriptSourceFileMaps', sourceFileMaps)
-
-export namespace jsconsole {
-    export function readSourceMap(fileName: string, lineNumber: any) {
-        try {
-            if (fileName.endsWith('js') || fileName.endsWith('ms')) {
-                if (sourceMaps[fileName] === undefined) {
-                    sourceMaps[fileName] = null
-                    let sourceLine = base.read(fileName).split('\n')
-                    let lastLine = sourceLine[sourceLine.length - 1] || sourceLine[sourceLine.length - 2]
-                    // lastLine is similar //# sourceMappingURL=data:application/json;base64,
-                    if (lastLine.startsWith('//# sourceMappingURL=')) {
-                        let sourceContent = null
-                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1]
-                        if (sourceMappingURL.startsWith('data:application/json;base64,')) {
-                            sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
-                        } else if (sourceMappingURL.startsWith('http://') || sourceMappingURL.startsWith('https://')) {
-                            // TODO
-                        } else {
-                            let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile()
-                            if (file.exists()) {
-                                sourceContent = base.read(file)
-                                sourceFileMaps[fileName] = file.getCanonicalPath()
-                            } else if (global.debug) {
-                                console.debug('readSourceMap can\'t found', fileName, 'source map file', sourceMappingURL)
-                            }
-                        }
-                        if (sourceContent) {
-                            sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
-                        }
-                    }
-                }
-                if (sourceMaps[fileName]) {
-                    let sourceMapping = sourceMaps[fileName].getSource(lineNumber, 25, true, true)
-                    if (sourceMapping) {
-                        fileName = Paths.get(fileName, '..', sourceMapping.sourcePath).toFile().getCanonicalPath()
-                        lineNumber = sourceMapping.mapping.sourceLine
-                    }
-                }
-            }
-        } catch (error: any) {
-            console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
-            if (global.debug) {
-                console.ex(error)
-            }
-        }
-        return {
-            fileName,
-            lineNumber
-        }
-    }
-
-    export function getStackTrace(ex: Error, color: boolean = true): string[] {
-        if (!ex) return []
-        let stack = ex.getStackTrace()
-        let cache = [(color ? '§c' : '') + ex]
-        //@ts-ignore
-        if (stack.class) {
-            stack = Arrays.asList(stack)
-        }
-        stack.forEach(trace => {
-            if (!trace.fileName || trace.fileName.startsWith('jar:file:') || trace.fileName.startsWith('file:')) { return }
-            if (trace.className.startsWith('<')) {
-                let { fileName, lineNumber } = readSourceMap(trace.fileName, trace.lineNumber)
-                if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
-                if (color) {
-                    cache.push(`    §e->§c ${fileName}:${lineNumber}(${trace.lineNumber}) => §4${trace.methodName}`)
-                } else {
-                    cache.push(`    -> ${fileName}:${lineNumber}(${trace.lineNumber}) => ${trace.methodName}`)
-                }
-            } else {
-                let className = trace.className
-                var fileName = trace.fileName as string
-                var lineNumber = trace.lineNumber
-                if (className.startsWith('jdk.nashorn.internal.scripts') || className.startsWith('org.openjdk.nashorn.internal.scripts')) {
-                    className = className.substr(className.lastIndexOf('$') + 1)
-                    var { fileName, lineNumber } = readSourceMap(fileName, lineNumber)
-                    if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
-                } else {
-                    if (!global.debug) {
-                        for (let prefix in ignoreLogPrefix) {
-                            if (className.startsWith(ignoreLogPrefix[prefix])) {
-                                return
-                            }
-                        }
-                    } else if (className.startsWith('jdk.nashorn.internal.') || className.startsWith('org.openjdk.nashorn.internal.')) {
-                        return
-                    }
-                }
-                if (color) {
-                    cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`)
-                } else {
-                    cache.push(`    -> ${className}.${trace.methodName}(${fileName}:${lineNumber})`)
-                }
-            }
-        })
-        return cache
-    }
-}
-
 export class MiaoScriptConsole implements Console {
     Console: any
     memory: any
 
+    private static sourceMaps: { [key: string]: SourceMapBuilder } = {}
+    private static sourceFileMaps: { [key: string]: string } = {}
     private _name: string = ''
     private _level: LogLevel = LogLevel.INFO
 
@@ -194,8 +92,91 @@ export class MiaoScriptConsole implements Console {
     ex(ex: Error) {
         this.stack(ex).forEach(line => this.console(line))
     }
+    readSourceMap(fileName: string, lineNumber: any) {
+        try {
+            if (fileName.endsWith('js')) {
+                if (MiaoScriptConsole.sourceMaps[fileName] === undefined) {
+                    MiaoScriptConsole.sourceMaps[fileName] = null
+                    let sourceLine = base.read(fileName).split('\n')
+                    let lastLine = sourceLine[sourceLine.length - 1]
+                    // lastLine is similar //# sourceMappingURL=data:application/json;base64,
+                    if (lastLine.startsWith('//# sourceMappingURL=')) {
+                        let sourceContent = null
+                        let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1]
+                        if (sourceMappingURL.startsWith('data:application/json;base64,')) {
+                            sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
+                        } else if (sourceMappingURL.startsWith('http://') || sourceMappingURL.startsWith('https://')) {
+                            // TODO
+                        } else {
+                            let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile()
+                            if (file.exists()) { sourceContent = base.read(file) }
+                        }
+                        if (sourceContent) {
+                            MiaoScriptConsole.sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
+                            MiaoScriptConsole.sourceFileMaps[fileName] = Paths.get(fileName, '..', MiaoScriptConsole.sourceMaps[fileName].sources[0]).toFile().getCanonicalPath()
+                        }
+                    }
+                }
+                if (MiaoScriptConsole.sourceMaps[fileName]) {
+                    let sourceMapping = MiaoScriptConsole.sourceMaps[fileName].getSource(lineNumber, 25, true, true)
+                    fileName = MiaoScriptConsole.sourceFileMaps[fileName]
+                    if (sourceMapping && lineNumber != sourceMapping.mapping.sourceLine) { lineNumber = sourceMapping.mapping.sourceLine }
+                }
+            }
+        } catch (error: any) {
+            console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
+            if (global.debug) {
+                console.ex(error)
+            }
+        }
+        return {
+            fileName,
+            lineNumber
+        }
+    }
     stack(ex: Error, color: boolean = true): string[] {
-        return jsconsole.getStackTrace(ex, color)
+        if (!ex) return []
+        let stack = ex.getStackTrace()
+        let cache = [(color ? '§c' : '') + ex]
+        //@ts-ignore
+        if (stack.class) {
+            stack = Arrays.asList(stack)
+        }
+        stack.forEach(trace => {
+            if (!trace.fileName || trace.fileName.startsWith('jar:file:') || trace.fileName.startsWith('file:')) { return }
+            if (trace.className.startsWith('<')) {
+                let { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
+                if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
+                if (color) {
+                    cache.push(`    §e->§c ${fileName}:${lineNumber} => §4${trace.methodName}`)
+                } else {
+                    cache.push(`    -> ${fileName}:${lineNumber} => ${trace.methodName}`)
+                }
+            } else {
+                let className = trace.className
+                var fileName = trace.fileName as string
+                var lineNumber = trace.lineNumber
+                if (className.startsWith('jdk.nashorn.internal.scripts') || className.startsWith('org.openjdk.nashorn.internal.scripts')) {
+                    className = className.substr(className.lastIndexOf('$') + 1)
+                    var { fileName, lineNumber } = this.readSourceMap(fileName, lineNumber)
+                    if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
+                } else {
+                    if (!global.debug) {
+                        for (let prefix in ignoreLogPrefix) {
+                            if (className.startsWith(ignoreLogPrefix[prefix])) {
+                                return
+                            }
+                        }
+                    }
+                }
+                if (color) {
+                    cache.push(`    §e->§c ${className}.${trace.methodName}(§4${fileName}:${lineNumber}§c)`)
+                } else {
+                    cache.push(`    -> ${className}.${trace.methodName}(${fileName}:${lineNumber})`)
+                }
+            }
+        })
+        return cache
     }
     assert(value: any, message?: string, ...optionalParams: any[]): void {
         throw new Error("Method not implemented.")

packages/api/src/constants.ts

@@ -11,21 +11,10 @@ export namespace constants {
     }
     export namespace Reflect {
         export const Method = {
-            getServerConnection: [
+            getServerConnection: [/*spigot 1.8.8*/'aq',/*spigot 1.12.2*/ 'an', /*spigot 1.14.4+*/'getServerConnection', /*catserver 1.12.2*/'func_147137_ag']
-                /*spigot 1.8.8*/'aq',
-                /*spigot 1.12.2*/ 'an',
-                /*spigot 1.14.4+*/'getServerConnection',
-                /*spigot 1.19+*/'ad',
-                /*catserver 1.12.2*/'func_147137_ag'
-            ]
         }
         export const Field = {
-            listeningChannels: [
+            listeningChannels: [/*spigot 1.8.8-1.12.2*/'g', /*spigot 1.14.4*/'f', /*spigot 1.15.2+*/'listeningChannels', /*catserver 1.12.2*/'field_151274_e']
-                /*spigot 1.8.8-1.12.2*/'g',
-                /*spigot 1.14.4*/'f',
-                /*spigot 1.15.2+*/'listeningChannels',
-                /*catserver 1.12.2*/'field_151274_e'
-            ]
         }
     }
     export enum ServerType {

packages/api/src/database.ts

@@ -1,56 +1,5 @@
-import { injectable } from "@ccms/container"
-
 export namespace database {
-    export const DataSource = Symbol("DataSource")
+    export const DataBaseManager = Symbol("DataBaseManager");
-    /**
+    export const DataSource = Symbol("DataSource");
-     * 数据库配置
+    export const DataBase = Symbol("DataBase");
-     */
-    export interface DataBaseConfig {
-        /**
-         * 数据库类型
-         */
-        type: 'h2' | 'mysql' | 'mongodb' | 'sqlite' | 'postgres' | 'redis'
-        /**
-         * 数据库连接串
-         */
-        url: string | javax.sql.DataSource
-        /**
-         * 数据库驱动
-         */
-        driverClassName?: string
-        /**
-         * 用户名
-         */
-        username?: string
-        /**
-         * 密码
-         */
-        password?: string
-        /**
-         * 链接属性
-         */
-        properties?: { [key: string]: any }
-        /**
-         * 调试模式
-         */
-        debug?: boolean
-    }
-
-    @injectable()
-    export abstract class DataBaseManager {
-        abstract setMainDatabase(mainDatabase: DataBase): void
-        abstract getMainDatabase(): DataBase
-        abstract createDatabase(name: string, config: DataBaseConfig): DataBase
-        abstract removeDatabase(name: string): boolean
-        abstract getDatabase(name: string): DataBase
-        abstract startWebManager(...args: string[])
-        abstract stopWebManager()
-        abstract shutdown()
-    }
-    @injectable()
-    export abstract class DataBase {
-        abstract query<T>(sql: string, ...args: any[]): Array<T>
-        abstract update(sql: string, ...args: any[]): number
-        abstract execute(sql: string): void
-    }
 }

packages/api/src/event.ts

@@ -25,8 +25,7 @@ export namespace event {
         public EventPriority = EventPriority;
 
         private mapEvent = [];
-        private pluginEventMap = [];
+        private listenerMap = [];
-        private cacheSlowEventKey = {};
 
         protected baseEventDir = '';
 
@@ -93,24 +92,18 @@ export namespace event {
             return eventCls
         }
 
-        /**
+        execute(name, exec, eventCls) {
-         * 创建命令执行器
-         * @param name 插件名称
-         * @param exec 执行方法
-         * @param eventCls 事件类
-         * @returns
-         */
-        createExecute(name, exec, eventCls) {
             return (...args: any[]) => {
-                let event = args[args.length - 1]
                 try {
-                    if (!eventCls.isAssignableFrom(event.getClass())) { return }
+                    let event = args[args.length - 1]
-                    let time = Date.now(); exec(event); let cost = Date.now() - time
+                    if (eventCls.isAssignableFrom(event.getClass())) {
-                    if (cost > global.ScriptSlowExecuteTime && !event.async) {
+                        let time = Date.now()
-                        let eventKey = `${name}-${this.class2Name(eventCls)}`
+                        exec(event)
-                        if (!this.cacheSlowEventKey[eventKey]) { return this.cacheSlowEventKey[eventKey] = cost }
+                        let cost = Date.now() - time
+                        if (cost > global.ScriptSlowExecuteTime) {
                             console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
                         }
+                    }
                 } catch (ex: any) {
                     console.i18n("ms.api.event.execute.error", { name, event: this.class2Name(eventCls), ex })
                     console.ex(ex)
@@ -120,11 +113,11 @@ export namespace event {
 
         /**
         * 添加事件监听
-        * @param plugin {any} 插件
+        * @param plugin {any}
-        * @param event {string} 事件名称
+        * @param event {string}
-        * @param exec {function} 事件执行器
+        * @param exec {function}
-        * @param priority {string} [LOWEST,LOW,NORMAL,HIGH,HIGHEST,MONITOR] 优先级
+        * @param priority {string} [LOWEST,LOW,NORMAL,HIGH,HIGHEST,MONITOR]
-        * @param ignoreCancel 是否忽略已取消事件
+        * @param ignoreCancel
         */
         listen(plugin: any, event: string, exec: (event: any) => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) {
             if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"))
@@ -140,33 +133,19 @@ export namespace event {
             // @ts-ignore
             let executor = exec.name || exec.executor || '[anonymous]'
             // noinspection JSUnusedGlobalSymbols
-            let listener = this.register(
+            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel)
-                eventCls,
+            var listenerMap = this.listenerMap
-                this.createExecute(name, exec, eventCls),
-                priority,
-                ignoreCancel
-            )
             // add to cache Be used for close plugin to close event
-            if (!this.pluginEventMap[name]) this.pluginEventMap[name] = []
+            if (!listenerMap[name]) listenerMap[name] = []
-            let off = () => {
+            var off = () => {
                 if (off['offed']) return
                 off['offed'] = true
                 this.unregister(eventCls, listener)
-                console.debug(i18n.translate("ms.api.event.unregister", {
+                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: executor }))
-                    name,
-                    event: this.class2Name(eventCls),
-                    exec: executor
-                }))
             }
-            this.pluginEventMap[name].push(off)
+            listenerMap[name].push(off)
             // noinspection JSUnresolvedVariable
-            console.debug(i18n.translate("ms.api.event.register", {
+            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: executor }))
-                name,
-                event: this.class2Name(eventCls),
-                exec: executor,
-                priority,
-                ignore: ignoreCancel
-            }))
             return off
         }
 
@@ -175,10 +154,10 @@ export namespace event {
          * @param plugin 插件
          */
         disable(plugin: any) {
-            var eventCache = this.pluginEventMap[plugin.description.name]
+            var eventCache = this.listenerMap[plugin.description.name]
             if (eventCache) {
-                eventCache.forEach((off: () => any) => off())
+                eventCache.forEach(off => off())
-                delete this.pluginEventMap[plugin.description.name]
+                delete this.listenerMap[plugin.description.name]
             }
         }
 

packages/api/src/index.ts

@@ -4,13 +4,11 @@ export * from './web'
 export * from './amqp'
 export * from './chat'
 export * from './task'
-export * from './item'
 export * from './event'
 export * from './proxy'
 export * from './plugin'
 export * from './server'
 export * from './console'
-export { jsconsole as console } from './console'
 export * from './channel'
 export * from './command'
 export * from './database'

packages/api/src/item.ts

@@ -1,20 +0,0 @@
-import { injectable } from '@ccms/container'
-
-export namespace item {
-    @injectable()
-    export abstract class Item {
-        abstract builder(): ItemBuilder
-        abstract toJson(item: any): string
-        abstract fromJson(json: string): any
-    }
-    export interface ItemBuilder {
-        from(item: any): ItemBuilder
-        create(type: string | number): ItemBuilder
-        name(name: string): ItemBuilder
-        lore(...lores: string[]): ItemBuilder
-        amount(amount: number): ItemBuilder
-        durability(durability: number): ItemBuilder
-        clone(): any
-        build(): any
-    }
-}

packages/api/src/particle.ts

@@ -6,12 +6,6 @@ const UUID = Java.type('java.util.UUID')
 const Math = Java.type('java.lang.Math')
 
 export namespace particle {
-    @injectable()
-    export abstract class ParticleSpawner {
-        abstract spawn(location: any, particle: Particle)
-        abstract spawnToPlayer(player: any, location: any, particle: Particle)
-    }
-
     /**
      * 表示一个特效对象
      *
@@ -29,11 +23,6 @@ export namespace particle {
         private extra: number = 0;
         private data: Object = null;
 
-        /**
-         * Only Show To Player
-         */
-        private player: any
-
         constructor() {
             this.uuid = UUID.randomUUID().toString()
         }
@@ -116,15 +105,6 @@ export namespace particle {
             return this
         }
 
-        getPlayer() {
-            return this.player
-        }
-
-        setPlayer(player) {
-            this.player = player
-            return this
-        }
-
         /**
          * 通过给定一个坐标就可以使用已经指定的参数来播放粒子
          *
@@ -132,14 +112,9 @@ export namespace particle {
          */
         spawn(location: any) {
             if (!this.spawner) throw new Error(`particle ${this.uuid} not set spawner can't spawn!`)
-            if (this.player) {
-                this.spawner.spawnToPlayer(this.player, location, this)
-            } else {
             this.spawner.spawn(location, this)
         }
     }
-    }
-
     /**
      * 表示一条线
      *
@@ -183,7 +158,8 @@ export namespace particle {
 
         show() {
             for (let i = 0; i < this.length; i += this.step) {
-                this.spawn(this.start.clone().add(this.vector.clone().multiply(i)))
+                let vectorTemp = this.vector.clone().multiply(i)
+                this.spawn(this.start.clone().add(vectorTemp))
             }
         }
 
@@ -258,6 +234,15 @@ export namespace particle {
             this.length = this.vector.length()
             this.vector.normalize()
         }
+
+        public static buildLine(locA: any, locB: any, step: number, particle: any) {
+            let vectorAB = locB.clone().subtract(locA).toVector()
+            let vectorLength = vectorAB.length()
+            vectorAB.normalize()
+            for (let i = 0; i < vectorLength; i += step) {
+                ParticleManager.globalSpawner.spawn(locA.clone().add(vectorAB.clone().multiply(i)), particle)
+            }
+        }
     }
     /**
      * 表示一个弧
@@ -346,10 +331,9 @@ export namespace particle {
 
     @injectable()
     export abstract class ParticleManager {
+        public static globalSpawner: ParticleSpawner = undefined
         @Autowired()
         private taskManager: task.TaskManager
-        @Autowired()
-        private particleSpawner: particle.ParticleSpawner
 
         protected taskId: java.util.concurrent.atomic.AtomicInteger
         protected cacheTasks = new Map<string, ParticleTask>()
@@ -370,10 +354,6 @@ export namespace particle {
             return this.taskManager
         }
 
-        public getParticleSpawner() {
-            return this.particleSpawner
-        }
-
         public create(particle: Particle, plugin?: plugin.Plugin) {
             let uuid = particle.getUUID()
             if (this.cacheTasks.has(uuid)) {
@@ -409,12 +389,14 @@ export namespace particle {
             }
         }
         protected create0(owner: plugin.Plugin, particle: Particle): ParticleTask {
-            particle.setSpawner(this.getParticleSpawner())
+            particle.setSpawner(this.getGlobalSpawner())
             return new ParticleTask(owner, particle, this)
         }
+        protected abstract getGlobalSpawner(): ParticleSpawner
     }
 
     export class ParticleTask {
+
         private particle: Particle
         private isAsync: boolean = false
         private interval: number = 0
@@ -504,4 +486,9 @@ export namespace particle {
             }
         }
     }
+
+    export abstract class ParticleSpawner {
+        abstract spawnParticle(location: any, particle: any, count: number)
+        abstract spawn(location: any, particle: Particle)
+    }
 }

packages/api/src/plugin.ts

@@ -20,7 +20,7 @@ export namespace plugin {
     export abstract class PluginManager {
         abstract scan(folder: string): void
         abstract build(): void
-        abstract loadFromFile(file: string, ext?: any): Plugin
+        abstract loadFromFile(file: string, ext: any): Plugin
         abstract load(...args: any[]): void
         abstract enable(...args: any[]): void
         abstract disable(...args: any[]): void
@@ -149,19 +149,7 @@ export namespace plugin {
         /**
          * 插件名称 不填默认为类名
          */
-        name: string
+        name?: string
-        /**
-         * 插件中文名称
-         */
-        cname?: string
-        /**
-         * 付费插件ID
-         */
-        pid?: number
-        /**
-         * 付费插件等级 付费插件自动注入
-         */
-        level?: number
         /**
          * 前缀
          */

packages/api/src/server.ts

@@ -29,7 +29,6 @@ export namespace server {
         origin: any
         [key: string]: any
     }
-
     @injectable()
     export abstract class NativePluginManager {
         list(): NativePlugin[] {
@@ -54,7 +53,6 @@ export namespace server {
             throw new Error("Method not implemented.")
         }
     }
-
     /**
      * MiaoScript Server
      */
@@ -100,7 +98,6 @@ export namespace server {
             throw new Error("Method not implemented.")
         }
     }
-
     @injectable()
     export class ServerChecker {
         @Autowired(ServerType)
@@ -119,22 +116,6 @@ export namespace server {
             }
         }
     }
-
-    @injectable()
-    export class NativePluginChecker {
-        @Autowired(NativePluginManager)
-        private nativePluginManager: NativePluginManager
-
-        check(plugins: string[]) {
-            // Not set plugins -> allow
-            if (!plugins || !plugins.length) return true
-            for (const plugin of plugins) {
-                if (!this.nativePluginManager.has(plugin)) { return false }
-            }
-            return true
-        }
-    }
-
     @injectable()
     export abstract class ReflectServer extends server.Server {
         @Autowired(ContainerInstance)
@@ -191,23 +172,13 @@ export namespace server {
         }
         protected reflectRootLogger(consoleServer: any) {
             try {
-                this.rootLogger = reflect.on(consoleServer).get('LOGGER').get()
+                this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
             } catch (error: any) {
                 if (global.debug) {
                     console.ex(error)
                 }
                 try {
-                    this.rootLogger = reflect.on(consoleServer).get(0).get()
+                    this.rootLogger = reflect.on(consoleServer).get(0).get().parent
-                } catch (error: any) {
-                    if (global.debug) {
-                        console.ex(error)
-                    }
-                }
-            }
-            if (this.rootLogger.class.name.indexOf('slf4j') !== -1) {
-                try {
-                    let LogManager = Java.type('org.apache.logging.log4j.LogManager')
-                    this.rootLogger = LogManager.getLogger('ROOT')
                 } catch (error: any) {
                     if (global.debug) {
                         console.ex(error)
@@ -218,11 +189,11 @@ export namespace server {
                 console.error('Error Logger Class: ' + this.rootLogger.class.name)
                 this.rootLogger = undefined
             }
-            if (!this.rootLogger) { console.error("Can't found rootLogger!") }
             // get root logger
             for (let index = 0; index < 5 && this.rootLogger.parent; index++) {
                 this.rootLogger = this.rootLogger.parent
             }
+            if (!this.rootLogger) { console.error("Can't found rootLogger!") }
             this.container.bind(constants.ServiceIdentifier.RootLogger).toConstantValue(this.rootLogger)
         }
     }

packages/api/src/service.ts

@@ -1,5 +0,0 @@
-export namespace service {
-    export class ServiceManager {
-        
-    }
-}

packages/api/src/task.ts

@@ -1,7 +1,5 @@
-import { EventEmitter } from 'events'
-import { injectable } from '@ccms/container'
-
 import { plugin } from './index'
+import { injectable } from '@ccms/container'
 
 const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
 
@@ -81,7 +79,7 @@ export namespace task {
     /**
      * 任务抽象
      */
-    export abstract class Task extends EventEmitter implements Cancelable {
+    export abstract class Task implements Cancelable {
         protected func: Function
         protected isAsync: boolean = false;
         protected laterTime: number = 0;
@@ -90,10 +88,7 @@ export namespace task {
         protected taskId: number
         protected innerTask: any
 
-        private cancelled: boolean = false
-
         constructor(owner: plugin.Plugin, func: Function, id: number) {
-            super()
             this.owner = owner
             this.func = func
             this.taskId = id
@@ -139,33 +134,18 @@ export namespace task {
          */
         cancel(): boolean {
             let result = this.cancel0()
-            this.finish()
+            process.emit('task.finish', this)
-            this.cancelled = true
             return result
         }
 
         protected run(...args: any[]): void {
             try {
-                this.emit('before', this)
-                if (this.cancelled) { return }
                 this.func(...args)
-                this.emit('after', this)
+                !this.interval && process.emit('task.finish', this)
-            } catch (error: any) {
+            } catch (ex: any) {
-                this.emit('error', error)
+                console.console('§4插件执行任务时发生错误', ex)
-                if (!error.processed) {
+                console.ex(ex)
-                    console.console('§4插件执行任务时发生错误', error)
-                    console.ex(error)
-                    this.cancel()
             }
-            } finally {
-                this.emit('finally', this)
-                if (!this.interval && !this.cancelled) { this.finish() }
-            }
-        }
-
-        protected finish() {
-            process.emit('task.finish', this)
-            this.emit('finish', this)
         }
 
         /**

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "@javatypes/spigot-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/bukkit/src/event.ts

@@ -2,7 +2,6 @@ import { event, plugin } from '@ccms/api'
 import { inject, provideSingleton } from '@ccms/container'
 import * as reflect from '@ccms/common/dist/reflect'
 
-const URL = Java.type('java.net.URL')
 const Bukkit = Java.type("org.bukkit.Bukkit")
 const Event = Java.type("org.bukkit.event.Event")
 const Modifier = Java.type("java.lang.reflect.Modifier")
@@ -20,15 +19,7 @@ export class BukkitEvent extends event.Event {
     }
 
     getJarFile(resource: string) {
-        try {
         return super.getJarFile('org/bukkit/Bukkit.class', Bukkit.class.classLoader)
-        } catch (error) {
-            // 兼容 LoliServer 的 Bukkit 包无法获取的问题
-            let ModList = Java.type('net.minecraftforge.fml.ModList').get()
-            let forgeFile = ModList.getModFileById("forge").getFile().getFilePath()
-            let jarPath = `jar:file:${forgeFile}!/org/bukkit/Bukkit.class`
-            return new URL(jarPath).openConnection().jarFile
-        }
     }
     isValidEvent(clazz: any): boolean {
         // 继承于 org.bukkit.event.Event

packages/bukkit/src/index.ts

@@ -4,7 +4,6 @@ import { server } from '@ccms/api'
 import { Container } from '@ccms/container'
 
 import { BukkitConsole } from './console'
-import './item'
 import './chat'
 import './task'
 import './event'

packages/bukkit/src/internal/chat.ts

@@ -6,14 +6,12 @@ let bukkitChatInvoke: BukkitChatInvoke
 abstract class BukkitChatInvoke {
     private downgrade: boolean = false
     protected RemapUtils: any
-    protected ComponentSerializer: any
 
     protected ChatSerializer: any
     protected nmsChatSerializerMethodName: string
     protected PacketPlayOutChat: any
     protected chatMessageTypes: any
     protected playerConnectionFieldName: string
-    protected playerFieldName: string
     protected sendPacketMethodName: string
 
     constructor(private nmsVersion) {
@@ -22,12 +20,12 @@ abstract class BukkitChatInvoke {
     init() {
         try {
             try {
-                this.ComponentSerializer = Java.type('net.md_5.bungee.chat.ComponentSerializer')
                 this.RemapUtils = Java.type('catserver.server.remapper.RemapUtils')
             } catch (ex: any) {
             }
             let nmsChatSerializerClass = this.getNmsChatSerializerClass()
-            this.nmsChatSerializerMethodName = this.getNmsChatSerializerMethodName(nmsChatSerializerClass)
+            let nmsChatSerializerMethod = this.remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
+            this.nmsChatSerializerMethodName = nmsChatSerializerMethod.getName()
             this.ChatSerializer = Java.type(nmsChatSerializerClass.getName())
             let packetTypeClass = this.getPacketPlayOutChatClass()
             this.PacketPlayOutChat = Java.type(packetTypeClass.getName())
@@ -39,14 +37,12 @@ abstract class BukkitChatInvoke {
                     if (nmsChatMessageTypeClass.isEnum()) {
                         this.chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
                         break
-                    } else if (nmsChatMessageTypeClass.getName() == 'int') {
-                        break
                     }
                 }
             }
             let playerConnectionField = this.getPlayerConnectionField()
             this.playerConnectionFieldName = playerConnectionField.getName()
-            this.sendPacketMethodName = this.getSendPacketMethodName(playerConnectionField.getType())
+            this.sendPacketMethodName = this.remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', this.getPacketClass()).getName()
         } catch (ex: any) {
             org.bukkit.Bukkit.getConsoleSender().sendMessage(`§6[§cMS§6][§bbukkit§6][§achat§6] §cNMS Inject Error §4${ex} §cDowngrade to Command Mode...`)
             this.downgrade = true
@@ -54,12 +50,10 @@ abstract class BukkitChatInvoke {
     }
 
     abstract getNmsChatSerializerClass()
-    abstract getNmsChatSerializerMethodName(nmsChatSerializerClass: any)
     abstract getPacketPlayOutChatClass()
     abstract getPacketPlayOutChat(sender: any, json: any, type: number)
     abstract getPlayerConnectionField()
     abstract getPacketClass()
-    abstract getSendPacketMethodName(playerConnectionClass: any)
 
     nmsCls(name: string) {
         return base.getClass(['net.minecraft.server', this.nmsVersion, name].join('.'))
@@ -89,9 +83,9 @@ abstract class BukkitChatInvoke {
         }
     }
 
-    json(sender: any, json: string) {
+    json(sender: { name: string }, json: string) {
         if (this.downgrade) {
-            return sender.spigot().sendMessage(this.ComponentSerializer.parse(json))
+            return '/tellraw ' + sender.name + ' ' + json
         } else {
             this.send(sender, json, 0)
             return false
@@ -106,13 +100,6 @@ abstract class BukkitChatInvoke {
 }
 
 class BukkitChatInvokeBase extends BukkitChatInvoke {
-    getSendPacketMethodName(playerConnectionClass: any) {
-        return this.remapMethod(playerConnectionClass, 'sendPacket', 'func_179290_a', this.getPacketClass()).getName()
-    }
-    getNmsChatSerializerMethodName(nmsChatSerializerClass: any) {
-        let nmsChatSerializerMethod = this.remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
-        return nmsChatSerializerMethod.getName()
-    }
     getPacketPlayOutChat(sender: any, json: any, type: number) {
         return new this.PacketPlayOutChat(this.ChatSerializer[this.nmsChatSerializerMethodName](json), type)
     }
@@ -161,35 +148,18 @@ class BukkitChatInvoke_1_17_1 extends BukkitChatInvoke_1_16_5 {
         return base.getClass('net.minecraft.network.protocol.Packet')
     }
 }
-class BukkitChatInvoke_1_18_2 extends BukkitChatInvoke_1_17_1 {
-    getSendPacketMethodName(playerConnectionClass: any) {
-        return playerConnectionClass.getMethod('a', this.getPacketClass()).getName()
-    }
-}
-class BukkitChatInvoke_1_19 extends BukkitChatInvoke_1_18_2 {
-    getPacketPlayOutChatClass() {
-        return base.getClass('net.minecraft.network.protocol.game.ClientboundSystemChatPacket')
-    }
-    getPacketPlayOutChat(sender: any, json: any, type: number) {
-        return new this.PacketPlayOutChat(this.ChatSerializer[this.nmsChatSerializerMethodName](json), type)
-    }
-}
 
 try {
     let Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
     // @ts-ignore
     let nmsVersion = Bukkit.getServer().class.name.split('.')[3]
     let nmsSubVersion = nmsVersion.split("_")[1]
-    if (nmsSubVersion >= 19) {
+    if (nmsSubVersion >= 8) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_19(nmsVersion)
+        bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
-    } else if (nmsSubVersion >= 18) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_18_2(nmsVersion)
-    } else if (nmsSubVersion >= 17) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_17_1(nmsVersion)
     } else if (nmsSubVersion >= 16) {
         bukkitChatInvoke = new BukkitChatInvoke_1_16_5(nmsVersion)
-    } else if (nmsSubVersion >= 8) {
+    } else if (nmsSubVersion >= 17) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
+        bukkitChatInvoke = new BukkitChatInvoke_1_17_1(nmsVersion)
     } else {
         bukkitChatInvoke = new BukkitChatInvoke_1_7_10(nmsVersion)
     }

packages/bukkit/src/item.ts

@@ -1,128 +0,0 @@
-import { item } from "@ccms/api"
-import { provideSingleton } from "@ccms/container"
-
-import { itemIds } from './internal/item'
-
-const Material: typeof org.bukkit.Material = Java.type('org.bukkit.Material')
-const ItemStack: typeof org.bukkit.inventory.ItemStack = Java.type('org.bukkit.inventory.ItemStack')
-
-@provideSingleton(item.Item)
-export class BukkitItem extends item.Item {
-    private CraftItemStack: any
-    private NBTTagCompound: any
-    private nmsSaveNBTMethodName: any
-    private MojangsonParser: any
-    private nmsItemStack: any
-    private mpParseMethodName: any
-    private nmsVersion: any
-    constructor() {
-        super()
-        this.reflect()
-    }
-    builder(): item.ItemBuilder {
-        return new BukkitItemBuilder()
-    }
-    toJson(item: any): string {
-        let nbt = new this.NBTTagCompound()
-        return this.CraftItemStack.asNMSCopy(item)[this.nmsSaveNBTMethodName](nbt).toString()
-    }
-    fromJson(json: string) {
-        return this.CraftItemStack.asBukkitCopy(new this.nmsItemStack(this.MojangsonParser[this.mpParseMethodName](json)))
-    }
-    private obcCls(name: string) {
-        return base.getClass(['org.bukkit.craftbukkit', this.nmsVersion, name].join('.'))
-    }
-    private nmsCls(name: string) {
-        return base.getClass(['net.minecraft.server', this.nmsVersion, name].join('.'))
-    }
-    private reflect() {
-        try {
-            let Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
-            // @ts-ignore
-            this.nmsVersion = Bukkit.getServer().class.name.split('.')[3]
-            let CraftItemStackClass = this.obcCls('inventory.CraftItemStack')
-            this.CraftItemStack = Java.type(CraftItemStackClass.getName())
-            // @ts-ignore
-            let asNMSCopyMethod = CraftItemStackClass.getMethod('asNMSCopy', ItemStack.class)
-            let nmsItemStackClass = asNMSCopyMethod.getReturnType()
-            this.nmsItemStack = Java.type(nmsItemStackClass.getName())
-            let nmsNBTTagCompoundClass = undefined
-            for (let method of Java.from(nmsItemStackClass.getMethods())) {
-                let rt = method.getReturnType()
-                if (method.getParameterTypes().length == 0 && "NBTTagCompound" == rt.getSimpleName()) {
-                    nmsNBTTagCompoundClass = rt
-                }
-            }
-            this.NBTTagCompound = Java.type(nmsNBTTagCompoundClass.getName())
-            for (let method of Java.from(nmsItemStackClass.getMethods())) {
-                let params = method.getParameterTypes()
-                let rt = method.getReturnType()
-                if (params.length == 1 && "NBTTagCompound" == params[0].getSimpleName() && "NBTTagCompound" == rt.getSimpleName()) {
-                    this.nmsSaveNBTMethodName = method.getName()
-                    break
-                }
-            }
-            try {
-                this.MojangsonParser = this.nmsCls('MojangsonParser').static
-            } catch (error) {
-                this.MojangsonParser = Java.type('net.minecraft.nbt.MojangsonParser')
-            }
-            for (let method of Java.from(this.MojangsonParser.class.getMethods())) {
-                let params = method.getParameterTypes()
-                let rt = method.getReturnType()
-                if (params.length == 1 && "String" == params[0].getSimpleName() && "NBTTagCompound" == rt.getSimpleName()) {
-                    this.mpParseMethodName = method.getName()
-                }
-            }
-        } catch (error: any) {
-            console.log('Bukkit 物品管理器初始化失败:', error)
-            if (global.debug) {
-                console.ex(error)
-            }
-        }
-    }
-}
-
-export class BukkitItemBuilder implements item.ItemBuilder {
-    private itemStack: org.bukkit.inventory.ItemStack
-    private itemMeta: org.bukkit.inventory.meta.ItemMeta
-
-    from(itemStack: any): item.ItemBuilder {
-        this.itemStack = itemStack
-        this.itemMeta = this.itemStack.getItemMeta()
-        return this
-    }
-    create(type: string | number): item.ItemBuilder {
-        let material = undefined
-        if (typeof type == 'number') {
-            type = itemIds[type]
-        }
-        material = Material[type] || Material[Material['LEGACY_PREFIX'] + type]
-        this.itemStack = new ItemStack(material)
-        this.itemMeta = this.itemStack.getItemMeta()
-        return this
-    }
-    name(name: string): item.ItemBuilder {
-        this.itemMeta.setDisplayName(name)
-        return this
-    }
-    lore(...lores: string[]): item.ItemBuilder {
-        this.itemMeta.setLore(lores)
-        return this
-    }
-    amount(amount: number): item.ItemBuilder {
-        this.itemStack.setAmount(amount)
-        return this
-    }
-    durability(durability: number): item.ItemBuilder {
-        this.itemStack.setDurability(durability)
-        return this
-    }
-    clone() {
-        return this.build().clone()
-    }
-    build() {
-        this.itemStack.setItemMeta(this.itemMeta)
-        return this.itemStack
-    }
-}

packages/bukkit/src/particle.ts

@@ -3,11 +3,20 @@ import { particle } from '@ccms/api'
 
 @provideSingleton(particle.ParticleManager)
 export class BukkitParticleManager extends particle.ParticleManager {
+    private globalSpawner = new BukkitParticleSpawner()
+    constructor() {
+        super()
+        particle.ParticleManager.globalSpawner = this.globalSpawner
+    }
+    protected getGlobalSpawner() {
+        return this.globalSpawner
+    }
 }
-
-@provideSingleton(particle.ParticleSpawner)
 export class BukkitParticleSpawner extends particle.ParticleSpawner {
-    spawn(location: org.bukkit.Location, particle: particle.Particle) {
+    spawnParticle(location: any, particle: any, count: number = 1) {
+        location.getWorld().spawnParticle(particle, location, count)
+    }
+    spawn(location: any, particle: particle.Particle) {
         location.getWorld().spawnParticle(
             particle.getParticle(),
             location,
@@ -19,15 +28,4 @@ export class BukkitParticleSpawner extends particle.ParticleSpawner {
             particle.getData()
         )
     }
-    spawnToPlayer(player: org.bukkit.entity.Player, location: org.bukkit.Location, particle: particle.Particle) {
-        player.spawnParticle(
-            particle.getParticle(),
-            location,
-            particle.getCount(),
-            particle.getOffsetX(),
-            particle.getOffsetY(),
-            particle.getOffsetZ(),
-            particle.getExtra(),
-            particle.getData())
-    }
 }

packages/bukkit/tsconfig.json

@@ -2,7 +2,6 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "baseUrl": "src",
-        "outDir": "dist",
+        "outDir": "dist"
-        "resolveJsonModule": true
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "@javatypes/bungee-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/client/.gitignore

@@ -0,0 +1 @@
+src/emp.ts

packages/client/package.json

@@ -0,0 +1,37 @@
+{
+    "private": true,
+    "name": "@ccms/client",
+    "version": "0.19.0",
+    "description": "MiaoScript client 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": {
+        "dev": "ts-node-dev --respawn --debounce=1500 src/index.ts",
+        "clean": "rimraf dist",
+        "watch": "tsc --watch",
+        "build": "yarn clean && tsc",
+        "start": "node dist/index.js",
+        "debug": "DEBUG=minecraft-protocol node dist/index.js",
+        "emp": "node dist/emp.js",
+        "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "dependencies": {
+        "axios": "^0.25.0",
+        "minecraft-protocol": "^1.30.0",
+        "minecraft-protocol-forge": "^1.0.0",
+        "proxy-agent": "^5.0.0"
+    },
+    "devDependencies": {
+        "@types/node": "^17.0.17",
+        "rimraf": "^3.0.2",
+        "typescript": "^4.5.5"
+    }
+}

packages/client/src/color.ts

@@ -0,0 +1,101 @@
+class MessagePart {
+    text: string
+    color: string
+    clickEvent: MessagePartEvent
+    hoverEvent: MessagePartEvent
+    translate: string
+    with: MessagePart[]
+    extra: MessagePart[]
+}
+
+class MessagePartEvent {
+    action: string
+    value: string
+}
+
+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) {
+    for (const regex in regexMap) {
+        str = str.replace(regexMap[regex], `\u001b[${regex}m`)
+    }
+    return str;
+}
+
+let jsonColorMap = {
+    "black": '0',
+    "dark_blue": '1',
+    "dark_green": '2',
+    "dark_aqua": '3',
+    "dark_red": '4',
+    "dark_purple": '5',
+    "gold": '6',
+    "gray": '7',
+    "dark_gray": '8',
+    "blue": '9',
+    "green": 'a',
+    "aqua": 'b',
+    "red": 'c',
+    "light_purple": 'd',
+    "yellow": 'e',
+    "white": 'f',
+    "obfuscated": 'k',
+    "bold": 'l',
+    "strikethrough": 'm',
+    "underline": 'n',
+    "italic": 'o',
+    "reset": 'r',
+};
+
+function json2text(json: MessagePart): string {
+    let temp = "";
+    if (json.color) {
+        temp += `§${jsonColorMap[json.color]}`
+    }
+    temp += json.text || json.translate || ''
+    if (json.extra) {
+        json.extra.forEach((ext) => {
+            temp += json2text(ext)
+        })
+    }
+    return temp += '§r'
+}
+
+function $(input: any) {
+    if (typeof input === "string") {
+        input = JSON.parse(input)
+    }
+    input = json2text(input) + '§r'
+    if (input.startsWith('§卐')) {
+        input = input.substring(2)
+    }
+    return mcColor2ANSI(input)
+}
+
+export {
+    json2text,
+    mcColor2ANSI,
+    $
+}

packages/client/src/event.ts

@@ -0,0 +1,33 @@
+import { $ } from './color'
+
+export function attachEvents(client) {
+    client.on('chat', (packet) => {
+        // Listen for chat messages and echo them back.
+        var jsonMsg = JSON.parse(packet.message)
+        console.log($(jsonMsg))
+    })
+    client.on('state', (newState, oldState) => {
+        console.log('Client Change State', oldState, 'to', newState)
+        let targetServer = process.argv[6]
+        if (newState == "play" && targetServer) {
+            setTimeout(() => {
+                client.write('chat', {
+                    message: '/server ' + targetServer
+                })
+            }, 3000)
+        }
+    })
+    client.on('update_health', (packet) => {
+        if (packet.health <= 0) {
+            console.log("Player Dead Auto Respawn...")
+            client.write('client_command', { payload: 0 })
+        } else if (packet.health > 0) {
+        }
+    })
+    client.on('kick_disconnect', (packet) => {
+        console.log($(packet.reason))
+    })
+    client.on('disconnect', (packet) => {
+        console.log($(packet.reason))
+    })
+}

packages/client/src/forge.ts

@@ -0,0 +1,14 @@
+export function attachForge(client) {
+    client.on('custom_payload', function(packet) {
+        if (packet.channel === 'FML|HS') {
+            client.write('custom_payload', {
+                channel: 'FML|HS',
+                data: Buffer.of(0x01, 0x02)
+            });
+            client.write('custom_payload', {
+                channel: 'FML|HS',
+                data: Buffer.of(0x02, 0x00)
+            });
+        }
+    });
+}

packages/client/src/index.ts

@@ -0,0 +1,124 @@
+import { createInterface } from 'readline'
+import { Client, createClient } from 'minecraft-protocol'
+
+import { attachForge } from './forge'
+import { attachEvents } from './event'
+
+let readUserInfo = process.argv[2] || 'Mr_jtb'
+let realUserInfo = readUserInfo.split(":")
+let username = realUserInfo[0]
+let password = realUserInfo[1] || ''
+let version = process.argv[3] || '1.12.2'
+let readAddress = process.argv[4] || '192.168.2.25:25565'
+let realAddress = readAddress.split(":")
+let address = realAddress[0]
+let port = parseInt(realAddress[1] || "25565")
+let client = commandLineCreateClient()
+
+function commandLineCreateClient() {
+    return createConnection(address, port, username, password)
+}
+
+function createConnection(host: string, port: number, username: string, password: string) {
+    let clientOptions: any = {
+        version,
+        host,
+        port,
+        username,
+        password,
+        // clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
+        //@ts-ignore
+        // authServer: 'https://skin.yumc.pw/api/yggdrasil/authserver',
+        // sessionServer: 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    if (clientOptions.password) {
+        clientOptions.clientToken = 'd02c7f39-2376-45da-a5a5-50e24fa8b185'
+        clientOptions.authServer = 'https://skin.yumc.pw/api/yggdrasil/authserver'
+        clientOptions.sessionServer = 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    let client = createClient(clientOptions)
+
+    attachCommon(client)
+    attachForge(client)
+    attachEvents(client)
+    return client
+}
+
+function attachCommon(client: Client) {
+    client.on('login', () => {
+        // client.registerChannel('updater', ['string', []])
+        // client.registerChannel('updater-enabled', ['string', []])
+        // client.registerChannel('dragoncore', ['string', []])
+        // client.registerChannel('dragoncore:main', ['string', []])
+        client.on('REGISTER', (array) => {
+            for (const channel of array) {
+                client.on('channel', console.log)
+            }
+        })
+        // client.on('dragoncore:main', (data) => {
+        //     console.log(data)
+        // })
+    })
+    client.on('custom_payload', (data) => {
+        console.log('custom_payload' + JSON.stringify(data))
+    })
+    client.on('error', (error) => {
+        console.log("Client Error", error)
+    })
+    client.on('end', (resone) => {
+        console.log("Client End Resone:", resone)
+        if (`${resone}` != "SocketClosed") {
+            setTimeout(() => {
+                client = commandLineCreateClient()
+            }, 500)
+        } else {
+            process.exit(0)
+        }
+    })
+}
+
+const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    completer: (line, func) => {
+        let args = line.split(' ')
+        let comp = args[args.length - 1]
+        client.once('tab_complete', (msg) => {
+            let mcts = msg.matches.filter(s => s)
+            func(null, [mcts, comp])
+        })
+        client.write('tab_complete', {
+            text: line
+        })
+    },
+    terminal: true,
+    prompt: ''
+})
+
+rl.on('line', function (line) {
+    switch (line) {
+        case "":
+            break
+        case "eval":
+            break
+        case "write":
+            break
+        case "/respawn":
+            client.write('client_command', { payload: 0 })
+            break
+        case "//reco":
+            client.end("")
+            client = commandLineCreateClient()
+            break
+        case "//quit":
+            console.info('Disconnected')
+            client.end("")
+            break
+        case "//end":
+            console.info('Forcibly ended client')
+            process.exit(0)
+        default:
+            client.write('chat', { message: line })
+    }
+    rl.prompt()
+})

packages/client/start.sh

@@ -0,0 +1,5 @@
+while :; do
+    yarn emp
+    echo 进程退出 休眠120秒!
+    sleep 120
+done

packages/common/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/common",
-    "version": "0.27.4",
+    "version": "0.19.0",
-    "description": "MiaoScript common package",
+    "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/common/src/http.ts

@@ -19,20 +19,12 @@ interface RequestConfig {
     method?: Method
     headers?: { [key: string]: string }
     params?: { [key: string]: string }
-    data?: any,
+    data?: any
-    connectTimeout?: number,
-    readTimeout?: number,
 }
 
 function request(config: RequestConfig) {
     // @ts-ignore XMLHttpRequest class only exist nashorn polyfill
     let xhr = new XMLHttpRequest()
-    if (config.connectTimeout) {
-        xhr.connectTimeout = config.connectTimeout
-    }
-    if (config.readTimeout) {
-        xhr.readTimeout = config.readTimeout
-    }
     xhr.open(config.method, config.url, false)
     for (const header in config.headers) {
         xhr.setRequestHeader(header, config.headers[header])

packages/common/src/reflect.ts

@@ -54,7 +54,6 @@ class Reflect {
             }
         }
         if (!field) throw new Error(`can't reflect field ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} from ${this.class.getName()}!`)
-        fieldCache.set(key, field)
         return accessible(field)
     }
 
@@ -130,14 +129,12 @@ function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.Str
     let field = null
     // noinspection JSUnresolvedVariable
     while (target !== JavaObject.class) {
-        console.debug(`reflect field ${name} from ${target.getName()}`)
         try {
             field = target.getDeclaredField(name)
             if (field !== null) { break }
         } catch (error: any) {
             if (target === undefined) { break }
             target = target.getSuperclass()
-            console.debug(`切换到超类: ${target.getName()}`)
         }
     }
     if (field === null) {
@@ -149,32 +146,21 @@ function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.Str
 function declaredMethod(clazz: java.lang.Class<any>, nameOrIndex: string | number, ...clazzs: java.lang.Class<any>[]): java.lang.reflect.Method {
     let key = clazz.getName() + '.' + nameOrIndex + ':' + (clazzs || []).map(c => c.getName()).join(':')
     if (methodCache.has(key)) { return methodCache.get(key) }
-    let target = clazz
     if (typeof nameOrIndex === "number") {
         methodCache.set(key, declaredMethods(clazz)[nameOrIndex])
     } else {
-        while (target !== JavaObject.class && !methodCache.has(key)) {
         try {
-                console.debug(`reflect method ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} from ${target.getName()}`)
+            methodCache.set(key, clazz.getMethod(nameOrIndex, clazzs as any))
-                try {
-                    methodCache.set(key, target.getMethod(nameOrIndex, clazzs as any))
         } catch (ex: any) {
             try {
-                        methodCache.set(key, target.getDeclaredMethod(nameOrIndex, clazzs as any))
+                methodCache.set(key, clazz.getDeclaredMethod(nameOrIndex, clazzs as any))
             } catch (ex: any) {
-                        for (const m of Java.from(declaredMethods(target))) {
+                for (const m of Java.from(declaredMethods(clazz))) {
                     if (m.getName() == nameOrIndex) {
                         methodCache.set(key, m)
                         break
                     }
                 }
-                        throw new Error(`method ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} not found.`)
-                    }
-                }
-            } catch (error) {
-                if (target === undefined) { break }
-                target = target.getSuperclass()
-                console.debug(`切换到超类: ${target.getName()}`)
             }
         }
     }

packages/common/src/tellraw.ts

@@ -17,14 +17,14 @@ class ChatMessagePart {
     }
 
     convert() {
-        return this.internal
+        return this.internal;
     }
 }
 
 class Tellraw {
     static duplicateChar = '§卐'
     static create() {
-        return new Tellraw().then(Tellraw.duplicateChar)
+        return new Tellraw().then(Tellraw.duplicateChar);
     }
 
     private cache: string = '';
@@ -32,81 +32,77 @@ class Tellraw {
 
     then(part: ChatMessagePart | string) {
         if (typeof part === "string") {
-            var newPart = new ChatMessagePart()
+            var newPart = new ChatMessagePart();
             newPart.text = part
-            this.then(newPart)
+            this.then(newPart);
-            return this
+            return this;
         }
-        var last = this.latest()
+        var last = this.latest();
         if (!last.text) {
-            last.text = part.text
+            last.text = part.text;
         } else {
-            this.parts.push(part)
+            this.parts.push(part);
         }
-        this.cache = null
+        this.cache = null;
     }
 
     text(text: string) {
-        this.latest().text = text
+        this.latest().text = text;
-        return this
+        return this;
     }
 
-    tip(texts: string) {
+    tip(text: string) {
-        return this.hover(texts)
+        this.latest().hover("show_text", text);
+        return this;
     }
 
-    hover(texts: string) {
+    item(text: string) {
-        this.latest().hover("show_text", texts)
+        this.latest().hover("show_item", text);
-        return this
+        return this;
-    }
-
-    item(item: string) {
-        this.latest().hover("show_item", item)
-        return this
     }
 
     command(command: string) {
-        this.latest().click("run_command", command)
+        this.latest().click("run_command", command);
-        return this
+        return this;
     }
 
     suggest(url: string) {
-        this.latest().click("suggest_command", url)
+        this.latest().click("suggest_command", url);
-        return this
+        return this;
     }
 
     file(path: string) {
-        this.latest().click("open_file", path)
+        this.latest().click("open_file", path);
-        return this
+        return this;
     }
 
     link(url: string) {
-        this.latest().click("open_url", url)
+        this.latest().click("open_url", url);
-        return this
+        return this;
     }
 
     latest() {
-        return this.parts[this.parts.length - 1]
+        return this.parts[this.parts.length - 1];
     }
 
     json() {
         if (!this.cache) {
-            var temp = []
+            var temp = [];
             this.parts.forEach(t => {
-                temp.push(t.convert())
+                temp.push(t.convert());
-            })
+            });
-            this.cache = JSON.stringify(temp)
+            this.cache = JSON.stringify(temp);
-            console.trace(this.cache)
+            console.trace(this.cache);
         }
-        return this.cache
+        return this.cache;
     }
 
     string() {
-        var temp = ''
+        var temp = '';
         this.parts.forEach(t => {
             temp += t.text
-        })
+        });
-        return temp
+        return temp;
     }
 }
 

packages/common/src/version.ts

@@ -1,35 +0,0 @@
-export type Version = [string, string, string]
-
-export class VersionUtils {
-    static isEqual(version: string, targetVersion: string): boolean {
-        return version == targetVersion
-    }
-    static isGreaterOrEqual(version: string, targetVersion: string): boolean {
-        const v1 = parseVersion(version)
-        const v2 = parseVersion(targetVersion)
-
-        return (
-            v1[0] > v2[0] ||
-            (v1[0] === v2[0] && v1[1] > v2[1]) ||
-            (v1[0] === v2[0] && v1[1] === v2[1] && v1[2] >= v2[2])
-        )
-    }
-    static isGreater(version: string, targetVersion: string): boolean {
-        const v1 = parseVersion(version)
-        const v2 = parseVersion(targetVersion)
-
-        return (
-            v1[0] > v2[0] ||
-            (v1[0] === v2[0] && v1[1] > v2[1]) ||
-            (v1[0] === v2[0] && v1[1] === v2[1] && v1[2] > v2[2])
-        )
-    }
-}
-
-function parseVersion(version: string = ""): Version {
-    const v: Version = ['0', '0', '0']
-
-    version.split(".").forEach((value, i) => (v[i] = value))
-
-    return v
-}

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -20,7 +20,7 @@
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/container/package.json

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

packages/container/src/decorators.ts

@@ -1,9 +1,38 @@
 import { interfaces, Container } from "inversify"
-import { _proxyGetter } from "./utils"
 
 let _container: Container
 
 const ContainerInstance = Symbol.for("@ccms/ioc:Container")
+const INJECTION = Symbol.for("INJECTION")
+
+function _proxyGetter(
+    proto: any,
+    key: string,
+    resolve: () => any,
+    doCache: boolean
+) {
+    function getter(this: object) {
+        if (doCache && !Reflect.hasMetadata(INJECTION, this, key)) {
+            Reflect.defineMetadata(INJECTION, resolve(), this, key)
+        }
+        if (Reflect.hasMetadata(INJECTION, this, key)) {
+            return Reflect.getMetadata(INJECTION, this, key)
+        } else {
+            return resolve()
+        }
+    }
+
+    function setter(this: object, newVal: any) {
+        Reflect.defineMetadata(INJECTION, newVal, this, key)
+    }
+
+    Object.defineProperty(proto, key, {
+        configurable: true,
+        enumerable: true,
+        get: getter,
+        set: setter
+    })
+}
 
 function initContainer(container: Container) {
     Reflect.defineMetadata(ContainerInstance, container, Reflect)

packages/container/src/index.ts

@@ -5,7 +5,6 @@ import { initContainer, getContainer } from './decorators'
 import { interfaces, Container, inject, named } from 'inversify'
 import { fluentProvide } from 'inversify-binding-decorators'
 import { ioc } from "./constants"
-import { _proxyGetter } from "./utils"
 
 /**
  * 注册一个命名对象
@@ -50,11 +49,9 @@ export const JavaClass = (className: string) => {
  */
 export const JSClass = (className: string) => {
     return function (target: object, propertyKey: string, index?: number) {
-        _proxyGetter(target, propertyKey, () => {
+        try { target[propertyKey] = Java.type(className); return } catch (error: any) { }
-            try { return Java.type(className) } catch (error: any) { }
+        try { target[propertyKey] = base.getClass(className).static; return } catch (error: any) { }
-            try { return base.getClass(className).static } catch (error: any) { }
         console.warn('JSClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
-        }, true)
     }
 }
 
@@ -91,59 +88,6 @@ export const Resource = (resourceName?: string | any) => {
     }
 }
 
-const DocumentBuilderFactory = Java.type('javax.xml.parsers.DocumentBuilderFactory')
-
-export const MavenDepend = (groupId: string, artifactId: string, version: string, recursion = false) => {
-    return function (target: any) {
-        loadMavenDepend(groupId, artifactId, version, recursion)
-    }
-}
-
-const loadedMavenDepend = new Set<string>()
-
-export function loadMavenDepend(groupId: string, artifactId: string, version: string, recursion = false) {
-    const key = `${groupId}:${artifactId}:${version}`
-    try {
-        if (loadedMavenDepend.has(key)) { return }
-        console.info('loading maven dependency', key)
-        let [pom, _] = base.loadMavenDepend(groupId, artifactId, version)
-        loadedMavenDepend.add(key)
-        if (recursion) {
-            let doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(pom)
-            let dependencies = doc.getElementsByTagName("dependency")
-            let size = dependencies.length
-            if (!size) { return }
-            console.debug(key, 'found', size, 'dependencies loading...')
-            for (let i = 0; i < size; i++) {
-                const dependency = dependencies.item(i)
-                const gav = dependency.getChildNodes()
-                const length = gav.length
-                const dependencyVersion = { groupId: '', artifactId: '', version: '' }
-                for (let j = 0; j < length; j++) {
-                    const prop = gav.item(j)
-                    switch (prop.getNodeName()) {
-                        case "groupId":
-                            dependencyVersion.groupId = prop.getTextContent()
-                            break
-                        case "artifactId":
-                            dependencyVersion.artifactId = prop.getTextContent()
-                            break
-                        case "version":
-                            dependencyVersion.version = prop.getTextContent()
-                            break
-                    }
-                }
-                loadMavenDepend(dependencyVersion.groupId, dependencyVersion.artifactId, dependencyVersion.version, recursion)
-            }
-        }
-    } catch (error: any) {
-        console.warn('load maven dependency', key, 'failed. Error:', error)
-        if (global.debug) {
-            console.ex(error)
-        }
-    }
-}
-
 export const reduceMetadata = (ctx: interfaces.Context): any => {
     return ctx.currentRequest.target.metadata.reduce((result, entry, index) => {
         result[entry.key] = entry.value
@@ -154,9 +98,8 @@ export const reduceMetadata = (ctx: interfaces.Context): any => {
 function initAutowired(container: Container) {
     container.bind(ioc.Autowired).toDynamicValue((ctx) => {
         var metadata: any = reduceMetadata(ctx)
-        let key = Object.prototype.toString.call(metadata.named)
+        let key = Object.toString.call(metadata.named)
         if (key === "[object Function]" || key === "[object Symbol]") { return container.get(metadata.named) }
-        console.warn('container autowired', metadata.named, 'failed. Error: illegal serviceIdentifier type', key)
         return undefined
     })
 }

packages/container/src/utils.ts

@@ -1,30 +0,0 @@
-const INJECTION = Symbol.for("INJECTION")
-
-export function _proxyGetter(
-    proto: any,
-    key: string,
-    resolve: () => any,
-    doCache: boolean
-) {
-    function getter(this: object) {
-        if (doCache && !Reflect.hasMetadata(INJECTION, this, key)) {
-            Reflect.defineMetadata(INJECTION, resolve(), this, key)
-        }
-        if (Reflect.hasMetadata(INJECTION, this, key)) {
-            return Reflect.getMetadata(INJECTION, this, key)
-        } else {
-            return resolve()
-        }
-    }
-
-    function setter(this: object, newVal: any) {
-        Reflect.defineMetadata(INJECTION, newVal, this, key)
-    }
-
-    Object.defineProperty(proto, key, {
-        configurable: true,
-        enumerable: true,
-        get: getter,
-        set: setter
-    })
-}

packages/core/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/core",
-    "version": "0.27.4",
+    "version": "0.19.5",
-    "description": "MiaoScript core package",
+    "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -20,12 +20,12 @@
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/.gitignore

@@ -1 +0,0 @@
-script

packages/core/src/exit.js

@@ -0,0 +1,4 @@
+function exit() {
+    console.debug('exit finish!')
+}
+exit()

packages/core/src/index.ts

@@ -1,15 +1,9 @@
 let containerStartTime = Date.now()
 console.i18n("ms.core.ioc.initialize", { scope: global.scope })
-import { plugin, server, task, constants, console as jsconsole } from '@ccms/api'
+import { plugin, server, task, constants } from '@ccms/api'
 import { DefaultContainer as container, provideSingleton, ContainerInstance, buildProviderModule, Autowired } from '@ccms/container'
 console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() - containerStartTime) / 1000 })
-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')
 
 @provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {
@@ -25,17 +19,8 @@ class MiaoScriptCore {
     enable() {
         process.emit('core.before.enable')
         this.loadServerConsole()
-        try {
-            MiaoScriptAPI.setPluginManager(this.pluginManager)
-        } catch (error) {
-        }
         this.loadPlugins()
         process.emit('core.after.enable')
-        console.i18n("ms.core.engine.completed", {
-            loader: base.version,
-            version: 'v' + global.ScriptEngineVersion,
-            time: (Date.now() - global.ScriptEngineStartTime) / 1000
-        })
         return () => this.disable()
     }
 
@@ -65,7 +50,14 @@ class MiaoScriptCore {
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
         process.emit('core.after.disable')
-        loadCoreScript('exit')
+        try {
+            engineLoad({
+                script: http.get("https://ms.yumc.pw/api/plugin/download/name/exit"),
+                name: 'core/exit.js'
+            })
+        } catch (error: any) {
+            console.debug(error)
+        }
         process.emit('core.before.exit')
         process.exit(0)
         console.i18n("ms.core.engine.disable.finish", {
@@ -106,35 +98,19 @@ function detectServer(): constants.ServerType {
     throw Error('Unknow Server Type...')
 }
 
-function loadCoreScript(name) {
+function initialize() {
+    process.emit('core.before.initialize')
+    global.ScriptSlowExecuteTime = 30
+    global.ScriptEngineVersion = require('../package.json').version
     try {
-        let scriptname = name + (global.debug ? '-debug' : '')
         engineLoad({
-            script: http.get(`https://mscript.yumc.pw/api/plugin/download/name/${scriptname}`),
+            script: http.get("https://ms.yumc.pw/api/plugin/download/name/initialize"),
-            name: `core/${scriptname}.js`
+            name: 'core/initialize.js'
         })
     } catch (error: any) {
-        if (global.debug) {
         console.debug(error)
-            console.ex(error)
     }
-    }
+    try {
-}
-
-function loadMiaoScriptConfig() {
-    let configFile = fs.concat(root, 'config.yml')
-    if (!fs.exists(configFile)) {
-        global.ScriptEngineConfig = base.save(configFile, yaml.dump({
-            uuid: UUID.randomUUID().toString(),
-            slow_execute: 50
-        }))
-    } else {
-        global.ScriptEngineConfig = yaml.load(base.read(configFile))
-    }
-    global.ScriptSlowExecuteTime = global.ScriptEngineConfig.slow_execute || 50
-}
-
-function createCore() {
         let corePackageStartTime = new Date().getTime()
         container.bind(ContainerInstance).toConstantValue(container)
         container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
@@ -146,7 +122,6 @@ function createCore() {
         container.bind(server.ServerType).toConstantValue(type)
         container.bind(server.ServerChecker).toSelf().inSingletonScope()
         container.bind(server.NativePluginManager).toSelf().inSingletonScope()
-    container.bind(server.NativePluginChecker).toSelf().inSingletonScope()
         process.emit('core.after.initialize.detect')
 
         process.emit('core.before.package.initialize')
@@ -156,26 +131,19 @@ function createCore() {
         container.load(buildProviderModule())
         console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
         process.emit('core.after.package.initialize')
-    return container.get<MiaoScriptCore>(MiaoScriptCore)
-}
 
-function initialize() {
+        let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-    process.emit('core.before.initialize')
+        console.i18n("ms.core.engine.completed", {
-    loadMiaoScriptConfig()
+            loader: base.version,
-    global.ScriptEngineVersion = require('../package.json').version
+            version: 'v' + global.ScriptEngineVersion,
-    global.setGlobal('loadCoreScript', loadCoreScript)
+            time: (Date.now() - global.ScriptEngineStartTime) / 1000
-    loadCoreScript('initialize')
+        })
-    try {
-        let core = createCore()
-        return VersionUtils.isGreaterOrEqual(base.version, '0.22.0') ? core : core.enable()
-    } 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()
-    } finally {
         process.emit('core.after.initialize')
+        return disable
+    } catch (error: any) {
+        console.i18n("ms.core.initialize.error", { error })
+        console.ex(error)
+        return () => console.i18n('ms.core.engine.disable.abnormal')
     }
 }
 

packages/core/src/initialize.js

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

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -21,11 +21,11 @@
     "devDependencies": {
         "@javatypes/spring-jdbc": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/database/src/database.ts

@@ -1,109 +1,88 @@
-import { database } from '@ccms/api'
+import { Model } from './model'
-import { JSClass } from '@ccms/container'
 
-const Thread = Java.type('java.lang.Thread')
+const HikariDataSource = Java.type('com.zaxxer.hikari.HikariDataSource')
-const JavaString = Java.type('java.lang.String')
+const HikariConfig = Java.type('com.zaxxer.hikari.HikariConfig')
-const Properties = Java.type('java.util.Properties')
+const JdbcTemplate = Java.type('org.springframework.jdbc.core.JdbcTemplate')
+
+/**
+ * 数据库配置
+ */
+export interface DataBaseConfig {
+    /**
+     * 数据库连接串
+     */
+    url: string | javax.sql.DataSource
+    /**
+     * 数据库驱动
+     */
+    driverClassName?: string
+    /**
+     * 用户名
+     */
+    username?: string
+    /**
+     * 密码
+     */
+    password?: string
+}
 
 /**
  * 数据库封装类
  */
-export class DataBase extends database.DataBase {
+export class DataBase {
     private dataSource: javax.sql.DataSource
     private jdbcTemplate: org.springframework.jdbc.core.JdbcTemplate
 
-    @JSClass('com.zaxxer.hikari.HikariDataSource')
+    constructor(dbConfig: DataBaseConfig) {
-    private HikariDataSource: any
-    @JSClass('com.zaxxer.hikari.HikariConfig')
-    private HikariConfig: any
-    @JSClass('org.springframework.jdbc.core.JdbcTemplate')
-    private JdbcTemplate: typeof org.springframework.jdbc.core.JdbcTemplate
-
-    constructor(dbConfig: database.DataBaseConfig) {
-        super()
         if (!dbConfig.url) { throw new Error('DataBase url can\'t be null!') }
         this.createDataSource(dbConfig)
+        this.initialize()
     }
 
-    private createDataSource(dbConfig: database.DataBaseConfig) {
+    private createDataSource(dbConfig: DataBaseConfig) {
         if (typeof dbConfig.url === "string") {
-            let originClassLoader = Thread.currentThread().getContextClassLoader()
+            if (!dbConfig.username || !dbConfig.password) {
-            Thread.currentThread().setContextClassLoader(base.getInstance().class.classLoader)
+                throw new Error('DataBase username or password can\'t be null!')
-            let config = new this.HikariConfig()
+            }
+            let config = new HikariConfig()
             if (dbConfig.driverClassName) {
                 config.setDriverClassName(dbConfig.driverClassName)
-            } else {
-                switch (dbConfig.type) {
-                    case "h2":
-                        config.setDriverClassName("org.h2.Driver")
-                        break
-                    case "sqlite":
-                        config.setDriverClassName("org.sqlite.JDBC")
-                        break
-                    default:
             }
-            }
-            if (dbConfig.username) {
             config.setUsername(dbConfig.username)
-            }
-            if (dbConfig.password) {
             config.setPassword(dbConfig.password)
-            }
             config.setJdbcUrl(dbConfig.url)
-            if (dbConfig.properties) {
+            this.dataSource = new HikariDataSource(config)
-                let properties = new Properties()
-                for (const key in dbConfig.properties) {
-                    properties.setProperty(key, dbConfig.properties[key])
-                }
-                config.setDataSourceProperties(properties)
-            }
-            console.debug('createDataSource from config ' + JSON.stringify(dbConfig))
-            this.dataSource = new this.HikariDataSource(config)
-            Thread.currentThread().setContextClassLoader(originClassLoader)
         } else {
             this.dataSource = dbConfig.url
         }
-        this.jdbcTemplate = new this.JdbcTemplate(this.dataSource)
     }
 
-    getDataSource() {
+    private initialize() {
-        return this.dataSource
+        this.jdbcTemplate = new JdbcTemplate(this.dataSource)
     }
 
     /**
      * 执行SQL查询
      * @param sql SQL语句
-     * @param args 参数
      */
     query<T>(sql: string, ...args: any[]): Array<T> {
         let startTime = Date.now()
         let result = Java.from<any>(this.jdbcTemplate.queryForList(sql, args))
-        console.debug(JavaString.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(java.lang.String.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
     /**
      * 执行SQL更新
      * @param sql SQL语句
-     * @param args 参数
      */
     update(sql: string, ...args: any[]): number {
         let startTime = Date.now()
         let result = this.jdbcTemplate.update(sql, args)
-        console.debug(JavaString.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(java.lang.String.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
-    /**
-     * 执行SQL语句
-     * @param sql SQL语句
-     */
-    execute(sql: string): void {
-        let startTime = Date.now()
-        this.jdbcTemplate.execute(sql)
-        console.debug(`\n[DB] execute \nSQL  : ${sql} \nCOST : ${Date.now() - startTime}ms`)
-    }
-
     close() {
         //@ts-ignore
         this.dataSource.close()

packages/database/src/decorators.ts

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

packages/database/src/index.ts

@@ -2,11 +2,5 @@
 /// <reference types="@javatypes/jdk" />
 /// <reference types="@javatypes/spring-jdbc" />
 
-import { loadMavenDepend } from '@ccms/container'
-
-loadMavenDepend('com.h2database', 'h2', '2.1.212')
-loadMavenDepend("com.zaxxer", "HikariCP", "4.0.3")
-loadMavenDepend("org.springframework", "spring-jdbc", "5.3.19", true)
-
 export * from './database'
 export * from './manager'

packages/database/src/manager.ts

@@ -1,44 +1,25 @@
-import { database } from '@ccms/api'
+import { plugin, database } from '@ccms/api'
-import { JSClass, provideSingleton } from '@ccms/container'
+import { provideSingleton, inject, postConstruct } from '@ccms/container'
-import { DataBase } from './database'
+import { DataBase, DataBaseConfig } from './database'
 
 @provideSingleton(database.DataBaseManager)
-export class DataBaseManager extends database.DataBaseManager {
+export class DataBaseManager {
+    @inject(plugin.PluginInstance)
+    private instance: any
+
+    private beanFactory: any
     private mainDatabase: DataBase
-    private databases = new Map<string, DataBase>()
+    private databases: { [key: string]: DataBase } = {}
 
-    @JSClass('org.h2.tools.Server')
+    @postConstruct()
-    private Server: any
+    initialize() {
-
+        try {
-    private webManager: any
+            this.beanFactory = this.instance.getAutowireCapableBeanFactory()
-
+            let mainDatasource = this.beanFactory.getBean(Packages.javax.sql.DataSource.class)
-    constructor() {
+            this.mainDatabase = new DataBase({ url: mainDatasource })
-        super()
+        } catch (error: any) {
-        process.on('exit', () => this.shutdown())
+            console.ex(error)
         }
-
-    startWebManager(...args: string[]) {
-        this.webManager = this.Server.createWebServer(args)
-        this.webManager.start()
-    }
-
-    stopWebManager() {
-        if (this.webManager) {
-            this.webManager.stop()
-            this.webManager.shutdown()
-        }
-    }
-
-    shutdown() {
-        this.stopWebManager()
-        this.disable()
-    }
-    /**
-     * 设置主数据库
-     * @param mainDatabase 主数据库
-     */
-    setMainDatabase(mainDatabase: DataBase) {
-        this.mainDatabase = mainDatabase
     }
 
     /**
@@ -55,28 +36,18 @@ export class DataBaseManager extends database.DataBaseManager {
      * @param name 数据库名称 用于代码 database Name use at code
      * @param config 数据库配置
      */
-    createDatabase(name: string, config: database.DataBaseConfig) {
+    createDatabase(name: string, config: DataBaseConfig) {
-        return Java.synchronized(() => {
+        Java.synchronized(() => {
-            if (!this.databases.has(name)) {
+            if (this.databases[name]) return this.databases[name]
-                this.databases.set(name, new DataBase(config))
+            return this.databases[name] = new DataBase(config)
-            }
-            return this.databases.get(name)
         }, this.databases)()
     }
 
-    removeDatabase(name: string) {
-        if (this.databases.has(name)) {
-            this.databases.get(name).close()
-        }
-        return this.databases.delete(name)
-    }
-
     getDatabase(name: string) {
-        return this.databases.get(name)
+        return this.databases[name]
     }
 
     disable() {
-        this.databases.forEach((db) => db.close())
+        Object.values(this.databases).forEach((ds) => ds?.close())
-        this.databases.clear()
     }
 }

packages/database/src/model.ts

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

packages/i18n/languages/en.yml

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

packages/i18n/languages/zh_cn.yml

@@ -22,9 +22,8 @@ ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失
 ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
 ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
 ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
-ms.api.event.register: "[{name}] 注册事件 {event} => 执行器 {exec} 优先级 {priority} 忽略取消 {ignore}"
+ms.api.event.register: "[{name}] 注册事件 {event} => 执行器 {exec}"
 ms.api.event.unregister: "[{name}] 注销事件 {event} => 执行器 {exec}"
-
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."
@@ -34,10 +33,9 @@ ms.api.command.tab.completer.slow: "§c注意! §6玩家 §a{player} §6执行
 ms.api.command.tab.completer.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全时发生异常 §4{ex}"
 
 ms.plugin.initialize: "初始化 MiaoScript 插件系统: 实例: {plugin} 加载器: {loader}..."
-ms.plugin.event.map: "映射 {type} 事件 成功 总计 {count} 个 {type} 事件..."
+ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
-ms.plugin.event.map.error: "映射 {type} 事件 异常 将无法使用事件简称. Error: {error}"
 ms.plugin.manager.scan: "扫描器 {scanner} 扫描 {folder} 中的插件..."
-ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始编译..."
+ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始构建..."
 ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} 版本 {version} 作者 {author}"
 ms.plugin.manager.stage.exec: "[{plugin}] 执行 {stage} 阶段函数 {name} 匹配类型 {servers}..."
@@ -45,7 +43,7 @@ ms.plugin.manager.stage.exec.error: "§6插件 §b{plugin} §6执行 §d{executo
 ms.plugin.manager.stage.load: "加载"
 ms.plugin.manager.stage.enable: "启用"
 ms.plugin.manager.stage.disable: "关闭"
-ms.plugin.manager.build: "插件 {name}({version}) 编译完成 来源: {file}({scanner}) 引导: {loader} 编译耗时: {cost}s."
+ms.plugin.manager.build: "插件 {name}({version}) 构建完成 来源: {file}({scanner}) 引导: {loader} 构建耗时: {cost}s."
 ms.plugin.manager.build.error: "§6从文件 §b{file} §6加载插件失败 §4错误: §c{error}"
 ms.plugin.manager.build.update: "自动更新插件 {name} ..."
 ms.plugin.manager.build.not.extends: "§4发现错误的插件 §b{source} §4未继承接口 interfaces.Plugin, 将不会被载入到服务器!"

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "@types/js-yaml": "^4.0.5",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
         "js-yaml": "^4.1.0"

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,18 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "@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",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
 }

packages/molang/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/molang",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "A fast parser for Minecraft's MoLang",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -21,9 +21,9 @@
     },
     "homepage": "https://github.com/solvedDev/MoLang#readme",
     "devDependencies": {
-        "@types/node": "^18.13.0",
+        "@types/node": "^17.0.17",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "tslib": "^2.5.0",
+        "tslib": "^2.3.1",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/nashorn/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.27.4",
+    "version": "0.19.0",
-    "description": "MiaoScript nashorn package",
+    "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -21,7 +21,7 @@
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/nashorn/src/index.ts

@@ -48,34 +48,10 @@ declare global {
             scope: string
             logger: any
             debug: boolean
-            /**
+            level: string
-             * 引擎日志等级
-             */
-            ScriptEngineLoggerLevel: string
-            /**
-             * 引擎配置
-             */
-            ScriptEngineConfig: any
-            /**
-             * 引擎版本
-             */
             ScriptEngineVersion: string
-            /**
-             * 引擎渠道
-             */
-            ScriptEngineChannel: string
-            /**
-             * 慢执行检测时间
-             */
             ScriptSlowExecuteTime: number
             ScriptEngineStartTime: number
-            /**
-             * 设置全局对象
-             * @param key 对象名称
-             * @param value 对象值
-             * @param config 对象属性
-             * @returns
-             */
             setGlobal: (key: string, value: any, config?: PropertyDescriptor & ThisType<any>) => void
             noop: () => void
             console: Console
@@ -95,7 +71,6 @@ declare global {
         getProxyClass(): any
         getJavaScriptTaskClass(): any
         getInstance(): any
-        loadMavenDepend(groupId: string, artifactId: string, version: string): [any, any]
         read(path: string): string
         save(path: string, content: string): void
         delete(path: string): void

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "tslib": "^2.5.0",
+        "tslib": "^2.3.1",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "@javatypes/nukkit-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/plugin/package.json

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

packages/plugin/src/command.ts

@@ -15,90 +15,85 @@ export class PluginCommandManager {
         process.on('plugin.after.disable', this.unregistryCommand.bind(this))
     }
 
-    public registryCommand(pluginInstance: plugin.Plugin, executor: any = pluginInstance) {
+    private registryCommand(pluginInstance: plugin.Plugin) {
-        let cmds = getPluginCommandMetadata(executor)
+        let cmds = getPluginCommandMetadata(pluginInstance)
-        let tabs = getPluginTabCompleterMetadata(executor)
+        let tabs = getPluginTabCompleterMetadata(pluginInstance)
         for (const cmd of cmds) {
             if (!this.ServerChecker.check(cmd.servers)) {
                 console.debug(`[${pluginInstance.description.name}] ${cmd.target.constructor.name} incompatible command ${cmd.name} server(${cmd.servers}) ignore.`)
                 continue
             }
             for (let command of [cmd.name, ...cmd.alias]) {
-                let [cmdExecutor, cmdCompleter] = this.generateAutoMainCommand(pluginInstance, executor, cmd, tabs.get(command))
+                let [cmdExecutor, cmdCompleter] = this.generateAutoMainCommand(pluginInstance, cmd, tabs.get(command))
                 this.CommandManager.on(pluginInstance, command, {
-                    cmd: cmdExecutor.bind(executor),
+                    cmd: cmdExecutor.bind(pluginInstance),
-                    tab: cmdCompleter?.bind(executor)
+                    tab: cmdCompleter?.bind(pluginInstance)
                 })
             }
         }
     }
 
-    public unregistryCommand(pluginInstance: plugin.Plugin, executor: any = pluginInstance) {
+    private unregistryCommand(pluginInstance: plugin.Plugin) {
-        let cmds = getPluginCommandMetadata(executor)
+        let cmds = getPluginCommandMetadata(pluginInstance)
         for (const cmd of cmds) {
             if (!this.ServerChecker.check(cmd.servers)) {
                 console.debug(`[${pluginInstance.description.name}] ${cmd.target.constructor.name} incompatible command ${cmd.name} server(${cmd.servers}) ignore.`)
                 continue
             }
             for (let command of [cmd.name, ...cmd.alias]) {
-                this.CommandManager.off(executor, command)
+                this.CommandManager.off(pluginInstance, command)
             }
         }
     }
 
-    private generateAutoMainCommand(pluginInstance: plugin.Plugin, executor: any, cmd: interfaces.CommandMetadata, tab: interfaces.CommandMetadata) {
+    private generateAutoMainCommand(pluginInstance: plugin.Plugin, cmd: interfaces.CommandMetadata, tab: interfaces.CommandMetadata) {
-        let cmdExecutor = executor[cmd.executor]
+        let cmdExecutor = pluginInstance[cmd.executor]
-        let cmdCompleter = tab ? executor[tab.executor] : undefined
+        let cmdCompleter = tab ? pluginInstance[tab.executor] : undefined
-        let cmdSubCache = Object.keys(executor.constructor.prototype).filter(s => s.startsWith('cmd')).map(s => s.substring(3))
+        let cmdSubCache = Object.keys(pluginInstance.constructor.prototype).filter(s => s.startsWith('cmd')).map(s => s.substring(3))
         if (cmd.autoMain) {
             cmdExecutor = (sender: any, command: string, args: string[]) => {
                 let subcommand = args[0]
                 let cmdKey = 'cmd' + subcommand
-                if (!cmdSubCache.includes(subcommand)) {
+                let subcommandexec = pluginInstance[cmdKey]
-                    if (!executor[cmd.executor].apply(executor, [sender, command, args])) {
+                if (!subcommandexec) {
-                        subcommand && pluginInstance.logger.sender(sender, `§4未知的命令: §b/${command} §c${subcommand}`)
+                    subcommandexec = pluginInstance['cmdmain']
+                } else {
+                    args.shift()
+                }
+                if (!subcommandexec) {
+                    subcommand && pluginInstance.logger.sender(sender, '§4未知的子命令: §c' + subcommand)
                     pluginInstance.logger.sender(
                         sender,
-                            executor['cmdhelp'] ?
+                        pluginInstance['cmdhelp'] ?
                             `§6请执行 §b/${command} §ahelp §6查看帮助!` :
-                                [
+                            `§b版本: §a ${pluginInstance.description.version}`
-                                    `§6插件: §b${pluginInstance.description.name}`,
-                                    `§6版本: §a${pluginInstance.description.version}`
-                                ]
                     )
-                    }
                     return
                 }
-                let subcommandexec = executor[cmdKey]
                 let permission: string
-                if (cmd.permission && sender.hasPermission) {
                 if (typeof cmd.permission == "string") {
                     permission = cmd.permission as string
-                    } else {
+                } else if (cmd.permission) {
-                        permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}.${subcommand || 'main'}`
+                    permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}.${subcommand}`
                 }
-                    if (!sender.hasPermission(permission)) {
+                if (sender.hasPermission && !sender.hasPermission(permission)) {
-                        return pluginInstance.logger.sender(sender, `§c你需要 §4${permission} §c权限 才可执行此命令.`)
+                    return pluginInstance.logger.sender(sender, `§c你需要 ${permission} 权限 才可执行此命令.`)
                 }
-                }
+                return subcommandexec.apply(pluginInstance, [sender, ...args])
-                args.shift()
-                return subcommandexec.apply(executor, [sender, ...args])
             }
             let originCompleter = cmdCompleter
             cmdCompleter = (sender: any, command: string, args: string[]) => {
                 let permission: string
-                if (cmd.permission && sender.hasPermission) {
                 if (typeof cmd.permission == "string") {
                     permission = cmd.permission as string
-                    } else {
+                } else if (cmd.permission) {
                     permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}`
                 }
-                    if (!sender.hasPermission(permission)) { return [] }
+                if (sender.hasPermission && !sender.hasPermission(permission)) { return [] }
-                }
+                return (args.length == 1 ? cmdSubCache : []).concat(originCompleter?.apply(pluginInstance, [sender, command, args]) || [])
-                return (args.length == 1 ? cmdSubCache : []).concat(originCompleter?.apply(executor, [sender, command, args]) || [])
             }
         }
-        if (!cmdCompleter) { console.debug(`[${pluginInstance.description.name}] command ${cmd.name} is not registry tabCompleter`) }
+        if (!cmdCompleter) { console.warn(`[${pluginInstance.description.name}] command ${cmd.name} is not registry tabCompleter`) }
         return [cmdExecutor, cmdCompleter]
     }
 }

packages/plugin/src/config.ts

@@ -1,35 +1,59 @@
-import { plugin } from '@ccms/api'
+import * as yaml from 'js-yaml'
-import { Autowired, Container, ContainerInstance, postConstruct, provideSingleton } from '@ccms/container'
-
 import * as fs from '@ccms/common/dist/fs'
+import { plugin } from '@ccms/api'
+import { provideSingleton } from '@ccms/container'
 
 import { interfaces } from './interfaces'
 import { getPluginConfigMetadata } from './utils'
 
-import { PluginConfigLoader } from './config/interfaces'
+export interface PluginConfigLoader {
-import './config/loader'
+    load(content: string): any
+    dump(variable: any): string
+}
+
+export class YamlPluginConfig implements PluginConfigLoader {
+    load(content: string) {
+        return yaml.load(content)
+    }
+    dump(variable: any): string {
+        return yaml.dump(variable, { skipInvalid: true, lineWidth: 120 })
+    }
+}
+
+export class JsonPluginConfig implements PluginConfigLoader {
+    load(content: string) {
+        return JSON.parse(content)
+    }
+    dump(variable: any): string {
+        return JSON.stringify(variable, undefined, 4)
+    }
+}
+
+export interface PluginConfig {
+    /**
+     * Save Config to File
+     */
+    readonly save?: () => void
+    /**
+     * Reload Config from File
+     */
+    readonly reload?: () => void
+    [key: string]: any
+}
 
 @provideSingleton(PluginConfigManager)
 export class PluginConfigManager {
-    @Autowired(ContainerInstance)
-    private container: Container
-
     private configLoaderMap = new Map<string, PluginConfigLoader>()
 
     constructor() {
+        this.configLoaderMap.set("json", new JsonPluginConfig())
+        let yaml = new YamlPluginConfig()
+        this.configLoaderMap.set("yml", yaml)
+        this.configLoaderMap.set("yaml", yaml)
         process.on('plugin.before.load', this.loadConfig.bind(this))
         process.on('plugin.after.disable', this.saveConfig.bind(this))
     }
 
-    @postConstruct()
-    initialize() {
-        let configLoader = this.container.getAll<PluginConfigLoader>(PluginConfigLoader)
-        configLoader.forEach((scanner) => {
-            console.debug(`loading config loader ${scanner.type}...`)
-            this.configLoaderMap.set(scanner.type, scanner)
-        })
-    }
-
     getConfigLoader(format: string) {
         if (!this.configLoaderMap.has(format)) { throw new Error(`Unsupport config format ${format} !`) }
         return this.configLoaderMap.get(format)
@@ -49,17 +73,13 @@ export class PluginConfigManager {
         }
     }
 
-    createConfig(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
+    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
         Object.defineProperties(value, {
             'save': { value: () => this.saveConfig0(plugin, metadata) },
             'reload': { value: () => this.loadConfig0(plugin, metadata) }
         })
-        return value
-    }
-
-    private defienConfigProp(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata, value: any) {
         Object.defineProperty(plugin, metadata.variable, {
-            value: this.createConfig(plugin, metadata, value),
+            value,
             configurable: true
         })
     }
@@ -67,25 +87,30 @@ export class PluginConfigManager {
     private loadConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
         try {
             let defaultValue = metadata.default ?? plugin[metadata.variable]
+            let configValue = defaultValue || {}
+            if (defaultValue) {
                 metadata.file = fs.concat(
                     fs.file(plugin.description.loadMetadata.file).parent,
                     plugin.description.name,
                     metadata.filename
                 )
                 let configLoader = this.getConfigLoader(metadata.format)
-            if (!fs.exists(metadata.file) && defaultValue) {
+                if (!fs.exists(metadata.file)) {
                     base.save(metadata.file, configLoader.dump(defaultValue))
                     console.i18n("ms.plugin.manager.config.save.default", {
                         plugin: plugin.description.name,
                         name: metadata.name,
                         format: metadata.format
                     })
-            }
+                } else {
-            let configValue = configLoader.load(base.read(metadata.file)) || {}
+                    configValue = configLoader.load(base.read(metadata.file)) || {}
-            if (metadata.migrate && defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
+                    if (defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
                         base.save(metadata.file, configLoader.dump(configValue))
                     }
-            console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file}`)
+                    console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>
+${JSON.stringify(configValue, undefined, 4).substring(0, 500)}`)
+                }
+            }
             this.defienConfigProp(plugin, metadata, configValue)
         } catch (error: any) {
             console.i18n("ms.plugin.manager.config.load.error", {

packages/plugin/src/config/config.ts

@@ -1,3 +0,0 @@
-export * from "./loader"
-export * from "./interfaces"
-export * from "./file-config"

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

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

packages/plugin/src/config/interfaces.ts

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

packages/plugin/src/config/loader/index.ts

@@ -1,2 +0,0 @@
-export * from './json-loader'
-export * from './yaml-loader'

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

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

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

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

packages/plugin/src/decorators.ts

@@ -76,7 +76,6 @@ export function config(metadata: interfaces.ConfigMetadata = {}) {
         metadata.variable = key
         metadata.version = metadata.version ?? 1
         metadata.format = metadata.format ?? 'yml'
-        metadata.migrate = metadata.migrate ?? true
         metadata.autosave = metadata.autosave ?? false
         metadata.filename = metadata.filename ?? metadata.name + '.' + metadata.format
         let previousMetadata = getPluginConfigMetadata(target)

packages/plugin/src/event.ts

@@ -5,13 +5,9 @@ import { getPluginListenerMetadata } from './utils'
 @provideSingleton(PluginEventManager)
 export class PluginEventManager {
     @Autowired()
-    private eventManager: event.Event
+    private EventManager: event.Event
     @Autowired()
-    private serverChecker: server.ServerChecker
+    private ServerChecker: server.ServerChecker
-    @Autowired()
-    private nativePluginChecker: server.NativePluginChecker
-
-    private listenerMap = [];
 
     constructor() {
         process.on('plugin.before.enable', this.registryListener.bind(this))
@@ -19,44 +15,26 @@ export class PluginEventManager {
     }
 
     mapEventName() {
-        return this.eventManager.mapEventName().toFixed(0)
+        return this.EventManager.mapEventName().toFixed(0)
     }
 
-    public registryListener(pluginInstance: plugin.Plugin, listener: any = pluginInstance) {
+    private registryListener(pluginInstance: plugin.Plugin) {
-        let events = getPluginListenerMetadata(listener)
+        let events = getPluginListenerMetadata(pluginInstance)
-        let execes = []
         for (const event of events) {
             // ignore space listener
-            if (!this.serverChecker.check(event.servers)) {
+            if (!this.ServerChecker.check(event.servers)) {
-                console.debug(`[${pluginInstance.description.name}] ${event.target.constructor.name} incompatible server(${event.servers}) ignore event ${event.name}.`)
+                console.debug(`[${pluginInstance.description.name}] ${event.target.constructor.name} incompatible event ${event.name} server(${event.servers}) ignore.`)
-                continue
-            }
-            // ignore space listener
-            if (!this.nativePluginChecker.check(event.plugins)) {
-                console.debug(`[${pluginInstance.description.name}] ${event.target.constructor.name} require native plugins(${event.plugins}) ignore event ${event.name}.`)
                 continue
             }
             // here must bind this to pluginInstance
             let exec = event.target[event.executor]
-            let execBinded = exec.bind(listener)
+            let execBinded = exec.bind(pluginInstance)
             execBinded.executor = event.executor
-            exec.off = this.eventManager.listen(pluginInstance, event.name, execBinded, event.priority, event.ignoreCancel)
+            exec.off = this.EventManager.listen(pluginInstance, event.name, execBinded, event.priority, event.ignoreCancel)
-            execes.push(exec)
         }
-        let off = () => {
-            if (off['offed']) return
-            off['offed'] = true
-            execes.forEach((off: () => any) => off())
-        }
-        listener.off = off
     }
 
-    private unregistryListener(pluginInstance: plugin.Plugin, listener: any = pluginInstance) {
+    private unregistryListener(pluginInstance: plugin.Plugin) {
-        if (listener && listener.off) {
+        this.EventManager.disable(pluginInstance)
-            listener.off()
-        }
-        if (pluginInstance) {
-            this.eventManager.disable(pluginInstance)
-        }
     }
 }

packages/plugin/src/index.ts

@@ -1,18 +1,14 @@
-import '@ccms/verify'
 import './scanner/js-scanner'
+import './scanner/mjs-scanner'
 
 import './loader/ioc-loader'
 import './loader/basic-loader'
 
 export * from './config'
-export * from './config/config'
 export * from './manager'
 export * from './decorators'
 export * from './interfaces'
 
-export * from './event'
-export * from './command'
-
 export {
     plugin as JSPlugin,
     cmd as Cmd,
@@ -21,5 +17,3 @@ export {
     config as Config,
     playerdata as PlayerData
 } from './decorators'
-
-import '@ccms/database'

packages/plugin/src/interfaces.ts

@@ -8,7 +8,7 @@ export namespace interfaces {
     @injectable()
     export abstract class Plugin implements plugin.Plugin {
         public description: plugin.PluginMetadata
-        public logger: MiaoScriptConsole
+        public logger: Console
         @inject(server.Console)
         private Console: MiaoScriptConsole
 
@@ -28,11 +28,6 @@ export namespace interfaces {
             return dataFolder.getAbsolutePath()
         }
 
-        public registryCommand(executor: any) { }
-        public unregistryCommand(executor: any) { }
-        public registryListener(listener: any) { }
-        public unregistryListener(listener: any) { }
-
         public load() { }
         public enable() { }
         public disable() { }
@@ -78,10 +73,6 @@ export namespace interfaces {
          * 是否忽略已取消的事件
          */
         ignoreCancel?: boolean
-        /**
-         * 依赖插件 没有就不加载
-         */
-        plugins?: string[]
     }
     export interface ConfigMetadata extends plugin.BaseMetadata {
         /**
@@ -100,10 +91,6 @@ export namespace interfaces {
          * 配置文件格式 默认 yml
          */
         format?: string
-        /**
-         * 是否合并默认配置
-         */
-        migrate?: boolean
         /**
          * 自动保存 默认为 false
          */

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

@@ -63,13 +63,13 @@ export class IocLoader implements plugin.PluginLoader {
     }
 
     private bindPlugin(metadata: plugin.PluginMetadata) {
-        if (this.container.isBoundNamed(plugin.Plugin, metadata.name)) {
+        try {
             let pluginInstance = this.container.getNamed<plugin.Plugin>(plugin.Plugin, metadata.name)
             if (pluginInstance.description.source + '' !== metadata.source + '') {
                 console.i18n('ms.plugin.manager.build.duplicate', { exists: pluginInstance.description.source, source: metadata.source })
             }
             this.container.rebind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
-        } else {
+        } catch {
             this.container.bind(plugin.Plugin).to(metadata.target).inSingletonScope().whenTargetNamed(metadata.name)
         }
     }

packages/plugin/src/manager.ts

@@ -2,11 +2,12 @@ import i18n from '@ccms/i18n'
 import { plugin, server } from '@ccms/api'
 import { provideSingleton, Container, ContainerInstance, Autowired } from '@ccms/container'
 
+import './config'
 import { interfaces } from './interfaces'
 import { PluginTaskManager } from './task'
 import { PluginEventManager } from './event'
-import { PluginConfigManager } from './config'
 import { PluginCommandManager } from './command'
+import { PluginConfigManager } from './config'
 
 const Thread = Java.type('java.lang.Thread')
 
@@ -63,13 +64,9 @@ export class PluginManagerImpl implements plugin.PluginManager {
     initialize() {
         if (this.pluginInstance === undefined) { throw new Error("Can't found Plugin Instance!") }
         if (this.initialized !== true) {
-            process.emit('plugin.manager.before.initialize', this)
+            process.emit('plugin.manager.before.initialize')
             console.i18n('ms.plugin.initialize', { plugin: this.pluginInstance, loader: Thread.currentThread().contextClassLoader })
-            try {
             console.i18n('ms.plugin.event.map', { count: this.eventManager.mapEventName(), type: this.serverType })
-            } catch (error) {
-                console.i18n('ms.plugin.event.map.error', { type: this.serverType, error })
-            }
             let pluginScanner = this.container.getAll<plugin.PluginScanner>(plugin.PluginScanner)
             pluginScanner.forEach((scanner) => {
                 console.debug(`loading plugin sacnner ${scanner.type}...`)
@@ -81,38 +78,39 @@ export class PluginManagerImpl implements plugin.PluginManager {
                 this.loaderMap.set(loader.type, loader)
             })
             this.initialized = true
-            process.emit('plugin.manager.after.initialize', this)
+            process.emit('plugin.manager.after.initialize')
         }
     }
 
     scan(folder: string): void {
         if (!folder) { throw new Error('plugin scan folder can\'t be empty!') }
         this.initialize()
-        process.emit('plugin.manager.before.scan', folder, this)
+        process.emit('plugin.manager.before.scan', folder)
         for (const [, scanner] of this.sacnnerMap) {
             try {
                 console.i18n('ms.plugin.manager.scan', { scanner: scanner.type, folder })
-                let loadMetadatas = scanner.scan(folder)
+                let plugins = scanner.scan(folder)
-                console.i18n('ms.plugin.manager.scan.finish', { scanner: scanner.type, folder, size: loadMetadatas.length })
+                console.i18n('ms.plugin.manager.scan.finish', { scanner: scanner.type, folder, size: plugins.length })
-                for (const loadMetadata of loadMetadatas) {
+                plugins.forEach(loadMetadata => {
                     try {
                         this.loadAndRequirePlugin(loadMetadata)
                     } catch (error: any) {
-                        console.console(`§c扫描器 §4${scanner.type} §c文件 §4${loadMetadata.file.toString().replace(root, '')} §c编译失败 请提供下列错误给开发者`)
+                        console.error(`plugin scanner ${scanner.type} load ${loadMetadata.file} occurred error ${error}`)
                         console.ex(error)
                     }
-                }
+                })
             } catch (error: any) {
+                console.error(`plugin scanner ${scanner.type} occurred error ${error}`)
                 console.ex(error)
             }
         }
-        process.emit('plugin.manager.after.scan', folder, this)
+        process.emit('plugin.manager.after.scan', folder)
     }
 
     build(): void {
-        process.emit('plugin.manager.before.build', this)
+        process.emit('plugin.manager.before.build')
         this.buildPlugins()
-        process.emit('plugin.manager.after.build', this)
+        process.emit('plugin.manager.after.build')
     }
 
     private logStage(plugin: plugin.Plugin, stage: string) {
@@ -146,6 +144,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
             console.i18n("ms.plugin.manager.initialize.error", { name: loadMetadata.file, ex: error })
             console.ex(error)
         }
+        console.console(`§6scanner: §b${loadMetadata.scanner.type} §ccan\'t load §6file §b${loadMetadata.file}. §eskip!`)
     }
 
     private loaderRequirePlugin(loadMetadata: plugin.PluginLoadMetadata, loader: plugin.PluginLoader) {
@@ -196,9 +195,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
         let scanner = this.sacnnerMap.get(ext)
         if (!scanner) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
         let metadata = this.loadAndRequirePlugin(scanner.read(file))
-        this.buildPlugin(metadata)
+        let plugin = this.buildPlugin(metadata)
-        let plugin = metadata.target
-        if (!plugin) { throw new Error(`plugin scanner ${ext} can't found in sacnnerMap.`) }
         this.load(plugin)
         this.enable(plugin)
         return plugin
@@ -227,16 +224,8 @@ export class PluginManagerImpl implements plugin.PluginManager {
         })
     }
 
-    has(name: string) {
-        return this.instanceMap.has(name)
-    }
-
-    get(name: string) {
-        return this.instanceMap.get(name) || null
-    }
-
     getPlugin(name: string) {
-        return this.instanceMap.get(name) || null
+        return this.instanceMap.get(name)
     }
 
     getPlugins() {
@@ -266,10 +255,10 @@ export class PluginManagerImpl implements plugin.PluginManager {
             if (metadata?.depends?.length) {
                 this.lazyMetadataMap.set(key, metadata)
             } else {
-                this.tryBuildPlugin(metadata)
+                this.buildPlugin(metadata)
             }
         })
-        this.lazyMetadataMap.forEach((metadata, key) => this.tryBuildPlugin(metadata))
+        this.lazyMetadataMap.forEach((metadata, key) => this.buildPlugin(metadata))
     }
 
     private checkDepends(depends: string | string[]) {
@@ -284,17 +273,9 @@ export class PluginManagerImpl implements plugin.PluginManager {
         for (const depend of depends) { if (!this.nativePluginManager.has(depend)) loseDepends.push(depend) }
         return loseDepends
     }
-
-    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)
+        try {
             if (this.instanceMap.has(metadata.name)) { throw new Error(`Plugin ${metadata.name} is already load from ${metadata.source}...`) }
             if (!this.loaderMap.has(metadata.type)) { throw new Error(`§4无法加载插件 §b${metadata.name} §4请检查 §c${metadata.type} §4加载器是否正常启用!`) }
             if (!this.serverChecker.check(metadata.servers)) { throw new Error(`§6插件 §b${metadata.name} §c服务器类型不兼容(${metadata.servers.join(',')}) §6忽略加载...`) }
@@ -304,9 +285,12 @@ 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失败!`) }
-        metadata.target = pluginInstance
             this.instanceMap.set(metadata.name, pluginInstance)
             process.emit(`plugin.after.build`, metadata, pluginInstance)
             return pluginInstance
+        } catch (error: any) {
+            console.console(`§4无法加载插件 §b${metadata.name} §4构建插件失败!`)
+            console.ex(error)
+        }
     }
 }

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

@@ -0,0 +1,131 @@
+import { plugin } from "@ccms/api"
+import http from '@ccms/common/dist/http'
+import { provideSingletonNamed } from "@ccms/container"
+
+import * as fs from '@ccms/common/dist/fs'
+
+import * as CryptoJS from "crypto-js"
+
+const SCANNER_TYPE_NAME = 'mjs'
+
+@provideSingletonNamed(plugin.PluginScanner, SCANNER_TYPE_NAME)
+export class SecretJSFileScanner implements plugin.PluginScanner {
+    type: string = SCANNER_TYPE_NAME
+
+    constructor() {
+        global.setGlobal('MiaoScriptPackageCenterTokenCache', {})
+        global.setGlobal('MiaoScriptPackageCenterQQCache', {})
+    }
+
+    scan(target: any): plugin.PluginLoadMetadata[] {
+        return this.scanFolder(fs.concat(root, target)).map((file) => this.read(file))
+    }
+
+    read(file: any): plugin.PluginLoadMetadata {
+        return { file, type: this.type, scanner: this, loaded: false }
+    }
+
+    load(metadata: plugin.PluginLoadMetadata): plugin.PluginLoadMetadata {
+        if (metadata.type !== this.type) { return }
+        this.updatePlugin(metadata.file)
+        //@ts-ignore load plugin not use cache
+        metadata.instance = require(metadata.file.toString(), {
+            cache: false,
+            hook: (origin) => {
+                let info = JSON.parse(origin)
+                if (!info || !info.encrypt) {
+                    return this.exportErrorPlugin(
+                        metadata.file,
+                        `console.console('§4无效的加密插件: §c${metadata.file}')`
+                    )
+                }
+                let qq = info.qq
+                let encrypt = info.encrypt
+                let token = this.decrypt(info.token, qq, info.timestamp)
+                global.MiaoScriptPackageCenterQQCache[info.name] = qq
+                global.MiaoScriptPackageCenterTokenCache[info.name] = token
+                try {
+                    let result = http.post('https://ms.yumc.pw/api/plugin/check', `{
+                        "pid": ${info.pid},
+                        "qq": ${qq},
+                        "token": "${token}",
+                        "source": true
+                    }`)
+                    if (result.code != 200) {
+                        return this.exportErrorPlugin(
+                            info.name,
+                            `console.console('§6[§b圈云授权系统§6] §6插件: §b${info.name} §c授权效验失败: §4${result.msg}')`
+                        )
+                    }
+                    if (!result.data) {
+                        return this.exportErrorPlugin(
+                            info.name,
+                            `console.console('§6[§b圈云授权系统§6] §6插件: §b${info.name} §c服务器返回异常数据.')`
+                        )
+                    }
+                    base.save(metadata.file, result.data.encrypt)
+                    return result.data.source
+                } catch (error) {
+                }
+                if (Date.now() / 1000 - info.timestamp > 7 * 24 * 60 * 60) {
+                    return this.exportErrorPlugin(
+                        info.name,
+                        `console.console('§6[§b圈云授权系统§6] §6插件: §b${info.name} §c离线授权已过期.')`
+                    )
+                }
+                return this.decrypt(encrypt, qq, token)
+            }
+        })
+        return metadata
+    }
+
+    private decrypt(encrypt, key, iv) {
+        return CryptoJS.AES.decrypt(encrypt,
+            CryptoJS.enc.Utf8.parse(`${key}`.padEnd(16, "\0").substring(0, 16)), {
+            iv: CryptoJS.enc.Utf8.parse(`${iv}`.padEnd(16, "\0").substring(0, 16))
+        }).toString(CryptoJS.enc.Utf8)
+    }
+
+    private exportErrorPlugin(name, src) {
+        return `module.exports = {
+            description: {
+                name: "${name}",
+                version: "未授权",
+                author: "未授权",
+                type: "basic",
+                source: __filename,
+                target: this
+            },
+            load: function () { ${src} }
+        }`
+    }
+
+    private scanFolder(folder: any): string[] {
+        var files = []
+        this.checkUpdateFolder(folder)
+        // must check file is exist maybe is a illegal symbolic link file
+        fs.list(folder).forEach((path: any) => {
+            let file = path.toFile()
+            if (file.exists() && (file.getName().endsWith(".mjs.json") || file.getName().endsWith(".mjs"))) {
+                files.push(file)
+            }
+        })
+        return files
+    }
+
+    private checkUpdateFolder(path: any) {
+        var update = fs.file(path, "update")
+        if (!update.exists()) {
+            update.mkdirs()
+        }
+    }
+
+    private updatePlugin(file: any) {
+        var update = fs.file(fs.file(fs.file(file).parentFile, 'update'), file.name)
+        if (update.exists()) {
+            console.i18n("ms.plugin.manager.build.update", { name: file.name })
+            fs.move(update, file, true)
+        }
+    }
+
+}

packages/polyfill/package.json

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

packages/polyfill/src/index.ts

@@ -12,7 +12,5 @@ import 'core-js'
 process.on('exit', () => require.disable())
 global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
-global.setGlobal('Buffer', require('./buffer').Buffer)
 global.setGlobal('Blob', require('blob-polyfill').Blob)
 console.i18n("ms.polyfill.completed", { time: (new Date().getTime() - polyfillStartTime) / 1000 })
-export default true

packages/polyfill/src/node-shim.ts

@@ -2,7 +2,6 @@ import { EventEmitter } from 'events'
 
 const System = Java.type('java.lang.System')
 const Thread = Java.type('java.lang.Thread')
-const ManagementFactory = Java.type('java.lang.management.ManagementFactory')
 const InterruptedException = Java.type('java.lang.InterruptedException')
 const ThreadGroup = Java.type("java.lang.ThreadGroup")
 const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
@@ -16,35 +15,19 @@ const DelayQueue = Java.type('java.util.concurrent.DelayQueue')
 const JavaScriptTask = Java.type(base.getJavaScriptTaskClass().name)
 
 const threadCount = new AtomicInteger(0)
-const threadGroup = new ThreadGroup("@ccms/micro-task")
+const threadGroup = new ThreadGroup("@ccms/ployfill-micro-task")
 const microTaskPool = new ThreadPoolExecutor(
     100, 200, 60, TimeUnit.SECONDS,
-    new LinkedBlockingQueue(1024),
+    new LinkedBlockingQueue(300),
     new ThreadFactory((run: any) => new Thread(threadGroup, run, "@ccms/micro-task-" + threadCount.incrementAndGet()))
 )
 class Process extends EventEmitter {
-    readonly version = base.version
-    readonly versions = []
-    readonly config = {}
-    readonly pid: number = parseInt(ManagementFactory.getRuntimeMXBean().getName().split('@')[0])
-    readonly ppid: number
-    title: string
-    readonly arch: string = System.getProperty("os.arch")
-    readonly platform = System.getProperty("os.name")
-
     env = {
         __noSuchProperty__: (prop) => {
             return System.getenv(prop)
         }
     }
-
+    platform = System.getProperty("os.name")
-    stdout = System.out
-    stderr = System.err
-    stdin = System.in
-
-    execArgv = ''
-    execPath = ''
-
     constructor() {
         super()
         this.on('exit', () => {
@@ -66,10 +49,10 @@ class Process extends EventEmitter {
             }
         })
     }
-    nextTick(callback: Function, ...args: any[]): void {
+    nextTick(func: Function, ...args: any[]) {
         microTaskPool.execute(() => {
             try {
-                callback(args)
+                func(args)
             } catch (origin: any) {
                 try {
                     super.emit('error', origin)
@@ -82,44 +65,9 @@ class Process extends EventEmitter {
     }
     exit(code: number) {
         console.log(`process exit by code ${code}!`)
-        this.emit('exit', this.exitCode = code)
+        this.emit('exit', code)
-    }
-    exitCode = 0
-    openStdin() {
-        throw new Error('MiaoScript unsupport openStdin.')
-    }
-    chdir(directory: string): void {
-        console.error('MiaoScript unsupport chdir. lock at ' + root)
-    }
-    cwd() {
-        return root
-    }
-    getgid(): number {
-        throw new Error('MiaoScript unsupport getgid.')
-    }
-    setgid(id: number | string) {
-        throw new Error('MiaoScript unsupport setgid.')
-    }
-    getuid(): number {
-        throw new Error('MiaoScript unsupport getuid.')
-    }
-    setuid(id: number | string) {
-        throw new Error('MiaoScript unsupport setuid.')
-    }
-    setUncaughtExceptionCaptureCallback(cb: ((err: Error) => void) | null) {
-        if (cb == null) {
-            this.removeAllListeners('error')
-        } else {
-            this.on('error', cb)
-        }
-    }
-    hasUncaughtExceptionCaptureCallback() {
-        return this.listenerCount('error') > 0
-    }
-    kill(pid: number, signal?: string | number): true {
-        throw new Error('MiaoScript unsupport kill.')
-        return true
     }
+
     toString() {
         return "[object process]"
     }
@@ -128,16 +76,16 @@ class Process extends EventEmitter {
 class EventLoop {
     private eventLoopMainThread = undefined
     private eventLoopTaskQueue = new DelayQueue()
-    private taskExecuteTimeout = 3000
+    private taskExecTimeout = 3
     private fixedThreadPool = undefined
 
     constructor() {
-        this.taskExecuteTimeout = parseInt(process.env.MS_TASK_EXECUTE_TIMEOUT) || 3000
+        this.taskExecTimeout = parseInt(process.env.MS_NODE_EVENT_LOOP_TIMEOUT) || 3
         this.fixedThreadPool = new ThreadPoolExecutor(
             1, 1, 0, TimeUnit.SECONDS,
-            new LinkedBlockingQueue(1024),
+            new LinkedBlockingQueue(300),
             new ThreadFactory((run: any) => {
-                let thread = new Thread(run, "@ccms/event-loop")
+                let thread = new Thread(run, "@ccms/node-shim/event-loop-exec")
                 thread.setDaemon(true)
                 return thread
             }))
@@ -167,7 +115,7 @@ class EventLoop {
                 this.intervalTasks = undefined
                 this.eventLoopMainThread = undefined
             }
-        }, "@ccms/event-loop")
+        }, "@ccms/node-shim/event-loop")
         this.eventLoopMainThread.setDaemon(true)
         process.on('exit', () => {
             this.eventLoopMainThread.interrupt()
@@ -189,9 +137,7 @@ class EventLoop {
         if (!callback) {
             throw new Error(`task ${name} callback function can't be null!`)
         }
-        if (this.fixedThreadPool.isShutdown()) {
+        if (this.fixedThreadPool.isShutdown()) { return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`) }
-            return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`)
-        }
         try {
             this.fixedThreadPool.submit(new Callable({
                 call: () => {
@@ -207,13 +153,13 @@ class EventLoop {
                         }
                     }
                 }
-            })).get(this.taskExecuteTimeout, TimeUnit.MILLISECONDS)
+            })).get(this.taskExecTimeout, TimeUnit.SECONDS)
         } catch (error: any) {
             if (error instanceof InterruptedException) {
                 return console.warn(`FixedThreadPool isInterrupted exit! Task ${name} exec exit!`)
             }
             if (error instanceof TimeoutException) {
-                return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecuteTimeout}s!`)
+                return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecTimeout}s!`)
             }
             throw error.getCause && error.getCause() || error
         }

packages/polyfill/src/xml-http-request.ts

@@ -68,14 +68,13 @@ type EventType =
     | 'timeout'
     | 'loadend'
     | 'loadstart'
-type RequestHttpHeader = { [key: string]: string }
+type HttpHeader = { [key: string]: string }
-type HttpHeader = { [key: string]: string[] }
+
 
 const executor = Executors.newCachedThreadPool()
 
 export class XMLHttpRequest {
-    private _connectTimeout: number = 5000;
+    private _timeout: number = 120000;
-    private _readTimeout: number = 120000;
     private _responseType: ResponseType = 'text';
     private _withCredentials: boolean
 
@@ -85,7 +84,7 @@ export class XMLHttpRequest {
     private _url: string
     private _async: boolean
     private _mimeType: string
-    private _requestHeaders: RequestHttpHeader = {};
+    private _requestHeaders: HttpHeader = {};
 
     private _status: number = 0;
     private _statusText: string = null;
@@ -97,22 +96,10 @@ export class XMLHttpRequest {
     private _connection = null;
 
     get timeout() {
-        return this._readTimeout
+        return this._timeout
     }
     set timeout(timeout: number) {
-        this._readTimeout = timeout
+        this._timeout = timeout
-    }
-    get connectTimeout() {
-        return this._connectTimeout
-    }
-    set connectTimeout(timeout: number) {
-        this._connectTimeout = timeout
-    }
-    get readTimeout() {
-        return this._readTimeout
-    }
-    set readTimeout(timeout: number) {
-        this._readTimeout = timeout
     }
     get readyState() {
         return this._readyState
@@ -156,7 +143,7 @@ export class XMLHttpRequest {
         this._requestHeaders[key] = val
     }
     getResponseHeader(key: string): string {
-        return this._responseHeaders[key]?.[0]
+        return this._responseHeaders[key]
     }
     getAllResponseHeaders(): any {
         return this._responseHeaders
@@ -182,8 +169,8 @@ export class XMLHttpRequest {
         this._connection.setRequestMethod(this._method)
         this._connection.setDoOutput(true)
         this._connection.setDoInput(true)
-        this._connection.setConnectTimeout(this._connectTimeout)
+        this._connection.setConnectTimeout(this._timeout)
-        this._connection.setReadTimeout(this._readTimeout)
+        this._connection.setReadTimeout(this._timeout)
 
         this.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
         this.setReadyState(ReadyState.OPENED)
@@ -194,7 +181,7 @@ export class XMLHttpRequest {
         }
         if (this._readyState !== ReadyState.OPENED) { throw new Error(`Error Status ${this._readyState}!`) }
         let future = executor.submit(new Callable({ call: () => this._send(body) }))
-        if (!this._async) { future.get(this._connectTimeout + this._readTimeout + 100, TimeUnit.MILLISECONDS) }
+        if (!this._async) { future.get(this._timeout, TimeUnit.MILLISECONDS) }
         return future
     }
     get() {
@@ -212,23 +199,22 @@ export class XMLHttpRequest {
     }
     abort() {
         this._connection.disconnect()
-        this.onabort?.()
+        this.onabort && this.onabort()
     }
 
     private _send(body?: string | object) {
         try {
             this._connection.connect()
-            this.onloadstart?.()
+            this.onloadstart && this.onloadstart()
             if (body) {
                 let bodyType = Object.prototype.toString.call(body)
-                if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string.`) }
+                if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string!`) }
                 var out = this._connection.getOutputStream()
                 out.write(new JavaString(body).getBytes(UTF_8))
                 out.flush()
                 out.close()
             }
             this.setReadyState(ReadyState.LOADING)
-            this.onload?.()
             this._status = this._connection.getResponseCode()
             this._statusText = this._connection.getResponseMessage()
             if (this._status >= 0 && this._status < 300) {
@@ -238,8 +224,8 @@ export class XMLHttpRequest {
             } else {
                 this._responseText = this.readOutput(this._connection.getErrorStream())
             }
-            this.setResponseHeaders()
+            this.setResponseHeaders(this._connection.getHeaderFields())
-            this.onloadend?.()
+            this.onloadend && this.onloadend()
         } catch (ex: any) {
             if (ex instanceof SocketTimeoutException && this.ontimeout) {
                 return this.ontimeout(ex)
@@ -253,15 +239,15 @@ export class XMLHttpRequest {
         }
     }
 
-    private setResponseHeaders() {
+    private setResponseHeaders(header: any) {
-        this._connection.getHeaderFields().forEach((key: string | number, value: any[]) => {
+        header.forEach((key: string | number, value: string | any[]) => {
-            this._responseHeaders[key + ''] = Java.from(value)
+            this._responseHeaders[key + ''] = value[value.length - 1] + ''
         })
     }
 
     private setReadyState(state: ReadyState) {
         this._readyState = state
-        this.onreadystatechange?.()
+        this.onreadystatechange && this.onreadystatechange()
     }
 
     private readOutput(input: any) {

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",
@@ -21,7 +21,7 @@
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/qrcode/package.json

@@ -1,26 +0,0 @@
-{
-    "name": "@ccms/qrcode",
-    "version": "0.27.4",
-    "description": "MiaoScript qrcode 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"
-    }
-}

packages/sponge/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.27.4",
+    "version": "0.19.5",
-    "description": "MiaoScript sponge package",
+    "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
         "minecraft",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "@javatypes/sponge-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/sponge/src/particle.ts

@@ -1,15 +1,32 @@
 import { provideSingleton } from '@ccms/container'
-import { particle } from '@ccms/api'
+import { particle, plugin } from '@ccms/api'
 
 @provideSingleton(particle.ParticleManager)
 export class SpongeParticleManager extends particle.ParticleManager {
+    private globalSpawner = new SpongeParticleSpawner()
+    constructor() {
+        super()
+        particle.ParticleManager.globalSpawner = this.globalSpawner
+    }
+    protected getGlobalSpawner() {
+        return this.globalSpawner
+    }
 }
-@provideSingleton(particle.ParticleSpawner)
 export class SpongeParticleSpawner extends particle.ParticleSpawner {
-    spawn(location: any, particle: particle.Particle) {
+    spawnParticle(location: org.spongepowered.api.world.Location<any>, particle: any, count: number = 1) {
-        throw new Error('Not Impl.')
+        location.getPosition()
+        // location.getWorld().spawnParticle(particle, location, count)
     }
-    spawnToPlayer(player: any, location: any, particle: particle.Particle) {
+    spawn(location: any, particle: particle.Particle) {
-        throw new Error('Not Impl.')
+        location.getWorld().spawnParticle(
+            particle.getParticle(),
+            location,
+            particle.getCount(),
+            particle.getOffsetX(),
+            particle.getOffsetY(),
+            particle.getOffsetZ(),
+            particle.getExtra(),
+            particle.getData()
+        )
     }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -20,13 +20,13 @@
     },
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/common": "^0.27.4",
+        "@ccms/common": "^0.19.0",
-        "@ccms/container": "^0.27.4",
+        "@ccms/container": "^0.19.0",
-        "@ccms/database": "^0.27.4"
+        "@ccms/database": "^0.19.5"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.27.4",
+    "version": "0.19.5",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -25,11 +25,11 @@
         "@javatypes/spring-web": "^0.0.3",
         "@javatypes/tomcat": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.27.4",
+        "@ccms/api": "^0.19.5",
-        "@ccms/container": "^0.27.4"
+        "@ccms/container": "^0.19.0"
     }
 }

packages/websocket/.prettierrc

@@ -1,4 +0,0 @@
-{
-    "tabWidth": 2,
-    "semi": true
-}

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.27.4",
+    "version": "0.19.0",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -19,15 +19,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@socket.io/component-emitter": "3.1.0",
         "backo2": "^1.0.2",
         "parseuri": "^0.0.6"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.27.4",
+        "@ccms/nashorn": "^0.19.0",
         "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
-        "rimraf": "^4.1.2",
+        "rimraf": "^3.0.2",
-        "typescript": "^4.9.5"
+        "typescript": "^4.5.5"
     }
 }

packages/websocket/src/client/index.ts

@@ -38,7 +38,7 @@ export class WebSocket extends EventEmitter {
 
     private client: Transport
 
-    constructor(url: string, subProtocol: string | string[] = '', headers: WebSocketHeader = {}) {
+    constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
         super()
         this.manager = manager
         this._url = url

packages/websocket/src/client/netty/index.ts

@@ -58,7 +58,7 @@ export class NettyWebSocket extends Transport {
     private _host: string
     private _port: number
     private channel: any
-    private b: any
+    private b = new Bootstrap();
 
     constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
         super(url, subProtocol, headers)
@@ -102,7 +102,6 @@ export class NettyWebSocket extends Transport {
         // HttpResponseDecoder to WebSocketHttpResponseDecoder in the pipeline.
         let handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory
             .newHandshaker(uri, WebSocketVersion.V13, null, false, headers), this)
-        this.b = new Bootstrap()
         this.b.group(group)
             .channel(socketChannelClass)
             .handler(new ChannelInitializer({
@@ -124,7 +123,6 @@ export class NettyWebSocket extends Transport {
                 }
             }))
         this.b.connect(this._host, this._port).addListener(new ChannelFutureListener((future: any) => {
-            try {
             this.channel = future.sync().channel()
             this.onconnection({})
             handler.handshakeFuture.addListener(new ChannelFutureListener((future: any) => {
@@ -137,9 +135,6 @@ export class NettyWebSocket extends Transport {
                     // this.onerror({ error })
                 }
             }))
-            } catch (error: any) {
-                this.onerror({ error })
-            }
         }))
     }
     doSend(text: string) {

packages/websocket/src/debug.ts

@@ -1,57 +1 @@
-export = (namepsace) =>
+export = (namepsace) => (...args) => { }//console.debug(namepsace, ...args)
-    (...args) => {
-        console.trace(`[${namepsace}] ` + format(...args))
-    } //console.debug(namepsace, ...args)
-let formatters: any = {}
-formatters.s = function (v) {
-    return v
-}
-formatters.j = function (v) {
-    try {
-        return JSON.stringify(v)
-    } catch (error: any) {
-        return "[UnexpectedJSONParseError]: " + error.message
-    }
-}
-/**
- * Coerce `val`.
- *
- * @param {Mixed} val
- * @return {Mixed}
- * @api private
- */
-function coerce(val) {
-    if (val instanceof Error) {
-        return val.stack || val.message
-    }
-    return val
-}
-function format(...args) {
-    // Apply any `formatters` transformations
-    args[0] = coerce(args[0])
-
-    if (typeof args[0] !== "string") {
-        // Anything else let's inspect with %O
-        args.unshift("%O")
-    }
-
-    let index = 0
-    args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format) => {
-        // If we encounter an escaped % then don't increase the array index
-        if (match === "%%") {
-            return "%"
-        }
-        index++
-        const formatter = formatters[format]
-        if (typeof formatter === "function") {
-            const val = args[index]
-            match = formatter.call(format, val)
-
-            // Now we need to remove `args[index]` since it's inlined in the `format`
-            args.splice(index, 1)
-            index--
-        }
-        return match
-    })
-    return args[0]
-}

packages/websocket/src/engine.io-client/contrib/has-cors.ts

@@ -1,12 +0,0 @@
-// imported from https://github.com/component/has-cors
-let value = false;
-
-try {
-    value = typeof XMLHttpRequest !== 'undefined' &&
-        'withCredentials' in new XMLHttpRequest();
-} catch (err) {
-    // if XMLHttp support is disabled in IE then it will throw
-    // when trying to create
-}
-
-export const hasCORS = value;

packages/websocket/src/engine.io-client/contrib/parseqs.ts

@@ -1,38 +0,0 @@
-// imported from https://github.com/galkn/querystring
-/**
- * Compiles a querystring
- * Returns string representation of the object
- *
- * @param {Object}
- * @api private
- */
-
-export function encode(obj) {
-    let str = ''
-
-    for (let i in obj) {
-        if (obj.hasOwnProperty(i)) {
-            if (str.length) str += '&'
-            str += encodeURIComponent(i) + '=' + encodeURIComponent(obj[i])
-        }
-    }
-
-    return str
-}
-
-/**
- * Parses a simple querystring into an object
- *
- * @param {String} qs
- * @api private
- */
-
-export function decode(qs) {
-    let qry = {}
-    let pairs = qs.split('&')
-    for (let i = 0, l = pairs.length; i < l; i++) {
-        let pair = pairs[i].split('=')
-        qry[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1])
-    }
-    return qry
-}