From d1f58e7482ff23806af32ae47cf02094245651ac Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Fri, 27 Sep 2019 09:49:45 +0800 Subject: [PATCH] feat: supoort mod server scan event Signed-off-by: MiaoWoo --- packages/api/src/event.ts | 70 ++++++++++++++++++------------------ packages/bukkit/src/event.ts | 17 +++++---- tsconfig.json | 4 ++- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/packages/api/src/event.ts b/packages/api/src/event.ts index 1020cec3..fca55134 100644 --- a/packages/api/src/event.ts +++ b/packages/api/src/event.ts @@ -6,14 +6,15 @@ import '@ms/core' import '@ms/nashorn' import { injectable } from '@ms/container' -const Thread = Java.type("java.lang.Thread"); +const Thread = Java.type('java.lang.Thread'); export namespace event { @injectable() export abstract class Event { private mapEvent = []; private listenerMap = []; - private baseEventDir = ''; + + protected baseEventDir = ''; constructor(baseEventDir: string) { this.baseEventDir = baseEventDir; @@ -27,43 +28,44 @@ export namespace event { if (this.baseEventDir === "") { throw new Error("事件基础包名为空 无法进行事件映射!"); } - var count = 0; - var dirs = Thread.currentThread().getContextClassLoader().getResources(this.baseEventDir); - while (dirs.hasMoreElements()) { - var url = dirs.nextElement(); - var protocol = url.protocol; - if (protocol === "jar") { - // noinspection JSUnresolvedVariable - var jar = url.openConnection().jarFile; - var entries = jar.entries(); - while (entries.hasMoreElements()) { - var entry = entries.nextElement(); - var name = entry.name; - // 以 org/bukkit/event 开头 并且以 .class 结尾 - if (name.startsWith(this.baseEventDir) && name.endsWith(".class")) { - var i = name.replaceAll('/', '.'); - try { - var clz = base.getClass(i.substring(0, i.length - 6)); - // 继承于 org.bukkit.event.Event 访问符为Public - if (this.isValidEvent(clz)) { - var simpleName = this.class2Name(clz).toLowerCase(); - console.debug(`Mapping Event [${clz.canonicalName}] => ${simpleName}`); - this.mapEvent[simpleName] = clz; - count++; - } - } catch (ex) { - //ignore already loaded class - } + let count = 0; + let jar = this.getJarFile(this.baseEventDir); + let entries = jar.entries(); + while (entries.hasMoreElements()) { + let entry = entries.nextElement(); + let name = entry.name; + // 以 org/bukkit/event 开头 并且以 .class 结尾 + if (name.startsWith(this.baseEventDir) && name.endsWith(".class")) { + let qualifiedName = name.replaceAll('/', '.'); + try { + let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6)); + // 继承于 org.bukkit.event.Event 访问符为Public + if (this.isValidEvent(clazz)) { + let simpleName = this.class2Name(clazz).toLowerCase(); + console.debug(`Mapping Event [${clazz.canonicalName}] => ${simpleName}`); + this.mapEvent[simpleName] = clazz; + count++; } + } catch (ex) { + //ignore already loaded class } } } return count; - }; + } + + getJarFile(resource: string) { + let dirs = Thread.currentThread().getContextClassLoader().getResources(resource); + if (dirs.hasMoreElements()) { + let url = dirs.nextElement(); + if (url.protocol === "jar") { return url.openConnection().jarFile; } + } + throw new Error(`Can't Mapping Event Because not found Resources ${resource}!`) + } class2Name(clazz) { return clazz.simpleName; - }; + } name2Class(name, event) { var eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event']; @@ -78,7 +80,7 @@ export namespace event { } } return eventCls; - }; + } execute(name, exec, eventCls) { return (...args) => { @@ -93,8 +95,8 @@ export namespace event { console.console(`§6插件 §b${name} §6处理 §d${this.class2Name(eventCls)} §6事件时发生异常 §4${ex}`); console.ex(ex); } - }; - }; + } + } /** * 添加事件监听 diff --git a/packages/bukkit/src/event.ts b/packages/bukkit/src/event.ts index 5f8019a8..4c85d0dc 100644 --- a/packages/bukkit/src/event.ts +++ b/packages/bukkit/src/event.ts @@ -2,12 +2,12 @@ import { event, server, plugin } from '@ms/api' import { injectable, inject } from '@ms/container'; import * as reflect from '@ms/common/dist/reflect' -let Bukkit = Java.type("org.bukkit.Bukkit"); -let Event = Java.type("org.bukkit.event.Event"); -let Modifier = Java.type("java.lang.reflect.Modifier"); -let Listener = Java.type("org.bukkit.event.Listener"); -let EventPriority = Java.type("org.bukkit.event.EventPriority"); -let EventExecutor = Java.type("org.bukkit.plugin.EventExecutor"); +const Bukkit = Java.type("org.bukkit.Bukkit"); +const Event = Java.type("org.bukkit.event.Event"); +const Modifier = Java.type("java.lang.reflect.Modifier"); +const Listener = Java.type("org.bukkit.event.Listener"); +const EventPriority = Java.type("org.bukkit.event.EventPriority"); +const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor"); @injectable() export class BukkitEvent extends event.Event { @@ -18,6 +18,9 @@ export class BukkitEvent extends event.Event { super('org/bukkit/event'); } + getJarFile(resource: string) { + return super.getJarFile('org/bukkit/Bukkit.class') + } isValidEvent(clazz: any): boolean { // 继承于 org.bukkit.event.Event return Event.class.isAssignableFrom(clazz) && @@ -27,7 +30,7 @@ export class BukkitEvent extends event.Event { !Modifier.isAbstract(clazz.getModifiers()); } register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean) { - var listener = new Listener({}); + let listener = new Listener({}); Bukkit.pluginManager.registerEvent( eventCls, listener, diff --git a/tsconfig.json b/tsconfig.json index 8ecbb4f7..b086a6d8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,13 +4,15 @@ "outDir": "dist", "target": "es5", "module": "commonjs", + "strict": true, + "strictNullChecks": false, "sourceMap": false, "declaration": true, "noImplicitAny": false, "downlevelIteration": true, "allowUnreachableCode": true, - "experimentalDecorators": true, "emitDecoratorMetadata": true, + "experimentalDecorators": true, "lib": [] } } \ No newline at end of file