Allows empty encryption keys (#350)

* Fixes invalidated module not resolving promises

* Allow empty encryption key

* Fix encryption key

* Fix Cpp

Author: ospfranco

cpp/DBHostObject.cpp

@@ -142,24 +142,21 @@ void DBHostObject::auto_register_update_hook() {
 #ifdef OP_SQLITE_USE_LIBSQL
 // Remote connection constructor
 DBHostObject::DBHostObject(jsi::Runtime &rt, std::string &url,
-                           std::string &auth_token,
-                           std::shared_ptr<react::CallInvoker> invoker)
-    : db_name(url), invoker(std::move(invoker)), rt(rt) {
+                           std::string &auth_token)
+    : db_name(url), rt(rt) {
   _thread_pool = std::make_shared<ThreadPool>();
   db = opsqlite_libsql_open_remote(url, auth_token);
 
   create_jsi_functions();
 }
 
 // Sync connection constructor
-DBHostObject::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,
+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 &remote_encryption_key)
-    : db_name(db_name), invoker(std::move(invoker)), rt(rt) {
+    : db_name(db_name), rt(rt) {
 
   _thread_pool = std::make_shared<ThreadPool>();
 
@@ -173,13 +170,11 @@ DBHostObject::DBHostObject(jsi::Runtime &rt,
 #endif
 
 DBHostObject::DBHostObject(jsi::Runtime &rt, std::string &base_path,
-                           std::shared_ptr<react::CallInvoker> invoker,
                            std::string &db_name, std::string &path,
                            std::string &crsqlite_path,
                            std::string &sqlite_vec_path,
                            std::string &encryption_key)
-    : base_path(base_path), invoker(std::move(invoker)), db_name(db_name),
-      rt(rt) {
+    : base_path(base_path), db_name(db_name), rt(rt) {
   _thread_pool = std::make_shared<ThreadPool>();
 
 #ifdef OP_SQLITE_USE_SQLCIPHER
@@ -617,13 +612,12 @@ void DBHostObject::create_jsi_functions() {
     return jsi::String::createFromUtf8(rt, result);
   });
 
-  function_map["flushPendingReactiveQueries"] =
-      HOSTFN("flushPendingReactiveQueries") {
+  function_map["flushPendingReactiveQueries"] = HFN(this) {
     auto promiseCtr = rt.global().getPropertyAsFunction(rt, "Promise");
-    auto promise = promiseCtr.callAsConstructor(rt, HOSTFN("executor") {
+    auto promise = promiseCtr.callAsConstructor(rt, HFN(this) {
       auto resolve = std::make_shared<jsi::Value>(rt, args[0]);
 
-      auto task = [&rt, this, resolve]() {
+      auto task = [this, resolve]() {
         flush_pending_reactive_queries(resolve);
       };
 

cpp/DBHostObject.h

@@ -44,22 +44,19 @@ struct ReactiveQuery {
 class JSI_EXPORT DBHostObject : public jsi::HostObject {
 public:
   // Normal constructor shared between all backends
-  DBHostObject(jsi::Runtime &rt, std::string &base_path,
-               std::shared_ptr<react::CallInvoker> invoker,
-               std::string &db_name, std::string &path,
-               std::string &crsqlite_path, std::string &sqlite_vec_path,
-               std::string &encryption_key);
+  DBHostObject(jsi::Runtime &rt, std::string &base_path, std::string &db_name,
+               std::string &path, std::string &crsqlite_path,
+               std::string &sqlite_vec_path, std::string &encryption_key);
 
 #ifdef OP_SQLITE_USE_LIBSQL
   // Constructor for remoteOpen, purely for remote databases
-  DBHostObject(jsi::Runtime &rt, std::string &url, std::string &auth_token,
-               std::shared_ptr<react::CallInvoker> invoker);
+  DBHostObject(jsi::Runtime &rt, std::string &url, std::string &auth_token);
 
   // Constructor for a local database with remote sync
-  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 &remote_encryption_key);
+  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 &remote_encryption_key);
 #endif
 
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
@@ -82,7 +79,6 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
 
   std::unordered_map<std::string, jsi::Value> function_map;
   std::string base_path;
-  std::shared_ptr<react::CallInvoker> invoker;
   std::shared_ptr<ThreadPool> _thread_pool;
   std::string db_name;
   std::shared_ptr<jsi::Value> update_hook_callback;

cpp/OPSqlite.cpp

@@ -69,12 +69,6 @@ void install(jsi::Runtime &rt,
           options.getProperty(rt, "encryptionKey").asString(rt).utf8(rt);
     }
 
-#ifdef OP_SQLITE_USE_SQLCIPHER
-    if (encryption_key.empty()) {
-      log_to_console(rt, "Encryption key is missing for SQLCipher");
-    }
-#endif
-
     if (!location.empty()) {
       if (location == ":memory:") {
         path = ":memory:";
@@ -86,8 +80,7 @@ void install(jsi::Runtime &rt,
     }
 
     std::shared_ptr<DBHostObject> db = std::make_shared<DBHostObject>(
-        rt, path, opsqlite::invoker, name, path, _crsqlite_path,
-        _sqlite_vec_path, encryption_key);
+        rt, path, name, path, _crsqlite_path, _sqlite_vec_path, encryption_key);
     dbs.emplace_back(db);
     return jsi::Object::createFromHostObject(rt, db);
   });
@@ -126,7 +119,7 @@ void install(jsi::Runtime &rt,
         options.getProperty(rt, "authToken").asString(rt).utf8(rt);
 
     std::shared_ptr<DBHostObject> db =
-        std::make_shared<DBHostObject>(rt, url, auth_token, invoker);
+        std::make_shared<DBHostObject>(rt, url, auth_token);
 
     return jsi::Object::createFromHostObject(rt, db);
   });
@@ -177,8 +170,8 @@ 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, remote_encryption_key);
+        rt, name, path, url, auth_token, sync_interval, offline, encryption_key,
+        remote_encryption_key);
     return jsi::Object::createFromHostObject(rt, db);
   });
 #endif

example/package.json

@@ -46,7 +46,7 @@
   },
   "op-sqlite": {
     "libsql": false,
-    "sqlcipher": false,
+    "sqlcipher": true,
     "iosSqlite": false,
     "fts5": true,
     "rtree": true,