From 70f52ef09627c346c4672e09475f65ab6d3ca9f4 Mon Sep 17 00:00:00 2001 From: yanji-yang Date: Fri, 22 Dec 2023 18:08:02 +0800 Subject: [PATCH] fix #108 to Support CustomEventHandler to Convert EventObject extend BaseEvent or BaseEventV2 --- .../lark/oapi/event/CustomEventV1Handler.java | 19 ++++++++++ .../lark/oapi/event/CustomEventV2Handler.java | 19 ++++++++++ .../com/lark/oapi/event/EventDispatcher.java | 24 +++++++++++++ .../lark/oapi/event/TestEventDispatcher.java | 35 +++++++++++++++++++ 4 files changed, 97 insertions(+) create mode 100644 larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV1Handler.java create mode 100644 larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV2Handler.java diff --git a/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV1Handler.java b/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV1Handler.java new file mode 100644 index 000000000..f80bcb043 --- /dev/null +++ b/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV1Handler.java @@ -0,0 +1,19 @@ +/* + * MIT License + * + * Copyright (c) 2022 Lark Technologies Pte. Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice, shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package com.lark.oapi.event; + +import com.lark.oapi.event.model.BaseEvent; + +public abstract class CustomEventV1Handler implements IEventHandler { + +} diff --git a/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV2Handler.java b/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV2Handler.java new file mode 100644 index 000000000..43039ef89 --- /dev/null +++ b/larksuite-oapi/src/main/java/com/lark/oapi/event/CustomEventV2Handler.java @@ -0,0 +1,19 @@ +/* + * MIT License + * + * Copyright (c) 2022 Lark Technologies Pte. Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice, shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package com.lark.oapi.event; + +import com.lark.oapi.event.model.BaseEventV2; + +public abstract class CustomEventV2Handler implements IEventHandler { + +} diff --git a/larksuite-oapi/src/main/java/com/lark/oapi/event/EventDispatcher.java b/larksuite-oapi/src/main/java/com/lark/oapi/event/EventDispatcher.java index 562c2ee03..391837afc 100644 --- a/larksuite-oapi/src/main/java/com/lark/oapi/event/EventDispatcher.java +++ b/larksuite-oapi/src/main/java/com/lark/oapi/event/EventDispatcher.java @@ -1972,6 +1972,30 @@ public Builder onCustomizedEvent(String eventType, CustomEventHandler handler) { return this; } + + /** + * 订阅事件扩展：开发者可自己传递事件类型，并传递对应事件类型的处理器 + */ + public Builder onCustomizedEvent(String eventType, CustomEventV1Handler handler) { + if (eventType2EventHandler.containsKey(eventType)) { + throw new EventTypeAlreadyHasHandlerException(eventType); + } + eventType2EventHandler.put(eventType, handler); + return this; + } + + + /** + * 订阅事件扩展：开发者可自己传递事件类型，并传递对应事件类型的处理器 + */ + public Builder onCustomizedEvent(String eventType, CustomEventV2Handler handler) { + if (eventType2EventHandler.containsKey(eventType)) { + throw new EventTypeAlreadyHasHandlerException(eventType); + } + eventType2EventHandler.put(eventType, handler); + return this; + } + /** *

用户阅读机器人发送的消息后触发此事件。 *

事件描述文档链接：https://open.feishu.cn/document/ukTMukTMukTM/ugzMugzMugzM/event/message-read diff --git a/larksuite-oapi/src/test/java/com/lark/oapi/event/TestEventDispatcher.java b/larksuite-oapi/src/test/java/com/lark/oapi/event/TestEventDispatcher.java index 7c451838c..a5ac5d873 100644 --- a/larksuite-oapi/src/test/java/com/lark/oapi/event/TestEventDispatcher.java +++ b/larksuite-oapi/src/test/java/com/lark/oapi/event/TestEventDispatcher.java @@ -179,4 +179,39 @@ public void handle(P2MessageReceiveV1 event) { assert resp != null; } + + @Test + public void testProcessCustomEncyEvent() throws Throwable { + EventDispatcher eventDispatcher = EventDispatcher.newBuilder("v", "1212121212") + .onCustomizedEvent("contact.user.created_v3", new CustomEventV2Handler() { + @Override + public P2UserCreatedV3 getEvent() { + return new P2UserCreatedV3(); + } + + @Override + public void handle(P2UserCreatedV3 event) throws Exception { + System.out.println(Jsons.DEFAULT.toJson(event)); + System.out.println("---------------------"); + System.out.println(Jsons.DEFAULT.toJson(event.getEvent())); + } + }) + .build(); + + String body = "{\"encrypt\":\"4T4ivT/PR2APX9OYkhRKtu54s1rtIpj9xJU69Hs1yWQ/1RutbufsBs9xjx5YC3u/0hMRF49sN0kevQiEL8iB3bVEdpfyJXzXGDfKUjvKQTmG64GbMdTW6qRpadVPem3f32jHuT6fc+4TRg4BigwoUId+l/D+vcIwu3mDgAEbaqzWfmvccmpiRMfQbh9JhdK/akmrRjo/CXPLM+hZciFXJMSpKueV3SjZJoSls5y0ZTHC8zak/Mp/DSl1wa4mYe5laP367Lnl4ylGiXBKx3Ku29oWv79rYcO/5QT63H4rkl8bwYmAzScpb2KNnV11L3xiDzJp3hFdfXczUvm93FXu4Lw8eDAsRzIWCccKrqHh0UvtDJD95tNn6LvYew4+Xbk1RD4k7UzWJS9AMobOK778NLNxfQ+Kn7MKzBHilXnSIVY5V+dcsOOdfqJviW4yWmT73JHYKq1qJip7Cw7lbkmRMUmettUwdVFWxeXH6iTex3YXCgqoriCx/MzeQhdNEycipooB/vHItRt1CF44uFWj9tf8n3TdbdH4dNMD0hw8ejHJSbEHb9HAGCugUniN8BzL9wxE959JU4cu3BKjDuIk5oS9hLR1mSc3vKBuSa3VKOE=\"}"; + + Map> map = new HashMap<>(); + map.put(Constants.X_LARK_REQUEST_TIMESTAMP.toLowerCase(), Arrays.asList("timestamp")); + map.put(Constants.X_LARK_REQUEST_NONCE.toLowerCase(), Arrays.asList("nonce")); + String signature = eventDispatcher.calculateSignature("timestamp", "nonce", "1212121212", body); + map.put(Constants.X_LARK_SIGNATURE.toLowerCase(), Arrays.asList(signature)); + + EventReq req = new EventReq(); + req.setHeaders(map); + req.setBody(body.getBytes(StandardCharsets.UTF_8)); + + EventResp resp = eventDispatcher.handle(req); + assert resp != null; + + } }