Add timetoken for subscribe_v2_options and fix subscribe v2 types visibility (#229)

feat(cpp): add `timetoken` for `subscribe_v2_options`

Add a field that lets the user specify a timetoken for catch-up or `0` to make
an initial / handshake subscription.

fix: fix types visibility

Fix subscribe v2 types visibility when `USE_SUBSCRIBE_V2` not set.

Author: parfeon

.pubnub.yml

@@ -1,8 +1,15 @@
 name: c-core
 schema: 1
-version: "5.2.0"
+version: "5.3.0"
 scm: github.com/pubnub/c-core
 changelog:
+  - date: 2025-09-02
+    version: v5.3.0
+    changes:
+      - type: feature
+        text: "Add a field that lets the user specify a timetoken for catch-up or `0` to make an initial / handshake subscription."
+      - type: bug
+        text: "Fix subscribe v2 types visibility when `USE_SUBSCRIBE_V2` not set."
   - date: 2025-08-19
     version: v5.2.0
     changes:
@@ -1019,7 +1026,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1085,7 +1092,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1151,7 +1158,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1213,7 +1220,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1274,7 +1281,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1330,7 +1337,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"
@@ -1383,7 +1390,7 @@ sdks:
             distribution-type: source code
             distribution-repository: GitHub release
             package-name: C-Core
-            location: https://github.com/pubnub/c-core/releases/tag/v5.2.0
+            location: https://github.com/pubnub/c-core/releases/tag/v5.3.0
             requires:
               -
                 name: "miniz"

CHANGELOG.md

@@ -1,3 +1,12 @@
+## v5.3.0
+September 02 2025
+
+#### Added
+- Add a field that lets the user specify a timetoken for catch-up or `0` to make an initial / handshake subscription.
+
+#### Fixed
+- Fix subscribe v2 types visibility when `USE_SUBSCRIBE_V2` not set.
+
 ## v5.2.0
 August 19 2025
 

core/pbauto_heartbeat.c

@@ -759,7 +759,9 @@ void pbauto_heartbeat_start_timer(pubnub_t const* pb)
             }
             /*FALLTHRU*/
         case PBTT_SUBSCRIBE:
+#if PUBNUB_USE_SUBSCRIBE_V2
         case PBTT_SUBSCRIBE_V2:
+#endif // #if PUBNUB_USE_SUBSCRIBE_V2
             start_heartbeat_timer(pb->thumperIndex);
             break;
         default:
@@ -828,7 +830,9 @@ void pbauto_heartbeat_transaction_ongoing(pubnub_t const* pb)
             }
             /*FALLTHRU*/
         case PBTT_SUBSCRIBE:
+#if PUBNUB_USE_SUBSCRIBE_V2
         case PBTT_SUBSCRIBE_V2:
+#endif // #if PUBNUB_USE_SUBSCRIBE_V2
             // Ignore implicit heartbeat if "smart heartbeat" is disabled.
             if (!pb->use_smart_heartbeat) return;
 

core/pbcc_event_engine.c

@@ -312,7 +312,7 @@ enum pubnub_res pbcc_ee_handle_event(
     const size_t      count       = pbarray_count(invocations);
     const pbarray_res merge_rslt  = pbarray_merge(ee->invocations, invocations);
     if (PBAR_OK != merge_rslt) {
-        rslt = PBTT_ADD_MEMBERS == merge_rslt
+        rslt = PBAR_OUT_OF_MEMORY == merge_rslt
                    ? PNR_OUT_OF_MEMORY
                    : PNR_INVALID_PARAMETERS;
     }

core/pubnub_version_internal.h

@@ -3,7 +3,7 @@
 #define INC_PUBNUB_VERSION_INTERNAL
 
 
-#define PUBNUB_SDK_VERSION "5.2.0"
+#define PUBNUB_SDK_VERSION "5.3.0"
 
 
 #endif /* !defined INC_PUBNUB_VERSION_INTERNAL */

cpp/pubnub_common.hpp

@@ -238,6 +238,7 @@ class subscribe_v2_options {
     pubnub_subscribe_v2_options d_;
     std::string d_chgrp;
     std::string d_filter_expr;
+    std::string d_timetoken;
 
 public:
     subscribe_v2_options() { d_ = pubnub_subscribe_v2_defopts(); }
@@ -262,6 +263,17 @@ class subscribe_v2_options {
         d_.filter_expr = d_filter_expr.empty() ? 0 : d_filter_expr.c_str();
         return *this;
     }
+    subscribe_v2_options& timetoken(std::string const& timetoken)
+    {
+        d_timetoken          = timetoken;
+        if (d_timetoken.empty()) {
+            d_.timetoken[0] = '\0';
+        } else {
+            std::strncpy(d_.timetoken, d_timetoken.c_str(), sizeof(d_.timetoken) - 1);
+            d_.timetoken[d_timetoken.size()] = '\0';
+        }
+        return *this;
+    }
     pubnub_subscribe_v2_options data() { return d_; }
 };
 #endif /* PUBNUB_USE_SUBSCRIBE_V2 */
@@ -1881,14 +1893,14 @@ class context {
 
     /// Instructs C-core to use system certificate store.
     /// @see pubnub_ssl_use_system_certificate_store
-    int use_system_certificate_store()
+    void use_system_certificate_store()
     {
         pubnub_ssl_use_system_certificate_store(d_pb);
     }
 
     /// Instructs C-core to not use system certificate store.
     /// @see pubnub_ssl_dont_use_system_certificate_store
-    int dont_use_system_certificate_store()
+    void dont_use_system_certificate_store()
     {
         pubnub_ssl_dont_use_system_certificate_store(d_pb);
     }

lib/md5/pbmd5.h

@@ -2,7 +2,6 @@
 #if !defined INC_PBMD5
 #define	INC_PBMD5
 
-
 /** @file pbmd5.h 
 
     This is the internal "MD5" Message Digest API of the Pubnub client
@@ -75,4 +74,4 @@
         MD5_Final((d), &M_ctx);                         \
     } while (0)
 
-#endif /* !defined INC_PBMD5 */
+#endif /* !defined INC_PBMD5 */

make/common/targets_cpp_app_openssl.mk

@@ -29,7 +29,7 @@ $(TARGET_BUILD_PATH)pubnub_sync_revoke_sample$(APP_EXT): \
 	$(COMPILER) $(OUT_FLAG)$@ $(COMPILER_FLAGS) $(CPPFLAGS) $(PREREQUISITES) $(LINK_FLAG) $(LDLIBS)
 
 SYNC_CRYPTO_MODULE_SOURCES_ = \
-    ./cpp/samples/pubnub_crypto_module_sample.cpp \
+    ../cpp/samples/pubnub_crypto_module_sample.cpp \
     $(SOURCE_FILES)                               \
     $(SYNC_SOURCE_FILES)                          \
     $(PUBNUB_FUTRES_SYNC_SOURCE_FILE)

qt/pubnub_qt.cpp

@@ -256,7 +256,9 @@ void pubnub_qt::stop_auto_heartbeat_before_transaction(pubnub_trans transaction)
     switch (transaction) {
     case PBTT_HEARTBEAT:
     case PBTT_SUBSCRIBE:
+#if PUBNUB_USE_SUBSCRIBE_V2
     case PBTT_SUBSCRIBE_V2:
+#endif // #if PUBNUB_USE_SUBSCRIBE_V2
         stop_auto_heartbeat();
         break;
     default:
@@ -274,7 +276,9 @@ void pubnub_qt::start_auto_heartbeat_timer(pubnub_res pbres)
     switch (d_trans) {
     case PBTT_HEARTBEAT:
     case PBTT_SUBSCRIBE:
+#if PUBNUB_USE_SUBSCRIBE_V2
     case PBTT_SUBSCRIBE_V2:
+#endif // #if PUBNUB_USE_SUBSCRIBE_V2
         if (PNR_OK == pbres) {
             d_auto_heartbeatTimer->start(d_auto_heartbeat_period_sec * UNIT_IN_MILLI);
         }
@@ -640,6 +644,7 @@ pubnub_res pubnub_qt::subscribe(QString const& channel, QString const& channel_g
 }
 
 
+#if PUBNUB_USE_SUBSCRIBE_V2
 pubnub_res pubnub_qt::subscribe_v2(QString const& channel, subscribe_v2_options opt)
 {
     QString prep_channels;
@@ -660,6 +665,7 @@ pubnub_res pubnub_qt::subscribe_v2(QString const& channel, subscribe_v2_options
             opt.get_timetoken(),
         PBTT_SUBSCRIBE_V2);
 }
+#endif // #if PUBNUB_USE_SUBSCRIBE_V2
 
 
 pubnub_res pubnub_qt::leave(QString const& channel, QString const& channel_group)