Merge pull request #109 from OP-Engineering/fix-reactive-query-de-sub…

…scription Fix de-registration of update hooks
OP-Engineering · Jun 18, 2024 · aa78c93 · aa78c93
2 parents 912df62 + 7ba7f4f
commit aa78c93
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
@@ -17,13 +17,14 @@ namespace react = facebook::react;
 
 #ifndef OP_SQLITE_USE_LIBSQL
 void DBHostObject::auto_register_update_hook() {
-  if (update_hook_callback == nullptr && reactive_queries.size() == 0 &&
-      has_update_hook_registered) {
+  if (update_hook_callback == nullptr && reactive_queries.empty() &&
+      is_update_hook_registered) {
     opsqlite_deregister_update_hook(db_name);
+    is_update_hook_registered = false;
     return;
   }
 
-  if (has_update_hook_registered) {
+  if (is_update_hook_registered) {
     return;
   }
 
@@ -52,7 +53,7 @@ void DBHostObject::auto_register_update_hook() {
             res.setProperty(rt, "operation",
                             jsi::String::createFromUtf8(rt, operation));
             res.setProperty(rt, "rowId", jsi::Value(rowId));
-            if (results->size() != 0) {
+            if (!results->empty()) {
               res.setProperty(
                   rt, "row",
                   jsi::Object::createFromHostObject(
@@ -65,7 +66,7 @@ void DBHostObject::auto_register_update_hook() {
 
     for (const auto &query_ptr : reactive_queries) {
       auto query = query_ptr.get();
-      if (query->discriminators.size() == 0) {
+      if (query->discriminators.empty()) {
         continue;
       }
 
@@ -116,23 +117,16 @@ void DBHostObject::auto_register_update_hook() {
             [this,
              results = std::make_shared<std::vector<DumbHostObject>>(results),
              callback = query->callback, metadata, status = std::move(status)] {
-              if (status.type == SQLiteOk) {
-                auto jsiResult =
-                    createResult(rt, status, results.get(), metadata);
-                callback->asObject(rt).asFunction(rt).call(rt, jsiResult);
-              } else {
-                auto errorCtr = rt.global().getPropertyAsFunction(rt, "Error");
-                auto error = errorCtr.callAsConstructor(
-                    rt, jsi::String::createFromUtf8(rt, status.message));
-                callback->asObject(rt).asFunction(rt).call(rt, error);
-              }
+              auto jsiResult =
+                  createResult(rt, status, results.get(), metadata);
+              callback->asObject(rt).asFunction(rt).call(rt, jsiResult);
             });
       }
     }
   };
 
   opsqlite_register_update_hook(db_name, std::move(hook));
-  has_update_hook_registered = true;
+  is_update_hook_registered = true;
 }
 #endif
 

diff --git a/cpp/DBHostObject.h b/cpp/DBHostObject.h
@@ -66,7 +66,7 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
   std::shared_ptr<jsi::Value> rollback_hook_callback;
   jsi::Runtime &rt;
   std::vector<std::shared_ptr<ReactiveQuery>> reactive_queries;
-  bool has_update_hook_registered = false;
+  bool is_update_hook_registered = false;
 };
 
 } // namespace opsqlite