martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome: completed adapting to msgio2 interface.

Browse Source
This commit is contained in:
Martin Preuss
2023-07-12 13:33:04 +02:00
parent 39987b31c7
commit 08c3875a26
66 changed files with 1765 additions and 3914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/aqhome-mqttlog/0BUILD
View File

@@ -37,12 +37,15 @@
</setVar>
<headers dist="true" >
mqtt.h
messages.h
</headers>
<sources>
$(local/typefiles)
main.c
mqtt.c
messages.c
</sources>
<useTargets>

450
apps/aqhome-mqttlog/main.c
View File

@@ -11,44 +11,25 @@
#endif
#include "./item.h"
#include "./mqtt.h"
#include "./messages.h"
#include <aqhome/api.h>
#include <aqhome/aqhome.h>
#include <aqhome/msgmanager.h>
#include <aqhome/msg/endpoint_log.h>
#include <aqhome/mqtt/endpoint_mqttc.h>
#include "aqhome/mqtt/endpoint_mqttc.h"
#include <aqhome/mqtt/msg_mqtt_connect.h>
#include <aqhome/mqtt/msg_mqtt_connack.h>
#include <aqhome/mqtt/msg_mqtt_publish.h>
#include <aqhome/mqtt/msg_mqtt_subscribe.h>
#include <aqhome/mqtt/msg_mqtt_suback.h>
#include "aqhome/aqhome.h"
#include "aqhome/mqtt/msg_mqtt.h"
#include "aqhome/mqtt/msg_mqtt_publish.h"
#include <gwenhywfar/gwenhywfar.h>
#include <gwenhywfar/endpoint_tcpc.h>
#include <gwenhywfar/endpoint_connectable.h>
#include <gwenhywfar/args.h>
#include <gwenhywfar/logger.h>
#include <gwenhywfar/db.h>
#include <gwenhywfar/debug.h>
#include <gwenhywfar/cgui.h>
#include <gwenhywfar/text.h>
#include <gwenhywfar/json_read.h>
#include <gwenhywfar/directory.h>
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
@@ -57,31 +38,27 @@
#include <time.h>
/* ------------------------------------------------------------------------------------------------
* defines
* ------------------------------------------------------------------------------------------------
*/
#define I18N(msg) msg
#define I18S(msg) msg
//#define FULL_DEBUG
/* ------------------------------------------------------------------------------------------------
* forward declarations
* ------------------------------------------------------------------------------------------------
*/
static int _serve(GWEN_DB_NODE *dbArgs);
static GWEN_MSG_ENDPOINT *_createMqttEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_DB_NODE *dbArgs);
static int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs);
static int _createPidFile(const char *pidFilename);
static ITEM_LIST *_readItems(GWEN_DB_NODE *dbArgs);
static const ITEM *_getItemForTopic(const ITEM_LIST *itemList, const char *topic);
int _subscribe(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp, const char *topicFilter);
int _mqttConnect(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp);
GWEN_MSG *_awaitPacket(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp, uint8_t expectedPacketType);
void _handlePublishMsg(const char *baseFolder, const ITEM_LIST *itemList, const GWEN_MSG *msg);
void _handlePublish(const char *baseFolder, const ITEM_LIST *itemList, const char *topic, const char *value);
void _handleRawMsgForItem(const char *baseFolder, const ITEM *item, const char *value);
void _handleJsonMsgForItem(const char *baseFolder, const ITEM *item, const char *value);
void _handleJsonItemVar(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, GWEN_JSON_ELEM *jeRoot);
void _writeValueAccordingToItem(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, const char *value);
void _writeToFile(const char *filename, const char *txt);
#ifdef HAVE_SIGNAL_H
static int _setSignalHandlers(void);
@@ -90,10 +67,21 @@ static void _signalHandler(int s);
static struct sigaction saINT,saTERM, saHUP, saTSTP, saCONT;
#endif
/* ------------------------------------------------------------------------------------------------
* static vars
* ------------------------------------------------------------------------------------------------
*/
static int stopService=0;
/* ------------------------------------------------------------------------------------------------
* implementations
* ------------------------------------------------------------------------------------------------
*/
int main(int argc, char **argv)
{
@@ -153,8 +141,7 @@ int main(int argc, char **argv)
int _serve(GWEN_DB_NODE *dbArgs)
{
const char *pidFile;
GWEN_MSG_ENDPOINT_MGR *emgr;
GWEN_MSG_ENDPOINT *epTcp;
GWEN_MSG_ENDPOINT2 *epTcp;
ITEM_LIST *itemList;
int rv;
int timeout;
@@ -163,7 +150,7 @@ int _serve(GWEN_DB_NODE *dbArgs)
startTime=time(NULL);
itemList=_readItems(dbArgs);
itemList=AqHomeMqttLog_ReadItems(dbArgs);
if (itemList==NULL) {
DBG_ERROR(NULL, "No items to listen to, aborting.");
return GWEN_ERROR_GENERIC;
@@ -186,39 +173,39 @@ int _serve(GWEN_DB_NODE *dbArgs)
}
}
emgr=GWEN_MsgEndpointMgr_new();
epTcp=_createMqttEndpoint(emgr, dbArgs);
epTcp=AqHomeMqttLog_CreateMqttEndpoint(dbArgs);
if (epTcp==NULL) {
DBG_INFO(NULL, "here");
GWEN_MsgEndpointMgr_free(emgr);
Item_List_free(itemList);
return GWEN_ERROR_GENERIC;
}
rv=_mqttConnect(emgr, epTcp);
rv=AqHomeMqttLog_MqttConnect(epTcp);
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
GWEN_MsgEndpointMgr_free(emgr);
GWEN_MsgEndpoint2_free(epTcp);
Item_List_free(itemList);
return rv;
}
rv=_subscribe(emgr, epTcp, "#");
rv=AqHomeMqttLog_Subscribe(epTcp, "#");
if (rv<0) {
DBG_INFO(NULL, "here (%d)", rv);
GWEN_MsgEndpointMgr_free(emgr);
GWEN_MsgEndpoint2_free(epTcp);
Item_List_free(itemList);
return rv;
}
while(!stopService) {
DBG_DEBUG(NULL, "Next loop");
GWEN_MsgEndpointMgr_IoLoopOnce(emgr);
GWEN_MsgEndpointMgr_RunAllEndpoints(emgr);
if (GWEN_ConnectableMsgEndpoint_GetState(epTcp)<GWEN_ENDPOINT_MQTTC_STATE_ESTABLISHED) {
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
if (GWEN_MsgEndpoint2_GetState(epTcp)!=GWEN_MSG_ENDPOINT_STATE_CONNECTED) {
DBG_INFO(NULL, "Not connected...");
}
else {
GWEN_MSG *msg;
msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(epTcp);
msg=GWEN_MsgEndpoint2_TakeFirstReceivedMessage(epTcp);
if (msg) {
#ifdef FULL_DEBUG
DBG_ERROR(NULL, "Received this message:");
@@ -234,7 +221,7 @@ int _serve(GWEN_DB_NODE *dbArgs)
fprintf(stdout, "%s\n", GWEN_Buffer_GetStart(buf));
GWEN_Buffer_free(buf);
#endif
_handlePublishMsg(baseFolder, itemList, msg);
AqHomeMqttLog_HandlePublishMsg(baseFolder, itemList, msg);
}
else {
#ifdef FULL_DEBUG
@@ -259,278 +246,13 @@ int _serve(GWEN_DB_NODE *dbArgs)
if (pidFile && *pidFile)
remove(pidFile);
GWEN_MsgEndpointMgr_free(emgr);
GWEN_MsgEndpoint2_free(epTcp);
Item_List_free(itemList);
return 0;
}
void _handlePublishMsg(const char *baseFolder, const ITEM_LIST *itemList, const GWEN_MSG *msg)
{
char *topic;
char *value;
topic=AQH_PublishMqttMsg_ExtractTopic(msg);
value=AQH_PublishMqttMsg_ExtractValue(msg);
if (topic && value)
_handlePublish(baseFolder, itemList, topic, value);
else {
DBG_ERROR(NULL, "Either topic or value missing in PUBLISH msg");
}
free(value);
free(topic);
}
void _handlePublish(const char *baseFolder, const ITEM_LIST *itemList, const char *topic, const char *value)
{
const ITEM *item;
item=_getItemForTopic(itemList, topic);
if (item) {
const char *t;
DBG_INFO(NULL, "HANDLING topic \"%s\"", topic);
t=Item_GetDataType(item);
if (t && strcasecmp(t, "json")==0)
_handleJsonMsgForItem(baseFolder, item, value);
else
_handleRawMsgForItem(baseFolder, item, value);
}
else {
DBG_INFO(NULL, "ignoring topic \"%s\"", topic);
}
}
void _handleJsonMsgForItem(const char *baseFolder, const ITEM *item, const char *value)
{
GWEN_JSON_ELEM *jeRoot;
jeRoot=GWEN_JsonElement_fromString(value);
if (jeRoot==NULL) {
DBG_INFO(NULL, "Could not parse JSON value: %s", value);
}
else {
const ITEMVAR_LIST *itemVarList;
itemVarList=Item_GetVarList(item);
if (itemVarList) {
ITEMVAR *itemVar;
itemVar=ItemVar_List_First(itemVarList);
while(itemVar) {
_handleJsonItemVar(baseFolder, item, itemVar, jeRoot);
itemVar=ItemVar_List_Next(itemVar);
}
}
GWEN_JsonElement_free(jeRoot);
}
}
void _handleJsonItemVar(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, GWEN_JSON_ELEM *jeRoot)
{
const char *path;
path=ItemVar_GetPath(itemVar);
if (path) {
GWEN_JSON_ELEM *je;
je=GWEN_JsonElement_GetElementByPath(jeRoot, path, 0);
if (je) {
const char *s;
s=GWEN_JsonElement_GetData(je);
if (s && *s)
_writeValueAccordingToItem(baseFolder, item, itemVar, s);
else {
DBG_ERROR(NULL, "Path \"%s\" in JSON data contains no data", path);
}
}
else {
DBG_ERROR(NULL, "Path \"%s\" not found in JSON data", path);
}
}
}
void _handleRawMsgForItem(const char *baseFolder, const ITEM *item, const char *value)
{
const ITEMVAR_LIST *itemVarList;
itemVarList=Item_GetVarList(item);
if (itemVarList) {
ITEMVAR *itemVar;
itemVar=ItemVar_List_First(itemVarList);
while(itemVar) {
_writeValueAccordingToItem(baseFolder, item, itemVar, value);
itemVar=ItemVar_List_Next(itemVar);
}
}
}
void _writeValueAccordingToItem(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, const char *value)
{
const char *id;
const char *name;
id=Item_GetId(item);
name=ItemVar_GetName(itemVar);
if (id && *id && name && *name) {
GWEN_BUFFER *fnameBuf;
fnameBuf=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendString(fnameBuf, baseFolder);
GWEN_Buffer_AppendString(fnameBuf, GWEN_DIR_SEPARATOR_S);
GWEN_Buffer_AppendArgs(fnameBuf, "%s_%s", id, name);
_writeToFile(GWEN_Buffer_GetStart(fnameBuf), value);
GWEN_Buffer_free(fnameBuf);
}
else {
DBG_ERROR(NULL, "Either id or name missing in item list file");
}
}
void _writeToFile(const char *filename, const char *txt)
{
if (txt && *txt) {
GWEN_BUFFER *tmpNameBuf;
int rv;
tmpNameBuf=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendString(tmpNameBuf, filename);
GWEN_Buffer_AppendString(tmpNameBuf, ".tmp");
rv=GWEN_Directory_GetPath(GWEN_Buffer_GetStart(tmpNameBuf), GWEN_PATH_FLAGS_VARIABLE);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error getting path for %s (%d)", GWEN_Buffer_GetStart(tmpNameBuf), rv);
}
else {
FILE *f;
f=fopen(GWEN_Buffer_GetStart(tmpNameBuf), "w");
if (f) {
if (1!=fwrite(txt, strlen(txt), 1, f)) {
DBG_ERROR(AQH_LOGDOMAIN, "Error writing.");
fclose(f);
}
else {
fclose(f);
rename(GWEN_Buffer_GetStart(tmpNameBuf), filename);
}
}
}
GWEN_Buffer_free(tmpNameBuf);
}
}
const ITEM *_getItemForTopic(const ITEM_LIST *itemList, const char *topic)
{
const ITEM *item;
item=Item_List_First(itemList);
while(item) {
const char *s;
s=Item_GetTopic(item);
if (s && GWEN_Text_ComparePattern(topic, s, 0)!=-1)
return item;
item=Item_List_Next(item);
}
return NULL;
}
int _subscribe(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp, const char *topicFilter)
{
uint16_t pckId;
GWEN_MSG *msgOut;
GWEN_MSG *msgIn;
DBG_INFO(NULL, "Sending SUBSCRIBE %s", topicFilter);
pckId=AQH_MqttClientEndpoint_GetNextPacketId(epTcp);
msgOut=GWEN_SubscribeMqttMsg_new(AQH_MQTTMSG_MSGTYPE_SUBSCRIBE, pckId, topicFilter, 0);
if (msgOut==NULL) {
DBG_ERROR(NULL, "Error creating message");
return GWEN_ERROR_INTERNAL;
}
DBG_ERROR(NULL, "Sending this message:");
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msgOut), GWEN_Msg_GetBytesInBuffer(msgOut), 2);
GWEN_MsgEndpoint_AddSendMessage(epTcp, msgOut);
DBG_INFO(NULL, "Waiting for response");
msgIn=_awaitPacket(emgr, epTcp, AQH_MQTTMSG_MSGTYPE_SUBACK);
if (msgIn) {
GWEN_BUFFER *buf;
buf=GWEN_Buffer_new(0, 256, 0, 1);
AQH_SubAckMqttMsg_DumpToBuffer(msgIn, buf, "received");
DBG_INFO(NULL, "%s", GWEN_Buffer_GetStart(buf));
GWEN_Buffer_free(buf);
GWEN_Msg_free(msgIn);
}
return 0;
}
GWEN_MSG_ENDPOINT *_createMqttEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_DB_NODE *dbArgs)
{
const char *mqttAddress;
int mqttPort;
const char *mqttClientId;
const char *mqttTopicPrefix;
int mqttKeepAlive;
mqttAddress=GWEN_DB_GetCharValue(dbArgs, "mqttAddress", 0, NULL);
mqttPort=GWEN_DB_GetIntValue(dbArgs, "mqttPort", 0, 1883);
mqttClientId=GWEN_DB_GetCharValue(dbArgs, "mqttClientId", 0, "aqhome-mqttlog");
mqttTopicPrefix=GWEN_DB_GetCharValue(dbArgs, "mqttTopicPrefix", 0, "aqhome/sensors");
mqttKeepAlive=GWEN_DB_GetIntValue(dbArgs, "mqttKeepAlive", 0, 600);
if (mqttAddress && *mqttAddress && mqttPort) {
GWEN_MSG_ENDPOINT *epMqtt;
DBG_INFO(AQH_LOGDOMAIN, "Connecting to %s (port %d)", mqttAddress, mqttPort);
epMqtt=AQH_MqttClientEndpoint_new(mqttAddress, mqttPort, NULL, AQH_MSGMGR_ENDPOINTGROUP_MQTT);
if (epMqtt==NULL) {
DBG_ERROR(AQH_LOGDOMAIN, "Error creating endpoint TCP");
return NULL;
}
GWEN_MsgEndpoint_SetAcceptedGroupIds(epMqtt, AQH_MSGMGR_ENDPOINTGROUP_NODE | AQH_MSGMGR_ENDPOINTGROUP_MQTT);
if (mqttClientId && *mqttClientId)
AQH_MqttClientEndpoint_SetClientId(epMqtt, mqttClientId);
if (mqttTopicPrefix && *mqttTopicPrefix)
AQH_MqttClientEndpoint_SetTopicPrefix(epMqtt, mqttTopicPrefix);
AQH_MqttClientEndpoint_SetKeepAliveTime(epMqtt, mqttKeepAlive);
GWEN_MsgEndpointMgr_AddEndpoint(emgr, epMqtt);
return epMqtt;
}
return NULL;
}
int _setSignalHandlers(void)
{
#ifdef HAVE_SIGNAL_H
@@ -633,90 +355,6 @@ int _createPidFile(const char *pidFilename)
int _mqttConnect(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp)
{
while(GWEN_ConnectableMsgEndpoint_GetState(epTcp)<GWEN_ENDPOINT_MQTTC_STATE_ESTABLISHED) {
DBG_DEBUG(AQH_LOGDOMAIN, "Next loop");
GWEN_MsgEndpointMgr_IoLoopOnce(emgr);
GWEN_MsgEndpointMgr_RunAllEndpoints(emgr);
}
return 0;
}
GWEN_MSG *_awaitPacket(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *epTcp, uint8_t expectedPacketType)
{
while(!stopService) {
GWEN_MSG *msg;
DBG_DEBUG(AQH_LOGDOMAIN, "Next loop");
//GWEN_MsgManager_LoopOnce(emgr);
GWEN_MsgEndpointMgr_IoLoopOnce(emgr);
msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(epTcp);
if (msg) {
if ((AQH_MqttMsg_GetMsgTypeAndFlags(msg) & 0xf0)==(expectedPacketType & 0xf0)) {
return msg;
}
else {
DBG_ERROR(NULL, "Received this message:");
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msg), GWEN_Msg_GetBytesInBuffer(msg), 2);
}
}
} /* for */
return NULL;
}
ITEM_LIST *_readItems(GWEN_DB_NODE *dbArgs)
{
const char *itemFile;
itemFile=GWEN_DB_GetCharValue(dbArgs, "itemfile", 0, NULL);
if (itemFile && *itemFile) {
ITEM_LIST *itemList;
GWEN_DB_NODE *dbItemList;
GWEN_DB_NODE *dbItem;
int rv;
dbItemList=GWEN_DB_Group_new("items");
rv=GWEN_DB_ReadFile(dbItemList, itemFile,
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP |
GWEN_DB_FLAGS_ALLOW_EMPTY_STREAM);
if (rv<0) {
DBG_ERROR(NULL, "Error reading item file \"%s\" (%d)", itemFile, rv);
GWEN_DB_Group_free(dbItemList);
return NULL;
}
itemList=Item_List_new();
dbItem=GWEN_DB_FindFirstGroup(dbItemList, "item");
while(dbItem) {
ITEM *item;
item=Item_fromDb(dbItem);
Item_List_Add(item, itemList);
dbItem=GWEN_DB_FindNextGroup(dbItem, "item");
}
GWEN_DB_Group_free(dbItemList);
if (Item_List_GetCount(itemList)==0) {
DBG_INFO(NULL, "No items in file");
Item_List_free(itemList);
return NULL;
}
return itemList;
}
return NULL;
}
int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs)
{
int rv;

274
apps/aqhome-mqttlog/messages.c Normal file
View File

@@ -0,0 +1,274 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "./messages.h"
#include "aqhome/mqtt/msg_mqtt_publish.h"
#include <gwenhywfar/json_read.h>
#include <gwenhywfar/db.h>
#include <gwenhywfar/directory.h>
#include <gwenhywfar/text.h>
#include <gwenhywfar/debug.h>
static const ITEM *_getItemForTopic(const ITEM_LIST *itemList, const char *topic);
void _handlePublishMsg(const char *baseFolder, const ITEM_LIST *itemList, const GWEN_MSG *msg);
void _handlePublish(const char *baseFolder, const ITEM_LIST *itemList, const char *topic, const char *value);
void _handleRawMsgForItem(const char *baseFolder, const ITEM *item, const char *value);
void _handleJsonMsgForItem(const char *baseFolder, const ITEM *item, const char *value);
void _handleJsonItemVar(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, GWEN_JSON_ELEM *jeRoot);
void _writeValueAccordingToItem(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, const char *value);
void _writeToFile(const char *filename, const char *txt);
ITEM_LIST *AqHomeMqttLog_ReadItems(GWEN_DB_NODE *dbArgs)
{
const char *itemFile;
itemFile=GWEN_DB_GetCharValue(dbArgs, "itemfile", 0, NULL);
if (itemFile && *itemFile) {
ITEM_LIST *itemList;
GWEN_DB_NODE *dbItemList;
GWEN_DB_NODE *dbItem;
int rv;
dbItemList=GWEN_DB_Group_new("items");
rv=GWEN_DB_ReadFile(dbItemList, itemFile,
GWEN_DB_FLAGS_DEFAULT |
GWEN_PATH_FLAGS_CREATE_GROUP |
GWEN_DB_FLAGS_ALLOW_EMPTY_STREAM);
if (rv<0) {
DBG_ERROR(NULL, "Error reading item file \"%s\" (%d)", itemFile, rv);
GWEN_DB_Group_free(dbItemList);
return NULL;
}
itemList=Item_List_new();
dbItem=GWEN_DB_FindFirstGroup(dbItemList, "item");
while(dbItem) {
ITEM *item;
item=Item_fromDb(dbItem);
Item_List_Add(item, itemList);
dbItem=GWEN_DB_FindNextGroup(dbItem, "item");
}
GWEN_DB_Group_free(dbItemList);
if (Item_List_GetCount(itemList)==0) {
DBG_INFO(NULL, "No items in file");
Item_List_free(itemList);
return NULL;
}
return itemList;
}
return NULL;
}
void AqHomeMqttLog_HandlePublishMsg(const char *baseFolder, const ITEM_LIST *itemList, const GWEN_MSG *msg)
{
char *topic;
char *value;
topic=AQH_PublishMqttMsg_ExtractTopic(msg);
value=AQH_PublishMqttMsg_ExtractValue(msg);
if (topic && value)
_handlePublish(baseFolder, itemList, topic, value);
else {
DBG_ERROR(NULL, "Either topic or value missing in PUBLISH msg");
}
free(value);
free(topic);
}
void _handlePublish(const char *baseFolder, const ITEM_LIST *itemList, const char *topic, const char *value)
{
const ITEM *item;
item=_getItemForTopic(itemList, topic);
if (item) {
const char *t;
DBG_INFO(NULL, "HANDLING topic \"%s\"", topic);
t=Item_GetDataType(item);
if (t && strcasecmp(t, "json")==0)
_handleJsonMsgForItem(baseFolder, item, value);
else
_handleRawMsgForItem(baseFolder, item, value);
}
else {
DBG_INFO(NULL, "ignoring topic \"%s\"", topic);
}
}
void _handleJsonMsgForItem(const char *baseFolder, const ITEM *item, const char *value)
{
GWEN_JSON_ELEM *jeRoot;
jeRoot=GWEN_JsonElement_fromString(value);
if (jeRoot==NULL) {
DBG_INFO(NULL, "Could not parse JSON value: %s", value);
}
else {
const ITEMVAR_LIST *itemVarList;
itemVarList=Item_GetVarList(item);
if (itemVarList) {
ITEMVAR *itemVar;
itemVar=ItemVar_List_First(itemVarList);
while(itemVar) {
_handleJsonItemVar(baseFolder, item, itemVar, jeRoot);
itemVar=ItemVar_List_Next(itemVar);
}
}
GWEN_JsonElement_free(jeRoot);
}
}
void _handleJsonItemVar(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, GWEN_JSON_ELEM *jeRoot)
{
const char *path;
path=ItemVar_GetPath(itemVar);
if (path) {
GWEN_JSON_ELEM *je;
je=GWEN_JsonElement_GetElementByPath(jeRoot, path, 0);
if (je) {
const char *s;
s=GWEN_JsonElement_GetData(je);
if (s && *s)
_writeValueAccordingToItem(baseFolder, item, itemVar, s);
else {
DBG_ERROR(NULL, "Path \"%s\" in JSON data contains no data", path);
}
}
else {
DBG_ERROR(NULL, "Path \"%s\" not found in JSON data", path);
}
}
}
void _handleRawMsgForItem(const char *baseFolder, const ITEM *item, const char *value)
{
const ITEMVAR_LIST *itemVarList;
itemVarList=Item_GetVarList(item);
if (itemVarList) {
ITEMVAR *itemVar;
itemVar=ItemVar_List_First(itemVarList);
while(itemVar) {
_writeValueAccordingToItem(baseFolder, item, itemVar, value);
itemVar=ItemVar_List_Next(itemVar);
}
}
}
void _writeValueAccordingToItem(const char *baseFolder, const ITEM *item, const ITEMVAR *itemVar, const char *value)
{
const char *id;
const char *name;
id=Item_GetId(item);
name=ItemVar_GetName(itemVar);
if (id && *id && name && *name) {
GWEN_BUFFER *fnameBuf;
fnameBuf=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendString(fnameBuf, baseFolder);
GWEN_Buffer_AppendString(fnameBuf, GWEN_DIR_SEPARATOR_S);
GWEN_Buffer_AppendArgs(fnameBuf, "%s_%s", id, name);
_writeToFile(GWEN_Buffer_GetStart(fnameBuf), value);
GWEN_Buffer_free(fnameBuf);
}
else {
DBG_ERROR(NULL, "Either id or name missing in item list file");
}
}
void _writeToFile(const char *filename, const char *txt)
{
if (txt && *txt) {
GWEN_BUFFER *tmpNameBuf;
int rv;
tmpNameBuf=GWEN_Buffer_new(0, 256, 0, 1);
GWEN_Buffer_AppendString(tmpNameBuf, filename);
GWEN_Buffer_AppendString(tmpNameBuf, ".tmp");
rv=GWEN_Directory_GetPath(GWEN_Buffer_GetStart(tmpNameBuf), GWEN_PATH_FLAGS_VARIABLE);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Error getting path for %s (%d)", GWEN_Buffer_GetStart(tmpNameBuf), rv);
}
else {
FILE *f;
f=fopen(GWEN_Buffer_GetStart(tmpNameBuf), "w");
if (f) {
if (1!=fwrite(txt, strlen(txt), 1, f)) {
DBG_ERROR(AQH_LOGDOMAIN, "Error writing.");
fclose(f);
}
else {
fclose(f);
rename(GWEN_Buffer_GetStart(tmpNameBuf), filename);
}
}
}
GWEN_Buffer_free(tmpNameBuf);
}
}
const ITEM *_getItemForTopic(const ITEM_LIST *itemList, const char *topic)
{
const ITEM *item;
item=Item_List_First(itemList);
while(item) {
const char *s;
s=Item_GetTopic(item);
if (s && GWEN_Text_ComparePattern(topic, s, 0)!=-1)
return item;
item=Item_List_Next(item);
}
return NULL;
}

25
apps/aqhome-mqttlog/messages.h Normal file
View File

@@ -0,0 +1,25 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQHOME_TOOL_MESSAGES_H
#define AQHOME_TOOL_MESSAGES_H
#include "./item.h"
#include <gwenhywfar/msg.h>
ITEM_LIST *AqHomeMqttLog_ReadItems(GWEN_DB_NODE *dbArgs);
void AqHomeMqttLog_HandlePublishMsg(const char *baseFolder, const ITEM_LIST *itemList, const GWEN_MSG *msg);
#endif

179
apps/aqhome-mqttlog/mqtt.c Normal file
View File

@@ -0,0 +1,179 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include "./mqtt.h"
#include <aqhome/api.h>
#include <aqhome/aqhome.h>
#include "aqhome/mqtt/endpoint2_mqttc.h"
#include <aqhome/mqtt/msg_mqtt_connect.h>
#include <aqhome/mqtt/msg_mqtt_connack.h>
#include <aqhome/mqtt/msg_mqtt_publish.h>
#include <aqhome/mqtt/msg_mqtt_subscribe.h>
#include <aqhome/mqtt/msg_mqtt_suback.h>
#include <gwenhywfar/debug.h>
#include <gwenhywfar/text.h>
#include <time.h>
#include <unistd.h>
/* ------------------------------------------------------------------------------------------------
* defines
* ------------------------------------------------------------------------------------------------
*/
#define AQHOME_MQTTLOG_DEFAULT_CMDTIMEOUT 10000
/* ------------------------------------------------------------------------------------------------
* forward declarations
* ------------------------------------------------------------------------------------------------
*/
static GWEN_MSG *_awaitPacket(GWEN_MSG_ENDPOINT2 *epTcp, uint8_t expectedPacketType, int timeoutInSeconds);
/* ------------------------------------------------------------------------------------------------
* implementations
* ------------------------------------------------------------------------------------------------
*/
GWEN_MSG_ENDPOINT2 *AqHomeMqttLog_CreateMqttEndpoint(GWEN_DB_NODE *dbArgs)
{
const char *mqttAddress;
int mqttPort;
const char *mqttClientId;
const char *mqttTopicPrefix;
int mqttKeepAlive;
mqttAddress=GWEN_DB_GetCharValue(dbArgs, "mqttAddress", 0, NULL);
mqttPort=GWEN_DB_GetIntValue(dbArgs, "mqttPort", 0, 1883);
mqttClientId=GWEN_DB_GetCharValue(dbArgs, "mqttClientId", 0, "aqhome-mqttlog");
mqttTopicPrefix=GWEN_DB_GetCharValue(dbArgs, "mqttTopicPrefix", 0, "aqhome/sensors");
mqttKeepAlive=GWEN_DB_GetIntValue(dbArgs, "mqttKeepAlive", 0, 600);
if (mqttAddress && *mqttAddress && mqttPort) {
GWEN_MSG_ENDPOINT2 *epMqtt;
DBG_INFO(AQH_LOGDOMAIN, "Connecting to %s (port %d)", mqttAddress, mqttPort);
epMqtt=AQH_MqttClientEndpoint2_new(mqttClientId, mqttAddress, mqttPort, NULL, 0);
if (epMqtt==NULL) {
DBG_ERROR(AQH_LOGDOMAIN, "Error creating endpoint TCP");
return NULL;
}
if (mqttTopicPrefix && *mqttTopicPrefix)
AQH_MqttClientEndpoint2_SetTopicPrefix(epMqtt, mqttTopicPrefix);
AQH_MqttClientEndpoint2_SetKeepAliveTime(epMqtt, mqttKeepAlive);
return epMqtt;
}
return NULL;
}
int AqHomeMqttLog_MqttConnect(GWEN_MSG_ENDPOINT2 *epTcp)
{
if (GWEN_MsgEndpoint2_GetState(epTcp)==GWEN_MSG_ENDPOINT_STATE_UNCONNECTED) {
int rv;
rv=AQH_MqttClientEndpoint2_StartConnect(epTcp);
if (rv<0) {
DBG_ERROR(NULL, "Error starting to connect (%d)", rv);
return rv;
}
}
while(GWEN_MsgEndpoint2_GetState(epTcp)!=GWEN_MSG_ENDPOINT_STATE_CONNECTED) {
DBG_DEBUG(NULL, "Next loop");
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
}
return 0;
}
int AqHomeMqttLog_Subscribe(GWEN_MSG_ENDPOINT2 *epTcp, const char *topicFilter)
{
uint16_t pckId;
GWEN_MSG *msgOut;
GWEN_MSG *msgIn;
DBG_INFO(NULL, "Sending SUBSCRIBE %s", topicFilter);
pckId=AQH_MqttClientEndpoint2_GetNextPacketId(epTcp);
msgOut=GWEN_SubscribeMqttMsg_new(AQH_MQTTMSG_MSGTYPE_SUBSCRIBE, pckId, topicFilter, 0);
if (msgOut==NULL) {
DBG_ERROR(NULL, "Error creating message");
return GWEN_ERROR_INTERNAL;
}
DBG_ERROR(NULL, "Sending this message:");
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msgOut), GWEN_Msg_GetBytesInBuffer(msgOut), 2);
GWEN_MsgEndpoint2_AddSendMessage(epTcp, msgOut);
DBG_INFO(NULL, "Waiting for response");
msgIn=_awaitPacket(epTcp, AQH_MQTTMSG_MSGTYPE_SUBACK, AQHOME_MQTTLOG_DEFAULT_CMDTIMEOUT);
if (msgIn) {
GWEN_BUFFER *buf;
buf=GWEN_Buffer_new(0, 256, 0, 1);
AQH_SubAckMqttMsg_DumpToBuffer(msgIn, buf, "received");
DBG_INFO(NULL, "%s", GWEN_Buffer_GetStart(buf));
GWEN_Buffer_free(buf);
GWEN_Msg_free(msgIn);
}
return 0;
}
GWEN_MSG *_awaitPacket(GWEN_MSG_ENDPOINT2 *epTcp, uint8_t expectedPacketType, int timeoutInSeconds)
{
time_t startTime;
startTime=time(NULL);
for (;;) {
GWEN_MSG *msg;
time_t now;
GWEN_MsgEndpoint2_IoLoop(epTcp, 2000); /* 2000 ms */
msg=GWEN_MsgEndpoint2_TakeFirstReceivedMessage(epTcp);
if (msg) {
if ((AQH_MqttMsg_GetMsgTypeAndFlags(msg) & 0xf0)==(expectedPacketType & 0xf0)) {
return msg;
}
else {
DBG_ERROR(NULL, "Received this message:");
GWEN_Text_DumpString((const char*) GWEN_Msg_GetConstBuffer(msg), GWEN_Msg_GetBytesInBuffer(msg), 2);
}
GWEN_Msg_free(msg);
}
now=time(NULL);
if (now-startTime>timeoutInSeconds) {
DBG_INFO(NULL, "Timeout");
break;
}
}
return NULL;
}

28
apps/aqhome-mqttlog/mqtt.h Normal file
View File

@@ -0,0 +1,28 @@
/****************************************************************************
* This file is part of the project AqHome.
* AqHome (c) by 2023 Martin Preuss, all rights reserved.
*
* The license for this file can be found in the file COPYING which you
* should have received along with this file.
****************************************************************************/
#ifndef AQHOME_TOOL_MQTT_H
#define AQHOME_TOOL_MQTT_H
#include "aqhome/mqtt/endpoint2_mqttc.h"
#include <gwenhywfar/db.h>
GWEN_MSG_ENDPOINT2 *AqHomeMqttLog_CreateMqttEndpoint(GWEN_DB_NODE *dbArgs);
int AqHomeMqttLog_MqttConnect(GWEN_MSG_ENDPOINT2 *epTcp);
int AqHomeMqttLog_Subscribe(GWEN_MSG_ENDPOINT2 *epTcp, const char *topicFilter);
#endif