IFTTT improvements and some bug fixes

Author: sharky76

libZaeUtil/service_args.c

@@ -59,12 +59,15 @@ void                    service_args_stack_remove(const char* service_name, uint
 
 service_args_stack_t*   service_args_stack_get(const char* service_name)
 {
-    uint32_t key = crc32(0, service_name, strlen(service_name));
-    variant_t* stack_var = variant_hash_get(service_stack_table, key);
-
-    if(NULL != stack_var)
+    if(NULL != service_stack_table)
     {
-        return (service_args_stack_t*)variant_get_ptr(stack_var);
+        uint32_t key = crc32(0, service_name, strlen(service_name));
+        variant_t* stack_var = variant_hash_get(service_stack_table, key);
+    
+        if(NULL != stack_var)
+        {
+            return (service_args_stack_t*)variant_get_ptr(stack_var);
+        }
     }
 
     return NULL;

libZaeUtil/vty.c

@@ -280,8 +280,8 @@ void    vty_erase_char(vty_t* vty)
         }
         else
         {
-            vty->buffer[vty->buf_size] = 0;
             vty->buf_size--;
+            vty->buffer[vty->buf_size] = 0;
             vty->cursor_pos = vty->buf_size;
 
             if(NULL != vty->erase_char_cb)

services/IFTTT/IFTTT.c

@@ -17,10 +17,11 @@ variant_t* ifttt_trigger_event(service_method_t* method, va_list args);
 void    service_create(service_t** service, int service_id)
 {
     SERVICE_INIT(IFTTT, "Send and receive IFTTT triggers");
-    SERVICE_ADD_METHOD(Trigger, ifttt_trigger_event, 1, "Trigger IFTTT event. Arg: Event, 3 Values can be provided as argument stack.");
+    SERVICE_ADD_METHOD(Trigger, ifttt_trigger_event, 1, "Trigger IFTTT Maker event. Arg: Event, 3 Values can be provided as argument stack.");
 
     (*service)->get_config_callback = ifttt_cli_get_config;
     DT_IFTTT = service_id;
+    ifttt_key = NULL;
 }
 
 void    service_cli_create(cli_node_t* parent_node)
@@ -30,35 +31,39 @@ void    service_cli_create(cli_node_t* parent_node)
 
 variant_t* ifttt_trigger_event(service_method_t* method, va_list args)
 {
-    variant_t* event_name = va_arg(args, variant_t*);
-    service_args_stack_t* service_stack = service_args_stack_get("IFTTT.Trigger");
-    hash_table_t*   value_table = (hash_table_t*)service_stack->data_storage;
-    
     if(NULL == ifttt_key)
     {
         LOG_ERROR(DT_IFTTT, "Key not set");
         return variant_create_bool(false);
     }
 
+    variant_t* event_name = va_arg(args, variant_t*);
+    service_args_stack_t* service_stack = service_args_stack_get("IFTTT.Trigger");
+    LOG_INFO(DT_IFTTT, "Event %s triggered", variant_get_string(event_name));    
+    
     // Create JSON payload
     json_object* payload_obj = json_object_new_object();
-    char* json_keys[3] = {"value1", "value2", "value3"};
 
-
-    for(int i = 0; i < 3; i++)
+    if(NULL != service_stack)
     {
-        variant_t* value_var;
-        uint32_t key = crc32(0, json_keys[i], strlen(json_keys[i]));
-        if((value_var = variant_hash_get(value_table, key)) != NULL)
+        hash_table_t*   value_table = (hash_table_t*)service_stack->data_storage;
+        char* json_keys[3] = {"value1", "value2", "value3"};
+    
+        for(int i = 0; i < 3; i++)
         {
-            json_object *value_obj = json_object_new_string(variant_get_string(value_var));
-            json_object_object_add(payload_obj, json_keys[i], value_obj);
+            variant_t* value_var;
+            uint32_t key = crc32(0, json_keys[i], strlen(json_keys[i]));
+            if((value_var = variant_hash_get(value_table, key)) != NULL)
+            {
+                json_object *value_obj = json_object_new_string(variant_get_string(value_var));
+                json_object_object_add(payload_obj, json_keys[i], value_obj);
+            }
         }
+    
+        const char* payload_str = json_object_to_json_string_ext(payload_obj, JSON_C_TO_STRING_SPACED);
+        LOG_ADVANCED(DT_IFTTT, "Creating payload %s", payload_str);
     }
 
-    const char* payload_str = json_object_to_json_string_ext(payload_obj, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY);
-    LOG_ADVANCED(DT_IFTTT, "Creating payload %s", payload_str);
-
     CURL *curl_handle;
     CURLcode res;
 
@@ -85,7 +90,7 @@ variant_t* ifttt_trigger_event(service_method_t* method, va_list args)
 
         LOG_DEBUG(DT_IFTTT, "Trigger URL is %s", urlbuf);
         curl_easy_setopt(curl_handle, CURLOPT_URL, urlbuf);
-        curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, payload_str);
+        curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, json_object_to_json_string_ext(payload_obj, JSON_C_TO_STRING_SPACED));
 
         struct curl_slist *headers=NULL;
         headers = curl_slist_append(headers, "Content-Type: application/json");
@@ -103,12 +108,14 @@ variant_t* ifttt_trigger_event(service_method_t* method, va_list args)
         }
         else 
         {
-            LOG_DEBUG(DT_IFTTT, "Mail sent successfully");
+            LOG_ADVANCED(DT_IFTTT, "Event %s triggered successfully", variant_get_string(event_name));
         }
 
         /* cleanup curl stuff */ 
         curl_easy_cleanup(curl_handle);
     }
 
+    json_object_put(payload_obj);
+
     return variant_create_bool(true);
 }

socket_io.c

@@ -61,7 +61,7 @@ char*   socket_read_cb(vty_t* vty)
 
     if(recv(socket, ch, 1, 0) > 0)
     {
-        LOG_DEBUG(SocketIO, "Socket recv: %s (0x%x)", ch, ch[0]);
+        LOG_DEBUG(SocketIO, "Socket recv: %c (0x%x), buffer: %s, cursor: %d", ch[0], ch[0], vty->buffer, vty->cursor_pos);
         if(ch[0] == '?')
         {
             cli_command_describe_norl(vty);