perf(dev): 优化

cnlimiter · Feb 21, 2024 · a8206df · a8206df
1 parent e17e257
commit a8206df
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 18 deletions.
diff --git a/src/main/java/cn/evole/onebot/client/OneBotClient.java b/src/main/java/cn/evole/onebot/client/OneBotClient.java
@@ -8,6 +8,7 @@
 import cn.evole.onebot.client.instances.event.EventsBusImpl;
 import cn.evole.onebot.client.instances.event.MsgHandlerImpl;
 import cn.evole.onebot.client.interfaces.EventsBus;
+import cn.evole.onebot.client.internal.TestHandler;
 import lombok.Getter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -61,6 +62,8 @@ public void create() {
                 logger.error("▌ §c{}连接错误，请检查服务端是否开启 §a┈━═☆", URI.create(builder.toString()));
             }
         });
+
+        eventsBus.register(new TestHandler(this));
     }
 
     public boolean close() {

diff --git a/src/main/java/cn/evole/onebot/client/annotations/EventBus.java b/src/main/java/cn/evole/onebot/client/annotations/EventBus.java
@@ -0,0 +1,17 @@
+package cn.evole.onebot.client.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @Project: onebot-client
+ * @Author: cnlimiter
+ * @CreateTime: 2024/2/20 10:12
+ * @Description:
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EventBus {
+}
diff --git a/...ebot/client/annotations/EventHandler.java → ...ot/client/annotations/SubscribeEvent.java b/...ebot/client/annotations/EventHandler.java → ...ot/client/annotations/SubscribeEvent.java
@@ -14,7 +14,7 @@
 
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
-public @interface EventHandler {
+public @interface SubscribeEvent {
     /**
      * 内部注册的处理器优先度更高
      * @return 是否内部注册

diff --git a/src/main/java/cn/evole/onebot/client/instances/event/MethodScannerImpl.java b/src/main/java/cn/evole/onebot/client/instances/event/MethodScannerImpl.java
@@ -1,6 +1,6 @@
 package cn.evole.onebot.client.instances.event;
 
-import cn.evole.onebot.client.annotations.EventHandler;
+import cn.evole.onebot.client.annotations.SubscribeEvent;
 import cn.evole.onebot.client.interfaces.Listener;
 import net.kyori.event.PostOrders;
 import net.kyori.event.method.MethodScanner;
@@ -24,12 +24,12 @@ private MethodScannerImpl() {
 
     @Override
     public boolean shouldRegister(@NonNull Listener listener, @NonNull Method method) {
-        return Modifier.isPublic(method.getModifiers()) && method.isAnnotationPresent(EventHandler.class);
+        return Modifier.isPublic(method.getModifiers()) && method.isAnnotationPresent(SubscribeEvent.class);
     }
 
     @Override
     public int postOrder(@NonNull Listener listener, @NonNull Method method) {
-        return method.getAnnotation(EventHandler.class).internal() ? PostOrders.EARLY : PostOrders.NORMAL;
+        return method.getAnnotation(SubscribeEvent.class).internal() ? PostOrders.EARLY : PostOrders.NORMAL;
     }
 
     @Override

diff --git a/src/main/java/cn/evole/onebot/client/instances/event/MsgHandlerImpl.java b/src/main/java/cn/evole/onebot/client/instances/event/MsgHandlerImpl.java
@@ -41,15 +41,16 @@ public void handle(String msg) {
         if (msg == null) client.getLogger().warn("▌ §c消息体为空");
         assert msg != null;
         try {
-            val json = TransUtils.arrayToMsg(GsonUtils.parse(msg));
-            client.getLogger().debug(json.toString());
-            if (!META_HEART_BEAT.equals(GsonUtils.getAsString(json, META_EVENT))) {
-                client.getEventExecutor().execute(() -> {
-                    synchronized (lck) {
-                        event(json);
-                    }
-                });
-            }
+            JsonObject json = GsonUtils.parse(msg);
+            if (json.has(META_EVENT)) return;
+            val json2 = TransUtils.arrayToMsg(GsonUtils.parse(msg));
+            client.getLogger().info(json2.toString());
+            client.getEventExecutor().execute(() -> {
+                synchronized (lck) {
+                    event(json2);
+                }
+            });
+
         } catch (
                 JsonSyntaxException e) {
             client.getLogger().error("▌ §cJson语法错误:{}", msg);

diff --git a/src/main/java/cn/evole/onebot/client/internal/TestHandler.java b/src/main/java/cn/evole/onebot/client/internal/TestHandler.java
@@ -0,0 +1,25 @@
+package cn.evole.onebot.client.internal;
+
+import cn.evole.onebot.client.OneBotClient;
+import cn.evole.onebot.client.annotations.SubscribeEvent;
+import cn.evole.onebot.client.interfaces.Listener;
+import cn.evole.onebot.sdk.event.message.GroupMessageEvent;
+
+/**
+ * @Project: onebot-client
+ * @Author: cnlimiter
+ * @CreateTime: 2024/2/20 9:57
+ * @Description:
+ */
+
+public class TestHandler implements Listener {
+    OneBotClient client;
+    public TestHandler(OneBotClient client){
+        this.client = client;
+    }
+
+    @SubscribeEvent(internal = true)
+    public void msg1(GroupMessageEvent event){
+        client.getLogger().info(event);
+    }
+}
diff --git a/src/main/java/cn/evole/onebot/client/utils/TransUtils.java b/src/main/java/cn/evole/onebot/client/utils/TransUtils.java
@@ -18,11 +18,12 @@
 public class TransUtils {
 
     public static JsonObject arrayToMsg(JsonObject json){
+        if (json.has("raw_message")) return json;
         if (json.has("message") && GsonUtils.isArrayNode(json, "message")){
             List<ArrayMsg> msg = GsonUtils.fromJson(json.getAsJsonArray("message"), new TypeToken<List<ArrayMsg>>() {
             }.getType());
             String code = BotUtils.arrayMsgToCode(msg);
-            json.addProperty("array_msg", code);
+            json.addProperty("trans_msg", code);
         }
         return json;
     }

diff --git a/src/test/java/HandlerTest.java b/src/test/java/HandlerTest.java
@@ -1,8 +1,10 @@
 import cn.evole.onebot.client.OneBotClient;
-import cn.evole.onebot.client.annotations.EventHandler;
+import cn.evole.onebot.client.annotations.SubscribeEvent;
 import cn.evole.onebot.client.core.BotConfig;
 import cn.evole.onebot.client.interfaces.Listener;
 import cn.evole.onebot.sdk.event.message.GroupMessageEvent;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * @Project: onebot-client
@@ -13,16 +15,19 @@
 
 public class HandlerTest implements Listener {
     static OneBotClient client;
+    static Logger logger;
 
     public static void main(String[] args) throws InterruptedException {
+        logger = LogManager.getLogger("OneBot Client1");
         BotConfig config = new BotConfig("ws://127.0.0.1:9999");
         client = new OneBotClient(config);
         client.create();
-        client.getEventsBus().register(new HandlerTest());
+        //client.getEventsBus().register(new HandlerTest());
     }
 
-    @EventHandler(internal = true)
+    @SubscribeEvent(internal = true)
     public void msg1(GroupMessageEvent event){
-        System.out.println(event);
+        logger.info(event);
+        //System.out.println(event);
     }
 }