v0.10.1

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

lerna.json

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

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,17 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.10.1",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/ployfill": "^0.10.0",
+        "@ccms/ployfill": "^0.10.1",
-        "base64-js": "^1.3.1",
+        "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
         "@types/base64-js": "^1.3.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/api/src/console.ts

@@ -133,6 +133,7 @@ export class MiaoScriptConsole implements Console {
         }
     }
     stack(ex: Error, color: boolean = true): string[] {
+        if (!ex) return []
         let stack = ex.getStackTrace()
         let cache = [(color ? '§c' : '') + ex]
         //@ts-ignore

packages/api/src/task.ts

@@ -1,34 +1,66 @@
 import { plugin } from './index'
 import { injectable } from '@ccms/container'
 
+const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
+
 export namespace task {
     @injectable()
     export abstract class TaskManager {
-        protected cacheTasks = new Map<string, task.Task[]>()
+        protected taskId: java.util.concurrent.atomic.AtomicInteger
+        protected cacheTasks = new Map<number, task.Task>()
+        protected pluginCacheTasks = new Map<string, Map<number, task.Task>>()
+
+        constructor() {
+            this.taskId = new AtomicInteger(0)
+            process.on('task.finish', (task: task.Task) => {
+                let taskId = task.getTaskId()
+                this.cacheTasks.delete(taskId)
+                let ownerName = task.getOwner()?.description.name
+                if (ownerName && this.pluginCacheTasks.has(ownerName)) {
+                    this.pluginCacheTasks.get(ownerName).delete(taskId)
+                }
+            })
+        }
 
         protected pluginCreate(plugin: plugin.Plugin, task: task.Task) {
-            if (!this.cacheTasks.has(plugin.description.name)) {
+            if (!this.pluginCacheTasks.has(plugin.description.name)) {
-                this.cacheTasks.set(plugin.description.name, [])
+                this.pluginCacheTasks.set(plugin.description.name, new Map())
             }
-            this.cacheTasks.get(plugin.description.name).push(task)
+            this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
             return task
         }
+
         protected pluginDisable(plugin: plugin.Plugin) {
-            if (this.cacheTasks.has(plugin.description.name)) {
+            if (this.pluginCacheTasks.has(plugin.description.name)) {
-                this.cacheTasks.get(plugin.description.name).forEach(task => task.cancel())
+                this.pluginCacheTasks.get(plugin.description.name).forEach((task) => {
-                this.cacheTasks.delete(plugin.description.name)
+                    task.cancel()
+                })
+                this.pluginCacheTasks.delete(plugin.description.name)
             }
         }
+
+        /**
+         * 获得自增的任务ID
+         */
+        protected nextId() {
+            return this.taskId.incrementAndGet()
+        }
+
         /**
          * 创建任务
          * @param func 任务内容
          */
         create(func: Function, plugin?: plugin.Plugin): task.Task {
             if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !') };
-            let task = this.create0(func)
+            let task = this.create0(plugin, func, this.nextId())
+            this.cacheTasks.set(task.getTaskId(), task)
             if (plugin) { return this.pluginCreate(plugin, task) }
             return task
         }
+        cancel(taskId: number) {
+            if (!this.cacheTasks.has(taskId)) { throw new Error(`Task ${taskId} not found!`) }
+            this.cacheTasks.get(taskId).cancel()
+        }
         /**
          * 在主线程执行代码
          * @param func 执行内容
@@ -41,22 +73,33 @@ export namespace task {
             if (plugin) { return this.pluginDisable(plugin) }
             this.disable0()
         }
-        protected abstract create0(func: Function): task.Task
+        protected abstract create0(owner: plugin.Plugin, func: Function, id: number): task.Task
         protected abstract disable0()
     }
     /**
      * 任务抽象
      */
-    export abstract class Task {
+    export abstract class Task implements Cancelable {
-        protected plugin: any
         protected func: Function
         protected isAsync: boolean = false;
         protected laterTime: number = 0;
         protected interval: number = 0;
+        protected owner: plugin.Plugin
+        protected taskId: number
+        protected innerTask: any
 
-        constructor(plugin: any, func: Function) {
+        constructor(owner: plugin.Plugin, func: Function, id: number) {
-            this.plugin = plugin
+            this.owner = owner
             this.func = func
+            this.taskId = id
+        }
+
+        getOwner() {
+            return this.owner
+        }
+
+        getTaskId() {
+            return this.taskId
         }
 
         /**
@@ -90,12 +133,15 @@ export namespace task {
          * 取消任务
          */
         cancel(): boolean {
-            throw new Error("Method not implemented.")
+            let result = this.cancel0()
+            process.emit('task.finish', this)
+            return result
         }
 
         protected run(...args: any[]): void {
             try {
                 this.func(...args)
+                !this.interval && process.emit('task.finish', this)
             } catch (ex) {
                 console.console('§4插件执行任务时发生错误', ex)
                 console.ex(ex)
@@ -107,16 +153,21 @@ export namespace task {
          * @param args 任务参数
          */
         submit(...args: any[]): Cancelable {
-            let cancelable = this.submit0(...args)
+            this.innerTask = this.submit0(...args)
-            this.cancel = cancelable.cancel
+            return this
-            return cancelable
         }
 
         /**
          * 提交任务
          * @param args 任务参数
          */
-        protected abstract submit0(...args: any[]): Cancelable
+        protected abstract submit0(...args: any[]): any
+        /**
+         * 取消任务
+         */
+        protected cancel0(): boolean {
+            return this.innerTask?.cancel()
+        }
     }
     /**
      * 返可取消的对象

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/spigot-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/bukkit/src/task.ts

@@ -7,17 +7,14 @@ const Callable = Java.type('java.util.concurrent.Callable')
 
 @provideSingleton(task.TaskManager)
 export class BukkitTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any
+        return new BukkitTask(owner, func, id)
-
-    create0(func: Function): task.Task {
-        return new BukkitTask(this.pluginInstance, func)
     }
     callSyncMethod(func: Function): any {
-        return Bukkit.getScheduler().callSyncMethod(this.pluginInstance, new Callable({ call: () => func() })).get()
+        return Bukkit.getScheduler().callSyncMethod(base.getInstance(), new Callable({ call: () => func() })).get()
     }
     disable0() {
-        Bukkit.getScheduler().cancelTasks(this.pluginInstance)
+        Bukkit.getScheduler().cancelTasks(base.getInstance())
     }
 }
 
@@ -26,9 +23,9 @@ export class BukkitTask extends task.Task {
         let run = new BukkitRunnable({ run: () => this.run(...args) })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
-            return run[funcName](this.plugin, this.laterTime, this.interval)
+            return run[funcName](base.getInstance(), this.laterTime, this.interval)
         } else {
-            return run[funcName](this.plugin, this.laterTime)
+            return run[funcName](base.getInstance(), this.laterTime)
         }
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/bungee-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/bungee/src/task.ts

@@ -6,17 +6,14 @@ let TimeUnit = Java.type('java.util.concurrent.TimeUnit')
 
 @provideSingleton(task.TaskManager)
 export class BungeeTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any
+        return new BungeeTask(owner, func, id)
-
-    create0(func: Function): task.Task {
-        return new BungeeTask(this.pluginInstance, func)
     }
     callSyncMethod(func: Function): any {
         return func()
     }
     disable0() {
-        this.pluginInstance.getProxy().getScheduler().cancel(this.pluginInstance)
+        base.getInstance().getProxy().getScheduler().cancel(base.getInstance())
     }
 }
 
@@ -24,12 +21,12 @@ export class BungeeTask extends task.Task {
     submit0(...args: any[]): task.Cancelable {
         let run = new Runnable({ run: () => this.run(...args) })
         if (this.isAsync) {
-            return this.plugin.getProxy().getScheduler().runAsync(this.plugin, run)
+            return base.getInstance().getProxy().getScheduler().runAsync(base.getInstance(), run)
         }
         if (this.interval) {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
         } else {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, TimeUnit.MILLISECONDS)
         }
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "minecraft-protocol": "^1.16.0"
+        "minecraft-protocol": "^1.19.0"
     },
     "devDependencies": {
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/common/package.json

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

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -21,6 +21,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/container/package.json

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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -21,11 +21,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "@javatypes/spring-jdbc": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/i18n/package.json

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

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,18 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.10.1",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
 }

packages/nashorn/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nashorn",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,6 +22,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.10.1",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/nukkit-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/nukkit/src/console.ts

@@ -1,21 +1,25 @@
 import { MiaoScriptConsole } from '@ccms/api'
 
-let Nukkit = base.getInstance().getServer();
+let Nukkit = base.getInstance().getServer()
+let LogLevel = Java.type('cn.nukkit.utils.LogLevel')
 let CommandSender = Java.type('cn.nukkit.command.CommandSender')
 
 export class NukkitConsole extends MiaoScriptConsole {
     sender(sender, ...args) {
         if (!(sender instanceof CommandSender)) {
             this.error(`First parameter ${sender} not instanceof cn.nukkit.command.CommandSender can't send message!`)
-            return;
+            return
         }
         if (Object.prototype.toString.call(args[0]) === "[object Array]") {
             args[0].forEach(line => sender.sendMessage(this.prefix + line))
         } else {
-            sender.sendMessage(this.prefix + args.join(' '));
+            sender.sendMessage(this.prefix + args.join(' '))
         }
     }
     console(...args: string[]): void {
-        this.sender(Nukkit.getConsoleSender(), args.join(' '));
+        this.sender(Nukkit.getConsoleSender(), args.join(' '))
+    }
+    error(...args: any[]) {
+        this.logger.log(LogLevel.ERROR, this.name + args.join(' '))
     }
 }

packages/nukkit/src/task.ts

@@ -5,17 +5,14 @@ const NukkitRunnable = Java.type('cn.nukkit.scheduler.NukkitRunnable')
 
 @provideSingleton(task.TaskManager)
 export class NukkitTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-    private pluginInstance: any
+        return new NukkitTask(owner, func, id)
-
-    create0(func: Function): task.Task {
-        return new NukkitTask(this.pluginInstance, func)
     }
     callSyncMethod(func: Function): any {
         return func()
     }
     disable0() {
-        base.getInstance().getServer().getScheduler().cancelTask(this.pluginInstance)
+        base.getInstance().getServer().getScheduler().cancelTask(base.getInstance())
     }
 }
 
@@ -24,9 +21,9 @@ export class NukkitTask extends task.Task {
         let run = new NukkitRunnable({ run: () => this.run(...args) })
         let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
         if (this.interval) {
-            return run[funcName](this.plugin, this.laterTime, this.interval)
+            return run[funcName](base.getInstance(), this.laterTime, this.interval)
         } else {
-            return run[funcName](this.plugin, this.laterTime)
+            return run[funcName](base.getInstance(), this.laterTime)
         }
     }
 }

packages/ployfill/package.json

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

packages/ployfill/src/node-shim.ts

@@ -22,6 +22,19 @@ class Process extends EventEmitter {
         }
     }
     platform = Packages.java.lang.System.getProperty("os.name")
+    on(event: string | symbol, listener: (...args: any[]) => void) {
+        return super.on(event, (...args) => {
+            try {
+                listener(...args)
+            } catch (error) {
+                try {
+                    super.emit('error', error)
+                } catch (error) {
+                    console.ex(error)
+                }
+            }
+        })
+    }
     nextTick(func: Function) {
         microTaskPool.execute(func)
     }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,13 +22,13 @@
         "@types/js-yaml": "^3.12.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/i18n": "^0.10.0",
+        "@ccms/i18n": "^0.10.1",
         "js-yaml": "^3.14.0"
     }
 }

packages/plugin/src/command.ts

@@ -1,5 +1,5 @@
 import { command, plugin, server } from '@ccms/api'
-import { provideSingleton, inject, Autowired } from '@ccms/container'
+import { provideSingleton, Autowired } from '@ccms/container'
 import { getPluginCommandMetadata, getPluginTabCompleterMetadata } from './utils'
 
 @provideSingleton(PluginCommandManager)

packages/plugin/src/task.ts

@@ -7,7 +7,7 @@ export class PluginTaskManager {
     private taskManager: task.TaskManager
 
     constructor() {
-        process.on('plugin.after.disable', (plugin: plugin.Plugin) => this.cancelTask(plugin))
+        process.on('plugin.after.disable', this.cancelTask.bind(this))
     }
 
     private cancelTask(pluginInstance: plugin.Plugin) {

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -20,16 +20,19 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
+        "@javatypes/bukkit-api": "^0.0.3",
+        "@javatypes/bungee-api": "^0.0.3",
+        "@javatypes/sponge-api": "^0.0.3",
         "@javatypes/spring-data-redis": "^0.0.3",
         "@javatypes/spring-web": "^0.0.3",
         "@javatypes/tomcat": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.10.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/plugin": "^0.10.0"
+        "@ccms/plugin": "^0.10.1"
     }
 }

packages/plugins/src/McbbsPlugin.ts

@@ -0,0 +1,78 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+
+import { plugin, server } from '@ccms/api'
+import { Autowired } from '@ccms/container'
+import { Cmd, interfaces, JSPlugin, Tab } from '@ccms/plugin'
+import { Server as SocketIOServer, Socket as SocketIOSocket, Namespace } from '@ccms/websocket'
+
+import * as fs from '@ccms/common/dist/fs'
+
+const FileFilter = Java.type('java.io.FileFilter')
+const ByteArrayInputStream = java.io.ByteArrayInputStream
+const ByteArrayOutputStream = java.io.ByteArrayOutputStream
+const StandardCharsets = Java.type("java.nio.charset.StandardCharsets")
+const GZIPInputStream = Java.type('java.util.zip.GZIPInputStream')
+const ByteArray = Java.type("byte[]")
+
+@JSPlugin({ version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class McbbsPlugin extends interfaces.Plugin {
+    @Autowired()
+    private Server: server.Server
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    private namespace: any
+
+    load() {
+    }
+
+    enable() {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        if (consolePlugin.socketIOServer) {
+            this.startWebSocketServer(consolePlugin.socketIOServer)
+        } else {
+            process.on('websocket.create', (server: SocketIOServer) => {
+                this.startWebSocketServer(server)
+            })
+        }
+    }
+
+    private startWebSocketServer(server: SocketIOServer) {
+        this.namespace = server.of('/McbbsPlugin')
+        this.namespace.on('connect', (client: SocketIOSocket) => {
+            this.initWebSocketClient(client)
+            this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
+        })
+    }
+
+    disable() {
+        this.namespace.close()
+    }
+
+    private initWebSocketClient(client: SocketIOSocket) {
+        client.on('ungzip', (content) => {
+
+        })
+
+        client.on('error', (error) => {
+            this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
+            this.logger.error(error)
+        })
+        client.on('disconnect', () => {
+            this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+        })
+    }
+
+    @Cmd()
+    msme(sender: any, command: string, args: string[]) {
+        this.logger.log(sender, command, args)
+        sender.sendMessage(JSON.stringify({ command, ...args }))
+    }
+
+    @Tab()
+    tabmsme(_sender: any, _command: string, _args: string[]) {
+        return ['world']
+    }
+}

packages/plugins/src/MiaoConsole.ts

@@ -1,8 +1,8 @@
 /// <reference types="@ccms/nashorn" />
 
 import { plugin as pluginApi, server, task, constants, command } from '@ccms/api'
-import { plugin, interfaces, cmd, tab, enable, config, disable } from '@ccms/plugin'
+import { plugin, interfaces, cmd, tab, enable, config, disable, PluginConfig } from '@ccms/plugin'
-import { inject, ContainerInstance, Container } from '@ccms/container'
+import { ContainerInstance, Container, Autowired } from '@ccms/container'
 import io, { Server as SocketIOServer, Socket as SocketIOSocket } from '@ccms/websocket'
 import * as fs from '@ccms/common/dist/fs'
 import * as reflect from '@ccms/common/dist/reflect'
@@ -19,22 +19,22 @@ let help = [
     '§6/mconsole §areload               §6-  §3重载插件',
 ]
 
-@plugin({ name: 'MiaoConsole', prefix: 'Console', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
+@plugin({ prefix: 'Console', version: '1.0.0', author: 'MiaoWoo', servers: ['!nukkit'], source: __filename })
 export class MiaoConsole extends interfaces.Plugin {
-    @inject(ContainerInstance)
+    @Autowired(ContainerInstance)
     private container: Container
-    @inject(server.ServerType)
+    @Autowired(server.ServerType)
     private serverType: string
-    @inject(server.Server)
+    @Autowired(pluginApi.PluginFolder)
-    private server: server.Server
-    @inject(command.Command)
-    private command: command.Command
-    @inject(task.TaskManager)
-    private task: task.TaskManager
-    @inject(pluginApi.PluginManager)
-    private pluginManager: pluginApi.PluginManager
-    @inject(pluginApi.PluginFolder)
     private pluginFolder: string
+    @Autowired()
+    private server: server.Server
+    @Autowired()
+    private command: command.Command
+    @Autowired()
+    private task: task.TaskManager
+    @Autowired()
+    private pluginManager: pluginApi.PluginManager
 
     private token: string
     private instance: any
@@ -46,7 +46,7 @@ export class MiaoConsole extends interfaces.Plugin {
     private logCache: string[] = []
 
     @config()
-    private secret = { token: undefined }
+    private secret: PluginConfig = { token: undefined }
 
     load() {
         if (this.secret.token) {
@@ -90,6 +90,7 @@ export class MiaoConsole extends interfaces.Plugin {
     cmdtoken(sender: any, sub: string, token: string) {
         if (sub == "set") {
             this.secret.token = this.token = token
+            this.secret.save()
             this.logger.sender(sender, '§a已保存§6服务器登录Token:§3', this.token, '§4请勿分享给其他人 防止服务器被攻击!')
             return
         }
@@ -216,6 +217,7 @@ export class MiaoConsole extends interfaces.Plugin {
             root: fs.concat(root, 'wwwroot')
         })
         this.container.bind(io.Instance).toConstantValue(this.socketIOServer)
+        process.emit('websocket.create', this.socketIOServer)
     }
 
     startSocketIOServer() {
@@ -224,20 +226,19 @@ export class MiaoConsole extends interfaces.Plugin {
         namespace.on('connect', (client: SocketIOSocket) => {
             if (!this.token) {
                 this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
-                client.emit('unauthorized')
+                client.emit('unauthorized', () => client.disconnect(true))
-                client.disconnect(true)
                 return
             }
             if (this.token != client.handshake.query.token) {
                 this.logger.console(`§6客户端 §b${client.id} §c无效请求 §4请提供正确Token后再次连接!`)
-                client.emit('unauthorized')
+                client.emit('unauthorized', () => client.disconnect(true))
-                client.disconnect(true)
                 return
             }
             this.initWebSocketClient(client)
             this.logCache.forEach(msg => client.emit('log', msg))
             this.logger.console(`§6客户端 §b${client.id} §a新建连接 ${this.rootLogger ? '启动日志转发' : '§4转发日志启动失败'}...`)
         })
+        process.emit('websocket.start', this.socketIOServer)
     }
 
     private initWebSocketClient(client: SocketIOSocket) {
@@ -280,7 +281,7 @@ export class MiaoConsole extends interfaces.Plugin {
             if (!dir.isDirectory()) {
                 return fn(undefined, `${file} 不是一个目录!`)
             }
-            fn(fs.list(dir))
+            fn(fs.list(dir).map(f => f.name))
         })
         client.on('error', (error) => {
             this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)

packages/plugins/src/MiaoExplorer.ts

@@ -0,0 +1,175 @@
+/// <reference types="@javatypes/bungee-api" />
+/// <reference types="@javatypes/bukkit-api" />
+/// <reference types="@javatypes/sponge-api" />
+
+import { plugin, server } from '@ccms/api'
+import { Autowired } from '@ccms/container'
+import { Cmd, interfaces, JSPlugin, Tab } from '@ccms/plugin'
+import { Server as SocketIOServer, Socket as SocketIOSocket, Namespace } from '@ccms/websocket'
+
+import * as fs from '@ccms/common/dist/fs'
+
+const FileFilter = Java.type('java.io.FileFilter')
+const ByteArrayInputStream = java.io.ByteArrayInputStream
+const ByteArrayOutputStream = java.io.ByteArrayOutputStream
+const StandardCharsets = Java.type("java.nio.charset.StandardCharsets")
+const GZIPInputStream = Java.type('java.util.zip.GZIPInputStream')
+const ByteArray = Java.type("byte[]")
+
+@JSPlugin({ prefix: 'Explorer', version: '1.0.0', author: 'MiaoWoo', source: __filename })
+export class MiaoExplorer extends interfaces.Plugin {
+    @Autowired()
+    private Server: server.Server
+    @Autowired()
+    private pluginManager: plugin.PluginManager
+
+    private token: string
+    private namespace: any
+    private chunkCacheMap: Map<string, Array<string>>
+
+    load() {
+        this.chunkCacheMap = new Map()
+    }
+
+    enable() {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        if (consolePlugin.socketIOServer) {
+            this.startWebSocketServer(consolePlugin.socketIOServer)
+        } else {
+            process.on('websocket.create', (server: SocketIOServer) => {
+                this.startWebSocketServer(server)
+            })
+        }
+    }
+
+    private startWebSocketServer(server: SocketIOServer) {
+        let consolePlugin: any = this.pluginManager.getPlugin('MiaoConsole')
+        this.token = consolePlugin.token
+        this.namespace = server.of('/MiaoExplorer')
+        this.namespace.on('connect', (client: SocketIOSocket) => {
+            if (!this.token) {
+                this.logger.console(`§6客户端 §b${client.id} §a请求连接 §4服务器尚未设置 Token 无法连接!`)
+                client.emit('unauthorized', () => client.disconnect(true))
+                return
+            }
+            if (this.token != client.handshake.query.token) {
+                this.logger.console(`§6客户端 §b${client.id} §c无效请求 §4请提供正确Token后再次连接!`)
+                client.emit('unauthorized', () => client.disconnect(true))
+                return
+            }
+            this.initWebSocketClient(client)
+            this.logger.console(`§6客户端 §b${client.id} §a新建连接...`)
+        })
+    }
+
+    disable() {
+        this.namespace.removeAllListeners('connect')
+        this.namespace.close()
+    }
+
+    private readDir(dir) {
+        let children = Java.from(dir.listFiles(new FileFilter({
+            accept: file => file.getName().endsWith('.yml') || file.isDirectory()
+        }))).sort().map(file => {
+            if (file.isDirectory()) {
+                let children = this.readDir(file)
+                if (!children.length) { return null }
+                return {
+                    label: file.getName(),
+                    value: fs.path(file),
+                    children,
+                    disabled: true
+                }
+            }
+            return {
+                label: file.getName(),
+                value: fs.path(file),
+                creatable: true,
+                editable: true,
+                removable: true,
+                deleteApi: "delete"
+            }
+        })
+        return children.filter(s => s)
+    }
+
+    private initWebSocketClient(client: SocketIOSocket) {
+        client.on('ls', (fn) => {
+            var pluginDirs = Java.from(fs.file('./plugins').listFiles(new FileFilter({
+                accept: dirs => dirs.isDirectory()
+            })))
+            let result = {
+                options: pluginDirs.sort().map(f => {
+                    let node: any = {
+                        label: f.getName(),
+                        value: fs.path(f)
+                    }
+                    let children = this.readDir(f)
+                    if (!children.length) {
+                        return null
+                    }
+                    node.children = children
+                    node.disabled = true
+                    return node
+                })
+            }
+            fn && fn(result.options.filter(s => s))
+        })
+        client.on('read', (file, callback) => {
+            callback?.(base.read(file))
+        })
+        client.on('chunk', (file, index, content, callback) => {
+            if (!this.chunkCacheMap.has(file)) {
+                this.chunkCacheMap.set(file, [])
+            }
+            this.chunkCacheMap.get(file)[index] = content
+            callback?.(true)
+        })
+        client.on('ungzip', (content) => {
+            try {
+                console.log(content)
+                let baos = new ByteArrayOutputStream()
+                let byte = java.util.Base64.getDecoder().decode(content)
+                let gzip = new GZIPInputStream(new ByteArrayInputStream(byte))
+                let buffer = new ByteArray(1024)
+                let n: number
+                while ((n = gzip.read(buffer)) != -1) {
+                    baos.write(buffer, 0, n)
+                }
+                gzip.close()
+                baos.close()
+                content = baos.toString(StandardCharsets.UTF_8.name())
+                this.logger.log(content)
+            } catch (error) {
+                console.ex(error)
+            }
+        })
+        client.on('save', (file, callback) => {
+            if (!this.chunkCacheMap.has(file)) {
+                return callback?.(false)
+            }
+            let content = this.chunkCacheMap.get(file).join('')
+            this.chunkCacheMap.delete(file)
+            base.save(file, content)
+            callback?.(true)
+        })
+        client.on('error', (error) => {
+            this.logger.console(`§6客户端 §b${client.id} §c触发异常: ${error}`)
+            this.logger.error(error)
+        })
+        client.on('disconnect', () => {
+            this.logger.console(`§6客户端 §b${client.id} §c断开连接...`)
+        })
+    }
+
+    @Cmd()
+    msme(sender: any, command: string, args: string[]) {
+        this.logger.log(sender, command, args)
+        sender.sendMessage(JSON.stringify({ command, ...args }))
+    }
+
+    @Tab()
+    tabmsme(_sender: any, _command: string, _args: string[]) {
+        return ['world']
+    }
+}

packages/plugins/src/MiaoProtocol.ts

@@ -52,12 +52,13 @@ export class MiaoProtocol extends interfaces.Plugin {
     initPacketAdapter() {
         this.adapter = this.createPacketAdapter((event) => {
             let integers = event.getPacket().getIntegers().getValues()
-            console.log(`ProtocolLib onPacketSending filter Map
+            //             console.log(`ProtocolLib onPacketSending filter Map
-Player: ${event.getPlayer()}
+            // Player: ${event.getPlayer()}
-MapId: ${integers.get(0)}
+            // MapId: ${integers.get(0)}
-Size: ${integers.get(3)}x${integers.get(4)}
+            // Short: ${event.getPacket().getShorts().read(0)}
-Bytes: ${event.getPacket().getByteArrays().read(0).length}
+            // Bytes: ${event.getPacket().getByteArrays().read(0).length}
-`)
+            // `)
+            //Size: ${integers.get(3)}x${integers.get(4)}
             // org.bukkit.map.MapPalette.imageToBytes()
         })
         this.ProtocolLibrary.getProtocolManager().addPacketListener(this.adapter)

packages/plugins/src/MiaoReward.ts

@@ -8,6 +8,7 @@ import http from '@ccms/common/dist/http'
 
 const BufferedImage = Java.type('java.awt.image.BufferedImage')
 const Color = Java.type('java.awt.Color')
+const Bytes = Java.type('byte[]')
 
 interface PlaceholderAPI {
     registerPlaceholderHook: (key: string, onPlaceholderRequest: (player, s) => string) => void
@@ -29,7 +30,7 @@ function(cls, plugin, type, onPacketSending){
     }
 }`)
 
-@JSPlugin({ prefix: 'MRD', version: '1.4.1', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
+@JSPlugin({ prefix: 'MRD', version: '1.4.2', author: 'MiaoWoo', servers: [constants.ServerType.Bukkit], source: __filename })
 export class MiaoReward extends interfaces.Plugin {
     private serverInfo: any
     private cacheBindUuid = ''
@@ -97,11 +98,10 @@ export class MiaoReward extends interfaces.Plugin {
         //@ts-ignore
         this.logger.prefix = this.config.prefix
         this.downgrade = this.Bukkit.server.class.name.split('.')[3] == "v1_7_R4"
-        this.updateServerInfo()
+        this.updateServerInfo(null, () => this.updateOnlinePlayersInfo())
-        this.updateOnlinePlayersInfo()
     }
 
-    private updateServerInfo(player?: any) {
+    private updateServerInfo(player?: any, cb?: () => void) {
         this.taskManager.create(() => {
             if (this.config.serverId) {
                 let result = this.httpPost(`https://reward.yumc.pw/server/server`, {
@@ -111,6 +111,7 @@ export class MiaoReward extends interfaces.Plugin {
                 if (result.code == 200) {
                     this.serverInfo = result.data
                     if (player) this.bungee.for(player).forward("ALL", "MiaoReward", { type: "updateServerInfo", data: result.data }).send()
+                    cb?.()
                 }
             }
         }).async().submit()
@@ -206,9 +207,21 @@ export class MiaoReward extends interfaces.Plugin {
             let mapId = integers.get(0)
             let player = event.getPlayer()
             if (mapId == this.zeroMapView.getId() && this.playerImageCache.has(player.getName())) {
-                event.getPacket().getByteArrays().write(0, org.bukkit.map.MapPalette.imageToBytes(this.playerImageCache.get(player.getName())))
+                let bytes = this.playerImageCache.get(player.getName())
-                event.getPacket().getIntegers().write(3, 128)
+                if (!this.downgrade) {
-                event.getPacket().getIntegers().write(4, 128)
+                    event.getPacket().getByteArrays().write(0, bytes)
+                    event.getPacket().getIntegers().write(3, 128)
+                    event.getPacket().getIntegers().write(4, 128)
+                } else {
+                    // let xbytes = new Bytes(131)
+                    let origin = event.getPacket().getByteArrays().read(0)
+                    // xbytes[1] = origin[1]
+                    // xbytes[2] = origin[2]
+                    for (let y = 0; y < 128; ++y) {
+                        origin[y + 3] = bytes[y * 128 + origin[1]]
+                    }
+                    event.getPacket().getByteArrays().write(0, origin)
+                }
             }
         })
         this.ProtocolLibrary.getProtocolManager().addPacketListener(this.adapter)
@@ -307,14 +320,20 @@ export class MiaoReward extends interfaces.Plugin {
         return scanning
     }
 
-    cmdbind(sender: org.bukkit.entity.Player, server: boolean) {
+    cmdopen(sender: org.bukkit.entity.Player) {
         if (this.bindCheck(sender)) return
+        this.logger.sender(sender, '§a正在获取小程序二维码...')
+        let sync = { scaned: false }
+        this.setItemAndTp(sender, 'https://m.q.qq.com/a/p/1110360279?s=' + encodeURIComponent(`pages/my/index`), sync)
+        this.taskManager.create(() => sync.scaned = true).later(20 * 50).submit()
+    }
+
+    cmdbind(sender: org.bukkit.entity.Player, server: boolean) {
         if (!sender.getItemInHand) { return this.logger.sender(sender, '§c手持物品检测异常 请检查是否在客户端执行命令!') }
+        if (this.bindCheck(sender)) return
         if (server) {
-            if (!sender.isOp()) { return this.logger.sender(sender, '§4您没有配置服务器的权限!') }
             this.bindServer(sender)
         } else {
-            if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
             this.bindUser(sender)
         }
     }
@@ -484,6 +503,7 @@ export class MiaoReward extends interfaces.Plugin {
     }
 
     private bindServer(sender: org.bukkit.entity.Player) {
+        if (!sender.isOp()) { return this.logger.sender(sender, '§4您没有配置服务器的权限!') }
         this.logger.sender(sender, '§a正在请求二维码 请稍候...')
         let scanObj = http.get(`https://reward.yumc.pw/server/scan`)
         if (scanObj.code !== 200) {
@@ -510,8 +530,7 @@ export class MiaoReward extends interfaces.Plugin {
     }
 
     private bindUser(sender: org.bukkit.entity.Player) {
-        if (!this.config.serverId || !this.config.serverToken) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
+        if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
-        this.logger.sender(sender, '§a正在请求二维码 请稍候...')
         let check = this.httpPost(`https://reward.yumc.pw/server/query`, {
             id: this.config.serverId,
             token: this.config.serverToken
@@ -521,8 +540,10 @@ export class MiaoReward extends interfaces.Plugin {
         }
         let queryUser = this.queryUser(sender)
         if (queryUser.code == 200) {
-            return this.logger.sender(sender, ['§4当前用户已绑定! §c如需解绑 请联系腐竹!', '§b如需看广告请进QQ群 §a点击聊天框上的圈云盒子!'])
+            this.logger.sender(sender, ['§a当前用户已绑定! §3如需看广告请扫码进入!'])
+            return this.cmdopen(sender)
         }
+        this.logger.sender(sender, '§a正在请求二维码 请稍候...')
         let bindUrl = 'https://m.q.qq.com/a/p/1110360279?s=' + encodeURIComponent(`pages/my/index?bindType=user&serverId=${this.config.serverId}&uuid=${sender.getUniqueId().toString()}&username=${sender.getName()}`)
         let sync = { scaned: false, timeout: false }
         this.taskManager.create(() => {
@@ -569,21 +590,22 @@ export class MiaoReward extends interfaces.Plugin {
                 }
             }, this).async().later(20).timer(20).submit()
             this.playerTaskCache.set(sender.getName(), task)
-            this.playerImageCache.set(sender.getName(), this.createQrcode(content))
             if (this.downgrade) {
-                this.logger.sender(sender, '§c低版本客户端 二维码渲染中 请等待 6 秒 稍候扫码!')
+                this.logger.sender(sender, '§c低版本客户端 二维码渲染中 请等待 3 秒 稍候扫码!')
                 let waitTask = this.taskManager.create(() => {
                     let temp = sender.getLocation()
                     temp.setPitch(-90)
                     sender.teleport(temp)
-                }, this).later(20).timer(20).submit()
+                }, this).later(0).timer(20).submit()
                 this.taskManager.create(() => {
                     waitTask.cancel()
                     let temp = sender.getLocation()
                     temp.setPitch(90)
                     sender.teleport(temp)
-                }).later(150).submit()
+                }).later(80).submit()
-            } else {
+            }
+            this.playerImageCache.set(sender.getName(), org.bukkit.map.MapPalette.imageToBytes(this.createQrcode(content)))
+            if (!this.downgrade) {
                 let temp = sender.getLocation()
                 temp.setPitch(90)
                 sender.teleport(temp)
@@ -594,7 +616,7 @@ export class MiaoReward extends interfaces.Plugin {
     }
 
     private queryUser(sender: org.bukkit.entity.Player, sync = false) {
-        if (!this.config.serverId || !this.config.serverToken) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
+        if (!this.serverInfo) { return this.logger.sender(sender, '§4当前服务器尚未配置绑定ID 请联系腐竹进行配置!') }
         let result = this.httpPost(`https://reward.yumc.pw/server/queryUser`, {
             id: this.config.serverId,
             token: this.config.serverToken,
@@ -696,6 +718,7 @@ CAST TIME   : ${Date.now() - startTime}`)
         const player = event.getPlayer()
         this.bungeeCordDetect(player)
         this.updatePlayerInfo(player)
+        this.taskManager.create(() => this.logger.sender(player, `§a本服已使用喵式奖励 §3可以看广告赚${this.config.coinName} §c/mrd help §b查看帮助!`)).later(50).submit()
     }
 
     @Listener()
@@ -741,6 +764,7 @@ CAST TIME   : ${Date.now() - startTime}`)
         let help = [
             `§6====== ${this.config.prefix} §a帮助菜单 §6======`,
             `§6/mrd bind §a绑定圈云盒子`,
+            `§6/mrd open §a打开圈云盒子`,
             `§6/mrd query §a查询当前账户`,
             `§6/mrd draw §e<兑换数量> §a兑换${this.config.coinName}`
         ]

packages/plugins/src/MiaoSpring.ts

@@ -94,7 +94,7 @@ export class MiaoSpring extends interfaces.Plugin {
             preHandle: (ctx: Context) => {
                 const index = foundMap.indexOf(ctx.request.getRequestURI())
                 if (index != -1) {
-                    return this.ResponseEntity.status(this.HttpStatus.FOUND).header('Location', foundMap[index + 1]).build()
+                    return this.ResponseEntity.status(org.springframework.http.HttpStatus.FOUND).header('Location', foundMap[index + 1]).build()
                 }
             }
         })

packages/protocol/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/protocol",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript protocol package",
     "keywords": [
         "miaoscript",
@@ -22,6 +22,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/sponge-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/sponge/src/task.ts

@@ -9,24 +9,22 @@ const TimeUnit = Java.type('java.util.concurrent.TimeUnit')
 
 @provideSingleton(task.TaskManager)
 export class SpongeTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
     private syncExecutor: any
 
     @postConstruct()
     initialize() {
-        this.syncExecutor = Sponge.getScheduler().createSyncExecutor(this.pluginInstance)
+        this.syncExecutor = Sponge.getScheduler().createSyncExecutor(base.getInstance())
     }
 
-    create0(func: Function): task.Task {
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-        return new SpongeTask(this.pluginInstance, func)
+        return new SpongeTask(owner, func, id)
     }
     callSyncMethod(func: Function): any {
         // @ts-ignore
         return this.syncExecutor.schedule(new Callable({ call: () => func() }), java.lang.Long.valueOf(0), TimeUnit.NANOSECONDS).get()
     }
     disable0() {
-        Sponge.getScheduler().getScheduledTasks(this.pluginInstance).forEach((task: task.Cancelable) => task.cancel())
+        Sponge.getScheduler().getScheduledTasks(base.getInstance()).forEach((task: task.Cancelable) => task.cancel())
     }
 }
 
@@ -36,6 +34,6 @@ export class SpongeTask extends task.Task {
         if (this.isAsync) { run.async() }
         if (this.laterTime) { run.delayTicks(this.laterTime) }
         if (this.interval) { run.intervalTicks(this.interval) }
-        return run.submit(this.plugin)
+        return run.submit(base.getInstance())
     }
 }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -21,12 +21,12 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/common": "^0.10.0",
+        "@ccms/common": "^0.10.1",
-        "@ccms/container": "^0.10.0",
+        "@ccms/container": "^0.10.1",
-        "@ccms/database": "^0.10.0"
+        "@ccms/database": "^0.10.1"
     }
 }

packages/spring/src/task.ts

@@ -2,7 +2,6 @@ import { task, plugin } from '@ccms/api'
 import { inject, provideSingleton } from '@ccms/container'
 import thread_pool from '@ccms/common/dist/thread-pool'
 
-const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
 const AtomicBoolean = Java.type("java.util.concurrent.atomic.AtomicBoolean")
 const Thread = Java.type('java.lang.Thread')
 
@@ -11,21 +10,19 @@ export class SpringTaskManager extends task.TaskManager {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
 
-    private taskId: any
     private tasks: { [s: string]: task.Cancelable }
     private executor: java.util.concurrent.ThreadPoolExecutor
 
     constructor() {
         super()
-        this.taskId = new AtomicInteger(0)
         this.tasks = {}
         this.executor = thread_pool.create({
             groupName: '@ccms/spring'
         })
     }
 
-    create0(func: Function): task.Task {
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
-        return new SpringTask(this.pluginInstance, func, this)
+        return new SpringTask(owner, func, id, this)
     }
     callSyncMethod(func: Function): any {
         return func()
@@ -51,8 +48,8 @@ export class SpringTask extends task.Task {
     private taskManager: SpringTaskManager
     private running = new AtomicBoolean(true)
 
-    constructor(plugin: any, func: Function, taskManager: SpringTaskManager) {
+    constructor(owner: plugin.Plugin, func: Function, id: number, taskManager: SpringTaskManager) {
-        super(plugin, func)
+        super(owner, func, id)
         this.id = taskManager.nextId()
         this.taskManager = taskManager
     }
@@ -83,19 +80,16 @@ export class SpringTask extends task.Task {
         this.cancel()
     }
 
-    cancel0(): any {
+    cancel0() {
         var wasRunning = this.running.getAndSet(false)
         if (wasRunning) {
             this.taskManager.cancel(this.id)
+            return true
         }
+        return false
     }
 
     submit0(...args: any[]) {
         this.taskManager.submit(this.id, this, () => this.run(...args))
-        return {
-            cancel: () => {
-                return this.cancel0()
-            }
-        }
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -26,10 +26,10 @@
         "@javatypes/tomcat": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
+        "@ccms/api": "^0.10.1",
-        "@ccms/container": "^0.10.0"
+        "@ccms/container": "^0.10.1"
     }
 }

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -19,10 +19,10 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.10.1",
         "@javatypes/tomcat-websocket-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.0.5"
     }
 }

packages/websocket/src/netty/text_websocket_frame.ts

@@ -3,7 +3,7 @@ const TextWebSocketFrameMatcher = TypeParameterMatcher.get(base.getClass('io.net
 const SimpleChannelInboundHandler = Java.type('io.netty.channel.SimpleChannelInboundHandler')
 
 export abstract class TextWebSocketFrameHandlerAdapter {
-    private _Handler;
+    private _Handler
     constructor() {
         let TextWebSocketFrameHandlerAdapterImpl = Java.extend(SimpleChannelInboundHandler, {
             userEventTriggered: this.userEventTriggered.bind(this),
@@ -13,12 +13,12 @@ export abstract class TextWebSocketFrameHandlerAdapter {
             channelRead0: this.channelRead0.bind(this),
             exceptionCaught: this.exceptionCaught.bind(this)
         })
-        this._Handler = new TextWebSocketFrameHandlerAdapterImpl();
+        this._Handler = new TextWebSocketFrameHandlerAdapterImpl()
     }
-    abstract userEventTriggered(ctx: any, evt: any);
+    abstract userEventTriggered(ctx: any, evt: any)
-    abstract channelRead0(ctx: any, msg: any);
+    abstract channelRead0(ctx: any, msg: any)
-    abstract exceptionCaught(ctx: any, cause: Error);
+    abstract exceptionCaught(ctx: any, cause: Error)
     getHandler() {
-        return this._Handler;
+        return this._Handler
     }
 }

packages/websocket/src/netty/websocket.ts

@@ -1,17 +1,19 @@
 const ChannelInboundHandlerAdapter = Java.type('io.netty.channel.ChannelInboundHandlerAdapter')
 
 export abstract class WebSocketHandlerAdapter {
-    private _Handler;
+    private _Handler
     constructor() {
         let ChannelInboundHandlerAdapterImpl = Java.extend(ChannelInboundHandlerAdapter, {
             channelRead: this.channelRead.bind(this),
+            channelUnregistered: this.exceptionCaught.bind(this),
             exceptionCaught: this.exceptionCaught.bind(this)
         })
         this._Handler = new ChannelInboundHandlerAdapterImpl()
     }
-    abstract channelRead(ctx: any, channel: any);
+    abstract channelRead(ctx: any, channel: any)
-    abstract exceptionCaught(ctx: any, cause: Error);
+    abstract channelUnregistered(ctx: any)
+    abstract exceptionCaught(ctx: any, cause: Error)
     getHandler() {
-        return this._Handler;
+        return this._Handler
     }
 }

packages/websocket/src/server/client.ts

@@ -1,40 +1,40 @@
 import { EventEmitter } from 'events'
-import { SocketIO } from '../socket-io/interfaces';
+import { SocketIO } from '../socket-io/interfaces'
-import { AttributeKeys } from './constants';
+import { AttributeKeys } from './constants'
 
 const TextWebSocketFrame = Java.type('io.netty.handler.codec.http.websocketx.TextWebSocketFrame')
 
 export class NettyClient extends EventEmitter implements SocketIO.EngineSocket {
-    private _id: string;
+    private _id: string
     private channel: any
 
-    server: any;
+    server: any
-    readyState: string;
+    readyState: string
-    remoteAddress: string;
+    remoteAddress: string
-    upgraded: boolean;
+    upgraded: boolean
-    request: any;
+    request: any
-    transport: any;
+    transport: any
 
     constructor(server: any, channel: any) {
-        super();
+        super()
-        this.server = server;
+        this.server = server
-        this.readyState = 'open';
+        this.readyState = 'open'
         this.remoteAddress = channel.remoteAddress() + ''
-        this.upgraded = true;
+        this.upgraded = true
-        this.request = channel.attr(AttributeKeys.Request).get();
+        this.request = channel.attr(AttributeKeys.Request).get()
-        this.transport = null;
+        this.transport = null
 
-        this.channel = channel;
+        this.channel = channel
-        this._id = channel.id();
+        this._id = channel.id() + ''
     }
 
     get id() {
-        return this._id;
+        return this._id
     }
     send(text: string) {
         this.channel.writeAndFlush(new TextWebSocketFrame(text))
     }
     close() {
-        this.channel.close();
+        this.channel.close()
     }
 }

packages/websocket/src/server/index.ts

@@ -9,14 +9,14 @@ import { WebSocketDetect } from './websocket_detect'
 import { WebSocketHandler } from './websocket_handler'
 
 class NettyWebSocketServer extends EventEmitter {
-    private pipeline: any;
+    private pipeline: any
-    private allClients: { [key: string]: NettyClient };
+    private clients: Map<string, NettyClient>
 
     constructor(pipeline: any, options: ServerOptions) {
         super()
-        this.allClients = {};
+        this.clients = new Map()
-        this.pipeline = pipeline;
+        this.pipeline = pipeline
-        let connectEvent = options.event;
+        let connectEvent = options.event
         try { this.pipeline.remove(Keys.Detect) } catch (error) { }
         this.pipeline.addFirst(Keys.Detect, new WebSocketDetect(connectEvent).getHandler())
         connectEvent.on(ServerEvent.detect, (ctx, channel) => {
@@ -24,22 +24,42 @@ class NettyWebSocketServer extends EventEmitter {
             ctx.fireChannelRead(channel)
         })
         connectEvent.on(ServerEvent.connect, (ctx) => {
+            let cid = ctx?.channel().id() + ''
             let nettyClient = new NettyClient(this, ctx.channel())
-            this.allClients[nettyClient.id] = nettyClient
+            this.clients.set(cid, nettyClient)
             this.emit(ServerEvent.connect, nettyClient)
         })
         connectEvent.on(ServerEvent.message, (ctx, msg) => {
-            this.emit(ServerEvent.message, this.allClients[ctx.channel().id()], msg.text())
+            let cid = ctx?.channel().id() + ''
+            if (this.clients.has(cid)) {
+                this.emit(ServerEvent.message, this.clients.get(cid), msg.text())
+            } else {
+                console.error(`unknow client ${ctx} reciver message ${msg.text()}`)
+            }
+        })
+        connectEvent.on(ServerEvent.disconnect, (ctx, cause) => {
+            let cid = ctx?.channel().id() + ''
+            if (this.clients.has(cid)) {
+                this.emit(ServerEvent.disconnect, this.clients.get(cid), cause)
+            } else {
+                console.error(`unknow client ${ctx} disconnect cause ${cause}`)
+            }
         })
         connectEvent.on(ServerEvent.error, (ctx, cause) => {
-            this.emit(ServerEvent.error, this.allClients[ctx.channel().id()], cause)
+            let cid = ctx?.channel().id() + ''
+            if (this.clients.has(cid)) {
+                this.emit(ServerEvent.error, this.clients.get(cid), cause)
+            } else {
+                console.error(`unknow client ${ctx} cause error ${cause}`)
+                console.ex(cause)
+            }
         })
     }
     close() {
         if (this.pipeline.names().contains(Keys.Detect)) {
             this.pipeline.remove(Keys.Detect)
         }
-        Object.values(this.allClients).forEach(client => client.close())
+        this.clients.forEach(client => client.close())
     }
 }
 

packages/websocket/src/server/websocket_detect.ts

@@ -3,15 +3,19 @@ import { WebSocketHandlerAdapter } from "../netty"
 import { ServerEvent } from '../socket-io/constants'
 
 export class WebSocketDetect extends WebSocketHandlerAdapter {
-    private event: EventEmitter;
+    private event: EventEmitter
     constructor(event: EventEmitter) {
         super()
-        this.event = event;
+        this.event = event
     }
     channelRead(ctx: any, channel: any) {
-        this.event.emit(ServerEvent.detect, ctx, channel);
+        this.event.emit(ServerEvent.detect, ctx, channel)
+    }
+    channelUnregistered(ctx: any) {
+        this.event.emit(ServerEvent.disconnect, ctx, 'client disconnect')
+        ctx.fireChannelUnregistered()
     }
     exceptionCaught(ctx: any, cause: Error) {
-        this.event.emit(ServerEvent.error, ctx, cause);
+        this.event.emit(ServerEvent.error, ctx, cause)
     }
 }

packages/websocket/src/server/websocket_handler.ts

@@ -13,10 +13,10 @@ const HttpObjectAggregator = Java.type('io.netty.handler.codec.http.HttpObjectAg
 const WebSocketServerProtocolHandler = Java.type('io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler')
 
 export class WebSocketHandler extends WebSocketHandlerAdapter {
-    private options: ServerOptions;
+    private options: ServerOptions
     constructor(options: ServerOptions) {
         super()
-        this.options = options;
+        this.options = options
     }
     channelRead(ctx: any, msg: any) {
         msg.markReaderIndex()
@@ -32,6 +32,7 @@ export class WebSocketHandler extends WebSocketHandlerAdapter {
             pipeline.addLast('chunk', new ChunkedWriteHandler())
             pipeline.addLast('httpobj', new HttpObjectAggregator(64 * 1024))
             pipeline.addLast('http_request', new HttpRequestHandler(this.options).getHandler())
+            // this.options.path, null, false, 655360, false, true, false, 10000
             pipeline.addLast('websocket', new WebSocketServerProtocolHandler(this.options.path, true))
             pipeline.addLast('websocket_handler', new TextWebSocketFrameHandler(this.options).getHandler())
         }
@@ -39,6 +40,12 @@ export class WebSocketHandler extends WebSocketHandlerAdapter {
         msg.resetReaderIndex()
         ctx.fireChannelRead(msg)
     }
+
+    channelUnregistered(ctx: any) {
+        this.options.event.emit(ServerEvent.disconnect, ctx, 'client disconnect')
+        ctx.fireChannelUnregistered()
+    }
+
     exceptionCaught(ctx: any, cause: Error) {
         this.options.event.emit(ServerEvent.error, ctx, cause)
     }

packages/websocket/src/socket-io/index.ts

@@ -21,7 +21,7 @@ interface WebSocketServer extends EventEmitter {
 
 class Server implements SocketIO.Server {
     private websocketServer: WebSocketServer
-    private allClients: { [key: string]: Client }
+    private allClients: Map<string, Client>
 
     engine: { ws: any }
     nsps: { [namespace: string]: Namespace }
@@ -35,7 +35,7 @@ class Server implements SocketIO.Server {
 
     constructor(instance: any, options: ServerOptions) {
         if (!instance) { throw new Error('instance can\'t be undefiend!') }
-        this.allClients = {}
+        this.allClients = new Map()
         this.nsps = {}
         this.sockets = new Namespace('/', this)
         this.nsps['/'] = this.sockets
@@ -99,18 +99,17 @@ class Server implements SocketIO.Server {
     bind(srv: any): SocketIO.Server {
         throw new Error("Method not implemented.")
     }
-    onconnection(socket: Client): SocketIO.Server {
+    onconnection(client: Client): SocketIO.Server {
-        this.allClients[socket.id] = socket
+        client.packet({
-        socket.packet({
             type: PacketTypes.OPEN,
             data: {
-                sid: socket.id,
+                sid: client.id,
                 upgrades: [],
                 pingInterval: 25000,
                 pingTimeout: 5000
             }
         })
-        this.sockets.add(socket)
+        this.sockets.add(client)
         return this
     }
     of(nsp: string): Namespace {
@@ -164,20 +163,35 @@ class Server implements SocketIO.Server {
     private initServer() {
         this.websocketServer.on(ServerEvent.connect, (socket: SocketIO.EngineSocket) => {
             let client = new Client(this, socket)
+            this.allClients.set(socket.id, client)
             this.onconnection(client)
         })
         this.websocketServer.on(ServerEvent.message, (socket: SocketIO.EngineSocket, text) => {
-            this.processPacket(this.parser.decode(text), this.allClients[socket.id])
+            if (this.allClients.has(socket.id)) {
+                this.processPacket(this.parser.decode(text), this.allClients.get(socket.id))
+            } else {
+                console.error(`unknow engine socket ${socket.id} reciver message ${text}`)
+            }
         })
         this.websocketServer.on(ServerEvent.disconnect, (socket: SocketIO.EngineSocket, reason) => {
-            this.allClients[socket.id].onclose(reason)
+            if (this.allClients.has(socket.id)) {
-            delete this.allClients[socket.id]
+                this.allClients.get(socket.id).onclose(reason)
+                this.allClients.delete(socket.id)
+            } else {
+                console.error(`unknow engine socket ${socket?.id} disconnect cause ${reason}`)
+            }
         })
         this.websocketServer.on(ServerEvent.error, (socket: SocketIO.EngineSocket, cause) => {
-            if (socket.listeners(ServerEvent.error).length) {
+            if (this.allClients.has(socket?.id)) {
-                socket.emit(ServerEvent.error, cause)
+                if (socket.listeners(ServerEvent.error).length) {
+                    socket.emit(ServerEvent.error, cause)
+                } else {
+                    console.error(`engine socket ${socket.id} cause error: ${cause}`)
+                    console.ex(cause)
+                }
             } else {
-                console.error(`client ${socket.id} cause error: ${cause}`)
+                console.error(`unknow engine socket ${socket?.id} cause error: ${cause}`)
+                console.ex(cause)
             }
         })
     }
@@ -219,5 +233,6 @@ export {
     Server,
     Socket,
     Client,
+    Namespace,
     ServerOptions
 }

packages/websocket/src/socket-io/namespace.ts

@@ -1,40 +1,40 @@
 import { EventEmitter } from 'events'
 
 import { Client } from './client'
-import { SocketIO } from './interfaces';
+import { SocketIO } from './interfaces'
-import { ServerEvent } from './constants';
+import { ServerEvent } from './constants'
-import { Socket } from './socket';
+import { Socket } from './socket'
-import { Adapter } from './adapter';
+import { Adapter } from './adapter'
 import { Server } from './index'
-import { Packet } from './packet';
+import { Packet } from './packet'
-import { PacketTypes, SubPacketTypes } from './types';
+import { PacketTypes, SubPacketTypes } from './types'
 
 export class Namespace extends EventEmitter implements SocketIO.Namespace {
-    name: string;
+    name: string
-    server: Server;
+    server: Server
-    sockets: { [id: string]: Socket; };
+    sockets: { [id: string]: Socket }
-    connected: { [id: string]: Socket; };
+    connected: { [id: string]: Socket }
-    adapter: SocketIO.Adapter;
+    adapter: SocketIO.Adapter
-    json: SocketIO.Namespace;
+    json: SocketIO.Namespace
 
-    fns: any[];
+    fns: any[]
-    ids: number;
+    ids: number
-    rooms: string[];
+    rooms: string[]
-    flags: { [key: string]: boolean };
+    flags: { [key: string]: boolean }
 
     private events = ['connect', 'connection', 'newListener']
 
     constructor(name: string, server: Server) {
-        super();
+        super()
-        this.name = name;
+        this.name = name
-        this.server = server;
+        this.server = server
-        this.sockets = {};
+        this.sockets = {}
-        this.connected = {};
+        this.connected = {}
-        this.fns = [];
+        this.fns = []
-        this.ids = 0;
+        this.ids = 0
-        this.rooms = [];
+        this.rooms = []
-        this.flags = {};
+        this.flags = {}
-        this.adapter = new Adapter(this);
+        this.adapter = new Adapter(this)
     }
     initAdapter() {
         // @ts-ignore
@@ -42,39 +42,39 @@ export class Namespace extends EventEmitter implements SocketIO.Namespace {
     }
     add(client: Client, query?: any, callback?: () => void) {
         // client.conn.request.url();
-        let socket = new Socket(this, client, {});
+        let socket = new Socket(this, client, {})
-        this.sockets[client.id] = socket;
+        this.sockets[client.id] = socket
-        client.nsps[this.name] = socket;
+        client.nsps[this.name] = socket
-        this.onconnection(socket);
+        this.onconnection(socket)
-        return socket;
+        return socket
     }
     del(client: Client) {
-        let socket = this.sockets[client.id];
+        let socket = this.sockets[client.id]
-        socket.disconnect();
+        socket.disconnect()
-        delete this.sockets[client.id];
+        delete this.sockets[client.id]
     }
     use(fn: (socket: SocketIO.Socket, fn: (err?: any) => void) => void): SocketIO.Namespace {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
     }
     to(room: string): SocketIO.Namespace {
-        if (!~this.rooms.indexOf(room)) this.rooms.push(room);
+        if (!~this.rooms.indexOf(room)) this.rooms.push(room)
-        return this;
+        return this
     }
     in(room: string): SocketIO.Namespace {
-        return this.to(room);
+        return this.to(room)
     }
     send(...args: any[]): SocketIO.Namespace {
         super.emit('message', ...args)
-        return this;
+        return this
     }
     write(...args: any[]): SocketIO.Namespace {
-        return this.send(...args);
+        return this.send(...args)
     }
     emit(event: string, ...args: any[]): boolean {
         if (~this.events.indexOf(event)) {
-            super.emit(event, ...args);
+            super.emit(event, ...args)
             // @ts-ignore
-            return this;
+            return this
         }
         // set up packet object
         var packet = {
@@ -85,54 +85,58 @@ export class Namespace extends EventEmitter implements SocketIO.Namespace {
         }
 
         if ('function' == typeof args[args.length - 1]) {
-            throw new Error('Callbacks are not supported when broadcasting');
+            throw new Error('Callbacks are not supported when broadcasting')
         }
 
-        var rooms = this.rooms.slice(0);
+        var rooms = this.rooms.slice(0)
-        var flags = Object.assign({}, this.flags);
+        var flags = Object.assign({}, this.flags)
 
         // reset flags
-        this.rooms = [];
+        this.rooms = []
-        this.flags = {};
+        this.flags = {}
 
         this.adapter.broadcast(packet, {
             rooms: rooms,
             flags: flags
-        });
+        })
         // @ts-ignore
-        return this;
+        return this
     }
     hasBin(args: any[]) {
-        return false;
+        return false
     }
-    clients(fn: Function): SocketIO.Namespace {
+    clients(fn: (sockets: Socket[]) => SocketIO.Namespace): SocketIO.Namespace {
         return fn(Object.values(this.sockets))
     }
     compress(compress: boolean): SocketIO.Namespace {
-        throw new Error("Method not implemented.");
+        throw new Error("Method not implemented.")
     }
     process(packet: Packet, client: Client) {
         switch (packet.sub_type) {
             case SubPacketTypes.CONNECT:
-                this.add(client);
+                this.add(client)
-                break;
+                break
             default:
-                this.sockets[client.id].onpacket(packet);
+                this.sockets[client.id].onpacket(packet)
-                break;
+                break
         }
     }
     remove(socket: Socket) {
         if (this.sockets.hasOwnProperty(socket.id)) {
-            delete this.sockets[socket.id];
+            delete this.sockets[socket.id]
         } else {
             // debug('ignoring remove for %s', socket.id);
         }
     }
+    close() {
+        this.removeAllListeners('connect')
+        Object.values(this.sockets).forEach(socket => socket.disconnect(false))
+    }
     private onconnection(socket: any) {
-        let client = socket as Socket;
+        let client = socket as Socket
-        this.sockets[client.id] = client;
+        this.sockets[client.id] = client
+        this.emit(ServerEvent.connect, socket)
         client.onconnect()
-        this.emit(ServerEvent.connect, socket);
+        this.emit(ServerEvent.connection, socket)
-        this.emit(ServerEvent.connection, socket);
     }
 }

packages/websocket/src/tomcat/client.ts

@@ -25,7 +25,7 @@ export class TomcatClient extends EventEmitter implements SocketIO.EngineSocket
         this.transport = null
 
         this.session = session
-        this._id = session.getId()
+        this._id = session.getId() + ''
     }
 
     get id() {

packages/websocket/src/tomcat/server.ts

@@ -15,28 +15,45 @@ type TomcatWebSocketSession = javax.websocket.Session
 class TomcatWebSocketServer extends EventEmitter {
     private beanFactory: any
     private executor: any
-    private allClients: { [key: string]: SocketIO.EngineSocket }
+    private clients: Map<string, SocketIO.EngineSocket>
 
     constructor(beanFactory: any, options: ServerOptions) {
         super()
-        this.allClients = {}
+        this.clients = new Map()
         this.beanFactory = beanFactory
         this.initThreadPool()
         try { this.beanFactory.destroySingleton(ProxyBeanName) } catch (error) { }
         let NashornWebSocketServerProxy = Java.extend(WebSocketServerProxy, {
             onOpen: (session: TomcatWebSocketSession) => {
+                let cid = `${session?.getId()}`
                 let tomcatClient = new TomcatClient(this, session)
-                this.allClients[session.getId()] = tomcatClient
+                this.clients.set(cid, tomcatClient)
                 this.emit(ServerEvent.connect, tomcatClient)
             },
             onMessage: (session: TomcatWebSocketSession, message: string) => {
-                this.executor.execute(() => this.emit(ServerEvent.message, this.allClients[session.getId()], message))
+                let cid = `${session?.getId()}`
+                if (this.clients.has(cid)) {
+                    this.executor.execute(() => this.emit(ServerEvent.message, this.clients.get(cid), message))
+                } else {
+                    console.error(`unknow client ${session} reciver message ${message}`)
+                }
             },
             onClose: (session: TomcatWebSocketSession, reason: any) => {
-                this.emit(ServerEvent.disconnect, this.allClients[session.getId()], reason)
+                let cid = `${session?.getId()}`
+                if (this.clients.has(cid)) {
+                    this.emit(ServerEvent.disconnect, this.clients.get(cid), reason)
+                } else {
+                    console.error(`unknow client ${session} disconnect cause ${reason}`)
+                }
             },
             onError: (session: TomcatWebSocketSession, error: Error) => {
-                this.emit(ServerEvent.error, this.allClients[session.getId()], error)
+                let cid = `${session?.getId()}`
+                if (this.clients.has(cid)) {
+                    this.emit(ServerEvent.error, this.clients.get(cid), error)
+                } else {
+                    console.error(`unknow client ${session} cause error ${error}`)
+                    console.ex(error)
+                }
             },
         })
         this.beanFactory.registerSingleton(ProxyBeanName, new NashornWebSocketServerProxy())
@@ -52,7 +69,7 @@ class TomcatWebSocketServer extends EventEmitter {
         this.executor.initialize()
     }
     close() {
-        Object.values(this.allClients).forEach(client => client.close())
+        this.clients.forEach(client => client.close())
         this.beanFactory.destroySingleton(ProxyBeanName)
         this.executor.shutdown()
     }