update version to 0.33

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,18 +1,19 @@
 ## 野火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) | 机器人服务端                                            |                                                |
-| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |                                                |
-| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |                                                |
+| 仓库                                                         | 说明                                                    | 备注 |
+| ------------------------------------------------------------ | ------------------------------------------------------- | ---- |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                       |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                            |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |      |
+| [web-chat](https://github.com/wildfirechat/web-chat)          | Web平台的Demo, [体验地址](http://web.wildfirechat.cn)   |      |
+| [wx-chat](https://github.com/wildfirechat/wx-chat)           | 微信小程序平台的Demo   |      |
+| [server](https://github.com/wildfirechat/server)             | IM server                                               |      |
+| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                          |      |
+| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                        |      |
+| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |      |
+| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |      | |                                            |
 
 # server
 本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.cn)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)
@@ -20,11 +21,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 +43,11 @@
 
 ![野火IM](http://static.wildfirechat.cn/download_qrcode.png)
 
+#### 加入野火官方体验交流群
+使用野火IM移动客户端扫码下面二维码（不是使用微信扫码），和野火IM的爱好者一起畅谈野火IM的问题和经验：
+
+![野火IM官方交流群](http://static.wildfirechat.cn/wildfirechat_official_group.jpeg)
+
 #### 应用截图
 ![ios-demo](http://static.wildfirechat.cn/ios-demo.gif)
 
@@ -65,7 +78,7 @@
 
 | 捐赠者 | 商标 | 金额 | 简介 |
 | ----- | ---- | -------- | --- |
-| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 每月2000¥ | 一站式区块链解决方案服务商(http://samos.io) |
+| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 保密 | 一站式区块链解决方案服务商(http://samos.io) |
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/hazelcast.xml

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

broker/config/wildfirechat.conf

@@ -1,8 +1,17 @@
+#
+#
+# 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下
+#
+#
+
+
+
 #*********************************************************************
 # Server configuration
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
-#客户端会从${http_port}端口获取到长链接端口。
+#客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
+# （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
 ##原生客户端长链接端口
@@ -26,14 +35,15 @@ host 0.0.0.0
 ##本地绑定端口
 local_port 80
 
-##是否使用内置DB。0使用mysql；1使用h2db
-embed.db 1
+##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
+embed.db 0
 
 ##服务器管理接口密钥
 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用逗号分割。这个密钥对安全性帮助不大，客户不要修改
@@ -42,6 +52,12 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+message.roaming 0
+
+##是否开启拉取远程历史消息
+message.remote_history_message 0
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -86,6 +102,9 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # 本地媒体服务器配置。
 local.media.storage.root media
 
+# 是否支持多端登陆
+server.multi_endpoint false
+
 #*********************************************************************
 # Push server configuration
 #*********************************************************************
@@ -95,10 +114,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/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/h2/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/h2/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 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/h2/V17__add_user_session_token_index.sql

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

broker/migrate/h2/V18__add_friend_request_index.sql

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

broker/migrate/h2/V19__add_user_session_uid_index.sql

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

broker/migrate/h2/V20__user_session_add_deleted.sql

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

broker/migrate/h2/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/h2/V8__add_content_type_in_messages.sql

@@ -0,0 +1 @@
+alter table `t_messages` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/h2/V9__add_sensitive_messages.sql

@@ -0,0 +1,15 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_messages` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_mid` bigint(20) NOT NULL,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_data` BLOB NOT NULL,
+  `_searchable_key` TEXT DEFAULT NULL,
+  `_dt` DATETIME NOT NULL DEFAULT NOW(),
+  `_content_type` int(11) NOT NULL DEFAULT 0,
+  UNIQUE INDEX `sensitive_message_uid_index` (`_mid` ASC)
+);

broker/migrate/mysql/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/mysql/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/mysql/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 0;

broker/migrate/mysql/V13__create_session_table.sql

@@ -0,0 +1,14 @@
+
+DROP TABLE IF EXISTS `t_session`;
+CREATE TABLE `t_session` (
+  `row_id` varchar(50) not null primary key,
+  `del_flag` tinyint(1) default 0 null,
+  `create_time` timestamp null,
+  `update_time` timestamp null,
+  `expire_time` timestamp null,
+  `user_id` int null,
+  constraint `t_session_pk_2` unique (`user_id`, `expire_time`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/migrate/mysql/V14__alter_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();
+alter table t_group MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();

broker/migrate/mysql/V15__alter_session_table_time.sql

@@ -0,0 +1,4 @@
+alter table t_session MODIFY column `create_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `update_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `expire_time` DATETIME NOT NULL DEFAULT NOW();
+

broker/migrate/mysql/V16__update_message_dt_gmt8.sql

@@ -0,0 +1,40 @@
+update t_messages_0 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_1 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_2 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_3 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_4 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_5 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_6 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_7 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_8 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_9 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_10 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_11 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_12 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_13 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_14 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_15 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_16 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_17 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_18 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_19 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_20 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_21 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_22 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_23 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_24 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_25 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_26 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_27 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_28 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_29 set _dt = date_add(_dt, interval 8 hour);
+
+
+update t_messages_30 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_31 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_32 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_33 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_34 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_35 set _dt = date_add(_dt, interval 8 hour);

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

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

broker/migrate/mysql/V23__add_friend_request_index.sql

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

broker/migrate/mysql/V24__add_user_session_uid_index.sql

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

broker/migrate/mysql/V25__user_session_add_deleted.sql

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

broker/migrate/mysql/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/mysql/V8__add_content_type_in_messages.sql

@@ -0,0 +1,36 @@
+alter table `t_messages_0` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_1` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_2` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_3` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_4` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_5` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_6` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_7` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_8` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_9` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_10` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_11` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_12` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_13` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_14` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_15` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_16` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_17` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_18` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_19` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_20` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_21` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_22` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_23` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_24` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_25` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_26` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_27` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_28` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_29` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_30` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_31` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_32` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_33` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_34` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_35` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/mysql/V9__add_sensitive_messages.sql

@@ -0,0 +1,18 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_messages` (
+    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `_mid` bigint(20) NOT NULL,
+    `_from` varchar(64) NOT NULL,
+    `_type` tinyint NOT NULL DEFAULT 0,
+    `_target` varchar(64) NOT NULL,
+    `_line` int(11) NOT NULL DEFAULT 0,
+    `_data` BLOB NOT NULL,
+    `_searchable_key` TEXT DEFAULT NULL,
+    `_dt` DATETIME NOT NULL,
+    `_content_type` int(11) NOT NULL DEFAULT '0',
+    INDEX `message_uid_index` (`_mid` DESC)
+  )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.22</version>
+        <version>0.33</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,34 +104,11 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
             <classifier>linux-x86_64</classifier>
-            <!-- 
+            <!--
             <classifier>${os.detected.name}-${os.detected.arch}</classifier>
              -->
         </dependency>
 
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jvm</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.librato.metrics</groupId>
-            <artifactId>metrics-librato</artifactId>
-            <version>5.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.bugsnag</groupId>
-            <artifactId>bugsnag</artifactId>
-            <version>[3.0,4.0)</version>
-        </dependency>
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -170,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 -->
@@ -190,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>
@@ -256,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/cn/wildfirechat/push/PushServer.java

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

broker/src/main/java/com/xiaoleilu/loServer/action/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/RouteAction.java

@@ -35,12 +35,15 @@ import java.util.concurrent.Executor;
 @HttpMethod("POST")
 public class RouteAction extends Action {
     private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class);
+
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");
-            FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
+            response.setHeader("Access-Control-Allow-Origin", "*");
+
+            FullHttpRequest fullHttpRequest = (FullHttpRequest) request.getNettyRequest();
             boolean b = false;
             if ("web".equalsIgnoreCase(fullHttpRequest.headers().get("p"))) {
                 b = true;
@@ -79,7 +82,7 @@ public class RouteAction extends Action {
 
             MemorySessionStore.Session session = sessionsStore.sessionForClientAndUser(uid, cid);
             if (session == null) {
-                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true, true);
+                ErrorCode errorCode = sessionsStore.loadActiveSession(uid, cid);
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     sendResponse(response, errorCode, null, base64Response);
                     return true;
@@ -144,10 +147,14 @@ public class RouteAction extends Action {
 
     private void sendResponse(Response response, ErrorCode errorCode, byte[] contents, boolean base64Response) {
         response.setStatus(HttpResponseStatus.OK);
-        if(contents == null) {
+        if (contents == null) {
             ByteBuf ackPayload = Unpooled.buffer();
             ackPayload.ensureWritable(1).writeByte(errorCode.getCode());
-            response.setContent(ackPayload);
+            contents = ackPayload.array();
+        }
+        if (base64Response) {
+            byte[] base64Data = Base64.getEncoder().encode(contents);
+            response.setContent(base64Data);
         } else {
             response.setContent(contents);
         }

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

@@ -45,7 +45,7 @@ public class BlockUserAction extends AdminAction {
                 result = RestResult.resultOf(errorCode);
                 response.setContent(new Gson().toJson(result));
 
-                if (inputUserBlock.getStatus() != 0) {
+                if (inputUserBlock.getStatus() == 2) {
                     RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
                 }
 

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 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.*;
+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/GetIMTokenAction.java

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

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

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.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/KickoffGroupMemberAction.java

@@ -42,7 +42,7 @@ public class KickoffGroupMemberAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             if (inputKickoffGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                     @Override
                     public void onSuccess(byte[] result) {
                         ByteBuf byteBuf = Unpooled.buffer();

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

broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java

@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Action处理单元
- * 
+ *
  * @author Looly
  */
 abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
@@ -45,7 +45,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 		try {
 			//do filter
 			boolean isPass = this.doFilter(request, response);
-			
+
 			if(isPass){
 				//do action
 				this.doAction(ctx, request, response);
@@ -64,10 +64,10 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
             ctx.fireExceptionCaught(e);
             ctx.close();
 		}
-		
+
 
 	}
-	
+
 	@Override
 	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         super.exceptionCaught(ctx, cause);
@@ -75,7 +75,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
         Channel channel = ctx.channel();
         if(channel.isActive())ctx.close();
 	}
-	
+
 	//---------------------------------------------------------------------------------------- Private method start
 	/**
 	 * 执行过滤
@@ -91,7 +91,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 				return false;
 			}
 		}
-		
+
 		//自定义Path过滤器
 		filter = ServerSetting.getFilter(request.getPath());
 		if(null != filter){
@@ -99,7 +99,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 				return false;
 			}
 		}
-		
+
 		return true;
 	}
 
@@ -110,6 +110,10 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 	 * @param response 响应对象
 	 */
 	private void doAction(ChannelHandlerContext ctx, Request request, Response response){
+	    if( "/route".equalsIgnoreCase(request.getPath()) && "OPTIONS".equalsIgnoreCase(request.getMethod())){
+	        handleOptions(ctx, request, response);
+	        return;
+        }
 		Action action;
 		if (isValidePath(request.getPath())) {
             action = ServerSetting.getAction(request.getPath(), request.getMethod().toUpperCase());
@@ -141,4 +145,11 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
         }
 	}
 	//---------------------------------------------------------------------------------------- Private method start
+
+
+    private void handleOptions(ChannelHandlerContext ctx, Request request, Response response){
+	    response.setHeader("Access-Control-Allow-Origin", "*");
+	    response.setHeader("Access-Control-Allow-Headers", "*");
+	    response.send();
+    }
 }

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

@@ -60,13 +60,6 @@ public final class BrokerConstants {
     public static final String NETTY_SO_KEEPALIVE_PROPERTY_NAME = "netty.so_keepalive";
     public static final String NETTY_CHANNEL_TIMEOUT_SECONDS_PROPERTY_NAME = "netty.channel_timeout.seconds";
     public static final String NETTY_EPOLL_PROPERTY_NAME = "netty.epoll";
-    public static final String METRICS_ENABLE_PROPERTY_NAME = "use_metrics";
-    public static final String METRICS_LIBRATO_EMAIL_PROPERTY_NAME = "metrics.librato.email";
-    public static final String METRICS_LIBRATO_TOKEN_PROPERTY_NAME = "metrics.librato.token";
-    public static final String METRICS_LIBRATO_SOURCE_PROPERTY_NAME = "metrics.librato.source";
-
-    public static final String BUGSNAG_ENABLE_PROPERTY_NAME = "use_bugsnag";
-    public static final String BUGSNAG_TOKEN_PROPERTY_NAME = "bugsnag.token";
 
     public static final String STORAGE_CLASS_NAME = "storage_class";
 
@@ -103,7 +96,7 @@ public final class BrokerConstants {
     public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
 
     public static final String CLIENT_PROTO_SECRET_KEY = "client.proto.secret_key";
-    public static final String TOKEN_SECRET_KEY = "token.key ";
+    public static final String TOKEN_SECRET_KEY = "token.key";
 
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
 
@@ -113,6 +106,14 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_Forward_Url = "message.forward.url";
 
+    public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
+
+    public static final String MONGODB_Client_URI = "mongodb.client_uri";
+    public static final String MONGODB_Database = "mongodb.database";
+    public static final String MONGODB_Data_Expire_Days = "mongodb.data_expire_days";
+
+    public static final String MESSAGE_ROAMING = "message.roaming";
+    public static final String MESSAGE_Remote_History_Message = "message.remote_history_message";
 
 
     private BrokerConstants() {

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

@@ -22,7 +22,7 @@ public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberReques
 
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, request.getGroupId(), request.getAddedMemberList());
+        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getAddedMemberList());
         if (errorCode == ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -14,10 +14,18 @@ import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
 @Handler(IMTopic.DeleteFriendTopic)
 public class DeleteFriendHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
-        return m_messagesStore.deleteFriend(fromUser, request.getId());
+        long[] head = new long[2];
+        ErrorCode errorCode = m_messagesStore.deleteFriend(fromUser, request.getId(), head);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, head[0]);
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getId(), head[1]);
+        }
+        return errorCode;
     }
 }

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

@@ -9,6 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -21,11 +22,15 @@ 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
             ) {
-            builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).setAlias(data.getAlias()).build());
+            WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setBlacked(data.getBlacked()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp());
+            if (!StringUtil.isNullOrEmpty(data.getAlias())) {
+                builder1.setAlias(data.getAlias());
+            }
+            builder.addEntry(builder1.build());
         }
         byte[] data = builder.build().toByteArray();
         ackPayload.ensureWritable(data.length).writeBytes(data);

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

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.WFCMessage;
+import 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/GetTokenHandler.java

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

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

@@ -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,13 +235,22 @@ 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);
+        mServer.getImBusinessScheduler().execute(() -> 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<>();
 
         message = m_messagesStore.storeMessage(username, clientID, message);
-        int pullType = m_messagesStore.getNotifyReceivers(username, message, notifyReceivers);
-        this.publisher.publish2Receivers(message, notifyReceivers, clientID, pullType);
+        WFCMessage.Message.Builder messageBuilder = message.toBuilder();
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
+        mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
         return notifyReceivers.size();
     }
 
@@ -249,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

@@ -24,20 +24,38 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
             errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
-
-        } else if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
-            && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
-
-            //send notify message first, then kickoff the member
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
-            } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
-                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
-            }
-            errorCode = m_messagesStore.kickoffGroupMembers(fromUser, request.getGroupId(), request.getRemovedMemberList());
         } else {
-            errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            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;
+                }
+            }
+
+            if (!isAllow) {
+                WFCMessage.GroupMember gm = m_messagesStore.getGroupMember(request.getGroupId(), fromUser);
+                if (gm != null && gm.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Manager) {
+                    isAllow = true;
+                }
+            }
+            if (!isAllow && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)) {
+                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            } else {
+                //send notify message first, then kickoff the member
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                    sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                } else {
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
+                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+                }
+                errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
+            }
         }
         return errorCode;
     }

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

@@ -14,16 +14,15 @@ import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
 import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyGroupInfoTopic)
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue());
+        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
@@ -33,6 +32,14 @@ public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupI
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupNameNotifyContent();
                 } else if(request.getType() == Modify_Group_Portrait) {
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getChangeGroupPortraitNotifyContent();
+                } else if(request.getType() == Modify_Group_Mute) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupMuteNotifyContent();
+                } else if(request.getType() == Modify_Group_JoinType) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupJointypeNotifyContent();
+                } else if(request.getType() == Modify_Group_PrivateChat) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPrivatechatNotifyContent();
+                } else if(request.getType() == Modify_Group_Searchable) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupSearchableNotifyContent();
                 }
 
                 if (content != null) {

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

@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.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/QuitGroupHandler.java

@@ -20,19 +20,14 @@ import static win.liyufan.im.IMTopic.QuitGroupTopic;
 public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
-        WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
-        if (groupInfo == null) {
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
-        } else {
-            //send notify message first, then quit group
+        ErrorCode errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
+        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
         }
         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,7 +33,11 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        m_messagesStore.getNotifyReceivers(fromUser, message, notifyReceivers);
+        publish(fromUser, clientID, message);
+
+
+        //等待客户端实现根据撤回消息更新内容，之后可以删掉这段代码
+        m_messagesStore.getNotifyReceivers(fromUser, message.toBuilder(), notifyReceivers);
         this.publisher.publishRecall2Receivers(int64Buf.getId(), fromUser, notifyReceivers, clientID);
 
         return errorCode;

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

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

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

@@ -46,6 +46,10 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         if (message != null) {
             if (!isAdmin) {  //admin do not check the right
+                // 不能在端上直接发送撤回和群通知
+                if (message.getContent().getType() == 80 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
+                    return ErrorCode.INVALID_PARAMETER;
+                }
                 int userStatus = m_messagesStore.getUserStatus(fromUser);
                 if (userStatus == 1 || userStatus == 2) {
                     return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
@@ -58,14 +62,19 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 }
 
 
-                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel && !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
+                    errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
+                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                        return errorCode;
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
+                    if(!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+                    if(!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                    }
                 }
             }
 
@@ -81,17 +90,20 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             if (!isAdmin && message.getContent().getType() == Text) {
                 Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
                 if (matched != null && !matched.isEmpty()) {
+                    m_messagesStore.storeSensitiveMessage(message);
                     if (mSensitiveType == 0) {
                         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/imhandler/SetGroupManagerHandler.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.SetGroupManagerTopic)
+public class SetGroupManagerHandler extends GroupHandler<WFCMessage.SetGroupManagerRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SetGroupManagerRequest request, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = m_messagesStore.setGroupManager(fromUser, request.getGroupId(), request.getType(), request.getUserIdList(), isAdmin);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
+            } else {
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getType() + "", request.getUserIdList()).getSetGroupManagerNotifyContent();
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+            }
+        }
+        return errorCode;
+    }
+}

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

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

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

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

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

@@ -27,7 +27,7 @@ public class UserStatusLoader implements MapStore<String, Integer> {
 
     @Override
     public void delete(String s) {
-        getDatabaseStore().deleteUser(s);
+        getDatabaseStore().deleteUserStatus(s);
     }
 
     @Override

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/server/netty/BugSnagErrorsHandler.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012-2017 The original author or authors
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-package io.moquette.server.netty;
-
-import com.bugsnag.Bugsnag;
-import io.moquette.server.config.IConfig;
-import io.netty.channel.ChannelHandler.Sharable;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-import static io.moquette.BrokerConstants.BUGSNAG_TOKEN_PROPERTY_NAME;
-
-@Sharable
-public class BugSnagErrorsHandler extends ChannelInboundHandlerAdapter {
-
-    private Bugsnag bugsnag;
-
-    public void init(IConfig props) {
-        final String token = props.getProperty(BUGSNAG_TOKEN_PROPERTY_NAME);
-        this.bugsnag = new Bugsnag(token);
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        bugsnag.notify(cause);
-        ctx.fireExceptionCaught(cause);
-    }
-}

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -139,25 +139,11 @@ public class NettyAcceptor implements ServerAcceptor {
 
         final NettyMQTTHandler mqttHandler = new NettyMQTTHandler(processor);
 
-        final boolean useFineMetrics = Boolean.parseBoolean(props.getProperty(METRICS_ENABLE_PROPERTY_NAME, "false"));
-        if (useFineMetrics) {
-            DropWizardMetricsHandler metricsHandler = new DropWizardMetricsHandler();
-            metricsHandler.init(props);
-            this.metrics = Optional.of(metricsHandler);
-        } else {
-            this.metrics = Optional.empty();
-        }
+        this.metrics = Optional.empty();
+
+        this.errorsCather = Optional.empty();
 
-        final boolean useBugSnag = Boolean.parseBoolean(props.getProperty(BUGSNAG_ENABLE_PROPERTY_NAME, "false"));
-        if (useBugSnag) {
-            BugSnagErrorsHandler bugSnagHandler = new BugSnagErrorsHandler();
-            bugSnagHandler.init(props);
-            this.errorsCather = Optional.of(bugSnagHandler);
-        } else {
-            this.errorsCather = Optional.empty();
-        }
         initializePlainTCPTransport(mqttHandler, props);
-        initializeWebSocketTransport(mqttHandler, props);
         String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME);
         String wssPortProp = props.getProperty(BrokerConstants.WSS_PORT_PROPERTY_NAME);
         if (sslTcpPortProp != null || wssPortProp != null) {
@@ -239,42 +225,6 @@ public class NettyAcceptor implements ServerAcceptor {
         });
     }
 
-    private void initializeWebSocketTransport(final NettyMQTTHandler handler, IConfig props) throws IOException {
-        LOG.info("Configuring Websocket MQTT transport");
-        String webSocketPortProp = props.getProperty(WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
-        if (DISABLED_PORT_BIND.equals(webSocketPortProp)) {
-            // Do nothing no WebSocket configured
-            LOG.info("Property {} has been setted to {}. Websocket MQTT will be disabled",
-                BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
-            return;
-        }
-        int port = Integer.parseInt(webSocketPortProp);
-
-        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
-
-        String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
-        initFactory(host, port, "Websocket MQTT", new PipelineInitializer() {
-
-            @Override
-            void init(ChannelPipeline pipeline) {
-                pipeline.addLast(new HttpServerCodec());
-                pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-                pipeline.addLast("webSocketHandler",
-                        new WebSocketServerProtocolHandler("/org/fusesource/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
-                pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
-                pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
-                pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
-                pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
-                pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
-                pipeline.addLast("decoder", new MqttDecoder());
-                pipeline.addLast("encoder", MqttEncoder.INSTANCE);
-                pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector));
-                pipeline.addLast("messageLogger", new MQTTMessageLogger());
-                pipeline.addLast("handler", handler);
-            }
-        });
-    }
-
     private void initializeSSLTCPTransport(final NettyMQTTHandler handler, IConfig props, final SSLContext sslContext)
             throws IOException {
         LOG.info("Configuring SSL MQTT transport");

broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java

@@ -16,6 +16,7 @@
 
 package io.moquette.server.netty.metrics;
 
+import io.moquette.server.netty.NettyUtils;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
@@ -23,10 +24,15 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static io.moquette.server.netty.NettyUtils.ATTR_USERNAME;
 
 public class BytesMetricsHandler extends ChannelDuplexHandler {
-
+    private static final Logger LOG = LoggerFactory.getLogger(BytesMetricsHandler.class);
     private static final AttributeKey<BytesMetrics> ATTR_KEY_METRICS = AttributeKey.valueOf("BytesMetrics");
+    private static final AttributeKey<String> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
 
     private BytesMetricsCollector m_collector;
 
@@ -59,6 +65,12 @@ public class BytesMetricsHandler extends ChannelDuplexHandler {
     @Override
     public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
         BytesMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get();
+        String userId = ctx.channel().attr(ATTR_KEY_USERNAME).get();
+        if (userId == null) {
+            userId = "";
+        }
+
+        LOG.info("channel<{}> closing after read {} bytes and wrote {} bytes", userId,  metrics.readBytes(), metrics.wroteBytes());
         m_collector.sumReadBytes(metrics.readBytes());
         m_collector.sumWroteBytes(metrics.wroteBytes());
         super.close(ctx, promise);

broker/src/main/java/io/moquette/server/netty/metrics/DropWizardMetricsHandler.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2012-2017 The original author or authors
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-package io.moquette.server.netty.metrics;
-
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.librato.metrics.reporter.Librato;
-import io.moquette.server.config.IConfig;
-import io.moquette.server.netty.NettyUtils;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttMessageType;
-
-import java.util.concurrent.TimeUnit;
-
-import static io.moquette.BrokerConstants.*;
-import static io.netty.channel.ChannelHandler.Sharable;
-
-/**
- * Pipeline handler use to track some MQTT metrics.
- */
-@Sharable
-public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter {
-    private MetricRegistry metrics;
-    private Meter publishesMetrics;
-    private Meter subscribeMetrics;
-    private Counter connectedClientsMetrics;
-
-    public void init(IConfig props) {
-        this.metrics = new MetricRegistry();
-        this.publishesMetrics = metrics.meter("publish.requests");
-        this.subscribeMetrics = metrics.meter("subscribe.requests");
-        this.connectedClientsMetrics = metrics.counter("connect.num_clients");
-//        ConsoleReporter reporter = ConsoleReporter.forRegistry(metrics)
-//            .convertRatesTo(TimeUnit.SECONDS)
-//            .convertDurationsTo(TimeUnit.MILLISECONDS)
-//            .build();
-//        reporter.start(1, TimeUnit.MINUTES);
-        final String email = props.getProperty(METRICS_LIBRATO_EMAIL_PROPERTY_NAME);
-        final String token = props.getProperty(METRICS_LIBRATO_TOKEN_PROPERTY_NAME);
-        final String source = props.getProperty(METRICS_LIBRATO_SOURCE_PROPERTY_NAME);
-
-        Librato.reporter(this.metrics, email, token)
-            .setSource(source)
-            .start(10, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object message) {
-        MqttMessage msg = (MqttMessage) message;
-        MqttMessageType messageType = msg.fixedHeader().messageType();
-        switch (messageType) {
-            case PUBLISH:
-                this.publishesMetrics.mark();
-                break;
-            case SUBSCRIBE:
-                this.subscribeMetrics.mark();
-                break;
-            case CONNECT:
-                this.connectedClientsMetrics.inc();
-                break;
-            case DISCONNECT:
-                this.connectedClientsMetrics.dec();
-                break;
-            default:
-                break;
-        }
-        ctx.fireChannelRead(message);
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        String clientID = NettyUtils.clientID(ctx.channel());
-        if (clientID != null && !clientID.isEmpty()) {
-            this.connectedClientsMetrics.dec();
-        }
-        ctx.fireChannelInactive();
-    }
-
-}

broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java

@@ -22,10 +22,16 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static io.moquette.server.netty.NettyUtils.ATTR_USERNAME;
 
 public class MessageMetricsHandler extends ChannelDuplexHandler {
-
+    private static final Logger LOG = LoggerFactory.getLogger(MessageMetricsHandler.class);
     private static final AttributeKey<MessageMetrics> ATTR_KEY_METRICS = AttributeKey.valueOf("MessageMetrics");
+    private static final AttributeKey<String> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
+
 
     private MessageMetricsCollector m_collector;
 
@@ -58,6 +64,12 @@ public class MessageMetricsHandler extends ChannelDuplexHandler {
     @Override
     public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
         MessageMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get();
+        String userId = ctx.channel().attr(ATTR_KEY_USERNAME).get();
+        if (userId == null) {
+            userId = "";
+        }
+
+        LOG.info("channel<{}> closing after read {} messages and wrote {} messages", userId,  metrics.messagesRead(), metrics.messagesWrote());
         m_collector.sumReadMessages(metrics.messagesRead());
         m_collector.sumWroteMessages(metrics.messagesWrote());
         super.close(ctx, promise);

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;
@@ -96,26 +97,29 @@ public interface IMessagesStore {
 
     DatabaseStore getDatabaseStore();
     WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message);
-	int getNotifyReceivers(String fromUser, WFCMessage.Message message, Set<String> notifyReceivers);
+    void storeSensitiveMessage(WFCMessage.Message message);
+	int getNotifyReceivers(String fromUser, WFCMessage.Message.Builder message, Set<String> notifyReceivers);
     Set<String> getAllEnds();
     WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType);
     WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count);
     long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId);
     WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList);
-    ErrorCode addGroupMembers(String operator, String groupId, List<WFCMessage.GroupMember> memberList);
-    ErrorCode kickoffGroupMembers(String operator, String groupId, List<String> memberList);
+    ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList);
+    ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
-    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value);
+    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
     ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
+    WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
+    ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
     boolean isMemberInGroup(String member, String groupId);
-    boolean isForbiddenInGroup(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);
@@ -132,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);
@@ -147,12 +153,12 @@ 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);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
-    ErrorCode deleteFriend(String userId, String friendUid);
+    ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);
     boolean isBlacked(String fromUser, String userId);

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

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

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

@@ -308,7 +308,7 @@ public class MessagesPublisher {
                     }
 
                     if (isSlient) {
-                        LOG.info("The conversation is slient");
+                        LOG.info("Slient of user or conversation");
                         continue;
                     }
 

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

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

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

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

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

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

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

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

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

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

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

@@ -52,7 +52,7 @@ public class HttpUtils {
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                LOG.info("POST to {} success with response", url, response.body().string());
+                LOG.info("POST to {} success with response: {}", url, response.body());
             }
         });
     }

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";
@@ -30,7 +31,7 @@ public interface IMTopic {
     String GetGroupInfoTopic = "GPGI";
     String GetGroupMemberTopic = "GPGM";
     String TransferGroupTopic = "GTG";
-
+    String SetGroupManagerTopic = "GSM";
 
     String GetUserInfoTopic = "UPUI";
     String ModifyMyInfoTopic = "MMI";

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

@@ -54,10 +54,15 @@ public class MessageShardingUtil {
             return "t_messages";
         }
 
-        mid >>= (nodeIdWidth + rotateIdWidth);
-        Date date = new Date(mid + T201801010000);
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
+        if (mid != Long.MAX_VALUE) {
+            mid >>= (nodeIdWidth + rotateIdWidth);
+            Date date = new Date(mid + T201801010000);
+            calendar.setTime(date);
+        } else {
+            Date date = new Date(System.currentTimeMillis());
+            calendar.setTime(date);
+        }
         int month = calendar.get(Calendar.MONTH);
         int year = calendar.get(Calendar.YEAR);
         year %= 3;

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

@@ -58,6 +58,7 @@ public class SensitiveFilter {
             return sensitiveWords;
         }
 
+        text = text.toLowerCase();
         for(int i=0;i<text.length();i++){
             int sensitiveWordLength = getSensitiveWordLength(text, i, matchType);
             if(sensitiveWordLength>0){

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>
@@ -15,7 +18,7 @@
         <!--MySQL数据库驱动程序-->
         <property name="driverClass">com.mysql.cj.jdbc.Driver</property>
         <!--MySQL数据库地址-->
-        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
+        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT%2B8&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
         <!--MySQL数据库用户名-->
         <property name="user">root</property>
         <!--MySQL数据库密码-->

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.22</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,398 +0,0 @@
-package cn.wildfirechat.client;
-
-import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import cn.wildfirechat.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.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();
-                connection.publish("MP", request.toByteArray(), QoS.AT_LEAST_ONCE, false, new Callback<byte[]>(){
-                    @Override
-                    public void onSuccess(byte[] value) {
-                        try {
-                            byte[] data = AES.AESDecrypt(value, privateSecret, true);
-                            try {
-                                WFCMessage.PullMessageResult result = WFCMessage.PullMessageResult.parseFrom(data);
-                                if (receiveMessageCallback != null) {
-                                    receiveMessageCallback.onReceiveMessages(result.getMessageList(), 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非法
-        IMClient client = new IMClient("yzyOyOKK", "7SJk13q+YdHHe6EwDzry9BKogxTNf3UgtYj50cBTZgWNkNuxEkiqg2koKg0lXViONIX1LmwCR1jN0Mw8hvk6KGpiSKFi+IRaRkIb3mNzgIfrq4afhyIHaQfa2HOfsi6Ws+9YobkdDgdq7W70bEdVfiCSU9+JOIY449nxZzfg2Zw=", "DD72C212-26C7-4B38-A5FC-88550896B170", "192.168.1.101", 80);
-
-        client.setReceiveMessageCallback(new ReceiveMessageCallback() {
-            @Override
-            public void onReceiveMessages(List<WFCMessage.Message> messageList, boolean hasMore) {
-
-            }
-
-            @Override
-            public void onRecallMessage(long messageUid) {
-
-            }
-        });
-
-        client.setConnectionStatusCallback((ConnectionStatus newStatus) -> {
-            if (newStatus == ConnectionStatus_Connected) {
-                WFCMessage.Conversation conversation = WFCMessage.Conversation.newBuilder().setType(0).setTarget("yzyOyOKK").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);
-
-}