emgauwa/core-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add: macro endpoints

Browse source 
add: basic macro support
fix: database locking with lock-pointer
fix: memory leaks
This commit is contained in:
Tobias Reisinger 2020-09-04 00:28:49 +02:00
parent 6a2b94ef1c
commit 9d2c48d645
30 changed files with 606 additions and 213 deletions

3
src/endpoints/api_v1_controllers_STR.c
View file

@ -193,7 +193,8 @@ api_v1_controllers_STR_DELETE(struct mg_connection *nc, struct http_message *hm,
else
{
LOGGER_DEBUG("deleted controller %s\n", args[0].value.v_str);
endpoint_response_text(response, 200, "", 0);
static const char content[] = "delete controller";
endpoint_response_text(response, 200, content, STRLEN(content));
}
controller_free(controller);
return;

37
src/endpoints/api_v1_controllers_STR_relays_INT.c
View file

@ -36,7 +36,10 @@ api_v1_controllers_STR_relays_INT_GET(struct mg_connection *nc, struct http_mess
return;
}
relay_t* relay = relay_get_for_controller(controller->id, args[1].value.v_int);
int controller_id = controller->id;
controller_free(controller);
relay_t* relay = relay_get_for_controller(controller_id, args[1].value.v_int);
if(!relay)
{
@ -53,7 +56,6 @@ api_v1_controllers_STR_relays_INT_GET(struct mg_connection *nc, struct http_mess
endpoint_response_json(response, 200, json);
cJSON_Delete(json);
relay_free(relay);
controller_free(controller);
}
void
@ -83,7 +85,11 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
return;
}
if(args[1].value.v_int > controller->relay_count)
int controller_id = controller->id;
int controller_relay_count = controller->relay_count;
controller_free(controller);
if(args[1].value.v_int > controller_relay_count)
{
LOGGER_DEBUG("relay num %d is too high for %s\n", args[1].value.v_int, args[0].value.v_str);
@ -92,7 +98,7 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
return;
}
relay_t* relay = relay_get_for_controller(controller->id, args[1].value.v_int);
relay_t* relay = relay_get_for_controller(controller_id, args[1].value.v_int);
if(!relay)
{
@ -102,7 +108,7 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
relay->number = args[1].value.v_int;
snprintf(relay->name, MAX_NAME_LENGTH, "Relay %d", relay->number);
relay->name[MAX_NAME_LENGTH] = '\0';
relay->controller_id = controller->id;
relay->controller_id = controller_id;
uuid_t tmp_uuid;
memset(tmp_uuid, 0, sizeof(uuid_t));
@ -117,7 +123,6 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
relay->active_schedule = relay->schedules[helper_get_weekday(time_struct)];
}
controller_free(controller);
LOGGER_DEBUG("overwriting relay %d for controller %s\n", args[1].value.v_int, args[0].value.v_str);
cJSON *json = cJSON_ParseWithLength(hm->body.p, hm->body.len);
@ -202,16 +207,14 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
}
}
int opened_transaction = database_transaction_begin();
database_transaction_lock lock;
database_transaction_begin(&lock);
if(relay_save(relay))
{
LOGGER_ERR("failed to save relay\n");
if(opened_transaction)
{
database_transaction_rollback();
}
database_transaction_rollback(&lock);
cJSON_Delete(json);
@ -237,10 +240,7 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
{
LOGGER_DEBUG("invalid tag in tags\n");
if(opened_transaction)
{
database_transaction_rollback();
}
database_transaction_rollback(&lock);
relay_free(relay);
cJSON_Delete(json);
@ -259,13 +259,12 @@ api_v1_controllers_STR_relays_INT_PUT(struct mg_connection *nc, struct http_mess
}
tag_ids[i++] = tag_id;
}
junction_tag_insert_list(tag_ids, relay->id, 0, json_tags_count);
free(tag_ids);
}
if(opened_transaction)
{
database_transaction_commit();
}
database_transaction_commit(&lock);
cJSON_Delete(json);
json = relay_to_json(relay, 0);

9
src/endpoints/api_v1_controllers_STR_relays_INT_pulse.c
View file

@ -36,7 +36,10 @@ api_v1_controllers_STR_relays_INT_pulse_POST(struct mg_connection *nc, struct ht
return;
}
relay_t* relay = relay_get_for_controller(controller->id, args[1].value.v_int);
int controller_id = controller->id;
controller_free(controller);
relay_t* relay = relay_get_for_controller(controller_id, args[1].value.v_int);
if(!relay)
{
@ -64,7 +67,7 @@ api_v1_controllers_STR_relays_INT_pulse_POST(struct mg_connection *nc, struct ht
LOGGER_DEBUG("commanding pulse to relay %d for controller %s\n", args[1].value.v_int, args[0].value.v_str);
command_relay_pulse(relay, duration);
endpoint_response_text(response, 200, "", 0);
static const char content[] = "sent pulse";
endpoint_response_text(response, 200, content, STRLEN(content));
relay_free(relay);
controller_free(controller);
}

257
src/endpoints/api_v1_macros.c Normal file
View file

@ -0,0 +1,257 @@
#include <cJSON.h>
#include <macros.h>
#include <constants.h>
#include <database.h>
#include <endpoints/api_v1_macros.h>
#include <logger.h>
#include <models/macro.h>
#include <models/macro_action.h>
#include <models/schedule.h>
#include <models/relay.h>
#include <models/controller.h>
void
api_v1_macros_GET(struct mg_connection *nc, struct http_message *hm, endpoint_args_t *args, endpoint_response_t *response)
{
(void)args;
(void)hm;
(void)nc;
macro_t** all_macros = macro_get_all();
cJSON *json = cJSON_CreateArray();
for(int i = 0; all_macros[i] != NULL; ++i)
{
cJSON_AddItemToArray(json, macro_to_json(all_macros[i]));
free(all_macros[i]);
}
endpoint_response_json(response, 200, json);
cJSON_Delete(json);
free(all_macros);
}
void
api_v1_macros_POST(struct mg_connection *nc, struct http_message *hm, endpoint_args_t *args, endpoint_response_t *response)
{
(void)args;
(void)nc;
cJSON *json = cJSON_ParseWithLength(hm->body.p, hm->body.len);
if(json == NULL)
{
static const char content[] = "no valid json was supplied";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_name = cJSON_GetObjectItemCaseSensitive(json, "name");
if(!cJSON_IsString(json_name) || (json_name->valuestring == NULL))
{
LOGGER_DEBUG("no name for macro provided\n");
cJSON_Delete(json);
static const char content[] = "no name for macro provided";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_actions = cJSON_GetObjectItemCaseSensitive(json, "actions");
if(!cJSON_IsArray(json_actions))
{
LOGGER_DEBUG("no actions for macro provided\n");
cJSON_Delete(json);
static const char content[] = "no actions for macro provided";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
database_transaction_lock lock;
database_transaction_begin(&lock);
macro_t *new_macro = malloc(sizeof(macro_t));
new_macro->id = 0;
uuid_generate(new_macro->uid);
strncpy(new_macro->name, json_name->valuestring, MAX_NAME_LENGTH);
new_macro->name[MAX_NAME_LENGTH] = '\0';
if(macro_save(new_macro))
{
LOGGER_DEBUG("macro could not be saved\n");
database_transaction_rollback(&lock);
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "macro could not be saved";
endpoint_response_text(response, 500, content, STRLEN(content));
return;
}
cJSON *json_action;
cJSON_ArrayForEach(json_action, json_actions)
{
cJSON *json_action_weekday = cJSON_GetObjectItemCaseSensitive(json_action, "weekday");
if(!cJSON_IsNumber(json_action_weekday) || (json_action_weekday->valueint < 0) || (json_action_weekday->valueint > 6))
{
LOGGER_DEBUG("one action is missing a weekday\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing a weekday";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_action_schedule = cJSON_GetObjectItemCaseSensitive(json_action, "schedule");
if(!cJSON_IsObject(json_action_schedule))
{
LOGGER_DEBUG("action is missing schedule\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing schedule";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_action_schedule_uid = cJSON_GetObjectItemCaseSensitive(json_action_schedule, "id");
if(!cJSON_IsString(json_action_schedule_uid) || (json_action_schedule_uid->valuestring == NULL))
{
LOGGER_DEBUG("action is missing schedule id\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing schedule id";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
uuid_t action_schedule_uid;
if(schedule_uid_parse(json_action_schedule_uid->valuestring, action_schedule_uid))
{
LOGGER_DEBUG("action schedule has bad uid\n");
cJSON_Delete(json);
static const char content[] = "action schedule has bad id";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
schedule_t *action_schedule = schedule_get_by_uid(action_schedule_uid);
if(action_schedule == NULL)
{
LOGGER_DEBUG("action schedule was not found\n");
cJSON_Delete(json);
static const char content[] = "action schedule was not found";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
int action_schedule_id = action_schedule->id;
schedule_free(action_schedule);
cJSON *json_action_relay = cJSON_GetObjectItemCaseSensitive(json_action, "relay");
if(!cJSON_IsObject(json_action_relay))
{
LOGGER_DEBUG("action is missing relay\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing relay";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_action_relay_number = cJSON_GetObjectItemCaseSensitive(json_action_relay, "number");
if(!cJSON_IsNumber(json_action_relay_number))
{
LOGGER_DEBUG("action is missing relay number\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing relay number";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_action_relay_controller_uid = cJSON_GetObjectItemCaseSensitive(json_action_relay, "controller_id");
if(!cJSON_IsString(json_action_relay_controller_uid) || (json_action_relay_controller_uid->valuestring == NULL))
{
LOGGER_DEBUG("action is missing relay controller id\n");
cJSON_Delete(json);
macro_free(new_macro);
static const char content[] = "one action is missing relay controller id";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
uuid_t action_controller_uid;
if(uuid_parse(json_action_relay_controller_uid->valuestring, action_controller_uid))
{
LOGGER_DEBUG("action controller has bad uid\n");
cJSON_Delete(json);
static const char content[] = "action controller has bad id";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
controller_t *action_controller = controller_get_by_uid(action_controller_uid);
if(action_controller == NULL)
{
LOGGER_DEBUG("action controller was not found\n");
cJSON_Delete(json);
static const char content[] = "action controller was not found";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
int controller_id = action_controller->id;
int relay_num = json_action_relay_number->valueint;
controller_free(action_controller);
relay_t *action_relay = relay_get_for_controller(controller_id, relay_num);
if(action_relay == NULL)
{
LOGGER_DEBUG("action relay was not found\n");
cJSON_Delete(json);
static const char content[] = "action relay was not found";
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
int action_relay_id = action_relay->id;
relay_free(action_relay);
macro_action_t *new_action = malloc(sizeof(macro_action_t));
new_action->macro_id = new_macro->id;
new_action->relay_id = action_relay_id;
new_action->schedule_id = action_schedule_id;
new_action->weekday = json_action_weekday->valueint;
macro_action_insert(new_action);
free(new_action);
}
database_transaction_commit(&lock);
cJSON_Delete(json);
json = macro_to_json(new_macro);
endpoint_response_json(response, 201, json);
cJSON_Delete(json);
macro_free(new_macro);
}

1
src/endpoints/api_v1_schedules.c
View file

@ -31,6 +31,7 @@ api_v1_schedules_POST(struct mg_connection *nc, struct http_message *hm, endpoin
endpoint_response_text(response, 400, content, STRLEN(content));
return;
}
cJSON *json_periods = cJSON_GetObjectItemCaseSensitive(json, "periods");
if(!cJSON_IsArray(json_periods))
{

3
src/endpoints/api_v1_schedules_STR.c
View file

@ -226,7 +226,8 @@ api_v1_schedules_STR_DELETE(struct mg_connection *nc, struct http_message *hm, e
}
else
{
endpoint_response_text(response, 200, "", 0);
static const char content[] = "deleted schedule";
endpoint_response_text(response, 200, content, STRLEN(content));
}
schedule_free(schedule);
return;

5
src/endpoints/api_v1_tags.c
View file

@ -91,7 +91,10 @@ api_v1_tags_POST(struct mg_connection *nc, struct http_message *hm, endpoint_arg
{
LOGGER_DEBUG("new tag saved\n");
endpoint_response_text(response, 201, json_tag->valuestring, 0);
char *tag = malloc(sizeof(char) * (strlen(json_tag->valuestring) + 1));
strcpy(tag, json_tag->valuestring);
endpoint_response_text(response, 201, tag, 0);
}
cJSON_Delete(json);

3
src/endpoints/api_v1_tags_STR.c
View file

@ -105,6 +105,7 @@ api_v1_tags_STR_DELETE(struct mg_connection *nc, struct http_message *hm, endpoi
}
else
{
endpoint_response_text(response, 200, "", 0);
static const char content[] = "deleted tag";
endpoint_response_text(response, 200, content, STRLEN(content));
}
}