v0.24.0

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

lerna.json

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

package.json

@@ -14,7 +14,7 @@
         "np": "./script/push.sh",
         "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
         "lp": "lerna publish --registry https://registry.npmjs.org",
-        "lpb": "lerna publish --registry https://registry.npmjs.org --canary --pre-dist-tag beta"
+        "lpb": "lerna publish --registry https://registry.npmjs.org --canary --preid beta --pre-dist-tag beta"
     },
     "workspaces": [
         "packages/*"

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,9 +19,9 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2",
-        "@ccms/polyfill": "^0.21.2",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0",
+        "@ccms/polyfill": "^0.24.0",
         "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },

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.nashorn.', 'org.openjdk.nashorn', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
+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']
 
 enum LogLevel {
     ALL,
@@ -18,12 +18,114 @@ 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)
+                            } else if (global.debug) {
+                                console.debug('readSourceMap can\'t found', fileName, 'source map file', sourceMappingURL)
+                            }
+                        }
+                        if (sourceContent) {
+                            sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
+                            sourceFileMaps[fileName] = Paths.get(fileName, '..', sourceMaps[fileName].sources[0]).toFile().getCanonicalPath()
+                        }
+                    }
+                }
+                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} => §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 } = 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
 
@@ -92,91 +194,8 @@ 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[] {
-        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
+        return jsconsole.getStackTrace(ex, color)
     }
     assert(value: any, message?: string, ...optionalParams: any[]): void {
         throw new Error("Method not implemented.")

packages/api/src/constants.ts

@@ -11,10 +11,21 @@ export namespace constants {
     }
     export namespace Reflect {
         export const Method = {
-            getServerConnection: [/*spigot 1.8.8*/'aq',/*spigot 1.12.2*/ 'an', /*spigot 1.14.4+*/'getServerConnection', /*catserver 1.12.2*/'func_147137_ag']
+            getServerConnection: [
+                /*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: [/*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']
+            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'
+            ]
         }
     }
     export enum ServerType {

packages/api/src/database.ts

@@ -6,6 +6,10 @@ export namespace database {
      * 数据库配置
      */
     export interface DataBaseConfig {
+        /**
+         * 数据库类型
+         */
+        type: 'h2' | 'mysql' | 'mongodb' | 'sqlite' | 'postgres' | 'redis'
         /**
          * 数据库连接串
          */
@@ -35,6 +39,9 @@ export namespace 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 {

packages/api/src/index.ts

@@ -4,11 +4,13 @@ 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

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

@@ -149,7 +149,19 @@ export namespace plugin {
         /**
          * 插件名称 不填默认为类名
          */
-        name?: string
+        name: string
+        /**
+         * 插件中文名称
+         */
+        cname?: string
+        /**
+         * 付费插件ID
+         */
+        pid?: number
+        /**
+         * 付费插件等级 付费插件自动注入
+         */
+        level?: number
         /**
          * 前缀
          */

packages/api/src/server.ts

@@ -172,13 +172,13 @@ export namespace server {
         }
         protected reflectRootLogger(consoleServer: any) {
             try {
-                this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
+                this.rootLogger = reflect.on(consoleServer).get('LOGGER').get()
             } catch (error: any) {
                 if (global.debug) {
                     console.ex(error)
                 }
                 try {
-                    this.rootLogger = reflect.on(consoleServer).get(0).get().parent
+                    this.rootLogger = reflect.on(consoleServer).get(0).get()
                 } catch (error: any) {
                     if (global.debug) {
                         console.ex(error)

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/bukkit/src/event.ts

@@ -2,6 +2,7 @@ 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")
@@ -19,7 +20,15 @@ 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,6 +4,7 @@ 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,12 +6,14 @@ 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) {
@@ -20,12 +22,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()
-            let nmsChatSerializerMethod = this.remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
-            this.nmsChatSerializerMethodName = nmsChatSerializerMethod.getName()
+            this.nmsChatSerializerMethodName = this.getNmsChatSerializerMethodName(nmsChatSerializerClass)
             this.ChatSerializer = Java.type(nmsChatSerializerClass.getName())
             let packetTypeClass = this.getPacketPlayOutChatClass()
             this.PacketPlayOutChat = Java.type(packetTypeClass.getName())
@@ -37,12 +39,14 @@ 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.remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', this.getPacketClass()).getName()
+            this.sendPacketMethodName = this.getSendPacketMethodName(playerConnectionField.getType())
         } 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
@@ -50,10 +54,12 @@ 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('.'))
@@ -83,9 +89,9 @@ abstract class BukkitChatInvoke {
         }
     }
 
-    json(sender: { name: string }, json: string) {
+    json(sender: any, json: string) {
         if (this.downgrade) {
-            return '/tellraw ' + sender.name + ' ' + json
+            return sender.spigot().sendMessage(this.ComponentSerializer.parse(json))
         } else {
             this.send(sender, json, 0)
             return false
@@ -100,6 +106,13 @@ 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)
     }
@@ -149,17 +162,31 @@ class BukkitChatInvoke_1_17_1 extends BukkitChatInvoke_1_16_5 {
     }
 }
 
+class BukkitChatInvoke_1_19 extends BukkitChatInvoke_1_17_1 {
+    getSendPacketMethodName(playerConnectionClass: any) {
+        return playerConnectionClass.getMethod('a', this.getPacketClass()).getName()
+    }
+    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 == 0 ? 1 : 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 >= 8) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
-    } else if (nmsSubVersion >= 16) {
-        bukkitChatInvoke = new BukkitChatInvoke_1_16_5(nmsVersion)
+    if (nmsSubVersion >= 19) {
+        bukkitChatInvoke = new BukkitChatInvoke_1_19(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) {
+        bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
     } else {
         bukkitChatInvoke = new BukkitChatInvoke_1_7_10(nmsVersion)
     }

packages/bukkit/src/item.ts

@@ -0,0 +1,126 @@
+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 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(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()
+            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')
+            } 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/tsconfig.json

@@ -2,6 +2,7 @@
     "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.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.21.0",
+    "version": "0.24.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript common package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/common/src/reflect.ts

@@ -54,6 +54,7 @@ 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)
     }
 
@@ -129,12 +130,14 @@ 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) {
@@ -146,21 +149,32 @@ 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 {
-            methodCache.set(key, clazz.getMethod(nameOrIndex, clazzs as any))
+                console.debug(`reflect method ${typeof nameOrIndex == "number" ? 'index' : 'name'} ${nameOrIndex} from ${target.getName()}`)
+                try {
+                    methodCache.set(key, target.getMethod(nameOrIndex, clazzs as any))
                 } catch (ex: any) {
                     try {
-                methodCache.set(key, clazz.getDeclaredMethod(nameOrIndex, clazzs as any))
+                        methodCache.set(key, target.getDeclaredMethod(nameOrIndex, clazzs as any))
                     } catch (ex: any) {
-                for (const m of Java.from(declaredMethods(clazz))) {
+                        for (const m of Java.from(declaredMethods(target))) {
                             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,77 +32,81 @@ class Tellraw {
 
     then(part: ChatMessagePart | string) {
         if (typeof part === "string") {
-            var newPart = new ChatMessagePart();
+            var newPart = new ChatMessagePart()
             newPart.text = part
-            this.then(newPart);
-            return this;
+            this.then(newPart)
+            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;
-        return this;
+        this.latest().text = text
+        return this
     }
 
-    tip(text: string) {
-        this.latest().hover("show_text", text);
-        return this;
+    tip(texts: string) {
+        return this.hover(texts)
     }
 
-    item(text: string) {
-        this.latest().hover("show_item", text);
-        return this;
+    hover(texts: string) {
+        this.latest().hover("show_text", texts)
+        return this
+    }
+
+    item(item: string) {
+        this.latest().hover("show_item", item)
+        return this
     }
 
     command(command: string) {
-        this.latest().click("run_command", command);
-        return this;
+        this.latest().click("run_command", command)
+        return this
     }
 
     suggest(url: string) {
-        this.latest().click("suggest_command", url);
-        return this;
+        this.latest().click("suggest_command", url)
+        return this
     }
 
     file(path: string) {
-        this.latest().click("open_file", path);
-        return this;
+        this.latest().click("open_file", path)
+        return this
     }
 
     link(url: string) {
-        this.latest().click("open_url", url);
-        return this;
+        this.latest().click("open_url", url)
+        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());
-            });
-            this.cache = JSON.stringify(temp);
-            console.trace(this.cache);
+                temp.push(t.convert())
+            })
+            this.cache = JSON.stringify(temp)
+            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

@@ -0,0 +1,35 @@
+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.21.0",
+    "version": "0.24.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.6.3"

packages/container/src/index.ts

@@ -102,8 +102,8 @@ export const MavenDepend = (groupId: string, artifactId: string, version: string
 const loadedMavenDepend = new Set<string>()
 
 export function loadMavenDepend(groupId: string, artifactId: string, version: string, recursion = false) {
-    try {
     const key = `${groupId}:${artifactId}:${version}`
+    try {
         if (loadedMavenDepend.has(key)) { return }
         console.info('loading maven dependency', key)
         let [pom, _] = base.loadMavenDepend(groupId, artifactId, version)
@@ -137,7 +137,7 @@ export function loadMavenDepend(groupId: string, artifactId: string, version: st
             }
         }
     } catch (error: any) {
-        console.warn('attachMavenDepend failed. Error: ' + error)
+        console.warn('load maven dependency', key, 'failed. Error:', error)
         if (global.debug) {
             console.ex(error)
         }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript core package",
     "keywords": [
         "miaoscript",
@@ -24,8 +24,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -1,11 +1,12 @@
 let containerStartTime = Date.now()
 console.i18n("ms.core.ioc.initialize", { scope: global.scope })
-import { plugin, server, task, constants } from '@ccms/api'
+import { plugin, server, task, constants, console as jsconsole } 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')
 
@@ -25,6 +26,11 @@ class MiaoScriptCore {
         this.loadServerConsole()
         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()
     }
 
@@ -123,13 +129,7 @@ function loadMiaoScriptConfig() {
     global.ScriptSlowExecuteTime = global.ScriptEngineConfig.slow_execute || 50
 }
 
-function initialize() {
-    process.emit('core.before.initialize')
-    loadMiaoScriptConfig()
-    global.ScriptEngineVersion = require('../package.json').version
-    global.setGlobal('loadCoreScript', loadCoreScript)
-    loadCoreScript('initialize')
-    try {
+function createCore() {
     let corePackageStartTime = new Date().getTime()
     container.bind(ContainerInstance).toConstantValue(container)
     container.bind(plugin.PluginInstance).toConstantValue(base.getInstance())
@@ -150,23 +150,26 @@ function initialize() {
     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)
+}
 
-        let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-        console.i18n("ms.core.engine.completed", {
-            loader: base.version,
-            version: 'v' + global.ScriptEngineVersion,
-            time: (Date.now() - global.ScriptEngineStartTime) / 1000
-        })
-        process.emit('core.after.initialize')
-        return disable
+function initialize() {
+    process.emit('core.before.initialize')
+    loadMiaoScriptConfig()
+    global.ScriptEngineVersion = require('../package.json').version
+    global.setGlobal('loadCoreScript', loadCoreScript)
+    loadCoreScript('initialize')
+    try {
+        let core = createCore()
+        return VersionUtils.isGreaterOrEqual(base.version, '0.22.0') ? core : core.enable()
     } catch (error: any) {
-        if (console.console) {
-            console.i18n("ms.core.initialize.error", { error })
-            console.ex(error)
-        } else {
-            error.printStackTrace()
-        }
-        return () => console.i18n('ms.core.engine.disable.abnormal')
+        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')
     }
 }
 

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/database/src/database.ts

@@ -1,6 +1,8 @@
 import { database } from '@ccms/api'
-import { JSClass, postConstruct } from '@ccms/container'
+import { JSClass } from '@ccms/container'
 
+const Thread = Java.type('java.lang.Thread')
+const JavaString = Java.type('java.lang.String')
 const Properties = Java.type('java.util.Properties')
 
 /**
@@ -25,9 +27,21 @@ export class DataBase extends database.DataBase {
 
     private createDataSource(dbConfig: database.DataBaseConfig) {
         if (typeof dbConfig.url === "string") {
+            let originClassLoader = Thread.currentThread().getContextClassLoader()
+            Thread.currentThread().setContextClassLoader(base.getInstance().class.classLoader)
             let config = new this.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)
@@ -43,15 +57,17 @@ export class DataBase extends database.DataBase {
                 }
                 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)
     }
 
-    @postConstruct()
-    private initialize() {
-        this.jdbcTemplate = new this.JdbcTemplate(this.dataSource)
+    getDataSource() {
+        return this.dataSource
     }
 
     /**
@@ -62,7 +78,7 @@ export class DataBase extends database.DataBase {
     query<T>(sql: string, ...args: any[]): Array<T> {
         let startTime = Date.now()
         let result = Java.from<any>(this.jdbcTemplate.queryForList(sql, args))
-        console.debug(java.lang.String.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(JavaString.format(`\n[DB] query \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
@@ -74,7 +90,7 @@ export class DataBase extends database.DataBase {
     update(sql: string, ...args: any[]): number {
         let startTime = Date.now()
         let result = this.jdbcTemplate.update(sql, args)
-        console.debug(java.lang.String.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
+        console.debug(JavaString.format(`\n[DB] update \nSQL  : ${sql.replace(/\?/ig, '%s')} \nCOST : ${Date.now() - startTime}ms`, args))
         return result
     }
 
@@ -85,7 +101,7 @@ export class DataBase extends database.DataBase {
     execute(sql: string): void {
         let startTime = Date.now()
         this.jdbcTemplate.execute(sql)
-        console.debug(java.lang.String.format(`\n[DB] execute \nSQL  : sql} \nCOST : ${Date.now() - startTime}ms`))
+        console.debug(`\n[DB] execute \nSQL  : ${sql} \nCOST : ${Date.now() - startTime}ms`)
     }
 
     close() {

packages/database/src/decorators.ts

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

packages/database/src/manager.ts

@@ -1,5 +1,5 @@
 import { database } from '@ccms/api'
-import { provideSingleton } from '@ccms/container'
+import { JSClass, provideSingleton } from '@ccms/container'
 import { DataBase } from './database'
 
 @provideSingleton(database.DataBaseManager)
@@ -7,11 +7,32 @@ export class DataBaseManager extends database.DataBaseManager {
     private mainDatabase: DataBase
     private databases = new Map<string, DataBase>()
 
+    @JSClass('org.h2.tools.Server')
+    private Server: any
+
+    private webManager: any
+
     constructor() {
         super()
-        process.on('exit', () => this.disable())
+        process.on('exit', () => this.shutdown())
     }
 
+    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 主数据库

packages/database/src/model.ts

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

packages/i18n/languages/zh_cn.yml

@@ -34,7 +34,7 @@ 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: "总计 {count} 个 {type} 事件 映射完成..."
+ms.plugin.event.map: "映射 {type} 事件 成功 总计 {count} 个 {type} 事件..."
 ms.plugin.event.map.error: "映射 {type} 事件 异常 将无法使用事件简称. Error: {error}"
 ms.plugin.manager.scan: "扫描器 {scanner} 扫描 {folder} 中的插件..."
 ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始编译..."

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "@types/js-yaml": "^4.0.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",

packages/molang/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/molang",
-    "version": "0.21.0",
+    "version": "0.24.0",
     "description": "A fast parser for Minecraft's MoLang",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript nashorn package",
     "keywords": [
         "miaoscript",

packages/nashorn/src/index.ts

@@ -48,7 +48,10 @@ declare global {
             scope: string
             logger: any
             debug: boolean
-            level: string
+            /**
+             * 引擎日志等级
+             */
+            ScriptEngineLoggerLevel: string
             /**
              * 引擎配置
              */

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "tslib": "^2.3.1",

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript plugin package",
     "keywords": [
         "miaoscript",
@@ -26,10 +26,10 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2",
-        "@ccms/i18n": "^0.21.2",
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0",
+        "@ccms/i18n": "^0.24.0",
         "@ccms/verify": "^0.21.1",
         "crypto-js": "^4.1.1",
         "js-yaml": "^4.1.0"

packages/plugin/src/config.ts

@@ -83,7 +83,7 @@ export class PluginConfigManager {
                         name: metadata.name,
                         format: metadata.format
                     })
-                } else {
+                } else if (metadata.migrate) {
                     configValue = configLoader.load(base.read(metadata.file)) || {}
                     if (defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
                         base.save(metadata.file, configLoader.dump(configValue))

packages/plugin/src/decorators.ts

@@ -76,6 +76,7 @@ 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/interfaces.ts

@@ -91,6 +91,10 @@ export namespace interfaces {
          * 配置文件格式 默认 yml
          */
         format?: string
+        /**
+         * 是否合并默认配置
+         */
+        migrate?: boolean
         /**
          * 自动保存 默认为 false
          */

packages/plugin/src/manager.ts

@@ -69,7 +69,7 @@ export class PluginManagerImpl implements plugin.PluginManager {
             try {
                 console.i18n('ms.plugin.event.map', { count: this.eventManager.mapEventName(), type: this.serverType })
             } catch (error) {
-                console.i18n('ms.plugin.event.map.error', { error })
+                console.i18n('ms.plugin.event.map.error', { type: this.serverType, error })
             }
             let pluginScanner = this.container.getAll<plugin.PluginScanner>(plugin.PluginScanner)
             pluginScanner.forEach((scanner) => {

packages/polyfill/package.json

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

packages/polyfill/src/index.ts

@@ -14,3 +14,4 @@ global.setGlobal('Proxy', require('./proxy').Proxy)
 global.setGlobal('XMLHttpRequest', require('./xml-http-request').XMLHttpRequest)
 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,6 +2,7 @@ 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")
@@ -15,19 +16,35 @@ 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/ployfill-micro-task")
+const threadGroup = new ThreadGroup("@ccms/micro-task")
 const microTaskPool = new ThreadPoolExecutor(
     100, 200, 60, TimeUnit.SECONDS,
-    new LinkedBlockingQueue(300),
+    new LinkedBlockingQueue(1024),
     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', () => {
@@ -49,10 +66,10 @@ class Process extends EventEmitter {
             }
         })
     }
-    nextTick(func: Function, ...args: any[]) {
+    nextTick(callback: Function, ...args: any[]): void {
         microTaskPool.execute(() => {
             try {
-                func(args)
+                callback(args)
             } catch (origin: any) {
                 try {
                     super.emit('error', origin)
@@ -65,9 +82,44 @@ class Process extends EventEmitter {
     }
     exit(code: number) {
         console.log(`process exit by code ${code}!`)
-        this.emit('exit', code)
+        this.emit('exit', this.exitCode = 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]"
     }
@@ -76,16 +128,16 @@ class Process extends EventEmitter {
 class EventLoop {
     private eventLoopMainThread = undefined
     private eventLoopTaskQueue = new DelayQueue()
-    private taskExecTimeout = 3
+    private taskExecuteTimeout = 3000
     private fixedThreadPool = undefined
 
     constructor() {
-        this.taskExecTimeout = parseInt(process.env.MS_NODE_EVENT_LOOP_TIMEOUT) || 3
+        this.taskExecuteTimeout = parseInt(process.env.MS_TASK_EXECUTE_TIMEOUT) || 3000
         this.fixedThreadPool = new ThreadPoolExecutor(
             1, 1, 0, TimeUnit.SECONDS,
-            new LinkedBlockingQueue(300),
+            new LinkedBlockingQueue(1024),
             new ThreadFactory((run: any) => {
-                let thread = new Thread(run, "@ccms/node-shim/event-loop-exec")
+                let thread = new Thread(run, "@ccms/event-loop")
                 thread.setDaemon(true)
                 return thread
             }))
@@ -115,7 +167,7 @@ class EventLoop {
                 this.intervalTasks = undefined
                 this.eventLoopMainThread = undefined
             }
-        }, "@ccms/node-shim/event-loop")
+        }, "@ccms/event-loop")
         this.eventLoopMainThread.setDaemon(true)
         process.on('exit', () => {
             this.eventLoopMainThread.interrupt()
@@ -137,7 +189,9 @@ class EventLoop {
         if (!callback) {
             throw new Error(`task ${name} callback function can't be null!`)
         }
-        if (this.fixedThreadPool.isShutdown()) { return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`) }
+        if (this.fixedThreadPool.isShutdown()) {
+            return console.warn(`FixedThreadPool isTerminated! ignore Task ${name}!`)
+        }
         try {
             this.fixedThreadPool.submit(new Callable({
                 call: () => {
@@ -153,13 +207,13 @@ class EventLoop {
                         }
                     }
                 }
-            })).get(this.taskExecTimeout, TimeUnit.SECONDS)
+            })).get(this.taskExecuteTimeout, TimeUnit.MILLISECONDS)
         } 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.taskExecTimeout}s!`)
+                return console.warn(`Task ${name} => ${callback} exec time greater than ${this.taskExecuteTimeout}s!`)
             }
             throw error.getCause && error.getCause() || error
         }

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.21.0",
+    "version": "0.24.0",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript sponge package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -24,9 +24,9 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/common": "^0.21.2",
-        "@ccms/container": "^0.21.2",
-        "@ccms/database": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0",
+        "@ccms/database": "^0.24.0"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -29,7 +29,7 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.21.2",
-        "@ccms/container": "^0.21.2"
+        "@ccms/api": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.21.2",
+    "version": "0.24.0",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -23,7 +23,7 @@
         "parseuri": "^0.0.6"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.21.2",
+        "@ccms/nashorn": "^0.24.0",
         "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

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 = new Bootstrap();
+    private b: any
 
     constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
         super(url, subProtocol, headers)
@@ -102,6 +102,7 @@ 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({
@@ -123,6 +124,7 @@ 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) => {
@@ -135,6 +137,9 @@ export class NettyWebSocket extends Transport {
                         // this.onerror({ error })
                     }
                 }))
+            } catch (error: any) {
+                this.onerror({ error })
+            }
         }))
     }
     doSend(text: string) {