ton/GeneralUtils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
narawat lamaiin
2024-10-04 13:33:58 +07:00
parent eb74ac00f2
commit 05efa05ef5
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/communication.jl
View File

@@ -535,7 +535,7 @@ end
# Signature # Signature
""" """
function sendMqttMsg(outgoingMsg::Dict{Symbol, T})::NamedTuple where {T<:Any} function sendMqttMsg(outgoingMsg::Dict{Symbol, T})::NamedTuple where {T<:Any}
mqttMsgReceiveTopic = ["/GeneralUtils_sendReceiveMqttMsg/$(outgoingMsg[:msgMeta][:senderId])"] mqttMsgReceiveTopic = ["/GeneralUtils_sendMqttMsg/$(outgoingMsg[:msgMeta][:senderId])"]
mqttMsgReceiveChannel = (ch1=Channel(8),) mqttMsgReceiveChannel = (ch1=Channel(8),)
keepaliveChannel = Channel(8) keepaliveChannel = Channel(8)
@@ -555,35 +555,20 @@ function sendMqttMsg(outgoingMsg::Dict{Symbol, T})::NamedTuple where {T<:Any}
mqttBrokerPort=outgoingMsg[:msgMeta][:mqttBrokerPort] mqttBrokerPort=outgoingMsg[:msgMeta][:mqttBrokerPort]
) )
return sendMqttMsg(mqttInstance, outgoingMsg) response = sendMqttMsg(mqttInstance, outgoingMsg)
disconnect(mqttInstance.client)
return response
end end
function sendMqttMsg(mqttInstance::mqttClientInstance, outgoingMsg::Dict{Symbol, T} function sendMqttMsg(mqttInstance::mqttClientInstance, outgoingMsg::Dict{Symbol, T}
)::NamedTuple where {T<:Any} )::NamedTuple where {T<:Any}
try try
publish(mqttInstance.client, outgoingMsg[:msgMeta][:sendTopic], JSON3.write(outgoingMsg)) publish(mqttInstance.client, outgoingMsg[:msgMeta][:sendTopic], JSON3.write(outgoingMsg))
# disconnect mqtt
disconnect(client)
return (success=true, error=nothing) return (success=true, error=nothing)
catch e catch e
return (success=false, error=e) return (success=false, error=e)
end end
end end
# function sendMqttMsg(outgoingMsg::Dict{Symbol, T})::NamedTuple where {T<:Any}
# try
# # Instantiate a client and connection.
# client, connection = MakeConnection(
# outgoingMsg[:msgMeta][:mqttBrokerAddress],
# outgoingMsg[:msgMeta][:mqttBrokerPort])
# connect(client, connection)
# publish(client, outgoingMsg[:msgMeta][:sendTopic], JSON3.write(outgoingMsg))
# # disconnect mqtt
# disconnect(client)
# return (success=true, error=nothing)
# catch e
# return (success=false, error=e)
# end
# end
""" Send a message to specified MQTT topic then wait for reply. """ Send a message to specified MQTT topic then wait for reply.
@@ -626,9 +611,10 @@ julia> success, error, response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg)
""" """
function sendReceiveMqttMsg(outgoingMsg::Dict{Symbol, T}; function sendReceiveMqttMsg(outgoingMsg::Dict{Symbol, T};
timeout::Integer=60, maxattempt::Integer=1)::NamedTuple where {T<:Any} timeout::Integer=60, maxattempt::Integer=1)::NamedTuple where {T<:Any}
mqttMsgReceiveTopic = ["/GeneralUtils_sendReceiveMqttMsg/$(outgoingMsg[:msgMeta][:senderId])"] mqttMsgReceiveTopic = "/GeneralUtils_sendReceiveMqttMsg/$(outgoingMsg[:msgMeta][:senderId])"
mqttMsgReceiveChannel = (ch1=Channel(8),) mqttMsgReceiveChannel = (ch1=Channel(8),)
keepaliveChannel = Channel(8) keepaliveChannel = Channel(8)
outgoingMsg[:msgMeta][:replyTopic] = mqttMsgReceiveTopic
# Define the callback for receiving messages. # Define the callback for receiving messages.
function onMsgCallback(topic, payload) function onMsgCallback(topic, payload)
@@ -639,14 +625,17 @@ function sendReceiveMqttMsg(outgoingMsg::Dict{Symbol, T};
mqttInstance = mqttClientInstance_v2( mqttInstance = mqttClientInstance_v2(
outgoingMsg[:msgMeta][:mqttBrokerAddress], outgoingMsg[:msgMeta][:mqttBrokerAddress],
mqttMsgReceiveTopic, [mqttMsgReceiveTopic],
mqttMsgReceiveChannel, mqttMsgReceiveChannel,
keepaliveChannel, keepaliveChannel,
onMsgCallback; onMsgCallback;
mqttBrokerPort=outgoingMsg[:msgMeta][:mqttBrokerPort] mqttBrokerPort=outgoingMsg[:msgMeta][:mqttBrokerPort]
) )
return sendReceiveMqttMsg(mqttInstance, :ch1, outgoingMsg; timeout=timeout, maxattempt=maxattempt) response = sendReceiveMqttMsg(mqttInstance, :ch1, outgoingMsg; timeout=timeout, maxattempt=maxattempt)
disconnect(mqttInstance.client)
return response
end end
function sendReceiveMqttMsg(mqttInstance::mqttClientInstance_v2, receivechannel::Symbol, function sendReceiveMqttMsg(mqttInstance::mqttClientInstance_v2, receivechannel::Symbol,