Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mica
mica-mqtt
提交
851ab360
mica-mqtt
项目概览
mica
/
mica-mqtt
通知
71
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
mica-mqtt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
851ab360
编写于
1月 21, 2022
作者:
浅梦2013
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
✨
mica-mqtt client、server connectListener 改为异步
上级
9eb1652f
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
46 addition
and
32 deletion
+46
-32
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/DefaultMqttClientProcessor.java
...amlu/iot/mqtt/core/client/DefaultMqttClientProcessor.java
+10
-7
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientAioListener.java
...t/dreamlu/iot/mqtt/core/client/MqttClientAioListener.java
+11
-6
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
...a/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
+2
-2
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
...t/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
+12
-6
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
...a/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
+1
-1
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/support/DefaultMqttServerProcessor.java
.../mqtt/core/server/support/DefaultMqttServerProcessor.java
+9
-9
mica-mqtt-example/src/main/resources/log4j2.properties
mica-mqtt-example/src/main/resources/log4j2.properties
+1
-1
未找到文件。
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/DefaultMqttClientProcessor.java
浏览文件 @
851ab360
...
...
@@ -100,11 +100,14 @@ public class DefaultMqttClientProcessor implements IMqttClientProcessor {
if
(
connectListener
==
null
)
{
return
;
}
// 触发客户端连接事件
executor
.
submit
(()
->
{
try
{
connectListener
.
onConnected
(
context
,
context
.
isReconnect
);
}
catch
(
Throwable
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
});
}
/**
...
...
@@ -149,7 +152,7 @@ public class DefaultMqttClientProcessor implements IMqttClientProcessor {
MqttPendingSubscription
pendingSubscription
=
new
MqttPendingSubscription
(
reSubscriptionList
,
message
);
Boolean
result
=
Tio
.
send
(
context
,
message
);
logger
.
info
(
"MQTT subscriptionList:{} messageId:{} resubscribing result:{}"
,
reSubscriptionList
,
messageId
,
result
);
pendingSubscription
.
startRetransmitTimer
(
executor
,
(
msg
)
->
Tio
.
send
(
context
,
m
essage
));
pendingSubscription
.
startRetransmitTimer
(
executor
,
(
msg
)
->
Tio
.
send
(
context
,
m
sg
));
clientSession
.
addPaddingSubscribe
(
messageId
,
pendingSubscription
);
}
...
...
@@ -276,7 +279,7 @@ public class DefaultMqttClientProcessor implements IMqttClientProcessor {
Tio
.
send
(
context
,
pubRelMessage
);
pendingPublish
.
setPubRelMessage
(
pubRelMessage
);
pendingPublish
.
startPubRelRetransmissionTimer
(
executor
,
msg
->
Tio
.
send
(
context
,
msg
));
pendingPublish
.
startPubRelRetransmissionTimer
(
executor
,
(
msg
)
->
Tio
.
send
(
context
,
msg
));
}
@Override
...
...
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientAioListener.java
浏览文件 @
851ab360
...
...
@@ -29,6 +29,7 @@ import org.tio.utils.hutool.StrUtil;
import
java.nio.charset.StandardCharsets
;
import
java.util.Objects
;
import
java.util.concurrent.ScheduledThreadPoolExecutor
;
/**
* mqtt 客户端监听器
...
...
@@ -39,10 +40,12 @@ public class MqttClientAioListener extends DefaultClientAioListener {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
MqttClient
.
class
);
private
final
MqttConnectMessage
connectMessage
;
private
final
IMqttClientConnectListener
connectListener
;
private
final
ScheduledThreadPoolExecutor
executor
;
public
MqttClientAioListener
(
MqttClientCreator
clientCreator
)
{
public
MqttClientAioListener
(
MqttClientCreator
clientCreator
,
ScheduledThreadPoolExecutor
executor
)
{
this
.
connectMessage
=
getConnectMessage
(
Objects
.
requireNonNull
(
clientCreator
));
this
.
connectListener
=
clientCreator
.
getConnectListener
();
this
.
executor
=
executor
;
}
/**
...
...
@@ -109,11 +112,13 @@ public class MqttClientAioListener extends DefaultClientAioListener {
return
;
}
// 2. 触发客户断开连接事件
executor
.
submit
(()
->
{
try
{
connectListener
.
onDisconnect
(
channelContext
,
throwable
,
remark
,
isRemove
);
}
catch
(
Throwable
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
});
}
}
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClientCreator.java
浏览文件 @
851ab360
...
...
@@ -393,11 +393,11 @@ public final class MqttClientCreator {
if
(
this
.
messageIdGenerator
==
null
)
{
this
.
messageIdGenerator
=
new
DefaultMqttClientMessageIdGenerator
();
}
ScheduledThreadPoolExecutor
executor
=
new
ScheduledThreadPoolExecutor
(
1
,
DefaultThreadFactory
.
getInstance
(
"MqttClient"
));
ScheduledThreadPoolExecutor
executor
=
new
ScheduledThreadPoolExecutor
(
2
,
DefaultThreadFactory
.
getInstance
(
"MqttClient"
));
IMqttClientProcessor
processor
=
new
DefaultMqttClientProcessor
(
this
,
executor
);
// 4. 初始化 mqtt 处理器
ClientAioHandler
clientAioHandler
=
new
MqttClientAioHandler
(
this
,
processor
);
ClientAioListener
clientAioListener
=
new
MqttClientAioListener
(
this
);
ClientAioListener
clientAioListener
=
new
MqttClientAioListener
(
this
,
executor
);
// 5. 重连配置
ReconnConf
reconnConf
=
null
;
if
(
this
.
reconnect
)
{
...
...
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerAioListener.java
浏览文件 @
851ab360
...
...
@@ -30,6 +30,8 @@ import org.tio.core.Tio;
import
org.tio.core.intf.Packet
;
import
org.tio.utils.hutool.StrUtil
;
import
java.util.concurrent.ScheduledThreadPoolExecutor
;
/**
* mqtt 服务监听
*
...
...
@@ -41,12 +43,14 @@ public class MqttServerAioListener extends DefaultAioListener {
private
final
IMqttSessionManager
sessionManager
;
private
final
IMqttMessageDispatcher
messageDispatcher
;
private
final
IMqttConnectStatusListener
connectStatusListener
;
private
final
ScheduledThreadPoolExecutor
executor
;
public
MqttServerAioListener
(
MqttServerCreator
serverCreator
)
{
public
MqttServerAioListener
(
MqttServerCreator
serverCreator
,
ScheduledThreadPoolExecutor
executor
)
{
this
.
messageStore
=
serverCreator
.
getMessageStore
();
this
.
sessionManager
=
serverCreator
.
getSessionManager
();
this
.
messageDispatcher
=
serverCreator
.
getMessageDispatcher
();
this
.
connectStatusListener
=
serverCreator
.
getConnectStatusListener
();
this
.
executor
=
executor
;
}
@Override
...
...
@@ -113,11 +117,13 @@ public class MqttServerAioListener extends DefaultAioListener {
}
private
void
notify
(
ChannelContext
context
,
String
clientId
)
{
executor
.
execute
(()
->
{
try
{
connectStatusListener
.
offline
(
context
,
clientId
);
}
catch
(
Throwable
throwable
)
{
logger
.
error
(
"Mqtt server clientId:{} offline notify error."
,
clientId
,
throwable
);
}
});
}
@Override
...
...
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java
浏览文件 @
851ab360
...
...
@@ -465,7 +465,7 @@ public class MqttServerCreator {
// 1. 处理消息
ServerAioHandler
handler
=
new
MqttServerAioHandler
(
this
,
serverProcessor
);
// 2. t-io 监听
ServerAioListener
listener
=
new
MqttServerAioListener
(
this
);
ServerAioListener
listener
=
new
MqttServerAioListener
(
this
,
executor
);
// 3. t-io 配置
ServerTioConfig
tioConfig
=
new
ServerTioConfig
(
this
.
name
,
handler
,
listener
);
// 4. 设置 t-io 心跳 timeout
...
...
mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/server/support/DefaultMqttServerProcessor.java
浏览文件 @
851ab360
...
...
@@ -157,16 +157,16 @@ public class DefaultMqttServerProcessor implements MqttServerProcessor {
willMessage
.
setNode
(
nodeName
);
messageStore
.
addWillMessage
(
uniqueId
,
willMessage
);
}
// 9. 在线状态
// 9. 返回 ack
connAckByReturnCode
(
clientId
,
uniqueId
,
context
,
MqttConnectReasonCode
.
CONNECTION_ACCEPTED
);
// 10. 在线状态
executor
.
execute
(()
->
{
try
{
connectStatusListener
.
online
(
context
,
uniqueId
);
}
catch
(
Throwable
e
)
{
logger
.
error
(
"mqtt connectStatusListener"
,
e
);
connAckByReturnCode
(
clientId
,
uniqueId
,
context
,
MqttConnectReasonCode
.
CONNECTION_REFUSED_SERVER_UNAVAILABLE
);
return
;
logger
.
error
(
"Mqtt server uniqueId:{} clientId:{} online notify error."
,
uniqueId
,
clientId
,
e
);
}
// 10. 返回 ack
connAckByReturnCode
(
clientId
,
uniqueId
,
context
,
MqttConnectReasonCode
.
CONNECTION_ACCEPTED
);
});
}
private
static
void
connAckByReturnCode
(
String
clientId
,
String
uniqueId
,
ChannelContext
context
,
MqttConnectReasonCode
returnCode
)
{
...
...
mica-mqtt-example/src/main/resources/log4j2.properties
浏览文件 @
851ab360
...
...
@@ -2,7 +2,7 @@ log4j.rootLogger = DEBUG
appender.console.type
=
Console
appender.console.name
=
STDOUT
appender.console.layout.type
=
PatternLayout
appender.console.layout.pattern
=
%d %-5p %c{2} - %m%n
appender.console.layout.pattern
=
%d
[%t]
%-5p %c{2} - %m%n
# debug
rootLogger.level
=
INFO
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录