Merge pull request #9 from powersync-ja/fix/dependencies

[Fix] Missing dependencies

Author: stevensJourney

.changeset/funny-guests-walk.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/react-native-quick-sqlite': patch
+---
+
+Fixed: Missing dependency for `uuid` and race condition where ommitting `await` on some lock/transaction operations could deadlock the application's main thread.

cpp/ConnectionState.cpp

@@ -92,8 +92,10 @@ void ConnectionState::doWork() {
     ++threadBusy;
     task(connection);
     --threadBusy;
+    // Need to notify in order for waitFinished to be updated when
+    // the queue is empty and not busy
+    workQueueConditionVariable.notify_all();
   }
-  workQueueConditionVariable.notify_all();
 }
 
 void ConnectionState::waitFinished() {

package.json

@@ -81,6 +81,7 @@
     ]
   },
   "dependencies": {
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "uuid": "3.4.0"
   }
 }

tests/App.tsx

@@ -10,19 +10,38 @@ const TEST_SERVER_URL = 'http://localhost:4243/results';
 export default function App() {
   const [results, setResults] = useState<any>([]);
 
-  useEffect(() => {
-    console.log('Running Tests:');
+  const executeTests = React.useCallback(async () => {
     setResults([]);
-    runTests(registerBaseTests).then((results) => {
+
+    try {
+      const results = await runTests(registerBaseTests);
+      console.log(JSON.stringify(results, null, '\t'));
+      setResults(results);
       // Send results to host server
-      fetch(TEST_SERVER_URL, {
+      await fetch(TEST_SERVER_URL, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(results)
       });
-      console.log(JSON.stringify(results, null, '\t'));
-      setResults(results);
-    });
+    } catch (ex) {
+      console.error(ex);
+      // Send results to host server
+      fetch(TEST_SERVER_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify([
+          {
+            description: `Caught exception: ${ex}`,
+            type: 'incorrect'
+          }
+        ])
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    console.log('Running Tests:');
+    executeTests();
   }, []);
 
   return (

tests/tests/mocha/MochaRNAdapter.ts

@@ -5,6 +5,7 @@ export const rootSuite = new Mocha.Suite('') as MochaTypes.Suite;
 rootSuite.timeout(10 * 1000);
 
 let mochaContext = rootSuite;
+
 let only = false;
 
 export const clearTests = () => {
@@ -14,20 +15,18 @@ export const clearTests = () => {
   only = false;
 };
 
-export const it = (
-  name: string,
-  f: MochaTypes.Func | MochaTypes.AsyncFunc,
-): void => {
+export const it = (name: string, f: MochaTypes.Func | MochaTypes.AsyncFunc): void => {
   if (!only) {
-    const test = new Mocha.Test(name, f);
+    const test = new Mocha.Test(name, async () => {
+      console.log(`Running ${name}`);
+      // @ts-ignore
+      return f();
+    });
     mochaContext.addTest(test);
   }
 };
 
-export const itOnly = (
-  name: string,
-  f: MochaTypes.Func | MochaTypes.AsyncFunc,
-): void => {
+export const itOnly = (name: string, f: MochaTypes.Func | MochaTypes.AsyncFunc): void => {
   clearTests();
   const test = new Mocha.Test(name, f);
   mochaContext.addTest(test);
@@ -36,11 +35,9 @@ export const itOnly = (
 
 export const describe = (name: string, f: () => void): void => {
   const prevMochaContext = mochaContext;
-  mochaContext = new Mocha.Suite(
-    name,
-    prevMochaContext.ctx,
-  ) as MochaTypes.Suite;
+  mochaContext = new Mocha.Suite(name, prevMochaContext.ctx) as MochaTypes.Suite;
   prevMochaContext.addSuite(mochaContext);
+  console.log(`Running ${name}`);
   f();
   mochaContext = prevMochaContext;
 };

tests/tests/sqlite/rawQueries.spec.ts

@@ -157,7 +157,7 @@ export function registerBaseTests() {
 
       await db.writeTransaction(async (tx) => {
         await tx.execute('INSERT INTO "User" (id, name, age, networth) VALUES(?, ?, ?, ?)', [id, name, age, networth]);
-        tx.commit();
+        await tx.commit();
       });
 
       const res = await db.execute('SELECT * FROM User');
@@ -176,6 +176,24 @@ export function registerBaseTests() {
 
       await db.writeTransaction(async (tx) => {
         await tx.execute('INSERT INTO "User" (id, name, age, networth) VALUES(?, ?, ?, ?)', [id, name, age, networth]);
+        await tx.rollback();
+      });
+
+      const res = await db.execute('SELECT * FROM User');
+      expect(res.rows?._array).to.eql([]);
+    });
+
+    /**
+     * The lock manager will attempt to free the connection lock
+     * as soon as the callback resolves, but it should also
+     * correctly await any queued work such as tx.rollback();
+     */
+    it('Transaction, manual rollback, forgot await', async () => {
+      const { id, name, age, networth } = generateUserInfo();
+
+      await db.writeTransaction(async (tx) => {
+        await tx.execute('INSERT INTO "User" (id, name, age, networth) VALUES(?, ?, ?, ?)', [id, name, age, networth]);
+        // Purposely forget await to this.
         tx.rollback();
       });
 

tests/yarn.lock

@@ -6017,9 +6017,10 @@ react-native-quick-base64@^2.0.5:
     base64-js "^1.5.1"
 
 react-native-quick-sqlite@./..:
-  version "0.0.1"
+  version "0.1.0"
   dependencies:
     lodash "^4.17.21"
+    uuid "3.4.0"
 
 react-native-safe-area-context@^4.5.0:
   version "4.7.3"
@@ -7127,7 +7128,7 @@ [email protected]:
   resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.3.2, uuid@^3.4.0:
+uuid@3.4.0, uuid@^3.3.2, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

yarn.lock

@@ -6351,6 +6351,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+[email protected]:
+  version "3.4.0"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"