v0.28.0-beta.2

README.MD

@@ -11,24 +11,25 @@
     ├─api            全平台兼容的接口
     ├─core           核心代码 用于引导加载
     ├─common         公共类库代码 例如 http reflect 模块
-    ├─client      NodeJS的Minecraft客户端 用于调试插件
+    ├─compile        编译器相关功能
+    ├─client         NodeJS 的 Minecraft 客户端 已迁移至 ms-client
     ├─container      IOC容器 用于注入具体实现
-    ├─ployfill    Nashorn 的一些自定义增强
+    ├─database       数据库相关功能
+    ├─protocol       协议处理相关功能
+    ├─service        服务相关功能
+    ├─i18n           多语言环境相关支持
+    ├─polyfill       Nashorn 的一些自定义增强
     ├─nashorn        Nashorn 的类型定义
+    ├─nodejs         NodeJS 的部分 Java 实现
     ├─bungee         BungeeCordAPI 内部实现
     ├─bukkit         BukkitAPI 内部实现
     ├─sponge         SpongeAPI 内部实现
     ├─nukkit         NukkitAPI 内部实现
+    ├─molang         MoLang 解析库
+    ├─qrcode         二维码相关类库
     ├─plugin         插件管理器
-    ├─websocket   Netty的WebSocket注入
+    ├─websocket      WebSocket 相关实现
-    ├─type        Java的类型定义
+    |   ├─client     基于 Netty 的 WebSocket 客户端
-    |   ├─bungee  BungeeCord类型定义
+    |   └─server     基于 Netty 的 WebSocket 服务端
-    |   ├─bukkit  Bukkit类型定义
+    └─type           类型定义 已迁移到 @javatypes
-    |   ├─sponge  Sponge类型定义
-    |   └─nukkit  Nukkit类型定义
-    └─plugins     这里当然是插件啦
-        ├─bungee  只兼容BungeeCord的插件
-        ├─bukkit  只兼容Bukkit的插件
-        ├─sponge  只兼容Sponge的插件
-        └─nukkit  只兼容Nukkit的插件
 ```

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.28.0-beta.0",
+  "version": "0.28.0-beta.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

package.json

@@ -13,9 +13,9 @@
         "ug": "yarn upgrade-interactive",
         "np": "./script/push.sh",
         "lsp": "npm login -scope=@ccms",
-        "lp": "lerna publish --verify-access --force-publish",
+        "lp": "lerna publish --force-publish",
-        "lpb": "lerna publish --preid beta --dist-tag beta --verify-access --force-publish",
+        "lpb": "lerna publish --preid beta --dist-tag beta --force-publish",
-        "lpc": "lerna publish --canary --preid beta --pre-dist-tag beta --verify-access --force-publish",
+        "lpc": "lerna publish --canary --preid beta --pre-dist-tag beta --force-publish",
         "lpf": "lerna publish from-package --yes",
         "sync": "./script/sync.sh"
     },

packages/amqp/package.json

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

packages/api/package.json

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

packages/api/src/command.ts

@@ -5,6 +5,13 @@ import { plugin } from './plugin'
 export namespace command {
     @injectable()
     export abstract class Command {
+        /**
+         * first time script engine need optimize jit code
+         * so ignore first slow exec notify
+         */
+        private cacheSlowCommandKey = {};
+        private cacheSlowCompleteKey = {};
+
         /**
          * 注册插件命令
          * @param plugin 插件
@@ -48,6 +55,8 @@ export namespace command {
                     let result = executor(sender, command, Java.from(args))
                     let cost = Date.now() - time
                     if (cost > global.ScriptSlowExecuteTime) {
+                        let commandKey = `${plugin.description.name}-${command}-${sender.name}`
+                        if (!this.cacheSlowCommandKey[commandKey]) { return this.cacheSlowCommandKey[commandKey] = cost }
                         console.i18n("ms.api.command.execute.slow", {
                             player: sender.name,
                             plugin: plugin.description.name,
@@ -58,23 +67,17 @@ export namespace command {
                     }
                     return result
                 } catch (ex: any) {
-                    console.i18n("ms.api.command.execute.error", {
+                    let message = i18n.translate("ms.api.command.execute.error", {
                         player: sender.name,
                         plugin: plugin.description.name,
                         command,
                         args: Java.from(args).join(' '),
                         ex
                     })
+                    console.console(message)
                     console.ex(ex)
                     if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", {
+                        console.sender(sender, [message, ...console.stack(ex)])
-                            player: sender.name,
-                            plugin: plugin.description.name,
-                            command,
-                            args: Java.from(args).join(' '),
-                            ex
-                        }),
-                        ...console.stack(ex)])
                     }
                     return true
                 }
@@ -89,6 +92,8 @@ export namespace command {
                     let result = this.copyPartialMatches(complete, token)
                     let cost = Date.now() - time
                     if (cost > global.ScriptSlowExecuteTime) {
+                        let completerKey = `${plugin.description.name}-${command}-${sender.name}`
+                        if (!this.cacheSlowCompleteKey[completerKey]) { return this.cacheSlowCompleteKey[completerKey] = cost }
                         console.i18n("ms.api.command.tab.completer.slow", {
                             player: sender.name,
                             plugin: plugin.description.name,
@@ -99,25 +104,17 @@ export namespace command {
                     }
                     return result
                 } catch (ex: any) {
-                    console.i18n("ms.api.command.tab.completer.error", {
+                    let message = i18n.translate("ms.api.command.tab.completer.error", {
                         player: sender.name,
                         plugin: plugin.description.name,
                         command,
                         args: Java.from(args).join(' '),
                         ex
                     })
+                    console.console(message)
                     console.ex(ex)
                     if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [
+                        console.sender(sender, [message, ...console.stack(ex)])
-                            i18n.translate("ms.api.command.tab.completer.error", {
-                                player: sender.name,
-                                plugin: plugin.description.name,
-                                command,
-                                args: Java.from(args).join(' '),
-                                ex
-                            }),
-                            ...console.stack(ex)
-                        ])
                     }
                     return []
                 }

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/common/package.json

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

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.0",
+        "@ccms/nashorn": "^0.28.0-beta.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^4.1.2",
         "typescript": "^4.9.5"

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript core package",
     "keywords": [
         "miaoscript",
@@ -24,8 +24,8 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/i18n/package.json

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

packages/keyvalue/package.json

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

packages/molang/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/molang",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "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.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript nashorn package",
     "keywords": [
         "miaoscript",

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.0",
+        "@ccms/nashorn": "^0.28.0-beta.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^4.1.2",
         "tslib": "^2.5.0",

packages/nodejs/src/events/index.ts

@@ -20,6 +20,7 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 'use strict';
+var Throwable = Java.type('java.lang.Throwable')
 var R = typeof Reflect === 'object' ? Reflect : null
 var ReflectApply = R && typeof R.apply === 'function'
     ? R.apply
@@ -136,13 +137,19 @@ EventEmitter.prototype.emit = function emit(type) {
         var er;
         if (args.length > 0)
             er = args[0];
-        if (er instanceof Error) {
+        if (er instanceof Error || er instanceof Throwable) {
             // Note: The comments on the `throw` lines are intentional, they show
             // up in Node's output if this results in an unhandled exception.
             throw er; // Unhandled 'error' event
         }
+        if (er.error instanceof Error || er.error instanceof Throwable) {
+            throw er.error; // Unhandled 'error' event
+        }
+        if (er.cause instanceof Error || er.error instanceof Throwable) {
+            throw er.error; // Unhandled 'error' event
+        }
         // At least give some kind of context to the user
-        var err = new Error('Unhandled error.' + (er ? ' (' + er.message + ')' : ''));
+        var err = new Error('Unhandled error.' + (er ? ' (' + (er.message || er.error || er.cause || er) + ')' : ''));
         // @ts-ignore
         err.context = er;
         throw err; // Unhandled 'error' event

packages/nodejs/src/fs/index.ts

@@ -5,6 +5,7 @@ const Path = Java.type("java.nio.file.Path");
 const JavaString = Java.type("java.lang.String");
 const File = Java.type("java.io.File");
 const Files = Java.type("java.nio.file.Files");
+const Paths = Java.type("java.nio.file.Paths");
 const Collector = Java.type("java.util.stream.Collector")
 const separatorChar = File.separatorChar;
 const StandardCopyOption = Java.type("java.nio.file.StandardCopyOption");
@@ -37,7 +38,7 @@ function javaFile(...opts: any[]) {
 }
 
 export function renameSync(oldPath: PathLike, newPath: PathLike): void {
-
+    Files.move(Paths.get(oldPath), Paths.get(oldPath), StandardCopyOption['ATOMIC_MOVE'])
 }
 export function truncateSync() {
 

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript plugin package",
     "keywords": [
         "miaoscript",
@@ -26,10 +26,10 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0",
+        "@ccms/container": "^0.28.0-beta.2",
-        "@ccms/i18n": "^0.28.0-beta.0",
+        "@ccms/i18n": "^0.28.0-beta.2",
         "@ccms/verify": "^0.25.1",
         "crypto-js": "^4.1.1",
         "js-yaml": "^4.1.0"

packages/polyfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/polyfill",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "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.28.0-beta.0",
+        "@ccms/i18n": "^0.28.0-beta.2",
-        "@ccms/nodejs": "^0.28.0-beta.0",
+        "@ccms/nodejs": "^0.28.0-beta.2",
         "core-js": "^3.27.2"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.0",
+        "@ccms/nashorn": "^0.28.0-beta.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^4.1.2",
         "typescript": "^4.9.5"

packages/polyfill/src/node-shim.ts

@@ -126,6 +126,7 @@ class Process extends EventEmitter {
 }
 
 class EventLoop {
+    private threadCount = new AtomicInteger(0)
     private eventLoopMainThread = undefined
     private eventLoopTaskQueue = new DelayQueue()
     private taskExecuteTimeout = 3000
@@ -134,10 +135,10 @@ class EventLoop {
     constructor() {
         this.taskExecuteTimeout = parseInt(process.env.MS_TASK_EXECUTE_TIMEOUT) || 3000
         this.fixedThreadPool = new ThreadPoolExecutor(
-            1, 1, 0, TimeUnit.SECONDS,
+            8, 16, 0, TimeUnit.SECONDS,
             new LinkedBlockingQueue(1024),
             new ThreadFactory((run: any) => {
-                let thread = new Thread(run, "@ccms/event-loop")
+                let thread = new Thread(run, "@ccms/event-loop-" + this.threadCount.incrementAndGet())
                 thread.setDaemon(true)
                 return thread
             }))
@@ -198,7 +199,7 @@ class EventLoop {
                     try {
                         callback.apply(undefined, args)
                     } catch (cause: any) {
-                        cause = cause.getCause && cause.getCause() || cause
+                        cause = cause.getCause ? cause.getCause() : cause
                         try {
                             process.emit('error', cause)
                         } catch (error: any) {
@@ -213,7 +214,7 @@ class EventLoop {
                 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.taskExecuteTimeout}ms!`)
             }
             throw error.getCause && error.getCause() || error
         }

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",

packages/qrcode/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/qrcode",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript qrcode package",
     "keywords": [
         "miaoscript",

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript sponge package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -24,9 +24,9 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/common": "^0.28.0-beta.0",
+        "@ccms/common": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0",
+        "@ccms/container": "^0.28.0-beta.2",
-        "@ccms/database": "^0.28.0-beta.0"
+        "@ccms/database": "^0.28.0-beta.2"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -29,7 +29,7 @@
         "typescript": "^4.9.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.28.0-beta.0",
+        "@ccms/api": "^0.28.0-beta.2",
-        "@ccms/container": "^0.28.0-beta.0"
+        "@ccms/container": "^0.28.0-beta.2"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.28.0-beta.0",
+    "version": "0.28.0-beta.2",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -24,7 +24,7 @@
         "parseuri": "^0.0.6"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.28.0-beta.0",
+        "@ccms/nashorn": "^0.28.0-beta.2",
         "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^4.1.2",

packages/websocket/src/client/index.ts

@@ -1,7 +1,7 @@
 
 import { EventEmitter } from 'events'
 import { Transport } from './transport'
-import { CloseEvent, ErrorEvent, Event, EventType, MessageEvent, WebSocketHeader } from './interface'
+import { ClientEvent, CloseEvent, ErrorEvent, Event, EventType, MessageEvent, WebSocketHeader } from './interface'
 
 export class WebSocketManager {
     private clients = new Map<string, WebSocket>()
@@ -18,7 +18,9 @@ export class WebSocketManager {
     add(client: WebSocket) {
         this.clients.set(client.id, client)
     }
+
     del(client: WebSocket) {
+        client.removeAllListeners()
         this.clients.delete(client.id)
     }
 }
@@ -26,12 +28,14 @@ export class WebSocketManager {
 export const manager = new WebSocketManager()
 
 export class WebSocket extends EventEmitter {
+    public static manager: WebSocketManager = manager
+
     public static CONNECTING = 0
     public static OPEN = 1
     public static CLOSING = 2
     public static CLOSED = 3
+
     public binaryType: 'blob' | 'arraybuffer'
-    protected manager: WebSocketManager
 
     protected _url: string
     protected _headers: WebSocketHeader = {}
@@ -40,7 +44,6 @@ export class WebSocket extends EventEmitter {
 
     constructor(url: string, subProtocol: string | string[] = '', headers: WebSocketHeader = {}) {
         super()
-        this.manager = manager
         this._url = url
         this._headers = headers
         try {
@@ -52,16 +55,14 @@ export class WebSocket extends EventEmitter {
             console.ex(error)
             return
         }
-        this.client.on('open', (event) => {
+        // mamanger connected client
-            this.onopen?.(event)
         manager.add(this)
-        })
+        this.client.on(ClientEvent.close, (_) => manager.del(this))
-        this.client.on('message', (event) => this.onmessage?.(event))
+        // add event forward
-        this.client.on('close', (event) => {
+        this.client.on(ClientEvent.open, (event) => this.onopen?.(event))
-            this.onclose?.(event)
+        this.client.on(ClientEvent.message, (event) => this.onmessage?.(event))
-            manager.del(this)
+        this.client.on(ClientEvent.close, (event) => this.onclose?.(event))
-        })
+        this.client.on(ClientEvent.error, (event) => this.onerror?.(event))
-        this.client.on('error', (event) => this.onerror?.(event))
         setTimeout(() => this.client.connect(), 20)
     }
     get id() {
@@ -77,26 +78,31 @@ export class WebSocket extends EventEmitter {
         return this.client.protocol
     }
     get readyState() {
-        return this.client.readyStatus
+        return this.client.readyState
     }
     get url() {
         return this._url
     }
+
     public onopen: (event: Event) => void
     public onmessage: (event: MessageEvent) => void
     public onclose: (event: CloseEvent) => void
     public onerror: (event: ErrorEvent) => void
 
-    addEventListener(event: EventType, callback: () => void) {
+    public on(eventName: string | symbol, listener: (...args: any[]) => void): this {
-        this[`on${event.toLowerCase()}`] = callback
+        this.client.on(eventName, listener)
-        this.client.on(event, callback)
+        return this
     }
+    public emit(eventName: string | symbol, ...args: any[]): boolean {
+        return this.client.emit(eventName, ...args)
+    }
+
     public send(data: any) {
-        this.client.send(data)
+        return this.client.send(data)
     }
+
     public close(code?: number, reason?: string) {
-        this.client.close(code, reason)
+        return this.client.close(code, reason)
-        this.removeAllListeners()
     }
 }
 global.setGlobal('WebSocket', WebSocket)

packages/websocket/src/client/interface.ts

@@ -4,10 +4,18 @@ export interface WebSocketHeader {
 }
 
 export type EventType =
-    | 'close'
+    | ClientEvent.open
-    | 'error'
+    | ClientEvent.message
-    | 'message'
+    | ClientEvent.close
-    | 'open'
+    | ClientEvent.error
+
+export enum ClientEvent {
+    open = 'open',
+    message = 'message',
+    close = 'close',
+    error = 'error',
+}
+
 export interface Event {
 
 }

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

@@ -1,6 +1,9 @@
 import { NettyWebSocket } from '.'
 import { WebSocketClientHandlerAdapter } from './adapter/handler'
 
+const Throwable = Java.type('java.lang.Throwable')
+const RuntimeException = Java.type('java.lang.RuntimeException')
+
 const CharsetUtil = Java.type('io.netty.util.CharsetUtil')
 const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
 const CloseWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.CloseWebSocketFrame')
@@ -20,7 +23,7 @@ export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
         return true
     }
     handlerAdded(ctx: any) {
-        console.debug(`${ctx} handlerAdded`)
+        this.client.onconnection({})
         if (ctx.newPromise) {
             this.handshakeFuture = ctx.newPromise()
         } else {
@@ -28,20 +31,22 @@ export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
         }
     }
     channelActive(ctx: any) {
-        console.debug(`${ctx} channelActive`)
         this.handshaker.handshake(ctx.channel())
+        setTimeout(() => {
+            this.abortHandshake(new Error('handshake timed out.'))
+        }, 10000)
     }
     channelInactive(ctx: any) {
-        console.debug(`${ctx} channelInactive`)
+        this.client.close(1006, 'connection was closed abnormally.', true)
-        this.client.onclose({ code: 0, reason: 'client connection channel inactive!' })
     }
     channelRead0(ctx: any, msg: any) {
-        console.trace(`${ctx} channelRead0 ${msg}`)
         let ch = ctx.channel()
         if (!this.handshaker.isHandshakeComplete()) {
+            console.debug(`Netty Handler channelRead0 websocket client connected`)
             // websocket client connected
             this.handshaker.finishHandshake(ch, msg)
             this.handshakeFuture.setSuccess()
+            this.client.onconnect({})
             return
         }
 
@@ -54,14 +59,19 @@ export class WebSocketClientHandler extends WebSocketClientHandlerAdapter {
         if (frame instanceof TextWebSocketFrame) {
             this.client.onmessage({ data: frame.text() })
         } else if (frame instanceof CloseWebSocketFrame) {
-            this.client.onclose({ code: 0, reason: 'server close connection!' })
+            this.client.receiverClose(frame.statusCode(), frame.reasonText())
         }
     }
+    abortHandshake(reason: Error) {
+        if (this.handshakeFuture.isDone()) { return }
+        if (!(reason instanceof Throwable)) {
+            reason = new RuntimeException(reason)
+        }
+        this.handshakeFuture.setFailure(reason)
+    }
     exceptionCaught(ctx: any, cause: Error) {
         console.debug(`${ctx} exceptionCaught ${cause}`)
+        this.client.abortHandshake(cause)
         this.client.onerror({ error: cause })
-        if (!this.handshakeFuture.isDone()) {
-            this.handshakeFuture.setFailure(cause)
-        }
     }
 }

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

@@ -60,6 +60,8 @@ export class NettyWebSocket extends Transport {
     private channel: any
     private b: any
 
+    private handler: any
+
     constructor(url: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
         super(url, subProtocol, headers)
         if (!url) {
@@ -85,13 +87,9 @@ export class NettyWebSocket extends Transport {
         console.debug(`constructor NettyWebSocket url: ${url} scheme: ${this._schema} host: ${this._host} port: ${this._port} header: ${JSON.stringify(headers)}`)
     }
     getId() {
-        if (this.channel?.id) {
+        return `${this.channel?.id()}` || `NettyWebSocket#${channelCount.incrementAndGet()}`
-            return this.channel?.id() + ''
-        }
-        return 'NettyWebSocket#' + channelCount.incrementAndGet()
     }
     doConnect() {
-        console.debug('client NettyWebSocket doConnect', this._url)
         let uri = URI.create(this._url)
         let headers = new DefaultHttpHeaders()
         for (const key of Object.getOwnPropertyNames(this._headers || {})) {
@@ -100,7 +98,7 @@ export class NettyWebSocket extends Transport {
         // Connect with V13 (RFC 6455 aka HyBi-17). You can change it to V08 or V00.
         // If you change it to V00, ping is not supported and remember to change
         // HttpResponseDecoder to WebSocketHttpResponseDecoder in the pipeline.
-        let handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory
+        this.handler = new WebSocketClientHandler(WebSocketClientHandshakerFactory
             .newHandshaker(uri, WebSocketVersion.V13, null, false, headers), this)
         this.b = new Bootstrap()
         this.b.group(group)
@@ -111,7 +109,7 @@ export class NettyWebSocket extends Transport {
                     if (this._schema == "wss") {
                         if (SslContextBuilder) {
                             let sslCtx = SslContextBuilder.forClient().trustManager(InsecureTrustManagerFactory.INSTANCE).build()
-                            pipeline.addLast(sslCtx.newHandler(ch.alloc(), this._host, this._port))
+                            pipeline.addLast('ssl', sslCtx.newHandler(ch.alloc(), this._host, this._port))
                         } else {
                             let sslEngine = SSLContext.getDefault().createSSLEngine()
                             sslEngine.setUseClientMode(true)
@@ -120,35 +118,36 @@ export class NettyWebSocket extends Transport {
                     }
                     pipeline.addLast("http-codec", new HttpClientCodec())
                     pipeline.addLast("aggregator", new HttpObjectAggregator(65536))
-                    pipeline.addLast("websocket", handler.getHandler())
+                    pipeline.addLast("websocket", this.handler.getHandler())
                 }
             }))
-        this.b.connect(this._host, this._port).addListener(new ChannelFutureListener((future: any) => {
         try {
-                this.channel = future.sync().channel()
+            this.channel = this.b.connect(this._host, this._port).sync().channel()
-                this.onconnection({})
+            this.handler.handshakeFuture.sync()
-                handler.handshakeFuture.addListener(new ChannelFutureListener((future: any) => {
+        } catch (error) {
-                    try {
+            // ignore connect error
-                        future.sync()
+            // tigger error at handshakeFuture
-                        // 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) {
         this.channel.writeAndFlush(new TextWebSocketFrame(text))
     }
-    doClose(code: number, reason: string) {
+    doClose(code: number, reason: string, wasClean: boolean = false) {
-        this.channel.writeAndFlush(new CloseWebSocketFrame())
+        console.debug(`Netty Client doClose code: ${code} reason: ${reason}`)
-        this.channel.close()
+        if (this.readyState == WebSocket.CLOSING) {
-        this.channel.closeFuture().addListener(new ChannelFutureListener(() => console.debug(`NettyWebSocket close code: ${code} reason: ${reason}`)))
+            if (!this._closeFrameSent) {
+                console.debug(`Netty Client doClose send close frame`)
+                this.channel?.writeAndFlush(new CloseWebSocketFrame(code, reason))
+                this._closeFrameSent = true
+            }
+            if (!this._closeFrameReceived && !wasClean) { return console.debug(`Netty Client doClose wait server send close`) }
+        }
+        this.channel?.closeFuture().addListener(new ChannelFutureListener(() => {
+            this.onclose({ code, reason })
+        }))
+    }
+    abortHandshake(reason: Error): void {
+        this.handler.abortHandshake(reason)
     }
     getChannel() {
         return this.channel

packages/websocket/src/client/transport.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 import { WebSocket } from './index'
-import { CloseEvent, ErrorEvent, Event, MessageEvent, WebSocketHeader } from './interface'
+import { ClientEvent, CloseEvent, ErrorEvent, Event, MessageEvent, WebSocketHeader } from './interface'
 
 export abstract class Transport extends EventEmitter {
     protected _url: string
@@ -8,6 +8,9 @@ export abstract class Transport extends EventEmitter {
     protected _protocol: string
     protected _headers: WebSocketHeader = {}
 
+    protected _closeFrameReceived = false;
+    protected _closeFrameSent = false;
+
     constructor(uri: string, subProtocol: string = '', headers: WebSocketHeader = {}) {
         super()
         this._url = uri
@@ -23,25 +26,22 @@ export abstract class Transport extends EventEmitter {
         return this._protocol
     }
 
-    get readyStatus() {
+    get readyState() {
         return this._state
     }
 
-    set readyStatus(state: number) {
+    set readyState(state: number) {
         this._state = state
     }
 
     connect() {
-        console.debug(`client Transport connect`)
-        try {
         this.doConnect()
-        } catch (error: any) {
-            console.ex(error)
-            this.onerror({ error })
-        }
     }
 
     send(text: string) {
+        if (this.readyState === WebSocket.CONNECTING) {
+            throw new Error('WebSocket is not open: readyState 0 (CONNECTING)');
+        }
         try {
             this.doSend(text)
         } catch (error: any) {
@@ -49,19 +49,24 @@ export abstract class Transport extends EventEmitter {
         }
     }
 
-    close(code: number = 0, reason: string = '') {
+    close(code: number = 1000, reason: string = '', wasClean: boolean = false) {
-        if (this.readyStatus != WebSocket.CLOSING && this.readyStatus != WebSocket.CLOSED) {
+        if (this.readyState === WebSocket.CLOSED) return;
-            this.readyStatus = WebSocket.CLOSING
+        if (this.readyState === WebSocket.CONNECTING) {
+            const msg = 'WebSocket was closed before the connection was established';
+            this.abortHandshake(new Error(msg));
+            return;
+        }
+        if (this.readyState === WebSocket.CLOSING) {
+            if (this._closeFrameSent && this._closeFrameReceived) {
+                this.onclose({ code, reason });
+            }
+            return;
+        }
+        this.readyState = WebSocket.CLOSING
         try {
-                this.onclose({ code, reason })
+            this.doClose(code, reason, wasClean)
-                this.doClose(code, reason)
         } catch (error: any) {
             this.onerror({ error })
-            } finally {
-                this.removeAllListeners()
-            }
-        } else {
-            console.debug(`${this.id} call close but state is ${this.readyStatus}`)
         }
     }
 
@@ -71,33 +76,41 @@ export abstract class Transport extends EventEmitter {
     }
 
     onconnect(event: Event) {
-        if (this.readyStatus != WebSocket.OPEN) {
+        if (this.readyState != WebSocket.OPEN) {
-            this.readyStatus = WebSocket.OPEN
+            this.readyState = WebSocket.OPEN
-            this.emit('open', event)
+            this.emit(ClientEvent.open, event)
         } else {
-            console.debug(`${this.id} call onconnect but state is ${this.readyStatus}`)
+            console.debug(`WebSocket Transport ${this.id} call onconnect but state is ${this.readyState}`)
         }
     }
 
     onmessage(event: MessageEvent) {
-        this.emit('message', event)
+        this.emit(ClientEvent.message, event)
     }
 
     onerror(event: ErrorEvent) {
-        this.emit('error', event)
+        this.emit(ClientEvent.error, event)
     }
 
     onclose(event: CloseEvent) {
-        if (this.readyStatus != WebSocket.CLOSED) {
+        console.debug(`WebSocket Transport ${this.id} call onclose CloseEvent[code: ${event.code}, reason: ${event.reason}]`)
-            this.readyStatus = WebSocket.CLOSED
+        if (this.readyState != WebSocket.CLOSED) {
-            this.emit('close', event)
+            this.readyState = WebSocket.CLOSED
-            this.removeAllListeners()
+            this.emit(ClientEvent.close, event)
         } else {
-            console.debug(`${this.id} call onclose but state is ${this.readyStatus} CloseEvent[code: ${event.code}, reason: ${event.reason}]`)
+            console.debug(`WebSocket Transport ${this.id} call onclose but state is ${this.readyState} CloseEvent[code: ${event.code}, reason: ${event.reason}]`)
         }
     }
-    abstract getId()
+
-    abstract doConnect()
+    receiverClose(code: number, reason: string) {
-    abstract doSend(text: string)
+        console.debug(`Netty Handler receeve close code: ${code} reason: ${reason}`)
-    abstract doClose(code: number, reason: string)
+        this._closeFrameReceived = true;
+        this.close(code, reason)
+    }
+
+    abstract getId(): string
+    abstract doConnect(): void
+    abstract doSend(text: string): void
+    abstract doClose(code: number, reason: string, wasClean?: boolean): void
+    abstract abortHandshake(reason: Error): void
 }

packages/websocket/src/index.ts

@@ -1,7 +1,7 @@
 /// <reference types="@ccms/nashorn" />
 /// <reference types="@javatypes/tomcat-websocket-api" />
 
-import * as server from './server'
+import { WebSocketServer } from './server'
 import { Server, ServerOptions } from './socket.io'
 
 interface SocketIOStatic {
@@ -45,7 +45,7 @@ let singletonServer: Server
 let io: SocketStatic = function io(pipeline: any, options: Partial<JavaServerOptions>, singleton = true) {
     if (singleton) {
         if (!singletonServer) {
-            singletonServer = new Server(server.attach(pipeline, options), options)
+            singletonServer = new Server(WebSocketServer.attach(pipeline, options), options)
             process.emit('websocket.create', singletonServer)
             process.on('exit', () => {
                 singletonServer.close()
@@ -53,7 +53,7 @@ let io: SocketStatic = function io(pipeline: any, options: Partial<JavaServerOpt
         }
         return singletonServer
     }
-    return new Server(server.attach(pipeline, options), options)
+    return new Server(WebSocketServer.attach(pipeline, options), options)
 }
 io.Instance = Symbol("@ccms/websocket")
 export default io

packages/websocket/src/server/index.ts

@@ -26,6 +26,24 @@ export abstract class WebSocketServer extends EventEmitter {
     protected instance: any
     protected options: JavaServerOptions
     private clients: Map<string, WebSocketClient>
+
+    public static attach(instance, options) {
+        if (!instance) { throw new Error('instance can\'t be undefiend!') }
+        options = Object.assign({
+            event: new EventEmitter(),
+            path: '/ws',
+            root: root + Java.type("java.io.File").separatorChar + 'wwwroot',
+        }, options)
+        let WebSocketServerImpl = undefined
+        if (instance.class.name.startsWith('io.netty.channel')) {
+            WebSocketServerImpl = require("./netty").NettyWebSocketServer
+        } else {
+            WebSocketServerImpl = require("./tomcat").TomcatWebSocketServer
+        }
+        console.debug('create websocket server from ' + WebSocketServerImpl.name)
+        return new WebSocketServerImpl(instance, options)
+    }
+
     constructor(instance: any, options: JavaServerOptions) {
         super()
         this.instance = instance
@@ -69,20 +87,3 @@ export abstract class WebSocketServer extends EventEmitter {
     protected abstract getSocket(handler: any): WebSocketClient
     protected abstract doClose(): void
 }
-
-export const attach = (instance, options) => {
-    if (!instance) { throw new Error('instance can\'t be undefiend!') }
-    options = Object.assign({
-        event: new EventEmitter(),
-        path: '/ws',
-        root: root + Java.type("java.io.File").separatorChar + 'wwwroot',
-    }, options)
-    let WebSocketServerImpl = undefined
-    if (instance.class.name.startsWith('io.netty.channel')) {
-        WebSocketServerImpl = require("./netty").NettyWebSocketServer
-    } else {
-        WebSocketServerImpl = require("./tomcat").TomcatWebSocketServer
-    }
-    console.debug('create websocket server from ' + WebSocketServerImpl.name)
-    return new WebSocketServerImpl(instance, options)
-}

script/push.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+DISTTAG=${1:latest}
 for package in `ls packages`; do
     echo $package
     pushd packages/$package
-    npm publish --access=public --registry https://registry.npmjs.org
+    npm publish --tag ${DISTTAG} --access=public --registry https://registry.npmjs.org
     popd
 done