From 3901d9fb5ff76d000bb2c9026ea028f004150518 Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Wed, 8 Feb 2023 17:03:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MiaoWoo --- package.json | 2 +- packages/amqp/package.json | 4 ++-- packages/api/package.json | 4 ++-- packages/api/src/event.ts | 18 +++++++++--------- packages/bukkit/package.json | 4 ++-- packages/bungee/package.json | 4 ++-- packages/client/package.json | 12 ++++++------ packages/common/package.json | 4 ++-- packages/compile/package.json | 4 ++-- packages/container/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/database/package.json | 4 ++-- packages/i18n/package.json | 4 ++-- packages/keyvalue/package.json | 4 ++-- packages/molang/package.json | 8 ++++---- packages/nashorn/package.json | 4 ++-- packages/nodejs/package.json | 6 +++--- packages/nukkit/package.json | 4 ++-- packages/plugin/package.json | 6 +++--- packages/polyfill/package.json | 6 +++--- packages/polyfill/src/xml-http-request.ts | 18 +++++++++--------- packages/protocol/package.json | 4 ++-- packages/sponge/package.json | 4 ++-- packages/spring/package.json | 4 ++-- packages/web/package.json | 4 ++-- packages/websocket/package.json | 6 +++--- 26 files changed, 75 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 546a3918..a6c2dc64 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ "packages/*" ], "devDependencies": { - "lerna": "^6.0.3" + "lerna": "^6.4.1" } } diff --git a/packages/amqp/package.json b/packages/amqp/package.json index 99b11d92..f922aa2f 100644 --- a/packages/amqp/package.json +++ b/packages/amqp/package.json @@ -29,7 +29,7 @@ "@javatypes/spring-amqp": "^0.0.3", "@javatypes/spring-rabbit": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/api/package.json b/packages/api/package.json index 9b335bac..1d3ed792 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@types/base64-js": "^1.3.0", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/api/src/event.ts b/packages/api/src/event.ts index 2fcfa1cd..5b50e756 100644 --- a/packages/api/src/event.ts +++ b/packages/api/src/event.ts @@ -96,8 +96,8 @@ export namespace event { /** * 创建命令执行器 * @param name 插件名称 - * @param exec - * @param eventCls + * @param exec 执行方法 + * @param eventCls 事件类 * @returns */ createExecute(name, exec, eventCls) { @@ -106,7 +106,7 @@ export namespace event { try { if (!eventCls.isAssignableFrom(event.getClass())) { return } let time = Date.now(); exec(event); let cost = Date.now() - time - if (cost > global.ScriptSlowExecuteTime) { + if (cost > global.ScriptSlowExecuteTime && !event.async) { let eventKey = `${name}-${this.class2Name(eventCls)}` if (!this.cacheSlowEventKey[eventKey]) { return this.cacheSlowEventKey[eventKey] = cost } console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost }) @@ -120,11 +120,11 @@ export namespace event { /** * 添加事件监听 - * @param plugin {any} - * @param event {string} - * @param exec {function} - * @param priority {string} [LOWEST,LOW,NORMAL,HIGH,HIGHEST,MONITOR] - * @param ignoreCancel + * @param plugin {any} 插件 + * @param event {string} 事件名称 + * @param exec {function} 事件执行器 + * @param priority {string} [LOWEST,LOW,NORMAL,HIGH,HIGHEST,MONITOR] 优先级 + * @param ignoreCancel 是否忽略已取消事件 */ listen(plugin: any, event: string, exec: (event: any) => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) { if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty")) @@ -178,7 +178,7 @@ export namespace event { disable(plugin: any) { var eventCache = this.listenerMap[plugin.description.name] if (eventCache) { - eventCache.forEach(off => off()) + eventCache.forEach((off: () => any) => off()) delete this.listenerMap[plugin.description.name] } } diff --git a/packages/bukkit/package.json b/packages/bukkit/package.json index ce18ba2c..f4b662ca 100644 --- a/packages/bukkit/package.json +++ b/packages/bukkit/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@javatypes/spigot-api": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/bungee/package.json b/packages/bungee/package.json index 4738ac76..b507bec1 100644 --- a/packages/bungee/package.json +++ b/packages/bungee/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@javatypes/bungee-api": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/client/package.json b/packages/client/package.json index 55768768..828dfddc 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -24,16 +24,16 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "axios": "^1.1.3", + "axios": "^1.3.2", "https-proxy-agent": "^5.0.1", - "minecraft-protocol": "^1.36.1", + "minecraft-protocol": "^1.40.3", "minecraft-protocol-forge": "^1.0.0", "proxy-agent": "^5.0.0" }, "devDependencies": { - "@types/node": "^18.11.9", - "lerna": "^6.0.3", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "@types/node": "^18.13.0", + "lerna": "^6.4.1", + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/common/package.json b/packages/common/package.json index 51de208c..25ceae44 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -22,8 +22,8 @@ "@ccms/nashorn": "^0.26.0", "@javatypes/jdk": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027" } diff --git a/packages/compile/package.json b/packages/compile/package.json index 9b4b664f..b3455fad 100644 --- a/packages/compile/package.json +++ b/packages/compile/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/container/package.json b/packages/container/package.json index 53afeb94..4be304d1 100644 --- a/packages/container/package.json +++ b/packages/container/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@ccms/nashorn": "^0.26.0", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "inversify": "^6.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index d5a0a631..532484ef 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,8 +20,8 @@ }, "devDependencies": { "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/database/package.json b/packages/database/package.json index 697a840d..aa66bb5c 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@javatypes/spring-jdbc": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 9599e58a..925c520b 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -22,8 +22,8 @@ "@ccms/nashorn": "^0.26.0", "@types/js-yaml": "^4.0.5", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "js-yaml": "^4.1.0" diff --git a/packages/keyvalue/package.json b/packages/keyvalue/package.json index 847bb799..4cfb02a5 100644 --- a/packages/keyvalue/package.json +++ b/packages/keyvalue/package.json @@ -29,8 +29,8 @@ "@javatypes/spring-amqp": "^0.0.3", "@javatypes/spring-rabbit": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75" } diff --git a/packages/molang/package.json b/packages/molang/package.json index f66eaf5b..174bc143 100644 --- a/packages/molang/package.json +++ b/packages/molang/package.json @@ -21,9 +21,9 @@ }, "homepage": "https://github.com/solvedDev/MoLang#readme", "devDependencies": { - "@types/node": "^18.11.9", - "rimraf": "^3.0.2", - "tslib": "^2.4.1", - "typescript": "^4.9.3" + "@types/node": "^18.13.0", + "rimraf": "^4.1.2", + "tslib": "^2.5.0", + "typescript": "^4.9.5" } } diff --git a/packages/nashorn/package.json b/packages/nashorn/package.json index 3c14cb66..c6f76335 100644 --- a/packages/nashorn/package.json +++ b/packages/nashorn/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json index a1355701..fbc86a86 100644 --- a/packages/nodejs/package.json +++ b/packages/nodejs/package.json @@ -21,9 +21,9 @@ "devDependencies": { "@ccms/nashorn": "^0.26.0", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "tslib": "^2.4.1", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "tslib": "^2.5.0", + "typescript": "^4.9.5" }, "gitHead": "781524f83e52cad26d7c480513e3c525df867121" } diff --git a/packages/nukkit/package.json b/packages/nukkit/package.json index bfc7f323..95c28839 100644 --- a/packages/nukkit/package.json +++ b/packages/nukkit/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@javatypes/nukkit-api": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 9b24eaf0..da517864 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -22,15 +22,15 @@ "@types/crypto-js": "^4.1.1", "@types/js-yaml": "^4.0.5", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", "@ccms/common": "^0.26.0", "@ccms/container": "^0.26.0", "@ccms/i18n": "^0.26.0", - "@ccms/verify": "^0.24.5", + "@ccms/verify": "^0.25.1", "crypto-js": "^4.1.1", "js-yaml": "^4.1.0" } diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index 2e2f971d..b1974948 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -16,12 +16,12 @@ "dependencies": { "@ccms/i18n": "^0.26.0", "@ccms/nodejs": "^0.26.0", - "core-js": "^3.26.1" + "core-js": "^3.27.2" }, "devDependencies": { "@ccms/nashorn": "^0.26.0", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/polyfill/src/xml-http-request.ts b/packages/polyfill/src/xml-http-request.ts index 9a075776..69ce77a0 100644 --- a/packages/polyfill/src/xml-http-request.ts +++ b/packages/polyfill/src/xml-http-request.ts @@ -68,8 +68,8 @@ type EventType = | 'timeout' | 'loadend' | 'loadstart' -type HttpHeader = { [key: string]: string } - +type RequestHttpHeader = { [key: string]: string } +type HttpHeader = { [key: string]: string[] } const executor = Executors.newCachedThreadPool() @@ -85,7 +85,7 @@ export class XMLHttpRequest { private _url: string private _async: boolean private _mimeType: string - private _requestHeaders: HttpHeader = {}; + private _requestHeaders: RequestHttpHeader = {}; private _status: number = 0; private _statusText: string = null; @@ -156,7 +156,7 @@ export class XMLHttpRequest { this._requestHeaders[key] = val } getResponseHeader(key: string): string { - return this._responseHeaders[key] + return this._responseHeaders[key]?.[0] } getAllResponseHeaders(): any { return this._responseHeaders @@ -221,7 +221,7 @@ export class XMLHttpRequest { this.onloadstart?.() if (body) { let bodyType = Object.prototype.toString.call(body) - if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string!`) } + if (typeof body !== "string") { throw new Error(`body(${bodyType}) must be string.`) } var out = this._connection.getOutputStream() out.write(new JavaString(body).getBytes(UTF_8)) out.flush() @@ -238,7 +238,7 @@ export class XMLHttpRequest { } else { this._responseText = this.readOutput(this._connection.getErrorStream()) } - this.setResponseHeaders(this._connection.getHeaderFields()) + this.setResponseHeaders() this.onloadend?.() } catch (ex: any) { if (ex instanceof SocketTimeoutException && this.ontimeout) { @@ -253,9 +253,9 @@ export class XMLHttpRequest { } } - private setResponseHeaders(header: any) { - header.forEach((key: string | number, value: string | any[]) => { - this._responseHeaders[key + ''] = value[value.length - 1] + '' + private setResponseHeaders() { + this._connection.getHeaderFields().forEach((key: string | number, value: any[]) => { + this._responseHeaders[key + ''] = Java.from(value) }) } diff --git a/packages/protocol/package.json b/packages/protocol/package.json index bb7d97b6..af51c596 100644 --- a/packages/protocol/package.json +++ b/packages/protocol/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } } diff --git a/packages/sponge/package.json b/packages/sponge/package.json index 39c6a7d3..5d0952cb 100644 --- a/packages/sponge/package.json +++ b/packages/sponge/package.json @@ -21,8 +21,8 @@ "devDependencies": { "@javatypes/sponge-api": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/spring/package.json b/packages/spring/package.json index c9c3d155..77b31626 100644 --- a/packages/spring/package.json +++ b/packages/spring/package.json @@ -20,8 +20,8 @@ }, "devDependencies": { "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/web/package.json b/packages/web/package.json index 701d14f1..ad7ef0e2 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -25,8 +25,8 @@ "@javatypes/spring-web": "^0.0.3", "@javatypes/tomcat": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" }, "dependencies": { "@ccms/api": "^0.26.0", diff --git a/packages/websocket/package.json b/packages/websocket/package.json index 5233ba57..4c8b3b96 100644 --- a/packages/websocket/package.json +++ b/packages/websocket/package.json @@ -19,7 +19,7 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "@socket.io/component-emitter": "^3.1.0", + "@socket.io/component-emitter": "^4.0.0", "backo2": "^1.0.2", "parseuri": "^0.0.6" }, @@ -27,7 +27,7 @@ "@ccms/nashorn": "^0.26.0", "@javatypes/tomcat-websocket-api": "^0.0.3", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.2", - "typescript": "^4.9.3" + "rimraf": "^4.1.2", + "typescript": "^4.9.5" } }