feat: 设备配置扩展传输协议TCP

@@ -83,6 +83,10 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.thingsboard.common.transport</groupId>
             <groupId>org.thingsboard.common.transport</groupId>
+            <artifactId>tcp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard.common.transport</groupId>
             <artifactId>http</artifactId>
             <artifactId>http</artifactId>
         </dependency>
         </dependency>
         <dependency>
         <dependency>

@@ -176,7 +176,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
 
     @Override
     @Override
     public void createSysAdmin() {
     public void createSysAdmin() {
-        createUser(Authority.SYS_ADMIN, null, null, "sysadmin@thingsboard.org", "sysadmin");
+        createUser(Authority.SYS_ADMIN, null, null, "sysadmin@qq.com", "sysadmin");
     }
     }
 
 
     @Override
     @Override

@@ -170,9 +170,9 @@ ui:
 database:
 database:
   ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by single API call to fetch telemetry records
   ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by single API call to fetch telemetry records
   ts:
   ts:
-    type: "${DATABASE_TS_TYPE:sql}" # cassandra, sql, or timescale (for hybrid mode, DATABASE_TS_TYPE value should be cassandra, or timescale)
+    type: "${DATABASE_TS_TYPE:timescale}" # cassandra, sql, or timescale (for hybrid mode, DATABASE_TS_TYPE value should be cassandra, or timescale)
   ts_latest:
   ts_latest:
-    type: "${DATABASE_TS_LATEST_TYPE:sql}" # cassandra, sql, or timescale (for hybrid mode, DATABASE_TS_TYPE value should be cassandra, or timescale)
+    type: "${DATABASE_TS_LATEST_TYPE:timescale}" # cassandra, sql, or timescale (for hybrid mode, DATABASE_TS_TYPE value should be cassandra, or timescale)
 
 
 # note: timescale works only with postgreSQL database for DATABASE_ENTITIES_TYPE.
 # note: timescale works only with postgreSQL database for DATABASE_ENTITIES_TYPE.
 
 
@@ -539,9 +539,9 @@ spring:
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://47.99.141.212:20638/thingsboard-3.3.4}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://47.99.141.212:20638/timescale-3.3.4}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    password: "${SPRING_DATASOURCE_PASSWORD:Vrr861!@waja}"
+    password: "${SPRING_DATASOURCE_PASSWORD:Xga751++nqnk}"
 #    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:28776/thingsboard-3.3.2}"
 #    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://101.133.234.90:28776/thingsboard-3.3.2}"
 #    username: "${SPRING_DATASOURCE_USERNAME:postgres}"
 #    username: "${SPRING_DATASOURCE_USERNAME:postgres}"
 #    password: "${SPRING_DATASOURCE_PASSWORD:Bua312!!iwcw}"
 #    password: "${SPRING_DATASOURCE_PASSWORD:Bua312!!iwcw}"
@@ -1196,8 +1196,8 @@ file:
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       randomFileName: ${file.storage.randomFileName}
       randomFileName: ${file.storage.randomFileName}
     minio:
     minio:
-      minioUrl: ${MINIO_URL:https://dev.thingskit.com:9000}  #minio储存地址
-#      minioUrl: https://demo.thingskit.com:9000  #minio储存地址
+#      minioUrl: ${MINIO_URL:https://dev.thingskit.com:9000}  #minio储存地址
+      minioUrl: https://demo.thingskit.com:9000  #minio储存地址
       minioName: ${MINIO_NAME:YunTeng}                    #minio账户
       minioName: ${MINIO_NAME:YunTeng}                    #minio账户
       minioPass: ${MINIO_PWD:YunTeng123456}              #minio访问密码
       minioPass: ${MINIO_PWD:YunTeng123456}              #minio访问密码
       bucketName: yunteng                   #minio储存桶名称
       bucketName: yunteng                   #minio储存桶名称

@@ -26,10 +26,11 @@ public class TcpDeviceProfileTransportConfiguration implements DeviceProfileTran
     @NoXss
     @NoXss
     private TcpDataTypeEnum dataFormat = TcpDataTypeEnum.HEX;
     private TcpDataTypeEnum dataFormat = TcpDataTypeEnum.HEX;
     private String scriptId;
     private String scriptId;
+    private String pingText;
 
 
     @Override
     @Override
     public DeviceTransportType getType() {
     public DeviceTransportType getType() {
-        return DeviceTransportType.MQTT;
+        return DeviceTransportType.TCP;
     }
     }
 
 
 
 

-package org.thingsboard.server.common.data.yunteng.enums;
-
-/**
- * 设备凭证
- */
-public enum DeviceCredentialsEnum {
-    ACCESS_TOKEN,
-    X509_CERTIFICATE,
-    MQTT_BASIC,
-    LWM2M_CREDENTIALS
-}

@@ -27,7 +27,7 @@
     <artifactId>tcp</artifactId>
     <artifactId>tcp</artifactId>
     <packaging>jar</packaging>
     <packaging>jar</packaging>
 
 
-    <name>Thingsboard TPC Transport Common</name>
+    <name>Thingsboard TCP Transport Common</name>
     <url>https://thingsboard.io</url>
     <url>https://thingsboard.io</url>
 
 
     <properties>
     <properties>

@@ -25,7 +25,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.common.transport.TransportContext;
 import org.thingsboard.server.transport.tcp.adaptors.JsonTcpAdaptor;
 import org.thingsboard.server.transport.tcp.adaptors.JsonTcpAdaptor;
-import org.thingsboard.server.transport.tcp.adaptors.ProtoTcpAdaptor;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
 import java.net.InetSocketAddress;
 import java.net.InetSocketAddress;
@@ -45,18 +44,15 @@ public class TcpTransportContext extends TransportContext {
 
 
     @Getter
     @Getter
     @Autowired
     @Autowired
-    private JsonTcpAdaptor jsonMqttAdaptor;
+    private JsonTcpAdaptor jsonTcpAdaptor;
 
 
-    @Getter
-    @Autowired
-    private ProtoTcpAdaptor protoMqttAdaptor;
 
 
     @Getter
     @Getter
-    @Value("${transport.mqtt.netty.max_payload_size}")
+    @Value("${transport.tcp.netty.max_payload_size}")
     private Integer maxPayloadSize;
     private Integer maxPayloadSize;
 
 
     @Getter
     @Getter
-    @Value("${transport.mqtt.ssl.skip_validity_check_for_client_cert:false}")
+    @Value("${transport.tcp.ssl.skip_validity_check_for_client_cert:false}")
     private boolean skipValidityCheckForClientCert;
     private boolean skipValidityCheckForClientCert;
 
 
     @Getter
     @Getter
@@ -64,15 +60,15 @@ public class TcpTransportContext extends TransportContext {
     private SslHandler sslHandler;
     private SslHandler sslHandler;
 
 
     @Getter
     @Getter
-    @Value("${transport.mqtt.msg_queue_size_per_device_limit:100}")
+    @Value("${transport.tcp.msg_queue_size_per_device_limit:100}")
     private int messageQueueSizePerDeviceLimit;
     private int messageQueueSizePerDeviceLimit;
 
 
     @Getter
     @Getter
-    @Value("${transport.mqtt.timeout:10000}")
+    @Value("${transport.tcp.timeout:10000}")
     private long timeout;
     private long timeout;
 
 
     @Getter
     @Getter
-    @Value("${transport.mqtt.proxy_enabled:false}")
+    @Value("${transport.tcp.proxy_enabled:false}")
     private boolean proxyEnabled;
     private boolean proxyEnabled;
 
 
     private final AtomicInteger connectionsCounter = new AtomicInteger();
     private final AtomicInteger connectionsCounter = new AtomicInteger();

@@ -15,43 +15,25 @@
  */
  */
 package org.thingsboard.server.transport.tcp;
 package org.thingsboard.server.transport.tcp;
 
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParseException;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.mqtt.MqttConnAckMessage;
-import io.netty.handler.codec.mqtt.MqttConnAckVariableHeader;
-import io.netty.handler.codec.mqtt.MqttConnectMessage;
-import io.netty.handler.codec.mqtt.MqttConnectReturnCode;
-import io.netty.handler.codec.mqtt.MqttFixedHeader;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader;
-import io.netty.handler.codec.mqtt.MqttPubAckMessage;
-import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import io.netty.handler.codec.mqtt.MqttQoS;
-import io.netty.handler.codec.mqtt.MqttSubAckMessage;
-import io.netty.handler.codec.mqtt.MqttSubAckPayload;
-import io.netty.handler.codec.mqtt.MqttSubscribeMessage;
-import io.netty.handler.codec.mqtt.MqttTopicSubscription;
-import io.netty.handler.codec.mqtt.MqttUnsubscribeMessage;
+import io.netty.handler.codec.mqtt.*;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslHandler;
-import io.netty.util.CharsetUtil;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.GenericFutureListener;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.thingsboard.server.common.data.DataConstants;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
-import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.transport.SessionMsgListener;
 import org.thingsboard.server.common.transport.SessionMsgListener;
@@ -59,10 +41,7 @@ import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
 import org.thingsboard.server.common.transport.auth.SessionInfoCreator;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
-import org.thingsboard.server.common.transport.service.DefaultTransportService;
-import org.thingsboard.server.common.transport.service.SessionMetaData;
 import org.thingsboard.server.common.transport.util.SslUtil;
 import org.thingsboard.server.common.transport.util.SslUtil;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
@@ -70,37 +49,26 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509Ce
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
 import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
 import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
-import org.thingsboard.server.transport.tcp.session.GatewaySessionHandler;
-import org.thingsboard.server.transport.tcp.session.MqttTopicMatcher;
+import org.thingsboard.server.transport.tcp.session.TCPMessage;
+import org.thingsboard.server.transport.tcp.util.ByteUtils;
 
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLPeerUnverifiedException;
-import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.InetSocketAddress;
 import java.security.cert.Certificate;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
 import static com.amazonaws.util.StringUtils.UTF8;
 import static com.amazonaws.util.StringUtils.UTF8;
 import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED;
 import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED;
 import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED;
 import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED;
-import static io.netty.handler.codec.mqtt.MqttMessageType.CONNACK;
-import static io.netty.handler.codec.mqtt.MqttMessageType.CONNECT;
-import static io.netty.handler.codec.mqtt.MqttMessageType.PINGRESP;
-import static io.netty.handler.codec.mqtt.MqttMessageType.PUBACK;
-import static io.netty.handler.codec.mqtt.MqttMessageType.SUBACK;
-import static io.netty.handler.codec.mqtt.MqttMessageType.UNSUBACK;
-import static io.netty.handler.codec.mqtt.MqttQoS.AT_LEAST_ONCE;
-import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
-import static io.netty.handler.codec.mqtt.MqttQoS.FAILURE;
+import static io.netty.handler.codec.mqtt.MqttMessageType.*;
+import static io.netty.handler.codec.mqtt.MqttQoS.*;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
 import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
 
 
@@ -123,11 +91,11 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     private final TransportService transportService;
     private final TransportService transportService;
     private final SchedulerComponent scheduler;
     private final SchedulerComponent scheduler;
     private final SslHandler sslHandler;
     private final SslHandler sslHandler;
-    private final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
 
 
+
+    /**需要处理的消息队列，例如：需要下发给设备的，设备上传的。*/
     final DeviceSessionCtx deviceSessionCtx;
     final DeviceSessionCtx deviceSessionCtx;
     volatile InetSocketAddress address;
     volatile InetSocketAddress address;
-    volatile GatewaySessionHandler gatewaySessionHandler;
 
 
     private final ConcurrentHashMap<String, String> otaPackSessions;
     private final ConcurrentHashMap<String, String> otaPackSessions;
     private final ConcurrentHashMap<String, Integer> chunkSizes;
     private final ConcurrentHashMap<String, Integer> chunkSizes;
@@ -144,8 +112,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         this.transportService = context.getTransportService();
         this.transportService = context.getTransportService();
         this.scheduler = context.getScheduler();
         this.scheduler = context.getScheduler();
         this.sslHandler = sslHandler;
         this.sslHandler = sslHandler;
-        this.mqttQoSMap = new ConcurrentHashMap<>();
-        this.deviceSessionCtx = new DeviceSessionCtx(sessionId, mqttQoSMap, context);
+        this.deviceSessionCtx = new DeviceSessionCtx(sessionId, context);
         this.otaPackSessions = new ConcurrentHashMap<>();
         this.otaPackSessions = new ConcurrentHashMap<>();
         this.chunkSizes = new ConcurrentHashMap<>();
         this.chunkSizes = new ConcurrentHashMap<>();
         this.rpcAwaitingAck = new ConcurrentHashMap<>();
         this.rpcAwaitingAck = new ConcurrentHashMap<>();
@@ -165,21 +132,18 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
 
     @Override
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
     public void channelRead(ChannelHandlerContext ctx, Object msg) {
-        log.trace("[{}] Processing msg: {}", sessionId, msg);
+        log.trace("【{}】 Processing msg: 【{}】", sessionId, msg);
         if (address == null) {
         if (address == null) {
             address = getAddress(ctx);
             address = getAddress(ctx);
         }
         }
         try {
         try {
-            if (msg instanceof MqttMessage) {
-                MqttMessage message = (MqttMessage) msg;
-                if (message.decoderResult().isSuccess()) {
-                    processMqttMsg(ctx, message);
-                } else {
-                    log.error("[{}] Message decoding failed: {}", sessionId, message.decoderResult().cause().getMessage());
-                    ctx.close();
-                }
+            if (msg instanceof ByteBuf) {
+                ByteBuf message = (ByteBuf) msg;
+
+                processTcpMsg(ctx, ByteUtils.buf2Bytes(message));
+
             } else {
             } else {
-                log.debug("[{}] Received non mqtt message: {}", sessionId, msg.getClass().getSimpleName());
+                log.debug("【{}】 Received non tcp message: 【{}】", sessionId, msg.getClass().getSimpleName());
                 ctx.close();
                 ctx.close();
             }
             }
         } finally {
         } finally {
@@ -200,19 +164,12 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         return address;
         return address;
     }
     }
 
 
-    void processMqttMsg(ChannelHandlerContext ctx, MqttMessage msg) {
-        if (msg.fixedHeader() == null) {
-            log.info("[{}:{}] Invalid message received", address.getHostName(), address.getPort());
-            ctx.close();
-            return;
-        }
+    void processTcpMsg(ChannelHandlerContext ctx, byte[] msg) {
         deviceSessionCtx.setChannel(ctx);
         deviceSessionCtx.setChannel(ctx);
-        if (CONNECT.equals(msg.fixedHeader().messageType())) {
-            processConnect(ctx, (MqttConnectMessage) msg);
-        } else if (deviceSessionCtx.isProvisionOnly()) {
-            processProvisionSessionMsg(ctx, msg);
+        if (deviceSessionCtx.getDeviceInfo()  == null || deviceSessionCtx.getDeviceProfile() == null) {
+            processConnect(ctx,  ByteUtils.getString(msg, ByteUtils.UTF_8));
         } else {
         } else {
-            enqueueRegularSessionMsg(ctx, msg);
+            enqueueRegularSessionMsg(ctx,msg);
         }
         }
     }
     }
 
 
@@ -225,12 +182,12 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
                 try {
                 try {
                     if (topicName.equals(MqttTopics.DEVICE_PROVISION_REQUEST_TOPIC)) {
                     if (topicName.equals(MqttTopics.DEVICE_PROVISION_REQUEST_TOPIC)) {
                         try {
                         try {
-                            TransportProtos.ProvisionDeviceRequestMsg provisionRequestMsg = deviceSessionCtx.getContext().getJsonMqttAdaptor().convertToProvisionRequestMsg(deviceSessionCtx, mqttMsg);
+                            TransportProtos.ProvisionDeviceRequestMsg provisionRequestMsg = deviceSessionCtx.getContext().getJsonTcpAdaptor().convertToProvisionRequestMsg(deviceSessionCtx, mqttMsg);
                             transportService.process(provisionRequestMsg, new DeviceProvisionCallback(ctx, msgId, provisionRequestMsg));
                             transportService.process(provisionRequestMsg, new DeviceProvisionCallback(ctx, msgId, provisionRequestMsg));
                             log.trace("[{}][{}] Processing provision publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
                             log.trace("[{}][{}] Processing provision publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
                         } catch (Exception e) {
                         } catch (Exception e) {
                             if (e instanceof JsonParseException || (e.getCause() != null && e.getCause() instanceof JsonParseException)) {
                             if (e instanceof JsonParseException || (e.getCause() != null && e.getCause() instanceof JsonParseException)) {
-                                TransportProtos.ProvisionDeviceRequestMsg provisionRequestMsg = deviceSessionCtx.getContext().getProtoMqttAdaptor().convertToProvisionRequestMsg(deviceSessionCtx, mqttMsg);
+                                TransportProtos.ProvisionDeviceRequestMsg provisionRequestMsg = deviceSessionCtx.getContext().getAscallAdaptor().convertToProvisionRequestMsg(deviceSessionCtx, mqttMsg);
                                 transportService.process(provisionRequestMsg, new DeviceProvisionCallback(ctx, msgId, provisionRequestMsg));
                                 transportService.process(provisionRequestMsg, new DeviceProvisionCallback(ctx, msgId, provisionRequestMsg));
                                 deviceSessionCtx.setProvisionPayloadType(TransportPayloadType.PROTOBUF);
                                 deviceSessionCtx.setProvisionPayloadType(TransportPayloadType.PROTOBUF);
                                 log.trace("[{}][{}] Processing provision publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
                                 log.trace("[{}][{}] Processing provision publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
@@ -259,7 +216,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         }
         }
     }
     }
 
 
-    void enqueueRegularSessionMsg(ChannelHandlerContext ctx, MqttMessage msg) {
+    void enqueueRegularSessionMsg(ChannelHandlerContext ctx, byte[]  msg) {
         final int queueSize = deviceSessionCtx.getMsgQueueSize();
         final int queueSize = deviceSessionCtx.getMsgQueueSize();
         if (queueSize >= context.getMessageQueueSizePerDeviceLimit()) {
         if (queueSize >= context.getMessageQueueSizePerDeviceLimit()) {
             log.info("Closing current session because msq queue size for device {} exceed limit {} with msgQueueSize counter {} and actual queue size {}",
             log.info("Closing current session because msq queue size for device {} exceed limit {} with msgQueueSize counter {} and actual queue size {}",
@@ -268,10 +225,12 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             return;
             return;
         }
         }
 
 
-        deviceSessionCtx.addToQueue(msg);
+        deviceSessionCtx.addToQueue(new TCPMessage(MqttMessageType.PUBLISH,msg));
         processMsgQueue(ctx); //Under the normal conditions the msg queue will contain 0 messages. Many messages will be processed on device connect event in separate thread pool
         processMsgQueue(ctx); //Under the normal conditions the msg queue will contain 0 messages. Many messages will be processed on device connect event in separate thread pool
     }
     }
 
 
+
+
     void processMsgQueue(ChannelHandlerContext ctx) {
     void processMsgQueue(ChannelHandlerContext ctx) {
         if (!deviceSessionCtx.isConnected()) {
         if (!deviceSessionCtx.isConnected()) {
             log.trace("[{}][{}] Postpone processing msg due to device is not connected. Msg queue size is {}", sessionId, deviceSessionCtx.getDeviceId(), deviceSessionCtx.getMsgQueueSize());
             log.trace("[{}][{}] Postpone processing msg due to device is not connected. Msg queue size is {}", sessionId, deviceSessionCtx.getDeviceId(), deviceSessionCtx.getMsgQueueSize());
@@ -280,175 +239,143 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         deviceSessionCtx.tryProcessQueuedMsgs(msg -> processRegularSessionMsg(ctx, msg));
         deviceSessionCtx.tryProcessQueuedMsgs(msg -> processRegularSessionMsg(ctx, msg));
     }
     }
 
 
-    void processRegularSessionMsg(ChannelHandlerContext ctx, MqttMessage msg) {
-        switch (msg.fixedHeader().messageType()) {
+    void processRegularSessionMsg(ChannelHandlerContext ctx, TCPMessage msg) {
+        switch (msg.getMessageType()) {
             case PUBLISH:
             case PUBLISH:
-                processPublish(ctx, (MqttPublishMessage) msg);
+                processPublish(ctx, msg);
                 break;
                 break;
             case SUBSCRIBE:
             case SUBSCRIBE:
-                processSubscribe(ctx, (MqttSubscribeMessage) msg);
+//                processSubscribe(ctx, (MqttSubscribeMessage) msg);
                 break;
                 break;
             case UNSUBSCRIBE:
             case UNSUBSCRIBE:
-                processUnsubscribe(ctx, (MqttUnsubscribeMessage) msg);
-                break;
-            case PINGREQ:
-                if (checkConnected(ctx, msg)) {
-                    ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
-                    transportService.reportActivity(deviceSessionCtx.getSessionInfo());
-                }
+//                processUnsubscribe(ctx, (MqttUnsubscribeMessage) msg);
                 break;
                 break;
+
             case DISCONNECT:
             case DISCONNECT:
                 ctx.close();
                 ctx.close();
                 break;
                 break;
             case PUBACK:
             case PUBACK:
-                int msgId = ((MqttPubAckMessage) msg).variableHeader().messageId();
-                TransportProtos.ToDeviceRpcRequestMsg rpcRequest = rpcAwaitingAck.remove(msgId);
-                if (rpcRequest != null) {
-                    transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
-                }
+//                int msgId = ((MqttPubAckMessage) msg).variableHeader().messageId();
+//                TransportProtos.ToDeviceRpcRequestMsg rpcRequest = rpcAwaitingAck.remove(msgId);
+//                if (rpcRequest != null) {
+//                    transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
+//                }
                 break;
                 break;
             default:
             default:
                 break;
                 break;
         }
         }
     }
     }
 
 
-    private void processPublish(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg) {
+    private ByteBuf toDeviceMsg(byte[] msgs){
+        return Unpooled.copiedBuffer(msgs);
+    }
+
+    private String textFromMessage(byte[] payload){
+        if(deviceSessionCtx.getPayloadType().equals(TcpDataTypeEnum.ASCII)){
+            return ByteUtils.getString(payload,ByteUtils.UTF_8);
+        }else{
+            return ByteUtils.bytesToHex(payload);
+        }
+    }
+    private void processPublish(ChannelHandlerContext ctx, TCPMessage mqttMsg) {
         if (!checkConnected(ctx, mqttMsg)) {
         if (!checkConnected(ctx, mqttMsg)) {
             return;
             return;
         }
         }
-        String topicName = mqttMsg.variableHeader().topicName();
-        int msgId = mqttMsg.variableHeader().packetId();
-        log.trace("[{}][{}] Processing publish msg [{}][{}]!", sessionId, deviceSessionCtx.getDeviceId(), topicName, msgId);
-
-        if (topicName.startsWith(MqttTopics.BASE_GATEWAY_API_TOPIC)) {
-            if (gatewaySessionHandler != null) {
-                handleGatewayPublishMsg(ctx, topicName, msgId, mqttMsg);
-                transportService.reportActivity(deviceSessionCtx.getSessionInfo());
-            }
-        } else {
-            processDevicePublish(ctx, mqttMsg, topicName, msgId);
+        if(deviceSessionCtx.getPingText().equals(mqttMsg.getMessage())){
+            ctx.channel().writeAndFlush(toDeviceMsg(mqttMsg.getMessage()));
+            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
+            return;
         }
         }
-    }
+        String dataStr = textFromMessage(mqttMsg.getMessage());
+        log.trace("[{}][{}] Processing publish msg [{}]!", sessionId, deviceSessionCtx.getDeviceId(), dataStr);
 
 
-    private void handleGatewayPublishMsg(ChannelHandlerContext ctx, String topicName, int msgId, MqttPublishMessage mqttMsg) {
-        try {
-            switch (topicName) {
-                case MqttTopics.GATEWAY_TELEMETRY_TOPIC:
-                    gatewaySessionHandler.onDeviceTelemetry(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_CLAIM_TOPIC:
-                    gatewaySessionHandler.onDeviceClaim(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
-                    gatewaySessionHandler.onDeviceAttributes(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_ATTRIBUTES_REQUEST_TOPIC:
-                    gatewaySessionHandler.onDeviceAttributesRequest(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_RPC_TOPIC:
-                    gatewaySessionHandler.onDeviceRpcResponse(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_CONNECT_TOPIC:
-                    gatewaySessionHandler.onDeviceConnect(mqttMsg);
-                    break;
-                case MqttTopics.GATEWAY_DISCONNECT_TOPIC:
-                    gatewaySessionHandler.onDeviceDisconnect(mqttMsg);
-                    break;
-                default:
-                    ack(ctx, msgId);
-            }
-        } catch (RuntimeException e) {
-            log.warn("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
-            ctx.close();
-        } catch (AdaptorException e) {
-            log.debug("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
-            ctx.close();
-        }
+        processDevicePublish(ctx, mqttMsg, topicName, msgId);
     }
     }
 
 
+
     private void processDevicePublish(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg, String topicName, int msgId) {
     private void processDevicePublish(ChannelHandlerContext ctx, MqttPublishMessage mqttMsg, String topicName, int msgId) {
         try {
         try {
-            Matcher fwMatcher;
+//            Matcher fwMatcher;
             TcpTransportAdaptor payloadAdaptor = deviceSessionCtx.getPayloadAdaptor();
             TcpTransportAdaptor payloadAdaptor = deviceSessionCtx.getPayloadAdaptor();
-            if (deviceSessionCtx.isDeviceAttributesTopic(topicName)) {
-                TransportProtos.PostAttributeMsg postAttributeMsg = payloadAdaptor.convertToPostAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
-            } else if (deviceSessionCtx.isDeviceTelemetryTopic(topicName)) {
-                TransportProtos.PostTelemetryMsg postTelemetryMsg = payloadAdaptor.convertToPostTelemetry(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX)) {
-                TransportProtos.GetAttributeRequestMsg getAttributeMsg = payloadAdaptor.convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX);
-                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
-                attrReqTopicType = TopicType.V1;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_TOPIC)) {
-                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = payloadAdaptor.convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_TOPIC)) {
-                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = payloadAdaptor.convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
-                toServerRpcSubTopicType = TopicType.V1;
-            } else if (topicName.equals(MqttTopics.DEVICE_CLAIM_TOPIC)) {
-                TransportProtos.ClaimDeviceMsg claimDeviceMsg = payloadAdaptor.convertToClaimDevice(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(ctx, msgId, claimDeviceMsg));
-            } else if ((fwMatcher = FW_REQUEST_PATTERN.matcher(topicName)).find()) {
-                getOtaPackageCallback(ctx, mqttMsg, msgId, fwMatcher, OtaPackageType.FIRMWARE);
-            } else if ((fwMatcher = SW_REQUEST_PATTERN.matcher(topicName)).find()) {
-                getOtaPackageCallback(ctx, mqttMsg, msgId, fwMatcher, OtaPackageType.SOFTWARE);
-            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_TOPIC)) {
-                TransportProtos.PostTelemetryMsg postTelemetryMsg = payloadAdaptor.convertToPostTelemetry(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_JSON_TOPIC)) {
-                TransportProtos.PostTelemetryMsg postTelemetryMsg = context.getJsonMqttAdaptor().convertToPostTelemetry(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_PROTO_TOPIC)) {
-                TransportProtos.PostTelemetryMsg postTelemetryMsg = context.getProtoMqttAdaptor().convertToPostTelemetry(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC)) {
-                TransportProtos.PostAttributeMsg postAttributeMsg = payloadAdaptor.convertToPostAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC)) {
-                TransportProtos.PostAttributeMsg postAttributeMsg = context.getJsonMqttAdaptor().convertToPostAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
-            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC)) {
-                TransportProtos.PostAttributeMsg postAttributeMsg = context.getProtoMqttAdaptor().convertToPostAttributes(deviceSessionCtx, mqttMsg);
-                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_JSON_TOPIC)) {
-                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = context.getJsonMqttAdaptor().convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_JSON_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_PROTO_TOPIC)) {
-                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = context.getProtoMqttAdaptor().convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_PROTO_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_TOPIC)) {
-                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = payloadAdaptor.convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_JSON_TOPIC)) {
-                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = context.getJsonMqttAdaptor().convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_JSON_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
-                toServerRpcSubTopicType = TopicType.V2_JSON;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_PROTO_TOPIC)) {
-                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = context.getProtoMqttAdaptor().convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_PROTO_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
-                toServerRpcSubTopicType = TopicType.V2_PROTO;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_TOPIC)) {
-                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = payloadAdaptor.convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_TOPIC);
-                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
-                toServerRpcSubTopicType = TopicType.V2;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_JSON_TOPIC_PREFIX)) {
-                TransportProtos.GetAttributeRequestMsg getAttributeMsg = context.getJsonMqttAdaptor().convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_JSON_TOPIC_PREFIX);
-                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
-                attrReqTopicType = TopicType.V2_JSON;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_PROTO_TOPIC_PREFIX)) {
-                TransportProtos.GetAttributeRequestMsg getAttributeMsg = context.getProtoMqttAdaptor().convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_PROTO_TOPIC_PREFIX);
-                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
-                attrReqTopicType = TopicType.V2_PROTO;
-            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_TOPIC_PREFIX)) {
-                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 {
-                transportService.reportActivity(deviceSessionCtx.getSessionInfo());
-                ack(ctx, msgId);
-            }
+            TransportProtos.PostTelemetryMsg postTelemetryMsg = payloadAdaptor.convertToPostTelemetry(deviceSessionCtx, mqttMsg);
+            transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
+//            if (deviceSessionCtx.isDeviceAttributesTopic(topicName)) {
+//                TransportProtos.PostAttributeMsg postAttributeMsg = payloadAdaptor.convertToPostAttributes(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
+//            } else if (deviceSessionCtx.isDeviceTelemetryTopic(topicName)) {
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX)) {
+//                TransportProtos.GetAttributeRequestMsg getAttributeMsg = payloadAdaptor.convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
+//                attrReqTopicType = TopicType.V1;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_TOPIC)) {
+//                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = payloadAdaptor.convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_TOPIC)) {
+//                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = payloadAdaptor.convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
+//                toServerRpcSubTopicType = TopicType.V1;
+//            } else if (topicName.equals(MqttTopics.DEVICE_CLAIM_TOPIC)) {
+//                TransportProtos.ClaimDeviceMsg claimDeviceMsg = payloadAdaptor.convertToClaimDevice(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(ctx, msgId, claimDeviceMsg));
+//            } else if ((fwMatcher = FW_REQUEST_PATTERN.matcher(topicName)).find()) {
+//                getOtaPackageCallback(ctx, mqttMsg, msgId, fwMatcher, OtaPackageType.FIRMWARE);
+//            } else if ((fwMatcher = SW_REQUEST_PATTERN.matcher(topicName)).find()) {
+//                getOtaPackageCallback(ctx, mqttMsg, msgId, fwMatcher, OtaPackageType.SOFTWARE);
+//            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_TOPIC)) {
+//                TransportProtos.PostTelemetryMsg postTelemetryMsg = payloadAdaptor.convertToPostTelemetry(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
+//            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_JSON_TOPIC)) {
+//                TransportProtos.PostTelemetryMsg postTelemetryMsg = context.getJsonMqttAdaptor().convertToPostTelemetry(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
+//            } else if (topicName.equals(MqttTopics.DEVICE_TELEMETRY_SHORT_PROTO_TOPIC)) {
+//                TransportProtos.PostTelemetryMsg postTelemetryMsg = context.getAscallAdaptor().convertToPostTelemetry(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(ctx, msgId, postTelemetryMsg));
+//            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC)) {
+//                TransportProtos.PostAttributeMsg postAttributeMsg = payloadAdaptor.convertToPostAttributes(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
+//            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC)) {
+//                TransportProtos.PostAttributeMsg postAttributeMsg = context.getJsonMqttAdaptor().convertToPostAttributes(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
+//            } else if (topicName.equals(MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC)) {
+//                TransportProtos.PostAttributeMsg postAttributeMsg = context.getAscallAdaptor().convertToPostAttributes(deviceSessionCtx, mqttMsg);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(ctx, msgId, postAttributeMsg));
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_JSON_TOPIC)) {
+//                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = context.getJsonMqttAdaptor().convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_JSON_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_PROTO_TOPIC)) {
+//                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = context.getAscallAdaptor().convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_PROTO_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_RESPONSE_SHORT_TOPIC)) {
+//                TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = payloadAdaptor.convertToDeviceRpcResponse(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(ctx, msgId, rpcResponseMsg));
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_JSON_TOPIC)) {
+//                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = context.getJsonMqttAdaptor().convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_JSON_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
+//                toServerRpcSubTopicType = TopicType.V2_JSON;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_PROTO_TOPIC)) {
+//                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = context.getAscallAdaptor().convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_PROTO_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
+//                toServerRpcSubTopicType = TopicType.V2_PROTO;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_RPC_REQUESTS_SHORT_TOPIC)) {
+//                TransportProtos.ToServerRpcRequestMsg rpcRequestMsg = payloadAdaptor.convertToServerRpcRequest(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_TOPIC);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequestMsg, getPubAckCallback(ctx, msgId, rpcRequestMsg));
+//                toServerRpcSubTopicType = TopicType.V2;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_JSON_TOPIC_PREFIX)) {
+//                TransportProtos.GetAttributeRequestMsg getAttributeMsg = context.getJsonMqttAdaptor().convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_JSON_TOPIC_PREFIX);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
+//                attrReqTopicType = TopicType.V2_JSON;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_PROTO_TOPIC_PREFIX)) {
+//                TransportProtos.GetAttributeRequestMsg getAttributeMsg = context.getAscallAdaptor().convertToGetAttributes(deviceSessionCtx, mqttMsg, MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_PROTO_TOPIC_PREFIX);
+//                transportService.process(deviceSessionCtx.getSessionInfo(), getAttributeMsg, getPubAckCallback(ctx, msgId, getAttributeMsg));
+//                attrReqTopicType = TopicType.V2_PROTO;
+//            } else if (topicName.startsWith(MqttTopics.DEVICE_ATTRIBUTES_REQUEST_SHORT_TOPIC_PREFIX)) {
+//                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 {
+//                transportService.reportActivity(deviceSessionCtx.getSessionInfo());
+//                ack(ctx, msgId);
+//            }
         } catch (AdaptorException e) {
         } catch (AdaptorException e) {
             log.debug("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
             log.debug("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
             log.info("[{}] Closing current session due to invalid publish msg [{}][{}]", sessionId, topicName, msgId);
             log.info("[{}] Closing current session due to invalid publish msg [{}][{}]", sessionId, topicName, msgId);
@@ -526,18 +453,18 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
 
         @Override
         @Override
         public void onSuccess(TransportProtos.ProvisionDeviceResponseMsg provisionResponseMsg) {
         public void onSuccess(TransportProtos.ProvisionDeviceResponseMsg provisionResponseMsg) {
-            log.trace("[{}] Published msg: {}", sessionId, msg);
-            ack(ctx, msgId);
-            try {
-                if (deviceSessionCtx.getProvisionPayloadType().equals(TransportPayloadType.JSON)) {
-                    deviceSessionCtx.getContext().getJsonMqttAdaptor().convertToPublish(deviceSessionCtx, provisionResponseMsg).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
-                } else {
-                    deviceSessionCtx.getContext().getProtoMqttAdaptor().convertToPublish(deviceSessionCtx, provisionResponseMsg).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
-                }
-                scheduler.schedule((Callable<ChannelFuture>) ctx::close, 60, TimeUnit.SECONDS);
-            } catch (Exception e) {
-                log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
-            }
+//            log.trace("[{}] Published msg: {}", sessionId, msg);
+//            ack(ctx, msgId);
+//            try {
+//                if (deviceSessionCtx.getProvisionPayloadType().equals(TransportPayloadType.JSON)) {
+//                    deviceSessionCtx.getContext().getJsonMqttAdaptor().convertToPublish(deviceSessionCtx, provisionResponseMsg).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+//                } else {
+//                    deviceSessionCtx.getContext().getAscallAdaptor().convertToPublish(deviceSessionCtx, provisionResponseMsg).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+//                }
+//                scheduler.schedule((Callable<ChannelFuture>) ctx::close, 60, TimeUnit.SECONDS);
+//            } catch (Exception e) {
+//                log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
+//            }
         }
         }
 
 
         @Override
         @Override
@@ -604,164 +531,157 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     }
     }
 
 
     private void processSubscribe(ChannelHandlerContext ctx, MqttSubscribeMessage mqttMsg) {
     private void processSubscribe(ChannelHandlerContext ctx, MqttSubscribeMessage mqttMsg) {
-        if (!checkConnected(ctx, mqttMsg)) {
-            return;
-        }
-        log.trace("[{}] Processing subscription [{}]!", sessionId, mqttMsg.variableHeader().messageId());
-        List<Integer> grantedQoSList = new ArrayList<>();
-        boolean activityReported = false;
-        for (MqttTopicSubscription subscription : mqttMsg.payload().topicSubscriptions()) {
-            String topic = subscription.topicName();
-            MqttQoS reqQoS = subscription.qualityOfService();
-            try {
-                switch (topic) {
-                    case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC: {
-                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
-                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
-                    case MqttTopics.GATEWAY_RPC_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_ERROR_TOPIC:
-                        registerSubQoS(topic, grantedQoSList, reqQoS);
-                        break;
-                    default:
-                        log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS);
-                        grantedQoSList.add(FAILURE.value());
-                        break;
-                }
-            } catch (Exception e) {
-                log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS, e);
-                grantedQoSList.add(FAILURE.value());
-            }
-        }
-        if (!activityReported) {
-            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
-        }
-        ctx.writeAndFlush(createSubAckMessage(mqttMsg.variableHeader().messageId(), grantedQoSList));
-    }
+//        if (!checkConnected(ctx, mqttMsg)) {
+//            return;
+//        }
+//        log.trace("[{}] Processing subscription [{}]!", sessionId, mqttMsg.variableHeader().messageId());
+//        List<Integer> grantedQoSList = new ArrayList<>();
+//        boolean activityReported = false;
+//        for (MqttTopicSubscription subscription : mqttMsg.payload().topicSubscriptions()) {
+//            String topic = subscription.topicName();
+//            MqttQoS reqQoS = subscription.qualityOfService();
+//            try {
+//                switch (topic) {
+//                    case MqttTopics.DEVICE_ATTRIBUTES_TOPIC: {
+//                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC: {
+//                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
+//                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC: {
+//                        processAttributesSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC: {
+//                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V1);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC: {
+//                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC: {
+//                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_JSON);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
+//                        processRpcSubscribe(grantedQoSList, topic, reqQoS, TopicType.V2_PROTO);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
+//                    case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
+//                    case MqttTopics.GATEWAY_RPC_TOPIC:
+//                    case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
+//                    case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
+//                    case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
+//                    case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
+//                    case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
+//
+//                        break;
+//                    default:
+//                        log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS);
+//                        grantedQoSList.add(FAILURE.value());
+//                        break;
+//                }
+//            } catch (Exception e) {
+//                log.warn("[{}] Failed to subscribe to [{}][{}]", sessionId, topic, reqQoS, e);
+//                grantedQoSList.add(FAILURE.value());
+//            }
+//        }
+//        if (!activityReported) {
+//            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
+//        }
+//        ctx.writeAndFlush(createSubAckMessage(mqttMsg.variableHeader().messageId(), grantedQoSList));
+    }
+
+//    private void processRpcSubscribe(List<Integer> grantedQoSList, String topic, MqttQoS reqQoS, TopicType topicType) {
+//        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToRPCMsg.newBuilder().build(), null);
+//        rpcSubTopicType = topicType;
+//    }
+//
+//    private void processAttributesSubscribe(List<Integer> grantedQoSList, String topic, MqttQoS reqQoS, TopicType topicType) {
+//        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().build(), null);
+//        attrSubTopicType = topicType;
+//    }
 
 
-    private void processRpcSubscribe(List<Integer> grantedQoSList, String topic, MqttQoS reqQoS, TopicType topicType) {
-        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToRPCMsg.newBuilder().build(), null);
-        rpcSubTopicType = topicType;
-        registerSubQoS(topic, grantedQoSList, reqQoS);
-    }
 
 
-    private void processAttributesSubscribe(List<Integer> grantedQoSList, String topic, MqttQoS reqQoS, TopicType topicType) {
-        transportService.process(deviceSessionCtx.getSessionInfo(), TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().build(), null);
-        attrSubTopicType = topicType;
-        registerSubQoS(topic, grantedQoSList, reqQoS);
-    }
-
-    private void registerSubQoS(String topic, List<Integer> grantedQoSList, MqttQoS reqQoS) {
-        grantedQoSList.add(getMinSupportedQos(reqQoS));
-        mqttQoSMap.put(new MqttTopicMatcher(topic), getMinSupportedQos(reqQoS));
-    }
 
 
     private void processUnsubscribe(ChannelHandlerContext ctx, MqttUnsubscribeMessage mqttMsg) {
     private void processUnsubscribe(ChannelHandlerContext ctx, MqttUnsubscribeMessage mqttMsg) {
-        if (!checkConnected(ctx, mqttMsg)) {
-            return;
-        }
-        boolean activityReported = false;
-        log.trace("[{}] Processing subscription [{}]!", sessionId, mqttMsg.variableHeader().messageId());
-        for (String topicName : mqttMsg.payload().topics()) {
-            mqttQoSMap.remove(new MqttTopicMatcher(topicName));
-            try {
-                switch (topicName) {
-                    case MqttTopics.DEVICE_ATTRIBUTES_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
-                        transportService.process(deviceSessionCtx.getSessionInfo(),
-                                TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(), null);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC:
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
-                        transportService.process(deviceSessionCtx.getSessionInfo(),
-                                TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(), null);
-                        activityReported = true;
-                        break;
-                    }
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
-                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
-                    case MqttTopics.GATEWAY_RPC_TOPIC:
-                    case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
-                    case MqttTopics.DEVICE_SOFTWARE_ERROR_TOPIC: {
-                        activityReported = true;
-                        break;
-                    }
-                }
-            } catch (Exception e) {
-                log.debug("[{}] Failed to process unsubscription [{}] to [{}]", sessionId, mqttMsg.variableHeader().messageId(), topicName);
-            }
-        }
-        if (!activityReported) {
-            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
-        }
-        ctx.writeAndFlush(createUnSubAckMessage(mqttMsg.variableHeader().messageId()));
+//        if (!checkConnected(ctx, mqttMsg)) {
+//            return;
+//        }
+//        boolean activityReported = false;
+//        log.trace("[{}] Processing subscription [{}]!", sessionId, mqttMsg.variableHeader().messageId());
+//        for (String topicName : mqttMsg.payload().topics()) {
+//            try {
+//                switch (topicName) {
+//                    case MqttTopics.DEVICE_ATTRIBUTES_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC: {
+//                        transportService.process(deviceSessionCtx.getSessionInfo(),
+//                                TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().setUnsubscribe(true).build(), null);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_JSON_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_REQUESTS_SUB_SHORT_PROTO_TOPIC: {
+//                        transportService.process(deviceSessionCtx.getSessionInfo(),
+//                                TransportProtos.SubscribeToRPCMsg.newBuilder().setUnsubscribe(true).build(), null);
+//                        activityReported = true;
+//                        break;
+//                    }
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_JSON_TOPIC:
+//                    case MqttTopics.DEVICE_RPC_RESPONSE_SUB_SHORT_PROTO_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_JSON_TOPIC:
+//                    case MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_SHORT_PROTO_TOPIC:
+//                    case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
+//                    case MqttTopics.GATEWAY_RPC_TOPIC:
+//                    case MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC:
+//                    case MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC:
+//                    case MqttTopics.DEVICE_FIRMWARE_RESPONSES_TOPIC:
+//                    case MqttTopics.DEVICE_FIRMWARE_ERROR_TOPIC:
+//                    case MqttTopics.DEVICE_SOFTWARE_RESPONSES_TOPIC:
+//                    case MqttTopics.DEVICE_SOFTWARE_ERROR_TOPIC: {
+//                        activityReported = true;
+//                        break;
+//                    }
+//                }
+//            } catch (Exception e) {
+//                log.debug("[{}] Failed to process unsubscription [{}] to [{}]", sessionId, mqttMsg.variableHeader().messageId(), topicName);
+//            }
+//        }
+//        if (!activityReported) {
+//            transportService.reportActivity(deviceSessionCtx.getSessionInfo());
+//        }
+//        ctx.writeAndFlush(createUnSubAckMessage(mqttMsg.variableHeader().messageId()));
     }
     }
 
 
     private MqttMessage createUnSubAckMessage(int msgId) {
     private MqttMessage createUnSubAckMessage(int msgId) {
@@ -771,47 +691,39 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         return new MqttMessage(mqttFixedHeader, mqttMessageIdVariableHeader);
         return new MqttMessage(mqttFixedHeader, mqttMessageIdVariableHeader);
     }
     }
 
 
-    void processConnect(ChannelHandlerContext ctx, MqttConnectMessage msg) {
-        log.debug("[{}][{}] Processing connect msg for client: {}!", address, sessionId, msg.payload().clientIdentifier());
-        String userName = msg.payload().userName();
-        String clientId = msg.payload().clientIdentifier();
-        if (DataConstants.PROVISION.equals(userName) || DataConstants.PROVISION.equals(clientId)) {
+    void processConnect(ChannelHandlerContext ctx, String accessToken) {
+        log.debug("[{}][{}] Processing connect msg for client: {}!", address, sessionId, accessToken);
+
+        if (DataConstants.PROVISION.equals(accessToken) || DataConstants.PROVISION.equals(accessToken)) {
             deviceSessionCtx.setProvisionOnly(true);
             deviceSessionCtx.setProvisionOnly(true);
-            ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED, msg));
+            ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_ACCEPTED));
         } else {
         } else {
             X509Certificate cert;
             X509Certificate cert;
             if (sslHandler != null && (cert = getX509Certificate()) != null) {
             if (sslHandler != null && (cert = getX509Certificate()) != null) {
-                processX509CertConnect(ctx, cert, msg);
+//                processX509CertConnect(ctx, cert, msg);
             } else {
             } else {
-                processAuthTokenConnect(ctx, msg);
+                processAuthTokenConnect(ctx, accessToken);
             }
             }
         }
         }
     }
     }
 
 
-    private void processAuthTokenConnect(ChannelHandlerContext ctx, MqttConnectMessage connectMessage) {
-        String userName = connectMessage.payload().userName();
-        log.debug("[{}][{}] Processing connect msg for client with user name: {}!", address, sessionId, userName);
-        TransportProtos.ValidateBasicMqttCredRequestMsg.Builder request = TransportProtos.ValidateBasicMqttCredRequestMsg.newBuilder()
-                .setClientId(connectMessage.payload().clientIdentifier());
-        if (userName != null) {
-            request.setUserName(userName);
-        }
-        byte[] passwordBytes = connectMessage.payload().passwordInBytes();
-        if (passwordBytes != null) {
-            String password = new String(passwordBytes, CharsetUtil.UTF_8);
-            request.setPassword(password);
-        }
-        transportService.process(DeviceTransportType.MQTT, request.build(),
+    private void processAuthTokenConnect(ChannelHandlerContext ctx, String accessToken) {
+
+        log.debug("[{}][{}] Processing connect msg for client with user name: {}!", address, sessionId, accessToken);
+        TransportProtos.ValidateDeviceTokenRequestMsg.Builder request = TransportProtos.ValidateDeviceTokenRequestMsg.newBuilder()
+                .setToken(accessToken);
+
+        transportService.process(DeviceTransportType.TCP, request.build(),
                 new TransportServiceCallback<>() {
                 new TransportServiceCallback<>() {
                     @Override
                     @Override
                     public void onSuccess(ValidateDeviceCredentialsResponse msg) {
                     public void onSuccess(ValidateDeviceCredentialsResponse msg) {
-                        onValidateDeviceResponse(msg, ctx, connectMessage);
+                        onValidateDeviceResponse(msg, ctx);
                     }
                     }
 
 
                     @Override
                     @Override
                     public void onError(Throwable e) {
                     public void onError(Throwable e) {
-                        log.trace("[{}] Failed to process credentials: {}", address, userName, e);
-                        ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage));
+                        log.trace("[{}] Failed to process credentials: {}", address, accessToken, e);
+                        ctx.writeAndFlush(createTcpConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE));
                         ctx.close();
                         ctx.close();
                     }
                     }
                 });
                 });
@@ -828,19 +740,19 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
                     new TransportServiceCallback<>() {
                     new TransportServiceCallback<>() {
                         @Override
                         @Override
                         public void onSuccess(ValidateDeviceCredentialsResponse msg) {
                         public void onSuccess(ValidateDeviceCredentialsResponse msg) {
-                            onValidateDeviceResponse(msg, ctx, connectMessage);
+                            onValidateDeviceResponse(msg, ctx);
                         }
                         }
 
 
                         @Override
                         @Override
                         public void onError(Throwable e) {
                         public void onError(Throwable e) {
                             log.trace("[{}] Failed to process credentials: {}", address, sha3Hash, e);
                             log.trace("[{}] Failed to process credentials: {}", address, sha3Hash, e);
-                            ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage));
+                            ctx.writeAndFlush(createTcpConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE));
                             ctx.close();
                             ctx.close();
                         }
                         }
                     });
                     });
         } catch (Exception e) {
         } catch (Exception e) {
             context.onAuthFailure(address);
             context.onAuthFailure(address);
-            ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED, connectMessage));
+            ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED));
             log.trace("[{}] X509 auth failure: {}", sessionId, address, e);
             log.trace("[{}] X509 auth failure: {}", sessionId, address, e);
             ctx.close();
             ctx.close();
         }
         }
@@ -859,12 +771,8 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         return null;
         return null;
     }
     }
 
 
-    private MqttConnAckMessage createMqttConnAckMsg(MqttConnectReturnCode returnCode, MqttConnectMessage msg) {
-        MqttFixedHeader mqttFixedHeader =
-                new MqttFixedHeader(CONNACK, false, AT_MOST_ONCE, false, 0);
-        MqttConnAckVariableHeader mqttConnAckVariableHeader =
-                new MqttConnAckVariableHeader(returnCode, !msg.variableHeader().isCleanSession());
-        return new MqttConnAckMessage(mqttFixedHeader, mqttConnAckVariableHeader);
+    private ByteBuf createTcpConnAckMsg(MqttConnectReturnCode msg) {
+        return Unpooled.copiedBuffer(ByteUtils.hexStr2Bytes(msg.name()));
     }
     }
 
 
     @Override
     @Override
@@ -890,9 +798,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         return new MqttSubAckMessage(mqttFixedHeader, mqttMessageIdVariableHeader, mqttSubAckPayload);
         return new MqttSubAckMessage(mqttFixedHeader, mqttMessageIdVariableHeader, mqttSubAckPayload);
     }
     }
 
 
-    private static int getMinSupportedQos(MqttQoS reqQoS) {
-        return Math.min(reqQoS.value(), MAX_SUPPORTED_QOS_LVL.value());
-    }
+
 
 
     public static MqttPubAckMessage createMqttPubAckMsg(int requestId) {
     public static MqttPubAckMessage createMqttPubAckMsg(int requestId) {
         MqttFixedHeader mqttFixedHeader =
         MqttFixedHeader mqttFixedHeader =
@@ -902,7 +808,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         return new MqttPubAckMessage(mqttFixedHeader, mqttMsgIdVariableHeader);
         return new MqttPubAckMessage(mqttFixedHeader, mqttMsgIdVariableHeader);
     }
     }
 
 
-    private boolean checkConnected(ChannelHandlerContext ctx, MqttMessage msg) {
+    private boolean checkConnected(ChannelHandlerContext ctx, TCPMessage msg) {
         if (deviceSessionCtx.isConnected()) {
         if (deviceSessionCtx.isConnected()) {
             return true;
             return true;
         } else {
         } else {
@@ -911,23 +817,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         }
         }
     }
     }
 
 
-    private void checkGatewaySession(SessionMetaData sessionMetaData) {
-        TransportDeviceInfo device = deviceSessionCtx.getDeviceInfo();
-        try {
-            JsonNode infoNode = context.getMapper().readTree(device.getAdditionalInfo());
-            if (infoNode != null) {
-                JsonNode gatewayNode = infoNode.get("gateway");
-                if (gatewayNode != null && gatewayNode.asBoolean()) {
-                    gatewaySessionHandler = new GatewaySessionHandler(deviceSessionCtx, sessionId);
-                    if (infoNode.has(DefaultTransportService.OVERWRITE_ACTIVITY_TIME) && infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).isBoolean()) {
-                        sessionMetaData.setOverwriteActivityTime(infoNode.get(DefaultTransportService.OVERWRITE_ACTIVITY_TIME).asBoolean());
-                    }
-                }
-            }
-        } catch (IOException e) {
-            log.trace("[{}][{}] Failed to fetch device additional info", sessionId, device.getDeviceName(), e);
-        }
-    }
+
 
 
     @Override
     @Override
     public void operationComplete(Future<? super Void> future) throws Exception {
     public void operationComplete(Future<? super Void> future) throws Exception {
@@ -940,19 +830,16 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             log.debug("[{}] Client disconnected!", sessionId);
             log.debug("[{}] Client disconnected!", sessionId);
             transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
             transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
             transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
             transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
-            if (gatewaySessionHandler != null) {
-                gatewaySessionHandler.onGatewayDisconnect();
-            }
             deviceSessionCtx.setDisconnected();
             deviceSessionCtx.setDisconnected();
         }
         }
         deviceSessionCtx.release();
         deviceSessionCtx.release();
     }
     }
 
 
 
 
-    private void onValidateDeviceResponse(ValidateDeviceCredentialsResponse msg, ChannelHandlerContext ctx, MqttConnectMessage connectMessage) {
+    private void onValidateDeviceResponse(ValidateDeviceCredentialsResponse msg, ChannelHandlerContext ctx) {
         if (!msg.hasDeviceInfo()) {
         if (!msg.hasDeviceInfo()) {
             context.onAuthFailure(address);
             context.onAuthFailure(address);
-            ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED, connectMessage));
+            ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED));
             ctx.close();
             ctx.close();
         } else {
         } else {
             context.onAuthSuccess(address);
             context.onAuthSuccess(address);
@@ -962,9 +849,8 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_OPEN, new TransportServiceCallback<Void>() {
             transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_OPEN, new TransportServiceCallback<Void>() {
                 @Override
                 @Override
                 public void onSuccess(Void msg) {
                 public void onSuccess(Void msg) {
-                    SessionMetaData sessionMetaData = transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), TcpTransportHandler.this);
-                    checkGatewaySession(sessionMetaData);
-                    ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED, connectMessage));
+                    transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), TcpTransportHandler.this);
+                    ctx.writeAndFlush(createTcpConnAckMsg(CONNECTION_ACCEPTED));
                     deviceSessionCtx.setConnected(true);
                     deviceSessionCtx.setConnected(true);
                     log.debug("[{}] Client connected!", sessionId);
                     log.debug("[{}] Client connected!", sessionId);
                     transportService.getCallbackExecutor().execute(() -> processMsgQueue(ctx)); //this callback will execute in Producer worker thread and hard or blocking work have to be submitted to the separate thread.
                     transportService.getCallbackExecutor().execute(() -> processMsgQueue(ctx)); //this callback will execute in Producer worker thread and hard or blocking work have to be submitted to the separate thread.
@@ -977,7 +863,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
                     } else {
                     } else {
                         log.warn("[{}] Failed to submit session event", sessionId, e);
                         log.warn("[{}] Failed to submit session event", sessionId, e);
                     }
                     }
-                    ctx.writeAndFlush(createMqttConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE, connectMessage));
+                    ctx.writeAndFlush(createTcpConnAckMsg(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE));
                     ctx.close();
                     ctx.close();
                 }
                 }
             });
             });
@@ -986,26 +872,26 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
 
     @Override
     @Override
     public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg response) {
     public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg response) {
-        log.trace("[{}] Received get attributes response", sessionId);
-        String topicBase = attrReqTopicType.getAttributesResponseTopicBase();
-        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrReqTopicType);
-        try {
-            adaptor.convertToPublish(deviceSessionCtx, response, topicBase).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
-        } catch (Exception e) {
-            log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
-        }
+//        log.trace("[{}] Received get attributes response", sessionId);
+//        String topicBase = attrReqTopicType.getAttributesResponseTopicBase();
+//        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrReqTopicType);
+//        try {
+//            adaptor.convertToPublish(deviceSessionCtx, response, topicBase).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+//        } catch (Exception e) {
+//            log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
+//        }
     }
     }
 
 
     @Override
     @Override
     public void onAttributeUpdate(UUID sessionId, TransportProtos.AttributeUpdateNotificationMsg notification) {
     public void onAttributeUpdate(UUID sessionId, TransportProtos.AttributeUpdateNotificationMsg notification) {
-        log.trace("[{}] Received attributes update notification to device", sessionId);
-        String topic = attrSubTopicType.getAttributesSubTopic();
-        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrSubTopicType);
-        try {
-            adaptor.convertToPublish(deviceSessionCtx, notification, topic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
-        } catch (Exception e) {
-            log.trace("[{}] Failed to convert device attributes update to MQTT msg", sessionId, e);
-        }
+//        log.trace("[{}] Received attributes update notification to device", sessionId);
+//        String topic = attrSubTopicType.getAttributesSubTopic();
+//        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(attrSubTopicType);
+//        try {
+//            adaptor.convertToPublish(deviceSessionCtx, notification, topic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+//        } catch (Exception e) {
+//            log.trace("[{}] Failed to convert device attributes update to MQTT msg", sessionId, e);
+//        }
     }
     }
 
 
     @Override
     @Override
@@ -1016,52 +902,52 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
 
     @Override
     @Override
     public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
     public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
-        log.trace("[{}] Received RPC command to device", sessionId);
-        String baseTopic = rpcSubTopicType.getRpcRequestTopicBase();
-        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(rpcSubTopicType);
-        try {
-            adaptor.convertToPublish(deviceSessionCtx, rpcRequest, baseTopic).ifPresent(payload -> {
-                int msgId = ((MqttPublishMessage) payload).variableHeader().packetId();
-                if (isAckExpected(payload)) {
-                    rpcAwaitingAck.put(msgId, rpcRequest);
-                    context.getScheduler().schedule(() -> {
-                        TransportProtos.ToDeviceRpcRequestMsg msg = rpcAwaitingAck.remove(msgId);
-                        if (msg != null) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.TIMEOUT, TransportServiceCallback.EMPTY);
-                        }
-                    }, Math.max(0, Math.min(deviceSessionCtx.getContext().getTimeout(), rpcRequest.getExpirationTime() - System.currentTimeMillis())), TimeUnit.MILLISECONDS);
-                }
-                var cf = publish(payload, deviceSessionCtx);
-                cf.addListener(result -> {
-                    if (result.cause() == null) {
-                        if (!isAckExpected(payload)) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
-                        } else if (rpcRequest.getPersisted()) {
-                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
-                        }
-                    } else {
-                        // TODO: send error
-                    }
-                });
-            });
-        } catch (Exception e) {
-            transportService.process(deviceSessionCtx.getSessionInfo(),
-                    TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                            .setRequestId(rpcRequest.getRequestId()).setError("Failed to convert device RPC command to MQTT msg").build(), TransportServiceCallback.EMPTY);
-            log.trace("[{}] Failed to convert device RPC command to MQTT msg", sessionId, e);
-        }
+//        log.trace("[{}] Received RPC command to device", sessionId);
+//        String baseTopic = rpcSubTopicType.getRpcRequestTopicBase();
+//        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(rpcSubTopicType);
+//        try {
+//            adaptor.convertToPublish(deviceSessionCtx, rpcRequest, baseTopic).ifPresent(payload -> {
+//                int msgId = ((MqttPublishMessage) payload).variableHeader().packetId();
+//                if (isAckExpected(payload)) {
+//                    rpcAwaitingAck.put(msgId, rpcRequest);
+//                    context.getScheduler().schedule(() -> {
+//                        TransportProtos.ToDeviceRpcRequestMsg msg = rpcAwaitingAck.remove(msgId);
+//                        if (msg != null) {
+//                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.TIMEOUT, TransportServiceCallback.EMPTY);
+//                        }
+//                    }, Math.max(0, Math.min(deviceSessionCtx.getContext().getTimeout(), rpcRequest.getExpirationTime() - System.currentTimeMillis())), TimeUnit.MILLISECONDS);
+//                }
+//                var cf = publish(payload, deviceSessionCtx);
+//                cf.addListener(result -> {
+//                    if (result.cause() == null) {
+//                        if (!isAckExpected(payload)) {
+//                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
+//                        } else if (rpcRequest.getPersisted()) {
+//                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
+//                        }
+//                    } else {
+//                        // TODO: send error
+//                    }
+//                });
+//            });
+//        } catch (Exception e) {
+//            transportService.process(deviceSessionCtx.getSessionInfo(),
+//                    TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
+//                            .setRequestId(rpcRequest.getRequestId()).setError("Failed to convert device RPC command to MQTT msg").build(), TransportServiceCallback.EMPTY);
+//            log.trace("[{}] Failed to convert device RPC command to MQTT msg", sessionId, e);
+//        }
     }
     }
 
 
     @Override
     @Override
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg rpcResponse) {
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg rpcResponse) {
-        log.trace("[{}] Received RPC response from server", sessionId);
-        String baseTopic = toServerRpcSubTopicType.getRpcResponseTopicBase();
-        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(toServerRpcSubTopicType);
-        try {
-            adaptor.convertToPublish(deviceSessionCtx, rpcResponse, baseTopic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
-        } catch (Exception e) {
-            log.trace("[{}] Failed to convert device RPC command to MQTT msg", sessionId, e);
-        }
+//        log.trace("[{}] Received RPC response from server", sessionId);
+//        String baseTopic = toServerRpcSubTopicType.getRpcResponseTopicBase();
+//        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(toServerRpcSubTopicType);
+//        try {
+//            adaptor.convertToPublish(deviceSessionCtx, rpcResponse, baseTopic).ifPresent(deviceSessionCtx.getChannel()::writeAndFlush);
+//        } catch (Exception e) {
+//            log.trace("[{}] Failed to convert device RPC command to MQTT msg", sessionId, e);
+//        }
     }
     }
 
 
     private ChannelFuture publish(MqttMessage message, DeviceSessionCtx deviceSessionCtx) {
     private ChannelFuture publish(MqttMessage message, DeviceSessionCtx deviceSessionCtx) {

@@ -21,6 +21,8 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
 import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
 import io.netty.handler.codec.mqtt.MqttDecoder;
 import io.netty.handler.codec.mqtt.MqttDecoder;
 import io.netty.handler.codec.mqtt.MqttEncoder;
 import io.netty.handler.codec.mqtt.MqttEncoder;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslHandler;
 import org.thingsboard.server.transport.tcp.limits.IpFilter;
 import org.thingsboard.server.transport.tcp.limits.IpFilter;
 import org.thingsboard.server.transport.tcp.limits.ProxyIpFilter;
 import org.thingsboard.server.transport.tcp.limits.ProxyIpFilter;
@@ -52,8 +54,8 @@ public class TcpTransportServerInitializer extends ChannelInitializer<SocketChan
             sslHandler = context.getSslHandlerProvider().getSslHandler();
             sslHandler = context.getSslHandlerProvider().getSslHandler();
             pipeline.addLast(sslHandler);
             pipeline.addLast(sslHandler);
         }
         }
-        pipeline.addLast("decoder", new MqttDecoder(context.getMaxPayloadSize()));
-        pipeline.addLast("encoder", MqttEncoder.INSTANCE);
+//        pipeline.addLast("decoder", new StringDecoder());
+//        pipeline.addLast("encoder", new StringEncoder());
 
 
         TcpTransportHandler handler = new TcpTransportHandler(context, sslHandler);
         TcpTransportHandler handler = new TcpTransportHandler(context, sslHandler);
 
 

@@ -43,7 +43,7 @@ import java.net.InetSocketAddress;
 @Slf4j
 @Slf4j
 public class TcpTransportService implements TbTransportService {
 public class TcpTransportService implements TbTransportService {
 
 
-    public static AttributeKey<InetSocketAddress> ADDRESS = AttributeKey.newInstance("SRC_ADDRESS");
+    public static AttributeKey<InetSocketAddress> ADDRESS = AttributeKey.newInstance("TCP_SRC_ADDRESS");
 
 
     @Value("${transport.tcp.bind_address}")
     @Value("${transport.tcp.bind_address}")
     private String host;
     private String host;

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp;
-
-import lombok.Getter;
-import org.thingsboard.server.common.data.device.profile.MqttTopics;
-
-public enum TopicType {
-
-    V1(MqttTopics.DEVICE_ATTRIBUTES_RESPONSE_TOPIC_PREFIX, MqttTopics.DEVICE_ATTRIBUTES_TOPIC, MqttTopics.DEVICE_RPC_REQUESTS_TOPIC, MqttTopics.DEVICE_RPC_RESPONSE_TOPIC),
-    V2(MqttTopics.DEVICE_ATTRIBUTES_RESPONSE_SHORT_TOPIC_PREFIX, MqttTopics.DEVICE_ATTRIBUTES_SHORT_TOPIC, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_TOPIC, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_TOPIC),
-    V2_JSON(MqttTopics.DEVICE_ATTRIBUTES_RESPONSE_SHORT_JSON_TOPIC_PREFIX, MqttTopics.DEVICE_ATTRIBUTES_SHORT_JSON_TOPIC, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_JSON_TOPIC, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_JSON_TOPIC),
-    V2_PROTO(MqttTopics.DEVICE_ATTRIBUTES_RESPONSE_SHORT_PROTO_TOPIC_PREFIX, MqttTopics.DEVICE_ATTRIBUTES_SHORT_PROTO_TOPIC, MqttTopics.DEVICE_RPC_REQUESTS_SHORT_PROTO_TOPIC, MqttTopics.DEVICE_RPC_RESPONSE_SHORT_PROTO_TOPIC);
-
-    @Getter
-    private final String attributesResponseTopicBase;
-
-    @Getter
-    private final String attributesSubTopic;
-
-    @Getter
-    private final String rpcRequestTopicBase;
-
-    @Getter
-    private final String rpcResponseTopicBase;
-
-    TopicType(String attributesRequestTopicBase, String attributesSubTopic, String rpcRequestTopicBase, String rpcResponseTopicBase) {
-        this.attributesResponseTopicBase = attributesRequestTopicBase;
-        this.attributesSubTopic = attributesSubTopic;
-        this.rpcRequestTopicBase = rpcRequestTopicBase;
-        this.rpcResponseTopicBase = rpcResponseTopicBase;
-    }
-}

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.adaptors;
-
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-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.transport.tcp.session.MqttDeviceAwareSessionContext;
-
-import java.util.Optional;
-
-@Data
-@AllArgsConstructor
-@Slf4j
-public class BackwardCompatibilityAdaptor implements TcpTransportAdaptor {
-
-    private TcpTransportAdaptor protoAdaptor;
-    private TcpTransportAdaptor jsonAdaptor;
-
-    @Override
-    public TransportProtos.PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToPostTelemetry(ctx, inbound);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process post telemetry request msg: {} due to: ", ctx.getSessionId(), inbound, e);
-            return jsonAdaptor.convertToPostTelemetry(ctx, inbound);
-        }
-    }
-
-    @Override
-    public TransportProtos.PostAttributeMsg convertToPostAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToPostAttributes(ctx, inbound);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process post attributes request msg: {} due to: ", ctx.getSessionId(), inbound, e);
-            return jsonAdaptor.convertToPostAttributes(ctx, inbound);
-        }
-    }
-
-    @Override
-    public TransportProtos.GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToGetAttributes(ctx, inbound, topicBase);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process get attributes request msg: {} due to: ", ctx.getSessionId(), inbound, e);
-            return jsonAdaptor.convertToGetAttributes(ctx, inbound, topicBase);
-        }
-    }
-
-    @Override
-    public TransportProtos.ToDeviceRpcResponseMsg convertToDeviceRpcResponse(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process to device rpc response msg: {} due to: ", ctx.getSessionId(), mqttMsg, e);
-            return jsonAdaptor.convertToDeviceRpcResponse(ctx, mqttMsg, topicBase);
-        }
-    }
-
-    @Override
-    public TransportProtos.ToServerRpcRequestMsg convertToServerRpcRequest(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process to server rpc request msg: {} due to: ", ctx.getSessionId(), mqttMsg, e);
-            return jsonAdaptor.convertToServerRpcRequest(ctx, mqttMsg, topicBase);
-        }
-    }
-
-    @Override
-    public TransportProtos.ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        try {
-            return protoAdaptor.convertToClaimDevice(ctx, inbound);
-        } catch (AdaptorException e) {
-            log.trace("[{}] failed to process claim device request msg: {} due to: ", ctx.getSessionId(), inbound, e);
-            return jsonAdaptor.convertToClaimDevice(ctx, inbound);
-        }
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! GetAttributeResponseMsg: {} TopicBase: {}", ctx.getSessionId(), responseMsg, topicBase);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
-        return protoAdaptor.convertToGatewayPublish(ctx, deviceName, responseMsg);
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.AttributeUpdateNotificationMsg notificationMsg, String topic) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! AttributeUpdateNotificationMsg: {} Topic: {}", ctx.getSessionId(), notificationMsg, topic);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException {
-        return protoAdaptor.convertToGatewayPublish(ctx, deviceName, notificationMsg);
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, String topicBase) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! ToDeviceRpcRequestMsg: {} TopicBase: {}", ctx.getSessionId(), rpcRequest, topicBase);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws AdaptorException {
-        return protoAdaptor.convertToGatewayPublish(ctx, deviceName, rpcRequest);
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToServerRpcResponseMsg rpcResponse, String topicBase) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! ToServerRpcResponseMsg: {} TopicBase: {}", ctx.getSessionId(), rpcResponse, topicBase);
-        return Optional.empty();
-    }
-
-    @Override
-    public TransportProtos.ProvisionDeviceRequestMsg convertToProvisionRequestMsg(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! MqttPublishMessage: {}", ctx.getSessionId(), inbound);
-        return null;
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ProvisionDeviceResponseMsg provisionResponse) throws AdaptorException {
-        log.warn("[{}] invoked not implemented adaptor method! ProvisionDeviceResponseMsg: {}", ctx.getSessionId(), provisionResponse);
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) throws AdaptorException {
-        return protoAdaptor.convertToPublish(ctx, firmwareChunk, requestId, chunk, firmwareType);
-    }
-}

@@ -33,7 +33,7 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.tcp.session.MqttDeviceAwareSessionContext;
+import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
 
 
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
@@ -56,7 +56,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
     protected static final Charset UTF8 = StandardCharsets.UTF_8;
     protected static final Charset UTF8 = StandardCharsets.UTF_8;
 
 
     @Override
     @Override
-    public TransportProtos.PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+    public TransportProtos.PostTelemetryMsg convertToPostTelemetry(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
         try {
             return JsonConverter.convertToTelemetryProto(new JsonParser().parse(payload));
             return JsonConverter.convertToTelemetryProto(new JsonParser().parse(payload));
@@ -67,7 +67,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.PostAttributeMsg convertToPostAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+    public TransportProtos.PostAttributeMsg convertToPostAttributes(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
         try {
             return JsonConverter.convertToAttributesProto(new JsonParser().parse(payload));
             return JsonConverter.convertToAttributesProto(new JsonParser().parse(payload));
@@ -78,7 +78,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+    public TransportProtos.ClaimDeviceMsg convertToClaimDevice(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), true);
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), true);
         try {
         try {
             return JsonConverter.convertToClaimDeviceProto(ctx.getDeviceId(), payload);
             return JsonConverter.convertToClaimDeviceProto(ctx.getDeviceId(), payload);
@@ -89,7 +89,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.ProvisionDeviceRequestMsg convertToProvisionRequestMsg(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
+    public TransportProtos.ProvisionDeviceRequestMsg convertToProvisionRequestMsg(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
         try {
             return JsonConverter.convertToProvisionRequestMsg(payload);
             return JsonConverter.convertToProvisionRequestMsg(payload);
@@ -99,63 +99,63 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
+    public TransportProtos.GetAttributeRequestMsg convertToGetAttributes(DeviceSessionCtx ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
         return processGetAttributeRequestMsg(inbound, topicBase);
         return processGetAttributeRequestMsg(inbound, topicBase);
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.ToDeviceRpcResponseMsg convertToDeviceRpcResponse(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
+    public TransportProtos.ToDeviceRpcResponseMsg convertToDeviceRpcResponse(DeviceSessionCtx ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
         return processToDeviceRpcResponseMsg(inbound, topicBase);
         return processToDeviceRpcResponseMsg(inbound, topicBase);
     }
     }
 
 
     @Override
     @Override
-    public TransportProtos.ToServerRpcRequestMsg convertToServerRpcRequest(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
+    public TransportProtos.ToServerRpcRequestMsg convertToServerRpcRequest(DeviceSessionCtx ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
         return processToServerRpcRequestMsg(ctx, inbound, topicBase);
         return processToServerRpcRequestMsg(ctx, inbound, topicBase);
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
         return processConvertFromAttributeResponseMsg(ctx, responseMsg, topicBase);
         return processConvertFromAttributeResponseMsg(ctx, responseMsg, topicBase);
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
+    public Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
         return processConvertFromGatewayAttributeResponseMsg(ctx, deviceName, responseMsg);
         return processConvertFromGatewayAttributeResponseMsg(ctx, deviceName, responseMsg);
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.AttributeUpdateNotificationMsg notificationMsg, String topic) {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, TransportProtos.AttributeUpdateNotificationMsg notificationMsg, String topic) {
         return Optional.of(createMqttPublishMsg(ctx, topic, JsonConverter.toJson(notificationMsg)));
         return Optional.of(createMqttPublishMsg(ctx, topic, JsonConverter.toJson(notificationMsg)));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) {
+    public Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) {
         JsonObject result = JsonConverter.getJsonObjectForGateway(deviceName, notificationMsg);
         JsonObject result = JsonConverter.getJsonObjectForGateway(deviceName, notificationMsg);
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_ATTRIBUTES_TOPIC, result));
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_ATTRIBUTES_TOPIC, result));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, String topicBase) {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, String topicBase) {
         return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcRequest.getRequestId(), JsonConverter.toJson(rpcRequest, false)));
         return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcRequest.getRequestId(), JsonConverter.toJson(rpcRequest, false)));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
+    public Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_RPC_TOPIC, JsonConverter.toGatewayJson(deviceName, rpcRequest)));
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_RPC_TOPIC, JsonConverter.toGatewayJson(deviceName, rpcRequest)));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToServerRpcResponseMsg rpcResponse, String topicBase) {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, TransportProtos.ToServerRpcResponseMsg rpcResponse, String topicBase) {
         return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcResponse.getRequestId(), JsonConverter.toJson(rpcResponse)));
         return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcResponse.getRequestId(), JsonConverter.toJson(rpcResponse)));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ProvisionDeviceResponseMsg provisionResponse) {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, TransportProtos.ProvisionDeviceResponseMsg provisionResponse) {
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC, JsonConverter.toJson(provisionResponse)));
         return Optional.of(createMqttPublishMsg(ctx, MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC, JsonConverter.toJson(provisionResponse)));
     }
     }
 
 
     @Override
     @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) {
+    public Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) {
         return Optional.of(createMqttPublishMsg(ctx, String.format(DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT, firmwareType.getKeyPrefix(), requestId, chunk), firmwareChunk));
         return Optional.of(createMqttPublishMsg(ctx, String.format(DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT, firmwareType.getKeyPrefix(), requestId, chunk), firmwareChunk));
     }
     }
 
 
@@ -203,7 +203,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
         }
         }
     }
     }
 
 
-    private TransportProtos.ToServerRpcRequestMsg processToServerRpcRequestMsg(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
+    private TransportProtos.ToServerRpcRequestMsg processToServerRpcRequestMsg(DeviceSessionCtx ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
         String topicName = inbound.variableHeader().topicName();
         String topicName = inbound.variableHeader().topicName();
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
         try {
@@ -215,7 +215,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
         }
         }
     }
     }
 
 
-    private Optional<MqttMessage> processConvertFromAttributeResponseMsg(MqttDeviceAwareSessionContext ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
+    private Optional<MqttMessage> processConvertFromAttributeResponseMsg(DeviceSessionCtx ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
         if (!StringUtils.isEmpty(responseMsg.getError())) {
         if (!StringUtils.isEmpty(responseMsg.getError())) {
             throw new AdaptorException(responseMsg.getError());
             throw new AdaptorException(responseMsg.getError());
         } else {
         } else {
@@ -229,7 +229,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
         }
         }
     }
     }
 
 
-    private Optional<MqttMessage> processConvertFromGatewayAttributeResponseMsg(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
+    private Optional<MqttMessage> processConvertFromGatewayAttributeResponseMsg(DeviceSessionCtx ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
         if (!StringUtils.isEmpty(responseMsg.getError())) {
         if (!StringUtils.isEmpty(responseMsg.getError())) {
             throw new AdaptorException(responseMsg.getError());
             throw new AdaptorException(responseMsg.getError());
         } else {
         } else {
@@ -238,9 +238,9 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
         }
         }
     }
     }
 
 
-    protected MqttPublishMessage createMqttPublishMsg(MqttDeviceAwareSessionContext ctx, String topic, JsonElement json) {
-        MqttFixedHeader mqttFixedHeader =
-                new MqttFixedHeader(MqttMessageType.PUBLISH, false, ctx.getQoSForTopic(topic), false, 0);
+    protected MqttPublishMessage createMqttPublishMsg(DeviceSessionCtx ctx, String topic, JsonElement json) {
+        MqttFixedHeader mqttFixedHeader = null;
+//                new MqttFixedHeader(MqttMessageType.PUBLISH, false, ctx.getQoSForTopic(topic), false, 0);
         MqttPublishVariableHeader header = new MqttPublishVariableHeader(topic, ctx.nextMsgId());
         MqttPublishVariableHeader header = new MqttPublishVariableHeader(topic, ctx.nextMsgId());
         ByteBuf payload = ALLOCATOR.buffer();
         ByteBuf payload = ALLOCATOR.buffer();
         payload.writeBytes(json.toString().getBytes(UTF8));
         payload.writeBytes(json.toString().getBytes(UTF8));

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.adaptors;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.protobuf.Descriptors;
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import io.netty.buffer.ByteBuf;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import org.thingsboard.server.common.data.device.profile.MqttTopics;
-import org.thingsboard.server.common.data.ota.OtaPackageType;
-import org.thingsboard.server.common.transport.adaptor.AdaptorException;
-import org.thingsboard.server.common.transport.adaptor.JsonConverter;
-import org.thingsboard.server.common.transport.adaptor.ProtoConverter;
-import org.thingsboard.server.gen.transport.TransportApiProtos;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
-import org.thingsboard.server.transport.tcp.session.MqttDeviceAwareSessionContext;
-
-import java.util.Optional;
-
-import static org.thingsboard.server.common.data.device.profile.MqttTopics.DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT;
-
-@Component
-@Slf4j
-public class ProtoTcpAdaptor implements TcpTransportAdaptor {
-
-    @Override
-    public TransportProtos.PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        DeviceSessionCtx deviceSessionCtx = (DeviceSessionCtx) ctx;
-        byte[] bytes = toBytes(inbound.payload());
-        Descriptors.Descriptor telemetryDynamicMsgDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getTelemetryDynamicMsgDescriptor());
-        try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
-        } catch (Exception e) {
-            log.debug("Failed to decode post telemetry request", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.PostAttributeMsg convertToPostAttributes(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.convertToAttributesProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, attributesDynamicMessageDescriptor)));
-        } catch (Exception e) {
-            log.debug("Failed to decode post attributes request", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
-        byte[] bytes = toBytes(inbound.payload());
-        try {
-            return ProtoConverter.convertToClaimDeviceProto(ctx.getDeviceId(), bytes);
-        } catch (InvalidProtocolBufferException e) {
-            log.debug("Failed to decode claim device request", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException {
-        byte[] bytes = toBytes(inbound.payload());
-        String topicName = inbound.variableHeader().topicName();
-        try {
-            int requestId = getRequestId(topicName, topicBase);
-            return ProtoConverter.convertToGetAttributeRequestMessage(bytes, requestId);
-        } catch (InvalidProtocolBufferException e) {
-            log.debug("Failed to decode get attributes request", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.ToDeviceRpcResponseMsg convertToDeviceRpcResponse(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException {
-        DeviceSessionCtx deviceSessionCtx = (DeviceSessionCtx) ctx;
-        String topicName = mqttMsg.variableHeader().topicName();
-        byte[] bytes = toBytes(mqttMsg.payload());
-        Descriptors.Descriptor rpcResponseDynamicMessageDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getRpcResponseDynamicMessageDescriptor());
-        try {
-            int requestId = getRequestId(topicName, topicBase);
-            JsonElement response = new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, rpcResponseDynamicMessageDescriptor));
-            return TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId).setPayload(response.toString()).build();
-        } catch (Exception e) {
-            log.debug("Failed to decode rpc response", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.ToServerRpcRequestMsg convertToServerRpcRequest(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException {
-        byte[] bytes = toBytes(mqttMsg.payload());
-        String topicName = mqttMsg.variableHeader().topicName();
-        try {
-            int requestId = getRequestId(topicName, topicBase);
-            return ProtoConverter.convertToServerRpcRequest(bytes, requestId);
-        } catch (InvalidProtocolBufferException e) {
-            log.debug("Failed to decode to server rpc request", e);
-            throw new AdaptorException(e);
-        }
-    }
-
-    @Override
-    public TransportProtos.ProvisionDeviceRequestMsg convertToProvisionRequestMsg(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg) throws AdaptorException {
-        byte[] bytes = toBytes(mqttMsg.payload());
-        try {
-            return ProtoConverter.convertToProvisionRequestMsg(bytes);
-        } catch (InvalidProtocolBufferException ex) {
-            log.debug("Failed to decode provision request", ex);
-            throw new AdaptorException(ex);
-        }
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException {
-        if (!StringUtils.isEmpty(responseMsg.getError())) {
-            throw new AdaptorException(responseMsg.getError());
-        } else {
-            int requestId = responseMsg.getRequestId();
-            if (requestId >= 0) {
-                return Optional.of(createMqttPublishMsg(ctx, topicBase + requestId, responseMsg.toByteArray()));
-            }
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, String topicBase) throws AdaptorException {
-        DeviceSessionCtx deviceSessionCtx = (DeviceSessionCtx) ctx;
-        DynamicMessage.Builder rpcRequestDynamicMessageBuilder = deviceSessionCtx.getRpcRequestDynamicMessageBuilder();
-        if (rpcRequestDynamicMessageBuilder == null) {
-            throw new AdaptorException("Failed to get rpcRequestDynamicMessageBuilder!");
-        } else {
-            return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcRequest.getRequestId(), ProtoConverter.convertToRpcRequest(rpcRequest, rpcRequestDynamicMessageBuilder)));
-        }
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ToServerRpcResponseMsg rpcResponse, String topicBase) {
-        return Optional.of(createMqttPublishMsg(ctx, topicBase + rpcResponse.getRequestId(), rpcResponse.toByteArray()));
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.AttributeUpdateNotificationMsg notificationMsg, String topic) {
-        return Optional.of(createMqttPublishMsg(ctx, topic, notificationMsg.toByteArray()));
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, TransportProtos.ProvisionDeviceResponseMsg provisionResponse) {
-        return Optional.of(createMqttPublishMsg(ctx, MqttTopics.DEVICE_PROVISION_RESPONSE_TOPIC, provisionResponse.toByteArray()));
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) throws AdaptorException {
-        return Optional.of(createMqttPublishMsg(ctx, String.format(DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT, firmwareType.getKeyPrefix(), requestId, chunk), firmwareChunk));
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
-        if (!StringUtils.isEmpty(responseMsg.getError())) {
-            throw new AdaptorException(responseMsg.getError());
-        } else {
-            TransportApiProtos.GatewayAttributeResponseMsg.Builder responseMsgBuilder = TransportApiProtos.GatewayAttributeResponseMsg.newBuilder();
-            responseMsgBuilder.setDeviceName(deviceName);
-            responseMsgBuilder.setResponseMsg(responseMsg);
-            byte[] payloadBytes = responseMsgBuilder.build().toByteArray();
-            return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_ATTRIBUTES_RESPONSE_TOPIC, payloadBytes));
-        }
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) {
-        TransportApiProtos.GatewayAttributeUpdateNotificationMsg.Builder builder = TransportApiProtos.GatewayAttributeUpdateNotificationMsg.newBuilder();
-        builder.setDeviceName(deviceName);
-        builder.setNotificationMsg(notificationMsg);
-        byte[] payloadBytes = builder.build().toByteArray();
-        return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_ATTRIBUTES_TOPIC, payloadBytes));
-    }
-
-    @Override
-    public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
-        TransportApiProtos.GatewayDeviceRpcRequestMsg.Builder builder = TransportApiProtos.GatewayDeviceRpcRequestMsg.newBuilder();
-        builder.setDeviceName(deviceName);
-        builder.setRpcRequestMsg(rpcRequest);
-        byte[] payloadBytes = builder.build().toByteArray();
-        return Optional.of(createMqttPublishMsg(ctx, MqttTopics.GATEWAY_RPC_TOPIC, payloadBytes));
-    }
-
-    public static byte[] toBytes(ByteBuf inbound) {
-        byte[] bytes = new byte[inbound.readableBytes()];
-        int readerIndex = inbound.readerIndex();
-        inbound.getBytes(readerIndex, bytes);
-        return bytes;
-    }
-
-    private int getRequestId(String topicName, String topic) {
-        return Integer.parseInt(topicName.substring(topic.length()));
-    }
-}

@@ -37,7 +37,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcRequestMs
 import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcResponseMsg;
-import org.thingsboard.server.transport.tcp.session.MqttDeviceAwareSessionContext;
+import org.thingsboard.server.transport.tcp.session.DeviceSessionCtx;
 
 
 import java.util.Optional;
 import java.util.Optional;
 
 
@@ -48,41 +48,41 @@ public interface TcpTransportAdaptor {
 
 
     ByteBufAllocator ALLOCATOR = new UnpooledByteBufAllocator(false);
     ByteBufAllocator ALLOCATOR = new UnpooledByteBufAllocator(false);
 
 
-    PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
+    PostTelemetryMsg convertToPostTelemetry(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException;
 
 
-    PostAttributeMsg convertToPostAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
+    PostAttributeMsg convertToPostAttributes(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException;
 
 
-    GetAttributeRequestMsg convertToGetAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException;
+    GetAttributeRequestMsg convertToGetAttributes(DeviceSessionCtx ctx, MqttPublishMessage inbound, String topicBase) throws AdaptorException;
 
 
-    ToDeviceRpcResponseMsg convertToDeviceRpcResponse(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException;
+    ToDeviceRpcResponseMsg convertToDeviceRpcResponse(DeviceSessionCtx ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException;
 
 
-    ToServerRpcRequestMsg convertToServerRpcRequest(MqttDeviceAwareSessionContext ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException;
+    ToServerRpcRequestMsg convertToServerRpcRequest(DeviceSessionCtx ctx, MqttPublishMessage mqttMsg, String topicBase) throws AdaptorException;
 
 
-    ClaimDeviceMsg convertToClaimDevice(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
+    ClaimDeviceMsg convertToClaimDevice(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, GetAttributeResponseMsg responseMsg, String topicBase) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, GetAttributeResponseMsg responseMsg) throws AdaptorException;
+    Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, GetAttributeResponseMsg responseMsg) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, AttributeUpdateNotificationMsg notificationMsg, String topic) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, AttributeUpdateNotificationMsg notificationMsg, String topic) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException;
+    Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, ToDeviceRpcRequestMsg rpcRequest, String topicBase) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, ToDeviceRpcRequestMsg rpcRequest, String topicBase) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, ToDeviceRpcRequestMsg rpcRequest) throws AdaptorException;
+    Optional<MqttMessage> convertToGatewayPublish(DeviceSessionCtx ctx, String deviceName, ToDeviceRpcRequestMsg rpcRequest) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, ToServerRpcResponseMsg rpcResponse, String topicBase) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, ToServerRpcResponseMsg rpcResponse, String topicBase) throws AdaptorException;
 
 
-    ProvisionDeviceRequestMsg convertToProvisionRequestMsg(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException;
+    ProvisionDeviceRequestMsg convertToProvisionRequestMsg(DeviceSessionCtx ctx, MqttPublishMessage inbound) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, ProvisionDeviceResponseMsg provisionResponse) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, ProvisionDeviceResponseMsg provisionResponse) throws AdaptorException;
 
 
-    Optional<MqttMessage> convertToPublish(MqttDeviceAwareSessionContext ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) throws AdaptorException;
+    Optional<MqttMessage> convertToPublish(DeviceSessionCtx ctx, byte[] firmwareChunk, String requestId, int chunk, OtaPackageType firmwareType) throws AdaptorException;
 
 
-    default MqttPublishMessage createMqttPublishMsg(MqttDeviceAwareSessionContext ctx, String topic, byte[] payloadInBytes) {
-        MqttFixedHeader mqttFixedHeader =
-                new MqttFixedHeader(MqttMessageType.PUBLISH, false, ctx.getQoSForTopic(topic), false, 0);
+    default MqttPublishMessage createMqttPublishMsg(DeviceSessionCtx ctx, String topic, byte[] payloadInBytes) {
+        MqttFixedHeader mqttFixedHeader =null;
+//                new MqttFixedHeader(MqttMessageType.PUBLISH, false, ctx.getQoSForTopic(topic), false, 0);
         MqttPublishVariableHeader header = new MqttPublishVariableHeader(topic, ctx.nextMsgId());
         MqttPublishVariableHeader header = new MqttPublishVariableHeader(topic, ctx.nextMsgId());
         ByteBuf payload = ALLOCATOR.buffer();
         ByteBuf payload = ALLOCATOR.buffer();
         payload.writeBytes(payloadInBytes);
         payload.writeBytes(payloadInBytes);

 /**
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
  * Copyright © 2016-2022 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,34 +15,23 @@
  */
  */
 package org.thingsboard.server.transport.tcp.session;
 package org.thingsboard.server.transport.tcp.session;
 
 
-import com.google.protobuf.Descriptors;
-import com.google.protobuf.DynamicMessage;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.ReferenceCountUtil;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
-import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
+import org.thingsboard.server.common.data.device.profile.TcpDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
+import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
-import org.thingsboard.server.transport.tcp.TopicType;
-import org.thingsboard.server.transport.tcp.adaptors.BackwardCompatibilityAdaptor;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
-import org.thingsboard.server.transport.tcp.util.TcpTopicFilter;
-import org.thingsboard.server.transport.tcp.util.MqttTopicFilterFactory;
+import org.thingsboard.server.transport.tcp.util.ByteUtils;
 
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -52,7 +41,7 @@ import java.util.function.Consumer;
  * @author Andrew Shvayka
  * @author Andrew Shvayka
  */
  */
 @Slf4j
 @Slf4j
-public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
+public class DeviceSessionCtx extends DeviceAwareSessionContext {
 
 
     @Getter
     @Getter
     @Setter
     @Setter
@@ -63,7 +52,7 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
 
 
     private final AtomicInteger msgIdSeq = new AtomicInteger(0);
     private final AtomicInteger msgIdSeq = new AtomicInteger(0);
 
 
-    private final ConcurrentLinkedQueue<MqttMessage> msgQueue = new ConcurrentLinkedQueue<>();
+    private final ConcurrentLinkedQueue<TCPMessage> msgQueue = new ConcurrentLinkedQueue<>();
 
 
     @Getter
     @Getter
     private final Lock msgQueueProcessorLock = new ReentrantLock();
     private final Lock msgQueueProcessorLock = new ReentrantLock();
@@ -74,62 +63,36 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
     @Setter
     @Setter
     private boolean provisionOnly = false;
     private boolean provisionOnly = false;
 
 
-    private volatile TcpTopicFilter telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter();
-    private volatile TcpTopicFilter attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter();
-    private volatile TransportPayloadType payloadType = TransportPayloadType.JSON;
-    private volatile Descriptors.Descriptor attributesDynamicMessageDescriptor;
-    private volatile Descriptors.Descriptor telemetryDynamicMessageDescriptor;
-    private volatile Descriptors.Descriptor rpcResponseDynamicMessageDescriptor;
-    private volatile DynamicMessage.Builder rpcRequestDynamicMessageBuilder;
+    //    private volatile TcpTopicFilter telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter();
+//    private volatile TcpTopicFilter attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter();
+    @Getter
+    private volatile TcpDataTypeEnum payloadType = TcpDataTypeEnum.HEX;
+    @Getter
+    private volatile byte[] pingText ;
+    //    private volatile Descriptors.Descriptor attributesDynamicMessageDescriptor;
+//    private volatile Descriptors.Descriptor telemetryDynamicMessageDescriptor;
+//    private volatile Descriptors.Descriptor rpcResponseDynamicMessageDescriptor;
+//    private volatile DynamicMessage.Builder rpcRequestDynamicMessageBuilder;
     private volatile TcpTransportAdaptor adaptor;
     private volatile TcpTransportAdaptor adaptor;
-    private volatile boolean jsonPayloadFormatCompatibilityEnabled;
-    private volatile boolean useJsonPayloadFormatForDefaultDownlinkTopics;
 
 
-    @Getter
-    @Setter
-    private TransportPayloadType provisionPayloadType = payloadType;
 
 
-    public DeviceSessionCtx(UUID sessionId, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap, TcpTransportContext context) {
-        super(sessionId, mqttQoSMap);
+    public DeviceSessionCtx(UUID sessionId, TcpTransportContext context) {
+        super(sessionId);
         this.context = context;
         this.context = context;
-        this.adaptor = context.getJsonMqttAdaptor();
+        this.adaptor = context.getJsonTcpAdaptor();
     }
     }
 
 
     public int nextMsgId() {
     public int nextMsgId() {
         return msgIdSeq.incrementAndGet();
         return msgIdSeq.incrementAndGet();
     }
     }
 
 
-    public boolean isDeviceTelemetryTopic(String topicName) {
-        return telemetryTopicFilter.filter(topicName);
-    }
-
-    public boolean isDeviceAttributesTopic(String topicName) {
-        return attributesTopicFilter.filter(topicName);
-    }
 
 
     public TcpTransportAdaptor getPayloadAdaptor() {
     public TcpTransportAdaptor getPayloadAdaptor() {
         return adaptor;
         return adaptor;
     }
     }
 
 
-    public boolean isJsonPayloadType() {
-        return payloadType.equals(TransportPayloadType.JSON);
-    }
-
-    public Descriptors.Descriptor getTelemetryDynamicMsgDescriptor() {
-        return telemetryDynamicMessageDescriptor;
-    }
 
 
-    public Descriptors.Descriptor getAttributesDynamicMessageDescriptor() {
-        return attributesDynamicMessageDescriptor;
-    }
 
 
-    public Descriptors.Descriptor getRpcResponseDynamicMessageDescriptor() {
-        return rpcResponseDynamicMessageDescriptor;
-    }
-
-    public DynamicMessage.Builder getRpcRequestDynamicMessageBuilder() {
-        return rpcRequestDynamicMessageBuilder;
-    }
 
 
     @Override
     @Override
     public void setDeviceProfile(DeviceProfile deviceProfile) {
     public void setDeviceProfile(DeviceProfile deviceProfile) {
@@ -145,76 +108,37 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
 
 
     private void updateDeviceSessionConfiguration(DeviceProfile deviceProfile) {
     private void updateDeviceSessionConfiguration(DeviceProfile deviceProfile) {
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
-        if (transportConfiguration.getType().equals(DeviceTransportType.MQTT) &&
-                transportConfiguration instanceof MqttDeviceProfileTransportConfiguration) {
-            MqttDeviceProfileTransportConfiguration mqttConfig = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
-            TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttConfig.getTransportPayloadTypeConfiguration();
-            payloadType = transportPayloadTypeConfiguration.getTransportPayloadType();
-            telemetryTopicFilter = MqttTopicFilterFactory.toFilter(mqttConfig.getDeviceTelemetryTopic());
-            attributesTopicFilter = MqttTopicFilterFactory.toFilter(mqttConfig.getDeviceAttributesTopic());
-            if (TransportPayloadType.PROTOBUF.equals(payloadType)) {
-                ProtoTransportPayloadConfiguration protoTransportPayloadConfig = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
-                updateDynamicMessageDescriptors(protoTransportPayloadConfig);
-                jsonPayloadFormatCompatibilityEnabled = protoTransportPayloadConfig.isEnableCompatibilityWithJsonPayloadFormat();
-                useJsonPayloadFormatForDefaultDownlinkTopics = jsonPayloadFormatCompatibilityEnabled && protoTransportPayloadConfig.isUseJsonPayloadFormatForDefaultDownlinkTopics();
-            }
+
+        TcpDeviceProfileTransportConfiguration tcpConfiguration = (TcpDeviceProfileTransportConfiguration) transportConfiguration;
+        payloadType = tcpConfiguration.getDataFormat();
+        if (TcpDataTypeEnum.ASCII.equals(payloadType)) {
+            payloadType = TcpDataTypeEnum.ASCII;
         } else {
         } else {
-            telemetryTopicFilter = MqttTopicFilterFactory.getDefaultTelemetryFilter();
-            attributesTopicFilter = MqttTopicFilterFactory.getDefaultAttributesFilter();
-            payloadType = TransportPayloadType.JSON;
+            payloadType = TcpDataTypeEnum.HEX;
         }
         }
-        updateAdaptor();
-    }
+        this.pingText = ByteUtils.getBytes(tcpConfiguration.getPingText(),ByteUtils.UTF_8);
 
 
-    private void updateDynamicMessageDescriptors(ProtoTransportPayloadConfiguration protoTransportPayloadConfig) {
-        telemetryDynamicMessageDescriptor = protoTransportPayloadConfig.getTelemetryDynamicMessageDescriptor(protoTransportPayloadConfig.getDeviceTelemetryProtoSchema());
-        attributesDynamicMessageDescriptor = protoTransportPayloadConfig.getAttributesDynamicMessageDescriptor(protoTransportPayloadConfig.getDeviceAttributesProtoSchema());
-        rpcResponseDynamicMessageDescriptor = protoTransportPayloadConfig.getRpcResponseDynamicMessageDescriptor(protoTransportPayloadConfig.getDeviceRpcResponseProtoSchema());
-        rpcRequestDynamicMessageBuilder = protoTransportPayloadConfig.getRpcRequestDynamicMessageBuilder(protoTransportPayloadConfig.getDeviceRpcRequestProtoSchema());
     }
     }
 
 
-    public TcpTransportAdaptor getAdaptor(TopicType topicType) {
-        switch (topicType) {
-            case V2:
-                return getDefaultAdaptor();
-            case V2_JSON:
-                return context.getJsonMqttAdaptor();
-            case V2_PROTO:
-                return context.getProtoMqttAdaptor();
-            default:
-                return useJsonPayloadFormatForDefaultDownlinkTopics ? context.getJsonMqttAdaptor() : getDefaultAdaptor();
-        }
-    }
 
 
-    private TcpTransportAdaptor getDefaultAdaptor() {
-        return isJsonPayloadType() ? context.getJsonMqttAdaptor() : context.getProtoMqttAdaptor();
+    public TcpTransportAdaptor getAdaptor() {
+        return context.getJsonTcpAdaptor();
     }
     }
 
 
-    private void updateAdaptor() {
-        if (isJsonPayloadType()) {
-            adaptor = context.getJsonMqttAdaptor();
-            jsonPayloadFormatCompatibilityEnabled = false;
-            useJsonPayloadFormatForDefaultDownlinkTopics = false;
-        } else {
-            if (jsonPayloadFormatCompatibilityEnabled) {
-                adaptor = new BackwardCompatibilityAdaptor(context.getProtoMqttAdaptor(), context.getJsonMqttAdaptor());
-            } else {
-                adaptor = context.getProtoMqttAdaptor();
-            }
-        }
-    }
 
 
-    public void addToQueue(MqttMessage msg) {
+
+
+    public void addToQueue(TCPMessage msg) {
         msgQueueSize.incrementAndGet();
         msgQueueSize.incrementAndGet();
         ReferenceCountUtil.retain(msg);
         ReferenceCountUtil.retain(msg);
         msgQueue.add(msg);
         msgQueue.add(msg);
     }
     }
 
 
-    public void tryProcessQueuedMsgs(Consumer<MqttMessage> msgProcessor) {
+    public void tryProcessQueuedMsgs(Consumer<TCPMessage> msgProcessor) {
         while (!msgQueue.isEmpty()) {
         while (!msgQueue.isEmpty()) {
             if (msgQueueProcessorLock.tryLock()) {
             if (msgQueueProcessorLock.tryLock()) {
                 try {
                 try {
-                    MqttMessage msg;
+                    TCPMessage msg;
                     while ((msg = msgQueue.poll()) != null) {
                     while ((msg = msgQueue.poll()) != null) {
                         try {
                         try {
                             msgQueueSize.decrementAndGet();
                             msgQueueSize.decrementAndGet();
@@ -244,8 +168,5 @@ public class DeviceSessionCtx extends MqttDeviceAwareSessionContext {
         }
         }
     }
     }
 
 
-    public Collection<MqttMessage> getMsgQueueSnapshot(){
-        return Collections.unmodifiableCollection(msgQueue);
-    }
 
 
 }
 }

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.session;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.rpc.RpcStatus;
-import org.thingsboard.server.common.transport.SessionMsgListener;
-import org.thingsboard.server.common.transport.TransportService;
-import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
-
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * Created by ashvayka on 19.01.17.
- */
-@Slf4j
-public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext implements SessionMsgListener {
-
-    private final GatewaySessionHandler parent;
-    private final TransportService transportService;
-
-    public GatewayDeviceSessionCtx(GatewaySessionHandler parent, TransportDeviceInfo deviceInfo,
-                                   DeviceProfile deviceProfile, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap,
-                                   TransportService transportService) {
-        super(UUID.randomUUID(), mqttQoSMap);
-        this.parent = parent;
-        setSessionInfo(SessionInfoProto.newBuilder()
-                .setNodeId(parent.getNodeId())
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setDeviceIdMSB(deviceInfo.getDeviceId().getId().getMostSignificantBits())
-                .setDeviceIdLSB(deviceInfo.getDeviceId().getId().getLeastSignificantBits())
-                .setTenantIdMSB(deviceInfo.getTenantId().getId().getMostSignificantBits())
-                .setTenantIdLSB(deviceInfo.getTenantId().getId().getLeastSignificantBits())
-                .setCustomerIdMSB(deviceInfo.getCustomerId().getId().getMostSignificantBits())
-                .setCustomerIdLSB(deviceInfo.getCustomerId().getId().getLeastSignificantBits())
-                .setDeviceName(deviceInfo.getDeviceName())
-                .setDeviceType(deviceInfo.getDeviceType())
-                .setGwSessionIdMSB(parent.getSessionId().getMostSignificantBits())
-                .setGwSessionIdLSB(parent.getSessionId().getLeastSignificantBits())
-                .setDeviceProfileIdMSB(deviceInfo.getDeviceProfileId().getId().getMostSignificantBits())
-                .setDeviceProfileIdLSB(deviceInfo.getDeviceProfileId().getId().getLeastSignificantBits())
-                .build());
-        setDeviceInfo(deviceInfo);
-        setConnected(true);
-        setDeviceProfile(deviceProfile);
-        this.transportService = transportService;
-    }
-
-    @Override
-    public UUID getSessionId() {
-        return sessionId;
-    }
-
-    @Override
-    public int nextMsgId() {
-        return parent.nextMsgId();
-    }
-
-    @Override
-    public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg response) {
-        try {
-            parent.getPayloadAdaptor().convertToGatewayPublish(this, getDeviceInfo().getDeviceName(), response).ifPresent(parent::writeAndFlush);
-        } catch (Exception e) {
-            log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
-        }
-    }
-
-    @Override
-    public void onAttributeUpdate(UUID sessionId, TransportProtos.AttributeUpdateNotificationMsg notification) {
-        log.trace("[{}] Received attributes update notification to device", sessionId);
-        try {
-            parent.getPayloadAdaptor().convertToGatewayPublish(this, getDeviceInfo().getDeviceName(), notification).ifPresent(parent::writeAndFlush);
-        } catch (Exception e) {
-            log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
-        }
-    }
-
-    @Override
-    public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg request) {
-        log.trace("[{}] Received RPC command to device", sessionId);
-        try {
-            parent.getPayloadAdaptor().convertToGatewayPublish(this, getDeviceInfo().getDeviceName(), request).ifPresent(
-                    payload -> {
-                        ChannelFuture channelFuture = parent.writeAndFlush(payload);
-                        if (request.getPersisted()) {
-                            channelFuture.addListener(result -> {
-                                if (result.cause() == null) {
-                                    if (!isAckExpected(payload)) {
-                                        transportService.process(getSessionInfo(), request, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
-                                    } else if (request.getPersisted()) {
-                                        transportService.process(getSessionInfo(), request, RpcStatus.SENT, TransportServiceCallback.EMPTY);
-
-                                    }
-                                }
-                            });
-                        }
-                    }
-            );
-        } catch (Exception e) {
-            transportService.process(getSessionInfo(),
-                    TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                            .setRequestId(request.getRequestId()).setError("Failed to convert device RPC command to MQTT msg").build(), TransportServiceCallback.EMPTY);
-            log.trace("[{}] Failed to convert device attributes response to MQTT msg", sessionId, e);
-        }
-    }
-
-    @Override
-    public void onRemoteSessionCloseCommand(UUID sessionId, TransportProtos.SessionCloseNotificationProto sessionCloseNotification) {
-        log.trace("[{}] Received the remote command to close the session: {}", sessionId, sessionCloseNotification.getMessage());
-        parent.deregisterSession(getDeviceInfo().getDeviceName());
-    }
-
-    @Override
-    public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg toServerResponse) {
-        // This feature is not supported in the TB IoT Gateway yet.
-    }
-
-    @Override
-    public void onDeviceDeleted(DeviceId deviceId) {
-        parent.onDeviceDeleted(this.getSessionInfo().getDeviceName());
-    }
-
-    private boolean isAckExpected(MqttMessage message) {
-        return message.fixedHeader().qosLevel().value() > 0;
-    }
-
-}

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.session;
-
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ProtocolStringList;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ConcurrentReferenceHashMap;
-import org.springframework.util.StringUtils;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.transport.TransportService;
-import org.thingsboard.server.common.transport.TransportServiceCallback;
-import org.thingsboard.server.common.transport.adaptor.AdaptorException;
-import org.thingsboard.server.common.transport.adaptor.JsonConverter;
-import org.thingsboard.server.common.transport.adaptor.ProtoConverter;
-import org.thingsboard.server.common.transport.auth.GetOrCreateDeviceFromGatewayResponse;
-import org.thingsboard.server.common.transport.auth.TransportDeviceInfo;
-import org.thingsboard.server.gen.transport.TransportApiProtos;
-import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
-import org.thingsboard.server.transport.tcp.TcpTransportContext;
-import org.thingsboard.server.transport.tcp.TcpTransportHandler;
-import org.thingsboard.server.transport.tcp.adaptors.JsonTcpAdaptor;
-import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
-import org.thingsboard.server.transport.tcp.adaptors.ProtoTcpAdaptor;
-
-import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import static org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_CLOSED;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SESSION_EVENT_MSG_OPEN;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG;
-import static org.thingsboard.server.common.transport.service.DefaultTransportService.SUBSCRIBE_TO_RPC_ASYNC_MSG;
-
-/**
- * Created by ashvayka on 19.01.17.
- */
-@Slf4j
-public class GatewaySessionHandler {
-
-    private static final String DEFAULT_DEVICE_TYPE = "default";
-    private static final String CAN_T_PARSE_VALUE = "Can't parse value: ";
-    private static final String DEVICE_PROPERTY = "device";
-
-    private final TcpTransportContext context;
-    private final TransportService transportService;
-    private final TransportDeviceInfo gateway;
-    private final UUID sessionId;
-    private final ConcurrentMap<String, Lock> deviceCreationLockMap;
-    private final ConcurrentMap<String, GatewayDeviceSessionCtx> devices;
-    private final ConcurrentMap<String, ListenableFuture<GatewayDeviceSessionCtx>> deviceFutures;
-    private final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
-    private final ChannelHandlerContext channel;
-    private final DeviceSessionCtx deviceSessionCtx;
-
-    public GatewaySessionHandler(DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
-        this.context = deviceSessionCtx.getContext();
-        this.transportService = context.getTransportService();
-        this.deviceSessionCtx = deviceSessionCtx;
-        this.gateway = deviceSessionCtx.getDeviceInfo();
-        this.sessionId = sessionId;
-        this.devices = new ConcurrentHashMap<>();
-        this.deviceFutures = new ConcurrentHashMap<>();
-        this.deviceCreationLockMap = createWeakMap();
-        this.mqttQoSMap = deviceSessionCtx.getMqttQoSMap();
-        this.channel = deviceSessionCtx.getChannel();
-    }
-
-    ConcurrentReferenceHashMap<String, Lock> createWeakMap() {
-        return new ConcurrentReferenceHashMap<>(16, ReferenceType.WEAK);
-    }
-
-    public void onDeviceConnect(MqttPublishMessage mqttMsg) throws AdaptorException {
-        if (isJsonPayloadType()) {
-            onDeviceConnectJson(mqttMsg);
-        } else {
-            onDeviceConnectProto(mqttMsg);
-        }
-    }
-
-    public void onDeviceDisconnect(MqttPublishMessage mqttMsg) throws AdaptorException {
-        if (isJsonPayloadType()) {
-            onDeviceDisconnectJson(mqttMsg);
-        } else {
-            onDeviceDisconnectProto(mqttMsg);
-        }
-    }
-
-    public void onDeviceTelemetry(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceTelemetryJson(msgId, payload);
-        } else {
-            onDeviceTelemetryProto(msgId, payload);
-        }
-    }
-
-    public void onDeviceClaim(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceClaimJson(msgId, payload);
-        } else {
-            onDeviceClaimProto(msgId, payload);
-        }
-    }
-
-    public void onDeviceAttributes(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceAttributesJson(msgId, payload);
-        } else {
-            onDeviceAttributesProto(msgId, payload);
-        }
-    }
-
-    public void onDeviceAttributesRequest(MqttPublishMessage mqttMsg) throws AdaptorException {
-        if (isJsonPayloadType()) {
-            onDeviceAttributesRequestJson(mqttMsg);
-        } else {
-            onDeviceAttributesRequestProto(mqttMsg);
-        }
-    }
-
-    public void onDeviceRpcResponse(MqttPublishMessage mqttMsg) throws AdaptorException {
-        int msgId = getMsgId(mqttMsg);
-        ByteBuf payload = mqttMsg.payload();
-        if (isJsonPayloadType()) {
-            onDeviceRpcResponseJson(msgId, payload);
-        } else {
-            onDeviceRpcResponseProto(msgId, payload);
-        }
-    }
-
-    public void onGatewayDisconnect() {
-        devices.forEach(this::deregisterSession);
-    }
-
-    public void onDeviceDeleted(String deviceName) {
-        deregisterSession(deviceName);
-    }
-
-    public String getNodeId() {
-        return context.getNodeId();
-    }
-
-    public UUID getSessionId() {
-        return sessionId;
-    }
-
-    public TcpTransportAdaptor getPayloadAdaptor() {
-        return deviceSessionCtx.getPayloadAdaptor();
-    }
-
-    void deregisterSession(String deviceName) {
-        GatewayDeviceSessionCtx deviceSessionCtx = devices.remove(deviceName);
-        if (deviceSessionCtx != null) {
-            deregisterSession(deviceName, deviceSessionCtx);
-        } else {
-            log.debug("[{}] Device [{}] was already removed from the gateway session", sessionId, deviceName);
-        }
-    }
-
-    ChannelFuture writeAndFlush(MqttMessage mqttMessage) {
-        return channel.writeAndFlush(mqttMessage);
-    }
-
-    int nextMsgId() {
-        return deviceSessionCtx.nextMsgId();
-    }
-
-    private boolean isJsonPayloadType() {
-        return deviceSessionCtx.isJsonPayloadType();
-    }
-
-    private void processOnConnect(MqttPublishMessage msg, String deviceName, String deviceType) {
-        log.trace("[{}] onDeviceConnect: {}", sessionId, deviceName);
-        Futures.addCallback(onDeviceConnect(deviceName, deviceType), new FutureCallback<GatewayDeviceSessionCtx>() {
-            @Override
-            public void onSuccess(@Nullable GatewayDeviceSessionCtx result) {
-                ack(msg);
-                log.trace("[{}] onDeviceConnectOk: {}", sessionId, deviceName);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, t);
-
-            }
-        }, context.getExecutor());
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> onDeviceConnect(String deviceName, String deviceType) {
-        GatewayDeviceSessionCtx result = devices.get(deviceName);
-        if (result == null) {
-            Lock deviceCreationLock = deviceCreationLockMap.computeIfAbsent(deviceName, s -> new ReentrantLock());
-            deviceCreationLock.lock();
-            try {
-                result = devices.get(deviceName);
-                if (result == null) {
-                    return getDeviceCreationFuture(deviceName, deviceType);
-                } else {
-                    return Futures.immediateFuture(result);
-                }
-            } finally {
-                deviceCreationLock.unlock();
-            }
-        } else {
-            return Futures.immediateFuture(result);
-        }
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> getDeviceCreationFuture(String deviceName, String deviceType) {
-        final SettableFuture<GatewayDeviceSessionCtx> futureToSet = SettableFuture.create();
-        ListenableFuture<GatewayDeviceSessionCtx> future = deviceFutures.putIfAbsent(deviceName, futureToSet);
-        if (future != null) {
-            return future;
-        }
-            try {
-                transportService.process(GetOrCreateDeviceFromGatewayRequestMsg.newBuilder()
-                                .setDeviceName(deviceName)
-                                .setDeviceType(deviceType)
-                                .setGatewayIdMSB(gateway.getDeviceId().getId().getMostSignificantBits())
-                                .setGatewayIdLSB(gateway.getDeviceId().getId().getLeastSignificantBits()).build(),
-                        new TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse>() {
-                            @Override
-                            public void onSuccess(GetOrCreateDeviceFromGatewayResponse msg) {
-                                GatewayDeviceSessionCtx deviceSessionCtx = new GatewayDeviceSessionCtx(GatewaySessionHandler.this, msg.getDeviceInfo(), msg.getDeviceProfile(), mqttQoSMap, transportService);
-                                if (devices.putIfAbsent(deviceName, deviceSessionCtx) == null) {
-                                    log.trace("[{}] First got or created device [{}], type [{}] for the gateway session", sessionId, deviceName, deviceType);
-                                    SessionInfoProto deviceSessionInfo = deviceSessionCtx.getSessionInfo();
-                                    transportService.registerAsyncSession(deviceSessionInfo, deviceSessionCtx);
-                                    transportService.process(TransportProtos.TransportToDeviceActorMsg.newBuilder()
-                                            .setSessionInfo(deviceSessionInfo)
-                                            .setSessionEvent(SESSION_EVENT_MSG_OPEN)
-                                            .setSubscribeToAttributes(SUBSCRIBE_TO_ATTRIBUTE_UPDATES_ASYNC_MSG)
-                                            .setSubscribeToRPC(SUBSCRIBE_TO_RPC_ASYNC_MSG)
-                                            .build(), null);
-                                }
-                                futureToSet.set(devices.get(deviceName));
-                                deviceFutures.remove(deviceName);
-                            }
-
-                            @Override
-                            public void onError(Throwable e) {
-                                log.warn("[{}] Failed to process device connect command: {}", sessionId, deviceName, e);
-                                futureToSet.setException(e);
-                                deviceFutures.remove(deviceName);
-                            }
-                        });
-                return futureToSet;
-            } catch (Throwable e) {
-                deviceFutures.remove(deviceName);
-                throw e;
-            }
-    }
-
-    private int getMsgId(MqttPublishMessage mqttMsg) {
-        return mqttMsg.variableHeader().packetId();
-    }
-
-    private void onDeviceConnectJson(MqttPublishMessage mqttMsg) throws AdaptorException {
-        JsonElement json = getJson(mqttMsg);
-        String deviceName = checkDeviceName(getDeviceName(json));
-        String deviceType = getDeviceType(json);
-        processOnConnect(mqttMsg, deviceName, deviceType);
-    }
-
-    private void onDeviceConnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.ConnectMsg connectProto = TransportApiProtos.ConnectMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(connectProto.getDeviceName());
-            String deviceType = StringUtils.isEmpty(connectProto.getDeviceType()) ? DEFAULT_DEVICE_TYPE : connectProto.getDeviceType();
-            processOnConnect(mqttMsg, deviceName, deviceType);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void onDeviceDisconnectJson(MqttPublishMessage msg) throws AdaptorException {
-        String deviceName = checkDeviceName(getDeviceName(getJson(msg)));
-        processOnDisconnect(msg, deviceName);
-    }
-
-    private void onDeviceDisconnectProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.DisconnectMsg connectProto = TransportApiProtos.DisconnectMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(connectProto.getDeviceName());
-            processOnDisconnect(mqttMsg, deviceName);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processOnDisconnect(MqttPublishMessage msg, String deviceName) {
-        deregisterSession(deviceName);
-        ack(msg);
-    }
-
-    private void onDeviceTelemetryJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonTcpAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonArray()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                try {
-                                    TransportProtos.PostTelemetryMsg postTelemetryMsg = JsonConverter.convertToTelemetryProto(deviceEntry.getValue().getAsJsonArray());
-                                    processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
-                                } catch (Throwable e) {
-                                    log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
-                                    channel.close();
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceTelemetryProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayTelemetryMsg telemetryMsgProto = TransportApiProtos.GatewayTelemetryMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.TelemetryMsg> deviceMsgList = telemetryMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(deviceMsgList)) {
-                deviceMsgList.forEach(telemetryMsg -> {
-                    String deviceName = checkDeviceName(telemetryMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportProtos.PostTelemetryMsg msg = telemetryMsg.getMsg();
-                                    try {
-                                        TransportProtos.PostTelemetryMsg postTelemetryMsg = ProtoConverter.validatePostTelemetryMsg(msg.toByteArray());
-                                        processPostTelemetryMsg(deviceCtx, postTelemetryMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to convert telemetry: {}", gateway.getDeviceId(), deviceName, msg, e);
-                                        channel.close();
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device telemetry command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices telemetry messages is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices telemetry messages is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processPostTelemetryMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.PostTelemetryMsg postTelemetryMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), postTelemetryMsg, getPubAckCallback(channel, deviceName, msgId, postTelemetryMsg));
-    }
-
-    private void onDeviceClaimJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonTcpAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<GatewayDeviceSessionCtx>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonObject()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                try {
-                                    DeviceId deviceId = deviceCtx.getDeviceId();
-                                    TransportProtos.ClaimDeviceMsg claimDeviceMsg = JsonConverter.convertToClaimDeviceProto(deviceId, deviceEntry.getValue());
-                                    processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
-                                } catch (Throwable e) {
-                                    log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, deviceEntry.getValue(), e);
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceClaimProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayClaimMsg claimMsgProto = TransportApiProtos.GatewayClaimMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.ClaimDeviceMsg> claimMsgList = claimMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(claimMsgList)) {
-                claimMsgList.forEach(claimDeviceMsg -> {
-                    String deviceName = checkDeviceName(claimDeviceMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportApiProtos.ClaimDevice claimRequest = claimDeviceMsg.getClaimRequest();
-                                    if (claimRequest == null) {
-                                        throw new IllegalArgumentException("Claim request for device: " + deviceName + " is null!");
-                                    }
-                                    try {
-                                        DeviceId deviceId = deviceCtx.getDeviceId();
-                                        TransportProtos.ClaimDeviceMsg claimDeviceMsg = ProtoConverter.convertToClaimDeviceProto(deviceId, claimRequest.toByteArray());
-                                        processClaimDeviceMsg(deviceCtx, claimDeviceMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to convert claim message: {}", gateway.getDeviceId(), deviceName, claimRequest, e);
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device claiming command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices claim messages is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices claim messages is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processClaimDeviceMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.ClaimDeviceMsg claimDeviceMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), claimDeviceMsg, getPubAckCallback(channel, deviceName, msgId, claimDeviceMsg));
-    }
-
-    private void onDeviceAttributesJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonTcpAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            for (Map.Entry<String, JsonElement> deviceEntry : jsonObj.entrySet()) {
-                String deviceName = deviceEntry.getKey();
-                Futures.addCallback(checkDeviceConnected(deviceName),
-                        new FutureCallback<GatewayDeviceSessionCtx>() {
-                            @Override
-                            public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                if (!deviceEntry.getValue().isJsonObject()) {
-                                    throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-                                }
-                                TransportProtos.PostAttributeMsg postAttributeMsg = JsonConverter.convertToAttributesProto(deviceEntry.getValue().getAsJsonObject());
-                                processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
-                            }
-                        }, context.getExecutor());
-            }
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceAttributesProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayAttributesMsg attributesMsgProto = TransportApiProtos.GatewayAttributesMsg.parseFrom(getBytes(payload));
-            List<TransportApiProtos.AttributesMsg> attributesMsgList = attributesMsgProto.getMsgList();
-            if (!CollectionUtils.isEmpty(attributesMsgList)) {
-                attributesMsgList.forEach(attributesMsg -> {
-                    String deviceName = checkDeviceName(attributesMsg.getDeviceName());
-                    Futures.addCallback(checkDeviceConnected(deviceName),
-                            new FutureCallback<GatewayDeviceSessionCtx>() {
-                                @Override
-                                public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                                    TransportProtos.PostAttributeMsg kvListProto = attributesMsg.getMsg();
-                                    if (kvListProto == null) {
-                                        throw new IllegalArgumentException("Attributes List for device: " + deviceName + " is empty!");
-                                    }
-                                    try {
-                                        TransportProtos.PostAttributeMsg postAttributeMsg = ProtoConverter.validatePostAttributeMsg(kvListProto.toByteArray());
-                                        processPostAttributesMsg(deviceCtx, postAttributeMsg, deviceName, msgId);
-                                    } catch (Throwable e) {
-                                        log.warn("[{}][{}] Failed to process device attributes command: {}", gateway.getDeviceId(), deviceName, kvListProto, e);
-                                    }
-                                }
-
-                                @Override
-                                public void onFailure(Throwable t) {
-                                    log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
-                                }
-                            }, context.getExecutor());
-                });
-            } else {
-                log.debug("[{}] Devices attributes keys list is empty for: [{}]", sessionId, gateway.getDeviceId());
-                throw new IllegalArgumentException("[" + sessionId + "] Devices attributes keys list is empty for [" + gateway.getDeviceId() + "]");
-            }
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processPostAttributesMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.PostAttributeMsg postAttributeMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), postAttributeMsg, getPubAckCallback(channel, deviceName, msgId, postAttributeMsg));
-    }
-
-    private void onDeviceAttributesRequestJson(MqttPublishMessage msg) throws AdaptorException {
-        JsonElement json = JsonTcpAdaptor.validateJsonPayload(sessionId, msg.payload());
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            int requestId = jsonObj.get("id").getAsInt();
-            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
-            boolean clientScope = jsonObj.get("client").getAsBoolean();
-            Set<String> keys;
-            if (jsonObj.has("key")) {
-                keys = Collections.singleton(jsonObj.get("key").getAsString());
-            } else {
-                JsonArray keysArray = jsonObj.get("keys").getAsJsonArray();
-                keys = new HashSet<>();
-                for (JsonElement keyObj : keysArray) {
-                    keys.add(keyObj.getAsString());
-                }
-            }
-            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
-            processGetAttributeRequestMessage(msg, deviceName, requestMsg);
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceAttributesRequestProto(MqttPublishMessage mqttMsg) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayAttributesRequestMsg gatewayAttributesRequestMsg = TransportApiProtos.GatewayAttributesRequestMsg.parseFrom(getBytes(mqttMsg.payload()));
-            String deviceName = checkDeviceName(gatewayAttributesRequestMsg.getDeviceName());
-            int requestId = gatewayAttributesRequestMsg.getId();
-            boolean clientScope = gatewayAttributesRequestMsg.getClient();
-            ProtocolStringList keysList = gatewayAttributesRequestMsg.getKeysList();
-            Set<String> keys = new HashSet<>(keysList);
-            TransportProtos.GetAttributeRequestMsg requestMsg = toGetAttributeRequestMsg(requestId, clientScope, keys);
-            processGetAttributeRequestMessage(mqttMsg, deviceName, requestMsg);
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void onDeviceRpcResponseJson(int msgId, ByteBuf payload) throws AdaptorException {
-        JsonElement json = JsonTcpAdaptor.validateJsonPayload(sessionId, payload);
-        if (json.isJsonObject()) {
-            JsonObject jsonObj = json.getAsJsonObject();
-            String deviceName = jsonObj.get(DEVICE_PROPERTY).getAsString();
-            Futures.addCallback(checkDeviceConnected(deviceName),
-                    new FutureCallback<GatewayDeviceSessionCtx>() {
-                        @Override
-                        public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                            Integer requestId = jsonObj.get("id").getAsInt();
-                            String data = jsonObj.get("data").toString();
-                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                                    .setRequestId(requestId).setPayload(data).build();
-                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t) {
-                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
-                        }
-                    }, context.getExecutor());
-        } else {
-            throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
-        }
-    }
-
-    private void onDeviceRpcResponseProto(int msgId, ByteBuf payload) throws AdaptorException {
-        try {
-            TransportApiProtos.GatewayRpcResponseMsg gatewayRpcResponseMsg = TransportApiProtos.GatewayRpcResponseMsg.parseFrom(getBytes(payload));
-            String deviceName = checkDeviceName(gatewayRpcResponseMsg.getDeviceName());
-            Futures.addCallback(checkDeviceConnected(deviceName),
-                    new FutureCallback<GatewayDeviceSessionCtx>() {
-                        @Override
-                        public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                            Integer requestId = gatewayRpcResponseMsg.getId();
-                            String data = gatewayRpcResponseMsg.getData();
-                            TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg = TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
-                                    .setRequestId(requestId).setPayload(data).build();
-                            processRpcResponseMsg(deviceCtx, rpcResponseMsg, deviceName, msgId);
-                        }
-
-                        @Override
-                        public void onFailure(Throwable t) {
-                            log.debug("[{}] Failed to process device Rpc response command: {}", sessionId, deviceName, t);
-                        }
-                    }, context.getExecutor());
-        } catch (RuntimeException | InvalidProtocolBufferException e) {
-            throw new AdaptorException(e);
-        }
-    }
-
-    private void processRpcResponseMsg(GatewayDeviceSessionCtx deviceCtx, TransportProtos.ToDeviceRpcResponseMsg rpcResponseMsg, String deviceName, int msgId) {
-        transportService.process(deviceCtx.getSessionInfo(), rpcResponseMsg, getPubAckCallback(channel, deviceName, msgId, rpcResponseMsg));
-    }
-
-    private void processGetAttributeRequestMessage(MqttPublishMessage mqttMsg, String deviceName, TransportProtos.GetAttributeRequestMsg requestMsg) {
-        int msgId = getMsgId(mqttMsg);
-        Futures.addCallback(checkDeviceConnected(deviceName),
-                new FutureCallback<GatewayDeviceSessionCtx>() {
-                    @Override
-                    public void onSuccess(@Nullable GatewayDeviceSessionCtx deviceCtx) {
-                        transportService.process(deviceCtx.getSessionInfo(), requestMsg, getPubAckCallback(channel, deviceName, msgId, requestMsg));
-                    }
-
-                    @Override
-                    public void onFailure(Throwable t) {
-                        ack(mqttMsg);
-                        log.debug("[{}] Failed to process device attributes request command: {}", sessionId, deviceName, t);
-                    }
-                }, context.getExecutor());
-    }
-
-    private TransportProtos.GetAttributeRequestMsg toGetAttributeRequestMsg(int requestId, boolean clientScope, Set<String> keys) {
-        TransportProtos.GetAttributeRequestMsg.Builder result = TransportProtos.GetAttributeRequestMsg.newBuilder();
-        result.setRequestId(requestId);
-
-        if (clientScope) {
-            result.addAllClientAttributeNames(keys);
-        } else {
-            result.addAllSharedAttributeNames(keys);
-        }
-        return result.build();
-    }
-
-    private ListenableFuture<GatewayDeviceSessionCtx> checkDeviceConnected(String deviceName) {
-        GatewayDeviceSessionCtx ctx = devices.get(deviceName);
-        if (ctx == null) {
-            log.debug("[{}] Missing device [{}] for the gateway session", sessionId, deviceName);
-            return onDeviceConnect(deviceName, DEFAULT_DEVICE_TYPE);
-        } else {
-            return Futures.immediateFuture(ctx);
-        }
-    }
-
-    private String checkDeviceName(String deviceName) {
-        if (StringUtils.isEmpty(deviceName)) {
-            throw new RuntimeException("Device name is empty!");
-        } else {
-            return deviceName;
-        }
-    }
-
-    private String getDeviceName(JsonElement json) {
-        return json.getAsJsonObject().get(DEVICE_PROPERTY).getAsString();
-    }
-
-    private String getDeviceType(JsonElement json) {
-        JsonElement type = json.getAsJsonObject().get("type");
-        return type == null || type instanceof JsonNull ? DEFAULT_DEVICE_TYPE : type.getAsString();
-    }
-
-    private JsonElement getJson(MqttPublishMessage mqttMsg) throws AdaptorException {
-        return JsonTcpAdaptor.validateJsonPayload(sessionId, mqttMsg.payload());
-    }
-
-    private byte[] getBytes(ByteBuf payload) {
-        return ProtoTcpAdaptor.toBytes(payload);
-    }
-
-    private void ack(MqttPublishMessage msg) {
-        int msgId = getMsgId(msg);
-        if (msgId > 0) {
-            writeAndFlush(TcpTransportHandler.createMqttPubAckMsg(msgId));
-        }
-    }
-
-    private void deregisterSession(String deviceName, GatewayDeviceSessionCtx deviceSessionCtx) {
-        transportService.deregisterSession(deviceSessionCtx.getSessionInfo());
-        transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_CLOSED, null);
-        log.debug("[{}] Removed device [{}] from the gateway session", sessionId, deviceName);
-    }
-
-    private <T> TransportServiceCallback<Void> getPubAckCallback(final ChannelHandlerContext ctx, final String deviceName, final int msgId, final T msg) {
-        return new TransportServiceCallback<Void>() {
-            @Override
-            public void onSuccess(Void dummy) {
-                log.trace("[{}][{}] Published msg: {}", sessionId, deviceName, msg);
-                if (msgId > 0) {
-                    ctx.writeAndFlush(TcpTransportHandler.createMqttPubAckMsg(msgId));
-                }
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                log.trace("[{}] Failed to publish msg: {} for device: {}", sessionId, msg, deviceName, e);
-                ctx.close();
-            }
-        };
-    }
-}

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.session;
-
-import io.netty.handler.codec.mqtt.MqttQoS;
-import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
-
-/**
- * Created by ashvayka on 30.08.18.
- */
-public abstract class MqttDeviceAwareSessionContext extends DeviceAwareSessionContext {
-
-    private final ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap;
-
-    public MqttDeviceAwareSessionContext(UUID sessionId, ConcurrentMap<MqttTopicMatcher, Integer> mqttQoSMap) {
-        super(sessionId);
-        this.mqttQoSMap = mqttQoSMap;
-    }
-
-    public ConcurrentMap<MqttTopicMatcher, Integer> getMqttQoSMap() {
-        return mqttQoSMap;
-    }
-
-    public MqttQoS getQoSForTopic(String topic) {
-        List<Integer> qosList = mqttQoSMap.entrySet()
-                .stream()
-                .filter(entry -> entry.getKey().matches(topic))
-                .map(Map.Entry::getValue)
-                .collect(Collectors.toList());
-        if (!qosList.isEmpty()) {
-            return MqttQoS.valueOf(qosList.get(0));
-        } else {
-            return MqttQoS.AT_LEAST_ONCE;
-        }
-    }
-}

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.tcp.session;
-
-import java.util.regex.Pattern;
-
-public class MqttTopicMatcher {
-
-    private final String topic;
-    private final Pattern topicRegex;
-
-    public MqttTopicMatcher(String topic) {
-        if(topic == null){
-            throw new NullPointerException("topic");
-        }
-        this.topic = topic;
-        this.topicRegex = Pattern.compile(topic.replace("+", "[^/]+").replace("#", ".+") + "$");
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public boolean matches(String topic){
-        return this.topicRegex.matcher(topic).matches();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        MqttTopicMatcher that = (MqttTopicMatcher) o;
-
-        return topic.equals(that.topic);
-    }
-
-    @Override
-    public int hashCode() {
-        return topic.hashCode();
-    }
-}

+package org.thingsboard.server.transport.tcp.session;
+
+import io.netty.handler.codec.mqtt.MqttMessageType;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Data
+public class TCPMessage implements Serializable {
+    private String requestId;
+    private MqttMessageType messageType;
+
+    private byte[] message;
+    private boolean hex;
+
+    private String deviceId;
+
+    /**
+     *  TCP 消息
+     * @param sn 设备sn
+     * @param message 消息体
+     * @param hex 是否是16进制
+     */
+    public TCPMessage(MqttMessageType messageType, String deviceId, byte[] message, boolean hex){
+        this.messageType = messageType;
+        this.deviceId = deviceId;
+        this.message = message;
+        this.hex = hex;
+    }
+
+    public TCPMessage(MqttMessageType messageType,  byte[] message){
+        this.messageType = messageType;
+        this.message = message;
+    }
+}

+package org.thingsboard.server.transport.tcp.util;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.commons.lang3.ArrayUtils;
+
+import java.io.*;
+import java.nio.charset.Charset;
+
+/**
+ * @Description :数据类型转换工具类
+ * 二进制的最高位是符号位，0表示正，1表示负。
+ * 负数采用二进制的补码表示，10进制转为二进制得到的是源码，将源码按位取反得到的是反码，反码加1得到补码
+ *
+ *
+ * *￥￥￥【基本数据类型】￥￥￥￥￥￥￥￥￥￥￥￥
+        1/8：boolean【1 位】
+        3/8：byte   【1个字节，8 位】
+        3/8：short  【2个字节，16位】
+        4/8：int    【4个字节，32位】
+        5/8：long   【8个字节，64位】
+        6/8：float  【4个字节，32位】
+        7/8：double 【8个字节，64位】
+        8/8：chart  【2个字节，16位】
+ *
+ *
+ *
+ * *￥￥￥【位运算】￥￥￥￥￥￥￥￥￥￥￥￥
+    左移【<< n】：向左移动，左边高位舍弃，右边的低位补0，例如：2左移3位，结果为16
+    右移【>>n】：向右移动，右边的舍弃掉，左边补的值取决于原来最高位，原来是1就补1，原来是0就补0
+    无符号右移【>>>n】向右移动，右边的舍弃掉，左边补0。
+ *
+ *
+ *
+ * 1.其它地方抛出异常，交由控制层统一处理
+ * 2.服务层注意持久化的事务管理
+ * @Author: junlianglee
+ * @Date Created in 2019/12/11.
+ * @Modified by Administrator on 2019/12/11.
+ */
+public class ByteUtils {
+    public static final char[] ascii = "0123456789ABCDEF".toCharArray();
+    private static char[] HEX_VOCABLE = {'0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+    public static final String UTF_8 = "UTF-8";
+    /**
+     * 将short整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(short data) {
+        byte[] bytes = new byte[2];
+        bytes[0] = (byte) ((data & 0xff00) >> 8);//1个十六进制位匹配4个二进制位
+        bytes[1] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将字符转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(char data) {
+        byte[] bytes = new byte[2];
+        bytes[0] = (byte) (data >> 8);
+        bytes[1] = (byte) (data);
+        return bytes;
+    }
+
+    /**
+     * 将布尔值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(boolean data) {
+        byte[] bytes = new byte[1];
+        bytes[0] = (byte) (data ? 1 : 0);
+        return bytes;
+    }
+
+    /**
+     * 将整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(int data) {
+        byte[] bytes = new byte[4];
+        bytes[0] = (byte) ((data & 0xff000000) >> 24);
+        bytes[1] = (byte) ((data & 0xff0000) >> 16);
+        bytes[2] = (byte) ((data & 0xff00) >> 8);
+        bytes[3] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将long整型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(long data) {
+        byte[] bytes = new byte[8];
+        bytes[0] = (byte) ((data >> 56) & 0xff);
+        bytes[1] = (byte) ((data >> 48) & 0xff);
+        bytes[2] = (byte) ((data >> 40) & 0xff);
+        bytes[3] = (byte) ((data >> 32) & 0xff);
+        bytes[4] = (byte) ((data >> 24) & 0xff);
+        bytes[5] = (byte) ((data >> 16) & 0xff);
+        bytes[6] = (byte) ((data >> 8) & 0xff);
+        bytes[7] = (byte) (data & 0xff);
+        return bytes;
+    }
+
+    /**
+     * 将float型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(float data) {
+        int intBits = Float.floatToIntBits(data);
+        return getBytes(intBits);
+    }
+
+    /**
+     * 将double型数值转换为字节数组
+     *
+     * @param data
+     * @return
+     */
+    public static byte[] getBytes(double data) {
+        long intBits = Double.doubleToLongBits(data);
+        return getBytes(intBits);
+    }
+
+    /**
+     * 将字符串按照charsetName编码格式的字节数组
+     *
+     * @param data
+     *            字符串
+     * @param charsetName
+     *            编码格式
+     * @return
+     */
+    public static byte[] getBytes(String data, String charsetName) {
+        Charset charset = Charset.forName(charsetName);
+        return data.getBytes(charset);
+    }
+
+
+
+
+
+    /**
+     * 将字节数组前8字节转换为long整型数值
+     *
+     * @param bytes
+     * @return
+     */
+    public static long getLong(byte[] bytes) {
+        return (0xff00000000000000L & ((long) bytes[0] << 56)
+                | (0xff000000000000L & ((long) bytes[1] << 48))
+                | (0xff0000000000L & ((long) bytes[2] << 40))
+                | (0xff00000000L & ((long) bytes[3] << 32))
+                | (0xff000000L & ((long) bytes[4] << 24))
+                | (0xff0000L & ((long) bytes[5] << 16))
+                | (0xff00L & ((long) bytes[6] << 8))
+                | (0xffL & (long) bytes[7]));
+    }
+
+
+
+    /**
+     * 将charsetName编码格式的字节数组转换为字符串
+     *
+     * @param bytes
+     * @param charsetName
+     * @return
+     */
+    public static String getString(byte[] bytes, String charsetName) {
+        return new String(bytes, Charset.forName(charsetName));
+    }
+
+
+    public static byte[] hexStr2Bytes(String hexString) {
+        if (hexString == null || hexString.equals("")) {
+            return null;
+        }
+        // toUpperCase将字符串中的所有字符转换为大写
+        hexString = hexString.toUpperCase();
+        int length = hexString.length() / 2;// 2个16进制字符表示一个字节，所以字节数组长度是字符串长度除以2
+        // toCharArray将此字符串转换为一个新的字符数组。
+        char[] hexChars = hexString.toCharArray();
+        byte[] d = new byte[length];
+        for (int i = 0; i < length; i++) {
+            int pos = i * 2;
+            d[i] = (byte) (charToByte(hexChars[pos]) << 4
+                    | charToByte(hexChars[pos + 1]));
+        }
+        return d;
+    }
+
+    // charToByte返回在指定字符的第一个发生的字符串中的索引，即返回匹配字符
+    private static byte charToByte(char c) {
+        return (byte) "0123456789ABCDEF".indexOf(c);
+    }
+    /**
+     * 将16进制字符串转换为字节数组
+     *
+     * @param hex
+     * @return
+     */
+    public static byte[] hexToBytes(String hex) {
+        if (hex.length() % 2 != 0)
+            throw new IllegalArgumentException(
+                    "input string should be any multiple of 2!");
+        hex.toUpperCase();
+
+        byte[] byteBuffer = new byte[hex.length() / 2];
+
+        byte padding = 0x00;
+        boolean paddingTurning = false;
+        for (int i = 0; i < hex.length(); i++) {
+            if (paddingTurning) {
+                char c = hex.charAt(i);
+                int index = indexOf(hex, c);
+                padding = (byte) ((padding << 4) | index);
+                byteBuffer[i / 2] = padding;
+                padding = 0x00;
+                paddingTurning = false;
+            } else {
+                char c = hex.charAt(i);
+                int index = indexOf(hex, c);
+                padding = (byte) (padding | index);
+                paddingTurning = true;
+            }
+
+        }
+        return byteBuffer;
+    }
+
+    private static int indexOf(String input, char c) {
+        int index = ArrayUtils.indexOf(HEX_VOCABLE, c);
+
+        if (index < 0) {
+            throw new IllegalArgumentException("err input:" + input);
+        }
+        return index;
+
+    }
+    /**
+     * 字节数组转16进制字符串
+     *
+     * @param bs
+     * @return
+     */
+    public static String bytesToHex(byte[] bs) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bs) {
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 字节数组取前len个字节转16进制字符串
+     *
+     * @param bs
+     * @param len
+     * @return
+     */
+    public static String bytesToHex(byte[] bs, int len) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            byte b = bs[i];
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+    /**
+     * 字节数组偏移offset长度之后的取len个字节转16进制字符串
+     *
+     * @param bs
+     * @param offset
+     * @param len
+     * @return
+     */
+    public static String bytesToHex(byte[] bs, int offset, int len) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            byte b = bs[offset + i];
+            int high = (b >> 4) & 0x0f;
+            int low = b & 0x0f;
+            sb.append(HEX_VOCABLE[high]);
+            sb.append(HEX_VOCABLE[low]);
+        }
+        return sb.toString();
+    }
+    /**
+     * 字节数组转16进制字符串
+     *
+     * @param bs
+     * @return
+     */
+    public static String byteToHex(byte bs) {
+        StringBuilder sb = new StringBuilder();
+        int high = (bs >> 4) & 0x0f;
+        int low = bs & 0x0f;
+        sb.append(HEX_VOCABLE[high]);
+        sb.append(HEX_VOCABLE[low]);
+        return sb.toString();
+    }
+    /**
+     * 将字节数组取反
+     *
+     * @param src
+     * @return
+     */
+    public static String negate(byte[] src) {
+        if (src == null || src.length == 0) {
+            return null;
+        }
+        byte[] temp = new byte[2 * src.length];
+        for (int i = 0; i < src.length; i++) {
+            byte tmp = (byte) (0xFF ^ src[i]);
+            temp[i * 2] = (byte) ((tmp >> 4) & 0x0f);
+            temp[i * 2 + 1] = (byte) (tmp & 0x0f);
+        }
+        StringBuffer res = new StringBuffer();
+        for (int i = 0; i < temp.length; i++) {
+            res.append(ascii[temp[i]]);
+        }
+        return res.toString();
+    }
+
+
+
+    /**
+     * 数组合并
+     * @param before
+     * @param end
+     * @return
+     */
+    public static  byte[] merge(byte[]before,byte[]end){
+        byte[] result= new byte[before.length+end.length];
+        System.arraycopy(before,0,result,0,before.length);
+        System.arraycopy(end,0,result,before.length,end.length);
+        return result;
+    }
+
+    public static  byte[] subBytes(byte[]before,Integer start,Integer length){
+        byte[] result= new byte[length];
+        System.arraycopy(before,start,result,0,length);
+        return result;
+    }
+
+    /**
+     * 比较字节数组是否相同
+     *
+     * @param a
+     * @param b
+     * @return
+     */
+    public static boolean compareBytes(byte[] a, byte[] b) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length != b.length) {
+            return false;
+        }
+        if (a.length == b.length) {
+            for (int i = 0; i < a.length; i++) {
+                if (a[i] != b[i]) {
+                    return false;
+                }
+            }
+        } else {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * 只比对指定长度byte
+     *
+     * @param a
+     * @param b
+     * @param len
+     * @return
+     */
+    public static boolean compareBytes(byte[] a, byte[] b, int len) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length < len || b.length < len) {
+            return false;
+        }
+        for (int i = 0; i < len; i++) {
+            if (a[i] != b[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 将字节数组转换为二进制字符串
+     *
+     * @param items
+     * @return
+     */
+    public static String bytesToBinaryString(byte[] items) {
+        if (items == null || items.length == 0) {
+            return null;
+        }
+        StringBuffer buf = new StringBuffer();
+        for (byte item : items) {
+            buf.append(byteToBinaryString(item));
+        }
+        return buf.toString();
+    }
+
+    /**
+     * 将字节转换为二进制字符串
+     *
+     * @param item
+     * @return
+     */
+    public static String byteToBinaryString(byte item) {
+        byte a = item;
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < 8; i++) {
+            buf.insert(0, a % 2);
+            a = (byte) (a >> 1);
+        }
+        return buf.toString();
+    }
+
+    /**
+     * 对数组a，b进行异或运算
+     *
+     * @param a
+     * @param b
+     * @return
+     */
+    public static byte[] xor(byte[] a, byte[] b) {
+        if (a == null || a.length == 0 || b == null || b.length == 0
+                || a.length != b.length) {
+            return null;
+        }
+        byte[] result = new byte[a.length];
+        for (int i = 0; i < a.length; i++) {
+            result[i] = (byte) (a[i] ^ b[i]);
+        }
+        return result;
+    }
+
+    /**
+     * 对数组a，b进行异或运算 运算长度len
+     *
+     * @param a
+     * @param b
+     * @param len
+     * @return
+     */
+    public static byte[] xor(byte[] a, byte[] b, int len) {
+        if (a == null || a.length == 0 || b == null || b.length == 0) {
+            return null;
+        }
+        if (a.length < len || b.length < len) {
+            return null;
+        }
+        byte[] result = new byte[len];
+        for (int i = 0; i < len; i++) {
+            result[i] = (byte) (a[i] ^ b[i]);
+        }
+        return result;
+    }
+    /**
+     * 将short整型数值转换为字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] shortToBytes(int num) {
+        byte[] temp = new byte[2];
+        for (int i = 0; i < 2; i++) {
+            temp[i] = (byte) ((num >>> (8 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转为整型
+     *
+     * @param arr
+     * @return
+     */
+    public static int bytesToShort(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        for (int i = 0; i < 2; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将整型数值转换为指定长度的字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] intToBytes(int num) {
+        byte[] temp = new byte[4];
+        for (int i = 0; i < 4; i++) {
+            temp[i] = (byte) ((num >>> (24 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将整型数值转换为指定长度的字节数组
+     *
+     * @param src
+     * @param len
+     * @return
+     */
+    public static byte[] intToBytes(int src, int len) {
+        if (len < 1 || len > 4) {
+            return null;
+        }
+        byte[] temp = new byte[len];
+        for (int i = 0; i < len; i++) {
+            temp[len - 1 - i] = (byte) ((src >>> (8 * i)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转换为整型数值
+     *
+     * @param arr
+     * @return
+     */
+    public static int bytesToInt(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        for (int i = 0; i < 4; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将long整型数值转换为字节数组
+     *
+     * @param num
+     * @return
+     */
+    public static byte[] longToBytes(long num) {
+        byte[] temp = new byte[8];
+        for (int i = 0; i < 8; i++) {
+            temp[i] = (byte) ((num >>> (56 - i * 8)) & 0xFF);
+        }
+        return temp;
+    }
+
+    /**
+     * 将字节数组转换为long整型数值
+     *
+     * @param arr
+     * @return
+     */
+    public static long bytesToLong(byte[] arr) {
+        int mask = 0xFF;
+        int temp = 0;
+        long result = 0;
+        int len = Math.min(8, arr.length);
+        for (int i = 0; i < len; i++) {
+            result <<= 8;
+            temp = arr[i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * 将16进制字符转换为字节
+     *
+     * @param c
+     * @return
+     */
+    public static byte toByte(char c) {
+        byte b = (byte) "0123456789ABCDEF".indexOf(c);
+        return b;
+    }
+
+    /**
+     * 功能描述：把两个字节的字节数组转化为整型数据，高位补零，例如：<br/>
+     * 有字节数组byte[] data = new byte[]{1,2};转换后int数据的字节分布如下：<br/>
+     * 00000000 00000000 00000001 00000010,函数返回258
+     *
+     * @param lenData
+     *            需要进行转换的字节数组
+     * @return 字节数组所表示整型值的大小
+     */
+    public static int bytesToIntWhereByteLengthEquals2(byte lenData[]) {
+        if (lenData.length != 2) {
+            return -1;
+        }
+        byte fill[] = new byte[]{0, 0};
+        byte real[] = new byte[4];
+        System.arraycopy(fill, 0, real, 0, 2);
+        System.arraycopy(lenData, 0, real, 2, 2);
+        int len = byteToInt(real);
+        return len;
+
+    }
+
+    /**
+     * 功能描述：将byte数组转化为int类型的数据
+     *
+     * @param byteVal
+     *            需要转化的字节数组
+     * @return 字节数组所表示的整型数据
+     */
+    public static int byteToInt(byte[] byteVal) {
+        int result = 0;
+        for (int i = 0; i < byteVal.length; i++) {
+            int tmpVal = (byteVal[i] << (8 * (3 - i)));
+            switch (i) {
+                case 0 :
+                    tmpVal = tmpVal & 0xFF000000;
+                    break;
+                case 1 :
+                    tmpVal = tmpVal & 0x00FF0000;
+                    break;
+                case 2 :
+                    tmpVal = tmpVal & 0x0000FF00;
+                    break;
+                case 3 :
+                    tmpVal = tmpVal & 0x000000FF;
+                    break;
+            }
+
+            result = result | tmpVal;
+        }
+        return result;
+    }
+    public static byte CheckXORSum(byte[] bData) {
+        byte sum = 0x00;
+        for (int i = 0; i < bData.length; i++) {
+            sum ^= bData[i];
+        }
+        return sum;
+    }
+    /**
+     * 从offset开始 将后续长度为len的byte字节转为int
+     *
+     * @param data
+     * @param offset
+     * @param len
+     * @return
+     */
+    public static int bytesToInt(byte[] data, int offset, int len) {
+        int mask = 0xFF;
+        int temp = 0;
+        int result = 0;
+        len = Math.min(len, 4);
+        for (int i = 0; i < len; i++) {
+            result <<= 8;
+            temp = data[offset + i] & mask;
+            result |= temp;
+        }
+        return result;
+    }
+
+    /**
+     * byte字节数组中的字符串的长度
+     *
+     * @param data
+     * @return
+     */
+    public static int getBytesStringLen(byte[] data) {
+        int count = 0;
+        for (byte b : data) {
+            if (b == 0x00)
+                break;
+            count++;
+        }
+        return count;
+    }
+
+    /**
+     * 校验和
+     *
+     * @param msg
+     *            需要计算校验和的byte数组
+     * @param length
+     *            校验和位数
+     * @return 计算出的校验和数组
+     */
+    public static byte[] SumCheck(byte[] msg, int length) {
+        long mSum = 0;
+        byte[] mByte = new byte[length];
+
+        /** 逐Byte添加位数和 */
+        for (byte byteMsg : msg) {
+            long mNum = ((long) byteMsg >= 0)
+                    ? (long) byteMsg
+                    : ((long) byteMsg + 256);
+            mSum += mNum;
+        } /** end of for (byte byteMsg : msg) */
+
+        /** 位数和转化为Byte数组 */
+        for (int liv_Count = 0; liv_Count < length; liv_Count++) {
+            mByte[length - liv_Count
+                    - 1] = (byte) (mSum >> (liv_Count * 8) & 0xff);
+        } /** end of for (int liv_Count = 0; liv_Count < length; liv_Count++) */
+
+        return mByte;
+    }
+
+    /**
+     * 字节数据转十进制字符(补码-无符号)
+     *
+     * @param data
+     * @return
+     */
+    public static String getByteToStr(byte[] data) {
+        StringBuffer str = new StringBuffer();
+        for (int i = 0; i < data.length; i++) {
+            if (data[i] < 0) {
+                int tem = data[i] + 256;
+                str.append(tem + " ");
+            } else {
+                str.append(data[i] + " ");
+            }
+        }
+        return str.toString();
+    }
+
+    public static byte[]  buf2Bytes(ByteBuf in) {
+        return buf2Bytes( in, in.readableBytes()) ;
+    }
+    public static byte[]  buf2Bytes(ByteBuf in,int readable) {
+        byte[] dst = new byte[readable];
+        in.getBytes(0, dst);
+        return dst;
+    }
+
+    public static byte[] fileBytes(String pathname) throws IOException {
+        File filename = new File(pathname);
+        BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
+        ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+        byte[] temp = new byte[1024];
+        int size = 0;
+        while((size = in.read(temp)) != -1){
+            out.write(temp, 0, size);
+        }
+        in.close();
+        out.close();
+        byte[] content = out.toByteArray();
+        return content;
+    }
+    /**
+     * 单字节高低位互换
+     * @param src
+     * @return
+     */
+    public static int revert(int src) {
+        int lowByte = (src & 0xFF00) >> 8;
+        int highByte = (src & 0x00FF) << 8;
+        return lowByte | highByte;
+    }
+}

@@ -28,9 +28,9 @@ server:
 # Zookeeper connection parameters. Used for service discovery.
 # Zookeeper connection parameters. Used for service discovery.
 zk:
 zk:
   # Enable/disable zookeeper discovery service.
   # Enable/disable zookeeper discovery service.
-  enabled: "${ZOOKEEPER_ENABLED:false}"
+  enabled: "${ZOOKEEPER_ENABLED:true}"
   # Zookeeper connect string
   # Zookeeper connect string
-  url: "${ZOOKEEPER_URL:localhost:2181}"
+  url: "${ZOOKEEPER_URL:47.99.141.212:2181}"
   # Zookeeper retry interval in milliseconds
   # Zookeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
   # Zookeeper connection timeout in milliseconds
   # Zookeeper connection timeout in milliseconds
@@ -68,7 +68,7 @@ redis:
   # db index
   # db index
   db: "${REDIS_DB:0}"
   db: "${REDIS_DB:0}"
   # db password
   # db password
-  password: "${REDIS_PASSWORD:}"
+  password: "${REDIS_PASSWORD:redis@6379}"
   # pool config
   # pool config
   pool_config:
   pool_config:
     maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
     maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
@@ -163,7 +163,7 @@ transport:
 queue:
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
   kafka:
   kafka:
-    bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
+    bootstrap.servers: "${TB_KAFKA_SERVERS:47.99.141.212:9092}"
     acks: "${TB_KAFKA_ACKS:all}"
     acks: "${TB_KAFKA_ACKS:all}"
     retries: "${TB_KAFKA_RETRIES:1}"
     retries: "${TB_KAFKA_RETRIES:1}"
     batch.size: "${TB_KAFKA_BATCH_SIZE:16384}"
     batch.size: "${TB_KAFKA_BATCH_SIZE:16384}"