v0.24.0

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

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.23.0",
+    "version": "0.24.0",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.23.0",
+    "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.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.23.0",
+        "@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.23.0",
+    "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.23.0",
-        "@ccms/container": "^0.23.0",
-        "@ccms/polyfill": "^0.23.0",
+        "@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/plugin.ts

@@ -155,7 +155,11 @@ export namespace plugin {
          */
         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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/bukkit/src/internal/chat.ts

@@ -6,7 +6,7 @@ let bukkitChatInvoke: BukkitChatInvoke
 abstract class BukkitChatInvoke {
     private downgrade: boolean = false
     protected RemapUtils: any
-    protected ComponentSerializer:any
+    protected ComponentSerializer: any
 
     protected ChatSerializer: any
     protected nmsChatSerializerMethodName: string
@@ -39,6 +39,8 @@ abstract class BukkitChatInvoke {
                     if (nmsChatMessageTypeClass.isEnum()) {
                         this.chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
                         break
+                    } else if (nmsChatMessageTypeClass.getName() == 'int') {
+                        break
                     }
                 }
             }

packages/bungee/package.json

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

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.23.0",
+    "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.23.0",
+        "@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)
     }
 

packages/compile/package.json

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

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.23.0",
+    "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.23.0",
+        "@ccms/nashorn": "^0.24.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.6.3"

packages/core/package.json

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

packages/database/package.json

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

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.23.0",
+    "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.23.0",
+        "@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.23.0",
+    "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.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@ccms/api": "^0.24.0",
+        "@ccms/common": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.23.0",
+        "@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.23.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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript nashorn package",
     "keywords": [
         "miaoscript",

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.23.0",
+    "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.23.0",
+        "@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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript plugin package",
     "keywords": [
         "miaoscript",
@@ -26,10 +26,10 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0",
-        "@ccms/i18n": "^0.23.0",
+        "@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/polyfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/polyfill",
-    "version": "0.23.0",
+    "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.23.0",
-        "@ccms/nodejs": "^0.23.0",
+        "@ccms/i18n": "^0.24.0",
+        "@ccms/nodejs": "^0.24.0",
         "core-js": "^3.22.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.23.0",
+        "@ccms/nashorn": "^0.24.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^4.6.3"

packages/protocol/package.json

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

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript sponge package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -24,9 +24,9 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/common": "^0.23.0",
-        "@ccms/container": "^0.23.0",
-        "@ccms/database": "^0.23.0"
+        "@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.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -29,7 +29,7 @@
         "typescript": "^4.6.3"
     },
     "dependencies": {
-        "@ccms/api": "^0.23.0",
-        "@ccms/container": "^0.23.0"
+        "@ccms/api": "^0.24.0",
+        "@ccms/container": "^0.24.0"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.23.0",
+    "version": "0.24.0",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -23,7 +23,7 @@
         "parseuri": "^0.0.6"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.23.0",
+        "@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,18 +124,22 @@ export class NettyWebSocket extends Transport {
                 }
             }))
         this.b.connect(this._host, this._port).addListener(new ChannelFutureListener((future: any) => {
-            this.channel = future.sync().channel()
-            this.onconnection({})
-            handler.handshakeFuture.addListener(new ChannelFutureListener((future: any) => {
-                try {
-                    future.sync()
-                    // only trigger onconnect when not have error
-                    this.onconnect({})
-                } catch (error: any) {
-                    // ignore error exceptionCaught from handler
-                    // this.onerror({ error })
-                }
-            }))
+            try {
+                this.channel = future.sync().channel()
+                this.onconnection({})
+                handler.handshakeFuture.addListener(new ChannelFutureListener((future: any) => {
+                    try {
+                        future.sync()
+                        // only trigger onconnect when not have error
+                        this.onconnect({})
+                    } catch (error: any) {
+                        // ignore error exceptionCaught from handler
+                        // this.onerror({ error })
+                    }
+                }))
+            } catch (error: any) {
+                this.onerror({ error })
+            }
         }))
     }
     doSend(text: string) {