feat: add mqtt process event

@@ -130,6 +130,10 @@ message SessionEventMsg {
   SessionEvent event = 2;
 }
 
+//thingskit
+message PostEventMsg {
+  repeated KeyValueProto kv = 1;
+}
 message PostTelemetryMsg {
   repeated TsKvListProto tsKvList = 1;
 }
@@ -469,6 +473,8 @@ message TransportToRuleEngineMsg {
   PostAttributeMsg postAttributes = 3;
   ToDeviceRpcResponseMsg toDeviceRPCCallResponse = 4;
   ToServerRpcRequestMsg toServerRPCCallRequest = 5;
+  //thingskit
+  PostEventMsg postEvent = 6;
 }
 
 /**

@@ -51,6 +51,8 @@ public class MqttTopics {
     private static final String DEVICE_RPC_REQUEST_SHORT = RPC_SHORT + REQUEST_SHORT + "/";
     private static final String DEVICE_ATTRIBUTES_RESPONSE = ATTRIBUTES_RESPONSE + "/";
     private static final String DEVICE_ATTRIBUTES_REQUEST = ATTRIBUTES_REQUEST + "/";
+    // v1 thingskit event topic
+    public static final String BASE_DEVICE_EVENT_TOPIC = "v1/devices/event";
     // v1 topics
     public static final String BASE_DEVICE_API_TOPIC = "v1/devices/me";
     public static final String DEVICE_RPC_RESPONSE_TOPIC = BASE_DEVICE_API_TOPIC + DEVICE_RPC_RESPONSE;

@@ -86,6 +86,7 @@ public enum ErrorMessage {
   RULE_CHAIN_NOT_ENABLE(400062,"规则链不是有效的！"),
   DUPLICATE_IDENTIFIERS_EXIST(400063,"存在重复的功能标识符。"),
   SMS_CONFIG_ERROR(400064,"短信配置错误。"),
+  INVALID_TOPIC(400065,"无效Topic。"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum TkEventType {
+    INFO,ALARM,ERROR
+}

@@ -445,7 +445,11 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 TransportProtos.GetAttributeRequestMsg getAttributeMsg = payloadAdaptor.convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_TOPIC_PREFIX);
                 transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
                 attrReqTopicType = TopicType.V2;
-            } else {
+            } else if(topicName.startsWith(MqttTopics.BASE_DEVICE_EVENT_TOPIC)){
+                // thingskit
+                TransportProtos.PostEventMsg postEventMsgMsg = payloadAdaptor.convertToPostEvent(deviceSessionCtx, mqttMsg);
+                transportService.process(deviceSessionCtx.getSessionInfo(), postEventMsgMsg, getPubAckCallback(ctx, msgId, postEventMsgMsg),topicName);
+            } else{
                 transportService.reportActivity(deviceSessionCtx.getSessionInfo());
                 ack(ctx, msgId);
             }

@@ -54,6 +54,16 @@ public class BackwardCompatibilityAdaptor implements MqttTransportAdaptor {
             return jsonAdaptor.convertToPostAttributes(ctx, inbound);
         }
     }
+    //thingskit
+    @Override
+    public TransportProtos.PostEventMsg convertToPostEvent(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+        try {
+            return protoAdaptor.convertToPostEvent(ctx, inbound);
+        } catch (AdaptorException e) {
+            log.trace("[{}] failed to process post event request msg: {} due to: ", ctx.getSessionId(), inbound, e);
+            return jsonAdaptor.convertToPostEvent(ctx, inbound);
+        }
+    }
 
     @Override
     public TransportProtos.GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {

@@ -77,6 +77,18 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
         }
     }
 
+    //thingskit
+    @Override
+    public TransportProtos.PostEventMsg convertToPostEvent(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+        String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
+        try {
+            return JsonConverter.convertToEventProto(new JsonParser().parse(payload));
+        } catch (IllegalStateException | JsonSyntaxException ex) {
+            log.debug("Failed to decode post event request", ex);
+            throw new AdaptorException(ex);
+        }
+    }
+
     @Override
     public TransportProtos.ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), true);

@@ -25,6 +25,7 @@ import io.netty.handler.codec.mqtt.MqttPublishMessage;
 import io.netty.handler.codec.mqtt.MqttPublishVariableHeader;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
@@ -51,6 +52,8 @@ public interface MqttTransportAdaptor {
     PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
 
     PostAttributeMsg convertToPostAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
+    //thingskit
+    TransportProtos.PostEventMsg convertToPostEvent(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
 
     GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException;
 

@@ -70,6 +70,20 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
         }
     }
 
+    //thingskit
+    @Override
+    public TransportProtos.PostEventMsg convertToPostEvent(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+        DeviceSessionCtx deviceSessionCtx = (DeviceSessionCtx) ctx;
+        byte[] bytes = toBytes(inbound.payload());
+        Descriptors.Descriptor attributesDynamicMessageDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getAttributesDynamicMessageDescriptor());
+        try {
+            return JsonConverter.convertToEventProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, attributesDynamicMessageDescriptor)));
+        } catch (Exception e) {
+            log.debug("Failed to decode post event request", e);
+            throw new AdaptorException(e);
+        }
+    }
+
     @Override
     public TransportProtos.ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
         byte[] bytes = toBytes(inbound.payload());

@@ -41,6 +41,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.LwM2MRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.LwM2MResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.PostAttributeMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.PostEventMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionEventMsg;
@@ -104,6 +105,9 @@ public interface TransportService {
 
     void process(SessionInfoProto sessionInfo, PostAttributeMsg msg, TransportServiceCallback<Void> callback);
 
+    //thingskit
+    void process(SessionInfoProto sessionInfo, PostEventMsg msg, TransportServiceCallback<Void> callback,String topicName);
+
     void process(SessionInfoProto sessionInfo, GetAttributeRequestMsg msg, TransportServiceCallback<Void> callback);
 
     void process(SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg msg, TransportServiceCallback<Void> callback);

@@ -154,6 +154,18 @@ public class JsonConverter {
         }
     }
 
+    //thingskit
+    public static TransportProtos.PostEventMsg convertToEventProto(JsonElement jsonObject) throws JsonSyntaxException {
+        if (jsonObject.isJsonObject()) {
+            TransportProtos.PostEventMsg.Builder result = TransportProtos.PostEventMsg.newBuilder();
+            List<KeyValueProto> keyValueList = parseProtoValues(jsonObject.getAsJsonObject());
+            result.addAllKv(keyValueList);
+            return result.build();
+        } else {
+            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + jsonObject);
+        }
+    }
+
     public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
         //Thingskit function
         JsonObject result = null;

@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -46,6 +47,8 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
@@ -569,6 +572,32 @@ public class DefaultTransportService implements TransportService {
                     new TransportTbQueueCallback(new ApiStatsProxyCallback<>(tenantId, customerId, msg.getKvList().size(), callback)));
         }
     }
+    //thingskit
+    @Override
+    public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.PostEventMsg msg,
+                        TransportServiceCallback<Void> callback,String topicName) {
+        //Topic地址：v1/devices/event/{${identifier}}/{$eventType}
+        String[] topicInfo = topicName.split(MqttTopics.BASE_DEVICE_EVENT_TOPIC);
+        if(null == topicInfo || topicInfo.length !=2){
+            throw new TkDataValidationException(ErrorMessage.INVALID_TOPIC.getMessage());
+        }
+        String[] eventInfo = topicInfo[1].split("/");
+        if(null == eventInfo || eventInfo.length !=2){
+            throw new TkDataValidationException(ErrorMessage.INVALID_TOPIC.getMessage());
+        }
+        reportActivityInternal(sessionInfo);
+        JsonObject json = JsonUtils.getJsonObject(msg.getKvList());
+        TbMsgMetaData metaData = new TbMsgMetaData();
+        metaData.putValue("deviceName", sessionInfo.getDeviceName());
+        metaData.putValue("deviceType", sessionInfo.getDeviceType());
+        metaData.putValue("event_identifier", eventInfo[0]);
+        metaData.putValue("event_type",eventInfo[1]);
+        CustomerId customerId = getCustomerId(sessionInfo);
+        TenantId tenantId = getTenantId(sessionInfo);
+        DeviceId deviceId = new DeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
+        sendToRuleEngine(tenantId, deviceId, customerId, sessionInfo, json, metaData, SessionMsgType.POST_EVENT_REQUEST,
+                new TransportTbQueueCallback(new ApiStatsProxyCallback<>(tenantId, customerId, msg.getKvList().size(), callback)));
+    }
 
     @Override
     public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.GetAttributeRequestMsg msg, TransportServiceCallback<Void> callback) {