fix(cloud): defer meta report and align timer with time sync (#561)

Report device meta after time sync via delayed work; publish EVENT_DEVICE_META_REPORT for timer init. Publish TIME_SYNC earlier in OTA upgrade flow. TLS: use 4096 max fragment when ENABLE_MBEDTLS_SSL_MAX_CONTENT_LEN is set. Bump ESP32 platform ref; ESP32 board and switch_demo Kconfig; ignore .clangd.

Author: shiliu-yang

.gitignore

@@ -3,6 +3,7 @@ __pycache__
 .tags
 .env.json
 .cache
+.clangd
 
 CMakeCache.txt
 /CMakeFiles
@@ -28,4 +29,3 @@ dist
 /dist
 *monitor.log
 
-/.omc

boards/ESP32/config/ESP32.config

@@ -1 +1,2 @@
-CONFIG_BOARD_CHOICE_ESP32=y
+CONFIG_BOARD_CHOICE_ESP32=y
+CONFIG_ENABLE_MBEDTLS_SSL_MAX_CONTENT_LEN=4096

platform/platform_config.yaml

@@ -22,7 +22,7 @@ platforms:
 - name: ESP32
   repo: https://github.com/tuya/TuyaOpen-esp32
   branch: master
-  commit: 5763a03c9979c61272b5331393fff07d6b4ff6b0
+  commit: 22a2b3e8ae8a3aa6d3d43c206dff63b27a74e4de
 
 - name: LN882H
   repo: https://github.com/tuya/TuyaOpen-ln882h

src/tal_system/include/tal_event_info.h

@@ -23,6 +23,10 @@ extern "C" {
 /***********************************************************
 ************************macro define************************
 ***********************************************************/
+/*
+event name max length is 16, EVENT_NAME_MAX_LEN is defined in tal_event.h
+*/
+
 #define EVENT_REBOOT_REQ                                                                                               \
     "dev.reboot.req" // device health check reboot request, application should subscribe it if needed
 #define EVENT_REBOOT_ACK        "dev.reboot.ack" // device health check reboot ack, application should publish when it ready
@@ -37,6 +41,8 @@ extern "C" {
 #define EVENT_TIME_SYNC         "time.sync"     // time sync
 #define EVENT_LINK_ACTIVATE     "link.activate" // linkage got activate info
 
+#define EVENT_DEVICE_META_REPORT  "dev.meta.rpt" // device meta report success
+
 /***********************************************************
 ***********************typedef define***********************
 ***********************************************************/

src/tuya_cloud_service/cloud/tuya_device_meta.c

@@ -9,6 +9,8 @@
 
 #include "atop_base.h"
 #include "tal_log.h"
+#include "tal_workq_service.h"
+#include "tuya_cloud_types.h"
 #include "tuya_iot.h"
 #include "tal_api.h"
 
@@ -28,6 +30,8 @@
 typedef struct {
     cJSON *json;
     MUTEX_HANDLE mutex;
+
+    DELAYED_WORK_HANDLE delayed_work;
 } tuya_device_meta_t;
 
 /***********************************************************
@@ -44,14 +48,52 @@ static tuya_device_meta_t s_meta = {0};
 ***********************function define**********************
 ***********************************************************/
 
+static void __device_meta_event_workq(void *data)
+{
+    (void)data;
+
+    OPERATE_RET rt = OPRT_OK;
+
+    rt = tuya_device_meta_add_number("timerCapability", 1);
+    if (OPRT_OK != rt) {
+        PR_ERR("add timerCapability failed:%d", rt);
+        return;
+    }
+
+    rt = tuya_device_meta_report();
+    if (OPRT_OK != rt) {
+        PR_ERR("report meta failed:%d", rt);
+        return;
+    }
+
+    PR_DEBUG("device meta report success");
+
+    tal_event_publish(EVENT_DEVICE_META_REPORT, NULL);
+
+    PR_DEBUG("device meta report success, event publish");
+
+    tal_workq_cancel_delayed(s_meta.delayed_work);
+    s_meta.delayed_work = NULL;
+}
+
 static int __device_meta_event_cb(void *data)
 {
     (void)data;
 
+    OPERATE_RET rt = OPRT_OK;
+
     /* Add common default device meta here. Meta for other features may be added
      * after tuya_iot_init() and before tuya_iot_start(). */
-    tuya_device_meta_add_number("timerCapability", 1);
-    tuya_device_meta_report();
+    rt = tal_workq_init_delayed(WORKQ_SYSTEM, __device_meta_event_workq, NULL, &s_meta.delayed_work);
+    if (OPRT_OK != rt) {
+        PR_ERR("init delayed work failed:%d", rt);
+        return -1;
+    }
+    rt = tal_workq_start_delayed(s_meta.delayed_work, 5*1000, LOOP_CYCLE);
+    if (OPRT_OK != rt) {
+        PR_ERR("start delayed work failed:%d", rt);
+        return -1;
+    }
 
     return 0;
 }
@@ -70,7 +112,7 @@ OPERATE_RET tuya_device_meta_init(void)
         return rt;
     }
 
-    tal_event_subscribe(EVENT_MQTT_CONNECTED, "tuya_device_meta", __device_meta_event_cb,
+    tal_event_subscribe(EVENT_TIME_SYNC, "tuya_device_meta", __device_meta_event_cb,
         SUBSCRIBE_TYPE_ONETIME);
 
     return OPRT_OK;
@@ -228,7 +270,8 @@ OPERATE_RET tuya_device_meta_report(void)
     tal_mutex_lock(s_meta.mutex);
 
     /* 1. Build payload: update timestamp and serialize */
-    cJSON *new_time = cJSON_CreateNumber((double)tal_time_get_posix());
+    TIME_T timestamp = tal_time_get_posix();
+    cJSON *new_time = cJSON_CreateNumber((double)timestamp);
     if (new_time == NULL) {
         rt = OPRT_MALLOC_FAILED;
         goto __EXIT;
@@ -251,7 +294,7 @@ OPERATE_RET tuya_device_meta_report(void)
     atop_request.devid = client->activate.devid;
     atop_request.key = client->activate.seckey;
     atop_request.path = "/d.json";
-    atop_request.timestamp = (uint32_t)tal_time_get_posix();
+    atop_request.timestamp = (uint32_t)timestamp;
     atop_request.api = DEVICE_META_SAVE_API;
     atop_request.version = "1.0";
     atop_request.data = buffer;

src/tuya_cloud_service/cloud/tuya_device_timer.c

@@ -552,27 +552,29 @@ static void __timer_check_timer_cb(TIMER_ID timer_id, void *arg)
     (void)arg;
 
     if (s_ctx.inited == false || s_ctx.timer_task_list.mutex == NULL) {
+        PR_ERR("device timer not initialized");
         return;
     }
 
     if (tal_time_check_time_sync() != OPRT_OK) {
+        PR_ERR("time sync failed");
         return;
     }
 
     if (tuya_slist_empty(&s_ctx.timer_task_list.head)) {
+        PR_ERR("timer task list is empty");
         return;
     }
 
     POSIX_TM_S current_time = {0};
     rt = tal_time_get(&current_time);
     if (rt != OPRT_OK) {
+        PR_ERR("tal_time_get failed");
         return;
     }
 
     tal_mutex_lock(s_ctx.timer_task_list.mutex);
 
-
-
     SLIST_HEAD *pos = NULL;
     tuya_timer_item_t *item = NULL;
     SLIST_FOR_EACH_ENTRY(item, tuya_timer_item_t, pos, &s_ctx.timer_task_list.head, node) {
@@ -1114,7 +1116,7 @@ int tuya_device_timer_init(void)
     tuya_mqtt_dispatch_register(PRO_DEV_DA_RESP, "timer_full_syn", "device timer full sync", __on_timer_full_syn_ack_callback, NULL);
     tuya_mqtt_dispatch_register(PRO_IOT_DA_REQ, "timer_sync", "device timer sync", __on_timer_sync_callback, NULL);
 
-    tal_event_subscribe(EVENT_MQTT_CONNECTED, "tuya_device_timer", __device_timer_task_event_cb, SUBSCRIBE_TYPE_ONETIME);
+    tal_event_subscribe(EVENT_DEVICE_META_REPORT, "tuya_device_timer", __device_timer_task_event_cb, SUBSCRIBE_TYPE_ONETIME);
     tal_event_subscribe(EVENT_RESET, "tuya_device_timer", __device_timer_reset_event_cb, SUBSCRIBE_TYPE_ONETIME);
 
     // Load from kv

src/tuya_cloud_service/cloud/tuya_iot.c

@@ -345,6 +345,9 @@ static void matop_upgrade_info_on(atop_base_response_t *response, void *user_dat
     client->event.value.asInteger = response->t;
     iot_dispatch_event(client);
 
+    /* Send timestamp sync event*/
+    tal_event_publish(EVENT_TIME_SYNC, (void *)client);
+
     /* Param verify */
     if (response->result == NULL) {
         return;
@@ -356,9 +359,6 @@ static void matop_upgrade_info_on(atop_base_response_t *response, void *user_dat
     client->event.value.asJSON = response->result;
     iot_dispatch_event(client);
 
-    /* Send timestamp sync event*/
-    tal_event_publish(EVENT_TIME_SYNC, (void *)client);
-
     TUYA_CALL_ERR_LOG(tuya_ota_start(response->result));
 }
 
@@ -528,7 +528,7 @@ static int run_state_mqtt_connect_start(tuya_iot_client_t *client)
     tuya_mqtt_protocol_register(&client->mqctx, PRO_UPGD_REQ, mqtt_service_upgrade_notify_on, client);
     tuya_mqtt_protocol_register(&client->mqctx, PRO_MQ_DPCACHE_NOTIFY, mqtt_atop_dp_cache_notify_cb, client);
     tuya_mqtt_protocol_register(&client->mqctx, PRO_RTC_REQ, mqtt_rtc_req_notify_cb, client);
-    
+
     return rt;
 }
 

src/tuya_cloud_service/tls/tuya_tls.c

@@ -11,6 +11,7 @@
  *
  */
 
+#include "tuya_cloud_types.h"
 #include "tuya_tls.h"
 
 #if !defined(MBEDTLS_CONFIG_FILE)
@@ -613,6 +614,8 @@ OPERATE_RET tuya_tls_connect(tuya_tls_hander p_tls_handler, char *hostname, int
 #if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH)
 #if (MBEDTLS_SSL_MAX_CONTENT_LEN >= 4096)
     mbedtls_ssl_conf_max_frag_len(p_conf_ctx, MBEDTLS_SSL_MAX_FRAG_LEN_4096);
+#elif defined(ENABLE_MBEDTLS_SSL_MAX_CONTENT_LEN) && (ENABLE_MBEDTLS_SSL_MAX_CONTENT_LEN>=4096)
+    mbedtls_ssl_conf_max_frag_len(p_conf_ctx, MBEDTLS_SSL_MAX_FRAG_LEN_4096);
 #else
     mbedtls_ssl_conf_max_frag_len(p_conf_ctx, MBEDTLS_SSL_MAX_FRAG_LEN_1024);
 #endif