fix: Clean up internal state on reload (#16)

Author: savv

android/cpp-adapter.cpp

@@ -28,8 +28,12 @@ struct QuickSQLiteBridge : jni::JavaClass<QuickSQLiteBridge> {
 
     osp::install(*jsiRuntime, jsCallInvoker, docPathString.c_str());
   }
+
+  static void clearStateNativeJsi() {
+    osp::clearState();
+  }
 };
 
 JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) {
   return jni::initialize(vm, [] { QuickSQLiteBridge::registerNatives(); });
-}
+}

android/src/main/java/com/reactnativequicksqlite/QuickSQLiteBridge.java

@@ -8,6 +8,7 @@
 
 public class QuickSQLiteBridge {
   private native void installNativeJsi(long jsContextNativePointer, CallInvokerHolderImpl jsCallInvokerHolder, String docPath);
+  private native void clearStateNativeJsi();
   public static final QuickSQLiteBridge instance = new QuickSQLiteBridge();
 
   public void install(ReactContext context) {
@@ -21,4 +22,8 @@ public void install(ReactContext context) {
         path
       );
   }
-}
+
+  public void clearState() {
+    clearStateNativeJsi();
+  }
+}

android/src/main/java/com/reactnativequicksqlite/SequelModule.java

@@ -34,4 +34,13 @@ public boolean install() {
       return false;
     }
   }
-}
+
+  @Override
+  public void onCatalystInstanceDestroy() {
+    try {
+      QuickSQLiteBridge.instance.clearState();
+    } catch (Exception exception) {
+      Log.e(NAME, "Failed to clear state!", exception);
+    }
+  }
+}

cpp/bindings.cpp

@@ -17,6 +17,10 @@ namespace osp {
 string docPathStr;
 std::shared_ptr<react::CallInvoker> invoker;
 
+void clearState() {
+  sqliteCloseAll(); 
+}
+
 void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker, const char *docPath)
 {
   docPathStr = std::string(docPath);

cpp/bindings.h

@@ -6,5 +6,6 @@ using namespace facebook;
 
 namespace osp {
 void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker, const char *docPath);
+void clearState();
 }
 

cpp/sqliteBridge.cpp

@@ -121,7 +121,7 @@ SQLiteOPResult sqliteCloseDb(string const dbName)
 
   sqlite3 *db = dbMap[dbName];
 
-  sqlite3_close(db);
+  sqlite3_close_v2(db);
 
   dbMap.erase(dbName);
 
@@ -130,6 +130,15 @@ SQLiteOPResult sqliteCloseDb(string const dbName)
   };
 }
 
+void sqliteCloseAll() {
+  for (auto const& x : dbMap) {
+    // In certain cases, this will return SQLITE_OK, mark the database connection as an unusable "zombie",
+    // and deallocate the connection later.
+    sqlite3_close_v2(x.second);
+  }
+  dbMap.clear();
+}
+
 SQLiteOPResult sqliteAttachDb(string const mainDBName, string const docPath, string const databaseToAttach, string const alias)
 {
   /**

cpp/sqliteBridge.h

@@ -26,3 +26,5 @@ SQLiteOPResult sqliteDetachDb(string const mainDBName, string const alias);
 SQLiteOPResult sqliteExecute(string const dbName, string const &query, vector<QuickValue> *values, vector<map<string, QuickValue>> *result, vector<QuickColumnMetadata> *metadata);
 
 SequelLiteralUpdateResult sqliteExecuteLiteral(string const dbName, string const &query);
+
+void sqliteCloseAll();

ios/QuickSQLite.h

@@ -1,6 +1,7 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTInvalidating.h>
 
-@interface QuickSQLite : NSObject <RCTBridgeModule>
+@interface QuickSQLite : NSObject <RCTBridgeModule, RCTInvalidating>
 
 @property(nonatomic, assign) BOOL setBridgeOnMainQueue;
 

ios/QuickSQLite.mm

@@ -57,4 +57,9 @@ @implementation QuickSQLite
   return @true;
 }
 
+- (void)invalidate {
+  osp::clearState();
+}
+
+
 @end