refactor(event-engine): split subscribe event engine to separate files

feat(retry): add retry policy Add failed request automated retry configuration and timer implementations.
pubnub · Oct 2, 2024 · 8ee9f0d · 8ee9f0d
1 parent 44bbe53
commit 8ee9f0d
Show file tree

Hide file tree

Showing 58 changed files with 5,420 additions and 3,094 deletions.
diff --git a/.clang-format b/.clang-format
@@ -88,7 +88,7 @@ PenaltyExcessCharacter: 4
 PenaltyReturnTypeOnItsOwnLine: 100
 PointerAlignment: Left
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    Never
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
@@ -101,7 +101,7 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        c++11
 TabWidth:        4
 UseTab:          Never
 ...

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,8 +60,9 @@ num_option(ONLY_PUBSUB_API "Only pubsub API" OFF)
 num_option(USE_PROXY "Use proxy" ON)
 num_option(USE_GZIP_COMPRESSION "Use gzip compression" ON)
 num_option(RECEIVE_GZIP_RESPONSE "Use gzip decompression" ON)
+num_option(USE_RETRY_CONFIGURATION "Use requests retry" ON)
 num_option(USE_SUBSCRIBE_V2 "Use subscribe v2" ON)
-num_option(USE_SUBSCRIBE_EVENT_ENGINE "Use subscribe event engine" ON)
+num_option(USE_SUBSCRIBE_EVENT_ENGINE "Use Subscribe Event Engine" ON)
 num_option(USE_ADVANCED_HISTORY "Use advanced history" ON)
 num_option(USE_OBJECTS_API "Use objects API" ON)
 num_option(USE_AUTO_HEARTBEAT "Use auto heartbeat" ON)
@@ -97,6 +98,7 @@ set(FLAGS "\
     -D PUBNUB_PROXY_API=${USE_PROXY} \
     -D PUBNUB_USE_GZIP_COMPRESSION=${USE_GZIP_COMPRESSION} \
     -D PUBNUB_RECEIVE_GZIP_RESPONSE=${RECEIVE_GZIP_RESPONSE} \
+    -D PUBNUB_USE_RETRY_CONFIGURATION=${USE_RETRY_CONFIGURATION} \
     -D PUBNUB_USE_SUBSCRIBE_V2=${USE_SUBSCRIBE_V2} \
     -D PUBNUB_USE_SUBSCRIBE_EVENT_ENGINE=${USE_SUBSCRIBE_EVENT_ENGINE} \
     -D PUBNUB_USE_OBJECTS_API=${USE_OBJECTS_API} \
@@ -318,21 +320,41 @@ if(${RECEIVE_GZIP_RESPONSE})
         ${CMAKE_CURRENT_LIST_DIR}/core/pbgzip_decompress.c)
 endif()
 
-if(${USE_SUBSCRIBE_V2})
+if (${USE_RETRY_CONFIGURATION})
     set(FEATURE_SOURCEFILES
+        ${FEATURE_SOURCEFILES}
+        ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_request_retry_timer.c
+        ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_retry_configuration.c)
+endif ()
+
+if(${USE_SUBSCRIBE_V2})
+set(FEATURE_SOURCEFILES
         ${FEATURE_SOURCEFILES}
         ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_v2.c
         ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_subscribe_v2.c)
 endif()
 
 if(${USE_SUBSCRIBE_EVENT_ENGINE})
     message(STATUS "Using subscribe event engine API")
+    set(LIB_SOURCEFILES
+            ${LIB_SOURCEFILES}
+            ${CMAKE_CURRENT_LIST_DIR}/lib/pbarray.c
+            ${CMAKE_CURRENT_LIST_DIR}/lib/pbhash_set.c
+            ${CMAKE_CURRENT_LIST_DIR}/lib/pbref_counter.c
+            ${CMAKE_CURRENT_LIST_DIR}/lib/pbstrdup.c)
     set(FEATURE_SOURCEFILES
             ${FEATURE_SOURCEFILES}
-            ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_entities.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_memory_utils.c
             ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_event_engine.c
             ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_engine.c
-            ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_subscribe_event_engine.c)
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_engine_states.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_engine_events.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_engine_effects.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_engine_transitions.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pbcc_subscribe_event_listener.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_entities.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_subscribe_event_engine.c
+            ${CMAKE_CURRENT_LIST_DIR}/core/pubnub_subscribe_event_listener.c)
 endif()
 
 if(${USE_ADVANCED_HISTORY})
@@ -491,29 +513,7 @@ set(SOURCEFILES
     ${OS_SOURCEFILES} 
     ${FEATURE_SOURCEFILES} 
     ${INTF_SOURCEFILES}
-        core/pubnub_subscribe_event_engine.h
-        core/pubnub_entities.c
-        core/pubnub_entities.h
-        core/pubnub_entities_internal.h
-        lib/pbhash_set.c
-        lib/pbhash_set.h
-        lib/pbarray.c
-        lib/pbarray.h
-        core/pubnub_subscribe_event_engine_internal.h
-        lib/pbstrdup.c
-        lib/pbstrdup.h
-        lib/pbref_counter.c
-        lib/pbref_counter.h
-        core/pubnub_subscribe_event_listener.c
-        core/pubnub_subscribe_event_listener.h
-        core/pubnub_subscribe_event_listener_internal.h
-        core/pbcc_subscribe_event_listener.c
-        core/pbcc_subscribe_event_listener.h
-        core/pubnub_subscribe_event_listener_types.h
-        core/pubnub_subscribe_event_engine_types.h
-        core/pbcc_memory_utils.c
-        core/pbcc_memory_utils.h
-)
+        core/samples/subscribe_event_engine_sample.c)
 
 if(NOT ESP_PLATFORM)
     if(${SHARED_LIB})
@@ -687,6 +687,7 @@ if(${EXAMPLES})
                 pubnub_callback_subloop_sample
                 subscribe_publish_callback_sample
                 subscribe_publish_from_callback
+                subscribe_event_engine_sample
                 publish_callback_subloop_sample
                 publish_queue_callback_subloop)
             if (WITH_CPP)

diff --git a/core/pbauto_heartbeat.c b/core/pbauto_heartbeat.c
@@ -560,7 +560,7 @@ bool pubnub_is_auto_heartbeat_enabled(pubnub_t* pb)
 }
 
 
-void  pbauto_heartbeat_free_channelInfo(pubnub_t* pb)
+void pbauto_heartbeat_free_channelInfo(pubnub_t* pb)
 {
     PUBNUB_ASSERT_OPT(pb_valid_ctx_ptr(pb));
-Original file line number
+Diff line change
@@ Expand Up / @@ -560,7 +560,7 @@ bool pubnub_is_auto_heartbeat_enabled(pubnub_t* pb) @@
     }
-    void  pbauto_heartbeat_free_channelInfo(pubnub_t* pb)
+    void pbauto_heartbeat_free_channelInfo(pubnub_t* pb)
     {
         PUBNUB_ASSERT_OPT(pb_valid_ctx_ptr(pb));
@@ Expand Down @@