Refactor JSON handling and enhance error checking in AI components (#548)

Author: maidang-xing

apps/tuya.ai/ai_components/ai_audio/src/ai_audio_input.c

@@ -71,6 +71,11 @@ static OPERATE_RET __audio_slice_check_and_send(bool *more_data)
         if (len >= sg_recorder->slice_size) {
 
             uint8_t *cache_data = (uint8_t*)Malloc(sg_recorder->slice_size);
+            if (NULL == cache_data) {
+                PR_ERR("malloc cache_data fail, size: %d", sg_recorder->slice_size);
+                tal_mutex_unlock(sg_recorder->mutex);
+                return OPRT_MALLOC_FAILED;
+            }
             uint32_t read_len = tuya_ring_buff_read(sg_recorder->ringbuf, cache_data, sg_recorder->slice_size);
 
             sg_recorder->output_cb(cache_data, read_len);

apps/tuya.ai/ai_components/ai_mcp/src/ai_mcp_server.c

@@ -81,6 +81,14 @@ static MCP_SERVER_CTX_T s_server_ctx;
 /***********************************************************
 ***********************function define**********************
 ***********************************************************/
+static const char *__json_get_string(const cJSON *item)
+{
+    if (item == NULL || !cJSON_IsString(item) || item->valuestring == NULL) {
+        return NULL;
+    }
+    return item->valuestring;
+}
+
 MCP_PROPERTY_T *ai_mcp_property_create(const char *name, MCP_PROPERTY_TYPE_E type, const char *description)
 {
     if (!name)
@@ -981,8 +989,10 @@ static OPERATE_RET __handle_tools_list(cJSON *params, const char *id)
     /* Parse parameters */
     if (params) {
         cJSON *cursor = cJSON_GetObjectItem(params, "cursor");
-        if (cJSON_IsString(cursor))
-            cursor_str = cursor->valuestring;
+        const char *cursor_value = __json_get_string(cursor);
+        if (cursor_value != NULL) {
+            cursor_str = cursor_value;
+        }
     }
 
     result = cJSON_CreateObject();
@@ -1085,12 +1095,12 @@ static OPERATE_RET __parse_property_value(MCP_PROPERTY_LIST_T *prop_list,
         break;
 
     case MCP_PROPERTY_TYPE_STRING:
-        if (!cJSON_IsString(value))
+        if (!__json_get_string(value))
             return OPRT_INVALID_PARM;
         prop->default_val.type = MCP_PROPERTY_TYPE_STRING;
         if (prop->has_default && prop->default_val.str_val)
             AI_MCP_FREE(prop->default_val.str_val);    // Free existing string
-        prop->default_val.str_val = mm_strdup(value->valuestring);
+        prop->default_val.str_val = mm_strdup(__json_get_string(value));
         if (!prop->default_val.str_val)
             return OPRT_MALLOC_FAILED;
         prop->has_default = true;
@@ -1121,12 +1131,12 @@ static OPERATE_RET __handle_tools_call(cJSON *params, const char *id)
     }
 
     tool_name_json = cJSON_GetObjectItem(params, "name");
-    if (!cJSON_IsString(tool_name_json)) {
+    tool_name = __json_get_string(tool_name_json);
+    if (tool_name == NULL) {
         error_code = MCP_ERROR_INVALID_PARAMS;
         error_msg = "Missing tool name";
         goto err;
     }
-    tool_name = tool_name_json->valuestring;
 
     tool_arguments = cJSON_GetObjectItem(params, "arguments");
     if (tool_arguments && !cJSON_IsObject(tool_arguments)) {
@@ -1217,18 +1227,18 @@ OPERATE_RET ai_mcp_server_parse_message(const cJSON *json, VOID *user_data)
 
     /* Check JSONRPC version */
     node = cJSON_GetObjectItem(json, "jsonrpc");
-    if (!node || !cJSON_IsString(node) || strcmp(node->valuestring, "2.0") != 0) {
+    if (__json_get_string(node) == NULL || strcmp(__json_get_string(node), "2.0") != 0) {
         PR_ERR("Invalid JSONRPC version");
         return OPRT_INVALID_PARM;
     }
 
     /* Check method */
     node = cJSON_GetObjectItem(json, "method");
-    if (!node || !cJSON_IsString(node)) {
+    method = __json_get_string(node);
+    if (method == NULL) {
         PR_ERR("Missing method");
         return OPRT_INVALID_PARM;
     }
-    method = node->valuestring;
 
     /* Skip notifications */
     if (strncmp(method, "notifications", 13) == 0)
@@ -1241,11 +1251,11 @@ OPERATE_RET ai_mcp_server_parse_message(const cJSON *json, VOID *user_data)
         return OPRT_INVALID_PARM;
     }
 
-    if (!node || !cJSON_IsString(node) || node->valuestring == NULL) {
+    id = __json_get_string(node);
+    if (id == NULL) {
         PR_ERR("Missing ID or Invalid ID type for method: %s", method);
         return OPRT_INVALID_PARM;
     }
-    id = node->valuestring;
 
     /* Get params */
     node = cJSON_GetObjectItem(json, "params");

apps/tuya.ai/ai_components/ai_skills/src/ai_skill.c

@@ -43,6 +43,15 @@
 /***********************************************************
 ***********************function define**********************
 ***********************************************************/
+static const char *__json_get_string(const cJSON *item)
+{
+    if (item == NULL || !cJSON_IsString(item) || item->valuestring == NULL) {
+        return NULL;
+    }
+
+    return item->valuestring;
+}
+
 /**
  * @brief Process AI skill data from JSON.
  *
@@ -58,7 +67,7 @@ static OPERATE_RET __ai_skills_process(cJSON *root, bool eof)
 
     /* Root is data:{}, parse code */
     node = cJSON_GetObjectItem(root, "code");
-    code = cJSON_GetStringValue(node);
+    code = __json_get_string(node);
     if (!code) 
         return OPRT_OK;
 
@@ -102,14 +111,14 @@ static OPERATE_RET __ai_skills_process(cJSON *root, bool eof)
  */
 static OPERATE_RET __ai_asr_process(cJSON *root, bool eof)
 {
-    char *content = cJSON_GetStringValue(root);
-    PR_NOTICE("text -> ASR result: %s", content);
+    const char *content = __json_get_string(root);
     if (!content) {
         content = "";
     }
+    PR_NOTICE("text -> ASR result: %s", content);
 
     AI_NOTIFY_TEXT_T text;
-    text.data      = content;
+    text.data      = (char *)content;
     text.datalen   = strlen(content);
     text.timeindex = 0;
     ai_user_event_notify((0 == strlen(content))?AI_USER_EVT_ASR_EMPTY:AI_USER_EVT_ASR_OK, &text);
@@ -127,10 +136,7 @@ static OPERATE_RET __ai_asr_process(cJSON *root, bool eof)
 static OPERATE_RET __ai_images_process(cJSON *root)
 {
     cJSON *images = cJSON_GetObjectItem(root, "images");
-    if(NULL == images) {
-        PR_ERR("no images found");
-        return OPRT_COM_ERROR;
-    }
+    TUYA_CHECK_NULL_RETURN(images, OPRT_COM_ERROR);
 
     cJSON *url_array = cJSON_GetObjectItem(images, "url");
     if(NULL == url_array || !cJSON_IsArray(url_array)) {
@@ -146,7 +152,7 @@ static OPERATE_RET __ai_images_process(cJSON *root)
             continue;
         }
 
-        char *url_str = cJSON_GetStringValue(url_item);
+        const char *url_str = __json_get_string(url_item);
         if(NULL == url_str) {
             PR_ERR("url string is null");
             continue;
@@ -192,13 +198,13 @@ static OPERATE_RET __ai_nlg_process(cJSON *root, bool eof)
         return OPRT_OK;
     }
 
-    char *content = cJSON_GetStringValue(cJSON_GetObjectItem(root, "content"));
+    const char *content = __json_get_string(cJSON_GetObjectItem(root, "content"));
     if (!content) {
         content = "";
     }
 
     AI_NOTIFY_TEXT_T text;
-    text.data      = content;
+    text.data      = (char *)content;
     text.datalen   = strlen(content);
     PR_NOTICE("text -> NLG eof: %d, content: %s, time: %d", eof, content, text.timeindex);
 
@@ -227,7 +233,7 @@ static OPERATE_RET __ai_nlg_process(cJSON *root, bool eof)
     AI_AGENT_EMO_T emo;
     cJSON *tags_array = cJSON_GetObjectItem(root, "tags");
     if (tags_array && cJSON_IsArray(tags_array) && cJSON_GetArraySize(tags_array) > 0) {
-        char *emoji = cJSON_GetStringValue(cJSON_GetArrayItem(tags_array, 0));
+        const char *emoji = __json_get_string(cJSON_GetArrayItem(tags_array, 0));
         if (emoji && strlen(emoji)) {
             emo.emoji = emoji;
             emo.name = ai_agent_emoji_get_name(emoji);
@@ -273,4 +279,4 @@ OPERATE_RET ai_text_process(AI_TEXT_TYPE_E type, cJSON *root, bool eof)
     }
 
     return OPRT_OK;
-}
+}