Use c-core's EE in the implementation (#17)

* Implemented C-Core EE integration in Chat logic

Author: Xavrax

.clang-format

@@ -0,0 +1,86 @@
+AccessModifierOffset: 0
+AlignAfterOpenBracket: BlockIndent
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignOperands: false
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: false
+ColumnLimit: 100
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IncludeBlocks: Regroup
+IncludeCategories:
+    - Regex:           '^<ext/.*\.h>'
+      Priority:        2
+      SortPriority:    0
+      CaseSensitive:   false
+    - Regex:           '^<.*\.h>'
+      Priority:        1
+      SortPriority:    0
+      CaseSensitive:   false
+    - Regex:           '^<.*'
+      Priority:        2
+      SortPriority:    0
+      CaseSensitive:   false
+    - Regex:           '.*'
+      Priority:        3
+      SortPriority:    0
+      CaseSensitive:   false
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentAccessModifiers: true
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+TabWidth: 4
+UseTab: Never

CMakeLists.txt

@@ -49,6 +49,11 @@ include(FetchContent)
 
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(USE_GRANT_TOKEN_API ON)
+set(USE_SYNC_API ON)
+set(USE_CALLBACK_API ON)
+set(USE_SET_DNS_SERVERS ON)
+set(USE_IPV6 ON)
+set(USE_SUBSCRIBE_EVENT_ENGINE ON)
 
 if(WIN32 OR WIN64 OR MSVC)
     set(CUSTOM_BOOL_TYPE _Bool)
@@ -57,21 +62,21 @@ endif()
 FetchContent_Declare(
   pubnub
   GIT_REPOSITORY https://github.com/pubnub/c-core.git
-  GIT_TAG master
+  GIT_TAG feat/ee-listener-void
   GIT_SHALLOW TRUE
   GIT_PROGRESS ON
   SYSTEM
 )
 
 FetchContent_MakeAvailable(pubnub)
 
-
 # TODO: this flag is okay until we release the Cpp-Chat as an independent library
 if(${ENABLE_C_ABI})
     target_compile_options(pubnub PUBLIC -DPUBNUB_SDK_VERSION_SUFFIX=\"/CA-Unity/0.3.1\")
 else()
     target_compile_options(pubnub PUBLIC -DPUBNUB_SDK_VERSION_SUFFIX=\"/CA-Unreal/0.2.5\")
 endif()
+target_compile_options(pubnub PUBLIC -DPUBNUB_NTF_RUNTIME_SELECTION -DPUBNUB_USE_SUBSCRIBE_EVENT_ENGINE=1 -DPUBNUB_USE_SUBSCRIBE_V2=1 -DPUBNUB_CALLBACK_API=1 -DPUBNUB_SYNC_API=1 -DPUBNUB_SET_DNS_SERVERS=1 -DPUBNUB_USE_IPV6=1)
 
 FetchContent_Declare(
   json
@@ -147,7 +152,8 @@ set(APP_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/application/dao/user_dao.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/application/dao/message_dao.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/application/dao/membership_dao.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/application/dao/message_draft_dao.cpp)
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/application/dao/message_draft_dao.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/application/subscription.cpp)
 
 set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/presentation/chat.cpp
@@ -159,6 +165,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/presentation/thread_channel.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/presentation/thread_message.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/presentation/access_manager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/presentation/callback_handle.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/chat_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/string.cpp
 )
@@ -177,7 +184,9 @@ if(${ENABLE_C_ABI})
         ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_membership.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_serialization.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_thread_channel.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_thread_message.cpp)
+        ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_thread_message.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_callback_handle.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/c_abi/src/c_response.cpp)
 endif()
 
 set(SOURCES
@@ -186,26 +195,39 @@ set(SOURCES
     ${DOMAIN_SOURCES}
     ${APP_SOURCES})
 
+
 add_library(pubnub-chat SHARED ${SOURCES})
 
-target_link_libraries(pubnub-chat PRIVATE pubnub)
+target_compile_options(pubnub-chat PRIVATE -DPUBNUB_NTF_RUNTIME_SELECTION -DPUBNUB_USE_SUBSCRIBE_EVENT_ENGINE=1 -DPUBNUB_USE_SUBSCRIBE_V2=1 -DPUBNUB_CALLBACK_API=1 -DPUBNUB_SYNC_API=1 -DPUBNUB_SET_DNS_SERVERS=1 -DPUBNUB_USE_IPV6=1)
+
+target_link_libraries(pubnub-chat PRIVATE -lpthread pubnub)
 
 # TODO: kept for debugging purposes - should be deleted before release
 add_executable(pubnub-chat-example example/main.cpp)
-target_link_libraries(pubnub-chat-example PUBLIC pubnub-chat)
+target_compile_options(pubnub-chat-example PRIVATE -DPUBNUB_NTF_RUNTIME_SELECTION -DPUBNUB_USE_SUBSCRIBE_EVENT_ENGINE=1 -DPUBNUB_USE_SUBSCRIBE_V2=1 -DPUBNUB_CALLBACK_API=1 -DPUBNUB_SYNC_API=1 -DPUBNUB_SET_DNS_SERVERS=1 -DPUBNUB_USE_IPV6=1)
+target_link_libraries(pubnub-chat-example PUBLIC -lpthread pubnub-chat)
 
 if(${COMPILE_EXAMPLES})
     function(example name)
         add_executable(pubnub_${name} example/${name}.cpp)
+        target_compile_options(pubnub_${name} PRIVATE -DPUBNUB_NTF_RUNTIME_SELECTION -DPUBNUB_USE_SUBSCRIBE_EVENT_ENGINE=1 -DPUBNUB_USE_SUBSCRIBE_V2=1 -DPUBNUB_CALLBACK_API=1 -DPUBNUB_SYNC_API=1 -DPUBNUB_SET_DNS_SERVERS=1 -DPUBNUB_USE_IPV6=1)
         target_link_libraries(pubnub_${name} PRIVATE pubnub-chat)
     endfunction()
 
-    example(message_draft)
+    if(NOT ${ENABLE_C_ABI})
+        # It uses different mechanism systems for callbacks
+        # in C++ and C, so it's not possible to run this example
+        example(message_draft)
+    endif()
+    example(hello_world)
     example(forward_message)
     example(report_user)
     example(thread_channel)
     example(message_reactions)
     example(delete_message)
+    example(typing)
+    example(entity_update)
+    example(read_receipts)
     example(restrictions)
 endif()
 

c_abi/include/c_callback_handle.hpp

@@ -0,0 +1,11 @@
+#ifndef PN_CHAT_C_CALLBACK_HANDLE_HPP
+#define PN_CHAT_C_CALLBACK_HANDLE_HPP
+
+#include "c_errors.hpp"
+#include "callback_handle.hpp"
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT void pn_callback_handle_dispose(Pubnub::CallbackHandle* handle);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT void pn_callback_handle_close(Pubnub::CallbackHandle* handle);
+
+#endif // PN_CHAT_C_CALLBACK_HANDLE_HPP

c_abi/include/c_channel.hpp

@@ -1,6 +1,7 @@
 #ifndef PN_CHAT_C_CHANNEL_H
 #define PN_CHAT_C_CHANNEL_H
 
+#include "callback_handle.hpp"
 #include "chat.hpp"
 #include "message_draft.hpp"
 #include "channel.hpp"
@@ -29,13 +30,13 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::Channel* pn_channel_update_dirty(
         char* channel_status,
         char* channel_type);
 
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_connect(Pubnub::Channel* channel, char* result_messages);
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_connect(Pubnub::Channel* channel);
 
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_disconnect(Pubnub::Channel* channel, char* result_messages);
+PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_disconnect(Pubnub::Channel* channel);
 
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_join(Pubnub::Channel* channel, const char* additional_params, char* result_messages);
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_join(Pubnub::Channel* channel, const char* additional_params);
 
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_leave(Pubnub::Channel* channel, char* result_messages);
+PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_leave(Pubnub::Channel* channel);
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_channel_delete_channel(Pubnub::Channel* channel);
 
@@ -145,5 +146,15 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::MessageDraft* pn_channel_create_message_dr
     int user_limit,
     int channel_limit);
 
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_stream_updates(Pubnub::Channel* channel);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_get_typing(Pubnub::Channel* channel);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_stream_presence(Pubnub::Channel* channel);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_stream_read_receipts(Pubnub::Channel* channel);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_channel_stream_message_reports(Pubnub::Channel* channel);
+
 #endif // PN_CHAT_C_CHANNEL_H
 

c_abi/include/c_chat.hpp

@@ -139,11 +139,6 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_chat_delete_user(
         Pubnub::Chat* chat,
         const char* user_id);
 
-// Hacky way to get the messages
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_chat_get_updates(
-        Pubnub::Chat* chat,
-        char* messages_json);
-
 PN_CHAT_EXTERN PN_CHAT_EXPORT void pn_clear_string(char* str);
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCTribool pn_chat_is_present(
@@ -165,11 +160,10 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_chat_get_channels(
         const char* prev,
         char* result);
 
-PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_chat_listen_for_events(
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_chat_listen_for_events(
         Pubnub::Chat* chat,
         const char* channel_id,
-        Pubnub::pubnub_chat_event_type event_type,
-        char* messages_json);
+        Pubnub::pubnub_chat_event_type event_type);
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pin_message_to_channel(Pubnub::Chat* chat, Pubnub::Message* message, Pubnub::Channel* channel);
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult unpin_message_from_channel(Pubnub::Chat* chat, Pubnub::Channel* channel);

c_abi/include/c_membership.hpp

@@ -1,6 +1,7 @@
 #ifndef PN_CHAT_C_MEMBERSHIP_H
 #define PN_CHAT_C_MEMBERSHIP_H
 
+#include "callback_handle.hpp"
 #include "chat.hpp"
 #include "membership.hpp"
 #include "user.hpp"
@@ -45,4 +46,6 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::Membership* pn_membership_update_with_base
         Pubnub::Membership* membership,
         Pubnub::Membership* base_membership);
 
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_membership_stream_updates(Pubnub::Membership* membership);
+
 #endif // PN_CHAT_C_MEMBERSHIP_H

c_abi/include/c_message.hpp

@@ -1,6 +1,7 @@
 #ifndef PN_CHAT_C_MESSAGE_H
 #define PN_CHAT_C_MESSAGE_H
 
+#include "callback_handle.hpp"
 #include "message.hpp"
 #include "chat.hpp"
 #include "helpers/export.hpp"
@@ -65,4 +66,6 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::Message* pn_message_quoted_message(Pubnub:
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_message_text_links(Pubnub::Message* message, char* result);
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::Message* pn_message_restore(Pubnub::Message* message);
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_message_stream_updates(Pubnub::Message* message);
 #endif // PN_CHAT_C_MESSAGE_H

c_abi/include/c_response.hpp

@@ -0,0 +1,21 @@
+#ifndef PN_CHAT_C_RESPONSE_HPP
+#define PN_CHAT_C_RESPONSE_HPP
+
+#include "c_errors.hpp"
+#include "c_utils.hpp"
+#include "domain/quotes.hpp"
+#include "pubnub_chat/chat.hpp"
+
+PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_c_consume_response_buffer(Pubnub::Chat* chat, char* result);
+
+PnCResult pn_c_append_to_response_buffer(const ChatService* chat, const char* data);
+
+template <typename T>
+PnCResult pn_c_append_pointer_to_response_buffer(const ChatService* chat, Pubnub::String id, T* pointer) {
+    auto id_string = Quotes::add(id);
+    auto ptr_string = Quotes::add(to_ptr_string(pointer));
+    auto data = "{" + id_string + ":" + ptr_string + "}";
+    return pn_c_append_to_response_buffer(chat, data.c_str());
+}
+
+#endif

c_abi/include/c_thread_message.hpp

@@ -1,6 +1,7 @@
 #ifndef PN_CHAT_C_THREAD_MESSAGE_H
 #define PN_CHAT_C_THREAD_MESSAGE_H
 
+#include "callback_handle.hpp"
 #include "chat.hpp"
 #include "thread_channel.hpp"
 #include "thread_message.hpp"
@@ -75,5 +76,7 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::Channel* pn_thread_message_pin_to_parent_c
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_thread_message_parent_channel_id(Pubnub::ThreadMessage* thread_message, char* result);
 
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_thread_message_stream_updates(Pubnub::ThreadMessage* message);
+
 
 #endif // PN_CHAT_C_THREAD_MESSAGE_H

c_abi/include/c_user.hpp

@@ -1,6 +1,7 @@
 #ifndef PN_CHAT_C_USER_HPP
 #define PN_CHAT_C_USER_HPP
 
+#include "callback_handle.hpp"
 #include "channel.hpp"
 #include "chat.hpp"
 #include "user.hpp"
@@ -84,5 +85,7 @@ PN_CHAT_EXTERN PN_CHAT_EXPORT PnCTribool pn_user_active(Pubnub::User* user);
 
 PN_CHAT_EXTERN PN_CHAT_EXPORT PnCResult pn_user_last_active_timestamp(Pubnub::User* user, char* result);
 
+PN_CHAT_EXTERN PN_CHAT_EXPORT Pubnub::CallbackHandle* pn_user_stream_updates(Pubnub::User* user);
+
 
 #endif // PN_CHAT_C_USER_HPP

c_abi/include/c_utils.hpp

@@ -0,0 +1,24 @@
+#ifndef PN_CHAT_C_UTILS_HPP
+#define PN_CHAT_C_UTILS_HPP
+
+#include <sstream>
+#include "string.hpp"
+
+template <typename T>
+Pubnub::String to_ptr_string(T* ptr) {
+    Pubnub::String result;
+    result.reserve(18); //ptr str length
+
+#ifdef _WIN32 
+    result += "0x";
+#endif
+
+    std::ostringstream ss;
+    ss << static_cast<void*>(ptr);
+
+    result += ss.str();
+
+    return result;
+}
+
+#endif

c_abi/src/c_callback_handle.cpp

@@ -0,0 +1,13 @@
+#include "c_callback_handle.hpp"
+
+void pn_callback_handle_dispose(Pubnub::CallbackHandle* handle) {
+    if (handle == nullptr) {
+        return;
+    }
+    delete handle;
+}
+
+void pn_callback_handle_close(Pubnub::CallbackHandle* handle) {
+    handle->close();
+}
+