update version to 0.30

Bump org.eclipse.paho.client.mqttv3 from 1.0.2 to 1.2.1 in /broker

.gitignore

@@ -49,6 +49,8 @@ maven-metadata.xml
 /bin/
 broker/config/git.properties
 distribution/src/main/resources/git.properties
+license/target
+server/target
 broker/h2db
 broker/media
 common/target

README.md

@@ -1,13 +1,12 @@
 ## 野火IM解决方案
 
-野火IM是一套跨平台、全开源的即时通讯解决方案，主要包含以下内容。
+野火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) | 机器人服务端                                            |                                                |
@@ -20,11 +19,18 @@
 
 开发一套IM系统真的很艰辛，请路过的朋友们给点个star，支持我们坚持下去🙏🙏🙏🙏🙏
 
-
 ### 联系我们
-问题讨论请加群：822762829
 
-微信公众号：
+> 商务合作请优先采用邮箱和我们联系。技术问题请到[野火IM论坛](http://bbs.wildfirechat.cn/)发帖交流
+
+1. heavyrain.lee  邮箱: heavyrain.lee@wildfirechat.cn  微信：wildfirechat
+2. imndx  邮箱: imndx@wildfirechat.cn  微信：wfchat
+
+### 问题交流
+
+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% />
 
@@ -35,6 +41,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,9 +1,18 @@
+#
+#
+# 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下
+#
+#
+
+
+
 #*********************************************************************
 # Server configuration
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
-#客户端会从${http_port}端口获取到长链接端口。
+#客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
-server.ip 192.168.1.100
+# （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
+server.ip 0.0.0.0
 
 ##原生客户端长链接端口
 port 1883
@@ -26,7 +35,7 @@ host 0.0.0.0
 ##本地绑定端口
 local_port 80
 
-##是否使用内置DB。0使用mysql；1使用h2db
+##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
 embed.db 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用逗号分割。这个密钥对安全性帮助不大，客户不要修改
@@ -43,7 +53,10 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 token.key testim
 
 ##首次登录，是否接收之前的历史消息。0 不接收；1接收。
-message.roaming 1
+message.roaming 0
+
+##是否开启拉取远程历史消息
+message.remote_history_message 0
 
 #*********************************************************************
 # hazelcase configuration
@@ -98,10 +111,20 @@ push.android.server.address http://localhost:8085/android/push
 push.ios.server.address http://localhost:8085/ios/push
 
 
+#*********************************************************************
+# MongoDB configuration
+#*********************************************************************
+#专业版支持，社区版请忽略
+#mongodb.client_uri mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+#mongodb.client_uri mongodb://host1:27017,host2:27017,host3:27017/wfchat?replicaSet=myReplicaSet
+mongodb.client_uri mongodb://wfc:123456@localhost:27017/wfchat
+mongodb.database wfchat
+mongodb.data_expire_days 1096
+
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***
+##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
 sensitive.filter.type 0
 
 #*********************************************************************

broker/migrate/h2/V13__create_settings_table.sql

@@ -0,0 +1,10 @@
+
+DROP TABLE IF EXISTS `t_settings`;
+CREATE TABLE `t_settings` (
+  `id` int(11) NOT NULL PRIMARY KEY,
+  `value` varchar(64) NOT NULL,
+  `desc` varchar(128) NOT NULL
+);
+
+
+insert into t_settings(`id`, `value`,`desc`) values (1, '3000', '最大群成员数量');

broker/migrate/h2/V14__add_id_for_sensitive_word.sql

@@ -0,0 +1 @@
+alter table `t_sensitiveword` add column `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT;

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/mysql/V18__create_settings_table.sql

@@ -0,0 +1,13 @@
+
+DROP TABLE IF EXISTS `t_settings`;
+CREATE TABLE `t_settings` (
+  `id` int(11) NOT NULL PRIMARY KEY,
+  `value` varchar(64) NOT NULL,
+  `desc` varchar(128) NOT NULL default ""
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+
+insert into t_settings(`id`, `value`,`desc`) values (1, "3000", "最大群成员数量");

broker/migrate/mysql/V19__add_id_for_sensitive_word.sql

@@ -0,0 +1 @@
+alter table `t_sensitiveword` add column `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT;

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/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.25</version>
+        <version>0.30</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>
@@ -110,7 +104,7 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
             <classifier>linux-x86_64</classifier>
-            <!-- 
+            <!--
             <classifier>${os.detected.name}-${os.detected.arch}</classifier>
              -->
         </dependency>
@@ -147,7 +141,7 @@
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>[0.9.5.3,)</version>
+            <version>0.9.5.4</version>
         </dependency>
 
         <!-- needs extra dependencies: objenesis & hamcrest -->
@@ -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>
@@ -233,6 +227,11 @@
             <version>5.2.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>3.4.1</version>
+        </dependency>
 
     </dependencies>
 

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

@@ -22,6 +22,8 @@ import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import cn.wildfirechat.common.ErrorCode;
 
+import java.nio.charset.StandardCharsets;
+
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
@@ -84,7 +86,7 @@ abstract public class Action {
         if (request instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
-            String content = new String(bytes);
+            String content = new String(bytes, StandardCharsets.UTF_8);//contribute by JiaRG from github
             Gson gson = new Gson();
             T t = gson.fromJson(content, cls);
             return t;

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

@@ -0,0 +1,94 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.*;
+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.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+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.concurrent.Executor;
+
+@Route(APIPath.Create_Channel)
+@HttpMethod("POST")
+public class CreateChannelAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputCreateChannel inputCreateChannel = getRequestBody(request.getNettyRequest(), InputCreateChannel.class);
+            if (inputCreateChannel != null
+                && !StringUtil.isNullOrEmpty(inputCreateChannel.getName())) {
+
+
+                if(StringUtil.isNullOrEmpty(inputCreateChannel.getTargetId())) {
+                    inputCreateChannel.setTargetId(messagesStore.getShortUUID());
+                }
+
+                RPCCenter.getInstance().sendRequest(inputCreateChannel.getOwner(), null, IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), inputCreateChannel.getOwner(), 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, new OutputCreateChannel(inputCreateChannel.getTargetId()));
+                        } 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/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/GetSystemSettingAction.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.SystemSettingPojo;
+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;
+
+@Route(APIPath.Get_System_Setting)
+@HttpMethod("POST")
+public class GetSystemSettingAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return false;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
+            if (inputUserId != null) {
+                SystemSettingPojo output = messagesStore.getSystemSetting(inputUserId.id);
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (output == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    result = RestResult.ok(output);
+                }
+
+                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/ModifyGroupInfoAction.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.InputModifyGroupInfo;
+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_Modify_Info)
+@HttpMethod("POST")
+public class ModifyGroupInfoAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.ModifyGroupInfoTopic, 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/action/admin/MulticastMessageAction.java

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.BroadMessageData;
+import cn.wildfirechat.pojos.BroadMessageResult;
+import cn.wildfirechat.pojos.MultiMessageResult;
+import cn.wildfirechat.pojos.MulticastMessageData;
+import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
+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.Msg_Multicast)
+@HttpMethod("POST")
+public class MulticastMessageAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            MulticastMessageData sendMessageData = getRequestBody(request.getNettyRequest(), MulticastMessageData.class);
+            if (MulticastMessageData.isValide(sendMessageData)) {
+                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.MultiCastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), 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) {
+                            long messageId = byteBuf.readLong();
+                            long timestamp = byteBuf.readLong();
+                            sendResponse(response, null, new MultiMessageResult(messageId, timestamp));
+                        } 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/action/admin/PutSystemSettingAction.java

@@ -0,0 +1,64 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.SystemSettingPojo;
+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;
+
+@Route(APIPath.Put_System_Setting)
+@HttpMethod("POST")
+public class PutSystemSettingAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.value) || !StringUtil.isNullOrEmpty(inputUserId.desc))) {
+
+
+                boolean success = messagesStore.updateSystemSetting(inputUserId.id, inputUserId.value, inputUserId.desc);
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (!success) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR);
+                } else {
+                    result = RestResult.ok();
+                }
+
+                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 <heavyrain.lee@gmail.com>
+ *
+ * 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,7 +106,12 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_Forward_Url = "message.forward.url";
 
+    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.remote_history_message";
 
 
     private BrokerConstants() {

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

@@ -22,7 +22,7 @@ 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
             ) {

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

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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 com.qiniu.util.Auth;
+import com.xiaoleilu.loServer.action.UploadFileAction;
+import io.moquette.server.config.MediaServerConfig;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+
+@Handler("GMUT")
+public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTokenRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetUploadTokenRequest request, Qos1PublishHandler.IMCallback callback) {
+        int type = request.getMediaType();
+
+        String token;
+
+        WFCMessage.GetUploadTokenResult.Builder resultBuilder = WFCMessage.GetUploadTokenResult.newBuilder();
+        if (MediaServerConfig.USER_QINIU) {
+            Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
+
+
+            String bucketName;
+            String bucketDomain;
+            switch (type) {
+                case 0:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+                case 1:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_IMAGE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_IMAGE_DOMAIN;
+                    break;
+                case 2:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VOICE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VOICE_DOMAIN;
+                    break;
+                case 3:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VIDEO_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VIDEO_DOMAIN;
+                    break;
+                case 4:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FILE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FILE_DOMAIN;
+                    break;
+                case 5:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PORTRAIT_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PORTRAIT_DOMAIN;
+                    break;
+                case 6:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN;
+                    break;
+                default:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+            }
+
+            token = auth.uploadToken(bucketName);
+            resultBuilder.setDomain(bucketDomain)
+                .setServer(MediaServerConfig.QINIU_SERVER_URL);
+            resultBuilder.setPort(80);
+        } else {
+            token = UploadFileAction.getToken(type);
+            resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
+                .setServer(MediaServerConfig.SERVER_IP);
+            resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
+        }
+
+        resultBuilder.setToken(token);
+
+        byte[] data = resultBuilder.buildPartial().toByteArray();
+        ackPayload.ensureWritable(data.length).writeBytes(data);
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+}

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

@@ -32,6 +32,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -233,6 +235,14 @@ abstract public class IMHandler<T> {
     public void afterAction(String clientID, String fromUser, String topic, Qos1PublishHandler.IMCallback callback) {
 
     }
+    protected long publish(String username, String clientID, WFCMessage.Message message) {
+        Set<String> notifyReceivers = new LinkedHashSet<>();
+
+        WFCMessage.Message.Builder messageBuilder = message.toBuilder();
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
+        this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType);
+        return notifyReceivers.size();
+    }
 
     protected long saveAndPublish(String username, String clientID, WFCMessage.Message message) {
         Set<String> notifyReceivers = new LinkedHashSet<>();
@@ -250,4 +260,12 @@ abstract public class IMHandler<T> {
         mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
         return notifyReceivers.size();
     }
+
+    protected long saveAndMulticast(String username, String clientID, WFCMessage.Message message, Collection<String> targets) {
+        Set<String> notifyReceivers = new HashSet<>();
+        notifyReceivers.addAll(targets);
+        WFCMessage.Message updatedMessage = m_messagesStore.storeMessage(username, clientID, message);
+        mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
+        return notifyReceivers.size();
+    }
 }

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

@@ -27,6 +27,12 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
         } else {
             boolean isAllow = isAdmin;
             if (!isAllow) {
+                if (groupInfo.getOwner() != null) {
+                    if (request.getRemovedMemberList().contains(groupInfo.getOwner())) {
+                        return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    }
+                }
+
                 if (groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
                     isAllow = true;
                 }

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

@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
+import io.moquette.server.Server;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.MessageShardingUtil;
+
+import java.util.Set;
+
+import static cn.wildfirechat.proto.ProtoConstants.ContentType.Text;
+import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Private;
+
+@Handler(value = IMTopic.MultiCastMessageTopic)
+public class MultiCastMessageHandler extends IMHandler<WFCMessage.MultiCastMessage> {
+
+
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.MultiCastMessage multiCastMessage, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+        if (!isAdmin) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
+        long timestamp = System.currentTimeMillis();
+        long messageId = MessageShardingUtil.generateId();
+        WFCMessage.Message message = WFCMessage.Message.newBuilder()
+            .setContent(multiCastMessage.getContent())
+            .setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setType(ConversationType_Private).setLine(multiCastMessage.getLine()).build())
+            .setFromUser(fromUser)
+            .setMessageId(messageId)
+            .setServerTimestamp(timestamp)
+            .build();
+
+        saveAndMulticast(fromUser, clientID, message, multiCastMessage.getToList());
+
+        ackPayload = ackPayload.capacity(20);
+        ackPayload.writeLong(messageId);
+        ackPayload.writeLong(timestamp);
+
+        return errorCode;
+    }
+
+}

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

@@ -21,7 +21,7 @@ import java.util.Set;
 public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser);
+        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser, isAdmin);
 
         if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
             return errorCode;
@@ -33,6 +33,10 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
+        publish(fromUser, clientID, message);
+
+
+        //等待客户端实现根据撤回消息更新内容，之后可以删掉这段代码
         m_messagesStore.getNotifyReceivers(fromUser, message.toBuilder(), notifyReceivers);
         this.publisher.publishRecall2Receivers(int64Buf.getId(), fromUser, notifyReceivers, clientID);
 

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

@@ -95,13 +95,15 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                         errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
                     } else if(mSensitiveType == 1) {
                         ignoreMsg = true;
-                    } else {
+                    } else if(mSensitiveType == 2) {
                         String text = message.getContent().getSearchableContent();
                         for (String word : matched) {
                             text = text.replace(word, "***");
                         }
 
                         message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
+                    } else if(mSensitiveType == 3) {
+
                     }
                 }
             }

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

@@ -8,6 +8,7 @@
 
 package io.moquette.persistence;
 
+import cn.wildfirechat.pojos.SystemSettingPojo;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
@@ -18,7 +19,6 @@ import com.xiaoleilu.loServer.model.FriendData;
 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;
@@ -56,8 +56,6 @@ public class DatabaseStore {
 
             statement.setString(1, userId);
 
-            statement.executeQuery();
-
             rs = statement.executeQuery();
             while (rs.next()) {
                 int index = 1;
@@ -76,6 +74,79 @@ public class DatabaseStore {
         return out;
     }
 
+    boolean updateSystemSetting(int id, String value, String desc) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "insert into t_settings " +
+                " (`id`, `value`, `desc`) values(?, ?, ?)" +
+                " ON DUPLICATE KEY UPDATE " +
+                "`value` = ?," +
+                "`desc` = ?";
+
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setLong(index++, id);
+            statement.setString(index++, value);
+            statement.setString(index++, desc);
+            statement.setString(index++, value);
+            statement.setString(index++, desc);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+            return true;
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+        return false;
+    }
+
+    SystemSettingPojo getSystemSetting(int id) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select `value`, `desc` from t_settings where `id` = ?";
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setLong(index++, id);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                SystemSettingPojo out = new SystemSettingPojo();
+                index = 1;
+
+                out.id = id;
+
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                out.value = value;
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                out.desc = value;
+
+               return out;
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return null;
+    }
+
     List<WFCMessage.User> searchUserFromDB(String keyword, boolean buzzy, int page) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -99,13 +170,17 @@ public class DatabaseStore {
             if (buzzy) {
                 sql += " where (`_display_name` like ? or `_name` = ? or `_mobile` = ?) ";
             } else {
-                sql += " where (`_display_name` = ? or `_name` = ? or `_mobile` = ?) ";
+                sql += " where (`_name` = ? or `_mobile` = ?) ";
             }
 
             sql += " and _type <> 2"; //can search normal user(0) and robot(1), can not search things
 
-            sql += " limit 20";
+            if (buzzy) {
-
+                sql += " limit 20";
+            } else {
+                sql += " limit 1";
+            }
+            
             if (page > 0) {
                 sql += "offset = '" + page * 20 + "'";
             }
@@ -115,9 +190,8 @@ public class DatabaseStore {
             int index = 1;
             if (buzzy) {
                 statement.setString(index++, "%" + keyword + "%");
-            } else {
-                statement.setString(index++, keyword);
             }
+
             statement.setString(index++, keyword);
             statement.setString(index++, keyword);
 
@@ -276,7 +350,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;
@@ -301,6 +375,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);
 
@@ -594,6 +671,25 @@ public class DatabaseStore {
         return null;
     }
 
+    void deleteMessage(long messageId) {
+        String sql = "delete from " + MessageShardingUtil.getMessageTable(messageId) + " where _mid = ?";
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            statement = connection.prepareStatement(sql);
+            statement.setLong(1, messageId);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     List<WFCMessage.Message> loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count) {
         List<WFCMessage.Message> messages = loadRemoteMessagesFromTable(user, conversation, beforeUid, count, MessageShardingUtil.getMessageTable(beforeUid));
         if (messages != null && messages.size() < count) {
@@ -818,6 +914,41 @@ public class DatabaseStore {
     }
 
 
+    void removeGroupUserSettings(String groupId, List<String> users) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            StringBuilder sb = new StringBuilder("delete from t_user_setting where _scope in (1,3,5,7) and _uid in (");
+            for (int i = 0; i < users.size(); i++) {
+                sb.append("?");
+                if (i != users.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(") and _key like '1-_-");
+            sb.append(groupId);
+            sb.append("'");
+
+
+            statement = connection.prepareStatement(sb.toString());
+            int index = 1;
+            for (String userId:users) {
+                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 persistGroupInfo(final WFCMessage.GroupInfo groupInfo) {
         mScheduler.execute(()->{
             Connection connection = null;
@@ -1025,7 +1156,7 @@ public class DatabaseStore {
                     statement.setInt(index++, request.getPlatform());
                 }
                 if (session.getPushType() != request.getPushType()) {
-                    statement.setInt(index++, request.getPushType());
+                    statement.setInt(index++, request.getPushType() >= 32 ? 0 : request.getPushType());
                 }
                 if (!strEqual(session.getDeviceName(), request.getDeviceName())) {
                     statement.setString(index++, request.getDeviceName());
@@ -1137,7 +1268,6 @@ public class DatabaseStore {
     }
 
     void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -1193,7 +1323,70 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
+    }
+
+    int removeGroupMember(String groupId, List<String> groupMembers) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        PreparedStatement statement2 = null;
+        try {
+            connection = DBUtil.getConnection();
+            connection.setAutoCommit(false);
+
+            StringBuilder sqlBuilder = new StringBuilder("update t_group_member set `_type` = ?, `_dt` = ? where `_mid` in (");
+            for (int i = 0; i < groupMembers.size(); i++) {
+                sqlBuilder.append("?");
+                if (i != groupMembers.size()-1) {
+                    sqlBuilder.append(",");
+                }
+            }
+            sqlBuilder.append(")");
+
+            sqlBuilder.append(" and _gid = ?");
+
+            statement = connection.prepareStatement(sqlBuilder.toString());
+
+            int index = 1;
+            long current = System.currentTimeMillis();
+            statement.setInt(index++, ProtoConstants.GroupMemberType.GroupMemberType_Removed);
+            statement.setLong(index++, current);
+
+            for (String memberId:groupMembers) {
+                statement.setString(index++, memberId);
+            }
+            statement.setString(index++, groupId);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+
+            String sql = "update t_group set `_member_count` = `_member_count` - ?, `_member_dt` = ? , `_dt` = ? where `_gid` = ?";
+
+            statement2 = connection.prepareStatement(sql);
+            index = 1;
+            statement2.setInt(index++, count);
+            statement2.setLong(index++, current);
+            statement2.setLong(index++, current);
+            statement2.setString(index++, groupId);
+            statement2.executeUpdate();
+            connection.commit();
+            connection.setAutoCommit(true);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            if (connection != null) {
+                try {
+                    connection.commit();
+                    connection.setAutoCommit(true);
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+            DBUtil.closeDB(connection, statement2);
+        }
+        return 0;
     }
 
     WFCMessage.GroupInfo getPersistGroupInfo(String groupId) {
@@ -1438,8 +1631,7 @@ public class DatabaseStore {
 
                 try {
                     MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    BASE64Encoder base64en = new BASE64Encoder();
+                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
-                    String passwdMd5 = base64en.encode(md5.digest(password.getBytes("utf-8")));
                     statement.setString(index, passwdMd5);
                 } catch (Exception e) {
                     statement.setString(index, "");
@@ -1614,7 +1806,6 @@ public class DatabaseStore {
 
     void updateUser(final WFCMessage.User user) {
         LOG.info("Database update user info {} {}", user.getUid(), user.getUpdateDt());
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             LOG.info("Database update user info {}", user.getDisplayName());
@@ -1688,7 +1879,6 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     void deleteUserStatus(String userId) {
@@ -1952,7 +2142,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);
 
 
@@ -1966,9 +2156,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;
@@ -2118,10 +2309,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` = ?";
 
 
@@ -2131,9 +2323,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);
@@ -2191,7 +2385,6 @@ public class DatabaseStore {
 
     void updateChannelInfo(final WFCMessage.ChannelInfo channelInfo) {
         LOG.info("Database update channel info {} {}", channelInfo.getTargetId(), channelInfo.getUpdateDt());
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -2254,7 +2447,6 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     void removeChannelInfo(final String channelId) {
@@ -2580,7 +2772,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_word` from t_sensitiveword";
+            String sql = "select `_word` from t_sensitiveword order by `id` desc";
 
             statement = connection.prepareStatement(sql);
             rs = statement.executeQuery();

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

@@ -16,6 +16,7 @@
 
 package io.moquette.persistence;
 
+import cn.wildfirechat.pojos.SystemSettingPojo;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.protobuf.ByteString;
@@ -29,9 +30,9 @@ 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;
@@ -84,6 +85,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     private static boolean IS_MESSAGE_ROAMING = true;
 
+    private static boolean IS_MESSAGE_REMOTE_HISTORY_MESSAGE = true;
+
     static final String USER_ROBOTS = "user_robots";
     static final String USER_THINGS = "user_things";
 
@@ -118,6 +121,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         m_Server = server;
         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));
     }
 
     @Override
@@ -345,7 +349,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                         }
 
                         size += bundle.getMessage().getSerializedSize();
-                        if (size >= 1 * 1024 * 1024) { //3M
+                        if (size >= 512 * 1024) { //3M
                             break;
                         }
                         builder.addMessage(bundle.getMessage());
@@ -369,7 +373,12 @@ public class MemoryMessagesStore implements IMessagesStore {
     @Override
     public WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count) {
         WFCMessage.PullMessageResult.Builder builder = WFCMessage.PullMessageResult.newBuilder();
-        List<WFCMessage.Message> messages = databaseStore.loadRemoteMessages(user, conversation, beforeUid, count);
+        List<WFCMessage.Message> messages;
+        if (IS_MESSAGE_REMOTE_HISTORY_MESSAGE) {
+           messages = databaseStore.loadRemoteMessages(user, conversation, beforeUid, count);
+        } else {
+           messages = new ArrayList<>();
+        }
         builder.setCurrent(0).setHead(0);
         if(messages != null) {
             builder.addAllMessage(messages);
@@ -712,53 +721,21 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList) {
-        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        removeGroupMember(groupId, memberList);
-        IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
+        removeFavGroup(groupId, memberList);
+        removeGroupUserSettings(groupId, memberList);
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
 
-        WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
+    void removeGroupMember(String groupId, List<String> memberIds) {
-        if (groupInfo == null) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
-            return ErrorCode.ERROR_CODE_NOT_EXIST;
+        databaseStore.removeGroupMember(groupId, memberIds);
-        }
-        if (!isAdmin && ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
-            && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)))) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
-        }
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+        groupMembers.remove(groupId);
+        IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
+        mIMap.evict(groupId);
 
-        int removeCount = 0;
-        long updateDt = System.currentTimeMillis();
-        ArrayList<WFCMessage.GroupMember> list = new ArrayList<>();
-        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-        if (members == null || members.size() == 0) {
-            members = loadGroupMemberFromDB(hzInstance, groupId);
-        }
-
-        List<WFCMessage.GroupMember> allMembers = new ArrayList<>(members);
-
-        List<String> removedIds = new ArrayList<>();
-        for (WFCMessage.GroupMember member : allMembers) {
-            if (memberList.contains(member.getMemberId())) {
-                boolean removed = groupMembers.remove(groupId, member);
-                if (removed) {
-                    removeCount++;
-                    member = member.toBuilder().setType(GroupMemberType_Removed).setUpdateDt(updateDt).build();
-                    groupMembers.put(groupId, member);
-                    list.add(member);
-                    removedIds.add(member.getMemberId());
-                }
-            }
-        }
-
-        if (removeCount > 0) {
-            databaseStore.persistGroupMember(groupId, list);
-            databaseStore.updateGroupMemberCountDt(groupId, groupInfo.getMemberCount()-removeCount, updateDt);
-            mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(groupInfo.getMemberCount() - removeCount).build());
-        }
-
-        removeFavGroup(groupId, removedIds);
-
-        return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
     void removeFavGroup(String groupId, List<String> memberIds) {
@@ -797,38 +774,24 @@ 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);
-
-        long updateDt = System.currentTimeMillis();
-        boolean removed = false;
-        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-        if (members == null || members.size() == 0) {
-            members = loadGroupMemberFromDB(hzInstance, groupId);
-        }
-        for (WFCMessage.GroupMember member : members) {
-            if (member.getMemberId().equals(operator)) {
-                removed = groupMembers.remove(groupId, member);
-                if (removed) {
-                    ArrayList<WFCMessage.GroupMember> list = new ArrayList<>();
-                    list.add(member);
-                    databaseStore.persistGroupMember(groupId, list);
-
-                    databaseStore.updateGroupMemberCountDt(groupId, groupInfo.getMemberCount()-1, updateDt);
-                    member = member.toBuilder().setType(GroupMemberType_Removed).setUpdateDt(updateDt).build();
-                    groupMembers.put(groupId, member);
-                }
-                break;
-            }
-        }
-
-        if (removed) {
-            mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(groupInfo.getMemberCount() - 1).build());
-        }
 
+        removeGroupMember(groupId, Arrays.asList(operator));
         removeFavGroup(groupId, Arrays.asList(operator));
+        removeGroupUserSettings(groupId, Arrays.asList(operator));
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    private void removeGroupUserSettings(String groupId, List<String> users) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
+
+        databaseStore.removeGroupUserSettings(groupId, users);
+        for (String userId:users) {
+            userSettingMap.remove(userId);
+        }
+
+    }
+
     @Override
     public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -868,6 +831,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
         removeFavGroup(groupId, ids);
+        removeGroupUserSettings(groupId, ids);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -1004,12 +968,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
-        if (groupInfo == null) {
-            groupInfo = databaseStore.getPersistGroupInfo(groupId);
-            if (groupInfo != null) {
-                mIMap.put(groupId, groupInfo);
-            }
-        }
         return groupInfo;
     }
 
@@ -1081,10 +1039,35 @@ 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++;
+            }
+        }
+
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1184,7 +1167,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode recallMessage(long messageUid, String operatorId) {
+    public ErrorCode recallMessage(long messageUid, String operatorId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
 
@@ -1192,7 +1175,10 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (messageBundle != null) {
             WFCMessage.Message message = messageBundle.getMessage();
             boolean canRecall = false;
-            if (message.getFromUser().equals(operatorId)) {
+            if (isAdmin) {
+                canRecall = true;
+            }
+            if (!isAdmin && message.getFromUser().equals(operatorId)) {
                 canRecall = true;
             }
 
@@ -1235,6 +1221,8 @@ public class MemoryMessagesStore implements IMessagesStore {
             message = message.toBuilder().setContent(message.getContent().toBuilder().setContent(operatorId).setType(80).clearSearchableContent().setData(ByteString.copyFrom(new StringBuffer().append(messageUid).toString().getBytes())).build()).build();
             messageBundle.setMessage(message);
 
+            databaseStore.deleteMessage(messageUid);
+
             mIMap.put(messageUid, messageBundle, 7, TimeUnit.DAYS);
             return ErrorCode.ERROR_CODE_SUCCESS;
         } else {
@@ -1440,6 +1428,16 @@ public class MemoryMessagesStore implements IMessagesStore {
         return databaseStore.searchUserFromDB(keyword, buzzy, page);
     }
 
+    @Override
+    public boolean updateSystemSetting(int id, String value, String desc) {
+        return databaseStore.updateSystemSetting(id, value, desc);
+    }
+
+    @Override
+    public SystemSettingPojo getSystemSetting(int id) {
+        return databaseStore.getSystemSetting(id);
+    }
+
     @Override
     public void createChatroom(String chatroomId, WFCMessage.ChatroomInfo chatroomInfo) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1600,8 +1598,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 String pwd_md5 = rs.getString(2);
                 try {
                     MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    BASE64Encoder base64en = new BASE64Encoder();
+                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
-                    String passwdMd5 = base64en.encode(md5.digest(password.getBytes("utf-8")));
                     if (passwdMd5.equals(pwd_md5)) {
                         LOG.info("login success userName={}, userId={}", name, uid);
                         userIdRet.add(uid);
@@ -1656,7 +1653,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();
@@ -1666,9 +1663,26 @@ 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);
+                }
+
             }
         }
 
@@ -1723,6 +1737,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)
@@ -1774,7 +1806,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());
@@ -1796,7 +1828,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());
@@ -1837,10 +1869,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);
@@ -1862,6 +1894,9 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public ErrorCode blackUserRequest(String fromUser, String targetUserId, int state, long[] heads) {
+        if (state == 2) {
+            state = 1;
+        }
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
@@ -1879,9 +1914,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());
 
 
@@ -2328,6 +2363,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             words) {
             databaseStore.deleteSensitiveWord(word);
         }
+        lastUpdateSensitiveTime = 0;
         return true;
     }
 

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

@@ -406,6 +406,7 @@ public class Server {
     }
 
     public void stopServer() {
+        System.out.println("Server will flush data to db before shutting down, please wait 5 seconds!");
         LOG.info("Unbinding server from the configured ports");
         m_acceptor.close();
         LOG.trace("Stopping MQTT protocol processor");

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

@@ -16,6 +16,7 @@
 
 package io.moquette.spi;
 
+import cn.wildfirechat.pojos.SystemSettingPojo;
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
@@ -118,7 +119,7 @@ public interface IMessagesStore {
     boolean isMemberInGroup(String member, String groupId);
     ErrorCode canSendMessageInGroup(String member, String groupId);
 
-    ErrorCode recallMessage(long messageUid, String operatorId);
+    ErrorCode recallMessage(long messageUid, String operatorId, boolean isAdmin);
 
     WFCMessage.Robot getRobot(String robotId);
     void addRobot(WFCMessage.Robot robot);
@@ -135,6 +136,8 @@ public interface IMessagesStore {
     WFCMessage.User getUserInfoByMobile(String mobile);
     List<WFCMessage.User> searchUser(String keyword, boolean buzzy, int page);
 
+    boolean updateSystemSetting(int id, String value, String desc);
+    SystemSettingPojo getSystemSetting(int id);
     void createChatroom(String chatroomId, WFCMessage.ChatroomInfo chatroomInfo);
     void destoryChatroom(String chatroomId);
     WFCMessage.ChatroomInfo getChatroomInfo(String chatroomId);
@@ -150,7 +153,7 @@ 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);
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
     ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);

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

@@ -142,9 +142,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()
+        if (msg.variableHeader().version() <= MqttVersion.MQTT_3_1_1.protocolLevel() ||
-                && msg.variableHeader().version() != MqttVersion.MQTT_3_1_1.protocolLevel()
+                msg.variableHeader().version() >= MqttVersion.Wildfire_Max.protocolLevel()) {
-                && msg.variableHeader().version() != MqttVersion.Wildfire_1.protocolLevel()) {
             MqttConnAckMessage badProto = connAck(CONNECTION_REFUSED_UNACCEPTABLE_PROTOCOL_VERSION);
 
             LOG.error("MQTT protocol version is not valid. CId={}", clientId);

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/IDUtils.java

@@ -33,7 +33,7 @@ public class IDUtils {
             return ch - 'a' + 26;
         } else if(ch >= '0' && ch <= '9') {
             return ch - '0' + 52;
-        } else if(ch == '_') {
+        } else if(ch == '+') {
             return 62;
         }
         return 63;

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

@@ -10,6 +10,7 @@ package win.liyufan.im;
 
 public interface IMTopic {
 	String SendMessageTopic = "MS";
+    String MultiCastMessageTopic = "MMC";
     String RecallMessageTopic = "MR";
 	String PullMessageTopic = "MP";
 	String NotifyMessageTopic = "MN";

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">123456</property>
+        <property name="password">lt123456</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.25</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.25</version>
+        <version>0.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,142 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+public class InputCreateChannel {
+    private String owner;
+    private String name;
+    private String targetId;
+    private String callback;
+    private String portrait;
+    private int auto;
+    private String secret;
+    private String desc;
+    private int status;
+    private String extra;
+    private long updateDt;
+
+    public WFCMessage.ChannelInfo toProtoChannelInfo() {
+        WFCMessage.ChannelInfo.Builder builder = WFCMessage.ChannelInfo.newBuilder().setOwner(owner);
+        if (!StringUtil.isNullOrEmpty(name))
+            builder = builder.setName(name);
+        if (!StringUtil.isNullOrEmpty(targetId))
+            builder = builder.setTargetId(targetId);
+        if (!StringUtil.isNullOrEmpty(callback))
+            builder = builder.setCallback(callback);
+        if (!StringUtil.isNullOrEmpty(portrait))
+            builder = builder.setPortrait(portrait);
+        builder = builder.setAutomatic(auto);
+        if (!StringUtil.isNullOrEmpty(secret))
+            builder = builder.setSecret(secret);
+        if (!StringUtil.isNullOrEmpty(desc))
+            builder = builder.setDesc(desc);
+        builder = builder.setStatus(status);
+        if (!StringUtil.isNullOrEmpty(extra))
+            builder = builder.setExtra(extra);
+        if (!StringUtil.isNullOrEmpty(name))
+            builder = builder.setUpdateDt(updateDt);
+        else
+            builder = builder.setUpdateDt(System.currentTimeMillis());
+
+        return builder.build();
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getCallback() {
+        return callback;
+    }
+
+    public void setCallback(String callback) {
+        this.callback = callback;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public void setPortrait(String portrait) {
+        this.portrait = portrait;
+    }
+
+    public int getAuto() {
+        return auto;
+    }
+
+    public void setAuto(int auto) {
+        this.auto = auto;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public long getUpdateDt() {
+        return updateDt;
+    }
+
+    public void setUpdateDt(long updateDt) {
+        this.updateDt = updateDt;
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class InputModifyGroupInfo extends InputGroupBase {
+    private String group_id;
+    //ModifyGroupInfoType
+    private int type;
+    private String value;
+
+    public boolean isValide() {
+        return !StringUtil.isNullOrEmpty(group_id);
+    }
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public WFCMessage.ModifyGroupInfoRequest toProtoGroupRequest() {
+        return WFCMessage.ModifyGroupInfoRequest.newBuilder()
+            .setGroupId(group_id)
+            .setType(type)
+            .setValue(value)
+            .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines)
+            .build();
+    }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class InputSetGroupManager extends InputGroupBase {
+    private String group_id;
+    private List<String> members;
+    private boolean is_manager;
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public List<String> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<String> members) {
+        this.members = members;
+    }
+
+    public boolean isIs_manager() {
+        return is_manager;
+    }
+
+    public void setIs_manager(boolean is_manager) {
+        this.is_manager = is_manager;
+    }
+
+    public boolean isValide() {
+        if (StringUtil.isNullOrEmpty(operator) || StringUtil.isNullOrEmpty(group_id) || members == null || members.isEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
+    public WFCMessage.SetGroupManagerRequest toProtoGroupRequest() {
+        WFCMessage.SetGroupManagerRequest.Builder addGroupBuilder = WFCMessage.SetGroupManagerRequest.newBuilder();
+        addGroupBuilder.setGroupId(group_id);
+        addGroupBuilder.addAllUserId(members);
+        addGroupBuilder.setType(is_manager ? 1 : 0);
+
+        if (to_lines != null) {
+            for (Integer line : to_lines
+            ) {
+                addGroupBuilder.addToLine(line);
+            }
+        }
+
+        if (notify_message != null) {
+            addGroupBuilder.setNotifyContent(notify_message.toProtoMessageContent());
+        }
+        return addGroupBuilder.build();
+    }
+
+}

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

@@ -129,8 +129,8 @@ public class MessagePayload {
             builder.setSearchableContent(searchableContent);
         if (!StringUtil.isNullOrEmpty(pushContent))
             builder.setPushContent(pushContent);
-        if (!StringUtil.isNullOrEmpty(searchableContent))
+        if (!StringUtil.isNullOrEmpty(content))
-            builder.setContent(searchableContent);
+            builder.setContent(content);
         if (!StringUtil.isNullOrEmpty(base64edData))
             builder.setData(ByteString.copyFrom(Base64.getDecoder().decode(base64edData)));
         if (!StringUtil.isNullOrEmpty(remoteMediaUrl))

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

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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 MultiMessageResult {
+    private long messageUid;
+    private long timestamp;
+
+    public MultiMessageResult() {
+    }
+
+    public MultiMessageResult(long messageUid, long timestamp) {
+        this.messageUid = messageUid;
+        this.timestamp = timestamp;
+    }
+
+    public long getMessageUid() {
+        return messageUid;
+    }
+
+    public void setMessageUid(long messageUid) {
+        this.messageUid = messageUid;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}

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

@@ -0,0 +1,71 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class MulticastMessageData {
+    private String sender;
+    private int line;
+    private MessagePayload payload;
+    private List<String> targets;
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public void setLine(int line) {
+        this.line = line;
+    }
+
+    public MessagePayload getPayload() {
+        return payload;
+    }
+
+    public void setPayload(MessagePayload payload) {
+        this.payload = payload;
+    }
+
+    public static boolean isValide(MulticastMessageData sendMessageData) {
+        if(sendMessageData == null ||
+            StringUtil.isNullOrEmpty(sendMessageData.getSender()) ||
+            sendMessageData.getPayload() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public WFCMessage.MultiCastMessage toProtoMessage() {
+        return WFCMessage.MultiCastMessage.newBuilder().setFromUser(sender)
+            .setLine(line)
+            .setContent(payload.toProtoMessageContent())
+            .addAllTo(targets)
+            .build();
+    }
+
+    public List<String> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(List<String> targets) {
+        this.targets = targets;
+    }
+}

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

@@ -0,0 +1,28 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+
+public class OutputCreateChannel {
+    private String targetId;
+
+    public OutputCreateChannel(String targetId) {
+        this.targetId = targetId;
+    }
+
+    public String getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(String targetId) {
+        this.targetId = targetId;
+    }
+}

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

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+public class SystemSettingPojo {
+    public int id;
+    public String value;
+    public String desc;
+}

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

@@ -26,14 +26,22 @@ public interface APIPath {
     String Msg_Send = "/admin/message/send";
     String Msg_Recall = "/admin/message/recall";
     String Msg_Broadcast = "/admin/message/broadcast";
+    String Msg_Multicast = "/admin/message/multicast";
 
     String Create_Group = "/admin/group/create";
     String Group_Dismiss = "/admin/group/del";
     String Group_Transfer = "/admin/group/transfer";
     String Group_Get_Info = "/admin/group/get_info";
+    String Group_Modify_Info = "/admin/group/modify";
     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 Create_Channel = "/admin/channel/create";
+    String Get_System_Setting = "/admin/system/get_setting";
+    String Put_System_Setting = "/admin/system/put_setting";
 
 
     String Channel_Message_Send = "/channel/message/send";

common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java

@@ -128,6 +128,9 @@ public class ProtoConstants {
     }
 
 
+    public interface SystemSettingType {
+        int Group_Max_Member_Count = 1;
+    }
 
 
 

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.25</version>
+        <version>0.30</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/assembly/assembly.xml

@@ -19,11 +19,6 @@
             <directory>../broker/migrate/h2/</directory>
             <outputDirectory>/migrate/h2</outputDirectory>
         </fileSet>
-
-        <fileSet>
-            <directory>../wildfire_jmeter/test_plan/</directory>
-            <outputDirectory>/tools/jmeter</outputDirectory>
-        </fileSet>
     </fileSets>
 
     <files>
@@ -68,23 +63,12 @@
             <outputDirectory>config/</outputDirectory>
         </file>
 
-        <file>
-            <source>../wildfire_jmeter/target/wildfire-xmeter-jar-with-dependencies.jar</source>
-            <outputDirectory>tools/jmeter</outputDirectory>
-        </file>
-
         <file>
             <source>../broker/target/moquette-broker-${project.version}.jar</source>
             <outputDirectory>lib/</outputDirectory>
             <destName>moquette-broker-${project.version}.jar</destName>
         </file>
 
-        <file>
-            <source>../client/target/client-${project.version}.jar</source>
-            <outputDirectory>java_client/</outputDirectory>
-            <destName>client-${project.version}.jar</destName>
-        </file>
-
         <file>
             <source>../common/target/common-${project.version}.jar</source>
             <outputDirectory>java_client/</outputDirectory>

distribution/src/main/resources/wildfirechat.conf

@@ -2,7 +2,8 @@
 # Server configuration
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
-#客户端会从${http_port}端口获取到长链接端口。
+#客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
+# （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
 ##原生客户端长链接端口
@@ -26,7 +27,7 @@ host 0.0.0.0
 ##本地绑定端口
 local_port 80
 
-##是否使用内置DB。0使用mysql；1使用h2db
+##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
 embed.db 1
 
 ##服务器管理接口密钥
@@ -43,7 +44,10 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 token.key testim
 
 ##首次登录，是否接收之前的历史消息。0 不接收；1接收。
-message.roaming 1
+message.roaming 0
+
+##是否开启拉取远程历史消息
+message.remote_history_message 0
 
 #*********************************************************************
 # hazelcase configuration
@@ -99,6 +103,15 @@ push.android.server.address http://localhost:8085/android/push
 ##苹果推送服务器地址
 push.ios.server.address http://localhost:8085/ios/push
 
+#*********************************************************************
+# MongoDB configuration
+#*********************************************************************
+#专业版支持，社区版请忽略
+#mongodb.client_uri mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+#mongodb.client_uri mongodb://host1:27017,host2:27017,host3:27017/wfchat?replicaSet=myReplicaSet
+mongodb.client_uri mongodb://wfc:123456@localhost:27017/wfchat
+mongodb.database wfchat
+mongodb.data_expire_days 1096
 
 #*********************************************************************
 # Netty Configuration

distribution/src/main/scripts/wildfirechat.bat

@@ -17,9 +17,9 @@ goto end
 rem Set JavaHome if it exists
 if exist { "%JAVA_HOME%\bin\java" } (
     set "JAVA="%JAVA_HOME%\bin\java""
-) else {
+) else (
     set "JAVA="java""
-}
+)
 
 echo Using JAVA_HOME:       "%JAVA_HOME%"
 echo Using WILDFIRECHAT_HOME:   "%WILDFIRECHAT_HOME%"

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.25</version>
+    <version>0.30</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>
@@ -30,11 +30,8 @@
     </licenses>
 
 
-
     <modules>
         <module>broker</module>
-        <module>wildfire_jmeter</module>
-        <module>client</module>
         <module>common</module>
         <module>sdk</module>
         <module>distribution</module>

protobuf/install_protoc.md

@@ -1,35 +0,0 @@
-## Run follow command by sequence:
-To build protobuf from source, the following tools are needed:
-
-
-On Ubuntu, you can install them with:
-$ sudo apt-get install autoconf automake libtool curl make g++ unzip
-
-On Mac, you can install them with:
-$ brew install autoconf automake libtool
-
-
-Then run the cmd.
-$ ./autogen.sh
-$ ./configure
-$ make
-$ make check
-$ sudo make install
-$ sudo ldconfig # refresh shared library cache.
-
-
-
-## Javascript 生成方法
-1. 安装nodejs
-2. 安装protobufjs
-```
-sudo npm install protobufjs@5 -g
-```
-3. 生成JS
-```
-pbjs -t static-module -w commonjs -o protocol.js wfcmessage.proto
-```
-
-> [参考1](http://dcode.io/protobuf.js/#pbjs-for-javascript)
-
-> [参考2](https://blog.csdn.net/yyf1990cs/article/details/78942157)

protobuf/protobuf-2.5.0/CHANGES.txt

@@ -1,528 +0,0 @@
-2013-02-27 version 2.5.0:
-
-  General
-  * New notion "import public" that allows a proto file to forward the content
-    it imports to its importers. For example,
-      // foo.proto
-      import public "bar.proto";
-      import "baz.proto";
-
-      // qux.proto
-      import "foo.proto";
-      // Stuff defined in bar.proto may be used in this file, but stuff from
-      // baz.proto may NOT be used without importing it explicitly.
-    This is useful for moving proto files. To move a proto file, just leave
-    a single "import public" in the old proto file.
-  * New enum option "allow_alias" that specifies whether different symbols can
-    be assigned the same numeric value. Default value is "true". Setting it to
-    false causes the compiler to reject enum definitions where multiple symbols
-    have the same numeric value.
-
-  C++
-  * New generated method set_allocated_foo(Type* foo) for message and string
-    fields. This method allows you to set the field to a pre-allocated object
-    and the containing message takes the ownership of that object.
-  * Added SetAllocatedExtension() and ReleaseExtension() to extensions API.
-  * Custom options are now formatted correctly when descriptors are printed in
-    text format.
-  * Various speed optimizations.
-
-  Java
-  * Comments in proto files are now collected and put into generated code as
-    comments for corresponding classes and data members.
-  * Added Parser to parse directly into messages without a Builder. For
-    example,
-      Foo foo = Foo.getParser().ParseFrom(input);
-    Using Parser is ~25% faster than using Builder to parse messages.
-  * Added getters/setters to access the underlying ByteString of a string field
-    directly.
-  * ByteString now supports more operations: substring(), prepend(), and
-    append(). The implementation of ByteString uses a binary tree structure
-    to support these operations efficiently.
-  * New method findInitializationErrors() that lists all missing required
-    fields.
-  * Various code size and speed optimizations.
-
-  Python
-  * Added support for dynamic message creation. DescriptorDatabase,
-    DescriptorPool, and MessageFactory work like their C++ couterparts to
-    simplify Descriptor construction from *DescriptorProtos, and MessageFactory
-    provides a message instance from a Descriptor.
-  * Added pickle support for protobuf messages.
-  * Unknown fields are now preserved after parsing.
-  * Fixed bug where custom options were not correctly populated. Custom
-    options can be accessed now.
-  * Added EnumTypeWrapper that provides better accessibility to enum types.
-  * Added ParseMessage(descriptor, bytes) to generate a new Message instance
-    from a descriptor and a byte string.
-
-2011-05-01 version 2.4.1:
-
-  C++
-  * Fixed the frendship problem for old compilers to make the library now gcc 3
-    compatible again.
-  * Fixed vcprojects/extract_includes.bat to extract compiler/plugin.h.
-
-  Java
-  * Removed usages of JDK 1.6 only features to make the library now JDK 1.5
-    compatible again.
-  * Fixed a bug about negative enum values.
-  * serialVersionUID is now defined in generated messages for java serializing.
-  * Fixed protoc to use java.lang.Object, which makes "Object" now a valid
-    message name again.
-
-  Python
-  * Experimental C++ implementation now requires C++ protobuf library installed.
-    See the README.txt in the python directory for details.
-
-2011-02-02 version 2.4.0:
-
-  General
-  * The RPC (cc|java|py)_generic_services default value is now false instead of
-    true.
-  * Custom options can have aggregate types. For example,
-      message MyOption {
-        optional string comment = 1;
-        optional string author = 2;
-      }
-      extend google.protobuf.FieldOptions {
-        optional MyOption myoption = 12345;
-      }
-    This option can now be set as follows:
-      message SomeType {
-        optional int32 field = 1 [(myoption) = { comment:'x' author:'y' }];
-      }
-
-  C++
-  * Various speed and code size optimizations.
-  * Added a release_foo() method on string and message fields.
-  * Fixed gzip_output_stream sub-stream handling.
-
-  Java
-  * Builders now maintain sub-builders for sub-messages. Use getFooBuilder() to
-    get the builder for the sub-message "foo". This allows you to repeatedly
-    modify deeply-nested sub-messages without rebuilding them.
-  * Builder.build() no longer invalidates the Builder for generated messages
-    (You may continue to modify it and then build another message).
-  * Code generator will generate efficient equals() and hashCode()
-    implementations if new option java_generate_equals_and_hash is enabled.
-    (Otherwise, reflection-based implementations are used.)
-  * Generated messages now implement Serializable.
-  * Fields with [deprecated=true] will be marked with @Deprecated in Java.
-  * Added lazy conversion of UTF-8 encoded strings to String objects to improve
-    performance.
-  * Various optimizations.
-  * Enum value can be accessed directly, instead of calling getNumber() on the
-    enum member.
-  * For each enum value, an integer constant is also generated with the suffix
-    _VALUE.
-
-  Python
-  * Added an experimental  C++ implementation for Python messages via a Python
-    extension. Implementation type is controlled by an environment variable
-    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION (valid values: "cpp" and "python")
-    The default value is currently "python" but will be changed to "cpp" in
-    future release.
-  * Improved performance on message instantiation significantly.
-    Most of the work on message instantiation is done just once per message
-    class, instead of once per message instance.
-  * Improved performance on text message parsing.
-  * Allow add() to forward keyword arguments to the concrete class.
-      E.g. instead of
-        item = repeated_field.add()
-        item.foo = bar
-        item.baz = quux
-      You can do:
-        repeated_field.add(foo=bar, baz=quux)
-  * Added a sort() interface to the BaseContainer.
-  * Added an extend() method to repeated composite fields.
-  * Added UTF8 debug string support.
-
-2010-01-08 version 2.3.0:
-
-  General
-  * Parsers for repeated numeric fields now always accept both packed and
-    unpacked input.  The [packed=true] option only affects serializers.
-    Therefore, it is possible to switch a field to packed format without
-    breaking backwards-compatibility -- as long as all parties are using
-    protobuf 2.3.0 or above, at least.
-  * The generic RPC service code generated by the C++, Java, and Python
-    generators can be disabled via file options:
-      option cc_generic_services = false;
-      option java_generic_services = false;
-      option py_generic_services = false;
-    This allows plugins to generate alternative code, possibly specific to some
-    particular RPC implementation.
-
-  protoc
-  * Now supports a plugin system for code generators.  Plugins can generate
-    code for new languages or inject additional code into the output of other
-    code generators.  Plugins are just binaries which accept a protocol buffer
-    on stdin and write a protocol buffer to stdout, so they may be written in
-    any language.  See src/google/protobuf/compiler/plugin.proto.
-    **WARNING**:  Plugins are experimental.  The interface may change in a
-    future version.
-  * If the output location ends in .zip or .jar, protoc will write its output
-    to a zip/jar archive instead of a directory.  For example:
-      protoc --java_out=myproto_srcs.jar --python_out=myproto.zip myproto.proto
-    Currently the archive contents are not compressed, though this could change
-    in the future.
-  * inf, -inf, and nan can now be used as default values for float and double
-    fields.
-
-  C++
-  * Various speed and code size optimizations.
-  * DynamicMessageFactory is now fully thread-safe.
-  * Message::Utf8DebugString() method is like DebugString() but avoids escaping
-    UTF-8 bytes.
-  * Compiled-in message types can now contain dynamic extensions, through use
-    of CodedInputStream::SetExtensionRegistry().
-  * Now compiles shared libraries (DLLs) by default on Cygwin and MinGW, to
-    match other platforms.  Use --disable-shared to avoid this.
-
-  Java
-  * parseDelimitedFrom() and mergeDelimitedFrom() now detect EOF and return
-    false/null instead of throwing an exception.
-  * Fixed some initialization ordering bugs.
-  * Fixes for OpenJDK 7.
-
-  Python
-  * 10-25 times faster than 2.2.0, still pure-Python.
-  * Calling a mutating method on a sub-message always instantiates the message
-    in its parent even if the mutating method doesn't actually mutate anything
-    (e.g. parsing from an empty string).
-  * Expanded descriptors a bit.
-
-2009-08-11 version 2.2.0:
-
-  C++
-  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
-    to generate code which only depends libprotobuf-lite, which is much smaller
-    than libprotobuf but lacks descriptors, reflection, and some other features.
-  * Fixed bug where Message.Swap(Message) was only implemented for
-    optimize_for_speed.  Swap now properly implemented in both modes
-    (Issue 91).
-  * Added RemoveLast and SwapElements(index1, index2) to Reflection
-    interface for repeated elements.
-  * Added Swap(Message) to Reflection interface.
-  * Floating-point literals in generated code that are intended to be
-    single-precision now explicitly have 'f' suffix to avoid pedantic warnings
-    produced by some compilers.
-  * The [deprecated=true] option now causes the C++ code generator to generate
-    a GCC-style deprecation annotation (no-op on other compilers).
-  * google::protobuf::GetEnumDescriptor<SomeGeneratedEnumType>() returns the
-    EnumDescriptor for that type -- useful for templates which cannot call
-    SomeGeneratedEnumType_descriptor().
-  * Various optimizations and obscure bug fixes.
-
-  Java
-  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
-    to generate code which only depends libprotobuf-lite, which is much smaller
-    than libprotobuf but lacks descriptors, reflection, and some other features.
-  * Lots of style cleanups.
-
-  Python
-  * Fixed endianness bug with floats and doubles.
-  * Text format parsing support.
-  * Fix bug with parsing packed repeated fields in embedded messages.
-  * Ability to initialize fields by passing keyword args to constructor.
-  * Support iterators in extend and __setslice__ for containers.
-
-2009-05-13 version 2.1.0:
-
-  General
-  * Repeated fields of primitive types (types other that string, group, and
-    nested messages) may now use the option [packed = true] to get a more
-    efficient encoding.  In the new encoding, the entire list is written
-    as a single byte blob using the "length-delimited" wire type.  Within
-    this blob, the individual values are encoded the same way they would
-    be normally except without a tag before each value (thus, they are
-    tightly "packed").
-  * For each field, the generated code contains an integer constant assigned
-    to the field number.  For example, the .proto file:
-      message Foo { optional int bar_baz = 123; }
-    would generate the following constants, all with the integer value 123:
-      C++:     Foo::kBarBazFieldNumber
-      Java:    Foo.BAR_BAZ_FIELD_NUMBER
-      Python:  Foo.BAR_BAZ_FIELD_NUMBER
-    Constants are also generated for extensions, with the same naming scheme.
-    These constants may be used as switch cases.
-  * Updated bundled Google Test to version 1.3.0.  Google Test is now bundled
-    in its verbatim form as a nested autoconf package, so you can drop in any
-    other version of Google Test if needed.
-  * optimize_for = SPEED is now the default, by popular demand.  Use
-    optimize_for = CODE_SIZE if code size is more important in your app.
-  * It is now an error to define a default value for a repeated field.
-    Previously, this was silently ignored (it had no effect on the generated
-    code).
-  * Fields can now be marked deprecated like:
-      optional int32 foo = 1 [deprecated = true];
-    Currently this does not have any actual effect, but in the future the code
-    generators may generate deprecation annotations in each language.
-  * Cross-compiling should now be possible using the --with-protoc option to
-    configure.  See README.txt for more info.
-
-  protoc
-  * --error_format=msvs option causes errors to be printed in Visual Studio
-    format, which should allow them to be clicked on in the build log to go
-    directly to the error location.
-  * The type name resolver will no longer resolve type names to fields.  For
-    example, this now works:
-      message Foo {}
-      message Bar {
-        optional int32 Foo = 1;
-        optional Foo baz = 2;
-      }
-    Previously, the type of "baz" would resolve to "Bar.Foo", and you'd get
-    an error because Bar.Foo is a field, not a type.  Now the type of "baz"
-    resolves to the message type Foo.  This change is unlikely to make a
-    difference to anyone who follows the Protocol Buffers style guide.
-
-  C++
-  * Several optimizations, including but not limited to:
-    - Serialization, especially to flat arrays, is 10%-50% faster, possibly
-      more for small objects.
-    - Several descriptor operations which previously required locking no longer
-      do.
-    - Descriptors are now constructed lazily on first use, rather than at
-      process startup time.  This should save memory in programs which do not
-      use descriptors or reflection.
-    - UnknownFieldSet completely redesigned to be more efficient (especially in
-      terms of memory usage).
-    - Various optimizations to reduce code size (though the serialization speed
-      optimizations increased code size).
-  * Message interface has method ParseFromBoundedZeroCopyStream() which parses
-    a limited number of bytes from an input stream rather than parsing until
-    EOF.
-  * GzipInputStream and GzipOutputStream support reading/writing gzip- or
-    zlib-compressed streams if zlib is available.
-    (google/protobuf/io/gzip_stream.h)
-  * DescriptorPool::FindAllExtensions() and corresponding
-    DescriptorDatabase::FindAllExtensions() can be used to enumerate all
-    extensions of a given type.
-  * For each enum type Foo, protoc will generate functions:
-      const string& Foo_Name(Foo value);
-      bool Foo_Parse(const string& name, Foo* result);
-    The former returns the name of the enum constant corresponding to the given
-    value while the latter finds the value corresponding to a name.
-  * RepeatedField and RepeatedPtrField now have back-insertion iterators.
-  * String fields now have setters that take a char* and a size, in addition
-    to the existing ones that took char* or const string&.
-  * DescriptorPool::AllowUnknownDependencies() may be used to tell
-    DescriptorPool to create placeholder descriptors for unknown entities
-    referenced in a FileDescriptorProto.  This can allow you to parse a .proto
-    file without having access to other .proto files that it imports, for
-    example.
-  * Updated gtest to latest version.  The gtest package is now included as a
-    nested autoconf package, so it should be able to drop new versions into the
-    "gtest" subdirectory without modification.
-
-  Java
-  * Fixed bug where Message.mergeFrom(Message) failed to merge extensions.
-  * Message interface has new method toBuilder() which is equivalent to
-    newBuilderForType().mergeFrom(this).
-  * All enums now implement the ProtocolMessageEnum interface.
-  * Setting a field to null now throws NullPointerException.
-  * Fixed tendency for TextFormat's parsing to overflow the stack when
-    parsing large string values.  The underlying problem is with Java's
-    regex implementation (which unfortunately uses recursive backtracking
-    rather than building an NFA).  Worked around by making use of possesive
-    quantifiers.
-  * Generated service classes now also generate pure interfaces.  For a service
-    Foo, Foo.Interface is a pure interface containing all of the service's
-    defined methods.  Foo.newReflectiveService() can be called to wrap an
-    instance of this interface in a class that implements the generic
-    RpcService interface, which provides reflection support that is usually
-    needed by RPC server implementations.
-  * RPC interfaces now support blocking operation in addition to non-blocking.
-    The protocol compiler generates separate blocking and non-blocking stubs
-    which operate against separate blocking and non-blocking RPC interfaces.
-    RPC implementations will have to implement the new interfaces in order to
-    support blocking mode.
-  * New I/O methods parseDelimitedFrom(), mergeDelimitedFrom(), and
-    writeDelimitedTo() read and write "delemited" messages from/to a stream,
-    meaning that the message size precedes the data.  This way, you can write
-    multiple messages to a stream without having to worry about delimiting
-    them yourself.
-  * Throw a more descriptive exception when build() is double-called.
-  * Add a method to query whether CodedInputStream is at the end of the input
-    stream.
-  * Add a method to reset a CodedInputStream's size counter; useful when
-    reading many messages with the same stream.
-  * equals() and hashCode() now account for unknown fields.
-
-  Python
-  * Added slicing support for repeated scalar fields. Added slice retrieval and
-    removal of repeated composite fields.
-  * Updated RPC interfaces to allow for blocking operation.  A client may
-    now pass None for a callback when making an RPC, in which case the
-    call will block until the response is received, and the response
-    object will be returned directly to the caller.  This interface change
-    cannot be used in practice until RPC implementations are updated to
-    implement it.
-  * Changes to input_stream.py should make protobuf compatible with appengine.
-
-2008-11-25 version 2.0.3:
-
-  protoc
-  * Enum values may now have custom options, using syntax similar to field
-    options.
-  * Fixed bug where .proto files which use custom options but don't actually
-    define them (i.e. they import another .proto file defining the options)
-    had to explicitly import descriptor.proto.
-  * Adjacent string literals in .proto files will now be concatenated, like in
-    C.
-  * If an input file is a Windows absolute path (e.g. "C:\foo\bar.proto") and
-    the import path only contains "." (or contains "." but does not contain
-    the file), protoc incorrectly thought that the file was under ".", because
-    it thought that the path was relative (since it didn't start with a slash).
-    This has been fixed.
-
-  C++
-  * Generated message classes now have a Swap() method which efficiently swaps
-    the contents of two objects.
-  * All message classes now have a SpaceUsed() method which returns an estimate
-    of the number of bytes of allocated memory currently owned by the object.
-    This is particularly useful when you are reusing a single message object
-    to improve performance but want to make sure it doesn't bloat up too large.
-  * New method Message::SerializeAsString() returns a string containing the
-    serialized data.  May be more convenient than calling
-    SerializeToString(string*).
-  * In debug mode, log error messages when string-type fields are found to
-    contain bytes that are not valid UTF-8.
-  * Fixed bug where a message with multiple extension ranges couldn't parse
-    extensions.
-  * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on
-    a message that contained no fields (but possibly contained extensions).
-  * Fixed ShortDebugString() to not be O(n^2).  Durr.
-  * Fixed crash in TextFormat parsing if the first token in the input caused a
-    tokenization error.
-  * Fixed obscure bugs in zero_copy_stream_impl.cc.
-  * Added support for HP C++ on Tru64.
-  * Only build tests on "make check", not "make".
-  * Fixed alignment issue that caused crashes when using DynamicMessage on
-    64-bit Sparc machines.
-  * Simplify template usage to work with MSVC 2003.
-  * Work around GCC 4.3.x x86_64 compiler bug that caused crashes on startup.
-    (This affected Fedora 9 in particular.)
-  * Now works on "Solaris 10 using recent Sun Studio".
-
-  Java
-  * New overload of mergeFrom() which parses a slice of a byte array instead
-    of the whole thing.
-  * New method ByteString.asReadOnlyByteBuffer() does what it sounds like.
-  * Improved performance of isInitialized() when optimizing for code size.
-
-  Python
-  * Corrected ListFields() signature in Message base class to match what
-    subclasses actually implement.
-  * Some minor refactoring.
-  * Don't pass self as first argument to superclass constructor (no longer
-    allowed in Python 2.6).
-
-2008-09-29 version 2.0.2:
-
-  General
-  * License changed from Apache 2.0 to New BSD.
-  * It is now possible to define custom "options", which are basically
-    annotations which may be placed on definitions in a .proto file.
-    For example, you might define a field option called "foo" like so:
-      import "google/protobuf/descriptor.proto"
-      extend google.protobuf.FieldOptions {
-        optional string foo = 12345;
-      }
-    Then you annotate a field using the "foo" option:
-      message MyMessage {
-        optional int32 some_field = 1 [(foo) = "bar"]
-      }
-    The value of this option is then visible via the message's
-    Descriptor:
-      const FieldDescriptor* field =
-        MyMessage::descriptor()->FindFieldByName("some_field");
-      assert(field->options().GetExtension(foo) == "bar");
-    This feature has been implemented and tested in C++ and Java.
-    Other languages may or may not need to do extra work to support
-    custom options, depending on how they construct descriptors.
-
-  C++
-  * Fixed some GCC warnings that only occur when using -pedantic.
-  * Improved static initialization code, making ordering more
-    predictable among other things.
-  * TextFormat will no longer accept messages which contain multiple
-    instances of a singular field.  Previously, the latter instance
-    would overwrite the former.
-  * Now works on systems that don't have hash_map.
-
-  Java
-  * Print @Override annotation in generated code where appropriate.
-
-  Python
-  * Strings now use the "unicode" type rather than the "str" type.
-    String fields may still be assigned ASCII "str" values; they will
-    automatically be converted.
-  * Adding a property to an object representing a repeated field now
-    raises an exception.  For example:
-      # No longer works (and never should have).
-      message.some_repeated_field.foo = 1
-
-  Windows
-  * We now build static libraries rather than DLLs by default on MSVC.
-    See vsprojects/readme.txt for more information.
-
-2008-08-15 version 2.0.1:
-
-  protoc
-  * New flags --encode and --decode can be used to convert between protobuf text
-    format and binary format from the command-line.
-  * New flag --descriptor_set_out can be used to write FileDescriptorProtos for
-    all parsed files directly into a single output file.  This is particularly
-    useful if you wish to parse .proto files from programs written in languages
-    other than C++: just run protoc as a background process and have it output
-    a FileDescriptorList, then parse that natively.
-  * Improved error message when an enum value's name conflicts with another
-    symbol defined in the enum type's scope, e.g. if two enum types declared
-    in the same scope have values with the same name.  This is disallowed for
-    compatibility with C++, but this wasn't clear from the error.
-  * Fixed absolute output paths on Windows.
-  * Allow trailing slashes in --proto_path mappings.
-
-  C++
-  * Reflection objects are now per-class rather than per-instance.  To make this
-    possible, the Reflection interface had to be changed such that all methods
-    take the Message instance as a parameter.  This change improves performance
-    significantly in memory-bandwidth-limited use cases, since it makes the
-    message objects smaller.  Note that source-incompatible interface changes
-    like this will not be made again after the library leaves beta.
-  * Heuristically detect sub-messages when printing unknown fields.
-  * Fix static initialization ordering bug that caused crashes at startup when
-    compiling on Mac with static linking.
-  * Fixed TokenizerTest when compiling with -DNDEBUG on Linux.
-  * Fixed incorrect definition of kint32min.
-  * Fix bytes type setter to work with byte sequences with embedded NULLs.
-  * Other irrelevant tweaks.
-
-  Java
-  * Fixed UnknownFieldSet's parsing of varints larger than 32 bits.
-  * Fixed TextFormat's parsing of "inf" and "nan".
-  * Fixed TextFormat's parsing of comments.
-  * Added info to Java POM that will be required when we upload the
-    package to a Maven repo.
-
-  Python
-  * MergeFrom(message) and CopyFrom(message) are now implemented.
-  * SerializeToString() raises an exception if the message is missing required
-    fields.
-  * Code organization improvements.
-  * Fixed doc comments for RpcController and RpcChannel, which had somehow been
-    swapped.
-  * Fixed text_format_test on Windows where floating-point exponents sometimes
-    contain extra zeros.
-  * Fix Python service CallMethod() implementation.
-
-  Other
-  * Improved readmes.
-  * VIM syntax highlighting improvements.
-
-2008-07-07 version 2.0.0:
-
-  * First public release.

protobuf/protobuf-2.5.0/CONTRIBUTORS.txt

@@ -1,90 +0,0 @@
-This file contains a list of people who have made large contributions
-to the public version of Protocol Buffers.
-
-Original Protocol Buffers design and implementation:
-  Sanjay Ghemawat <[email protected]>
-  Jeff Dean <[email protected]>
-  Daniel Dulitz <[email protected]>
-  Craig Silverstein
-  Paul Haahr <[email protected]>
-  Corey Anderson <[email protected]>
-  (and many others)
-
-Proto2 C++ and Java primary author:
-  Kenton Varda <[email protected]>
-
-Proto2 Python primary authors:
-  Will Robinson <[email protected]>
-  Petar Petrov <[email protected]>
-
-Large code contributions:
-  Jason Hsueh <[email protected]>
-  Joseph Schorr <[email protected]>
-  Wenbo Zhu <[email protected]>
-
-Large quantity of code reviews:
-  Scott Bruce <[email protected]>
-  Frank Yellin
-  Neal Norwitz <[email protected]>
-  Jeffrey Yasskin <[email protected]>
-  Ambrose Feinstein <[email protected]>
-
-Documentation:
-  Lisa Carey <[email protected]>
-
-Maven packaging:
-  Gregory Kick <[email protected]>
-
-Patch contributors:
-  Kevin Ko <[email protected]>
-    * Small patch to handle trailing slashes in --proto_path flag.
-  Johan Euphrosine <[email protected]>
-    * Small patch to fix Python CallMethod().
-  Ulrich Kunitz <[email protected]>
-    * Small optimizations to Python serialization.
-  Leandro Lucarella <[email protected]>
-    * VI syntax highlighting tweaks.
-    * Fix compiler to not make output executable.
-  Dilip Joseph <[email protected]>
-    * Heuristic detection of sub-messages when printing unknown fields in
-      text format.
-  Brian Atkinson <[email protected]>
-    * Added @Override annotation to generated Java code where appropriate.
-  Vincent Choinière <[email protected]>
-    * Tru64 support.
-  Monty Taylor <[email protected]>
-    * Solaris 10 + Sun Studio fixes.
-  Alek Storm <[email protected]>
-    * Slicing support for repeated scalar fields for the Python API.
-  Oleg Smolsky <[email protected]>
-    * MS Visual Studio error format option.
-    * Detect unordered_map in stl_hash.m4.
-  Brian Olson <[email protected]>
-    * gzip/zlib I/O support.
-  Michael Poole <[email protected]>
-    * Fixed warnings about generated constructors not explicitly initializing
-      all fields (only present with certain compiler settings).
-    * Added generation of field number constants.
-  Wink Saville <[email protected]>
-    * Fixed initialization ordering problem in logging code.
-  Will Pierce <[email protected]>
-    * Small patch improving performance of in Python serialization.
-  Alexandre Vassalotti <[email protected]>
-    * Emacs mode for Protocol Buffers (editors/protobuf-mode.el).
-  Scott Stafford <[email protected]>
-    * Added Swap(), SwapElements(), and RemoveLast() to Reflection interface.
-  Alexander Melnikov <[email protected]>
-    * HPUX support.
-  Oliver Jowett <[email protected]>
-    * Detect whether zlib is new enough in configure script.
-    * Fixes for Solaris 10 32/64-bit confusion.
-  Evan Jones <[email protected]>
-    * Optimize Java serialization code when writing a small message to a stream.
-    * Optimize Java serialization of strings so that UTF-8 encoding happens only
-      once per string per serialization call.
-    * Clean up some Java warnings.
-    * Fix bug with permanent callbacks that delete themselves when run.
-  Michael Kucharski <[email protected]>
-    * Added CodedInputStream.getTotalBytesRead().
-  Kacper Kowalik <[email protected]>
-    * Fixed m4/acx_pthread.m4 problem for some Linux distributions.