@dittolive/ditto 4.12.4-experimental.sdk-publishing.6 → 4.12.4

package/README.md

@@ -3,10 +3,10 @@
 _Ditto is a cross-platform SDK that allows mobile, web, and IoT apps to sync
 with and even without connectivity._
 
-Version: **4.12.4-experimental.sdk-publishing.6**
+Version: **4.12.4**
 
 For more information please visit [ditto.com](https://ditto.com), as well as the
-[API Reference](https://software.ditto.live/js/Ditto/4.12.4-experimental.sdk-publishing.6/api-reference/) for this particular version.
+[API Reference](https://software.ditto.live/js/Ditto/4.12.4/api-reference/) for this particular version.
 
 ---
 

package/node/ditto.cjs.js

@@ -2393,7 +2393,7 @@ class AttachmentToken {
 
 // NOTE: this is patched up with the actual build version by Jake task
 // build:package and has to be a valid semantic version as defined here: https://semver.org.
-const fullBuildVersionString = '4.12.4-experimental.sdk-publishing.6';
+const fullBuildVersionString = '4.12.4';
 
 //
 // Copyright © 2021 DittoLive Incorporated. All rights reserved.
@@ -7008,7 +7008,7 @@ class TransportConfig {
                 isEnabled: false,
                 interfaceIP: '[::]',
                 port: 80,
-                websocketSync: false,
+                websocketSync: true,
             },
         };
         this.global = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dittolive/ditto",
-  "version": "4.12.4-experimental.sdk-publishing.6",
+  "version": "4.12.4",
   "description": "Ditto is a cross-platform SDK that allows apps to sync with and even without internet connectivity.",
   "homepage": "https://ditto.com",
   "license": "SEE LICENSE IN LICENSE.md",

package/react-native/android/dittoffi/src/dittoffi.h

@@ -1672,16 +1672,6 @@ BoxedCharPtrResult_t
 char *
 /* fn */ ditto_error_message (void);
 
-/** \brief
- *  Retrieves last thread-local error message (used by some synchronous APIs)
- *  and retains ownership of it.
- *
- *  Returns `NULL` if there was no error. A non-null result MUST be freed using
- *  `ditto_c_string_free`.
- */
-char *
-/* fn */ ditto_error_message_peek (void);
-
 /** <No documentation available> */
 typedef struct CIdentityConfig CIdentityConfig_t;
 
@@ -3044,6 +3034,27 @@ char const *
 char const *
 /* fn */ dittoffi_DITTO_DEVELOPMENT_PROVIDER (void);
 
+/** \brief
+ *  Communicate to the allocation tracking machinery that we want allocations to start being
+ *  tracked.
+ *
+ *  In practice, all this means is that the allocation tracker will reset to a default state.
+ *
+ *  If the `alloc-tracking` feature is not enabled then this is a no-op.
+ */
+void
+/* fn */ dittoffi_alloc_tracking_start (void);
+
+/** \brief
+ *  Compare current allocations to an empty (default) snapshot and return any leaks as a string.
+ *
+ *  Returns `None` if no leaks detected.
+ *
+ *  If the `alloc-tracking` feature is not enabled then this is (essentially) a no-op.
+ */
+char *
+/* fn */ dittoffi_alloc_tracking_stop (void);
+
 /** <No documentation available> */
 void
 /* fn */ dittoffi_authentication_register_local_server_backend (

package/react-native/android/dittoffi/src/dittoffi_java.cpp

@@ -939,6 +939,14 @@ SWIGINTERN void SWIG_JavaException(JNIEnv *jenv, int code, const char *msg) {
   {
     return *it;
   }
+
+  // Helper function to extract and take ownership of the string from BoxedCharPtrResult_t
+  // The returned string is freed by the custom typemap above
+  char* take_string_from_BoxedCharPtrResult(BoxedCharPtrResult_t* result) {
+    char* str = result->c_string;
+    result->c_string = NULL;  // Prevent double-free
+    return str;
+  }
 } 
  extern "C" {
   // This apparently no-op functions relies on the out typemap to perform the conversion
@@ -1051,26 +1059,27 @@ static CWriteTransaction_t * Ditto_WriteTransactionHandle_value(CWriteTransactio
 }
 
 
-static char * *new_Ditto_StringHandle(void) { 
-  return new char *(); 
+char ** new_Ditto_StringHandle(void) {
+  return (char **) malloc(sizeof(char *));
 }
 
-static char * *copy_Ditto_StringHandle(char * value) { 
-  return new char *(value); 
+void delete_Ditto_StringHandle(char **obj) {
+  if (obj != NULL) {
+    if (*obj != NULL) {
+      ditto_c_string_free(*obj);  // Free the string itself
+    }
+    free(obj);  // Free the wrapper
+  }
 }
 
-static void delete_Ditto_StringHandle(char * *obj) { 
-  delete obj; 
+char * Ditto_StringHandle_value(char **obj) {
+  return *obj;
 }
 
-static void Ditto_StringHandle_assign(char * *obj, char * value) {
+void Ditto_StringHandle_assign(char **obj, char *value) {
   *obj = value;
 }
 
-static char * Ditto_StringHandle_value(char * *obj) {
-  return *obj;
-}
-
 
 static long long *new_Ditto_LongLongHandle(void) { 
   return new long long(); 
@@ -9297,6 +9306,41 @@ SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Java
 }
 
 
+SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_take_1string_1from_1BoxedCharPtrResult(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jstring jresult = 0 ;
+  BoxedCharPtrResult_t *arg1 = (BoxedCharPtrResult_t *) 0 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(BoxedCharPtrResult_t **)&jarg1; 
+  {
+    try {
+      result = (char *)take_string_from_BoxedCharPtrResult(arg1);
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  {
+    if (result != NULL) {
+      jresult = jenv->NewStringUTF((const char *)result);
+      ditto_c_string_free(result);  // Free the string after converting to Java String
+    } else {
+      jresult = NULL;
+    }
+  }
+  return jresult;
+}
+
+
 SWIGEXPORT jbyteArray JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_JavaOf_1slice_1ref_1uint8_1t(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
   jbyteArray jresult = 0 ;
   slice_ref_uint8_t *arg1 = (slice_ref_uint8_t *) 0 ;
@@ -9872,58 +9916,53 @@ SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Ditt
 }
 
 
-SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_copy_1Ditto_1StringHandle(JNIEnv *jenv, jclass jcls, jstring jarg1) {
-  jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
-  char **result = 0 ;
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1Ditto_1StringHandle(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  char **arg1 = (char **) 0 ;
   
   (void)jenv;
   (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
-    if (!arg1) return 0;
-  }
+  arg1 = *(char ***)&jarg1; 
   {
     try {
-      result = (char **)copy_Ditto_StringHandle(arg1);
+      delete_Ditto_StringHandle(arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
+      return ;
     } catch (const std::exception &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
+      return ;
     } catch (...) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
+      return ;
     }
   }
-  *(char ***)&jresult = result; 
-  if (arg1) jenv->ReleaseStringUTFChars(jarg1, (const char *)arg1);
-  return jresult;
 }
 
 
-SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_delete_1Ditto_1StringHandle(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Ditto_1StringHandle_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  jstring jresult = 0 ;
   char **arg1 = (char **) 0 ;
+  char *result = 0 ;
   
   (void)jenv;
   (void)jcls;
   arg1 = *(char ***)&jarg1; 
   {
     try {
-      delete_Ditto_StringHandle(arg1);
+      result = (char *)Ditto_StringHandle_value(arg1);
     } catch (const std::runtime_error &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (const std::exception &e) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return ;
+      return 0;
     } catch (...) {
       SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return ;
+      return 0;
     }
   }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
 }
 
 
@@ -9957,33 +9996,6 @@ SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Ditto_1Str
 }
 
 
-SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_Ditto_1StringHandle_1value(JNIEnv *jenv, jclass jcls, jlong jarg1) {
-  jstring jresult = 0 ;
-  char **arg1 = (char **) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  arg1 = *(char ***)&jarg1; 
-  {
-    try {
-      result = (char *)Ditto_StringHandle_value(arg1);
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
 SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_new_1Ditto_1LongLongHandle(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
   long long *result = 0 ;
@@ -15565,6 +15577,11 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
     }
   }
   if (result) jresult = jenv->NewStringUTF((const char *)result);
+  {
+    if (result != NULL) {
+      ditto_c_string_free(result);
+    }
+  }
   return jresult;
 }
 
@@ -20093,31 +20110,6 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1
 }
 
 
-SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1error_1message_1peek(JNIEnv *jenv, jclass jcls) {
-  jstring jresult = 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  {
-    try {
-      result = (char *)ditto_error_message_peek();
-    } catch (const std::runtime_error &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (const std::exception &e) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
-      return 0;
-    } catch (...) {
-      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
-      return 0;
-    }
-  }
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
 SWIGEXPORT jlong JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_ditto_1experimental_1make_1with_1passphrase(JNIEnv *jenv, jclass jcls, jstring jarg1, jlong jarg2, jint jarg3, jstring jarg4, jlong jarg5) {
   jlong jresult = 0 ;
   char *arg1 = (char *) 0 ;
@@ -25559,6 +25551,51 @@ SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoff
 }
 
 
+SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1alloc_1tracking_1start(JNIEnv *jenv, jclass jcls) {
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      dittoffi_alloc_tracking_start();
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return ;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return ;
+    }
+  }
+}
+
+
+SWIGEXPORT jstring JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1alloc_1tracking_1stop(JNIEnv *jenv, jclass jcls) {
+  jstring jresult = 0 ;
+  char *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  {
+    try {
+      result = (char *)dittoffi_alloc_tracking_stop();
+    } catch (const std::runtime_error &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (const std::exception &e) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
+      return 0;
+    } catch (...) {
+      SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception");
+      return 0;
+    }
+  }
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
+  return jresult;
+}
+
+
 SWIGEXPORT void JNICALL Java_live_ditto_internal_swig_ffi_dittoffiJNI_dittoffi_1authentication_1register_1local_1server_1backend(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jlong jarg3, jlong jarg4, jlong jarg5, jlong jarg6) {
   CDitto_t *arg1 = (CDitto_t *) 0 ;
   void *arg2 = (void *) 0 ;

package/react-native/android/dittoffi/src/dittostore_java.i

@@ -369,6 +369,18 @@
   }
 }
 
+
+// Custom typemap for take_string_from_BoxedCharPtrResult helper function
+// This properly frees the string after conversion since ownership was transferred
+%typemap(out) char *take_string_from_BoxedCharPtrResult {
+  if ($1 != NULL) {
+    $result = jenv->NewStringUTF((const char *)$1);
+    ditto_c_string_free($1);  // Free the string after converting to Java String
+  } else {
+    $result = NULL;
+  }
+}
+
 %inline %{ extern "C" {
   slice_boxed_uint8_t get_id (
     CAttachment_t const * it)
@@ -382,6 +394,14 @@
   {
     return *it;
   }
+
+  // Helper function to extract and take ownership of the string from BoxedCharPtrResult_t
+  // The returned string is freed by the custom typemap above
+  char* take_string_from_BoxedCharPtrResult(BoxedCharPtrResult_t* result) {
+    char* str = result->c_string;
+    result->c_string = NULL;  // Prevent double-free
+    return str;
+  }
 } %}
 
 // High-level Java type
@@ -479,6 +499,7 @@
 %newobject dittoffi_ditto_absolute_persistence_directory;
 %newobject ditto_sdk_transports_error_description;
 %newobject dittoffi_connection_request_peer_key_string;
+%newobject ditto_auth_client_get_app_id;
 
 // To make it possible (or at least a lot easier) to work with pointers to some
 // of the Ditto_* types we use the `%pointer_functions` directive to provide a
@@ -503,7 +524,30 @@
   CWriteTransaction_t *,
   Ditto_WriteTransactionHandle
 )
-%pointer_functions(char *, Ditto_StringHandle)
+// Custom implementation for Ditto_StringHandle to properly free the string
+%inline %{
+char ** new_Ditto_StringHandle(void) {
+  return (char **) malloc(sizeof(char *));
+}
+
+void delete_Ditto_StringHandle(char **obj) {
+  if (obj != NULL) {
+    if (*obj != NULL) {
+      ditto_c_string_free(*obj);  // Free the string itself
+    }
+    free(obj);  // Free the wrapper
+  }
+}
+
+char * Ditto_StringHandle_value(char **obj) {
+  return *obj;
+}
+
+void Ditto_StringHandle_assign(char **obj, char *value) {
+  *obj = value;
+}
+%}
+
 %pointer_functions(long long, Ditto_LongLongHandle)
 %pointer_functions(uint64_t, Ditto_U64Handle)
 %pointer_functions(bool, Ditto_BoolHandle)