优化session处理

This reverts commit ab7b20871a.

.gitignore

@@ -56,3 +56,6 @@ broker/media
 common/target
 server/target
 sdk/target
+moments/target
+monitor
+wildfire_jmeter

README.md

@@ -2,17 +2,18 @@
 
 野火IM是一套跨平台、核心功能开源的即时通讯解决方案，主要包含以下内容。
 
-| 仓库                                                         | 说明                                                    | 备注                                           |
-| ------------------------------------------------------------ | ------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |                                                |
-| [proto](https://github.com/wildfirechat/proto)               | 野火IM的协议栈实现                                      |                                                |
-| [server](https://github.com/wildfirechat/server)             | IM server                                               |                                                |
-| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                              |                                                |
-| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                            |                                                |
-| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |                                                |
-| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |                                                |
+| 仓库                                                         | 说明                                                    | 备注 |
+| ------------------------------------------------------------ | ------------------------------------------------------- | ---- |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                       |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                            |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |      |
+| [web-chat](https://github.com/wildfirechat/web-chat)          | Web平台的Demo, [体验地址](http://web.wildfirechat.cn)   |      |
+| [wx-chat](https://github.com/wildfirechat/wx-chat)           | 微信小程序平台的Demo   |      |
+| [server](https://github.com/wildfirechat/server)             | IM server                                               |      |
+| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                          |      |
+| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                        |      |
+| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |      |
+| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |      | |                                            |
 
 # server
 本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.cn)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)
@@ -28,13 +29,10 @@
 2. imndx  邮箱: imndx@wildfirechat.cn  微信：wfchat
 
 ### 问题交流
-1. 微信交流群（请先加我们好友，我们再邀请您进群）
 
-  ![微信二维码](http://static.wildfirechat.cn/wx_qr_wildfirechat.jpeg)   ![微信二维码](http://static.wildfirechat.cn/wx_qr_wfc.jpeg)
-  
-2. 如果大家发现bug，请在GitHub提issue
-3. 其他问题，请到[野火IM论坛](http://bbs.wildfirechat.cn/)进行交流学习
-4. 微信公众号
+1. 如果大家发现bug，请在GitHub提issue
+2. 其他问题，请到[野火IM论坛](http://bbs.wildfirechat.cn/)进行交流学习
+3. 微信公众号
 
 <img src="http://static.wildfirechat.cn/wx_wfc_qrcode.jpg" width = 50% height = 50% />
 
@@ -45,6 +43,11 @@
 
 ![野火IM](http://static.wildfirechat.cn/download_qrcode.png)
 
+#### 加入野火官方体验交流群
+使用野火IM移动客户端扫码下面二维码（不是使用微信扫码），和野火IM的爱好者一起畅谈野火IM的问题和经验：
+
+![野火IM官方交流群](http://static.wildfirechat.cn/wildfirechat_official_group.jpeg)
+
 #### 应用截图
 ![ios-demo](http://static.wildfirechat.cn/ios-demo.gif)
 

broker/config/hazelcast.xml

@@ -1,3 +1,7 @@
+
+<!--    # 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下-->
+
+
 <hazelcast
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.hazelcast.com/schema/config

broker/config/wildfirechat.conf

@@ -1,8 +1,17 @@
+#
+#
+# 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下
+#
+#
+
+
+
 #*********************************************************************
 # Server configuration
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
-#客户端会从${http_port}端口获取到长链接端口。
+#客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
+# （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
 ##原生客户端长链接端口
@@ -34,6 +43,7 @@ http.admin.secret_key 123456
 
 ##服务器API接口参数是否检查时间。当设置为false时，所有的请求会检查时间的有效性；当设置为true时，可以在http.admin.secret_key保持不变的情况下，使用固定的服务API签名
 ##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
+##这个地方上线前要改为false
 http.admin.no_check_time true
 
 ##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
@@ -48,6 +58,9 @@ message.roaming 0
 ##是否开启拉取远程历史消息
 message.remote_history_message 0
 
+##服务器为每个用户缓存的消息数量。这个值改得太大，拉取消息时间变长，另外会占用大量内存。
+message.max_queue 1024
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -92,6 +105,9 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # 本地媒体服务器配置。
 local.media.storage.root media
 
+# 是否支持多端登陆
+server.multi_endpoint false
+
 #*********************************************************************
 # Push server configuration
 #*********************************************************************

broker/migrate/h2/V15__alter_voip_token_length.sql

@@ -0,0 +1,3 @@
+alter table `t_user_session` modify column `_voip_token` varchar(240) DEFAULT '';
+
+

broker/migrate/h2/V16__add_friend_blocked.sql

@@ -0,0 +1,2 @@
+alter table t_friend add column `_blacked` tinyint DEFAULT 0;
+update t_friend set `_blacked` = 1 where `_state` = 2;

broker/migrate/h2/V17__add_user_session_token_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_token_index` ( `_token` );

broker/migrate/h2/V18__add_friend_request_index.sql

@@ -0,0 +1 @@
+alter table t_friend_request add index `friend_request_uid_index` (`_friend_uid`);

broker/migrate/h2/V19__add_user_session_uid_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_uid_index` ( `_uid` );

broker/migrate/h2/V20__user_session_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user_session` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/h2/V21__user_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/mysql/V20__alter_voip_token_length.sql

@@ -0,0 +1,3 @@
+alter table `t_user_session` modify column `_voip_token` varchar(240) DEFAULT '';
+
+

broker/migrate/mysql/V21__add_friend_blocked.sql

@@ -0,0 +1,2 @@
+alter table t_friend add column `_blacked` tinyint DEFAULT 0 COMMENT "0, normal; 1, blacked";
+update t_friend set `_blacked` = 1 where `_state` = 2;

broker/migrate/mysql/V22__add_user_session_token_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_token_index` ( `_token` );

broker/migrate/mysql/V23__add_friend_request_index.sql

@@ -0,0 +1 @@
+alter table t_friend_request add index `friend_request_uid_index` (`_friend_uid`);

broker/migrate/mysql/V24__add_user_session_uid_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_uid_index` ( `_uid` );

broker/migrate/mysql/V25__user_session_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user_session` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/mysql/V26__user_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.27</version>
+        <version>0.36</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -31,12 +31,6 @@
             <version>1.7.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.wildfirechat</groupId>
-            <artifactId>client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.wildfirechat</groupId>
             <artifactId>common</artifactId>
@@ -167,7 +161,7 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.0.2</version>
+            <version>1.2.1</version>
         </dependency>
 
         <dependency>

broker/src/main/java/cn/wildfirechat/push/PushServer.java

@@ -57,7 +57,7 @@ public class PushServer {
     }
 
     public void pushMessage(PushMessage pushMessage, String deviceId, String pushContent) {
-        LOG.info("try to delivery push diviceId = {}, pushContent", deviceId, pushContent);
+        LOG.info("try to delivery push diviceId = {}, pushContent = {}", deviceId, pushContent);
         executorService.execute(() ->{
                 try {
                     pushMessageInternel(pushMessage, deviceId, pushContent);

broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java

@@ -82,7 +82,7 @@ public class RouteAction extends Action {
 
             MemorySessionStore.Session session = sessionsStore.sessionForClientAndUser(uid, cid);
             if (session == null) {
-                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true, true);
+                ErrorCode errorCode = sessionsStore.loadActiveSession(uid, cid);
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     sendResponse(response, errorCode, null, base64Response);
                     return true;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestroyUserAction.java

@@ -0,0 +1,97 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputDestroyUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.UUIDGenerator;
+
+import java.util.Base64;
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Destroy_User)
+@HttpMethod("POST")
+public class DestroyUserAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputDestroyUser inputDestroyUser = getRequestBody(request.getNettyRequest(), InputDestroyUser.class);
+            if (inputDestroyUser != null
+                && !StringUtil.isNullOrEmpty(inputDestroyUser.getUserId())) {
+
+                WFCMessage.IDBuf idBuf = WFCMessage.IDBuf.newBuilder().setId(inputDestroyUser.getUserId()).build();
+                RPCCenter.getInstance().sendRequest(inputDestroyUser.getUserId(), null, IMTopic.DestroyUserTopic, idBuf.toByteArray(), inputDestroyUser.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
+                        if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
+                            //ba errorcode qudiao
+                            byte[] data = new byte[result.length -1];
+                            for (int i = 0; i < data.length; i++) {
+                                data[i] = result[i+1];
+                            }
+                            String token = Base64.getEncoder().encodeToString(data);
+
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode1, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java

@@ -36,7 +36,7 @@ public class FriendRelationGetAction extends AdminAction {
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
-            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), 0);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
             List<String> list = new ArrayList<>();
             for (FriendData data : dataList) {
                 if (data.getState() == inputGetFriendList.getStatus()) {

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java

@@ -41,7 +41,7 @@ public class GetIMTokenAction extends AdminAction {
             String userId = input.getUserId();
 
 
-            WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).build();
+            WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).setPlatform(input.getPlatform() == null ? 0 : input.getPlatform()).build();
             RPCCenter.getInstance().sendRequest(userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), userId, TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                 @Override
                 public void onSuccess(byte[] result) {

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.java

@@ -0,0 +1,63 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputGroupIds;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+@Route(APIPath.Get_User_Groups)
+@HttpMethod("POST")
+public class GetUserGroupsAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()))) {
+
+                Set<String> groupIds = messagesStore.getUserGroupIds(inputUserId.getUserId());
+                response.setStatus(HttpResponseStatus.OK);
+                OutputGroupIds outputGroupIds = new OutputGroupIds();
+                outputGroupIds.setGroupIds(new ArrayList<>(groupIds));
+                RestResult result = RestResult.ok(outputGroupIds);
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SetGroupManagerAction.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputAddGroupMember;
+import cn.wildfirechat.pojos.InputSetGroupManager;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Set_Manager)
+@HttpMethod("POST")
+public class SetGroupManagerAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputSetGroupManager inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputSetGroupManager.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.SetGroupManagerTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/model/FriendData.java

@@ -15,14 +15,16 @@ public class FriendData implements Serializable {
     private String friendUid;
     private String alias;
     private int state;
+    private int blacked;
     private long timestamp;
 
 
-    public FriendData(String userId, String friendUid, String alias, int state, long timestamp) {
+    public FriendData(String userId, String friendUid, String alias, int state, int blacked, long timestamp) {
         this.userId = userId;
         this.friendUid = friendUid;
         this.alias = alias;
         this.state = state;
+        this.blacked = blacked;
         this.timestamp = timestamp;
     }
 
@@ -61,6 +63,14 @@ public class FriendData implements Serializable {
         this.state = state;
     }
 
+    public int getBlacked() {
+        return blacked;
+    }
+
+    public void setBlacked(int blacked) {
+        this.blacked = blacked;
+    }
+
     public long getTimestamp() {
         return timestamp;
     }

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -106,12 +106,17 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_Forward_Url = "message.forward.url";
 
+    public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
+
     public static final String MONGODB_Client_URI = "mongodb.client_uri";
     public static final String MONGODB_Database = "mongodb.database";
     public static final String MONGODB_Data_Expire_Days = "mongodb.data_expire_days";
 
     public static final String MESSAGE_ROAMING = "message.roaming";
-    public static final String MESSAGE_Remote_History_Message = "message.reomte_history_message";
+    public static final String MESSAGE_Remote_History_Message = "message.remote_history_message";
+
+    public static final String MESSAGE_Max_Queue = "message.max_queue";
+
 
 
     private BrokerConstants() {

broker/src/main/java/io/moquette/imhandler/DestroyUserHandler.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.persistence.MemorySessionStore;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.moquette.spi.impl.security.TokenAuthenticator;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+@Handler(IMTopic.DestroyUserTopic)
+public class DestroyUserHandler extends IMHandler<WFCMessage.IDBuf> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+        if (isAdmin) {
+            mServer.getImBusinessScheduler().execute(()-> {
+                m_sessionsStore.clearUserSession(fromUser);
+                m_messagesStore.clearUserMessages(fromUser);
+                m_messagesStore.clearUserSettings(fromUser);
+                m_messagesStore.clearUserFriend(fromUser);
+                m_messagesStore.clearUserGroups(fromUser);
+                m_messagesStore.clearUserChannels(fromUser);
+                m_messagesStore.destoryUser(fromUser);
+            });
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        } else {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+    }
+}

broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java

@@ -22,11 +22,11 @@ import java.util.List;
 public class FriendPullHandler extends IMHandler<WFCMessage.Version> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
-        List<FriendData> friendDatas = m_messagesStore.getFriendList(fromUser, request.getVersion());
+        List<FriendData> friendDatas = m_messagesStore.getFriendList(fromUser, clientID, request.getVersion());
         WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder();
         for (FriendData data : friendDatas
             ) {
-            WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp());
+            WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setBlacked(data.getBlacked()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp());
             if (!StringUtil.isNullOrEmpty(data.getAlias())) {
                 builder1.setAlias(data.getAlias());
             }

broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java

@@ -20,7 +20,7 @@ import win.liyufan.im.IMTopic;
 public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) {
-        MemorySessionStore.Session session = m_sessionsStore.createUserSession(fromUser, clientID);
+        MemorySessionStore.Session session = m_sessionsStore.updateOrCreateUserSession(fromUser, clientID, request.getPlatform());
         TokenAuthenticator authenticator = new TokenAuthenticator();
         String strToken = authenticator.generateToken(fromUser);
         String result = strToken + "|" + session.getSecret() + "|" + session.getDbSecret();

broker/src/main/java/io/moquette/imhandler/IMHandler.java

@@ -83,11 +83,10 @@ abstract public class IMHandler<T> {
                 }
             }
 
-
             for (Method method : getClass().getDeclaredMethods()
                  ) {
 
-                if (method.getName() == actionName && method.getParameterCount() == 6) {
+                if (method.getName() == actionName && method.getParameterCount() == 6 && !method.getParameterTypes()[4].equals(Object.class)) {
                     dataCls = method.getParameterTypes()[4];
                     break;
                 }
@@ -240,7 +239,7 @@ abstract public class IMHandler<T> {
 
         WFCMessage.Message.Builder messageBuilder = message.toBuilder();
         int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
-        this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType);
+        mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
         return notifyReceivers.size();
     }
 
@@ -250,7 +249,7 @@ abstract public class IMHandler<T> {
         message = m_messagesStore.storeMessage(username, clientID, message);
         WFCMessage.Message.Builder messageBuilder = message.toBuilder();
         int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
-        this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType);
+        mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
         return notifyReceivers.size();
     }
 

broker/src/main/java/io/moquette/imhandler/RouteHandler.java

@@ -32,7 +32,7 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
         ClientSession clientSession = m_sessionsStore.sessionForClient(clientID);
         boolean isSessionAlreadyStored = clientSession != null;
         if (!isSessionAlreadyStored) {
-            m_sessionsStore.createNewSession(fromUser, clientID, true, true);
+            m_sessionsStore.loadActiveSession(fromUser, clientID);
         } else {
             m_sessionsStore.updateExistSession(fromUser, clientID, request, true);
         }

broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java

@@ -26,12 +26,12 @@ public class UploadDeviceTokenHandler extends IMHandler<WFCMessage.UploadDeviceT
             session.setAppName(request.getAppName());
             if (request.getPlatform() == ProtoConstants.Platform.Platform_iOS && request.getPushType() == 2) {
                 session.setVoipDeviceToken(request.getDeviceToken());
-//                session.setPushType(0);//如果有voip token，肯定是生产环境的推送
                 m_sessionsStore.updateSessionToken(session, true);
             } else {
                 session.setDeviceToken(request.getDeviceToken());
                 session.setPushType(request.getPushType());
                 m_sessionsStore.updateSessionToken(session, false);
+                m_sessionsStore.cleanDuplatedToken(session.getClientID(), session.getPushType(), session.getDeviceToken(), false);
             }
 
             return ErrorCode.ERROR_CODE_SUCCESS;

broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class UserSearchHandler extends IMHandler<WFCMessage.SearchUserRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) {
-        List<WFCMessage.User> users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy() > 0, request.getPage());
+        List<WFCMessage.User> users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy(), request.getPage());
         WFCMessage.SearchUserResult.Builder builder = WFCMessage.SearchUserResult.newBuilder();
         builder.addAllEntry(users);
         byte[] data = builder.build().toByteArray();

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -16,10 +16,10 @@ import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.MultiMap;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
+import io.moquette.server.Server;
 import io.moquette.spi.ClientSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.misc.BASE64Encoder;
 import win.liyufan.im.DBUtil;
 import win.liyufan.im.MessageBundle;
 import win.liyufan.im.MessageShardingUtil;
@@ -31,9 +31,11 @@ import java.sql.*;
 import java.util.*;
 import java.util.function.Function;
 
+
 import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
 import static io.moquette.persistence.MemoryMessagesStore.USER_STATUS;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
+import static cn.wildfirechat.proto.ProtoConstants.SearchUserType.*;
 
 public class DatabaseStore {
     private static final Logger LOG = LoggerFactory.getLogger(DatabaseStore.class);
@@ -57,8 +59,6 @@ public class DatabaseStore {
 
             statement.setString(1, userId);
 
-            statement.executeQuery();
-
             rs = statement.executeQuery();
             while (rs.next()) {
                 int index = 1;
@@ -149,8 +149,12 @@ public class DatabaseStore {
         }
         return null;
     }
-
-    List<WFCMessage.User> searchUserFromDB(String keyword, boolean buzzy, int page) {
+    //searchType
+    // 0 模糊匹配displayName, 精确匹配账户名和电话号码
+    // 1 精确匹配账户名和电话号码
+    // 2 精确匹配账户名
+    // 3 精确匹配电话号码
+    List<WFCMessage.User> searchUserFromDB(String keyword, int searchType, int page) {
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet rs = null;
@@ -170,16 +174,31 @@ public class DatabaseStore {
                 ", `_social`" +
                 ", `_extra`" +
                 ", `_dt` from t_user";
-            if (buzzy) {
-                sql += " where (`_display_name` like ? or `_name` = ? or `_mobile` = ?) ";
-            } else {
-                sql += " where (`_display_name` = ? or `_name` = ? or `_mobile` = ?) ";
+            switch (searchType) {
+                case SearchUserType_Name_Mobile:
+                    sql += " where (`_name` = ? or `_mobile` = ?) ";
+                    break;
+                case SearchUserType_Name:
+                    sql += " where `_name` = ? ";
+                    break;
+                case SearchUserType_Mobile:
+                    sql += " where `_mobile` = ? ";
+                    break;
+                case SearchUserType_General:
+                default:
+                    sql += " where (`_display_name` like ? or `_name` = ? or `_mobile` = ?) ";
+                    break;
             }
 
+
             sql += " and _type <> 2"; //can search normal user(0) and robot(1), can not search things
 
-            sql += " limit 20";
-
+            if (searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name || searchType == SearchUserType_Mobile) {
+                sql += " limit 1";
+            } else {
+                sql += " limit 20";
+            }
+            
             if (page > 0) {
                 sql += "offset = '" + page * 20 + "'";
             }
@@ -187,13 +206,24 @@ public class DatabaseStore {
 
             statement = connection.prepareStatement(sql);
             int index = 1;
-            if (buzzy) {
-                statement.setString(index++, "%" + keyword + "%");
-            } else {
-                statement.setString(index++, keyword);
+
+            switch (searchType) {
+                case SearchUserType_Name_Mobile:
+                    statement.setString(index++, keyword);
+                    statement.setString(index++, keyword);
+                    break;
+                case SearchUserType_Name:
+                case SearchUserType_Mobile:
+                    statement.setString(index++, keyword);
+                    break;
+                case SearchUserType_General:
+                default:
+                    statement.setString(index++, "%" + keyword + "%");
+                    statement.setString(index++, keyword);
+                    statement.setString(index++, keyword);
+                    break;
             }
-            statement.setString(index++, keyword);
-            statement.setString(index++, keyword);
+
 
             rs = statement.executeQuery();
             while (rs.next()) {
@@ -350,7 +380,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_uid`, `_friend_uid`, `_alias`, `_state`, `_dt` from t_friend";
+            String sql = "select `_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt` from t_friend";
             statement = connection.prepareStatement(sql);
 
             int index;
@@ -375,6 +405,9 @@ public class DatabaseStore {
                 int intvalue = rs.getInt(index++);
                 builder.setState(intvalue);
 
+                intvalue = rs.getInt(index++);
+                builder.setBlacked(intvalue);
+
                 long longvalue = rs.getLong(index++);
                 builder.setTimestamp(longvalue);
 
@@ -635,11 +668,12 @@ public class DatabaseStore {
         String sql = "select  `_from`, `_type`, `_target`, `_line`, `_data`, `_dt` from " + MessageShardingUtil.getMessageTable(messageId) +" where _mid = ? limit 1";
         Connection connection = null;
         PreparedStatement statement = null;
+        ResultSet resultSet = null;
         try {
             connection = DBUtil.getConnection();
             statement = connection.prepareStatement(sql);
             statement.setLong(1, messageId);
-            ResultSet resultSet = statement.executeQuery();
+            resultSet = statement.executeQuery();
             if (resultSet.next()) {
                 WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder();
                 builder.setMessageId(messageId);
@@ -658,12 +692,11 @@ public class DatabaseStore {
                 WFCMessage.Message message = builder.build();
                 return new MessageBundle(messageId, message.getFromUser(), null, message);
             }
-            resultSet.close();
         } catch (SQLException | IOException e) {
             e.printStackTrace();
             Utility.printExecption(LOG, e);
         } finally {
-            DBUtil.closeDB(connection, statement);
+            DBUtil.closeDB(connection, statement, resultSet);
         }
         return null;
     }
@@ -783,6 +816,40 @@ public class DatabaseStore {
         });
     }
 
+    void clearUserMessage(final String userId) {
+        mScheduler.execute(()->{
+            String tableName = getUserMessageTable(userId);
+            Connection connection = null;
+            PreparedStatement statement = null;
+            try {
+                connection = DBUtil.getConnection();
+
+                String sql = "delete from " + tableName + " where _uid = ?";
+                statement = connection.prepareStatement(sql);
+                statement.setString(1, userId);
+                int count = statement.executeUpdate();
+                LOG.info("Update rows {}", count);
+
+                try {
+                    if (statement!=null) {
+                        statement.close();
+                    }
+                    statement = null;
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    Utility.printExecption(LOG, e);
+                }
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+
+    }
+
     void removeFavGroup(final String groupId, final List<String> memberIds) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -858,6 +925,31 @@ public class DatabaseStore {
         });
     }
 
+    void clearUserSetting(final String userId) {
+        mScheduler.execute(()->{
+            Connection connection = null;
+            PreparedStatement statement = null;
+            try {
+                connection = DBUtil.getConnection();
+
+                String sql = "delete from t_user_setting where `_uid` = ?";
+
+                statement = connection.prepareStatement(sql);
+                int index = 1;
+                statement.setString(index++, userId);
+
+                int count = statement.executeUpdate();
+                LOG.info("Update rows {}", count);
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+    }
+
     List<WFCMessage.UserSettingEntry> getPersistUserSetting(final String userId) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -947,90 +1039,154 @@ public class DatabaseStore {
     }
 
     void persistGroupInfo(final WFCMessage.GroupInfo groupInfo) {
-        mScheduler.execute(()->{
-            Connection connection = null;
-            PreparedStatement statement = null;
-            try {
-                connection = DBUtil.getConnection();
-                String sql = "insert into t_group (`_gid`" +
-                    ", `_name`" +
-                    ", `_portrait`" +
-                    ", `_owner`" +
-                    ", `_type`" +
-                    ", `_extra`" +
-                    ", `_dt`" +
-                    ", `_member_count`" +
-                    ", `_mute`" +
-                    ", `_join_type`" +
-                    ", `_private_chat`" +
-                    ", `_searchable`" +
-                    ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
-                    " ON DUPLICATE KEY UPDATE " +
-                    "`_name` = ?," +
-                    "`_portrait` = ?," +
-                    "`_owner` = ?," +
-                    "`_type` = ?," +
-                    "`_extra` = ?," +
-                    "`_dt` = ?," +
-                    "`_member_count` = ?," +
-                    "`_mute` = ?" +
-                    ", `_join_type` = ?" +
-                    ", `_private_chat` = ?" +
-                    ", `_searchable` = ?, " +
-                    "`_member_dt` = ?";
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "insert into t_group (`_gid`" +
+                ", `_name`" +
+                ", `_portrait`" +
+                ", `_owner`" +
+                ", `_type`" +
+                ", `_extra`" +
+                ", `_dt`" +
+                ", `_member_count`" +
+                ", `_mute`" +
+                ", `_join_type`" +
+                ", `_private_chat`" +
+                ", `_searchable`" +
+                ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
+                " ON DUPLICATE KEY UPDATE " +
+                "`_name` = ?," +
+                "`_portrait` = ?," +
+                "`_owner` = ?," +
+                "`_type` = ?," +
+                "`_extra` = ?," +
+                "`_dt` = ?," +
+                "`_member_count` = ?," +
+                "`_mute` = ?" +
+                ", `_join_type` = ?" +
+                ", `_private_chat` = ?" +
+                ", `_searchable` = ?, " +
+                "`_member_dt` = ?";
 
 
-                statement = connection.prepareStatement(sql);
+            statement = connection.prepareStatement(sql);
 
+            int index = 1;
+            statement.setString(index++, groupInfo.getTargetId());
+            statement.setString(index++, groupInfo.getName());
+            statement.setString(index++, groupInfo.getPortrait());
+            statement.setString(index++, groupInfo.getOwner());
+            statement.setInt(index++, groupInfo.getType());
+            statement.setString(index++, groupInfo.getExtra());
+            statement.setLong(index++, groupInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
+            statement.setInt(index++, groupInfo.getMemberCount());
+            statement.setInt(index++, groupInfo.getMute());
+            statement.setInt(index++, groupInfo.getJoinType());
+            statement.setInt(index++, groupInfo.getPrivateChat());
+            statement.setInt(index++, groupInfo.getSearchable());
+            statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
+
+            statement.setString(index++, groupInfo.getName());
+            statement.setString(index++, groupInfo.getPortrait());
+            statement.setString(index++, groupInfo.getOwner());
+            statement.setInt(index++, groupInfo.getType());
+            statement.setString(index++, groupInfo.getExtra());
+            statement.setLong(index++, groupInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
+            statement.setInt(index++, groupInfo.getMemberCount());
+            statement.setInt(index++, groupInfo.getMute());
+            statement.setInt(index++, groupInfo.getJoinType());
+            statement.setInt(index++, groupInfo.getPrivateChat());
+            statement.setInt(index++, groupInfo.getSearchable());
+            statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
+    List<MemorySessionStore.Session> getUserActivedSessions(String uid) {
+        String sql = "select  `_cid`, `_package_name`,`_token`,`_voip_token`,`_secret`,`_db_secret`,`_platform`,`_push_type`,`_device_name`,`_device_version`,`_phone_name`,`_language`,`_carrier_name`, `_dt` from t_user_session where `_uid` = ? and `_deleted` = 0";
+        Connection connection = null;
+        PreparedStatement statement = null;
+        List<MemorySessionStore.Session> result = new ArrayList<>();
+        ResultSet resultSet = null;
+        try {
+            connection = DBUtil.getConnection();
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, uid);
+
+            resultSet = statement.executeQuery();
+            while (resultSet.next()) {
                 int index = 1;
-                statement.setString(index++, groupInfo.getTargetId());
-                statement.setString(index++, groupInfo.getName());
-                statement.setString(index++, groupInfo.getPortrait());
-                statement.setString(index++, groupInfo.getOwner());
-                statement.setInt(index++, groupInfo.getType());
-                statement.setString(index++, groupInfo.getExtra());
-                statement.setLong(index++, groupInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
-                statement.setInt(index++, groupInfo.getMemberCount());
-                statement.setInt(index++, groupInfo.getMute());
-                statement.setInt(index++, groupInfo.getJoinType());
-                statement.setInt(index++, groupInfo.getPrivateChat());
-                statement.setInt(index++, groupInfo.getSearchable());
-                statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
+                String cid = resultSet.getString(index++);
 
-                statement.setString(index++, groupInfo.getName());
-                statement.setString(index++, groupInfo.getPortrait());
-                statement.setString(index++, groupInfo.getOwner());
-                statement.setInt(index++, groupInfo.getType());
-                statement.setString(index++, groupInfo.getExtra());
-                statement.setLong(index++, groupInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
-                statement.setInt(index++, groupInfo.getMemberCount());
-                statement.setInt(index++, groupInfo.getMute());
-                statement.setInt(index++, groupInfo.getJoinType());
-                statement.setInt(index++, groupInfo.getPrivateChat());
-                statement.setInt(index++, groupInfo.getSearchable());
-                statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
-                int count = statement.executeUpdate();
-                LOG.info("Update rows {}", count);
-            } catch (SQLException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            } finally {
-                DBUtil.closeDB(connection, statement);
+                ClientSession clientSession = new ClientSession(cid, Server.getServer().getStore().sessionsStore());
+                MemorySessionStore.Session session = new MemorySessionStore.Session(uid, cid, clientSession);
+
+                session.setAppName(resultSet.getString(index++));
+                session.setDeviceToken(resultSet.getString(index++));
+                session.setVoipDeviceToken(resultSet.getString(index++));
+                session.setSecret(resultSet.getString(index++));
+                session.setDbSecret(resultSet.getString(index++));
+                session.setPlatform(resultSet.getInt(index++));
+                session.setPushType(resultSet.getInt(index++));
+
+                session.setDeviceName(resultSet.getString(index++));
+                session.setDeviceVersion(resultSet.getString(index++));
+                session.setPhoneName(resultSet.getString(index++));
+                session.setLanguage(resultSet.getString(index++));
+                session.setCarrierName(resultSet.getString(index++));
+                session.setUpdateDt(resultSet.getLong(index++));
+                result.add(session);
             }
-        });
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, resultSet);
+        }
+        return result;
+    }
+
+    void clearUserSessions(String uid) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "delete from t_user_session where `_uid`=?";
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setString(index++, uid);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
     }
 
     MemorySessionStore.Session getSession(String uid, String clientId, ClientSession clientSession) {
-        String sql = "select  `_package_name`,`_token`,`_voip_token`,`_secret`,`_db_secret`,`_platform`,`_push_type`,`_device_name`,`_device_version`,`_phone_name`,`_language`,`_carrier_name`, `_dt` from t_user_session where `_uid` = ? and `_cid` = ? limit 1";
+        String sql = "select  `_package_name`,`_token`,`_voip_token`,`_secret`,`_db_secret`,`_platform`,`_push_type`,`_device_name`,`_device_version`,`_phone_name`,`_language`,`_carrier_name`, `_dt`, `_deleted` from t_user_session where `_uid` = ? and `_cid` = ? limit 1";
         Connection connection = null;
         PreparedStatement statement = null;
+        ResultSet resultSet = null;
         try {
             connection = DBUtil.getConnection();
             statement = connection.prepareStatement(sql);
             statement.setString(1, uid);
             statement.setString(2, clientId);
-            ResultSet resultSet = statement.executeQuery();
+            resultSet = statement.executeQuery();
             if (resultSet.next()) {
                 MemorySessionStore.Session session = new MemorySessionStore.Session(uid, clientId, clientSession);
 
@@ -1048,23 +1204,58 @@ public class DatabaseStore {
                 session.setPhoneName(resultSet.getString(index++));
                 session.setLanguage(resultSet.getString(index++));
                 session.setCarrierName(resultSet.getString(index++));
-                session.setUpdateDt(resultSet.getLong(index));
+                session.setUpdateDt(resultSet.getLong(index++));
+                session.setDeleted(resultSet.getInt(index));
                 return session;
             }
-            resultSet.close();
         } catch (SQLException e) {
             e.printStackTrace();
             Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, resultSet);
+        }
+        return null;
+    }
+
+    void clearOtherSessionToken(String cid, String token, int pushType, boolean voipToken) {
+        if (voipToken) {
+            return;
+        }
+
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            String sql = "update t_user_session set `_token` = ?, `_dt` = ? where `_token` = ? and `_push_type` = ? and `_cid` <> ?";
+
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setString(index++, "");
+            statement.setLong(index++, System.currentTimeMillis());
+            statement.setString(index++, token);
+            statement.setInt(index++, pushType);
+            statement.setString(index++, cid);
+
+            int c = statement.executeUpdate();
+            LOG.info("Update rows {}", c);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
         } finally {
             DBUtil.closeDB(connection, statement);
         }
-        return null;
     }
 
-    void updateSessionToken(String uid, String cid, String token, boolean voipToken) {
+
+    void updateSessionToken(String uid, String cid, String token, int pushType, boolean voipToken) {
         mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
+
+            clearOtherSessionToken(cid, token, pushType, voipToken);
             try {
                 connection = DBUtil.getConnection();
 
@@ -1073,12 +1264,15 @@ public class DatabaseStore {
                 if (voipToken) {
                     sql = "update t_user_session set `_voip_token` = ?, `_dt` = ? where `_uid` = ? and `_cid` = ?";
                 } else {
-                    sql = "update t_user_session set `_token` = ?, `_dt` = ? where `_uid` = ? and `_cid` = ?";
+                    sql = "update t_user_session set `_token` = ?, `_push_type` = ?, `_dt` = ? where `_uid` = ? and `_cid` = ?";
                 }
                 statement = connection.prepareStatement(sql);
 
                 int index = 1;
                 statement.setString(index++, token);
+                if (!voipToken) {
+                    statement.setInt(index++, pushType);
+                }
                 statement.setLong(index++, System.currentTimeMillis());
                 statement.setString(index++, uid);
                 statement.setString(index++, cid);
@@ -1095,6 +1289,64 @@ public class DatabaseStore {
         });
     }
 
+    void updateSessionDeleted(String uid, String cid, int deleted) {
+        mScheduler.execute(()->{
+            Connection connection = null;
+            PreparedStatement statement = null;
+
+            try {
+                connection = DBUtil.getConnection();
+
+                String sql = "update t_user_session set `_deleted` = ? where `_uid` = ? and `_cid` = ?";
+
+                statement = connection.prepareStatement(sql);
+
+                int index = 1;
+                statement.setInt(index++, deleted);
+                statement.setString(index++, uid);
+                statement.setString(index++, cid);
+
+                int c = statement.executeUpdate();
+                LOG.info("Update rows {}", c);
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+    }
+
+    void updateSessionPlatform(String uid, String cid, int platform) {
+        mScheduler.execute(()->{
+            Connection connection = null;
+            PreparedStatement statement = null;
+
+            try {
+                connection = DBUtil.getConnection();
+
+                String sql = "update t_user_session set `_platform` = ? where `_uid` = ? and `_cid` = ?";
+
+                statement = connection.prepareStatement(sql);
+
+                int index = 1;
+                statement.setInt(index++, platform);
+                statement.setString(index++, uid);
+                statement.setString(index++, cid);
+
+                int c = statement.executeUpdate();
+                LOG.info("Update rows {}", c);
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+    }
+
     private boolean strEqual(String left, String right) {
         if (left == right)
             return true;
@@ -1187,23 +1439,71 @@ public class DatabaseStore {
         });
     }
 
-    MemorySessionStore.Session createSession(String uid, String clientId, ClientSession clientSession) {
+    void clearMultiEndpoint(String uid, String clientId, int platform) {
+        LOG.info("clearMultiEndpoint {}, {}", uid, clientId);
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql;
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX
+                    || platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and `_platform` = ? and `_cid` <> ? and `_deleted` = 0";
+            }
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+
+            statement.setInt(index++, 1);
+            statement.setString(index++, "");
+            statement.setString(index++, "");
+            statement.setLong(index++, System.currentTimeMillis());
+
+            statement.setString(index++, uid);
+
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_Windows);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_OSX);
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_iOS);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_Android);
+            } else {
+                statement.setInt(index++, platform);
+            }
+
+            statement.setString(index++, clientId);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
+    MemorySessionStore.Session createSession(String uid, String clientId, ClientSession clientSession, int platform) {
         Connection connection = null;
         PreparedStatement statement = null;
         LOG.info("Database create session {},{}", uid, clientId);
         try {
             connection = DBUtil.getConnection();
-            String sql = "insert into t_user_session  (`_uid`,`_cid`,`_secret`,`_db_secret`, `_dt`) values (?,?,?,?,?)";
+            String sql = "insert into t_user_session  (`_uid`,`_cid`,`_platform`,`_secret`,`_db_secret`, `_dt`) values (?,?,?,?,?,?)";
 
             statement = connection.prepareStatement(sql);
 
             int index = 1;
 
             MemorySessionStore.Session session = new MemorySessionStore.Session(uid, clientId, clientSession);
-
+            session.setPlatform(platform);
 
             statement.setString(index++, uid);
             statement.setString(index++, clientId);
+            statement.setInt(index++, platform);
 
 
             session.setSecret(UUID.randomUUID().toString());
@@ -1228,40 +1528,67 @@ public class DatabaseStore {
         return null;
     }
 
-    void updateGroupMemberCountDt(final String groupId, final int count, final long dt) {
-        mScheduler.execute(()->{
-            Connection connection = null;
-            PreparedStatement statement = null;
-            try {
-                connection = DBUtil.getConnection();
+    Set<String> getUserGroupIds(String userId) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select `_gid` from t_group_member where `_mid` = ? and `_type` <> ?";
+            statement = connection.prepareStatement(sql);
 
-                String sql ;
+            statement.setString(1, userId);
+            statement.setInt(2, ProtoConstants.GroupMemberType.GroupMemberType_Removed);
 
-                if (count >= 0) {
-                    sql = "update t_group set `_member_count` = ?, `_member_dt` = ? , `_dt` = ? where `_gid` = ?";
-                } else {
-                    sql = "update t_group set `_member_dt` = ?, `_dt` = ? where `_gid` = ?";
-                }
-                statement = connection.prepareStatement(sql);
 
-                int index = 1;
-                if (count >=0) {
-                    statement.setInt(index++, count);
-                }
-                statement.setLong(index++, dt);
-                statement.setLong(index++, dt);
-                statement.setString(index++, groupId);
-
-                int c = statement.executeUpdate();
-                LOG.info("Update rows {}", c);
-            } catch (SQLException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            } finally {
-                DBUtil.closeDB(connection, statement);
+            rs = statement.executeQuery();
+            Set<String> out = new HashSet<>();
+            while (rs.next()) {
+                String uid = rs.getString(1);
+                out.add(uid);
             }
-        });
+            return out;
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return null;
+    }
+    void updateGroupMemberCountDt(final String groupId, final int count, final long dt) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            String sql ;
+
+            if (count >= 0) {
+                sql = "update t_group set `_member_count` = ?, `_member_dt` = ? , `_dt` = ? where `_gid` = ?";
+            } else {
+                sql = "update t_group set `_member_dt` = ?, `_dt` = ? where `_gid` = ?";
+            }
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            if (count >=0) {
+                statement.setInt(index++, count);
+            }
+            statement.setLong(index++, dt);
+            statement.setLong(index++, dt);
+            statement.setString(index++, groupId);
+
+            int c = statement.executeUpdate();
+            LOG.info("Update rows {}", c);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
     }
 
     void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
@@ -1628,8 +1955,7 @@ public class DatabaseStore {
 
                 try {
                     MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    BASE64Encoder base64en = new BASE64Encoder();
-                    String passwdMd5 = base64en.encode(md5.digest(password.getBytes("utf-8")));
+                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
                     statement.setString(index, passwdMd5);
                 } catch (Exception e) {
                     statement.setString(index, "");
@@ -1833,6 +2159,7 @@ public class DatabaseStore {
                     ", `_social`=?" +
                     ", `_extra`=?" +
                     ", `_type`=?" +
+                    ", `_deleted`=?" +
                     ", `_dt`=?";
 
                 statement = connection.prepareStatement(sql);
@@ -1866,6 +2193,7 @@ public class DatabaseStore {
 
                 statement.setString(index++, user.getExtra());
                 statement.setInt(index++, user.getType());
+                statement.setInt(index++, user.getDeleted());
                 statement.setLong(index++, user.getUpdateDt() == 0 ? System.currentTimeMillis() : user.getUpdateDt());
 
                 int count = statement.executeUpdate();
@@ -1992,6 +2320,7 @@ public class DatabaseStore {
                 ", `_social`" +
                 ", `_extra`" +
                 ", `_type`" +
+                ", `_deleted`" +
                 ", `_dt` from t_user where `_uid` = ?";
             statement = connection.prepareStatement(sql);
 
@@ -2046,6 +2375,9 @@ public class DatabaseStore {
                 int type = rs.getInt(index++);
                 builder.setType(type);
 
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
                 long longValue = rs.getLong(index++);
                 builder.setUpdateDt(longValue);
 
@@ -2113,7 +2445,7 @@ public class DatabaseStore {
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select distinct(`_uid`) from t_user_session";
+            String sql = "select distinct(`_uid`) from t_user_session where `_deleted` = 0";
             statement = connection.prepareStatement(sql);
 
 
@@ -2140,7 +2472,7 @@ public class DatabaseStore {
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_friend_uid`, `_alias`, `_state`, `_dt` from t_friend where `_uid` = ?";
+            String sql = "select `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt` from t_friend where `_uid` = ?";
             statement = connection.prepareStatement(sql);
 
 
@@ -2154,9 +2486,10 @@ public class DatabaseStore {
                 String uid = rs.getString(1);
                 String alias = rs.getString(2);
                 int state = rs.getInt(3);
-                long timestamp = rs.getLong(4);
+                int blacked = rs.getInt(4);
+                long timestamp = rs.getLong(5);
 
-                FriendData data = new FriendData(userId, uid, alias, state, timestamp);
+                FriendData data = new FriendData(userId, uid, alias, state, blacked, timestamp);
                 out.add(data);
             }
             return out;
@@ -2170,19 +2503,72 @@ public class DatabaseStore {
         return null;
     }
 
+
+    void removeUserFriend(String userId) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "update t_friend  set `_alias` = '', `_state` = 1, `_blacked` = 0, `_dt` = ? where `_uid` = ? or `_friend_uid` = ?";
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setLong(index++, System.currentTimeMillis());
+            statement.setString(index++, userId);
+            statement.setString(index++, userId);
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
+    void removeUserFriendRequest(String userId) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "delete from t_friend_request  where _uid = ? or _friend_uid = ?";
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setString(index++, userId);
+            statement.setString(index++, userId);
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     List<WFCMessage.FriendRequest> getPersistFriendRequests(String userId) {
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select   `_uid`" +
+            String sql = "select  `_uid`" +
                 ", `_friend_uid`" +
                 ", `_reason`" +
                 ", `_status`" +
                 ", `_dt`" +
                 ", `_from_read_status`" +
-                ", `_to_read_status` from t_friend_request where `_uid` = ? or `_friend_uid` = ?";
+                ", `_to_read_status` from t_friend_request where `_uid` = ? UNION ALL " +
+                "select   `_uid`" +
+                ", `_friend_uid`" +
+                ", `_reason`" +
+                ", `_status`" +
+                ", `_dt`" +
+                ", `_from_read_status`" +
+                ", `_to_read_status` from t_friend_request where `_friend_uid` = ?";
             statement = connection.prepareStatement(sql);
 
             int index = 1;
@@ -2306,10 +2692,11 @@ public class DatabaseStore {
             PreparedStatement statement = null;
             try {
                 connection = DBUtil.getConnection();
-                String sql = "insert into t_friend (`_uid`, `_friend_uid`, `_alias`, `_state`, `_dt`) values(?, ?, ?, ?, ?)" +
+                String sql = "insert into t_friend (`_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt`) values(?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_alias` = ?," +
                     "`_state` = ?," +
+                    "`_blacked` = ?," +
                     "`_dt` = ?";
 
 
@@ -2319,9 +2706,11 @@ public class DatabaseStore {
                 statement.setString(index++, request.getFriendUid());
                 statement.setString(index++, request.getAlias());
                 statement.setInt(index++, request.getState());
+                statement.setInt(index++, request.getBlacked());
                 statement.setLong(index++, request.getTimestamp());
                 statement.setString(index++, request.getAlias());
                 statement.setInt(index++, request.getState());
+                statement.setInt(index++, request.getBlacked());
                 statement.setLong(index++, request.getTimestamp());
                 int count = statement.executeUpdate();
                 LOG.info("Update rows {}", count);

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -25,14 +25,15 @@ import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import cn.wildfirechat.common.ErrorCode;
+import io.moquette.server.Constants;
 import io.moquette.server.Server;
 import io.moquette.spi.IMatchingCondition;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
+import io.netty.handler.codec.mqtt.MqttVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.misc.BASE64Encoder;
 import win.liyufan.im.*;
 
 import java.security.MessageDigest;
@@ -122,6 +123,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         this.databaseStore = databaseStore;
         IS_MESSAGE_ROAMING = "1".equals(m_Server.getConfig().getProperty(MESSAGE_ROAMING));
         IS_MESSAGE_REMOTE_HISTORY_MESSAGE = "1".equals(m_Server.getConfig().getProperty(MESSAGE_Remote_History_Message));
+        Constants.MAX_MESSAGE_QUEUE = Integer.parseInt(m_Server.getConfig().getProperty(MESSAGE_Max_Queue));
     }
 
     @Override
@@ -349,7 +351,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                         }
 
                         size += bundle.getMessage().getSerializedSize();
-                        if (size >= 1 * 1024 * 1024) { //3M
+                        if (size >= 512 * 1024) { //3M
+                            if(builder.getMessageCount() == 0){
+                                builder.addMessage(bundle.getMessage());
+                            }
                             break;
                         }
                         builder.addMessage(bundle.getMessage());
@@ -684,7 +689,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         List<WFCMessage.GroupMember> tmp = new ArrayList<>();
         ArrayList<String> newInviteUsers = new ArrayList<>();
         for (WFCMessage.GroupMember member : memberList) {
-            member = member.toBuilder().setType(ProtoConstants.GroupMemberType.GroupMemberType_Normal).setUpdateDt(updateDt).setAlias("").build();
+            if (member.getMemberId().equals(groupInfo.getOwner())) {
+                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setAlias("").build();
+            } else {
+                member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setAlias("").build();
+            }
             tmp.add(member);
             newInviteUsers.add(member.getMemberId());
         }
@@ -772,7 +781,31 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (groupInfo.getType() != ProtoConstants.GroupType.GroupType_Free && groupInfo.getOwner() != null && groupInfo.getOwner().equals(operator)) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+            Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+            if (members == null || members.size() == 0) {
+                members = loadGroupMemberFromDB(hzInstance, groupId);
+            }
+
+            WFCMessage.GroupMember newOwner = null;
+            for (WFCMessage.GroupMember member :members) {
+                if (!member.getMemberId().equals(operator) && member.getType() != GroupMemberType_Removed) {
+                    newOwner = member;
+                    break;
+                }
+            }
+
+            if (newOwner == null) {
+                 return dismissGroup(operator, groupId, false);
+            }
+
+            transferGroup(operator, groupId, newOwner.getMemberId(), false);
+
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
         removeGroupMember(groupId, Arrays.asList(operator));
@@ -781,6 +814,18 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public void clearUserGroups(String userId) {
+        Set<String> groupIds = databaseStore.getUserGroupIds(userId);
+        int[] removedCount = new int[1];
+        for (String groupId : groupIds) {
+            removedCount[0] = 0;
+            ErrorCode errorCode = quitGroup(userId, groupId);
+            LOG.info("clear user {} group {} result {}", userId, groupId, errorCode);
+        }
+    }
+
+
     private void removeGroupUserSettings(String groupId, List<String> users) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
@@ -971,6 +1016,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return groupInfo;
     }
 
+    @Override
+    public Set<String> getUserGroupIds(String userId) {
+        return databaseStore.getUserGroupIds(userId);
+    }
+
     @Override
     public ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1039,25 +1089,31 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         //check the new owner is in member list? is that necessary?
         long updateDt = System.currentTimeMillis();
-        groupInfo = groupInfo.toBuilder().setOwner(newOwner).setUpdateDt(updateDt).build();
-
+        groupInfo = groupInfo.toBuilder().setOwner(newOwner).setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build();
         mIMap.set(groupId, groupInfo);
+
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
         if (members == null || members.size() == 0) {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
+        int modifyMemeberCount = 0;
         for (WFCMessage.GroupMember member : members) {
+            if (modifyMemeberCount == 2) {
+                break;
+            }
             if (newOwner.equals(member.getMemberId())) {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 groupMembers.put(groupId, member);
+                modifyMemeberCount++;
             } else if(member.getType() == GroupMemberType_Owner) {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 groupMembers.put(groupId, member);
+                modifyMemeberCount++;
             }
         }
 
@@ -1224,6 +1280,18 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
     }
 
+    @Override
+    public void clearUserMessages(String userId) {
+        mWriteLock.lock();
+        try {
+            userMessages.remove(userId);
+        } finally {
+            mWriteLock.unlock();
+        }
+
+        databaseStore.clearUserMessage(userId);
+    }
+
     @Override
     public WFCMessage.Robot getRobot(String robotId) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1394,6 +1462,18 @@ public class MemoryMessagesStore implements IMessagesStore {
         databaseStore.updateUserPassword(user.getUid(), password);
     }
 
+    @Override
+    public void destoryUser(String userId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+        WFCMessage.User us = mUserMap.get(userId);
+        if (us != null) {
+            us = WFCMessage.User.newBuilder().setUid(userId).setUpdateDt(System.currentTimeMillis()).setDisplayName("已删除用户").setName(userId).setDeleted(1).build();
+            mUserMap.put(userId, us);
+        }
+
+    }
+
     @Override
     public WFCMessage.User getUserInfo(String userId) {
         if (StringUtil.isNullOrEmpty(userId)) {
@@ -1418,8 +1498,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         return getUserInfo(userId);
     }
     @Override
-    public List<WFCMessage.User> searchUser(String keyword, boolean buzzy, int page) {
-        return databaseStore.searchUserFromDB(keyword, buzzy, page);
+    public List<WFCMessage.User> searchUser(String keyword, int searchType, int page) {
+        return databaseStore.searchUserFromDB(keyword, searchType, page);
     }
 
     @Override
@@ -1556,7 +1636,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         for (FriendData friendData : friendDatas) {
             if (friendData.getFriendUid().equals(userId)) {
-                if (friendData.getState() == 2) {
+                if (friendData.getBlacked() == 1) {
                     return true;
                 } else {
                     return false;
@@ -1592,8 +1672,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 String pwd_md5 = rs.getString(2);
                 try {
                     MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    BASE64Encoder base64en = new BASE64Encoder();
-                    String passwdMd5 = base64en.encode(md5.digest(password.getBytes("utf-8")));
+                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
                     if (passwdMd5.equals(pwd_md5)) {
                         LOG.info("login success userName={}, userId={}", name, uid);
                         userIdRet.add(uid);
@@ -1648,7 +1727,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public List<FriendData> getFriendList(String userId, long version) {
+    public List<FriendData> getFriendList(String userId, String clientId, long version) {
         List<FriendData> out = new ArrayList<FriendData>();
 
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1658,15 +1737,57 @@ public class MemoryMessagesStore implements IMessagesStore {
             friends = loadFriend(friendsMap, userId);
         }
 
+        boolean needFriendMigrate = false;
+
+        if (!StringUtil.isNullOrEmpty(clientId)) {
+            MemorySessionStore.Session session = m_Server.getStore().sessionsStore().getSession(clientId);
+            if(session != null && session.getMqttVersion() != null && session.getMqttVersion().protocolLevel() < MqttVersion.Wildfire_2.protocolLevel()) {
+                needFriendMigrate = true;
+            }
+        }
+
         for (FriendData friend : friends) {
             if (friend.getTimestamp() > version) {
-                out.add(friend);
+                if (needFriendMigrate) {
+                    if (friend.getBlacked() > 0) {
+                        friend.setState(2);
+                    }
+                    out.add(friend);
+                } else {
+                    out.add(friend);
+                }
+
             }
         }
 
         return out;
     }
 
+    @Override
+    public void clearUserFriend(String userId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+        Collection<FriendData> friendDatas = friendsMap.get(userId);
+        if (friendDatas == null || friendDatas.size() == 0) {
+            friendDatas = loadFriend(friendsMap, userId);
+        }
+
+        databaseStore.removeUserFriend(userId);
+        databaseStore.removeUserFriendRequest(userId);
+
+        MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
+        requestMap.remove(userId);
+
+
+        if (friendDatas != null) {
+            for (FriendData fd : friendDatas) {
+                friendsMap.remove(fd.getFriendUid());
+            }
+            friendsMap.remove(userId);
+        }
+    }
+
     @Override
     public List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version) {
         List<WFCMessage.FriendRequest> out = new ArrayList<>();
@@ -1715,6 +1836,24 @@ public class MemoryMessagesStore implements IMessagesStore {
                 return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
             }
         }
+
+        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+        FriendData friendData1 = null;
+        Collection<FriendData> friendDatas = friendsMap.get(userId);
+        if (friendDatas == null || friendDatas.size() == 0) {
+            friendDatas = loadFriend(friendsMap, userId);
+        }
+        for (FriendData fd : friendDatas) {
+            if (fd.getFriendUid().equals(request.getTargetUid())) {
+                friendData1 = fd;
+                break;
+            }
+        }
+        if (friendData1 != null && friendData1.getBlacked() > 0) {
+            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+        }
+
         WFCMessage.FriendRequest newRequest = WFCMessage.FriendRequest
             .newBuilder()
             .setFromUid(userId)
@@ -1766,7 +1905,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 }
             }
             if (friendData1 == null) {
-                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), System.currentTimeMillis());
+                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), 0, System.currentTimeMillis());
             } else {
                 friendData1.setState(request.getStatus());
                 friendData1.setTimestamp(System.currentTimeMillis());
@@ -1788,7 +1927,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 }
                 if (friendData2 == null) {
-                    friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getStatus(), friendData1.getTimestamp());
+                    friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getStatus(), 0, friendData1.getTimestamp());
                 } else {
                     friendsMap.remove(request.getTargetUid(), friendData2);
                     friendData2.setState(request.getStatus());
@@ -1829,10 +1968,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                 databaseStore.persistOrUpdateFriendRequest(existRequest);
                 MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
-                FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", 0, System.currentTimeMillis());
+                FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", 0, 0, System.currentTimeMillis());
                 databaseStore.persistOrUpdateFriendData(friendData1);
 
-                FriendData friendData2 = new FriendData(request.getTargetUid(), userId, "", 0, friendData1.getTimestamp());
+                FriendData friendData2 = new FriendData(request.getTargetUid(), userId, "", 0, 0, friendData1.getTimestamp());
                 databaseStore.persistOrUpdateFriendData(friendData2);
 
                 requestMap.remove(userId);
@@ -1854,6 +1993,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public ErrorCode blackUserRequest(String fromUser, String targetUserId, int state, long[] heads) {
+        if (state == 2) {
+            state = 1;
+        } else {
+            state = 0;
+        }
+
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
@@ -1871,9 +2016,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (friendData == null) {
-            friendData = new FriendData(fromUser, targetUserId, "", state, System.currentTimeMillis());
+            friendData = new FriendData(fromUser, targetUserId, "", 1, state, System.currentTimeMillis());
         }
-        friendData.setState(state);
+        friendData.setBlacked(state);
         friendData.setTimestamp(System.currentTimeMillis());
 
 
@@ -1994,6 +2139,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     public ErrorCode getUserSettings(String userId, long version, WFCMessage.GetUserSettingResult.Builder builder) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
+        IMap<String, WFCMessage.GroupInfo> mGroups = hzInstance.getMap(GROUPS_MAP);
+        IMap<String, WFCMessage.ChannelInfo> mChannels = hzInstance.getMap(CHANNELS);
 
         Collection<WFCMessage.UserSettingEntry> entries = userSettingMap.get(userId);
         if (entries == null || entries.size() == 0) {
@@ -2001,12 +2148,51 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         ErrorCode ec = ErrorCode.ERROR_CODE_NOT_MODIFIED;
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.MONTH, -1);
+        long monthAgo = c.getTimeInMillis();
+
         if (entries != null) {
             for (WFCMessage.UserSettingEntry entry : entries
             ) {
                 if (entry.getUpdateDt() > version) {
                     ec = ErrorCode.ERROR_CODE_SUCCESS;
-                    builder.addEntry(entry);
+                    boolean skip = false;
+                    if (version == 0 && entry.getUpdateDt() > monthAgo) {
+                        if (entry.getScope() == UserSettingScope.kUserSettingConversationSync) {
+                            try {
+                                String key = entry.getKey();
+                                int pos1 = key.indexOf('-');
+                                String typeStr = key.substring(0, pos1);
+                                int type = Integer.parseInt(typeStr);
+                                if (type == ProtoConstants.ConversationType.ConversationType_Group
+                                    || type == ProtoConstants.ConversationType.ConversationType_Channel) {
+                                    int pos2 = key.indexOf('-', pos1 + 1);
+                                    String target = key.substring(pos2 + 1);
+
+                                    if (type == ProtoConstants.ConversationType.ConversationType_Group) {
+                                        WFCMessage.GroupInfo groupInfo = mGroups.get(target);
+                                        if (groupInfo == null) {
+                                            skip = true;
+                                        }
+                                    } else {
+                                        WFCMessage.ChannelInfo channelInfo = mChannels.get(target);
+                                        if (channelInfo == null) {
+                                            skip = true;
+                                        }
+                                    }
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+
+                        }
+                    }
+
+                    if (!skip) {
+                        builder.addEntry(entry);
+                    }
                 }
             }
         }
@@ -2102,6 +2288,14 @@ public class MemoryMessagesStore implements IMessagesStore {
         return updateDt;
     }
 
+    @Override
+    public void clearUserSettings(String userId) {
+        databaseStore.clearUserSetting(userId);
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
+        userSettingMap.remove(userId);
+    }
+
     @Override
     public boolean getUserGlobalSlient(String userId) {
         Boolean slient = userGlobalSlientMap.get(userId);
@@ -2121,7 +2315,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     public boolean getUserPushHiddenDetail(String userId) {
         Boolean hidden = userPushHiddenDetail.get(userId);
         if (hidden == null) {
-            WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingGlobalSilent, null);
+            WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingHiddenNotificationDetail, null);
             if (entry == null || !entry.getValue().equals("1")) {
                 hidden = false;
             } else {
@@ -2159,6 +2353,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public void clearUserChannels(String userId) {
+
+    }
+
+
     @Override
     public ErrorCode modifyChannelInfo(String operator, String channelId, int modifyType, String value) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -2320,6 +2520,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             words) {
             databaseStore.deleteSensitiveWord(word);
         }
+        lastUpdateSensitiveTime = 0;
         return true;
     }
 
@@ -2443,7 +2644,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
         return UUIDGenerator.getUUID();
     }
-    
+
     @Override
     public void storeRetained(Topic topic, StoredMessage storedMessage) {
         LOG.debug("Store retained message for topic={}, CId={}", topic, storedMessage.getClientID());

broker/src/main/java/io/moquette/persistence/MemorySessionStore.java

@@ -16,17 +16,19 @@
 
 package io.moquette.persistence;
 
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
 import io.moquette.server.Constants;
 import io.moquette.server.Server;
 import io.moquette.spi.ClientSession;
-import io.moquette.spi.IMessagesStore.StoredMessage;
 import io.moquette.spi.ISessionsStore;
-
+import io.moquette.spi.IMessagesStore.StoredMessage;
 import io.netty.handler.codec.mqtt.MqttVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import cn.wildfirechat.common.ErrorCode;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -35,6 +37,8 @@ public class MemorySessionStore implements ISessionsStore {
     private static int dumy = 1;
     private static final Logger LOG = LoggerFactory.getLogger(MemorySessionStore.class);
 
+    private boolean supportMultiEndpoint = false;
+
     public static class Session implements Comparable<Session>{
         final String clientID;
         String username;
@@ -50,6 +54,16 @@ public class MemorySessionStore implements ISessionsStore {
 
         private volatile int unReceivedMsgs;
 
+        private int deleted;
+
+        public int getDeleted() {
+            return deleted;
+        }
+
+        public void setDeleted(int deleted) {
+            this.deleted = deleted;
+        }
+
         private MqttVersion mqttVersion = MqttVersion.MQTT_3_1_1;
 
         public long getLastActiveTime() {
@@ -130,6 +144,9 @@ public class MemorySessionStore implements ISessionsStore {
 
         public void setUpdateDt(long updateDt) {
             this.updateDt = updateDt;
+            if (this.lastActiveTime == 0) {
+                this.lastActiveTime = updateDt;
+            }
         }
 
         private int pushType;
@@ -248,8 +265,14 @@ public class MemorySessionStore implements ISessionsStore {
     private final Server mServer;
     private final DatabaseStore databaseStore;
     public MemorySessionStore(Server server, DatabaseStore databaseStore) {
-    		mServer = server;
-    		this.databaseStore = databaseStore;
+        mServer = server;
+        this.databaseStore = databaseStore;
+
+        try {
+            supportMultiEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_ENDPOINT));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -261,6 +284,21 @@ public class MemorySessionStore implements ISessionsStore {
         return session;
     }
 
+    @Override
+    public void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip) {
+        if (StringUtil.isNullOrEmpty(token) || isVoip) {
+            return;
+        }
+
+        Iterator<Map.Entry<String, Session>> it = sessions.entrySet().iterator();
+        while (it.hasNext()) {
+            Session session = it.next().getValue();
+            if (!session.getClientID().equals(cid) && (session.pushType == pushType && token.equals(session.deviceToken))) {
+                session.deviceToken = null;
+            }
+        }
+    }
+
     @Override
     public void initStore() {
     }
@@ -272,18 +310,91 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public void updateSessionToken(Session session, boolean voip) {
-        databaseStore.updateSessionToken(session.getUsername(), session.getClientID(), voip ? session.getVoipDeviceToken() : session.getDeviceToken(), voip);
+        databaseStore.updateSessionToken(session.getUsername(), session.getClientID(), voip ? session.getVoipDeviceToken() : session.getDeviceToken(), session.getPushType(), voip);
     }
 
     @Override
-    public Session createUserSession(String username, String clientID) {
+    public void clearUserSession(String username) {
+        LOG.info("Fooooooooo <{}>", username);
+
+        databaseStore.clearUserSessions(username);
+
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
+        for (String clientID : sessionSet) {
+            Session s = sessions.remove(clientID);
+            mServer.getProcessor().kickoffSession(s);
+        }
+        userSessions.remove(username);
+    }
+
+    @Override
+    public Session updateOrCreateUserSession(String username, String clientID, int platform) {
         LOG.debug("createUserSession for client <{}>, user <{}>", clientID, username);
 
+        Session session = sessions.get(clientID);
+
+        if (session != null && !session.username.equals(username)) {
+            if (userSessions.get(username) != null) {
+                userSessions.get(username).remove(clientID);
+            }
+        }
         ClientSession clientSession = new ClientSession(clientID, this);
-        Session session = databaseStore.getSession(username, clientID, clientSession);
+        session = databaseStore.getSession(username, clientID, clientSession);
 
         if (session == null) {
-            session = databaseStore.createSession(username, clientID, clientSession);
+            session = databaseStore.createSession(username, clientID, clientSession, platform);
+        }
+        sessions.put(clientID, session);
+
+
+        if (session.getDeleted() > 0) {
+            session.setDeleted(0);
+            databaseStore.updateSessionDeleted(username, clientID, 0);
+        }
+
+        if (session.getPlatform() != platform) {
+            session.setPlatform(platform);
+            databaseStore.updateSessionPlatform(username, clientID, platform);
+        }
+
+
+        if (!supportMultiEndpoint && platform > 0) {
+            databaseStore.clearMultiEndpoint(username, clientID, platform);
+            if (userSessions.get(username) != null) {
+                Iterator<String> it = userSessions.get(username).iterator();
+                while (it.hasNext()) {
+                    String c = it.next();
+                    if (!clientID.equals(c)) {
+                        Session s = sessions.get(c);
+                        if (s == null) {
+                            it.remove();
+                            continue;
+                        }
+
+                        boolean remove = false;
+                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+                                remove = true;
+                            }
+                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows) {
+                                remove = true;
+                            }
+                        } else {
+                            if (s.getPlatform() ==platform) {
+                                remove = true;
+                            }
+                        }
+
+                        if (remove) {
+                            sessions.remove(c);
+                            mServer.getProcessor().kickoffSession(s);
+                            it.remove();
+                        }
+                    }
+                }
+            }
+
         }
 
         return session;
@@ -291,34 +402,29 @@ public class MemorySessionStore implements ISessionsStore {
 
 
     @Override
-    public ErrorCode createNewSession(String username, String clientID, boolean cleanSession, boolean createWhenNoExist) {
+    public ErrorCode loadActiveSession(String username, String clientID) {
         LOG.debug("createNewSession for client <{}>", clientID);
 
         Session session = sessions.get(clientID);
-        if (session != null) {
+
+        if (session != null && session.getDeleted() == 0) {
             LOG.error("already exists a session for client <{}>, bad condition", clientID);
             throw new IllegalArgumentException("Can't create a session with the ID of an already existing" + clientID);
         }
 
+        if (session != null && session.getDeleted() > 0) {
+            return ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH;
+        }
 
         ClientSession clientSession = new ClientSession(clientID, this);
         session = databaseStore.getSession(username, clientID, clientSession);
 
-        if (session == null) {
-            if (!createWhenNoExist) {
-                return ErrorCode.ERROR_CODE_NOT_EXIST;
-            }
-
-            session = databaseStore.createSession(username, clientID, clientSession);
+        if (session == null || session.getDeleted() > 0) {
+            return ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH;
         }
 
         sessions.put(clientID, session);
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<>();
-			userSessions.put(username, sessionSet);
-		}
-        sessionSet = userSessions.get(username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
         sessionSet.add(clientID);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -342,12 +448,7 @@ public class MemorySessionStore implements ISessionsStore {
         session.setUsername(username);
         sessions.put(clientID, session);
 
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-            sessionSet = new ConcurrentSkipListSet<>();
-            userSessions.put(username, sessionSet);
-        }
-        sessionSet = userSessions.get(username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
         sessionSet.add(clientID);
 
         if (endpoint != null) {
@@ -393,14 +494,26 @@ public class MemorySessionStore implements ISessionsStore {
         }
     }
 
+    private ConcurrentSkipListSet<String> getUserSessionSet(String username) {
+        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
+        if (sessionSet == null) {
+            sessionSet = new ConcurrentSkipListSet<String>();
+            List<Session> ss = databaseStore.getUserActivedSessions(username);
+            for (Session s : ss) {
+                sessionSet.add(s.getClientID());
+                sessions.put(s.getClientID(), s);
+            }
+            userSessions.put(username, sessionSet);
+        }
+
+        sessionSet = userSessions.get(username);
+        return sessionSet;
+    }
+
     @Override
     public Collection<Session> sessionForUser(String username) {
-    	ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<String>();
-			userSessions.put(username, sessionSet);
-		}
-        sessionSet = userSessions.get(username);
+    	ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
+
         ArrayList<Session> out = new ArrayList<>();
         for (String clientId : sessionSet
              ) {
@@ -466,7 +579,9 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public void dropQueue(String clientID) {
-        sessions.get(clientID).queue.clear();
+        if (sessions.get(clientID) != null) {
+            sessions.get(clientID).queue.clear();
+        }
     }
 
     @Override
@@ -542,12 +657,7 @@ public class MemorySessionStore implements ISessionsStore {
             LOG.error("Can't find the session for client <{}>", clientID);
             return;
         }
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(session.username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<>();
-			userSessions.put(session.username, sessionSet);
-		}
-        sessionSet = userSessions.get(session.username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
         sessionSet.remove(clientID);
 
         // remove also the messages stored of type QoS1/2

broker/src/main/java/io/moquette/server/Constants.java

@@ -24,8 +24,10 @@ public final class Constants {
     public static final String ATTR_CLIENTID = "ClientID";
     public static final String CLEAN_SESSION = "cleanSession";
     public static final String KEEP_ALIVE = "keepAlive";
-    public static final int MAX_MESSAGE_QUEUE = 1024; // number of messages
-    public static final int MAX_CHATROOM_MESSAGE_QUEUE = 256; // number of chatroom messages
+
+
+    public static int MAX_MESSAGE_QUEUE = 1024; // number of messages
+    public static int MAX_CHATROOM_MESSAGE_QUEUE = 256; // number of chatroom messages
 
     private Constants() {
     }

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -107,11 +107,13 @@ public interface IMessagesStore {
     ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList);
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
+    void clearUserGroups(String userId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
     ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
     ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
+    Set<String> getUserGroupIds(String userId);
     ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
     WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
@@ -121,6 +123,8 @@ public interface IMessagesStore {
 
     ErrorCode recallMessage(long messageUid, String operatorId, boolean isAdmin);
 
+    void clearUserMessages(String userId);
+
     WFCMessage.Robot getRobot(String robotId);
     void addRobot(WFCMessage.Robot robot);
     ErrorCode getUserInfo(List<WFCMessage.UserRequest> requestList, WFCMessage.PullUserResult.Builder builder);
@@ -131,10 +135,11 @@ public interface IMessagesStore {
     List<InputOutputUserBlockStatus> getUserStatusList();
 
     void addUserInfo(WFCMessage.User user, String password);
+    void destoryUser(String userId);
     WFCMessage.User getUserInfo(String userId);
     WFCMessage.User getUserInfoByName(String name);
     WFCMessage.User getUserInfoByMobile(String mobile);
-    List<WFCMessage.User> searchUser(String keyword, boolean buzzy, int page);
+    List<WFCMessage.User> searchUser(String keyword, int searchType, int page);
 
     boolean updateSystemSetting(int id, String value, String desc);
     SystemSettingPojo getSystemSetting(int id);
@@ -153,7 +158,8 @@ public interface IMessagesStore {
     ErrorCode verifyToken(String userId, String token, List<String> serverIPs, List<Integer> ports);
     ErrorCode login(String name, String password, List<String> userIdRet);
 
-    List<FriendData> getFriendList(String userId, long version);
+    List<FriendData> getFriendList(String userId, String clientId, long version);
+    void clearUserFriend(String userId);
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
     ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
@@ -171,12 +177,14 @@ public interface IMessagesStore {
     WFCMessage.UserSettingEntry getUserSetting(String userId, int scope, String key);
     List<WFCMessage.UserSettingEntry> getUserSetting(String userId, int scope);
     long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request);
+    void clearUserSettings(String userId);
 
     boolean getUserGlobalSlient(String userId);
     boolean getUserPushHiddenDetail(String userId);
     boolean getUserConversationSlient(String userId, WFCMessage.Conversation conversation);
 
     ErrorCode createChannel(String operator, WFCMessage.ChannelInfo channelInfo);
+    void clearUserChannels(String userId);
     ErrorCode modifyChannelInfo(String operator, String channelId, int modifyType, String value);
     ErrorCode transferChannel(String operator, String channelId, String newOwner);
     ErrorCode distoryChannel(String operator, String channelId);

broker/src/main/java/io/moquette/spi/ISessionsStore.java

@@ -38,15 +38,19 @@ public interface ISessionsStore {
      */
     boolean contains(String clientID);
 
-    Session createUserSession(String username, String clientID);
+    Session updateOrCreateUserSession(String username, String clientID, int platform);
 
-    ErrorCode createNewSession(String username, String clientID, boolean cleanSession, boolean createNoExist);
+    ErrorCode loadActiveSession(String username, String clientID);
 
     ClientSession updateExistSession(String username, String clientID, WFCMessage.RouteRequest endpoint, boolean cleanSession);
 
     Session getSession(String clientID);
 
+    void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip);
+
     void updateSessionToken(Session session, boolean voip);
+
+    void clearUserSession(String username);
     /**
      * @param clientID
      *            the client owning the session.

broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java

@@ -16,6 +16,7 @@
 
 package io.moquette.spi.impl;
 
+import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.interception.InterceptHandler;
@@ -55,7 +56,24 @@ import static io.moquette.server.ConnectionDescriptor.ConnectionState.*;
  *
  * Used by the front facing class ProtocolProcessorBootstrapper.
  */
+
 public class ProtocolProcessor {
+
+
+    public void kickoffSession(final MemorySessionStore.Session session) {
+        mServer.getImBusinessScheduler().execute(()->{
+            ConnectionDescriptor descriptor = connectionDescriptors.getConnection(session.getClientID());
+            try {
+                if (descriptor != null) {
+                    processDisconnect(descriptor.getChannel(), true);
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            }
+        });
+    }
+
     private void handleTargetRemovedFromCurrentNode(TargetEntry target) {
         System.out.println("kickof user " + target);
         if (target.type == TargetEntry.Type.TARGET_TYPE_USER) {
@@ -142,9 +160,8 @@ public class ProtocolProcessor {
         String clientId = payload.clientIdentifier();
         LOG.info("Processing CONNECT message. CId={}, username={}", clientId, payload.userName());
 
-        if (msg.variableHeader().version() != MqttVersion.MQTT_3_1.protocolLevel()
-                && msg.variableHeader().version() != MqttVersion.MQTT_3_1_1.protocolLevel()
-                && msg.variableHeader().version() != MqttVersion.Wildfire_1.protocolLevel()) {
+        if (msg.variableHeader().version() < MqttVersion.MQTT_3_1_1.protocolLevel() ||
+                msg.variableHeader().version() >= MqttVersion.Wildfire_Max.protocolLevel()) {
             MqttConnAckMessage badProto = connAck(CONNECTION_REFUSED_UNACCEPTABLE_PROTOCOL_VERSION);
 
             LOG.error("MQTT protocol version is not valid. CId={}", clientId);
@@ -165,7 +182,11 @@ public class ProtocolProcessor {
 
         MqttVersion mqttVersion = MqttVersion.fromProtocolLevel(msg.variableHeader().version());
         if (!login(channel, msg, clientId, mqttVersion)) {
+            MqttConnAckMessage badId = connAck(CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD);
+
+            channel.writeAndFlush(badId);
             channel.close();
+            LOG.error("The MQTT login failure. Username={}", payload.userName());
             return;
         }
         if (!mServer.m_initialized) {
@@ -254,9 +275,16 @@ public class ProtocolProcessor {
 
                 MemorySessionStore.Session session = m_sessionsStore.getSession(clientId);
                 if (session == null) {
-                    m_sessionsStore.createNewSession(msg.payload().userName(), clientId, true, false);
+                    ErrorCode errorCode = m_sessionsStore.loadActiveSession(msg.payload().userName(), clientId);
+                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                        return false;
+                    }
                     session = m_sessionsStore.getSession(clientId);
                 }
+
+                if (session.getDeleted() != 0) {
+                    return false;
+                }
                 
                 if (session != null && session.getUsername().equals(msg.payload().userName())) {
                     pwd = AES.AESDecrypt(pwd, session.getSecret(), true);
@@ -502,15 +530,12 @@ public class ProtocolProcessor {
             return;
         }
 
-        boolean stillPresent = this.connectionDescriptors.removeConnection(existingDescriptor);
-        if (!stillPresent) {
-            // another descriptor was inserted
-            LOG.warn("Another descriptor has been inserted. CId={}", clientID);
-            return;
-        }
+        this.connectionDescriptors.removeConnection(existingDescriptor);
 
         LOG.info("The DISCONNECT message has been processed. CId={}", clientID);
 
+        channel.closeFuture();
+
         //disconnect the session
         m_sessionsStore.sessionForClient(clientID).disconnect(clearSession);
     }

broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java

@@ -178,7 +178,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
                         } else {
                             MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
                             if (session != null && session.getUsername().equals(fromUser)) {
-                                if (data.length > 7*1024 && session.getMqttVersion() == MqttVersion.Wildfire_1) {
+                                if (data.length > 7*1024 && session.getMqttVersion().protocolLevel() >= MqttVersion.Wildfire_1.protocolLevel()) {
                                     ByteArrayOutputStream out = new ByteArrayOutputStream();
                                     GZIPOutputStream gzip;
                                     try {

broker/src/main/java/io/netty/handler/codec/mqtt/MqttCodecUtil.java

@@ -43,7 +43,7 @@ final class MqttCodecUtil {
             return clientId != null && clientId.length() >= MIN_CLIENT_ID_LENGTH &&
                 clientId.length() <= MAX_CLIENT_ID_LENGTH;
         }
-        if (mqttVersion == MqttVersion.MQTT_3_1_1 || mqttVersion == MqttVersion.Wildfire_1) {
+        if (mqttVersion.protocolLevel() >= MqttVersion.MQTT_3_1_1.protocolLevel()) {
             // In 3.1.3.1 Client Identifier of MQTT 3.1.1 specification, The Server MAY allow ClientId’s
             // that contain more than 23 encoded bytes. And, The Server MAY allow zero-length ClientId.
             return clientId != null;

broker/src/main/java/io/netty/handler/codec/mqtt/MqttDecoder.java

@@ -223,7 +223,7 @@ public final class MqttDecoder extends ReplayingDecoder<DecoderState> {
         final int willQos = (b1 & 0x18) >> 3;
         final boolean willFlag = (b1 & 0x04) == 0x04;
         final boolean cleanSession = (b1 & 0x02) == 0x02;
-        if (mqttVersion == MqttVersion.MQTT_3_1_1 || mqttVersion == MqttVersion.Wildfire_1) {
+        if (mqttVersion.protocolLevel() >= MqttVersion.MQTT_3_1_1.protocolLevel()) {
             final boolean zeroReservedFlag = (b1 & 0x01) == 0x0;
             if (!zeroReservedFlag) {
                 // MQTT v3.1.1: The Server MUST validate that the reserved flag in the CONNECT Control Packet is

broker/src/main/java/io/netty/handler/codec/mqtt/MqttVersion.java

@@ -25,7 +25,9 @@ import io.netty.util.internal.ObjectUtil;
 public enum MqttVersion {
     MQTT_3_1("MQIsdp", (byte) 3),
     MQTT_3_1_1("MQTT", (byte) 4),
-    Wildfire_1("MQTT", (byte) 5);
+    Wildfire_1("MQTT", (byte) 5),
+    Wildfire_2("MQTT", (byte) 6),
+    Wildfire_Max("MQTT", (byte) 7);
 
     private final String name;
     private final byte level;

broker/src/main/java/win/liyufan/im/HttpUtils.java

@@ -52,7 +52,14 @@ public class HttpUtils {
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                LOG.info("POST to {} success with response", url, response.body().string());
+                LOG.info("POST to {} success with response: {}", url, response.body());
+                try {
+                    if (response.body() != null) {
+                        response.body().close();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }

broker/src/main/java/win/liyufan/im/IMTopic.java

@@ -71,6 +71,7 @@ public interface IMTopic {
     String ChannelPullTopic = "CHP";
 
     String GetTokenTopic = "GETTOKEN";
+    String DestroyUserTopic = "DESTROYUSER";
 
     String LoadRemoteMessagesTopic = "LRM";
 }

broker/src/main/resources/c3p0-config.xml

@@ -1,4 +1,7 @@
 <?xml version ="1.0" encoding="UTF-8"?>
+
+<!--    # 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下-->
+
 <c3p0-config>
     <!-- This is default config! -->
     <default-config>
@@ -19,7 +22,7 @@
         <!--MySQL数据库用户名-->
         <property name="user">root</property>
         <!--MySQL数据库密码-->
-        <property name="password">lt123456</property>
+        <property name="password">123456</property>
         <!-- 初始化连接池中的连接数，取值应在minPoolSize与maxPoolSize之间，默认为3-->
         <property name="initialPoolSize">10</property>
         <!--最大空闲时间，60秒内未使用则连接被丢弃。若为0则永不丢弃。默认值: 0 -->

client/pom.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <relativePath>../</relativePath>
-        <artifactId>wildfirechat-parent</artifactId>
-        <groupId>cn.wildfirechat</groupId>
-        <version>0.27</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>client</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.wildfirechat</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.fusesource.hawtbuf/hawtbuf -->
-        <dependency>
-            <groupId>org.fusesource.hawtbuf</groupId>
-            <artifactId>hawtbuf</artifactId>
-            <version>1.11</version>
-        </dependency>
-
-
-        <!-- https://mvnrepository.com/artifact/org.fusesource.hawtdispatch/hawtdispatch-transport -->
-        <dependency>
-            <groupId>org.fusesource.hawtdispatch</groupId>
-            <artifactId>hawtdispatch-transport</artifactId>
-            <version>1.22</version>
-        </dependency>
-
-
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4.10</version>
-        </dependency>
-    </dependencies>
-
-</project>

client/src/main/java/cn/wildfirechat/client/IMClient.java

@@ -1,424 +0,0 @@
-package cn.wildfirechat.client;
-
-import cn.wildfirechat.proto.ProtoConstants;
-import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.InputRoute;
-import io.moquette.spi.impl.security.AES;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-import org.fusesource.mqtt.client.*;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-
-import static cn.wildfirechat.client.IMClient.ConnectionStatus.ConnectionStatus_Connected;
-import static cn.wildfirechat.client.IMClient.ConnectionStatus.ConnectionStatus_Connecting;
-import static cn.wildfirechat.client.IMClient.ConnectionStatus.ConnectionStatus_Unconnected;
-
-
-public class IMClient implements Listener {
-    private final String userId;
-    private final String token;
-    private final String clientId;
-    private final String host;
-    private final int port;
-    private ConnectionStatusCallback connectionStatusCallback;
-    private ReceiveMessageCallback receiveMessageCallback;
-    private ConnectionStatus connectionStatus;
-
-    protected String mqttServerIp;
-    protected long mqttServerPort;
-    private static byte[] commonSecret= {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F};
-    protected String privateSecret;
-
-    private long messageHead;
-
-    private transient MQTT mqtt = new MQTT();
-    private transient CallbackConnection connection = null;
-
-    public interface ReceiveMessageCallback {
-        void onReceiveMessages(List<WFCMessage.Message> messageList, boolean hasMore);
-        void onRecallMessage(long messageUid);
-    }
-
-    public interface ConnectionStatusCallback {
-        void onConnectionStatusChanged(ConnectionStatus newStatus);
-    }
-
-    public interface SendMessageCallback {
-        void onSuccess(long messageUid, long timestamp);
-        void onFailure(int errorCode);
-    }
-
-    public enum ConnectionStatus {
-        ConnectionStatus_Unconnected,
-        ConnectionStatus_Connecting,
-        ConnectionStatus_Connected,
-    }
-
-    public IMClient(String userId, String token, String clientId, String host, int port) {
-        this.userId = userId;
-
-        byte[] data = Base64.getDecoder().decode(token);
-        data = AES.AESDecrypt(data, commonSecret, false);
-        String s = new String(data);
-        String[] ss = s.split("\\|");
-
-        this.token = ss[0];
-        this.privateSecret = ss[1];
-        this.clientId = clientId;
-        this.host = host;
-        this.port = port;
-        AES.init(commonSecret);
-    }
-
-
-    public void connect() {
-        if(route(userId, token)) {
-            try {
-                mqtt.setHost("tcp://" + mqttServerIp + ":" + mqttServerPort);
-                mqtt.setVersion("3.1.1");
-                mqtt.setKeepAlive((short)180);
-
-                mqtt.setClientId(clientId);
-                mqtt.setConnectAttemptsMax(100);
-                mqtt.setReconnectAttemptsMax(100);
-
-                mqtt.setUserName(userId);
-                byte[] password = AES.AESEncrypt(token, privateSecret);
-                mqtt.setPassword(new UTF8Buffer(password));
-
-
-                connection = mqtt.callbackConnection();
-                connection.listener(this);
-
-                //connecting
-                connectionStatus = ConnectionStatus_Connecting;
-                if(connectionStatusCallback != null) {
-                    connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
-                }
-
-                connection.connect(new Callback<byte[]>() {
-                    @Override
-                    public void onSuccess(byte[] value) {
-                        if (value != null) {
-                            try {
-                                WFCMessage.ConnectAckPayload ackPayload = WFCMessage.ConnectAckPayload.parseFrom(value);
-                                System.out.println(ackPayload.getMsgHead());
-                                messageHead = ackPayload.getMsgHead();
-                            } catch (InvalidProtocolBufferException e) {
-                                e.printStackTrace();
-                            }
-
-                        }
-
-                        System.out.println("on connect success");
-                        //connected
-                        connectionStatus = ConnectionStatus_Connected;
-                        if(connectionStatusCallback != null) {
-                            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Throwable value) {
-                        System.out.println("on connect failure");
-                        connectionStatus = ConnectionStatus_Unconnected;
-                        if(connectionStatusCallback != null) {
-                            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
-                        }
-                    }
-                });
-
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void disconnect(boolean clearSession, final Callback<Void> onComplete) {
-        this.connection.disconnect(clearSession, onComplete);
-    }
-    public void sendMessage(WFCMessage.Conversation conversation, WFCMessage.MessageContent messageContent, final SendMessageCallback callback) {
-        WFCMessage.Message message = WFCMessage.Message.newBuilder().setConversation(conversation).setContent(messageContent).setFromUser(userId).build();
-        byte[] data = message.toByteArray();
-        data = AES.AESEncrypt(data, privateSecret);
-        connection.publish("MS", data, QoS.AT_LEAST_ONCE, false, new Callback<byte[]>() {
-            @Override
-            public void onSuccess(byte[] value) {
-                if (value[0] == 0) {
-                    byte[] data = new byte[value.length-1];
-                    for (int i = 0; i < data.length; i++) {
-                        data[i] = value[i+1];
-                    }
-
-                    data = AES.AESDecrypt(data, privateSecret, true);
-                    ByteBuffer buffer = ByteBuffer.wrap(data, 0,16);
-
-                    long messageUid = buffer.getLong();
-                    long timestamp = buffer.getLong();
-                    callback.onSuccess(messageUid, timestamp);
-                } else {
-                    callback.onFailure(value[0]);
-                }
-            }
-
-            @Override
-            public void onFailure(Throwable value) {
-                callback.onFailure(-1);
-            }
-        });
-    }
-
-    protected boolean route(String userId, String token) {
-        HttpPost httpPost;
-        try{
-            HttpClient httpClient = HttpClientBuilder.create().build();
-            httpPost = new HttpPost("http://" + host + ":" + port + "/route");
-            InputRoute inputRoute = new InputRoute();
-            inputRoute.setUserId(userId);
-            inputRoute.setClientId(clientId);
-            inputRoute.setToken(token);
-
-            WFCMessage.RouteRequest routeRequest = WFCMessage.RouteRequest.newBuilder().setPlatform(0).build();
-
-            WFCMessage.IMHttpWrapper request = WFCMessage.IMHttpWrapper.newBuilder().setClientId(clientId).setToken(token).setRequest("ROUTE").setData(ByteString.copyFrom(routeRequest.toByteArray())).build();
-            byte[] data = AES.AESEncrypt(request.toByteArray(), privateSecret);
-            data = Base64.getEncoder().encode(data);
-
-            StringEntity entity = new StringEntity(new String(data), Charset.forName("UTF-8"));
-            entity.setContentEncoding("UTF-8");
-            entity.setContentType("application/json");
-            httpPost.setEntity(entity);
-
-            byte[] cidByte = AES.AESEncrypt(clientId.getBytes(), commonSecret);
-            cidByte = Base64.getEncoder().encode(cidByte);
-            String cid = new String(cidByte);
-            httpPost.setHeader("cid", cid);
-
-            byte[] uidByte = AES.AESEncrypt(userId.getBytes(), commonSecret);
-            uidByte = Base64.getEncoder().encode(uidByte);
-            String uid = new String(uidByte);
-            httpPost.setHeader("uid", uid);
-
-
-            HttpResponse response = httpClient.execute(httpPost);
-            if(response != null){
-                if (response.getStatusLine().getStatusCode() != 200) {
-                    System.out.println("Http response error {" + response.getStatusLine().getStatusCode() + "}");
-                    return false;
-                }
-                HttpEntity resEntity = response.getEntity();
-                if(resEntity != null){
-                    try {
-                        byte[] bytes = new byte[resEntity.getContent().available()];
-                        resEntity.getContent().read(bytes);
-                        if (bytes[0] == 0) {
-                            byte[] bytes1 = new byte[bytes.length -1];
-                            for (int i = 0; i < bytes1.length; i++) {
-                                bytes1[i] = bytes[i+1];
-                            }
-                            byte[] rawData = AES.AESDecrypt(bytes1, privateSecret, true);
-                            WFCMessage.RouteResponse routeResponse = WFCMessage.RouteResponse.parseFrom(rawData);
-                            mqttServerIp = routeResponse.getHost();
-                            mqttServerPort = routeResponse.getLongPort();
-                            routeResponse.getShortPort();
-                            return true;
-                        } else {
-                            System.out.println("the route failure:" + bytes[0]);
-                            return false;
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    } catch (UnsupportedOperationException e) {
-                        e.printStackTrace();
-                    }
-                }
-            } else {
-                System.out.println("Http response nil");
-            }
-        }catch(Exception ex){
-            ex.printStackTrace();
-        }
-        return false;
-    }
-
-    @Override
-    public void onConnected() {
-        System.out.println("onConnected");
-        connectionStatus = ConnectionStatus_Connecting;
-        if(connectionStatusCallback != null) {
-            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
-        }
-    }
-
-    @Override
-    public void onDisconnected() {
-        System.out.println("onDisconnected");
-        connectionStatus = ConnectionStatus_Unconnected;
-        if(connectionStatusCallback != null) {
-            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
-        }
-    }
-
-    @Override
-    public void onPublish(UTF8Buffer topic, Buffer body, Runnable ack) {
-        System.out.println("onPublish" + topic.toString());
-        ack.run();
-        if (topic.toString().equals("MN")) {
-            try {
-                WFCMessage.NotifyMessage notifyMessage = WFCMessage.NotifyMessage.parseFrom(body.toByteArray());
-                WFCMessage.PullMessageRequest request = WFCMessage.PullMessageRequest.newBuilder().setId(messageHead).setType(notifyMessage.getType()).build();
-                byte[] data = request.toByteArray();
-                data = AES.AESEncrypt(data, privateSecret);
-                connection.publish("MP", data, QoS.AT_LEAST_ONCE, false, new Callback<byte[]>(){
-                    @Override
-                    public void onSuccess(byte[] value) {
-                        if (value == null || value.length == 0) {
-                            System.out.println("Invalide data");
-                        }
-
-                        if (value[0] != 0) {
-                            System.out.println("Pull message error with errorCode:" + value[0]);
-                        }
-
-                        byte[] data = new byte[value.length - 1];
-                        for (int i = 0; i < data.length; i++) {
-                            data[i] = value[i+1];
-                        }
-
-                        try {
-                            data = AES.AESDecrypt(data, privateSecret, true);
-                            try {
-                                WFCMessage.PullMessageResult result = WFCMessage.PullMessageResult.parseFrom(data);
-                                if (receiveMessageCallback != null && result.getMessageList().size() > 0) {
-                                    List<WFCMessage.Message> messages = result.getMessageList();
-                                    List<WFCMessage.Message> out = new ArrayList<>();
-                                    for (WFCMessage.Message msg : messages) {
-                                        if (msg.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private && msg.getConversation().getTarget().equals(userId)) {
-                                            msg = msg.toBuilder().setConversation(msg.getConversation().toBuilder().setTarget(msg.getFromUser())).build();
-                                        }
-                                        out.add(msg);
-                                    }
-                                    receiveMessageCallback.onReceiveMessages(out, false);
-                                }
-                                messageHead = result.getHead();
-                            } catch (InvalidProtocolBufferException e) {
-                                e.printStackTrace();
-                            }
-
-                            System.out.println("onSuccess");
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Throwable value) {
-                        System.out.println("onFailure");
-                    }
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-    }
-
-    @Override
-    public void onFailure(Throwable value) {
-        System.out.println("onDisconnected" + value.toString());
-        if(connectionStatusCallback != null) {
-            connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Unconnected);
-        }
-    }
-
-    public void setConnectionStatusCallback(ConnectionStatusCallback connectionStatusCallback) {
-        this.connectionStatusCallback = connectionStatusCallback;
-    }
-
-    public void setReceiveMessageCallback(ReceiveMessageCallback receiveMessageCallback) {
-        this.receiveMessageCallback = receiveMessageCallback;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public String getHost() {
-        return host;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public ConnectionStatus getConnectionStatus() {
-        return connectionStatus;
-    }
-
-    public static void main(String[] args) {
-        //token与userid和clientid是绑定的，使用时一定要传入正确的userid和clientid，不然会认为token非法
-        //clientId唯一代表一个设备，只能有一个登录。如果使用同一个clientId登录多次，会出现不可预料问题。
-        IMClient client = new IMClient("KNK_K_00", "6I7UTfKSQT7VhsUJfU6UCvDeCyblLfcXPfajAFxgFGOcqvfFVQCvYy8A5vfAGUj2LSYgoM5W02MHh6jtG/otQs6ft8zLT4Efz315UlDLfrz+OSQYfwAuGFw9m0/x4ckrgiooprsKFxPMaNcCDact0qvp1dBhbeGUipdWVhI33b4=", "5B6DEB72-8A3D-45E2-A88A-47DC4E692B00", "192.168.0.193", 80);
-
-        client.setReceiveMessageCallback(new ReceiveMessageCallback() {
-            @Override
-            public void onReceiveMessages(List<WFCMessage.Message> messageList, boolean hasMore) {
-                System.out.println("recieved messages");
-            }
-
-            @Override
-            public void onRecallMessage(long messageUid) {
-                System.out.println("recalled messages");
-            }
-        });
-
-        client.setConnectionStatusCallback((ConnectionStatus newStatus) -> {
-            if (newStatus == ConnectionStatus_Connected) {
-                WFCMessage.Conversation conversation = WFCMessage.Conversation.newBuilder().setType(0).setTarget("IMININnn").setLine(0).build();
-                WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.newBuilder().setSearchableContent("helloworld").setType(1).build();
-                client.sendMessage(conversation, messageContent, new SendMessageCallback() {
-                    @Override
-                    public void onSuccess(long messageUid, long timestamp) {
-                        System.out.println("send success");
-                    }
-
-                    @Override
-                    public void onFailure(int errorCode) {
-                        System.out.println("send failure");
-                    }
-                });
-            }
-        });
-
-        client.connect();
-
-        try {
-            Thread.sleep(1000000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/BlockingConnection.java

@@ -1,154 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static org.fusesource.hawtbuf.Buffer.utf8;
-
-/**
- * <p>
- * A blocking Connection interface to MQTT.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class BlockingConnection {
-
-    private final FutureConnection next;
-
-    public BlockingConnection(FutureConnection next) {
-        this.next = next;
-    }
-
-    public boolean isConnected() {
-        return next.isConnected();
-    }
-
-    public void connect() throws Exception {
-        this.next.connect().await();
-    }
-
-    public void disconnect() throws Exception {
-        this.next.disconnect().await();
-    }
-
-    public void kill() throws Exception {
-        this.next.kill().await();
-    }
-
-    public byte[] subscribe(final Topic[] topics) throws Exception {
-        return this.next.subscribe(topics).await();
-    }
-
-    public void unsubscribe(final String[] topics) throws Exception {
-        this.next.unsubscribe(topics).await();
-    }
-
-    public void unsubscribe(final UTF8Buffer[] topics) throws Exception {
-        this.next.unsubscribe(topics).await();
-    }
-
-    public void publish(final UTF8Buffer topic, final Buffer payload, final QoS qos, final boolean retain) throws Exception {
-        this.next.publish(topic, payload, qos, retain).await();
-    }
-
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        return super.clone();    //To change body of overridden methods use File | Settings | File Templates.
-    }
-
-    public void publish(final String topic, final byte[] payload, final QoS qos, final boolean retain) throws Exception {
-        publish(utf8(topic), new Buffer(payload), qos, retain);
-    }
-
-    public Message receive() throws Exception {
-        return this.next.receive().await();
-    }
-
-    /**
-     * @return null if the receive times out.
-     */
-    public Message receive(long amount, TimeUnit unit) throws Exception {
-        Future<Message> receive = this.next.receive();
-        try {
-            Message message = receive.await(amount, unit);
-            if( message!=null ) {
-                message.blocking = true;
-            }
-            return message;
-        } catch (TimeoutException e) {
-            // Put it back on the queue..
-            receive.then(new Callback<Message>() {
-                public void onSuccess(final Message value) {
-                    next.putBackMessage(value);
-                }
-                public void onFailure(Throwable value) {
-                }
-            });
-            return null;
-        }
-    }
-
-    public void setReceiveBuffer(final long receiveBuffer) throws InterruptedException {
-        final CountDownLatch done = new CountDownLatch(1);
-        next.getDispatchQueue().execute(new Runnable() {
-            public void run() {
-                try {
-                    next.setReceiveBuffer(receiveBuffer);
-                } finally {
-                    done.countDown();
-                }
-
-            }
-        });
-        done.await();
-    }
-
-    public long getReceiveBuffer() throws InterruptedException {
-        final CountDownLatch done = new CountDownLatch(1);
-        final AtomicLong result = new AtomicLong();
-        next.getDispatchQueue().execute(new Runnable() {
-            public void run() {
-                try {
-                    result.set(next.getReceiveBuffer());
-                } finally {
-                    done.countDown();
-                }
-
-            }
-        });
-        done.await();
-        return result.get();
-    }
-
-    public void resume() {
-        next.resume();
-    }
-
-    public void suspend() {
-        next.suspend();
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/Callback.java

@@ -1,31 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-/**
- * <p>
- * Function Result that carries one value.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public interface Callback<T> {
-    public void onSuccess(T value);
-    public void onFailure(Throwable value);
-}

client/src/main/java/org/fusesource/mqtt/client/CallbackConnection.java

@@ -1,966 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.HexSupport;
-import org.fusesource.hawtbuf.UTF8Buffer;
-import org.fusesource.hawtdispatch.Dispatch;
-import org.fusesource.hawtdispatch.DispatchQueue;
-import org.fusesource.hawtdispatch.Task;
-import org.fusesource.hawtdispatch.transport.DefaultTransportListener;
-import org.fusesource.hawtdispatch.transport.HeartBeatMonitor;
-import org.fusesource.hawtdispatch.transport.SslTransport;
-import org.fusesource.hawtdispatch.transport.TcpTransport;
-import org.fusesource.hawtdispatch.transport.Transport;
-import org.fusesource.mqtt.codec.CONNACK;
-import org.fusesource.mqtt.codec.DISCONNECT;
-import org.fusesource.mqtt.codec.MQTTFrame;
-import org.fusesource.mqtt.codec.MQTTProtocolCodec;
-import org.fusesource.mqtt.codec.MessageSupport.Acked;
-import org.fusesource.mqtt.codec.PINGREQ;
-import org.fusesource.mqtt.codec.PINGRESP;
-import org.fusesource.mqtt.codec.PUBACK;
-import org.fusesource.mqtt.codec.PUBCOMP;
-import org.fusesource.mqtt.codec.PUBLISH;
-import org.fusesource.mqtt.codec.PUBREC;
-import org.fusesource.mqtt.codec.PUBREL;
-import org.fusesource.mqtt.codec.SUBACK;
-import org.fusesource.mqtt.codec.SUBSCRIBE;
-import org.fusesource.mqtt.codec.UNSUBACK;
-import org.fusesource.mqtt.codec.UNSUBSCRIBE;
-
-import javax.net.ssl.SSLContext;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ProtocolException;
-import java.net.SocketAddress;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.fusesource.hawtbuf.Buffer.utf8;
-import static org.fusesource.hawtdispatch.Dispatch.createQueue;
-
-
-/**
- * <p>
- * A callback based non/blocking Connection interface to MQTT.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class CallbackConnection {
-    
-    private static class Request {
-        private final MQTTFrame frame;
-        private final short id;
-        private final Callback cb;
-
-        Request(int id, MQTTFrame frame, Callback cb) {
-            this.id = (short) id;
-            this.cb = cb;
-            this.frame = frame;
-        }
-    }
-
-    private static final ExtendedListener DEFAULT_LISTENER = new ExtendedListener(){
-        public void onConnected() {
-        }
-        public void onDisconnected() {
-        }
-        public void onPublish(UTF8Buffer utf8Buffer, Buffer buffer, Runnable runnable) {
-            this.onFailure(createListenerNotSetError());
-        }
-        public void onPublish(UTF8Buffer topic, Buffer body, Callback<Callback<byte[]>> ack) {
-            this.onFailure(createListenerNotSetError());
-        }
-        public void onFailure(Throwable value) {
-            Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), value);
-        }
-    };
-
-    private final DispatchQueue queue;
-    private final MQTT mqtt;
-    private Transport transport;
-    private ExtendedListener listener = DEFAULT_LISTENER;
-    private Runnable refiller;
-    private Map<Short, Request> requests = new ConcurrentHashMap<Short, Request>();
-    private LinkedList<Request> overflow = new LinkedList<Request>();
-    private final HashMap<Short, Callback<byte[]>> processed = new HashMap<Short, Callback<byte[]>>();
-    private Throwable failure;
-    private boolean disconnected = false;
-    private HeartBeatMonitor heartBeatMonitor;
-    private long pingedAt;
-    private long reconnects = 0;
-    private final AtomicInteger suspendCount = new AtomicInteger(0);
-    private final AtomicInteger suspendChanges = new AtomicInteger(0);
-
-    private final HashMap<UTF8Buffer, QoS> activeSubs = new HashMap<UTF8Buffer, QoS>();
-
-
-    public CallbackConnection(MQTT mqtt) {
-        this.mqtt = mqtt;
-        if(this.mqtt.dispatchQueue == null) {
-            this.queue = createQueue("mqtt client");
-        } else {
-            this.queue = this.mqtt.dispatchQueue;
-        }
-    }
-
-    public void connect(final Callback<byte[]> cb) {
-        assert cb !=null : "Callback should not be null.";
-
-        if( transport!=null ) {
-            cb.onFailure(new IllegalStateException("Already connected"));
-            return;
-        }
-        try {
-            createTransport(new LoginHandler(cb, true));
-        } catch (Throwable e) {
-            // This error happens when the MQTT config is invalid, reattempting
-            // wont fix this case.
-            cb.onFailure(e);
-        }
-    }
-
-    void reconnect() {
-        try {
-            // And reconnect.
-            createTransport(new LoginHandler(new Callback<byte[]>() {
-                public void onSuccess(byte[] value) {
-
-                    mqtt.tracer.debug("Restoring MQTT connection state");
-                    // Setup a new overflow so that the replay can be sent out before the original overflow list.
-                    LinkedList<Request> originalOverflow = overflow;
-                    Map<Short, Request> originalRequests = requests;
-                    overflow = new LinkedList<Request>();
-                    requests = new ConcurrentHashMap<Short, Request>();
-
-                    // Restore any active subscriptions.
-                    if (!activeSubs.isEmpty()) {
-                        ArrayList<Topic> topics = new ArrayList<Topic>(activeSubs.size());
-                        for (Map.Entry<UTF8Buffer, QoS> entry : activeSubs.entrySet()) {
-                            topics.add(new Topic(entry.getKey(), entry.getValue()));
-                        }
-                        send(new SUBSCRIBE().topics(topics.toArray(new Topic[topics.size()])), null);
-                    }
-
-                    // Replay any un-acked requests..
-                    for (Map.Entry<Short, Request> entry : originalRequests.entrySet()) {
-                        MQTTFrame frame = entry.getValue().frame;
-                        frame.dup(true); // set the dup flag as these frames were previously transmitted.
-                        send(entry.getValue());
-                    }
-
-                    // Replay the original overflow
-                    for (Request request : originalOverflow) {
-                        // Stuff in the overflow never got sent out.. so no need to set the dup flag
-                        send(request);
-                    }
-
-                }
-
-                public void onFailure(Throwable value) {
-                    handleFatalFailure(value);
-                }
-            }, false));
-        } catch (Throwable e) {
-            handleFatalFailure(e);
-        }
-    }
-    void handleSessionFailure(Throwable error) {
-        // Socket failure, should we try to reconnect?
-        if( !disconnected && (mqtt.reconnectAttemptsMax<0 || reconnects < mqtt.reconnectAttemptsMax ) ) {
-
-            mqtt.tracer.debug("Reconnecting transport");
-            // Cleanup the previous transport.
-            if(heartBeatMonitor!=null) {
-                heartBeatMonitor.stop();
-                heartBeatMonitor = null;
-            }
-            final Transport t = transport;
-            transport = null;
-
-            if(t!=null) {
-                t.stop(new Task() {
-                    @Override
-                    public void run() {
-                        listener.onDisconnected();
-                        reconnect();
-                    }
-                });
-            } else {
-                reconnect();
-            }
-
-        } else {
-            // nope.
-            handleFatalFailure(error);
-        }
-    }
-
-    void reconnect(final Callback<Transport> onConnect) {
-        long reconnectDelay = mqtt.reconnectDelay;
-        if( reconnectDelay> 0 && mqtt.reconnectBackOffMultiplier > 1.0 ) {
-            reconnectDelay = (long) Math.pow(mqtt.reconnectDelay*reconnects, mqtt.reconnectBackOffMultiplier);
-        }
-        reconnectDelay = Math.min(reconnectDelay, mqtt.reconnectDelayMax);
-        reconnects += 1;
-        queue.executeAfter(reconnectDelay, TimeUnit.MILLISECONDS, new Task() {
-            @Override
-            public void run() {
-                if(disconnected) {
-                    onConnect.onFailure(createDisconnectedError());
-                } else {
-                    try {
-                        createTransport(onConnect);
-                    } catch (Exception e) {
-                        onConnect.onFailure(e);
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Creates and start a transport to the MQTT server.  Passes it to the onConnect
-     * once the transport is connected.
-     *
-     * @param onConnect
-     * @throws Exception
-     */
-    void createTransport(final Callback<Transport> onConnect) throws Exception {
-        mqtt.tracer.debug("Connecting");
-        String scheme = mqtt.host.getScheme();
-
-        final Transport transport;
-        if( "tcp".equals(scheme) ) {
-            transport = new TcpTransport();
-        }  else if( SslTransport.protocol(scheme)!=null ) {
-            SslTransport ssl = new SslTransport();
-            if( mqtt.sslContext == null ) {
-                mqtt.sslContext = SSLContext.getDefault();
-            }
-            ssl.setSSLContext(mqtt.sslContext);
-            transport = ssl;
-        } else {
-            throw new Exception("Unsupported URI scheme '"+scheme+"'");
-        }
-
-        if( mqtt.blockingExecutor == null ) {
-            mqtt.blockingExecutor = MQTT.getBlockingThreadPool();
-        }
-        transport.setBlockingExecutor(mqtt.blockingExecutor);
-        transport.setDispatchQueue(queue);
-        transport.setProtocolCodec(new MQTTProtocolCodec());
-
-        if( transport instanceof TcpTransport ) {
-            TcpTransport tcp = (TcpTransport)transport;
-            tcp.setMaxReadRate(mqtt.maxReadRate);
-            tcp.setMaxWriteRate(mqtt.maxWriteRate);
-            tcp.setReceiveBufferSize(mqtt.receiveBufferSize);
-            tcp.setSendBufferSize(mqtt.sendBufferSize);
-            tcp.setTrafficClass(mqtt.trafficClass);
-            tcp.setUseLocalHost(mqtt.useLocalHost);
-            tcp.connecting(mqtt.host, mqtt.localAddress);
-        }
-
-        transport.setTransportListener(new DefaultTransportListener(){
-            @Override
-            public void onTransportConnected() {
-                mqtt.tracer.debug("Transport connected");
-                if(disconnected) {
-                    onFailure(createDisconnectedError());
-                } else {
-                    onConnect.onSuccess(transport);
-                }
-            }
-
-            @Override
-            public void onTransportFailure(final IOException error) {
-                mqtt.tracer.debug("Transport failure: %s", error);
-                onFailure(error);
-            }
-
-            private void onFailure(final Throwable error) {
-                if(!transport.isClosed()) {
-                    transport.stop(new Task() {
-                        @Override
-                        public void run() {
-                            onConnect.onFailure(error);
-                        }
-                    });
-                }
-            }
-        });
-        transport.start(NOOP);
-    }
-
-    class LoginHandler implements Callback<Transport> {
-        private final Callback<byte[]> cb;
-        private final boolean initialConnect;
-
-        LoginHandler(Callback<byte[]> cb, boolean initialConnect) {
-            this.cb = cb;
-            this.initialConnect = initialConnect;
-        }
-
-        public void onSuccess(final Transport transport) {
-            transport.setTransportListener(new DefaultTransportListener() {
-                @Override
-                public void onTransportFailure(IOException error) {
-                    mqtt.tracer.debug("Transport failure: %s", error);
-                    transport.stop(NOOP);
-                    onFailure(error);
-                }
-
-                @Override
-                public void onTransportCommand(Object command) {
-                    MQTTFrame response = (MQTTFrame) command;
-                    mqtt.tracer.onReceive(response);
-                    try {
-                        switch (response.messageType()) {
-                            case CONNACK.TYPE:
-                                CONNACK connack = new CONNACK().decode(response);
-                                switch (connack.code()) {
-                                    case CONNECTION_ACCEPTED:
-                                        mqtt.tracer.debug("MQTT login accepted");
-                                        onSessionEstablished(transport);
-                                        listener.onConnected();
-                                        cb.onSuccess(connack.payload);
-                                        queue.execute(new Task() {
-                                            @Override
-                                            public void run() {
-                                                drainOverflow();
-                                            }
-                                        });
-                                        break;
-                                    default:
-                                        mqtt.tracer.debug("MQTT login rejected");
-                                        // Bad creds or something. No point in reconnecting.
-                                        transport.stop(NOOP);
-                                        cb.onFailure(new MQTTException("Could not connect: " + connack.code(), connack));
-                                }
-                                break;
-                            default:
-                                mqtt.tracer.debug("Received unexpected MQTT frame: %d", response.messageType());
-                                // Naughty MQTT server? No point in reconnecting.
-                                transport.stop(NOOP);
-                                cb.onFailure(new IOException("Could not connect. Received unexpected command: " + response.messageType()));
-
-                        }
-                    } catch (ProtocolException e) {
-                        mqtt.tracer.debug("Protocol error: %s", e);
-                        transport.stop(NOOP);
-                        cb.onFailure(e);
-                    }
-                }
-            });
-            transport.resumeRead();
-            if( mqtt.connect.clientId() == null ) {
-                String id = hex(transport.getLocalAddress())+Long.toHexString(System.currentTimeMillis()/1000);
-                if(id.length() > 23) {
-                    id = id.substring(0,23);
-                }
-                mqtt.connect.clientId(utf8(id));
-            }
-            MQTTFrame encoded = mqtt.connect.encode();
-            boolean accepted = transport.offer(encoded);
-            mqtt.tracer.onSend(encoded);
-            mqtt.tracer.debug("Logging in");
-            assert accepted: "First frame should always be accepted by the transport";
-        }
-        
-        private boolean tryReconnect() {
-            if(initialConnect) {
-                return mqtt.connectAttemptsMax<0 || reconnects < mqtt.connectAttemptsMax;
-            }
-            
-            return mqtt.reconnectAttemptsMax<0 || reconnects < mqtt.reconnectAttemptsMax;
-        }
-
-        public void onFailure(Throwable value) {
-            // Socket failure, should we try to reconnect?
-            if( !disconnected && tryReconnect() ) {
-                reconnect(this);
-            } else {
-                // nope.
-                cb.onFailure(value);
-            }
-        }
-    }
-
-    private boolean onRefillCalled =false;
-    public void onSessionEstablished(Transport transport) {
-        this.transport = transport;
-        if( suspendCount.get() > 0 ) {
-            this.transport.suspendRead();
-        }
-        this.transport.setTransportListener(new DefaultTransportListener() {
-            @Override
-            public void onTransportCommand(Object command) {
-                MQTTFrame frame = (MQTTFrame) command;
-                mqtt.tracer.onReceive(frame);
-                processFrame(frame);
-            }
-            @Override
-            public void onRefill() {
-                onRefillCalled =true;
-                drainOverflow();
-            }
-
-            @Override
-            public void onTransportFailure(IOException error) {
-                handleSessionFailure(error);
-            }
-        });
-        pingedAt = 0;
-        if(mqtt.getKeepAlive()>0) {
-            heartBeatMonitor = new HeartBeatMonitor();
-            heartBeatMonitor.setWriteInterval((mqtt.getKeepAlive() * 1000) / 2);
-            heartBeatMonitor.setTransport(this.transport);
-            heartBeatMonitor.suspendRead(); // to match the suspended state of the transport.
-            heartBeatMonitor.setOnKeepAlive(new Task() {
-                @Override
-                public void run() {
-                    // Don't care if the offer is rejected, just means we have data outbound.
-                    if(!disconnected && pingedAt==0) {
-                        MQTTFrame encoded = new PINGREQ().encode();
-                        if(CallbackConnection.this.transport.offer(encoded)) {
-                            mqtt.tracer.onSend(encoded);
-                            final long now = System.currentTimeMillis();
-                            final long suspends = suspendChanges.get();
-                            pingedAt = now;
-                            queue.executeAfter(CallbackConnection.this.mqtt.getKeepAlive(), TimeUnit.SECONDS, new Task() {
-                                @Override
-                                public void run() {
-                                    if (now == pingedAt) {
-                                        // if the connection remained suspend we will never get the ping response..
-                                        // Looks like the user has forgoton to resume the connection
-                                        if (suspends == suspendChanges.get() && suspendCount.get() > 0) {
-                                            // Since the connection has been suspended, we can't really
-                                            // check to see if we are getting the ping responses.
-                                            mqtt.tracer.debug("The connection has remained suspended for an extended period of time so it cannot do proper keep alive processing.  Did you forget to resume the connection?");
-                                        } else {
-                                            mqtt.tracer.debug("Ping timeout");
-                                            handleSessionFailure(new ProtocolException("Ping timeout").fillInStackTrace());
-                                        }
-                                    }
-                                }
-                            });
-                        }
-                    }
-                    
-                }
-            });
-            heartBeatMonitor.start();
-        }
-    }
-
-    public Transport transport() {
-        return transport;
-    }
-
-    public DispatchQueue getDispatchQueue() {
-        return queue;
-    }
-
-    public void resume() {
-        suspendChanges.incrementAndGet();
-        if( suspendCount.decrementAndGet() == 0 && this.transport!=null ) {
-            this.transport.resumeRead();
-            if(this.heartBeatMonitor!=null){
-                this.heartBeatMonitor.resumeRead();
-            }
-        }
-    }
-
-    public void suspend() {
-        suspendChanges.incrementAndGet();
-        if( suspendCount.incrementAndGet() == 1 && this.transport!=null ) {
-            this.transport.suspendRead();
-            if(this.heartBeatMonitor!=null){
-                this.heartBeatMonitor.suspendRead();
-            }
-        }
-    }
-
-    public CallbackConnection refiller(Runnable refiller) {
-        queue.assertExecuting();
-        this.refiller = refiller;
-        return this;
-    }
-
-    public CallbackConnection listener(final Listener original) {
-        if( original instanceof ExtendedListener ) {
-            this.listener = (ExtendedListener) original;
-        } else {
-            this.listener = new ExtendedListener() {
-                public void onPublish(UTF8Buffer topic, Buffer body, final Callback<Callback<byte[]>> ack) {
-                    original.onPublish(topic, body, new Runnable() {
-                        public void run() {
-                            ack.onSuccess(null);
-                        }
-                    });
-                }
-                public void onPublish(UTF8Buffer topic, Buffer body, Runnable ack) {
-                    original.onPublish(topic, body, ack);
-                }
-
-                public void onConnected() {
-                    original.onConnected();
-                }
-
-                public void onDisconnected() {
-                    original.onDisconnected();
-                }
-
-                public void onFailure(Throwable value) {
-                    original.onFailure(value);
-                }
-            };
-        }
-        return this;
-    }
-
-    public boolean full() {
-        queue.assertExecuting();
-        return this.transport.full();
-    }
-
-    public Throwable failure() {
-        queue.assertExecuting();
-        return failure;
-    }
-
-    public void disconnect(boolean clearSession, final Callback<Void> onComplete) {
-        if( disconnected ) {
-            if(onComplete!=null){
-                onComplete.onSuccess(null);
-            }
-            return;
-        }
-
-        disconnected = true;
-        final short requestId = getNextMessageId();
-        final Runnable stop = new Runnable() {
-            private boolean executed = false;
-            public void run() {
-                if(!executed) {
-                    executed = true;
-                    requests.remove(requestId);
-
-                    if(heartBeatMonitor!=null) {
-                        heartBeatMonitor.stop();
-                        heartBeatMonitor = null;
-                    }
-                    transport.stop(new Task() {
-                        @Override
-                        public void run() {
-                            listener.onDisconnected();
-                            if (onComplete != null) {
-                                onComplete.onSuccess(null);
-                            }
-                        }
-                    });
-                }
-            }
-        };
-        
-        Callback<Void> cb = new Callback<Void>() {
-            public void onSuccess(Void v) {
-                // To make sure DISCONNECT has been flushed out to the socket
-                onRefillCalled = false;
-                refiller = new Runnable() {
-                    public void run() {
-                        if(onRefillCalled) {
-                            stop.run();
-                        }
-                    }
-                };
-                if(transport != null){
-                    transport.flush();
-                }
-            }
-            public void onFailure(Throwable value) {
-                stop.run();
-            }
-        };
-        
-        // Pop the frame into a request so it we get notified
-        // of any failures so we continue to stop the transport.
-        if(transport!=null) {
-            MQTTFrame frame = new DISCONNECT().encode().dup(clearSession);
-            send(new Request(getNextMessageId(), frame, cb));
-        } else {
-            cb.onSuccess(null);
-        }
-    }
-
-    /**
-     * Kills the connection without a graceful disconnect.
-     * @param onComplete
-     */
-    public void kill(final Callback<Void> onComplete) {
-        if( disconnected ) {
-            if(onComplete!=null){
-                onComplete.onSuccess(null);
-            }
-            return;
-        }
-        disconnected = true;
-        if(heartBeatMonitor!=null) {
-            heartBeatMonitor.stop();
-            heartBeatMonitor = null;
-        }
-        transport.stop(new Task() {
-            @Override
-            public void run() {
-                listener.onDisconnected();
-                if (onComplete != null) {
-                    onComplete.onSuccess(null);
-                }
-            }
-        });
-    }
-
-    public void publish(String topic, byte[] payload, QoS qos, boolean retain, Callback<byte[]> cb) {
-        publish(utf8(topic), new Buffer(payload), qos, retain, cb);
-    }
-
-    public void publish(UTF8Buffer topic, Buffer payload, QoS qos, boolean retain, Callback<byte[]> cb) {
-        queue.assertExecuting();
-        if( disconnected ) {
-            cb.onFailure(createDisconnectedError());
-            return;
-        }
-        PUBLISH command = new PUBLISH().qos(qos).retain(retain);
-        command.topicName(topic).payload(payload);
-        send(command, cb);
-    }
-
-    public void subscribe(final Topic[] topics, Callback<byte[]> cb) {
-        if(topics==null) {
-            throw new IllegalArgumentException("topics must not be null");
-        }
-        queue.assertExecuting();
-        if( disconnected ) {
-            cb.onFailure(createDisconnectedError());
-            return;
-        }
-        if( listener == DEFAULT_LISTENER ) {
-            cb.onFailure(createListenerNotSetError());
-        } else {
-            send(new SUBSCRIBE().topics(topics), new ProxyCallback<byte[]>(cb){
-                @Override
-                public void onSuccess(byte[] value) {
-                    for (Topic topic : topics) {
-                        activeSubs.put(topic.name(), topic.qos());
-                    }
-                    if(next!=null) {
-                        next.onSuccess(value);
-                    }
-                }
-            });
-        }
-    }
-
-    public void unsubscribe(final UTF8Buffer[] topics, Callback<Void> cb) {
-        queue.assertExecuting();
-        if( disconnected ) {
-            cb.onFailure(createDisconnectedError());
-            return;
-        }
-        send(new UNSUBSCRIBE().topics(topics), new ProxyCallback(cb){
-            @Override
-            public void onSuccess(Object value) {
-                for (UTF8Buffer topic : topics) {
-                    activeSubs.remove(topic);
-                }
-                if(next!=null) {
-                    next.onSuccess(value);
-                }
-            }
-        });
-    }
-
-    private void send(Acked command, Callback cb) {
-        short id = 0;
-        if(command.qos() != QoS.AT_MOST_ONCE) {
-            id = getNextMessageId();
-            command.messageId(id);
-        }
-        send(new Request(id, command.encode(), cb));
-    }
-
-    private void send(Request request) {
-        if( failure !=null ) {
-            if( request.cb!=null ) {
-                request.cb.onFailure(failure);
-            }
-        } else {
-            // Put the request in the map before sending it over the wire. 
-            if(request.id!=0) {
-                this.requests.put(request.id, request);
-            }
-
-            if( overflow.isEmpty() && transport!=null && transport.offer(request.frame) ) {
-                mqtt.tracer.onSend(request.frame);
-                if(request.id==0) {
-                    if( request.cb!=null ) {
-                        ((Callback<Void>)request.cb).onSuccess(null);
-                    }
-                    
-                }
-            } else {
-                // Remove it from the request.
-                this.requests.remove(request.id);
-                overflow.addLast(request);
-            }
-        }
-    }
-
-    private short nextMessageId = 1;
-    private short getNextMessageId() {
-        short rc = nextMessageId;
-        nextMessageId++;
-        if(nextMessageId==0) {
-            nextMessageId=1;
-        }
-        return rc;
-    }
-
-    private void drainOverflow() {
-        queue.assertExecuting();
-        if( overflow.isEmpty() || transport==null ){
-            return;
-        }
-        Request request;
-        while((request=overflow.peek())!=null) {
-            if( this.transport.offer(request.frame) ) {
-                mqtt.tracer.onSend(request.frame);
-                overflow.removeFirst();
-                if(request.id==0) {
-                    if( request.cb!=null ) {
-                        ((Callback<Void>)request.cb).onSuccess(null);
-                    }
-                } else {
-                    this.requests.put(request.id, request);
-                }
-            } else {
-                break;
-            }
-        }
-        if( overflow.isEmpty() ) {
-            if( refiller!=null ) {
-                try {
-                    refiller.run();
-                } catch (Throwable e) {
-                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
-                }
-            }
-        }
-    }
-
-
-    private void completeRequest(short id, byte originalType, Object arg) {
-        Request request = requests.remove(id);
-        if( request!=null ) {
-            assert originalType==request.frame.messageType();
-            if(request.cb!=null) {
-                if( arg==null ) {
-                    ((Callback<Void>)request.cb).onSuccess(null);
-                } else {
-                    ((Callback<Object>)request.cb).onSuccess(arg);
-                }
-            }
-        } else {
-            handleFatalFailure(new ProtocolException("Command from server contained an invalid message id: " + id));
-        }
-    }
-
-    private void processFrame(MQTTFrame frame) {
-        try {
-            switch(frame.messageType()) {
-                case PUBLISH.TYPE: {
-                    PUBLISH publish = new PUBLISH().decode(frame);
-                    toReceiver(publish);
-                    break;
-                }
-                case PUBREL.TYPE:{
-                    PUBREL ack = new PUBREL().decode(frame);
-                    Callback<byte[]> onRel = processed.remove(ack.messageId());
-                    PUBCOMP response = new PUBCOMP();
-                    response.messageId(ack.messageId());
-                    send(new Request(0, response.encode(), null));
-                    if( onRel!=null ) {
-                        onRel.onSuccess(null);
-                    }
-                    break;
-                }
-                case PUBACK.TYPE:{
-                    PUBACK ack = new PUBACK().decode(frame);
-                    completeRequest(ack.messageId(), PUBLISH.TYPE, ack.payload);
-                    break;
-                }
-                case PUBREC.TYPE:{
-                    PUBREC ack = new PUBREC().decode(frame);
-                    PUBREL response = new PUBREL();
-                    response.messageId(ack.messageId());
-                    send(new Request(0, response.encode(), null));
-                    break;
-                }
-                case PUBCOMP.TYPE:{
-                    PUBCOMP ack = new PUBCOMP().decode(frame);
-                    completeRequest(ack.messageId(), PUBLISH.TYPE, null);
-                    break;
-                }
-                case SUBACK.TYPE: {
-                    SUBACK ack = new SUBACK().decode(frame);
-                    completeRequest(ack.messageId(), SUBSCRIBE.TYPE, ack.grantedQos());
-                    break;
-                }
-                case UNSUBACK.TYPE: {
-                    UNSUBACK ack = new UNSUBACK().decode(frame);
-                    completeRequest(ack.messageId(), UNSUBSCRIBE.TYPE, null);
-                    break;
-                }
-                case PINGRESP.TYPE: {
-                    pingedAt = 0;
-                    break;
-                }
-                default:
-                    throw new ProtocolException("Unexpected MQTT command type: "+frame.messageType());
-            }
-        } catch (Throwable e) {
-            handleFatalFailure(e);
-        }
-    }
-
-    static public final Task NOOP = Dispatch.NOOP;
-
-    private void toReceiver(final PUBLISH publish) {
-        if( listener !=null ) {
-            try {
-                Callback<Callback<byte[]>> cb = null;
-                switch( publish.qos() ) {
-                    case AT_LEAST_ONCE:
-                        cb = new Callback<Callback<byte[]>>() {
-                            public void onSuccess(Callback<byte[]> value) {
-                                PUBACK response = new PUBACK();
-                                response.messageId(publish.messageId());
-                                send(new Request(0, response.encode(), null));
-                                if( value !=null ) {
-                                    value.onSuccess(null);
-                                }
-                            }
-                            public void onFailure(Throwable value) {
-                            }
-                        };
-                        break;
-                    case EXACTLY_ONCE:
-                        cb = new Callback<Callback<byte[]>>() {
-                            public void onSuccess(Callback<byte[]> value) {
-                                PUBREC response = new PUBREC();
-                                response.messageId(publish.messageId());
-                                processed.put(publish.messageId(), value);
-                                send(new Request(0, response.encode(), null));
-                            }
-
-                            public void onFailure(Throwable value) {
-                            }
-                        };
-                        // Looks like a dup delivery.. filter it out.
-                        if( processed.get(publish.messageId())!=null ) {
-                            return;
-                        }
-                        break;
-                    case AT_MOST_ONCE:
-                        cb = new Callback<Callback<byte[]>>() {
-                            public void onSuccess(Callback<byte[]> value) {
-                                if (value != null) {
-                                    value.onSuccess(null);
-                                }
-                            }
-
-                            public void onFailure(Throwable value) {
-                            }
-                        };
-                }
-                listener.onPublish(publish.topicName(), publish.payload(), cb);
-            } catch (Throwable e) {
-                handleFatalFailure(e);
-            }
-        }
-    }
-
-    private void handleFatalFailure(Throwable error) {
-        if( failure == null ) {
-            failure = error;
-            
-            mqtt.tracer.debug("Fatal connection failure: %s", error);
-            // Fail incomplete requests.
-            ArrayList<Request> values = new ArrayList(requests.values());
-            requests.clear();
-            for (Request value : values) {
-                if( value.cb!= null ) {
-                    value.cb.onFailure(failure);
-                }
-            }
-
-            ArrayList<Request> overflowEntries = new ArrayList<Request>(overflow);
-            overflow.clear();
-            for (Request entry : overflowEntries) {
-                if( entry.cb !=null ) {
-                    entry.cb.onFailure(failure);
-                }
-            }
-            
-            if( listener !=null && !disconnected ) {
-                try {
-                    listener.onFailure(failure);
-                } catch (Exception e) {
-                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
-                }
-            }
-        }
-    }
-
-    private static IllegalStateException createListenerNotSetError() {
-        return (IllegalStateException) new IllegalStateException("No connection listener set to handle message received from the server.").fillInStackTrace();
-    }
-
-    private static IllegalStateException createDisconnectedError() {
-        return (IllegalStateException) new IllegalStateException("Disconnected").fillInStackTrace();
-    }
-
-    static private  String hex(SocketAddress address) {
-        if( address instanceof InetSocketAddress ) {
-            InetSocketAddress isa = (InetSocketAddress)address;
-            return HexSupport.toHexFromBuffer(new Buffer(isa.getAddress().getAddress()))+Integer.toHexString(isa.getPort());
-        }
-        return "";
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/client/ExtendedListener.java

@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2016, Red Hat Inc.  All rights reserved.
- *
- *     http://redhat.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public interface ExtendedListener extends Listener {
-    public void onPublish(UTF8Buffer topic, Buffer body, Callback<Callback<byte[]>> ack);
-}

client/src/main/java/org/fusesource/mqtt/client/Future.java

@@ -1,33 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * <p>A simplified Future function results interface.</p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public interface Future<T> {
-    T await() throws Exception;
-    T await(long amount, TimeUnit unit) throws Exception;
-    void then(Callback<T> callback);
-
-}

client/src/main/java/org/fusesource/mqtt/client/FutureConnection.java

@@ -1,258 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-import org.fusesource.hawtdispatch.DispatchQueue;
-import org.fusesource.hawtdispatch.Task;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-
-import static org.fusesource.hawtbuf.Buffer.utf8;
-
-/**
- * <p>
- * A Future based optionally-blocking Connection interface to MQTT.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class FutureConnection {
-
-    private final CallbackConnection next;
-
-    private final LinkedList<Promise<Message>> receiveFutures = new LinkedList<Promise<Message>>();
-    private final LinkedList<Message> receivedFrames = new LinkedList<Message>();
-
-    private volatile boolean connected;
-
-    private long receiveBuffer = 1024*1024;
-    private long receiveBufferRemaining = receiveBuffer;
-    private boolean receiveBufferFull = false;
-
-    public FutureConnection(CallbackConnection next) {
-        this.next = next;
-        this.next.listener(new ExtendedListener() {
-
-            public void onConnected() {
-                connected = true;
-            }
-
-            public void onDisconnected() {
-                connected = false;
-            }
-
-
-            public void onPublish(UTF8Buffer topic, final Buffer payload, final Callback<Callback<byte[]>> onComplete) {
-                getDispatchQueue().assertExecuting();
-                receiveBufferRemaining -= payload.length();
-                if( !receiveBufferFull && receiveBufferRemaining <=0 ) {
-                    receiveBufferFull = true;
-                    suspend();
-                }
-                deliverMessage(new Message(getDispatchQueue(), topic, payload, new Callback<Callback<byte[]>>() {
-                    public void onSuccess(Callback<byte[]> value) {
-                        processed();
-                        onComplete.onSuccess(value);
-                    }
-                    public void onFailure(Throwable value) {
-                        processed();
-                        onComplete.onFailure(value);
-                    }
-
-                    private void processed() {
-                        getDispatchQueue().assertExecuting();
-                        receiveBufferRemaining += payload.length();
-                        if( receiveBufferFull && receiveBufferRemaining >0 ) {
-                            receiveBufferFull = false;
-                            resume();
-                        }
-                    }
-
-                }));
-            }
-
-            public void onPublish(UTF8Buffer topic, Buffer payload, final Runnable onComplete) {
-                onPublish(topic, payload, new Callback<Callback<byte[]>>() {
-                    public void onSuccess(Callback<byte[]> value) {
-                        onComplete.run();
-                    }
-                    public void onFailure(Throwable value) {
-                    }
-                });
-            }
-
-            public void onFailure(Throwable value) {
-                getDispatchQueue().assertExecuting();
-                ArrayList<Promise<?>> tmp = new ArrayList<Promise<?>>(receiveFutures);
-                receiveFutures.clear();
-                for (Promise<?> future : tmp) {
-                    future.onFailure(value);
-                }
-                connected = false;
-            }
-        });
-    }
-
-    void deliverMessage(Message msg) {
-        if( receiveFutures.isEmpty() ) {
-            receivedFrames.add(msg);
-        } else {
-            receiveFutures.removeFirst().onSuccess(msg);
-        }
-    }
-
-    void putBackMessage(Message msg) {
-        if( receiveFutures.isEmpty() ) {
-            receivedFrames.addFirst(msg);
-        } else {
-            receiveFutures.removeFirst().onSuccess(msg);
-        }
-    }
-
-    public boolean isConnected() {
-        return connected;
-    }
-
-    public DispatchQueue getDispatchQueue() {
-        return this.next.getDispatchQueue();
-    }
-
-
-    public Future<byte[]> connect() {
-        final Promise<byte[]> future = new Promise<byte[]>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.connect(future);
-            }
-        });
-        return future;
-    }
-
-    public Future<Void> disconnect() {
-        final Promise<Void> future = new Promise<Void>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.disconnect(false, future);
-            }
-        });
-        return future;
-    }
-
-    public Future<Void> kill() {
-        final Promise<Void> future = new Promise<Void>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.kill(future);
-            }
-        });
-        return future;
-    }
-
-    public Future<byte[]> subscribe(final Topic[] topics) {
-        final Promise<byte[]> future = new Promise<byte[]>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.subscribe(topics, future);
-            }
-        });
-        return future;
-    }
-    
-    public Future<Void> unsubscribe(final String[] topics) {
-        UTF8Buffer[] buffers = new UTF8Buffer[topics.length];
-        for (int i = 0; i < buffers.length; i++) {
-            buffers[i] = new UTF8Buffer(topics[i]);
-        }
-        return unsubscribe(buffers);
-    }
-
-    public Future<Void> unsubscribe(final UTF8Buffer[] topics) {
-        final Promise<Void> future = new Promise<Void>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.unsubscribe(topics, future);
-            }
-        });
-        return future;
-    }
-
-    public Future<byte[]> publish(final String topic, final byte[] payload, final QoS qos, final boolean retain) {
-        return publish(utf8(topic), new Buffer(payload), qos, retain);
-    }
-
-    public Future<byte[]> publish(final UTF8Buffer topic, final Buffer payload,  final QoS qos, final boolean retain) {
-        final Promise<byte[]> future = new Promise<byte[]>();
-        next.getDispatchQueue().execute(new Task() {
-            public void run() {
-                next.publish(topic, payload, qos, retain, future);
-            }
-        });
-        return future;
-    }
-
-    public Future<Message> receive() {
-        final Promise<Message> future = new Promise<Message>();
-        getDispatchQueue().execute(new Task(){
-            public void run() {
-                if( next.failure()!=null ) {
-                    future.onFailure(next.failure());
-                } else {
-                    if( receivedFrames.isEmpty() ) {
-                        receiveFutures.add(future);
-                    } else {
-                        future.onSuccess(receivedFrames.removeFirst());
-                    }
-                }
-            }
-        });
-        return future;
-    }
-
-    public long getReceiveBuffer() {
-        getDispatchQueue().assertExecuting();
-        return receiveBuffer;
-    }
-
-    public void setReceiveBuffer(long receiveBuffer) {
-        getDispatchQueue().assertExecuting();
-        long prev = this.receiveBuffer;
-        this.receiveBuffer = receiveBuffer;
-        long diff = prev-receiveBuffer;
-
-        receiveBufferRemaining -= diff;
-        if( !receiveBufferFull && receiveBufferRemaining <=0 ) {
-            receiveBufferFull = true;
-            suspend();
-        } else if( receiveBufferFull && receiveBufferRemaining >0 ) {
-            receiveBufferFull = false;
-            resume();
-        }
-    }
-
-    public void resume() {
-        next.resume();
-    }
-
-    public void suspend() {
-        next.suspend();
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/Listener.java

@@ -1,36 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-@Deprecated
-public interface Listener {
-    public void onConnected();
-    public void onDisconnected();
-    public void onPublish(UTF8Buffer topic, Buffer body, Runnable ack);
-    public void onFailure(Throwable value);
-}

client/src/main/java/org/fusesource/mqtt/client/MQTT.java

@@ -1,392 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.UTF8Buffer;
-import org.fusesource.hawtdispatch.DispatchQueue;
-import org.fusesource.hawtdispatch.transport.*;
-import org.fusesource.mqtt.codec.CONNECT;
-
-import javax.net.ssl.SSLContext;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.*;
-
-import static org.fusesource.hawtbuf.Buffer.utf8;
-import static org.fusesource.hawtdispatch.Dispatch.createQueue;
-
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class MQTT {
-
-    private static final long KEEP_ALIVE = Long.parseLong(System.getProperty("mqtt.thread.keep_alive", Integer.toString(1000)));
-    private static final long STACK_SIZE = Long.parseLong(System.getProperty("mqtt.thread.stack_size", Integer.toString(1024*512)));
-    private static ThreadPoolExecutor blockingThreadPool;
-
-
-    public synchronized static ThreadPoolExecutor getBlockingThreadPool() {
-        if( blockingThreadPool == null ) {
-            blockingThreadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, KEEP_ALIVE, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>(), new ThreadFactory() {
-                    public Thread newThread(Runnable r) {
-                        Thread rc = new Thread(null, r, "MQTT Task", STACK_SIZE);
-                        rc.setDaemon(true);
-                        return rc;
-                    }
-                }) {
-
-                    @Override
-                    public void shutdown() {
-                        // we don't ever shutdown since we are shared..
-                    }
-
-                    @Override
-                    public List<Runnable> shutdownNow() {
-                        // we don't ever shutdown since we are shared..
-                        return Collections.emptyList();
-                    }
-                };
-        }
-        return blockingThreadPool;
-    }
-    public synchronized static void setBlockingThreadPool(ThreadPoolExecutor pool) {
-        blockingThreadPool = pool;
-    }
-    
-    private static final URI DEFAULT_HOST = createDefaultHost();
-    private static URI createDefaultHost() {
-        try {
-            return new URI("tcp://127.0.0.1:1883");
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-
-    protected URI host = DEFAULT_HOST;
-    protected URI localAddress;
-    protected SSLContext sslContext;
-    protected DispatchQueue dispatchQueue;
-    protected Executor blockingExecutor;
-    protected int maxReadRate;
-    protected int maxWriteRate;
-    protected int trafficClass = TcpTransport.IPTOS_THROUGHPUT;
-    protected int receiveBufferSize = 1024*64;
-    protected int sendBufferSize = 1024*64;
-    protected boolean useLocalHost = true;
-    protected CONNECT connect = new CONNECT();
-
-    protected long reconnectDelay = 10;
-    protected long reconnectDelayMax = 30*1000;
-    protected double reconnectBackOffMultiplier = 2.0f;
-    protected long reconnectAttemptsMax = -1;
-    protected long connectAttemptsMax = -1;
-    protected Tracer tracer = new Tracer();
-
-    public MQTT() {
-    }
-    public MQTT(MQTT other) {
-        this.host = other.host;
-        this.localAddress = other.localAddress;
-        this.sslContext = other.sslContext;
-        this.dispatchQueue = other.dispatchQueue;
-        this.blockingExecutor = other.blockingExecutor;
-        this.maxReadRate = other.maxReadRate;
-        this.maxWriteRate = other.maxWriteRate;
-        this.trafficClass = other.trafficClass;
-        this.receiveBufferSize = other.receiveBufferSize;
-        this.sendBufferSize = other.sendBufferSize;
-        this.useLocalHost = other.useLocalHost;
-        this.connect = new CONNECT(other.connect);
-        this.reconnectDelay = other.reconnectDelay;
-        this.reconnectDelayMax = other.reconnectDelayMax;
-        this.reconnectBackOffMultiplier = other.reconnectBackOffMultiplier;
-        this.reconnectAttemptsMax = other.reconnectAttemptsMax;
-        this.connectAttemptsMax = other.connectAttemptsMax;
-        this.tracer = other.tracer;
-    }
-
-    public CallbackConnection callbackConnection() {
-        if( !isCleanSession() && ( getClientId()==null || getClientId().length==0 )) {
-            throw new IllegalArgumentException("The client id MUST be configured when clean session is set to false");
-        }
-        return new CallbackConnection(new MQTT(this));
-    }
-    public FutureConnection futureConnection() {
-        return new FutureConnection(callbackConnection());
-    }
-    public BlockingConnection blockingConnection() {
-        return new BlockingConnection(futureConnection());
-    }
-
-    public UTF8Buffer getClientId() {
-        return connect.clientId();
-    }
-
-    public short getKeepAlive() {
-        return connect.keepAlive();
-    }
-
-    public UTF8Buffer getPassword() {
-        return connect.password();
-    }
-
-    public byte getType() {
-        return connect.messageType();
-    }
-
-    public UTF8Buffer getUserName() {
-        return connect.userName();
-    }
-
-    public UTF8Buffer getWillMessage() {
-        return connect.willMessage();
-    }
-
-    public QoS getWillQos() {
-        return connect.willQos();
-    }
-
-    public UTF8Buffer getWillTopic() {
-        return connect.willTopic();
-    }
-
-    public boolean isCleanSession() {
-        return connect.cleanSession();
-    }
-
-    public boolean isWillRetain() {
-        return connect.willRetain();
-    }
-
-    public void setCleanSession(boolean cleanSession) {
-        connect.cleanSession(cleanSession);
-    }
-
-    public void setClientId(String clientId) {
-        this.setClientId(utf8(clientId));
-    }
-    public void setClientId(UTF8Buffer clientId) {
-        connect.clientId(clientId);
-    }
-
-    public void setKeepAlive(short keepAlive) {
-        connect.keepAlive(keepAlive);
-    }
-
-    public void setPassword(String password) {
-        this.setPassword(utf8(password));
-    }
-    public void setPassword(UTF8Buffer password) {
-        connect.password(password);
-    }
-
-    public void setUserName(String userName) {
-        this.setUserName(utf8(userName));
-    }
-    public void setUserName(UTF8Buffer userName) {
-        connect.userName(userName);
-    }
-
-    public void setWillMessage(String willMessage) {
-        connect.willMessage(utf8(willMessage));
-    }
-    public void setWillMessage(UTF8Buffer willMessage) {
-        connect.willMessage(willMessage);
-    }
-
-    public void setWillQos(QoS willQos) {
-        connect.willQos(willQos);
-    }
-
-    public void setVersion(String version) {
-        if( "3.1".equals(version) ) {
-            connect.version(3);
-        } else if( "3.1.1".equals(version) ) {
-            connect.version(4);
-        }
-    }
-    public String getVersion() {
-        switch(connect.version()) {
-            case 3: return "3.1";
-            case 4: return "3.1.1";
-            default: return "unknown";
-        }
-    }
-
-    public void setWillRetain(boolean willRetain) {
-        connect.willRetain(willRetain);
-    }
-
-    public void setWillTopic(String willTopic) {
-        this.setWillTopic(utf8(willTopic));
-    }
-    public void setWillTopic(UTF8Buffer willTopic) {
-        connect.willTopic(willTopic);
-    }
-
-    public Executor getBlockingExecutor() {
-        return blockingExecutor;
-    }
-
-    public void setBlockingExecutor(Executor blockingExecutor) {
-        this.blockingExecutor = blockingExecutor;
-    }
-
-    public DispatchQueue getDispatchQueue() {
-        return dispatchQueue;
-    }
-
-    public void setDispatchQueue(DispatchQueue dispatchQueue) {
-        this.dispatchQueue = dispatchQueue;
-    }
-
-    public URI getLocalAddress() {
-        return localAddress;
-    }
-
-    public void setLocalAddress(String localAddress) throws URISyntaxException {
-        this.setLocalAddress(new URI(localAddress));
-    }
-    public void setLocalAddress(URI localAddress) {
-        this.localAddress = localAddress;
-    }
-
-    public int getMaxReadRate() {
-        return maxReadRate;
-    }
-
-    public void setMaxReadRate(int maxReadRate) {
-        this.maxReadRate = maxReadRate;
-    }
-
-    public int getMaxWriteRate() {
-        return maxWriteRate;
-    }
-
-    public void setMaxWriteRate(int maxWriteRate) {
-        this.maxWriteRate = maxWriteRate;
-    }
-
-    public int getReceiveBufferSize() {
-        return receiveBufferSize;
-    }
-
-    public void setReceiveBufferSize(int receiveBufferSize) {
-        this.receiveBufferSize = receiveBufferSize;
-    }
-
-    public URI getHost() {
-        return host;
-    }
-    public void setHost(String host, int port) throws URISyntaxException {
-        this.setHost(new URI("tcp://"+host+":"+port));
-    }
-    public void setHost(String host) throws URISyntaxException {
-        this.setHost(new URI(host));
-    }
-    public void setHost(URI host) {
-        this.host = host;
-    }
-
-    public int getSendBufferSize() {
-        return sendBufferSize;
-    }
-
-    public void setSendBufferSize(int sendBufferSize) {
-        this.sendBufferSize = sendBufferSize;
-    }
-
-    public SSLContext getSslContext() {
-        return sslContext;
-    }
-
-    public void setSslContext(SSLContext sslContext) {
-        this.sslContext = sslContext;
-    }
-
-    public int getTrafficClass() {
-        return trafficClass;
-    }
-
-    public void setTrafficClass(int trafficClass) {
-        this.trafficClass = trafficClass;
-    }
-
-    public boolean isUseLocalHost() {
-        return useLocalHost;
-    }
-
-    public void setUseLocalHost(boolean useLocalHost) {
-        this.useLocalHost = useLocalHost;
-    }
-
-    public long getConnectAttemptsMax() {
-        return connectAttemptsMax;
-    }
-
-    public void setConnectAttemptsMax(long connectAttemptsMax) {
-        this.connectAttemptsMax = connectAttemptsMax;
-    }
-
-    public long getReconnectAttemptsMax() {
-        return reconnectAttemptsMax;
-    }
-
-    public void setReconnectAttemptsMax(long reconnectAttemptsMax) {
-        this.reconnectAttemptsMax = reconnectAttemptsMax;
-    }
-
-    public double getReconnectBackOffMultiplier() {
-        return reconnectBackOffMultiplier;
-    }
-
-    public void setReconnectBackOffMultiplier(double reconnectBackOffMultiplier) {
-        this.reconnectBackOffMultiplier = reconnectBackOffMultiplier;
-    }
-
-    public long getReconnectDelay() {
-        return reconnectDelay;
-    }
-
-    public void setReconnectDelay(long reconnectDelay) {
-        this.reconnectDelay = reconnectDelay;
-    }
-
-    public long getReconnectDelayMax() {
-        return reconnectDelayMax;
-    }
-
-    public void setReconnectDelayMax(long reconnectDelayMax) {
-        this.reconnectDelayMax = reconnectDelayMax;
-    }
-
-    public Tracer getTracer() {
-        return tracer;
-    }
-
-    public void setTracer(Tracer tracer) {
-        this.tracer = tracer;
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/MQTTException.java

@@ -1,14 +0,0 @@
-package org.fusesource.mqtt.client;
-
-import java.io.IOException;
-
-import org.fusesource.mqtt.codec.CONNACK;
-
-public class MQTTException extends IOException {
-  public final CONNACK connack;
-
-  public MQTTException(String msg, CONNACK connack) {
-    super(msg);
-    this.connack = connack;
-  }
-}

client/src/main/java/org/fusesource/mqtt/client/Message.java

@@ -1,104 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.UTF8Buffer;
-import org.fusesource.hawtdispatch.DispatchQueue;
-import org.fusesource.hawtdispatch.Task;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class Message {
-
-    private final UTF8Buffer topic;
-    private final Buffer payload;
-    private Callback<Callback<byte[]>>  onComplete;
-    private final DispatchQueue queue;
-    boolean blocking = false;
-
-    public Message(DispatchQueue queue, UTF8Buffer topic, Buffer payload, Callback<Callback<byte[]>> onComplete) {
-        this.queue = queue;
-        this.payload = payload;
-        this.topic = topic;
-        this.onComplete = onComplete;
-    }
-
-    public byte[] getPayload() {
-        return payload.toByteArray();
-    }
-
-    /**
-     * Using getPayloadBuffer() is lower overhead version of getPayload()
-     * since it avoids a byte array copy.
-     * @return
-     */
-    public Buffer getPayloadBuffer() {
-        return payload;
-    }
-
-    public String getTopic() {
-        return topic.toString();
-    }
-
-    /**
-     * Using getTopicBuffer is lower overhead version of getTopic()
-     * since it avoid doing UTF-8 decode.
-     * @return
-     */
-    public UTF8Buffer getTopicBuffer() {
-        return topic;
-    }
-
-    public void ack() {
-        if( blocking ) {
-            final Promise<byte[]> future = new Promise<byte[]>();
-            ack(future);
-            try {
-                future.await();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            ack(null);
-        }
-    }
-
-    public void ack(final Callback<byte[]> onAcked) {
-        if(onComplete!=null) {
-            queue.execute(new Task() {
-                Callback<Callback<byte[]>> onCompleteCopy = onComplete;
-                @Override
-                public void run() {
-                    onCompleteCopy.onSuccess(onAcked);
-                }
-            });
-            onComplete = null;
-        } else {
-            if( onAcked!=null ) {
-                onAcked.onSuccess(null);
-            }
-        }
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/client/NoopCallback.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-/**
- * <p>
- * Function Result that carries one value.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class NoopCallback<T> implements Callback<T> {
-
-    public final Callback<T> next;
-
-    public NoopCallback(Callback<T> next) {
-        this.next = next;
-    }
-
-    public void onSuccess(T value) {
-        if( next!=null ) {
-            next.onSuccess(value);
-        }
-    }
-
-    public void onFailure(Throwable value) {
-        if( next!=null ) {
-            next.onFailure(value);
-        }
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/Promise.java

@@ -1,109 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class Promise<T> implements Callback<T>, Future<T> {
-
-    private final CountDownLatch latch = new CountDownLatch(1);
-    private Callback<T> next;
-    private Throwable error;
-    private T value;
-
-    public void onFailure(Throwable value) {
-        Callback<T> callback = null;
-        synchronized(this)  {
-            error = value;
-            latch.countDown();
-            callback = next;
-        }
-        if( callback!=null ) {
-            callback.onFailure(value);
-        }
-    }
-
-    public void onSuccess(T value) {
-        Callback<T> callback = null;
-        synchronized(this)  {
-            this.value = value;
-            latch.countDown();
-            callback = next;
-        }
-        if( callback!=null ) {
-            callback.onSuccess(value);
-        }
-    }
-
-    public void then(Callback<T> callback) {
-        boolean fire = false;
-        synchronized(this)  {
-            next = callback;
-            if( latch.getCount() == 0 ) {
-                fire = true;
-            }
-        }
-        if( fire ) {
-            if( error!=null ) {
-                callback.onFailure(error);
-            } else {
-                callback.onSuccess(value);
-            }
-        }
-    }
-
-    public T await(long amount, TimeUnit unit) throws Exception {
-        if( latch.await(amount, unit) ) {
-            return get();
-        } else {
-            throw new TimeoutException();
-        }
-    }
-
-    public T await() throws Exception {
-        latch.await();
-        return get();
-    }
-
-    private T get() throws Exception {
-        Throwable e = error;
-        if( e !=null ) {
-            if( e instanceof RuntimeException ) {
-                throw (RuntimeException) e;
-            } else if( e instanceof Exception) {
-                throw (Exception) e;
-            } else if( e instanceof Error) {
-                throw (Error) e;
-            } else {
-                // don't expect to hit this case.
-                throw new RuntimeException(e);
-            }
-        }
-        return value;
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/client/ProxyCallback.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-/**
- * <p>
- * Function Result that carries one value.
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class ProxyCallback<T> implements Callback<T> {
-
-    public final Callback<T> next;
-
-    public ProxyCallback(Callback<T> next) {
-        this.next = next;
-    }
-
-    public void onSuccess(T value) {
-        if( next!=null ) {
-            next.onSuccess(value);
-        }
-    }
-
-    public void onFailure(Throwable value) {
-        if( next!=null ) {
-            next.onFailure(value);
-        }
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/QoS.java

@@ -1,31 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-/**
-* <p>
-* </p>
-*
-* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
-*/
-public enum QoS {
-    AT_MOST_ONCE,
-    AT_LEAST_ONCE,
-    EXACTLY_ONCE
-}

client/src/main/java/org/fusesource/mqtt/client/Topic.java

@@ -1,78 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class Topic {
-
-    private final UTF8Buffer name;
-    private final QoS qos;
-
-    public Topic(String name, QoS qos) {
-        this(new UTF8Buffer(name), qos);
-    }
-
-    public Topic(UTF8Buffer name, QoS qos) {
-        this.name = name;
-        this.qos = qos;
-    }
-
-    public UTF8Buffer name() {
-        return name;
-    }
-
-    public QoS qos() {
-        return qos;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o == null) return false;
-        if (o.getClass() != this.getClass()) return false;
-        if (this == o) return true;
-
-        Topic topic = (Topic) o;
-
-        if (name != null ? !name.equals(topic.name) : topic.name != null) return false;
-        if (qos != topic.qos) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = name != null ? name.hashCode() : 0;
-        result = 31 * result + (qos != null ? qos.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "{ name=" + name +
-                ", qos=" + qos +
-                " }";
-    }
-}

client/src/main/java/org/fusesource/mqtt/client/Tracer.java

@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.client;
-
-import org.fusesource.mqtt.codec.MQTTFrame;
-
-/**
- * A subclass of this can be configured on an MQTT connection to
- * get more insight into what it's doing.
- */
-public class Tracer {
-
-    /**
-     * Override to log/capture debug level messages
-     * @param message
-     * @param args
-     */
-    public void debug(String message, Object...args) {
-    }
-
-    /**
-     * Called when a MQTTFrame sent to the remote peer.
-     * @param frame
-     */
-    public void onSend(MQTTFrame frame) {
-    }
-
-    /**
-     * Called when a MQTTFrame is received from the remote peer.
-     * @param frame
-     */
-    public void onReceive(MQTTFrame frame) {
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/CONNACK.java

@@ -1,103 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.hawtbuf.*;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import static org.fusesource.mqtt.codec.MessageSupport.*;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class CONNACK implements Message {
-
-    public static final byte TYPE = 2;
-
-    public byte[] payload;
-
-    public static enum Code {
-        CONNECTION_ACCEPTED,
-        CONNECTION_REFUSED_UNACCEPTED_PROTOCOL_VERSION,
-        CONNECTION_REFUSED_IDENTIFIER_REJECTED,
-        CONNECTION_REFUSED_SERVER_UNAVAILABLE,
-        CONNECTION_REFUSED_BAD_USERNAME_OR_PASSWORD,
-        CONNECTION_REFUSED_NOT_AUTHORIZED;
-    }
-
-    private Code code = Code.CONNECTION_ACCEPTED;
-
-
-    
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public CONNACK decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-        is.skip(1);
-        byte c = is.readByte();
-        if( c >= Code.values().length ) {
-            throw new ProtocolException("Invalid CONNACK encoding");
-        }
-        code = Code.values()[c];
-        payload = new byte[is.available()];
-        try {
-            is.read(payload);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream(2);
-            os.writeByte(0);
-            os.writeByte(code.ordinal());
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    public Code code() {
-        return code;
-    }
-
-    public CONNACK code(Code code) {
-        this.code = code;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "CONNACK{" +
-                "code=" + code +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/CONNECT.java

@@ -1,284 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class CONNECT implements MessageSupport.Message {
-
-    public static final byte TYPE = 1;
-    
-    private static final UTF8Buffer V3_PROTOCOL_NAME = new UTF8Buffer("MQIsdp");
-    private static final UTF8Buffer V4_PROTOCOL_NAME = new UTF8Buffer("MQTT");
-
-    private short keepAlive = 30;
-    private UTF8Buffer clientId;
-    private UTF8Buffer willTopic;
-    private UTF8Buffer willMessage = new UTF8Buffer("");
-    private boolean willRetain;
-    private byte willQos;
-    private boolean cleanSession = true;
-    private UTF8Buffer userName;
-    private UTF8Buffer password;
-    private int version = 3;
-
-
-    public CONNECT(){
-    }
-
-    public CONNECT(CONNECT other) {
-        this.keepAlive = other.keepAlive;
-        this.clientId = other.clientId;
-        this.willTopic = other.willTopic;
-        this.willMessage = other.willMessage;
-        this.willRetain = other.willRetain;
-        this.willQos = other.willQos;
-        this.cleanSession = other.cleanSession;
-        this.userName = other.userName;
-        this.password = other.password;
-        this.version = other.version;
-    }
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public CONNECT decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-
-        UTF8Buffer protocolName = MessageSupport.readUTF(is);
-        if (V4_PROTOCOL_NAME.equals(protocolName)) {
-            version = is.readByte() & 0xFF;
-            if( version < 4 ) {
-                throw new ProtocolException("Invalid CONNECT frame: protocol name/version mismatch");
-            }
-        } else if( V3_PROTOCOL_NAME.equals(protocolName) ) {
-            version = is.readByte() & 0xFF;
-            if( version != 3 ) {
-                throw new ProtocolException("Invalid CONNECT frame: protocol name/version mismatch");
-            }
-        } else {
-            throw new ProtocolException("Invalid CONNECT frame");
-        }
-
-        byte flags = is.readByte();
-        boolean username_flag = (flags & 0x80) > 0;
-        boolean password_flag = (flags & 0x40) > 0;
-        willRetain = (flags & 0x20) > 0;
-        willQos = (byte) ((flags & 0x18) >>> 3);
-        boolean will_flag = (flags & 0x04) > 0;
-        cleanSession = (flags & 0x02) > 0;
-
-        keepAlive = is.readShort();
-        clientId = MessageSupport.readUTF(is);
-        if( clientId.length == 0 ) {
-            clientId = null;
-        }
-        if(will_flag) {
-            willTopic = MessageSupport.readUTF(is);
-            willMessage = MessageSupport.readUTF(is);
-        }
-        if( username_flag ) {
-            userName = MessageSupport.readUTF(is);
-        }
-        if( password_flag ) {
-            password = MessageSupport.readUTF(is);
-        }
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            if( (clientId==null || clientId.length == 0) && !cleanSession ) {
-                throw new IllegalArgumentException("A clean session must be used when no clientId is specified");
-            }
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream(500);
-            if(version==3) {
-                MessageSupport.writeUTF(os, V3_PROTOCOL_NAME);
-                os.writeByte(version);
-            } else if(version >= 4) {
-                MessageSupport.writeUTF(os, V4_PROTOCOL_NAME);
-                os.writeByte(version);
-            } else {
-                throw new IllegalArgumentException("Invalid version: "+version);
-            }
-
-            int flags = 0;
-            if(userName!=null) {
-                flags |= 0x80;
-            }
-            if(password!=null) {
-                flags |= 0x40;
-            }
-            if(willTopic!=null && willMessage!=null) {
-                flags |= 0x04;
-                if(willRetain) {
-                    flags |= 0x20;
-                }
-                flags |= (willQos << 3) & 0x18;
-            }
-            if(cleanSession) {
-                flags |= 0x02;
-            }
-            os.writeByte(flags);
-            os.writeShort(keepAlive);
-            MessageSupport.writeUTF(os, clientId);
-            if(willTopic!=null && willMessage!=null) {
-                MessageSupport.writeUTF(os, willTopic);
-                MessageSupport.writeUTF(os, willMessage);
-            }
-            if(userName!=null) {
-                MessageSupport.writeUTF(os, userName);
-            }
-            if(password!=null) {
-                MessageSupport.writeUTF(os, password);
-            }
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    public boolean cleanSession() {
-        return cleanSession;
-    }
-
-    public CONNECT cleanSession(boolean cleanSession) {
-        this.cleanSession = cleanSession;
-        return this;
-    }
-
-    public UTF8Buffer clientId() {
-        return clientId;
-    }
-
-    public CONNECT clientId(UTF8Buffer clientId) {
-        this.clientId = clientId;
-        return this;
-    }
-
-    public short keepAlive() {
-        return keepAlive;
-    }
-
-    public CONNECT keepAlive(short keepAlive) {
-        this.keepAlive = keepAlive;
-        return this;
-    }
-
-    public UTF8Buffer password() {
-        return password;
-    }
-
-    public CONNECT password(UTF8Buffer password) {
-        this.password = password;
-        return this;
-    }
-
-    public UTF8Buffer userName() {
-        return userName;
-    }
-
-    public CONNECT userName(UTF8Buffer userName) {
-        this.userName = userName;
-        return this;
-    }
-
-    public UTF8Buffer willMessage() {
-        return willMessage;
-    }
-
-    public CONNECT willMessage(UTF8Buffer willMessage) {
-        this.willMessage = willMessage;
-        return this;
-    }
-
-    public QoS willQos() {
-        return QoS.values()[willQos];
-    }
-
-    public CONNECT willQos(QoS willQos) {
-        this.willQos = (byte) willQos.ordinal();
-        return this;
-    }
-
-    public boolean willRetain() {
-        return willRetain;
-    }
-
-    public CONNECT willRetain(boolean willRetain) {
-        this.willRetain = willRetain;
-        return this;
-    }
-
-    public UTF8Buffer willTopic() {
-        return willTopic;
-    }
-
-    public CONNECT willTopic(UTF8Buffer willTopic) {
-        this.willTopic = willTopic;
-        return this;
-    }
-
-    public int version() {
-        return version;
-    }
-
-    public CONNECT version(int version) {
-        if(version==3) {
-            this.version = version;
-        } else if(version >= 4) {
-            this.version = version;
-        } else {
-            throw new IllegalArgumentException("Invalid version: "+version);
-        }
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "CONNECT{" +
-                "cleanSession=" + cleanSession +
-                ", keepAlive=" + keepAlive +
-                ", clientId=" + clientId +
-                ", willTopic=" + willTopic +
-                ", willMessage=" + willMessage +
-                ", willRetain=" + willRetain +
-                ", willQos=" + willQos +
-                ", userName=" + userName +
-                ", password=" + password +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/DISCONNECT.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class DISCONNECT extends MessageSupport.EmptyBase implements MessageSupport.Message {
-
-    public static final byte TYPE = 14;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public DISCONNECT decode(MQTTFrame frame) throws ProtocolException {
-        return (DISCONNECT) super.decode(frame);
-    }
-
-    @Override
-    public String toString() {
-        return "DISCONNECT";
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/MQTTFrame.java

@@ -1,159 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.Buffer;
-
-/**
-* <p>
-* </p>
-*
-* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
-*/
-public class MQTTFrame extends MessageSupport.HeaderBase {
-
-    private static final Buffer[] NO_BUFFERS = new Buffer[0];
-
-    public Buffer[] buffers = NO_BUFFERS;
-
-    public MQTTFrame() {
-    }
-    public MQTTFrame( Buffer buffer) {
-        this(new Buffer[]{buffer});
-    }
-    public MQTTFrame( Buffer[] buffers) {
-        this.buffers = buffers;
-    }
-
-    public Buffer[] buffers() {
-        return buffers;
-    }
-    public MQTTFrame buffers(Buffer...buffers) {
-        this.buffers = buffers;
-        return this;
-    }
-
-    public MQTTFrame buffer(Buffer buffer) {
-        this.buffers = new Buffer[]{buffer};
-        return this;
-    }
-
-    @Override
-    public byte header() {
-        return super.header();
-    }
-
-    @Override
-    public MQTTFrame header(byte header) {
-        return (MQTTFrame)super.header(header);
-    }
-
-    @Override
-    public byte messageType() {
-        return super.messageType();
-    }
-
-    @Override
-    public MQTTFrame commandType(int type) {
-        return (MQTTFrame)super.commandType(type);
-    }
-
-    @Override
-    public boolean dup() {
-        return super.dup();
-    }
-
-    @Override
-    public MQTTFrame dup(boolean dup) {
-        return (MQTTFrame) super.dup(dup);
-    }
-
-    @Override
-    public QoS qos() {
-        return super.qos();
-    }
-
-    @Override
-    public MQTTFrame qos(QoS qos) {
-        return (MQTTFrame) super.qos(qos);
-    }
-
-    @Override
-    public boolean retain() {
-        return super.retain();
-    }
-
-    @Override
-    public MQTTFrame retain(boolean retain) {
-        return (MQTTFrame) super.retain(retain);
-    }
-
-    @Override
-    public String toString() {
-        String type = "unknown";
-        switch(messageType()) {
-            case CONNECT.TYPE:
-                type = "CONNECT";
-                break;
-            case CONNACK.TYPE:
-                type = "CONNACK";
-                break;
-            case DISCONNECT.TYPE:
-                type = "DISCONNECT";
-                break;
-            case PINGREQ.TYPE:
-                type = "PINGREQ";
-                break;
-            case PINGRESP.TYPE:
-                type = "PINGRESP";
-                break;
-            case SUBSCRIBE.TYPE:
-                type = "SUBSCRIBE";
-                break;
-            case UNSUBSCRIBE.TYPE:
-                type = "UNSUBSCRIBE";
-                break;
-            case UNSUBACK.TYPE:
-                type = "UNSUBACK";
-                break;
-            case PUBLISH.TYPE:
-                type = "PUBLISH";
-                break;
-            case SUBACK.TYPE:
-                type = "SUBACK";
-                break;
-            case PUBACK.TYPE:
-                type = "PUBACK";
-                break;
-            case PUBREC.TYPE:
-                type = "PUBREC";
-                break;
-            case PUBREL.TYPE:
-                type = "PUBREL";
-                break;
-            case PUBCOMP.TYPE:
-                type = "PUBCOMP";
-                break;
-            default:
-        }
-
-        return "MQTTFrame { type: "+type+", qos: "+qos()+", dup:"+dup()+" }";
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/MQTTProtocolCodec.java

@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtdispatch.transport.AbstractProtocolCodec;
-import org.fusesource.hawtdispatch.util.BufferPools;
-
-import java.io.IOException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class MQTTProtocolCodec extends AbstractProtocolCodec {
-
-    private static final BufferPools BUFFER_POOLS = new BufferPools();
-
-    private int maxMessageLength = 1024*1024*100;
-
-    public MQTTProtocolCodec() {
-        this.bufferPools = BUFFER_POOLS;
-    }
-
-    public int getMaxMessageLength() {
-        return maxMessageLength;
-    }
-
-    public void setMaxMessageLength(int maxMessageLength) {
-        this.maxMessageLength = maxMessageLength;
-    }
-
-    @Override
-    protected void encode(Object value) throws IOException {
-        MQTTFrame frame = (MQTTFrame) value;
-        nextWriteBuffer.write(frame.header());
-
-        int remaining = 0;
-        for(Buffer buffer : frame.buffers) {
-            remaining += buffer.length;
-        }
-        do {
-            byte digit = (byte) (remaining & 0x7F);
-            remaining >>>= 7;
-            if (remaining > 0) {
-                digit |= 0x80;
-            }
-            nextWriteBuffer.write(digit);
-        } while (remaining > 0);
-        for(Buffer buffer : frame.buffers) {
-            nextWriteBuffer.write(buffer.data, buffer.offset, buffer.length);
-        }
-    }
-
-    @Override
-    protected Action initialDecodeAction() {
-        return readHeader;
-    }
-
-    private final Action readHeader = new Action() {
-        public MQTTFrame apply() throws IOException {
-            int length = readLength();
-            if( length >= 0 ) {
-                if( length > maxMessageLength) {
-                    throw new IOException("The maximum message length was exceeded");
-                }
-                byte header = readBuffer.get(readStart);
-                readStart = readEnd;
-                if( length > 0 ) {
-                    nextDecodeAction = readBody(header, length);
-                } else {
-                    return new MQTTFrame().header(header);
-                }
-            }
-            return null;
-        }
-    };
-
-    private int readLength() throws IOException {
-        readEnd = readStart+2; // Header is at least 2 bytes..
-        int limit = readBuffer.position();
-        int length = 0;
-        int multiplier = 1;
-        byte digit;
-
-        while (readEnd-1 < limit) {
-            // last byte is part of the encoded length..
-            digit = readBuffer.get(readEnd-1);
-            length += (digit & 0x7F) * multiplier;
-            if( (digit & 0x80) == 0 ) {
-                return length;
-            }
-
-            // length extends out one more byte..
-            multiplier <<= 7;
-            readEnd++;
-        }
-        return -1;
-    }
-
-    Action readBody(final byte header, final int length) {
-        return new Action() {
-            public MQTTFrame apply() throws IOException {
-                int limit = readBuffer.position();
-                if ((limit - readStart) < length) {
-                    readEnd = limit;
-                    return null;
-                } else {
-                    Buffer body = new Buffer(readBuffer.array(), readStart, length);
-                    readEnd = readStart = readStart + length;
-                    nextDecodeAction = readHeader;
-                    return new MQTTFrame(body).header(header);
-                }
-            }
-        };
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/MessageSupport.java

@@ -1,202 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public final class MessageSupport {
-
-    private MessageSupport() throws InstantiationException {
-        throw new InstantiationException("This class is not for instantiation");
-    }
-
-    /**
-     * All command objects implement this interface.
-     */
-    static public interface Message {
-        public byte messageType();
-        public Message decode(MQTTFrame frame) throws ProtocolException;
-        public MQTTFrame encode();
-    }
-
-
-    /**
-     * All command objects that can get acked implement this interface.
-     */
-    static public interface Acked extends Message {
-        public boolean dup();
-        public Acked dup(boolean dup);
-        public QoS qos();
-        public short messageId();
-        public Acked messageId(short messageId);
-    }
-
-    static protected UTF8Buffer readUTF(DataByteArrayInputStream is) throws ProtocolException {
-        int size = is.readUnsignedShort();
-        Buffer buffer = is.readBuffer(size);
-        if (buffer == null || buffer.length != size) {
-            throw new ProtocolException("Invalid message encoding");
-        }
-        return buffer.utf8();
-    }
-
-    static protected void writeUTF(DataByteArrayOutputStream os, Buffer buffer) throws IOException {
-        os.writeShort(buffer.length);
-        os.write(buffer);
-    }
-
-    static abstract public class AckBase {
-
-        private short messageId;
-        public byte[] payload;
-
-        abstract byte messageType();
-
-        protected AckBase decode(MQTTFrame frame) throws ProtocolException {
-            assert(frame.buffers.length == 1);
-            DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-            messageId = is.readShort();
-            payload = new byte[is.available()];
-            try {
-                is.read(payload);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            return this;
-        }
-
-        public MQTTFrame encode() {
-            try {
-                DataByteArrayOutputStream os = new DataByteArrayOutputStream(2);
-                os.writeShort(messageId);
-
-                MQTTFrame frame = new MQTTFrame();
-                frame.commandType(messageType());
-                return frame.buffer(os.toBuffer());
-            } catch (IOException e) {
-                throw new RuntimeException("The impossible happened");
-            }
-        }
-
-        public short messageId() {
-            return messageId;
-        }
-
-        protected AckBase messageId(short messageId) {
-            this.messageId = messageId;
-            return this;
-        }
-
-        @Override
-        public String toString() {
-            return getClass().getSimpleName()+"{" +
-                "messageId=" + messageId +
-                '}';
-        }
-    }
-
-    static abstract public class EmptyBase {
-        abstract  byte messageType();
-
-        protected EmptyBase decode(MQTTFrame frame) throws ProtocolException {
-            return this;
-        }
-        public MQTTFrame encode() {
-            return new MQTTFrame().commandType(messageType());
-        }
-    }
-
-
-   /**
-    * <p>
-    * </p>
-    *
-    * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
-    */
-   static public class HeaderBase {
-
-       protected byte header;
-
-       protected byte header() {
-           return header;
-       }
-       protected HeaderBase header(byte header) {
-           this.header = header;
-           return this;
-       }
-
-       protected byte messageType() {
-           return (byte) ((header & 0xF0) >>> 4);
-       }
-       protected HeaderBase commandType(int type) {
-           this.header &= 0x0F;
-           this.header |= (type << 4) & 0xF0;
-           return this;
-       }
-
-       protected QoS qos() {
-           return QoS.values()[((header & 0x06) >>> 1)];
-       }
-       protected HeaderBase qos(QoS qos) {
-           this.header &= 0xF9;
-           this.header |= (qos.ordinal() << 1) & 0x06;
-           return this;
-       }
-
-       protected boolean dup() {
-           return (header & 0x08) > 0;
-       }
-       protected HeaderBase dup(boolean dup) {
-           if(dup) {
-               this.header |= 0x08;
-           } else {
-               this.header &= 0xF7;
-           }
-           return this;
-       }
-
-       protected boolean retain() {
-           return (header & 0x01) > 0;
-       }
-       protected HeaderBase retain(boolean retain) {
-           if(retain) {
-               this.header |= 0x01;
-           } else {
-               this.header &= 0xFE;
-           }
-           return this;
-       }
-
-   }
-
-
-}

client/src/main/java/org/fusesource/mqtt/codec/PINGREQ.java

@@ -1,48 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-import static org.fusesource.mqtt.codec.MessageSupport.*;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PINGREQ extends MessageSupport.EmptyBase implements Message {
-
-    public static final byte TYPE = 12;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public PINGREQ decode(MQTTFrame frame) throws ProtocolException {
-        return (PINGREQ) super.decode(frame);
-    }
-
-    @Override
-    public String toString() {
-        return "PINGREQ";
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/PINGRESP.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PINGRESP extends MessageSupport.EmptyBase implements MessageSupport.Message {
-
-    public static final byte TYPE = 13;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public PINGRESP decode(MQTTFrame frame) throws ProtocolException {
-        return (PINGRESP) super.decode(frame);
-    }
-
-    @Override
-    public String toString() {
-        return "PINGRESP";
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/PUBACK.java

@@ -1,46 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PUBACK extends MessageSupport.AckBase implements MessageSupport.Message {
-
-    public static final byte TYPE = 4;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public PUBACK decode(MQTTFrame frame) throws ProtocolException {
-        return (PUBACK) super.decode(frame);
-    }
-
-    @Override
-    public PUBACK messageId(short messageId) {
-        return (PUBACK) super.messageId(messageId);
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/PUBCOMP.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PUBCOMP extends MessageSupport.AckBase implements MessageSupport.Message {
-
-    public static final byte TYPE = 7;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public PUBCOMP decode(MQTTFrame frame) throws ProtocolException {
-        return (PUBCOMP) super.decode(frame);
-    }
-
-    @Override
-    public PUBCOMP messageId(short messageId) {
-        return (PUBCOMP) super.messageId(messageId);
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/PUBLISH.java

@@ -1,159 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PUBLISH extends MessageSupport.HeaderBase implements MessageSupport.Message, MessageSupport.Acked {
-
-    public static final byte TYPE = 3;
-
-    private UTF8Buffer topicName;
-    private short messageId;
-    private Buffer payload;
-
-    public PUBLISH() {
-        qos(QoS.AT_LEAST_ONCE);
-    }
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public PUBLISH decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        header(frame.header());
-
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-        topicName = MessageSupport.readUTF(is);
-        
-        QoS qos = qos();
-        if(qos != QoS.AT_MOST_ONCE) {
-            messageId = is.readShort();
-        }
-        payload = is.readBuffer(is.available());
-        if( payload == null ) {
-            payload = new Buffer(0);
-        }
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream();
-            MessageSupport.writeUTF(os, topicName);
-            QoS qos = qos();
-            if(qos != QoS.AT_MOST_ONCE) {
-                os.writeShort(messageId);
-            }
-            MQTTFrame frame = new MQTTFrame();
-            frame.header(header());
-            frame.commandType(TYPE);
-            if(payload!=null && payload.length!=0) {
-                os.write(payload);
-            }
-            frame.buffer(os.toBuffer());
-            return frame;
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    @Override
-    public boolean dup() {
-        return super.dup();
-    }
-
-    @Override
-    public PUBLISH dup(boolean dup) {
-        return (PUBLISH) super.dup(dup);
-    }
-
-    @Override
-    public QoS qos() {
-        return super.qos();
-    }
-
-    @Override
-    public PUBLISH qos(QoS qos) {
-        return (PUBLISH) super.qos(qos);
-    }
-
-    @Override
-    public boolean retain() {
-        return super.retain();
-    }
-
-    @Override
-    public PUBLISH retain(boolean retain) {
-        return (PUBLISH) super.retain(retain);
-    }
-
-    public short messageId() {
-        return messageId;
-    }
-
-    public PUBLISH messageId(short messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
-    public Buffer payload() {
-        return payload;
-    }
-
-    public PUBLISH payload(Buffer payload) {
-        this.payload = payload;
-        return this;
-    }
-
-    public UTF8Buffer topicName() {
-        return topicName;
-    }
-
-    public PUBLISH topicName(UTF8Buffer topicName) {
-        this.topicName = topicName;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "PUBLISH{" +
-                "dup=" + dup() +
-                ", qos=" + qos() +
-                ", retain=" + retain() +
-                ", messageId=" + messageId +
-                ", topicName=" + topicName +
-                ", payload=" + payload +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/PUBREC.java

@@ -1,47 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PUBREC extends MessageSupport.AckBase implements MessageSupport.Message {
-
-    public static final byte TYPE = 5;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public PUBREC decode(MQTTFrame frame) throws ProtocolException {
-        return (PUBREC) super.decode(frame);
-    }
-
-    @Override
-    public PUBREC messageId(short messageId) {
-        return (PUBREC) super.messageId(messageId);
-    }
-
-}

client/src/main/java/org/fusesource/mqtt/codec/PUBREL.java

@@ -1,103 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class PUBREL extends MessageSupport.HeaderBase implements MessageSupport.Message, MessageSupport.Acked {
-
-    public static final byte TYPE = 6;
-
-    private short messageId;
-
-    public byte messageType() {
-        return TYPE;
-    }
-    
-    public PUBREL() {
-        qos(QoS.AT_LEAST_ONCE);
-    }
-
-    public PUBREL decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        header(frame.header());
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-        messageId = is.readShort();
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream(2);
-            os.writeShort(messageId);
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.header(header());
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-
-    @Override
-    public boolean dup() {
-        return super.dup();
-    }
-
-    @Override
-    public PUBREL dup(boolean dup) {
-        return (PUBREL) super.dup(dup);
-    }
-
-    @Override
-    public QoS qos() {
-        return super.qos();
-    }
-
-    public short messageId() {
-        return messageId;
-    }
-
-    public PUBREL messageId(short messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "PUBREL{" +
-                "dup=" + dup() +
-                ", qos=" + qos() +
-                ", messageId=" + messageId +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/SUBACK.java

@@ -1,94 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.util.Arrays;
-import static org.fusesource.mqtt.codec.MessageSupport.*;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class SUBACK implements Message {
-
-    public static final byte[] NO_GRANTED_QOS = new byte[0];
-    public static final byte TYPE = 9;
-
-    private short messageId;
-    private byte[] grantedQos = NO_GRANTED_QOS;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public SUBACK decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-        messageId = is.readShort();
-        grantedQos = is.readBuffer(is.available()).toByteArray();
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream(2+grantedQos.length);
-            os.writeShort(messageId);
-            os.write(grantedQos);
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    public byte[] grantedQos() {
-        return grantedQos;
-    }
-
-    public SUBACK grantedQos(byte[] grantedQos) {
-        this.grantedQos = grantedQos;
-        return this;
-    }
-
-    public short messageId() {
-        return messageId;
-    }
-
-    public SUBACK messageId(short messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "SUBACK{" +
-                "grantedQos=" + Arrays.toString(grantedQos) +
-                ", messageId=" +messageId +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/SUBSCRIBE.java

@@ -1,134 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.mqtt.client.Topic;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class SUBSCRIBE extends MessageSupport.HeaderBase implements MessageSupport.Message, MessageSupport.Acked {
-
-    public static final byte TYPE = 8;
-    public static final Topic[] NO_TOPICS = new Topic[0];
-
-    private short messageId;
-    private Topic[] topics = NO_TOPICS;
-
-    public SUBSCRIBE() {
-        qos(QoS.AT_LEAST_ONCE);
-    }
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public SUBSCRIBE decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        header(frame.header());
-
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-        QoS qos = qos();
-        if(qos != QoS.AT_MOST_ONCE) {
-            messageId = is.readShort();
-        }
-        ArrayList<Topic> list = new ArrayList<Topic>();
-        while(is.available() > 0) {
-            Topic topic = new Topic(MessageSupport.readUTF(is), QoS.values()[is.readByte()]);
-            list.add(topic);
-        }
-        topics = list.toArray(new Topic[list.size()]);
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream();
-            QoS qos = qos();
-            if(qos != QoS.AT_MOST_ONCE) {
-                os.writeShort(messageId);
-            }
-            for(Topic topic: topics) {
-                MessageSupport.writeUTF(os, topic.name());
-                os.writeByte(topic.qos().ordinal());
-            }
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.header(header());
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    @Override
-    public boolean dup() {
-        return super.dup();
-    }
-
-    @Override
-    public SUBSCRIBE dup(boolean dup) {
-        return (SUBSCRIBE) super.dup(dup);
-    }
-
-    @Override
-    public QoS qos() {
-        return super.qos();
-    }
-
-    public short messageId() {
-        return messageId;
-    }
-
-    public SUBSCRIBE messageId(short messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
-    public Topic[] topics() {
-        return topics;
-    }
-
-    public SUBSCRIBE topics(Topic[] topics) {
-        this.topics = topics;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "SUBSCRIBE{" +
-                "dup=" + dup() +
-                ", qos=" + qos() +
-                ", messageId=" + messageId +
-                ", topics=" + (topics == null ? null : Arrays.asList(topics)) +
-                '}';
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/UNSUBACK.java

@@ -1,49 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import java.net.ProtocolException;
-
-import static org.fusesource.mqtt.codec.MessageSupport.AckBase;
-import static org.fusesource.mqtt.codec.MessageSupport.*;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class UNSUBACK extends AckBase implements Message {
-
-    public static final byte TYPE = 11;
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    @Override
-    public UNSUBACK decode(MQTTFrame frame) throws ProtocolException {
-        return (UNSUBACK) super.decode(frame);
-    }
-
-    @Override
-    public UNSUBACK messageId(short messageId) {
-        return (UNSUBACK) super.messageId(messageId);
-    }
-}

client/src/main/java/org/fusesource/mqtt/codec/UNSUBSCRIBE.java

@@ -1,130 +0,0 @@
-/**
- * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
- *
- *     http://fusesource.com
- *
- * 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.fusesource.mqtt.codec;
-
-import org.fusesource.mqtt.client.QoS;
-import org.fusesource.hawtbuf.DataByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
-import org.fusesource.hawtbuf.UTF8Buffer;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * <p>
- * </p>
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class UNSUBSCRIBE extends MessageSupport.HeaderBase implements MessageSupport.Message, MessageSupport.Acked {
-
-    public static final byte TYPE = 10;
-    public static final UTF8Buffer[] NO_TOPICS = new UTF8Buffer[0];
-
-    private short messageId;
-    private UTF8Buffer[] topics = NO_TOPICS;
-
-    public UNSUBSCRIBE() {
-        qos(QoS.AT_LEAST_ONCE);
-    }
-
-    public byte messageType() {
-        return TYPE;
-    }
-
-    public UNSUBSCRIBE decode(MQTTFrame frame) throws ProtocolException {
-        assert(frame.buffers.length == 1);
-        header(frame.header());
-
-        DataByteArrayInputStream is = new DataByteArrayInputStream(frame.buffers[0]);
-
-        messageId = is.readShort();
-        ArrayList<UTF8Buffer> list = new ArrayList<UTF8Buffer>();
-        while(is.available() > 0) {
-            list.add(MessageSupport.readUTF(is));
-        }
-        topics = list.toArray(new UTF8Buffer[list.size()]);
-        return this;
-    }
-    
-    public MQTTFrame encode() {
-        try {
-            DataByteArrayOutputStream os = new DataByteArrayOutputStream();
-            QoS qos = qos();
-            if(qos != QoS.AT_MOST_ONCE) {
-                os.writeShort(messageId);
-            }
-            for(UTF8Buffer topic: topics) {
-                MessageSupport.writeUTF(os, topic);
-            }
-
-            MQTTFrame frame = new MQTTFrame();
-            frame.header(header());
-            frame.commandType(TYPE);
-            return frame.buffer(os.toBuffer());
-        } catch (IOException e) {
-            throw new RuntimeException("The impossible happened");
-        }
-    }
-
-    @Override
-    public boolean dup() {
-        return super.dup();
-    }
-
-    @Override
-    public UNSUBSCRIBE dup(boolean dup) {
-        return (UNSUBSCRIBE) super.dup(dup);
-    }
-
-    @Override
-    public QoS qos() {
-        return super.qos();
-    }
-
-    public short messageId() {
-        return messageId;
-    }
-
-    public UNSUBSCRIBE messageId(short messageId) {
-        this.messageId = messageId;
-        return this;
-    }
-
-    public UTF8Buffer[] topics() {
-        return topics;
-    }
-
-    public UNSUBSCRIBE topics(UTF8Buffer[] topics) {
-        this.topics = topics;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "UNSUBSCRIBE{" +
-                "dup=" + dup() +
-                ", qos=" + qos() +
-                ", messageId=" + messageId +
-                ", topics=" + (topics == null ? null : Arrays.asList(topics)) +
-                '}';
-    }
-}

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.27</version>
+        <version>0.36</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn.wildfirechat.pojos/InputDestroyUser.java

@@ -0,0 +1,22 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+public class InputDestroyUser {
+    private String userId;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -11,6 +11,7 @@ public interface APIPath {
     String Sensitive_Query = "/admin/sensitive/query";
 
     String Create_User = "/admin/user/create";
+    String Destroy_User = "/admin/user/destroy";
     String Create_Robot = "/admin/robot/create";
     String User_Get_Token = "/admin/user/get_token";
     String User_Update_Block_Status = "/admin/user/update_block_status";
@@ -36,6 +37,8 @@ public interface APIPath {
     String Group_Member_List = "/admin/group/member/list";
     String Group_Member_Add = "/admin/group/member/add";
     String Group_Member_Kickoff = "/admin/group/member/del";
+    String Group_Set_Manager = "/admin/group/manager/set";
+    String Get_User_Groups = "/admin/group/of_user";
 
 
     String Create_Channel = "/admin/channel/create";