better closing

Author: stevensJourney

cpp/ConnectionPool.cpp

@@ -94,7 +94,14 @@ ConnectionPool::queueInContext(ConnectionLockId contextId,
     };
   }
 
-  state->queueWork(task);
+  try {
+    state->queueWork(task);
+  } catch (const std::exception &e) {
+    return SQLiteOPResult{
+        .errorMessage = e.what(),
+        .type = SQLiteError,
+    };
+  }
 
   return SQLiteOPResult{
       .type = SQLiteOk,

cpp/ConnectionState.cpp

@@ -10,6 +10,7 @@ SQLiteOPResult genericSqliteOpenDb(string const dbName, string const docPath,
 ConnectionState::ConnectionState(const std::string dbName,
                                  const std::string docPath, int SQLFlags) {
   auto result = genericSqliteOpenDb(dbName, docPath, &connection, SQLFlags);
+  isClosed = false;
 
   this->clearLock();
   threadDone = false;
@@ -64,13 +65,18 @@ std::future<void> ConnectionState::refreshSchema() {
 }
 
 void ConnectionState::close() {
+  isClosed = true;
   waitFinished();
   // So that the thread can stop (if not already)
   threadDone = true;
   sqlite3_close_v2(connection);
 }
 
 void ConnectionState::queueWork(std::function<void(sqlite3 *)> task) {
+  if (isClosed) {
+    throw std::runtime_error("Connection is not open. Connection has been closed before queueing work.");
+  }
+
   // Grab the mutex
   std::lock_guard<std::mutex> g(workQueueMutex);
 
@@ -104,9 +110,9 @@ void ConnectionState::doWork() {
       workQueue.pop();
     }
 
-    ++threadBusy;
+    threadBusy = true;
     task(connection);
-    --threadBusy;
+    threadBusy = false;
     // Need to notify in order for waitFinished to be updated when
     // the queue is empty and not busy
     {
@@ -122,7 +128,7 @@ void ConnectionState::waitFinished() {
     return;
   }
   workQueueConditionVariable.wait(
-      g, [&] { return workQueue.empty() && (threadBusy == 0); });
+      g, [&] { return workQueue.empty() && (threadBusy == false); });
 }
 
 SQLiteOPResult genericSqliteOpenDb(string const dbName, string const docPath,

cpp/ConnectionState.h

@@ -29,10 +29,12 @@ class ConnectionState {
   // This condition variable is used for the threads to wait until there is work
   // to do
   std::condition_variable_any workQueueConditionVariable;
-  unsigned int threadBusy;
+  bool threadBusy;
   bool threadDone;
 
 public:
+  bool isClosed;
+
   ConnectionState(const std::string dbName, const std::string docPath,
                   int SQLFlags);
   ~ConnectionState();

cpp/bindings.cpp

@@ -384,7 +384,14 @@ void osp::install(jsi::Runtime &rt,
         }
       };
 
-      sqliteQueueInContext(dbName, contextLockId, task);
+      auto response = sqliteQueueInContext(dbName, contextLockId, task);
+      if (response.type == SQLiteError) {
+        auto errorCtr = rt.global().getPropertyAsFunction(rt, "Error");
+        auto error = errorCtr.callAsConstructor(
+                      rt, jsi::String::createFromUtf8(
+                      rt, response.errorMessage));
+        reject->asObject(rt).asFunction(rt).call(rt, error);
+      }
       return {};
     }));
 

tests/android/build.gradle

@@ -1,5 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+task printEnv() {
+    System.out.println( System.getenv().toString())
+}
+
 buildscript {
     ext {
         buildToolsVersion = findProperty('android.buildToolsVersion') ?: '35.0.0'
@@ -39,3 +43,4 @@ allprojects {
         maven { url 'https://www.jitpack.io' }
     }
 }
+

tests/babel.config.js

@@ -3,6 +3,7 @@ module.exports = function (api) {
   return {
     presets: ['babel-preset-expo'],
     plugins: [
+      '@babel/plugin-transform-class-static-block',
       [
         'module-resolver',
         {

tests/ios/Podfile

@@ -12,6 +12,7 @@ install! 'cocoapods',
   :deterministic_uuids => false
 
 prepare_react_native_project!
+use_modular_headers!
 
 target 'tests' do
   use_expo_modules!

tests/ios/Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
   - boost (1.84.0)
   - DoubleConversion (1.1.6)
-  - EXConstants (17.0.3):
+  - EXConstants (17.0.4):
     - ExpoModulesCore
-  - Expo (52.0.7):
+  - Expo (52.0.27):
     - ExpoModulesCore
-  - ExpoAsset (11.0.1):
+  - ExpoAsset (11.0.2):
     - ExpoModulesCore
-  - ExpoFileSystem (18.0.3):
+  - ExpoFileSystem (18.0.7):
     - ExpoModulesCore
-  - ExpoFont (13.0.1):
+  - ExpoFont (13.0.3):
     - ExpoModulesCore
-  - ExpoKeepAwake (14.0.1):
+  - ExpoKeepAwake (14.0.2):
     - ExpoModulesCore
-  - ExpoModulesCore (2.0.3):
+  - ExpoModulesCore (2.1.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1280,7 +1280,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-quick-sqlite (2.2.1):
+  - react-native-quick-sqlite (2.3.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1809,18 +1809,18 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 1dca942403ed9342f98334bf4c3621f011aa7946
-  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
-  EXConstants: dd2fe64c6cdb1383b694c309a63028a8e9f2be6d
-  Expo: 46cbe74ce0d0f4a4d7b726e90693eb8dfcec6de0
-  ExpoAsset: 8138f2a9ec55ae1ad7c3871448379f7d97692d15
-  ExpoFileSystem: cc31b7a48031ab565f9eb5c2b61aa08d774a271a
-  ExpoFont: 7522d869d84ee2ee8093ee997fef5b86f85d856b
-  ExpoKeepAwake: 783e68647b969b210a786047c3daa7b753dcac1f
-  ExpoModulesCore: 2d1df04dc27f91d8b383c0ec7f1d121e3d9b7f68
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  EXConstants: cc788e18fb962b77999c16f6b90e551542b1bcf4
+  Expo: 7021c4880d0bbd02781e88e213b6786c1200ebdf
+  ExpoAsset: 6cc988c426b5fc997859cc0f8f6728d1376bf53f
+  ExpoFileSystem: a0a5c44d3d3e8a2aa54fe7c70c7690df03cf4dd8
+  ExpoFont: 8b14db1afebf62e9774613a082e402985f4e747c
+  ExpoKeepAwake: 1f74cdf53ab3b3aeb7110f18eb053c92e7c3e710
+  ExpoModulesCore: 52b2f1c87f218a8a6ad2b0cb9d3d238bce3529fb
   ExpoSplashScreen: cb78ad96510786e97b35c1d9014b705cb196b8a3
   FBLazyVector: bc70dcb22ad30ce734a7cce7210791dc737e230f
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
-  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: 3852e37f6158a2fcfad23e31215ed495da3a6a40
   powersync-sqlite-core: 3b1cc184e277776aaf22e221fd0336575c7173c4
   RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
@@ -1852,7 +1852,7 @@ SPEC CHECKSUMS:
   React-logger: 81d58ca6f1d93fca9a770bda6cc1c4fbfcc99c9c
   React-Mapbuffer: 726951e68f4bb1c2513d322f2548798b2a3d628d
   React-microtasksnativemodule: bc55596cbf40957f5099bc495f1a06f459d0be88
-  react-native-quick-sqlite: de5eef2b2092b045d5c546018afd5b6b93843a1b
+  react-native-quick-sqlite: 3fda3ac881a9cc52d32c4553f6c894c0efda4110
   react-native-safe-area-context: 4532f1a0c5d34a46b9324ccaaedcb5582a302b7d
   React-nativeconfig: 470fce6d871c02dc5eff250a362d56391b7f52d6
   React-NativeModulesApple: 6297fc3136c1fd42884795c51d7207de6312b606
@@ -1882,8 +1882,8 @@ SPEC CHECKSUMS:
   ReactCodegen: 93b271af49774429f34d7fd561197020d86436e2
   ReactCommon: 208cb02e3c0bb8a727b3e1a1782202bcfa5d9631
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: 96872ee462cfc43866ad013c8160d4ff6b85709b
+  Yoga: c5b0e913b5b3b4cde588227c1402e747797061f3
 
-PODFILE CHECKSUM: d6c8a5c5ff2d3984a5826e0d3631fd656816f915
+PODFILE CHECKSUM: d4fee3078705a7168879502ec45d504d647dadf3
 
 COCOAPODS: 1.16.2

tests/ios/tests.xcodeproj/project.pbxproj

@@ -261,7 +261,6 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -272,7 +271,6 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -461,7 +459,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -520,7 +521,10 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;

tests/package.json

@@ -13,20 +13,21 @@
     "@craftzdog/react-native-buffer": "^6.0.5",
     "base-64": "^1.0.0",
     "base64-arraybuffer": "^1.0.2",
-    "chai": "^4.3.7",
+    "chai": "^5.1.2",
     "chance": "^1.1.9",
     "events": "^3.3.0",
-    "expo": "^52.0.0",
-    "expo-build-properties": "~0.13.1",
-    "expo-splash-screen": "~0.29.10",
-    "expo-status-bar": "~2.0.0",
+    "expo": "~52.0.26",
+    "expo-build-properties": "~0.13.2",
+    "expo-splash-screen": "~0.29.21",
+    "expo-status-bar": "~2.0.1",
     "lodash": "^4.17.21",
     "mocha": "^10.1.0",
     "nativewind": "^2.0.11",
+    "p-defer": "^4.0.1",
     "react": "18.3.1",
-    "react-native": "0.76.2",
+    "react-native": "0.76.6",
     "react-native-quick-sqlite": "link:..",
-    "react-native-safe-area-context": "4.14.0",
+    "react-native-safe-area-context": "4.12.0",
     "reflect-metadata": "^0.1.13",
     "stream-browserify": "^3.0.0",
     "tailwindcss": "^3.2.4",
@@ -35,15 +36,18 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
     "@react-native-community/cli": "^15.1.2",
-    "@types/chai": "^4.3.4",
+    "@types/chai": "^5.0.1",
+    "@types/chai-as-promised": "^8.0.1",
     "@types/chance": "^1.1.3",
     "@types/express": "^5.0.0",
     "@types/lodash": "^4.17.1",
     "@types/mocha": "^10.0.1",
     "@types/react": "~18.3.12",
     "babel-plugin-module-resolver": "^4.1.0",
     "body-parser": "^1.20.2",
+    "chai-as-promised": "^8.0.1",
     "chalk": "4.1.2",
     "commander": "^11.1.0",
     "express": "^4.21.1",

tests/tests/sqlite/rawQueries.spec.ts

@@ -1,3 +1,5 @@
+import { expect, use } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import Chance from 'chance';
 import {
   BatchedUpdateNotification,
@@ -10,11 +12,10 @@ import {
   UpdateNotification
 } from 'react-native-quick-sqlite';
 import { beforeEach, describe, it } from '../mocha/MochaRNAdapter';
-import chai from 'chai';
-import { randomIntFromInterval, numberName } from './utils';
+import { numberName, randomIntFromInterval } from './utils';
 
-const { expect } = chai;
 const chance = new Chance();
+use(chaiAsPromised);
 
 // Need to store the db on the global state since this variable will be cleared on hot reload,
 // Attempting to open an already open DB results in an error.
@@ -649,5 +650,32 @@ export function registerBaseTests() {
         }
       }
     });
+
+    it('Should handle multiple closes', async () => {
+      // populate test data
+      const dbName = 'test-close';
+      const db = open(dbName);
+      await db.execute('CREATE TABLE IF NOT EXISTS t1(id INTEGER PRIMARY KEY, c TEXT)');
+      await db.execute('DELETE FROM t1');
+      // Bulk insert 50000 rows without using a transaction
+      const bulkInsertCommands: SQLBatchTuple[] = [];
+      for (let i = 0; i < 50000; i++) {
+        bulkInsertCommands.push(['INSERT INTO t1(id, c) VALUES(?, ?)', [i + 1, `value${i + 1}`]]);
+      }
+      await db.executeBatch(bulkInsertCommands);
+      db.close();
+
+      for (let i = 1; i < 1_000; i++) {
+        const db = open(dbName, {
+          numReadConnections: NUM_READ_CONNECTIONS
+        });
+
+        // don't await this on purpose
+        const pExecute = db.execute(`SELECT * FROM t1} `);
+        db.close();
+
+        await expect(pExecute).to.eventually.rejectedWith('is not open');
+      }
+    });
   });
 }

tests/tsconfig.json

@@ -1,4 +1,6 @@
 {
-  "compilerOptions": {},
+  "compilerOptions": {
+    "typeRoots": ["node_modules/@types"]
+  },
   "extends": "expo/tsconfig.base"
 }