Skip to content

Commit

Permalink
Merge pull request #60 from Madeliine/unsub_command_added
Browse files Browse the repository at this point in the history
Adding the option for unsub command.
  • Loading branch information
vortex314 authored Dec 5, 2023
2 parents 518669a + ad33e39 commit 8e39164
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 2 deletions.
68 changes: 67 additions & 1 deletion src/Serial2Mqtt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ const char *signalString[] = {"PIPE_ERROR",
"MQTT_CONNECT_FAIL",
"MQTT_SUBSCRIBE_SUCCESS",
"MQTT_SUBSCRIBE_FAIL",
"MQTT_UNSUBSCRIBE_SUCCESS",
"MQTT_UNSUBSCRIBE_FAIL",
"MQTT_PUBLISH_SUCCESS",
"MQTT_PUBLISH_FAIL",
"MQTT_DISCONNECTED",
Expand Down Expand Up @@ -423,6 +425,17 @@ void Serial2Mqtt::run()
mqttDisconnect();
break;
}
case MQTT_UNSUBSCRIBE_SUCCESS:
{
INFO("MQTT_UNSUBSCRIBE_SUCCESS");
break;
}
case MQTT_UNSUBSCRIBE_FAIL:
{
WARN("MQTT_UNSUBSCRIBE_FAIL");
mqttDisconnect();
break;
}
case MQTT_ERROR:
{
WARN("MQTT_ERROR");
Expand Down Expand Up @@ -544,6 +557,7 @@ void Serial2Mqtt::reportStatus(const std::string &topic)
msg["SerialConnectionErrors"] = _serialConnectionErrors;
msg["SerialPublishMessagesReceived"] = _serialPublishMessagesReceived;
msg["SerialSubscribeMessagesReceived"] = _serialSubscribeMessagesReceived;
msg["SerialUnsubscribeMessagesReceived"] = _serialUnsubscribeMessagesReceived;
msg["SerialUnknownMessagesReceived"] = _serialUnknownMessagesReceived;
msg["SerialLogMessagesReceived"] = _serialLogMessagesReceived;
msg["SerialMessagesSent"] = _serialMessagesSent;
Expand Down Expand Up @@ -859,11 +873,12 @@ void Serial2Mqtt::genCrc(std::string &line)

/*
* JSON protocol : [CMD,TOPIC,MESSAGE,QOS,RETAIN,CRC]
* CMD : 0:SUBSCRIBE,1:PUBLISH,2:CONNECT,3:DISCONNECT
* CMD : 0:SUBSCRIBE,1:PUBLISH,2:CONNECT,3:DISCONNECT,4:UNSUBSCRIBE
* subscribe : [0,"dst/myTopic","ABCD"]
* publish : [1,"dst/topic1","message1",0,0,"ABCD"]
* connect : [2,"device","","ABCD"]
* disconnect : [3,"","","ABCD"]
* unsubscribe : [4,"dst/myTopic","ABCD"]
*/

void Serial2Mqtt::serialHandleLine(string &line)
Expand Down Expand Up @@ -905,6 +920,14 @@ void Serial2Mqtt::serialHandleLine(string &line)
_serialDataReceived = true;
return;
}
else if (cmd == UNSUBSCRIBE)
{
std::string topic = array[1];
mqttUnsubscribe(topic);
++_serialUnsubscribeMessagesReceived;
_serialDataReceived = true;
return;
}
else
{
WARN("invalid command from device : %d", cmd);
Expand Down Expand Up @@ -1196,6 +1219,38 @@ void Serial2Mqtt::mqttSubscribe(string topic)
}
}

void Serial2Mqtt::mqttUnsubscribe(string topic)
{
for (map<string, Bytes>::iterator lpmi = _mqttLocalPersistenceMessages.begin(); lpmi != _mqttLocalPersistenceMessages.end(); ++lpmi)
{
if (mqttTopicMatch(topic, lpmi->first))
{
serialPublish(PUBLISH, lpmi->first, lpmi->second, 0, true);
}
}
if (_mqttConnectionState != MS_CONNECTED)
return;
MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
INFO("Unsubscribing to topic %s for client %s", topic.c_str(), _mqttClientId.c_str());
opts.onSuccess = onUnsubscribeSuccess;
opts.onFailure = onUnsubscribeFailure;
opts.context = this;
int rc = E_OK;

if ((rc = MQTTAsync_unsubscribe(_client, topic.c_str(), &opts)) != MQTTASYNC_SUCCESS)
{
ERROR("Failed to start unsubscribe, return code %d", rc);
signal(MQTT_UNSUBSCRIBE_FAIL);
}
else
{
if (_logMqtt)
INFO("unsubscribe send");
}
}



void Serial2Mqtt::onConnectionLost(void *context, char *cause)
{
Serial2Mqtt *me = (Serial2Mqtt *)context;
Expand Down Expand Up @@ -1311,6 +1366,17 @@ void Serial2Mqtt::onSubscribeFailure(void *context, MQTTAsync_failureData *respo
Serial2Mqtt *me = (Serial2Mqtt *)context;
me->signal(MQTT_SUBSCRIBE_FAIL);
}
void Serial2Mqtt::onUnsubscribeSuccess(void *context, MQTTAsync_successData *response)
{
Serial2Mqtt *me = (Serial2Mqtt *)context;
me->signal(MQTT_UNSUBSCRIBE_SUCCESS);
}

void Serial2Mqtt::onUnsubscribeFailure(void *context, MQTTAsync_failureData *response)
{
Serial2Mqtt *me = (Serial2Mqtt *)context;
me->signal(MQTT_UNSUBSCRIBE_FAIL);
}

void Serial2Mqtt::mqttPublish(string topic, string message, int qos, bool retained)
{
Expand Down
9 changes: 8 additions & 1 deletion src/Serial2Mqtt.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class Serial2Mqtt
uint64_t _serialConnectionErrors = 0ULL;
uint64_t _serialPublishMessagesReceived = 0ULL;
uint64_t _serialSubscribeMessagesReceived = 0ULL;
uint64_t _serialUnsubscribeMessagesReceived = 0ULL;
uint64_t _serialUnknownMessagesReceived = 0ULL;
uint64_t _serialLogMessagesReceived = 0ULL;
uint64_t _serialMessagesSent = 0ULL;
Expand Down Expand Up @@ -142,6 +143,8 @@ class Serial2Mqtt
MQTT_CONNECT_FAIL,
MQTT_SUBSCRIBE_SUCCESS,
MQTT_SUBSCRIBE_FAIL,
MQTT_UNSUBSCRIBE_SUCCESS,
MQTT_UNSUBSCRIBE_FAIL,
MQTT_PUBLISH_SUCCESS,
MQTT_PUBLISH_FAIL,
MQTT_DISCONNECTED,
Expand All @@ -155,7 +158,8 @@ class Serial2Mqtt
SUBSCRIBE = 0,
PUBLISH,
CONNECT,
DISCONNECT
DISCONNECT,
UNSUBSCRIBE
} CMD;

Serial2Mqtt();
Expand Down Expand Up @@ -185,6 +189,7 @@ class Serial2Mqtt
void mqttPublish(string topic, Bytes message, int qos, bool retained);
void mqttPublish(string topic, string message, int qos, bool retained);
void mqttSubscribe(string topic);
void mqttUnsubscribe(string topic);

static void onConnectionLost(void *context, char *cause);
static int onMessage(void *context, char *topicName, int topicLen, MQTTAsync_message *message);
Expand All @@ -193,6 +198,8 @@ class Serial2Mqtt
static void onConnectSuccess(void *context, MQTTAsync_successData *response);
static void onSubscribeSuccess(void *context, MQTTAsync_successData *response);
static void onSubscribeFailure(void *context, MQTTAsync_failureData *response);
static void onUnsubscribeSuccess(void *context, MQTTAsync_successData *response);
static void onUnsubscribeFailure(void *context, MQTTAsync_failureData *response);
static void onPublishSuccess(void *context, MQTTAsync_successData *response);
static void onPublishFailure(void *context, MQTTAsync_failureData *response);
static void onDeliveryComplete(void *context, MQTTAsync_token response);
Expand Down

0 comments on commit 8e39164

Please sign in to comment.