cleanup code. extend test timeout limit

Author: stevensJourney

.github/workflows/test.yaml

@@ -50,7 +50,7 @@ jobs:
       - name: Configure Test App
         run: |
           cd tests
-          yarn install
+          yarn install --frozen-lockfile
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'

.mtslconfig.json

@@ -1 +1 @@
-{"ignore_dirs":[".git","node_modules","example"]}
+{ "ignore_dirs": [".git", "node_modules", "tests"] }

cpp/ConnectionPool.cpp

@@ -63,7 +63,6 @@ void ConnectionPool::readLock(ConnectionLockId contextId) {
     return writeLock(contextId);
   }
 
-  // Create a new Id for a new lock
   // Check if there are any available read connections
   if (readQueue.size() > 0) {
     // There are already items queued

cpp/bindings.cpp

@@ -46,7 +46,7 @@ void updateTableHandler(void *voidDBName, int opType, char const *dbName,
    */
   invoker->invokeAsync([voidDBName, opType, dbName, tableName, rowId] {
     try {
-      // Sqlite 3 just returns main as the db name is no other DBs are attached
+      // Sqlite 3 just returns main as the db name if no other DBs are attached
       auto global = runtime->global();
       jsi::Function handlerFunction =
           global.getPropertyAsFunction(*runtime, "triggerUpdateHook");
@@ -74,7 +74,6 @@ void contextLockAvailableHandler(std::string dbName,
                                  ConnectionLockId contextId) {
   invoker->invokeAsync([dbName, contextId] {
     try {
-      // Sqlite 3 just returns main as the db name is no other DBs are attached
       auto global = runtime->global();
       jsi::Function handlerFunction =
           global.getPropertyAsFunction(*runtime, "onLockContextIsAvailable");

scripts/dev-package-pre-version.js

@@ -1,7 +1,7 @@
 /**
- * Dev package version like 0.0.0-dev-[hash] seem to cause issues with the podspec
- * This script will remove the -dev-hash from the version.
- * Side Note: Versions above 0.0.0 e.g. 0.0.1-dev-[hash] do work with pod install.
+ * Dev package versions like 0.0.0-dev-[timestamp] seem to cause issues with the podspec
+ * This script will remove the -dev-[timestamp] from the version.
+ * Side Note: Versions above 0.0.0 e.g. 0.0.1-dev-[timestamp] do work with pod install.
  */
 const fs = require('fs');
 const path = require('path');

src/setup-open.ts

@@ -31,7 +31,7 @@ let proxy: ISQLite;
 function closeContextLock(dbName: string, id: ContextLockID) {
   delete LockCallbacks[id];
 
-  // This is configured by the setupConcurrency function
+  // This is configured by the setupOpen function
   proxy.releaseLock(dbName, id);
 }
 
@@ -105,43 +105,35 @@ export function setupOpen(QuickSQLite: ISQLite) {
       ): Promise<T> => {
         const id = uuid.v4(); // TODO maybe do this in C++
         // Wrap the callback in a promise that will resolve to the callback result
-        let resolve: (value: T) => void;
-        let reject: (ex: any) => void;
-
-        const promise = new Promise<T>((res, rej) => {
-          resolve = res;
-          reject = rej;
-        });
-
-        // Add callback to the queue for timing
-        const record = (LockCallbacks[id] = {
-          callback: async (context: LockContext) => {
-            try {
-              const res = await callback(context);
-              resolve(res);
-            } catch (ex) {
-              reject(ex);
+        return new Promise<T>((resolve, reject) => {
+          // Add callback to the queue for timing
+          const record = (LockCallbacks[id] = {
+            callback: async (context: LockContext) => {
+              try {
+                const res = await callback(context);
+                resolve(res);
+              } catch (ex) {
+                reject(ex);
+              }
             }
+          } as LockCallbackRecord);
+
+          try {
+            QuickSQLite.requestLock(dbName, id, type);
+            const timeout = options?.timeoutMs;
+            if (timeout) {
+              record.timeout = setTimeout(() => {
+                // The callback won't be executed
+                delete LockCallbacks[id];
+                reject(new Error(`Lock request timed out after ${timeout}ms`));
+              }, timeout);
+            }
+          } catch (ex) {
+            // Remove callback from the queue
+            delete LockCallbacks[id];
+            reject(ex);
           }
-        } as LockCallbackRecord);
-
-        try {
-          QuickSQLite.requestLock(dbName, id, type);
-          const timeout = options?.timeoutMs;
-          if (timeout) {
-            record.timeout = setTimeout(() => {
-              // The callback won't be executed
-              delete LockCallbacks[id];
-              reject(new Error(`Lock request timed out after ${timeout}ms`));
-            }, timeout);
-          }
-        } catch (ex) {
-          // Remove callback from the queue
-          delete LockCallbacks[id];
-          reject(ex);
-        }
-
-        return promise;
+        });
       };
 
       const readLock = <T>(callback: (context: LockContext) => Promise<T>, options?: LockOptions): Promise<T> =>

tests/scripts/test.js

@@ -12,7 +12,7 @@ const { program } = require('commander');
 
 const DEFAULT_AVD_NAME = 'macOS-avd-x86_64-29';
 const DEFAULT_PORT = 4243;
-const TEST_TIMEOUT = 600_000; // 10 minutes
+const TEST_TIMEOUT = 1_800_000; // 30 minutes
 
 program.name('Test Suite').description('Automates tests for React Native app based tests');