@dittolive/ditto 4.11.2-rc.1 → 4.12.0-experimental-untangle.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dittolive/ditto",
-  "version": "4.11.2-rc.1",
+  "version": "4.12.0-experimental-untangle.0",
   "description": "Ditto is a cross-platform SDK that allows apps to sync with and even without internet connectivity.",
-  "homepage": "https://ditto.live",
+  "homepage": "https://ditto.com",
   "license": "SEE LICENSE IN LICENSE.md",
 
   "author": {
     "name": "DittoLive Incorporated.",
-    "email": "contact@ditto.live",
-    "url": "https://ditto.live"
+    "email": "contact@ditto.com",
+    "url": "https://ditto.com"
   },
 
   "keywords": [

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

@@ -1,3 +1,4 @@
+#include <ctime>
 #ifdef DITTOFFI_EXPERIMENTAL_BUS
 #include <cstring>
 #include <stdexcept>
@@ -21,6 +22,14 @@ extern "C" {
 class PeerPubkeySwig {
   void_const_ptr_2_array_t pubkey;
 
+  const bool is_valid() const noexcept {
+    return pubkey.idx[0] && pubkey.idx[1];
+  }
+  const void invalidate() noexcept {
+    pubkey.idx[0] = nullptr;
+    pubkey.idx[1] = nullptr;
+  }
+
 public:
   explicit PeerPubkeySwig(char const *peer_key_str) noexcept(false)
       : pubkey({}) {
@@ -36,9 +45,23 @@ public:
   explicit PeerPubkeySwig(void_const_ptr_2_array_t key) noexcept
       : pubkey(key) {}
 
-  ~PeerPubkeySwig() noexcept { dittoffi_peer_pubkey_delete(pubkey); }
+  PeerPubkeySwig(PeerPubkeySwig const &other) noexcept : pubkey({}) {
+    if (other.is_valid()) {
+      pubkey = dittoffi_peer_pubkey_clone(&other.pubkey);
+    }
+  }
 
-  std::string to_string() noexcept {
+  ~PeerPubkeySwig() noexcept {
+    if (this->is_valid()) {
+      dittoffi_peer_pubkey_delete(pubkey);
+      invalidate();
+    }
+  }
+
+  std::string to_string() noexcept(false) {
+    if (!this->is_valid()) {
+      throw std::runtime_error("Tried to use destroyed PeerPubkey");
+    }
     auto s = dittoffi_peer_pubkey_to_cstr(&pubkey);
     std::string result((const char *)s.ptr, s.len);
     return result;
@@ -90,6 +113,9 @@ public:
 class BytesSwig {
   Bytes_t bytes;
 
+  bool is_valid() const noexcept { return bytes.vtable != nullptr; }
+  void invalidate() noexcept { bytes.vtable = nullptr; }
+
 public:
   explicit BytesSwig(slice_ref_uint8_t slice) noexcept
       : bytes(dittoffi_bytes_copied_from_slice(slice)) {}
@@ -97,26 +123,32 @@ public:
   explicit BytesSwig(Bytes_t bytes) noexcept : bytes(bytes) {}
 
   BytesSwig(BytesSwig &&other) noexcept : bytes(other.bytes) {
-    other.bytes.vtable = nullptr;
+    other.invalidate();
   }
 
-  BytesSwig(BytesSwig const &other) noexcept
-      : bytes(dittoffi_bytes_clone(&other.bytes)) {}
+  BytesSwig(BytesSwig const &other) noexcept : bytes({}) {
+    if (other.is_valid()) {
+      bytes = dittoffi_bytes_clone(&other.bytes);
+    }
+  }
 
   BytesSwig &operator=(BytesSwig const &other) noexcept = default;
 
   Bytes_t take() noexcept {
     auto result = bytes;
-    bytes.vtable = nullptr;
+    invalidate();
     return result;
   }
 
-  slice_ref_uint8_t data() const noexcept {
-    return {.ptr = bytes.start, .len = bytes.len};
+  slice_ref_uint8_t data() {
+    if (!this->is_valid()) {
+      throw std::runtime_error("Tried to use destroyed Bytes");
+    }
+    return dittoffi_bytes_as_slice(&bytes);
   }
 
   virtual ~BytesSwig() noexcept {
-    if (bytes.vtable != nullptr) {
+    if (this->is_valid()) {
       dittoffi_bytes_drop(&bytes);
     }
   }
@@ -226,7 +258,7 @@ public:
                                       .free = callback->invokeRelease});
   }
 
-  virtual unsigned size_t max_send_size() noexcept {
+  virtual size_t max_send_size() noexcept {
     return stream.inner.vtable.max_send_size(stream.inner.ptr);
   }
 };
@@ -391,7 +423,7 @@ public:
   }
 
   virtual void connect(const char *peer_key_str, const char *topic,
-                       Reliability reliability,
+                       Reliability reliability, bool request_compression,
                        ConnectionResultCallbackSwig *callback) noexcept {
     callback->java_retain();
     slice_ref_uint8_t peer_key_slice = {.ptr = (const uint8_t *)peer_key_str,
@@ -405,7 +437,7 @@ public:
     bus.inner.vtable.connect(bus.inner.ptr, parsed._1,
                              (slice_ref_uint8_t){.ptr = (const uint8_t *)topic,
                                                  .len = strlen(topic)},
-                             reliability,
+                             reliability, request_compression,
                              {.env_ptr = callback,
                               .call = callback->invokeCall,
                               .free = callback->invokeRelease});