diff --git a/package.json b/package.json index 5a4aa156..68172a41 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,6 @@ "packages/*" ], "devDependencies": { - "lerna": "^3.21.0" + "lerna": "^3.22.1" } } diff --git a/packages/amqp/package.json b/packages/amqp/package.json index 50ed4936..255b5f0a 100644 --- a/packages/amqp/package.json +++ b/packages/amqp/package.json @@ -21,12 +21,15 @@ "dependencies": { "@ccms/api": "^0.8.1", "@ccms/common": "^0.8.0", - "@ccms/container": "^0.8.0", - "@ccms/nashorn": "^0.8.0" + "@ccms/container": "^0.8.0" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", + "@javatypes/amqp-client": "^0.0.2", + "@javatypes/spring-amqp": "^0.0.2", + "@javatypes/spring-rabbit": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/api/package.json b/packages/api/package.json index 83668521..bc624854 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -26,9 +26,9 @@ "source-map-builder": "^0.0.7" }, "devDependencies": { - "@types/base64-js": "^1.2.5", + "@types/base64-js": "^1.3.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/bukkit/package.json b/packages/bukkit/package.json index d0a5d6da..4600f394 100644 --- a/packages/bukkit/package.json +++ b/packages/bukkit/package.json @@ -19,9 +19,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/spigot-api": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/bungee/package.json b/packages/bungee/package.json index c2e7ac33..f218d289 100644 --- a/packages/bungee/package.json +++ b/packages/bungee/package.json @@ -19,9 +19,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/bungee-api": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/client/package.json b/packages/client/package.json index 781b42f2..d7e9e95e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -22,10 +22,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "minecraft-protocol": "^1.11.0" + "minecraft-protocol": "^1.13.0" }, "devDependencies": { "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/common/package.json b/packages/common/package.json index e1a10c10..8ca13b8f 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -19,13 +19,13 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", + "@javatypes/jdk": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { - "@ccms/nashorn": "^0.8.0", - "@javatypes/jdk": "^1.14.0" }, "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027" } diff --git a/packages/compile/package.json b/packages/compile/package.json index 4b60a9b8..899ef361 100644 --- a/packages/compile/package.json +++ b/packages/compile/package.json @@ -21,6 +21,6 @@ "devDependencies": { "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/container/package.json b/packages/container/package.json index 374db77d..fbb5ba7f 100644 --- a/packages/container/package.json +++ b/packages/container/package.json @@ -19,12 +19,12 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { - "@ccms/nashorn": "^0.8.0", "inversify": "^5.0.1", "inversify-binding-decorators": "^4.0.0" } diff --git a/packages/core/package.json b/packages/core/package.json index 286618ab..ea884134 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -21,7 +21,7 @@ "devDependencies": { "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/database/package.json b/packages/database/package.json index b18c6849..80799d71 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -19,9 +19,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/spring-jdbc": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index f559f1ea..00105a87 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -19,14 +19,14 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { - "@types/js-yaml": "^3.12.3", + "@ccms/nashorn": "^0.8.0", + "@types/js-yaml": "^3.12.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { - "@ccms/nashorn": "^0.8.0", - "js-yaml": "^3.13.1" + "js-yaml": "^3.14.0" }, "gitHead": "781524f83e52cad26d7c480513e3c525df867121" } diff --git a/packages/nashorn/package.json b/packages/nashorn/package.json index 378e3b54..40a8f05c 100644 --- a/packages/nashorn/package.json +++ b/packages/nashorn/package.json @@ -22,6 +22,6 @@ "devDependencies": { "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json index ff03d946..ba631ec1 100644 --- a/packages/nodejs/package.json +++ b/packages/nodejs/package.json @@ -19,12 +19,12 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { - "@ccms/nashorn": "^0.8.0" }, "gitHead": "781524f83e52cad26d7c480513e3c525df867121" } diff --git a/packages/nukkit/package.json b/packages/nukkit/package.json index e8627825..f9128778 100644 --- a/packages/nukkit/package.json +++ b/packages/nukkit/package.json @@ -19,9 +19,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/nukkit-api": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/ployfill/package.json b/packages/ployfill/package.json index 9b456e02..cca2fa21 100644 --- a/packages/ployfill/package.json +++ b/packages/ployfill/package.json @@ -15,13 +15,13 @@ }, "dependencies": { "@ccms/i18n": "^0.8.0", - "@ccms/nashorn": "^0.8.0", "@ccms/nodejs": "^0.8.0", "core-js": "^3.6.5" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" } } diff --git a/packages/plugin/package.json b/packages/plugin/package.json index 6f0e92cd..f7c04ce8 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -19,16 +19,16 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { - "@types/js-yaml": "^3.12.3", + "@types/js-yaml": "^3.12.5", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", "@ccms/common": "^0.8.0", "@ccms/container": "^0.8.0", "@ccms/i18n": "^0.8.0", - "js-yaml": "^3.13.1" + "js-yaml": "^3.14.0" } } diff --git a/packages/sponge/package.json b/packages/sponge/package.json index 5a87bd4d..c1bd174e 100644 --- a/packages/sponge/package.json +++ b/packages/sponge/package.json @@ -19,9 +19,10 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/sponge-api": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/spring/package.json b/packages/spring/package.json index c28d47a1..7634ba47 100644 --- a/packages/spring/package.json +++ b/packages/spring/package.json @@ -21,7 +21,7 @@ "devDependencies": { "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/spring/src/internal/command.ts b/packages/spring/src/internal/command.ts index 1b9a2bca..4f06b41f 100644 --- a/packages/spring/src/internal/command.ts +++ b/packages/spring/src/internal/command.ts @@ -47,7 +47,7 @@ export class CommandMap { } tabComplate(sender: any, input: string, index?: number): string[] { - if (index == 0) { return Object.keys(this.commands) } + if (index == 0) { return Object.keys(this.commands).concat('help') } let [command, ...args] = input.split(' ') let exists = this.commands[command] if (exists && exists.tabCompleter) { diff --git a/packages/web/package.json b/packages/web/package.json index 9a0d4089..d38e6d4e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -19,9 +19,14 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@javatypes/jdk": "^0.0.2", + "@javatypes/spring-beans": "^0.0.2", + "@javatypes/spring-core": "^0.0.2", + "@javatypes/spring-web": "^0.0.2", + "@javatypes/tomcat": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { "@ccms/api": "^0.8.1", diff --git a/packages/websocket/package.json b/packages/websocket/package.json index 8ed83265..cc42edad 100644 --- a/packages/websocket/package.json +++ b/packages/websocket/package.json @@ -19,11 +19,12 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "devDependencies": { + "@ccms/nashorn": "^0.8.0", + "@javatypes/tomcat-websocket-api": "^0.0.2", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", - "typescript": "^3.9.2" + "typescript": "^3.9.5" }, "dependencies": { - "@ccms/nashorn": "^0.8.0" } } diff --git a/packages/websocket/src/index.ts b/packages/websocket/src/index.ts index 8adb8698..5797d100 100644 --- a/packages/websocket/src/index.ts +++ b/packages/websocket/src/index.ts @@ -1,4 +1,5 @@ /// +/// import { Server, ServerOptions } from './socket-io' @@ -6,40 +7,40 @@ interface SocketIOStatic { /** * Default Server constructor */ - (): Server; + (): Server /** * Creates a new Server * @param srv The HTTP server that we're going to bind to * @param opts An optional parameters object */ - (srv: any, opts?: ServerOptions): Server; + (srv: any, opts?: ServerOptions): Server /** * Creates a new Server * @param port A port to bind to, as a number, or a string * @param An optional parameters object */ - (port: string | number, opts?: ServerOptions): Server; + (port: string | number, opts?: ServerOptions): Server /** * Creates a new Server * @param A parameters object */ - (opts: ServerOptions): Server; + (opts: ServerOptions): Server /** * Backwards compatibility * @see io().listen() */ - listen?: SocketIOStatic; + listen?: SocketIOStatic } type SocketStatic = SocketIOStatic & { Instance?: symbol } // @ts-ignore let io: SocketStatic = function (pipeline: any, options: ServerOptions) { - return new Server(pipeline, options) + return new Server(pipeline, options) } io.Instance = Symbol("@ccms/websocket") export default io diff --git a/packages/websocket/src/tomcat/server.ts b/packages/websocket/src/tomcat/server.ts index cede0af4..db287340 100644 --- a/packages/websocket/src/tomcat/server.ts +++ b/packages/websocket/src/tomcat/server.ts @@ -10,9 +10,7 @@ const WebSocketServerProxy = Java.type("pw.yumc.MiaoScript.websocket.WebSocketPr const ThreadPoolExecutor = Java.type('java.util.concurrent.ThreadPoolExecutor') const ThreadPoolTaskExecutor = Java.type('org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor') -interface TomcatWebSocketSession { - getId: () => number -} +type TomcatWebSocketSession = javax.websocket.Session class TomcatWebSocketServer extends EventEmitter { private beanFactory: any