@op-engineering/op-sqlite 14.1.2 → 14.1.4

package/android/build.gradle

@@ -276,7 +276,7 @@ dependencies {
   implementation 'com.facebook.react:react-native'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   if (useSQLCipher) {
-    implementation('io.github.ronickg:openssl:3.3.2')
+    implementation('io.github.ronickg:openssl:3.3.2-1')
   }
 }
 

package/cpp/DBHostObject.cpp

@@ -157,13 +157,15 @@ DBHostObject::DBHostObject(jsi::Runtime &rt,
                            std::string &db_name, std::string &path,
                            std::string &url, std::string &auth_token,
                            int sync_interval, bool offline,
-                           std::string &encryption_key)
+                           std::string &encryption_key,
+                           std::string &remote_encryption_key)
     : db_name(db_name), invoker(std::move(invoker)), rt(rt) {
 
     _thread_pool = std::make_shared<ThreadPool>();
 
     db = opsqlite_libsql_open_sync(db_name, path, url, auth_token,
-                                   sync_interval, offline, encryption_key);
+                                   sync_interval, offline, encryption_key,
+                                   remote_encryption_key);
 
     create_jsi_functions();
 }

package/cpp/DBHostObject.h

@@ -59,7 +59,8 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
     DBHostObject(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
                  std::string &db_name, std::string &path, std::string &url,
                  std::string &auth_token, int sync_interval, bool offline,
-                 std::string &encryption_key);
+                 std::string &encryption_key,
+                 std::string &remote_encryption_key);
 #endif
 
     std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;

package/cpp/bindings.cpp

@@ -150,6 +150,12 @@ void install(jsi::Runtime &rt,
                 options.getProperty(rt, "encryptionKey").asString(rt).utf8(rt);
         }
 
+        std::string remote_encryption_key;
+        if (options.hasProperty(rt, "remoteEncryptionKey")) {
+            encryption_key =
+                options.getProperty(rt, "remoteEncryptionKey").asString(rt).utf8(rt);
+        }
+
         std::string location;
         if (options.hasProperty(rt, "location")) {
             location =
@@ -166,7 +172,7 @@ void install(jsi::Runtime &rt,
         }
 
         std::shared_ptr<DBHostObject> db = std::make_shared<DBHostObject>(
-            rt, invoker, name, path, url, auth_token, sync_interval, offline, encryption_key);
+            rt, invoker, name, path, url, auth_token, sync_interval, offline, encryption_key, remote_encryption_key);
         return jsi::Object::createFromHostObject(rt, db);
     });
 #endif

package/cpp/bridge.cpp

@@ -850,7 +850,7 @@ opsqlite_execute_batch(sqlite3 *db,
     }
 
     int affectedRows = 0;
-    opsqlite_execute(db, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
+    // opsqlite_execute(db, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
     for (int i = 0; i < commandCount; i++) {
         const auto &command = commands->at(i);
         // We do not provide a datastructure to receive query data because we
@@ -863,7 +863,7 @@ opsqlite_execute_batch(sqlite3 *db,
             throw exc;
         }
     }
-    opsqlite_execute(db, "COMMIT", nullptr);
+    // opsqlite_execute(db, "COMMIT", nullptr);
     return BatchResult{
         .affectedRows = affectedRows,
         .commands = static_cast<int>(commandCount),

package/cpp/libsql/bridge.cpp

@@ -40,7 +40,8 @@ DB opsqlite_libsql_open_sync(std::string const &name,
                              std::string const &base_path,
                              std::string const &url,
                              std::string const &auth_token, int sync_interval,
-                             bool offline, std::string const &encryption_key) {
+                             bool offline, std::string const &encryption_key,
+                             std::string const &remote_encryption_key) {
     std::string path = opsqlite_get_db_path(name, base_path);
 
     int status;
@@ -53,6 +54,7 @@ DB opsqlite_libsql_open_sync(std::string const &name,
                             .auth_token = auth_token.c_str(),
                             .read_your_writes = '1',
                             .encryption_key = encryption_key.c_str(),
+                            .remote_encryption_key = remote_encryption_key.c_str(),
                             .sync_interval = sync_interval,
                             .with_webpki = '1',
                             .offline = offline};
@@ -716,7 +718,7 @@ opsqlite_libsql_execute_batch(DB const &db,
 
     try {
         int affectedRows = 0;
-        opsqlite_libsql_execute(db, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
+        // opsqlite_libsql_execute(db, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
         for (int i = 0; i < commandCount; i++) {
             auto command = commands->at(i);
             // We do not provide a datastructure to receive query data because
@@ -725,13 +727,13 @@ opsqlite_libsql_execute_batch(DB const &db,
                 opsqlite_libsql_execute(db, command.sql, &command.params);
             affectedRows += result.affectedRows;
         }
-        opsqlite_libsql_execute(db, "COMMIT", nullptr);
+        // opsqlite_libsql_execute(db, "COMMIT", nullptr);
         return BatchResult{
             .affectedRows = affectedRows,
             .commands = static_cast<int>(commandCount),
         };
     } catch (std::exception &exc) {
-        opsqlite_libsql_execute(db, "ROLLBACK", nullptr);
+        // opsqlite_libsql_execute(db, "ROLLBACK", nullptr);
         return BatchResult{
             .message = exc.what(),
         };

package/cpp/libsql/bridge.h

@@ -41,7 +41,8 @@ DB opsqlite_libsql_open_remote(std::string const &url,
 DB opsqlite_libsql_open_sync(std::string const &name, std::string const &path,
                              std::string const &url,
                              std::string const &auth_token, int sync_interval,
-                             bool offline, std::string const &encryption_key);
+                             bool offline, std::string const &encryption_key,
+                             std::string const &remote_encryption_key);
 
 void opsqlite_libsql_close(DB &db);
 

package/cpp/libsql/libsql.h

@@ -41,6 +41,7 @@ typedef struct {
   int sync_interval;
   char with_webpki;
   char offline;
+  const char *remote_encryption_key;
 } libsql_config;
 
 typedef const libsql_connection *libsql_connection_t;