From 9e7ba05863f31dc198ace2ab536fc9533aff0375 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 07:26:31 -0400
Subject: [PATCH 01/28] Try to launch android emulator and run in-app tests

---
 .github/workflows/ci.yml      |  82 ++++++++++++++++++--
 example/ios/Podfile.lock      |  12 +++
 example/package.json          |   1 +
 example/src/App.tsx           | 140 ++++------------------------------
 scripts/poll-in-app-server.js |  58 ++++++++++++++
 scripts/test-android.sh       |   2 +
 yarn.lock                     |  12 +++
 7 files changed, 178 insertions(+), 129 deletions(-)
 create mode 100644 scripts/poll-in-app-server.js
 create mode 100755 scripts/test-android.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b0ded49..9093808c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,67 @@ jobs:
       - name: Typecheck files
         run: yarn typecheck
 
-  build-android:
+  # build-android:
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     TURBO_CACHE_DIR: .turbo/android
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+
+  #     - name: Turn off addons
+  #       run: |
+  #         node ./scripts/turnOffEverything.js
+
+  #     - name: Setup
+  #       uses: ./.github/actions/setup
+
+  #     - name: Cache turborepo for Android
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ env.TURBO_CACHE_DIR }}
+  #         key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-turborepo-android-
+
+  #     - name: Check turborepo cache for Android
+  #       run: |
+  #         TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
+
+  #         if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
+  #           echo "turbo_cache_hit=1" >> $GITHUB_ENV
+  #         fi
+
+  #     - name: Install JDK
+  #       if: env.turbo_cache_hit != 1
+  #       uses: actions/setup-java@v3
+  #       with:
+  #         distribution: 'zulu'
+  #         java-version: '17'
+
+  #     - name: Finalize Android SDK
+  #       if: env.turbo_cache_hit != 1
+  #       run: |
+  #         /bin/bash -c "yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null"
+
+  #     - name: Cache Gradle
+  #       if: env.turbo_cache_hit != 1
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: |
+  #           ~/.gradle/wrapper
+  #           ~/.gradle/caches
+  #         key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-gradle-
+
+  #     - name: Build example for Android
+  #       env:
+  #         JAVA_OPTS: '-XX:MaxHeapSize=6g'
+  #       run: |
+  #         yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+
+  test-android:
     runs-on: ubuntu-latest
     env:
       TURBO_CACHE_DIR: .turbo/android
@@ -68,11 +128,23 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build example for Android
-        env:
-          JAVA_OPTS: '-XX:MaxHeapSize=6g'
+      - name: Enable KVM
         run: |
-          yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          script: ./scripts test-android.sh
+
+      # - name: Build example for Android
+      #   env:
+      #     JAVA_OPTS: '-XX:MaxHeapSize=6g'
+      #   run: |
+      #     yarn turbo run android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
   build-ios:
     runs-on: macos-latest
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 2d3484ae..0edd4a4e 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -3,6 +3,9 @@ PODS:
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.74.0)
   - fmt (9.1.0)
+  - GCDWebServer (3.5.4):
+    - GCDWebServer/Core (= 3.5.4)
+  - GCDWebServer/Core (3.5.4)
   - glog (0.3.5)
   - hermes-engine (0.74.0):
     - hermes-engine/Pre-built (= 0.74.0)
@@ -939,6 +942,9 @@ PODS:
   - React-Mapbuffer (0.74.0):
     - glog
     - React-debug
+  - react-native-http-bridge-refurbished (1.2.9):
+    - GCDWebServer
+    - React
   - react-native-restart (0.0.27):
     - React-Core
   - React-nativeconfig (0.74.0)
@@ -1206,6 +1212,7 @@ DEPENDENCIES:
   - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
+  - react-native-http-bridge-refurbished (from `../node_modules/react-native-http-bridge-refurbished`)
   - react-native-restart (from `../node_modules/react-native-restart`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -1234,6 +1241,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - GCDWebServer
     - SocketRocket
 
 EXTERNAL SOURCES:
@@ -1300,6 +1308,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   React-Mapbuffer:
     :path: "../node_modules/react-native/ReactCommon"
+  react-native-http-bridge-refurbished:
+    :path: "../node_modules/react-native-http-bridge-refurbished"
   react-native-restart:
     :path: "../node_modules/react-native-restart"
   React-nativeconfig:
@@ -1356,6 +1366,7 @@ SPEC CHECKSUMS:
   DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
   FBLazyVector: 026c8f4ae67b06e088ae01baa2271ef8a26c0e8c
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
+  GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 6eae7edb2f563ee41d7c1f91f4f2e57c26d8a5c3
   op-sqlite: 743e833721d4b4a0af7e7fefbff4375dc2d4e559
@@ -1383,6 +1394,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 36a2bbc272300313653d980de5ab700ec86c534a
   React-logger: 03f2f7b955cfe24593a2b8c9705c23e142d1ad24
   React-Mapbuffer: 5e05d78fe6505f4a054b86f415733d4ad02dd314
+  react-native-http-bridge-refurbished: e2e45508ec1573999ace69a0b880eee8f0e5bab2
   react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
   React-nativeconfig: 951ec32f632e81cbd7d40aebb3211313251c092e
   React-NativeModulesApple: 0b3a42ca90069119ef79d8b2327d01441d71abd4
diff --git a/example/package.json b/example/package.json
index 06480e6f..01ae1291 100644
--- a/example/package.json
+++ b/example/package.json
@@ -21,6 +21,7 @@
     "nativewind": "^2.0.11",
     "react": "18.2.0",
     "react-native": "0.74.0",
+    "react-native-http-bridge-refurbished": "1.2.9",
     "react-native-restart": "^0.0.27",
     "reflect-metadata": "^0.1.13",
     "stream-browserify": "^3.0.0",
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 9204c929..bc688c23 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -1,22 +1,13 @@
-import React, {useEffect, useState} from 'react';
-import {
-  ActivityIndicator,
-  Button,
-  Clipboard,
-  SafeAreaView,
-  ScrollView,
-  Text,
-  View,
-} from 'react-native';
-import 'reflect-metadata';
-import {createLargeDB, queryLargeDB} from './Database';
-import {dbSetupTests, queriesTests, runTests, blobTests} from './tests/index';
+import clsx from 'clsx';
 import {styled} from 'nativewind';
+import {useEffect, useState} from 'react';
+import {SafeAreaView, ScrollView, Text, View} from 'react-native';
+import {BridgeServer} from 'react-native-http-bridge-refurbished';
+import 'reflect-metadata';
+import {constantsTests} from './tests/constants.spec';
 import {registerHooksTests} from './tests/hooks.spec';
-import {moveAssetsDatabase, open} from '@op-engineering/op-sqlite';
-import clsx from 'clsx';
+import {blobTests, dbSetupTests, queriesTests, runTests} from './tests/index';
 import {preparedStatementsTests} from './tests/preparedStatements.spec';
-import {constantsTests} from './tests/constants.spec';
 import {reactiveTests} from './tests/reactive.spec';
 
 const StyledScrollView = styled(ScrollView, {
@@ -26,15 +17,7 @@ const StyledScrollView = styled(ScrollView, {
 });
 
 export default function App() {
-  const [isLoading, setIsLoading] = useState(false);
   const [results, setResults] = useState<any>([]);
-  const [times, setTimes] = useState<number[]>([]);
-  const [accessingTimes, setAccessingTimes] = useState<number[]>([]);
-  const [prepareTimes, setPrepareTimes] = useState<number[]>([]);
-  const [prepareExecutionTimes, setPrepareExecutionTimes] = useState<number[]>(
-    [],
-  );
-  const [rawExecutionTimes, setRawExecutionTimes] = useState<number[]>([]);
   useEffect(() => {
     setResults([]);
     runTests(
@@ -46,48 +29,19 @@ export default function App() {
       constantsTests,
       reactiveTests,
     ).then(setResults);
-  }, []);
 
-  const createLargeDb = async () => {
-    setIsLoading(true);
-    await createLargeDB();
-    setIsLoading(false);
-  };
+    const server = new BridgeServer('http_service', true);
 
-  const queryLargeDb = async () => {
-    try {
-      setIsLoading(true);
-      const times = await queryLargeDB();
-      setTimes(times.loadFromDb);
-      setAccessingTimes(times.access);
-      setPrepareTimes(times.prepare);
-      setPrepareExecutionTimes(times.preparedExecution);
-      setRawExecutionTimes(times.rawExecution);
-    } catch (e) {
-      console.error(e);
-    } finally {
-      setIsLoading(false);
-    }
-  };
+    server.get('/test_results', async (req, res) => {
+      return {results};
+    });
 
-  const copyDbPathToClipboad = async () => {
-    const db = await open({name: 'dbPath.sqlite', encryptionKey: 'test'});
-    db.execute(
-      'CREATE TABLE IF NOT EXISTS test (id INTEGER PRIMARY KEY AUTOINCREMENT)',
-    );
-    const path = db.getDbPath();
-    await db.close();
-    console.warn(path);
-    Clipboard.setString(path);
-  };
+    server.listen(3000);
 
-  const openAssetsDb = async () => {
-    const moved = await moveAssetsDatabase({filename: 'sample.sqlite'});
-    console.log('moved', moved);
-    const db = open({name: 'sample.sqlite'});
-    const users = await db.execute('SELECT * FROM User');
-    console.log('users', users.rows?._array);
-  };
+    return () => {
+      server.stop();
+    };
+  }, []);
 
   let passingTests = 0;
   let failingTests = 0;
@@ -105,68 +59,6 @@ export default function App() {
   return (
     <SafeAreaView className="flex-1 bg-neutral-900">
       <StyledScrollView>
-        <View className="flex-row p-2 bg-neutral-800 items-center">
-          <Text className={'font-bold flex-1 text-white'}>Tools</Text>
-        </View>
-        <Button
-          title="Copy DB Path to clipboard"
-          onPress={copyDbPathToClipboad}
-        />
-        <Button title="Open assets db" onPress={openAssetsDb} />
-        <Button title="Create 300k Record DB" onPress={createLargeDb} />
-        <Button title="Query 300k Records" onPress={queryLargeDb} />
-        {isLoading && <ActivityIndicator color={'white'} size="large" />}
-
-        {!!times.length && (
-          <Text className="text-lg text-white self-center">
-            Normal query{' '}
-            {(times.reduce((acc, t) => (acc += t), 0) / times.length).toFixed(
-              0,
-            )}{' '}
-            ms
-          </Text>
-        )}
-        {!!accessingTimes.length && (
-          <Text className="text-lg text-white self-center">
-            Read property{' '}
-            {(
-              accessingTimes.reduce((acc, t) => (acc += t), 0) /
-              accessingTimes.length
-            ).toFixed(0)}{' '}
-            ms
-          </Text>
-        )}
-        {!!prepareTimes.length && (
-          <Text className="text-lg text-white self-center">
-            Prepare statement{' '}
-            {(
-              prepareTimes.reduce((acc, t) => (acc += t), 0) /
-              prepareTimes.length
-            ).toFixed(0)}{' '}
-            ms
-          </Text>
-        )}
-        {!!prepareExecutionTimes.length && (
-          <Text className="text-lg text-white self-center">
-            Execute prepared query{' '}
-            {(
-              prepareExecutionTimes.reduce((acc, t) => (acc += t), 0) /
-              prepareExecutionTimes.length
-            ).toFixed(0)}{' '}
-            ms
-          </Text>
-        )}
-        {!!rawExecutionTimes.length && (
-          <Text className="text-lg text-white self-center">
-            Raw execution:{' '}
-            {(
-              rawExecutionTimes.reduce((acc, t) => (acc += t), 0) /
-              rawExecutionTimes.length
-            ).toFixed(0)}{' '}
-            ms
-          </Text>
-        )}
-
         <Text
           className={clsx('font-bold flex-1 text-white p-2 mt-4', {
             'bg-green-500': allTestsPassed,
diff --git a/scripts/poll-in-app-server.js b/scripts/poll-in-app-server.js
new file mode 100644
index 00000000..da0c066c
--- /dev/null
+++ b/scripts/poll-in-app-server.js
@@ -0,0 +1,58 @@
+const http = require('http');
+
+async function pollInAppServer() {
+  const startTime = Date.now();
+  const maxDuration = 5 * 60 * 1000; // 5 minutes
+  const pollInterval = 1000; // 1 second
+
+  while (Date.now() - startTime < maxDuration) {
+    try {
+      const response = await makeHttpRequest(
+        'http://localhost:3000/test_results'
+      );
+      if (response !== null) {
+        let parsed_response = JSON.parse(response);
+        const allTestsPassed = parsed_response.results.reduce((acc, r) => {
+          return acc && r.type !== 'incorrect';
+        }, true);
+
+        if (allTestsPassed) {
+          console.log('🟢🟢🟢🟢🟢 All tests passed!');
+          process.exit(0);
+        } else {
+          console.log('Some tests failed');
+          process.exit(1);
+        }
+      }
+    } catch (error) {
+      console.error('Error occurred during polling:', error);
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, pollInterval));
+  }
+
+  console.error('Polling failed after 5 minutes');
+  process.exit(1);
+}
+
+function makeHttpRequest(url) {
+  return new Promise((resolve, reject) => {
+    http
+      .get(url, (res) => {
+        let data = '';
+
+        res.on('data', (chunk) => {
+          data += chunk;
+        });
+
+        res.on('end', () => {
+          resolve(data);
+        });
+      })
+      .on('error', (error) => {
+        reject(error);
+      });
+  });
+}
+
+pollInAppServer();
diff --git a/scripts/test-android.sh b/scripts/test-android.sh
new file mode 100755
index 00000000..7ad1cffe
--- /dev/null
+++ b/scripts/test-android.sh
@@ -0,0 +1,2 @@
+JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+node ./scripts/poll-in-app-server.js
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 73c087c6..9dcd03d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10366,6 +10366,7 @@ __metadata:
     react: "npm:18.2.0"
     react-native: "npm:0.74.0"
     react-native-builder-bob: "npm:^0.30.0"
+    react-native-http-bridge-refurbished: "npm:1.2.9"
     react-native-restart: "npm:^0.0.27"
     react-test-renderer: "npm:18.2.0"
     reflect-metadata: "npm:^0.1.13"
@@ -11026,6 +11027,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-native-http-bridge-refurbished@npm:1.2.9":
+  version: 1.2.9
+  resolution: "react-native-http-bridge-refurbished@npm:1.2.9"
+  dependencies:
+    react: "npm:18.2.0"
+  peerDependencies:
+    react-native: ">=0.72"
+  checksum: 10c0/50d77f2991a2ff7d38a17b59f1f9943f9637be9abd68ba34cc4fe744bcaa7a69e00e728b74bd5905b84fdc870b701388c85c7f27a9aaff17606521df362c8dbf
+  languageName: node
+  linkType: hard
+
 "react-native-quick-base64@npm:^2.0.5":
   version: 2.1.1
   resolution: "react-native-quick-base64@npm:2.1.1"

From 195cb02fd05bf266dc828c491753cfb80cf2aa7f Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 07:34:52 -0400
Subject: [PATCH 02/28] Update actions

---
 .github/workflows/ci.yml          |   3 +
 example/src/App.tsx               |   2 +-
 example/src/Database.ts           |   8 +--
 example/src/UpdateHook.tsx        | 100 ------------------------------
 example/src/tests/queries.spec.ts |   2 +-
 src/index.ts                      |  17 +++++
 6 files changed, 26 insertions(+), 106 deletions(-)
 delete mode 100644 example/src/UpdateHook.tsx

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9093808c..b68198ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -134,6 +134,9 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
+      - name: Give execute permissions to script
+        run: chmod +x ./scripts/test-android.sh
+
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
diff --git a/example/src/App.tsx b/example/src/App.tsx
index bc688c23..5069cb4d 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -32,7 +32,7 @@ export default function App() {
 
     const server = new BridgeServer('http_service', true);
 
-    server.get('/test_results', async (req, res) => {
+    server.get('/test_results', async (_req, _res) => {
       return {results};
     });
 
diff --git a/example/src/Database.ts b/example/src/Database.ts
index b822d1ae..4212c5eb 100644
--- a/example/src/Database.ts
+++ b/example/src/Database.ts
@@ -44,7 +44,7 @@ export async function createLargeDB() {
     ]);
   }
 
-  await largeDb.executeBatchAsync(insertions);
+  await largeDb.executeBatch(insertions);
 
   largeDb.close();
 }
@@ -52,7 +52,7 @@ export async function createLargeDB() {
 export async function querySingleRecordOnLargeDB() {
   let largeDb = open(DB_CONFIG);
 
-  await largeDb.executeAsync('SELECT * FROM "Test" LIMIT 1;');
+  await largeDb.execute('SELECT * FROM "Test" LIMIT 1;');
 }
 
 export async function queryLargeDB() {
@@ -79,7 +79,7 @@ export async function queryLargeDB() {
     global.gc();
 
     // let start = performance.now();
-    await largeDb.executeAsync('SELECT * FROM Test;');
+    await largeDb.execute('SELECT * FROM Test;');
     // let end = performance.now();
     // times.loadFromDb.push(end - start);
 
@@ -93,7 +93,7 @@ export async function queryLargeDB() {
     // end = performance.now();
 
     // start = performance.now();
-    await largeDb.executeRawAsync('SELECT * FROM Test;');
+    await largeDb.executeRaw('SELECT * FROM Test;');
     // end = performance.now();
     // times.rawExecution.push(end - start);
 
diff --git a/example/src/UpdateHook.tsx b/example/src/UpdateHook.tsx
deleted file mode 100644
index 8fb6653f..00000000
--- a/example/src/UpdateHook.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, {
-  useEffect,
-  useState,
-  createContext,
-  useContext,
-  useRef,
-} from 'react';
-import {ActivityIndicator, Text, View} from 'react-native';
-import {type DB, open} from '@op-engineering/op-sqlite';
-
-interface IDbContext {
-  db: DB;
-}
-
-const DbContext = createContext<IDbContext | null>(null);
-
-const UpdateHookPage = () => {
-  const [loading, setLoading] = useState(true);
-  const dbRef = useRef<DB>();
-
-  useEffect(() => {
-    function setup() {
-      const db = open({name: 'updatehook_test.db'});
-      db.updateHook(({table, operation}) => {
-        console.log('updateHook', table, operation);
-      });
-
-      db.execute('DROP TABLE IF EXISTS updatehook_example');
-      db.execute(
-        'CREATE TABLE updatehook_example (id INTEGER PRIMARY KEY, description TEXT, qty INTEGER, price REAL)',
-      );
-      db.execute(
-        'INSERT INTO updatehook_example (description, qty, price) VALUES (?, ?, ?)',
-        ['Pretzels', 1, 5.5],
-      );
-      db.execute(
-        'INSERT INTO updatehook_example (description, qty, price) VALUES (?, ?, ?)',
-        ['Chips', 1, 2.25],
-      );
-
-      dbRef.current = db;
-      setLoading(false);
-    }
-    function teardown() {
-      dbRef.current?.close();
-      dbRef.current = undefined;
-      setLoading(true);
-    }
-
-    setup();
-
-    return () => {
-      teardown();
-    };
-  }, []);
-
-  if (!dbRef.current || loading) {
-    return <ActivityIndicator />;
-  }
-
-  return (
-    <DbContext.Provider
-      value={{
-        db: dbRef.current!,
-      }}>
-      <UpdateHookExample />
-    </DbContext.Provider>
-  );
-};
-
-export default UpdateHookPage;
-
-export function useDbContext() {
-  const context = useContext(DbContext);
-  if (context == null) {
-    throw new Error('DbContext.Provider is missing from the component tree');
-  }
-  return context;
-}
-
-function UpdateHookExample() {
-  const {db} = useDbContext();
-
-  const rows =
-    db.execute('SELECT * FROM updatehook_example').rows?._array ?? [];
-
-  return (
-    <View>
-      <Text>Update Hook Crash</Text>
-      <Text>"Reload" the app to cause it to crash.</Text>
-      <View>
-        {rows.map((row, i) => (
-          <Text key={i}>
-            {row.description} {row.qty} {row.price}
-          </Text>
-        ))}
-      </View>
-    </View>
-  );
-}
diff --git a/example/src/tests/queries.spec.ts b/example/src/tests/queries.spec.ts
index 38cd29d4..45000e37 100644
--- a/example/src/tests/queries.spec.ts
+++ b/example/src/tests/queries.spec.ts
@@ -7,7 +7,7 @@ import {
   type DB,
   type SQLBatchTuple,
 } from '@op-engineering/op-sqlite';
-import {beforeEach, describe, it, itOnly} from './MochaRNAdapter';
+import {beforeEach, describe, it} from './MochaRNAdapter';
 import chai from 'chai';
 
 const expect = chai.expect;
diff --git a/src/index.ts b/src/index.ts
index d4f7632f..73ef1fe5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -454,6 +454,23 @@ function enhanceDB(db: DB, options: any): DB {
   return enhancedDb;
 }
 
+export const openSync = (options: {
+  url: string;
+  authToken: string;
+  name: string;
+  location?: string;
+  syncInterval?: number;
+}): DB => {
+  if (!isLibsql()) {
+    throw new Error('This function is only available for libsql');
+  }
+
+  const db = OPSQLite.openSync(options);
+  const enhancedDb = enhanceDB(db, options);
+
+  return enhancedDb;
+};
+
 export const openRemote = (options: { url: string; authToken: string }): DB => {
   if (!isLibsql()) {
     throw new Error('This function is only available for libsql');

From 5534d558ac98bc5fe88ddb5da9f8e9be067b3da4 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 07:37:34 -0400
Subject: [PATCH 03/28] Update actions

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b68198ad..929f57d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -141,7 +141,7 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 29
-          script: ./scripts test-android.sh
+          script: ./scripts/test-android.sh
 
       # - name: Build example for Android
       #   env:

From 4b44026fa82578fe86a64601c056afc29b6358ce Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 07:46:30 -0400
Subject: [PATCH 04/28] Update actions

---
 .turbo/cookies/1.cookie                         |  0
 .turbo/cookies/2.cookie                         |  0
 .../e74d1fd906537e8f-turbo.log.2024-09-08       |  0
 example/.turbo/turbo-android.log                | 11 +++++++++++
 example/.turbo/turbo-build$colon$android.log    |  2 ++
 scripts/test-android.sh                         |  2 +-
 turbo.json                                      | 17 ++++++++++++++++-
 7 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 .turbo/cookies/1.cookie
 create mode 100644 .turbo/cookies/2.cookie
 create mode 100644 .turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08
 create mode 100644 example/.turbo/turbo-android.log
 create mode 100644 example/.turbo/turbo-build$colon$android.log

diff --git a/.turbo/cookies/1.cookie b/.turbo/cookies/1.cookie
new file mode 100644
index 00000000..e69de29b
diff --git a/.turbo/cookies/2.cookie b/.turbo/cookies/2.cookie
new file mode 100644
index 00000000..e69de29b
diff --git a/.turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08 b/.turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08
new file mode 100644
index 00000000..e69de29b
diff --git a/example/.turbo/turbo-android.log b/example/.turbo/turbo-android.log
new file mode 100644
index 00000000..c783c7cd
--- /dev/null
+++ b/example/.turbo/turbo-android.log
@@ -0,0 +1,11 @@
+info A dev server is already running for this project on port 8081.
+* daemon not running; starting now at tcp:5037
+* daemon started successfully
+info Launching emulator...
+error Failed to launch emulator. Reason: The emulator (INFO    | Storing crashdata in: /tmp/android-osp/emu-crash-34.2.15.db, detection is enabled for process: 47155) quit before it finished opening. You can try starting the emulator manually from the terminal with: /Users/osp/Library/Android/sdk/emulator/emulator @INFO    | Storing crashdata in: /tmp/android-osp/emu-crash-34.2.15.db, detection is enabled for process: 47155.
+warn Please launch an emulator manually or connect a device. Otherwise app may fail to launch.
+info Installing the app...
+Starting a Gradle Daemon (subsequent builds will be faster)
+
+
+> Starting Daemon> IDLE<-------------> 0% INITIALIZING [63ms]<-------------> 0% INITIALIZING [167ms]<-------------> 0% INITIALIZING [266ms]> Evaluating settings<-------------> 0% INITIALIZING [363ms]<-------------> 0% INITIALIZING [468ms]<-------------> 0% INITIALIZING [563ms]<-------------> 0% INITIALIZING [667ms]<-------------> 0% INITIALIZING [768ms]<-------------> 0% INITIALIZING [868ms]<-------------> 0% INITIALIZING [968ms]<-------------> 0% INITIALIZING [1s]> Evaluating settings > Resolve dependencies of detachedConfiguration1> Evaluating settings<-------------> 0% INITIALIZING [2s][?12l[?25h
diff --git a/example/.turbo/turbo-build$colon$android.log b/example/.turbo/turbo-build$colon$android.log
new file mode 100644
index 00000000..378bd13a
--- /dev/null
+++ b/example/.turbo/turbo-build$colon$android.log
@@ -0,0 +1,2 @@
+To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/8.6/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation.
+[?12l[?25h
diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 7ad1cffe..725060dd 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,2 +1,2 @@
-JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run android --cache-dir=.turbo/android
 node ./scripts/poll-in-app-server.js
\ No newline at end of file
diff --git a/turbo.json b/turbo.json
index b3e6acb3..48e7477b 100644
--- a/turbo.json
+++ b/turbo.json
@@ -16,6 +16,21 @@
       ],
       "outputs": []
     },
+    "android": {
+      "inputs": [
+        "package.json",
+        "android",
+        "!android/build",
+        "src/*.ts",
+        "src/*.tsx",
+        "example/package.json",
+        "example/android",
+        "!example/android/.gradle",
+        "!example/android/build",
+        "!example/android/app/build"
+      ],
+      "outputs": []
+    },
     "build:ios": {
       "inputs": [
         "package.json",
@@ -31,4 +46,4 @@
       "outputs": []
     }
   }
-}
\ No newline at end of file
+}

From ae4ec9db4c935da8f9dcff611fde64895768b8f7 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 08:26:15 -0400
Subject: [PATCH 05/28] Update CI

---
 .turbo/cookies/1.cookie                             |  0
 .turbo/cookies/2.cookie                             |  0
 .turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08 |  0
 android/build.gradle                                |  8 ++++++++
 example/.turbo/turbo-android.log                    | 11 -----------
 example/.turbo/turbo-build$colon$android.log        |  2 --
 example/package.json                                |  1 +
 turbo.json                                          |  2 +-
 8 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 .turbo/cookies/1.cookie
 delete mode 100644 .turbo/cookies/2.cookie
 delete mode 100644 .turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08
 delete mode 100644 example/.turbo/turbo-android.log
 delete mode 100644 example/.turbo/turbo-build$colon$android.log

diff --git a/.turbo/cookies/1.cookie b/.turbo/cookies/1.cookie
deleted file mode 100644
index e69de29b..00000000
diff --git a/.turbo/cookies/2.cookie b/.turbo/cookies/2.cookie
deleted file mode 100644
index e69de29b..00000000
diff --git a/.turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08 b/.turbo/daemon/e74d1fd906537e8f-turbo.log.2024-09-08
deleted file mode 100644
index e69de29b..00000000
diff --git a/android/build.gradle b/android/build.gradle
index 59b472ef..cc90c9c4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -214,4 +214,12 @@ tasks.whenTaskAdded { task ->
       task.dependsOn(it)
     }
   }
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "opsqlite"
+    codegenJavaPackageName = "com.op.sqlite.example"
+  }
 }
\ No newline at end of file
diff --git a/example/.turbo/turbo-android.log b/example/.turbo/turbo-android.log
deleted file mode 100644
index c783c7cd..00000000
--- a/example/.turbo/turbo-android.log
+++ /dev/null
@@ -1,11 +0,0 @@
-info A dev server is already running for this project on port 8081.
-* daemon not running; starting now at tcp:5037
-* daemon started successfully
-info Launching emulator...
-error Failed to launch emulator. Reason: The emulator (INFO    | Storing crashdata in: /tmp/android-osp/emu-crash-34.2.15.db, detection is enabled for process: 47155) quit before it finished opening. You can try starting the emulator manually from the terminal with: /Users/osp/Library/Android/sdk/emulator/emulator @INFO    | Storing crashdata in: /tmp/android-osp/emu-crash-34.2.15.db, detection is enabled for process: 47155.
-warn Please launch an emulator manually or connect a device. Otherwise app may fail to launch.
-info Installing the app...
-Starting a Gradle Daemon (subsequent builds will be faster)
-
-
-> Starting Daemon> IDLE<-------------> 0% INITIALIZING [63ms]<-------------> 0% INITIALIZING [167ms]<-------------> 0% INITIALIZING [266ms]> Evaluating settings<-------------> 0% INITIALIZING [363ms]<-------------> 0% INITIALIZING [468ms]<-------------> 0% INITIALIZING [563ms]<-------------> 0% INITIALIZING [667ms]<-------------> 0% INITIALIZING [768ms]<-------------> 0% INITIALIZING [868ms]<-------------> 0% INITIALIZING [968ms]<-------------> 0% INITIALIZING [1s]> Evaluating settings > Resolve dependencies of detachedConfiguration1> Evaluating settings<-------------> 0% INITIALIZING [2s][?12l[?25h
diff --git a/example/.turbo/turbo-build$colon$android.log b/example/.turbo/turbo-build$colon$android.log
deleted file mode 100644
index 378bd13a..00000000
--- a/example/.turbo/turbo-build$colon$android.log
+++ /dev/null
@@ -1,2 +0,0 @@
-To honour the JVM settings for this build a single-use Daemon process will be forked. For more on this, please refer to https://docs.gradle.org/8.6/userguide/gradle_daemon.html#sec:disabling_the_daemon in the Gradle documentation.
-[?12l[?25h
diff --git a/example/package.json b/example/package.json
index 01ae1291..4e7693d9 100644
--- a/example/package.json
+++ b/example/package.json
@@ -8,6 +8,7 @@
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
+    "run:android:release": "cd android && ./gradlew assembleRelease && adb install -r app/build/outputs/apk/release/app-release.apk && adb shell am start -n com.op.sqlite.example/.MainActivity",
     "build:android": "cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
     "build:ios": "cd ios && xcodebuild -workspace OPSQLiteExample.xcworkspace -scheme debug -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
   },
diff --git a/turbo.json b/turbo.json
index 48e7477b..7e39912c 100644
--- a/turbo.json
+++ b/turbo.json
@@ -16,7 +16,7 @@
       ],
       "outputs": []
     },
-    "android": {
+    "run:android:release": {
       "inputs": [
         "package.json",
         "android",

From c62628522d00a7734c42fbe6b9341ca3d9221fed Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 08:28:13 -0400
Subject: [PATCH 06/28] Update CI

---
 scripts/test-android.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 725060dd..33a6bf19 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,2 +1,2 @@
-JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run android --cache-dir=.turbo/android
+JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android
 node ./scripts/poll-in-app-server.js
\ No newline at end of file

From 9a25409ad4bef302f0ab5c6339b21be6a2512e83 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 08:41:41 -0400
Subject: [PATCH 07/28] Update actions

---
 example/src/App.tsx           | 2 +-
 scripts/poll-in-app-server.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/src/App.tsx b/example/src/App.tsx
index 5069cb4d..20a2ba15 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -36,7 +36,7 @@ export default function App() {
       return {results};
     });
 
-    server.listen(3000);
+    server.listen(10424);
 
     return () => {
       server.stop();
diff --git a/scripts/poll-in-app-server.js b/scripts/poll-in-app-server.js
index da0c066c..c3b1ea64 100644
--- a/scripts/poll-in-app-server.js
+++ b/scripts/poll-in-app-server.js
@@ -8,7 +8,7 @@ async function pollInAppServer() {
   while (Date.now() - startTime < maxDuration) {
     try {
       const response = await makeHttpRequest(
-        'http://localhost:3000/test_results'
+        'http://localhost:10424/test_results'
       );
       if (response !== null) {
         let parsed_response = JSON.parse(response);

From 5d7770ecb2f419a2b75d729c311c48c369716d37 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 09:06:26 -0400
Subject: [PATCH 08/28] Update actions

---
 scripts/poll-in-app-server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/poll-in-app-server.js b/scripts/poll-in-app-server.js
index c3b1ea64..2aaf8ea9 100644
--- a/scripts/poll-in-app-server.js
+++ b/scripts/poll-in-app-server.js
@@ -8,7 +8,7 @@ async function pollInAppServer() {
   while (Date.now() - startTime < maxDuration) {
     try {
       const response = await makeHttpRequest(
-        'http://localhost:10424/test_results'
+        'http://127.0.0.1:10424/test_results'
       );
       if (response !== null) {
         let parsed_response = JSON.parse(response);

From b2806be94e0b875aca7f264562aa754d3b87f308 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 09:39:44 -0400
Subject: [PATCH 09/28] Update actions

---
 scripts/test-android.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 33a6bf19..810ac389 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,2 +1,3 @@
 JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android
+adb reverse tcp:10424 tcp:10424
 node ./scripts/poll-in-app-server.js
\ No newline at end of file

From 34cecc39e84c898c2a8be34c878b65ba76e3f2a7 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 09:52:26 -0400
Subject: [PATCH 10/28] Update actions

---
 scripts/test-android.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 810ac389..612ae1bd 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,3 +1,6 @@
 JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android
 adb reverse tcp:10424 tcp:10424
+echo "🟦 Android device address:"
+adb shell ip addr show
+echo "Polling in-app server..."
 node ./scripts/poll-in-app-server.js
\ No newline at end of file

From b4558d30c1682aa3808ca084a0d92f2c6686feca Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 10:12:27 -0400
Subject: [PATCH 11/28] Update actions

---
 .github/workflows/ci.yml |  6 +++++-
 example/src/App.tsx      | 11 ++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 929f57d8..a53993af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -141,7 +141,11 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 29
-          script: ./scripts/test-android.sh
+          emulator-options: -no-window -no-boot-anim -no-audio -no-snapshot-load
+          script: |
+            adb wait-for-device
+            adb shell input keyevent 82
+            ./scripts/test-android.sh
 
       # - name: Build example for Android
       #   env:
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 20a2ba15..7bbc13ce 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -1,5 +1,4 @@
 import clsx from 'clsx';
-import {styled} from 'nativewind';
 import {useEffect, useState} from 'react';
 import {SafeAreaView, ScrollView, Text, View} from 'react-native';
 import {BridgeServer} from 'react-native-http-bridge-refurbished';
@@ -10,12 +9,6 @@ import {blobTests, dbSetupTests, queriesTests, runTests} from './tests/index';
 import {preparedStatementsTests} from './tests/preparedStatements.spec';
 import {reactiveTests} from './tests/reactive.spec';
 
-const StyledScrollView = styled(ScrollView, {
-  props: {
-    contentContainerStyle: true,
-  },
-});
-
 export default function App() {
   const [results, setResults] = useState<any>([]);
   useEffect(() => {
@@ -58,7 +51,7 @@ export default function App() {
 
   return (
     <SafeAreaView className="flex-1 bg-neutral-900">
-      <StyledScrollView>
+      <ScrollView>
         <Text
           className={clsx('font-bold flex-1 text-white p-2 mt-4', {
             'bg-green-500': allTestsPassed,
@@ -108,7 +101,7 @@ export default function App() {
               </View>
             );
           })}
-      </StyledScrollView>
+      </ScrollView>
     </SafeAreaView>
   );
 }

From fc502196497bbb1a6b290abc29d1de1cd1a2c149 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 11:36:04 -0400
Subject: [PATCH 12/28] Update

---
 .../android/app/src/main/AndroidManifest.xml  |  1 +
 .../main/res/xml/network_security_config.xml  |  6 ++++
 example/src/App.tsx                           | 16 ++++-----
 example/src/server.ts                         | 36 +++++++++++++++++++
 scripts/poll-in-app-server.js                 |  5 ++-
 scripts/test-android.sh                       |  6 ++--
 6 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 example/android/app/src/main/res/xml/network_security_config.xml
 create mode 100644 example/src/server.ts

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 4122f36a..18087e82 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+      android:usesCleartextTraffic="true" 
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
diff --git a/example/android/app/src/main/res/xml/network_security_config.xml b/example/android/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..135200bb
--- /dev/null
+++ b/example/android/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">10.0.2.2</domain>
+        <domain includeSubdomains="true">127.0.0.1</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 7bbc13ce..90eff776 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -1,18 +1,17 @@
 import clsx from 'clsx';
 import {useEffect, useState} from 'react';
 import {SafeAreaView, ScrollView, Text, View} from 'react-native';
-import {BridgeServer} from 'react-native-http-bridge-refurbished';
 import 'reflect-metadata';
 import {constantsTests} from './tests/constants.spec';
 import {registerHooksTests} from './tests/hooks.spec';
 import {blobTests, dbSetupTests, queriesTests, runTests} from './tests/index';
 import {preparedStatementsTests} from './tests/preparedStatements.spec';
 import {reactiveTests} from './tests/reactive.spec';
+import {setServerResults, startServer, stopServer} from './server';
 
 export default function App() {
   const [results, setResults] = useState<any>([]);
   useEffect(() => {
-    setResults([]);
     runTests(
       dbSetupTests,
       queriesTests,
@@ -21,18 +20,15 @@ export default function App() {
       preparedStatementsTests,
       constantsTests,
       reactiveTests,
-    ).then(setResults);
-
-    const server = new BridgeServer('http_service', true);
-
-    server.get('/test_results', async (_req, _res) => {
-      return {results};
+    ).then(results => {
+      setServerResults(results as any);
+      setResults(results);
     });
 
-    server.listen(10424);
+    startServer();
 
     return () => {
-      server.stop();
+      stopServer();
     };
   }, []);
 
diff --git a/example/src/server.ts b/example/src/server.ts
new file mode 100644
index 00000000..dd0e3b5b
--- /dev/null
+++ b/example/src/server.ts
@@ -0,0 +1,36 @@
+import {BridgeServer} from 'react-native-http-bridge-refurbished';
+let results: any[] = [];
+
+const server = new BridgeServer('http_service', true);
+
+server.get('/ping', async (_req, _res) => {
+  console.log("🟦 🟦🟦🟦🟦🟦🟦 🟦 Received request for '/ping'");
+  return {message: 'pong'};
+});
+
+server.get('/results', async (req, _res) => {
+  // console.log("🟦 🟦🟦🟦🟦🟦🟦 🟦 Received request for '/test_results'");
+  // console.log(req.type);
+  // console.log(req.data);
+  // console.log(req.url);
+  // if (results.length > 0) {
+  //   return {results};
+  // } else {
+  //   return {};
+  // }
+  return {results};
+});
+
+server.listen(9000);
+
+export function startServer() {
+  return server;
+}
+
+export function stopServer() {
+  server.stop();
+}
+
+export function setServerResults(r: any[]) {
+  results = r;
+}
diff --git a/scripts/poll-in-app-server.js b/scripts/poll-in-app-server.js
index 2aaf8ea9..92e6e540 100644
--- a/scripts/poll-in-app-server.js
+++ b/scripts/poll-in-app-server.js
@@ -7,9 +7,8 @@ async function pollInAppServer() {
 
   while (Date.now() - startTime < maxDuration) {
     try {
-      const response = await makeHttpRequest(
-        'http://127.0.0.1:10424/test_results'
-      );
+      const response = await makeHttpRequest('http://127.0.0.1:9000/results');
+
       if (response !== null) {
         let parsed_response = JSON.parse(response);
         const allTestsPassed = parsed_response.results.reduce((acc, r) => {
diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 612ae1bd..04867bc0 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,6 +1,8 @@
 JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android
-adb reverse tcp:10424 tcp:10424
-echo "🟦 Android device address:"
+adb forward tcp:9000 tcp:9000
+# echo "🟦 Android device address:"
 adb shell ip addr show
+# echo "📱 Android Emulator IP Address:"
+# adb shell ifconfig | grep "inet addr" | awk '{print $2}' | awk -F: '{print $2}'
 echo "Polling in-app server..."
 node ./scripts/poll-in-app-server.js
\ No newline at end of file

From 95c595cf97c593c2a3bc1617d4093367189f6c75 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 19:22:46 -0400
Subject: [PATCH 13/28] Fix awaits in transactions

---
 example/src/server.ts             | 2 +-
 example/src/tests/queries.spec.ts | 8 ++++----
 scripts/poll-in-app-server.js     | 2 +-
 scripts/turnOffEverything.js      | 2 +-
 src/index.ts                      | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/example/src/server.ts b/example/src/server.ts
index dd0e3b5b..b3903cab 100644
--- a/example/src/server.ts
+++ b/example/src/server.ts
@@ -4,7 +4,7 @@ let results: any[] = [];
 const server = new BridgeServer('http_service', true);
 
 server.get('/ping', async (_req, _res) => {
-  console.log("🟦 🟦🟦🟦🟦🟦🟦 🟦 Received request for '/ping'");
+  // console.log("🟦 🟦🟦🟦🟦🟦🟦 🟦 Received request for '/ping'");
   return {message: 'pong'};
 });
 
diff --git a/example/src/tests/queries.spec.ts b/example/src/tests/queries.spec.ts
index 45000e37..f77a0f2d 100644
--- a/example/src/tests/queries.spec.ts
+++ b/example/src/tests/queries.spec.ts
@@ -151,7 +151,7 @@ export function queriesTests() {
 
       const countRes = await db.execute('SELECT COUNT(*) as count FROM User');
 
-      console.log(countRes);
+      // console.log(countRes);
 
       // expect(countRes.metadata?.[0]?.type).to.equal('UNKNOWN');
       expect(countRes.rows?._array.length).to.equal(1);
@@ -286,7 +286,7 @@ export function queriesTests() {
       });
 
       const res = await db.execute('SELECT * FROM User');
-      console.log(res);
+      // console.log(res);
       expect(res.rows?._array).to.eql([
         {
           id,
@@ -404,7 +404,7 @@ export function queriesTests() {
             [id, name, age, networth],
           );
         } catch (e) {
-          tx.rollback();
+          await tx.rollback();
         }
       });
 
@@ -519,7 +519,7 @@ export function queriesTests() {
       await db.executeBatch(commands);
 
       const res = await db.execute('SELECT * FROM User');
-      console.log(res);
+      // console.log(res);
       expect(res.rows?._array).to.eql([
         {id: id1, name: name1, age: age1, networth: networth1, nickname: null},
         {
diff --git a/scripts/poll-in-app-server.js b/scripts/poll-in-app-server.js
index 92e6e540..796622b9 100644
--- a/scripts/poll-in-app-server.js
+++ b/scripts/poll-in-app-server.js
@@ -19,7 +19,7 @@ async function pollInAppServer() {
           console.log('🟢🟢🟢🟢🟢 All tests passed!');
           process.exit(0);
         } else {
-          console.log('Some tests failed');
+          console.log('🟥🟥🟥🟥🟥 Some tests failed');
           process.exit(1);
         }
       }
diff --git a/scripts/turnOffEverything.js b/scripts/turnOffEverything.js
index 5d2ff8c7..b6897309 100644
--- a/scripts/turnOffEverything.js
+++ b/scripts/turnOffEverything.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
 
-console.log('Current working directory:', process.cwd());
+// console.log('Current working directory:', process.cwd());
 
 // Read the package.json file
 const packageJson = JSON.parse(fs.readFileSync('./example/package.json'));
diff --git a/src/index.ts b/src/index.ts
index 73ef1fe5..f3a43a2c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -418,13 +418,13 @@ function enhanceDB(db: DB, options: any): DB {
           });
 
           if (!isFinalized) {
-            commit();
+            await commit();
           }
         } catch (executionError) {
-          console.warn('transaction error', executionError);
+          // console.warn('transaction error', executionError);
           if (!isFinalized) {
             try {
-              rollback();
+              await rollback();
             } catch (rollbackError) {
               throw rollbackError;
             }

From 664284d8c9adf0c9bf588d85093f026badd2e97c Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 19:24:42 -0400
Subject: [PATCH 14/28] lint

---
 example/src/server.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/example/src/server.ts b/example/src/server.ts
index b3903cab..5adf82b4 100644
--- a/example/src/server.ts
+++ b/example/src/server.ts
@@ -8,16 +8,7 @@ server.get('/ping', async (_req, _res) => {
   return {message: 'pong'};
 });
 
-server.get('/results', async (req, _res) => {
-  // console.log("🟦 🟦🟦🟦🟦🟦🟦 🟦 Received request for '/test_results'");
-  // console.log(req.type);
-  // console.log(req.data);
-  // console.log(req.url);
-  // if (results.length > 0) {
-  //   return {results};
-  // } else {
-  //   return {};
-  // }
+server.get('/results', async (_req, _res) => {
   return {results};
 });
 

From 1f98c8fd1e4c9630d50d39c1ee9bd752b01009e5 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 19:32:10 -0400
Subject: [PATCH 15/28] Fix missing await rollback

---
 example/src/tests/queries.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/src/tests/queries.spec.ts b/example/src/tests/queries.spec.ts
index f77a0f2d..261cd810 100644
--- a/example/src/tests/queries.spec.ts
+++ b/example/src/tests/queries.spec.ts
@@ -438,7 +438,7 @@ export function queriesTests() {
           'INSERT INTO "User" (id, name, age, networth) VALUES(?, ?, ?, ?)',
           [id, name, age, networth],
         );
-        tx.rollback();
+        await tx.rollback();
         const res = await db.execute('SELECT * FROM User');
         expect(res.rows?._array).to.eql([]);
       });

From 8343899508442760f5ffc86c14797da28b1db105 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 19:33:37 -0400
Subject: [PATCH 16/28] Migrate the rest of scripts to run tests on device

---
 .github/workflows/ci.yml | 42 ++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a53993af..95124b72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -325,11 +325,24 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build example for Android
-        env:
-          JAVA_OPTS: '-XX:MaxHeapSize=6g'
+      - name: Enable KVM
         run: |
-          yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Give execute permissions to script
+        run: chmod +x ./scripts/test-android.sh
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          emulator-options: -no-window -no-boot-anim -no-audio -no-snapshot-load
+          script: |
+            adb wait-for-device
+            adb shell input keyevent 82
+            ./scripts/test-android.sh
 
   build-android-libsql:
     runs-on: ubuntu-latest
@@ -385,8 +398,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build example for Android
-        env:
-          JAVA_OPTS: '-XX:MaxHeapSize=6g'
+      - name: Enable KVM
         run: |
-          yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Give execute permissions to script
+        run: chmod +x ./scripts/test-android.sh
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          emulator-options: -no-window -no-boot-anim -no-audio -no-snapshot-load
+          script: |
+            adb wait-for-device
+            adb shell input keyevent 82
+            ./scripts/test-android.sh

From bd147b7be3d16d2d933ea8b81b88806c267d16b2 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Sun, 8 Sep 2024 19:49:17 -0400
Subject: [PATCH 17/28] Fix sqlcipher compilation

---
 .github/workflows/ci.yml | 4 ++--
 cpp/bridge.cpp           | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95124b72..a367779d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -271,7 +271,7 @@ jobs:
         run: |
           yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
-  build-android-sqlcipher:
+  test-android-sqlcipher:
     runs-on: ubuntu-latest
     env:
       TURBO_CACHE_DIR: .turbo/android
@@ -344,7 +344,7 @@ jobs:
             adb shell input keyevent 82
             ./scripts/test-android.sh
 
-  build-android-libsql:
+  test-android-libsql:
     runs-on: ubuntu-latest
     env:
       TURBO_CACHE_DIR: .turbo/android
diff --git a/cpp/bridge.cpp b/cpp/bridge.cpp
index 69014663..795538af 100644
--- a/cpp/bridge.cpp
+++ b/cpp/bridge.cpp
@@ -74,8 +74,7 @@ BridgeResult opsqlite_open(std::string const &dbName,
   dbMap[dbName] = db;
 
 #ifdef OP_SQLITE_USE_SQLCIPHER
-  opsqlite_execute(dbName, "PRAGMA key = '" + encryptionKey + "'", nullptr,
-                   nullptr, nullptr);
+  opsqlite_execute(dbName, "PRAGMA key = '" + encryptionKey + "'", nullptr);
 #endif
 
 #ifdef OP_SQLITE_USE_CRSQLITE

From 9006ffbc1317e354fe9b124385c871c57422660f Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 07:36:41 -0400
Subject: [PATCH 18/28] Modify execute function for libsql

---
 cpp/DBHostObject.cpp  |   5 +-
 cpp/bridge.cpp        |   2 +-
 cpp/libsql/bridge.cpp | 141 +++++++++++++++++++-----------------------
 cpp/libsql/bridge.h   |   8 ++-
 example/package.json  |   4 +-
 5 files changed, 75 insertions(+), 85 deletions(-)

diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
index 19ac2f01..d038437a 100644
--- a/cpp/DBHostObject.cpp
+++ b/cpp/DBHostObject.cpp
@@ -381,8 +381,7 @@ void DBHostObject::create_jsi_functions() {
         try {
 
 #ifdef OP_SQLITE_USE_LIBSQL
-          auto status = opsqlite_libsql_execute(db_name, query, &params,
-                                                &results, metadata);
+          auto status = opsqlite_libsql_execute(db_name, query, &params);
 #else
           auto status = opsqlite_execute(db_name, query, &params);
 #endif
@@ -446,7 +445,7 @@ void DBHostObject::create_jsi_functions() {
           std::shared_ptr<std::vector<SmartHostObject>> metadata =
               std::make_shared<std::vector<SmartHostObject>>();
 #ifdef OP_SQLITE_USE_LIBSQL
-          auto status = opsqlite_libsql_execute(db_name, query, &params,
+          auto status = opsqlite_libsql_execute_with_host_objects(db_name, query, &params,
                                                 &results, metadata);
 #else
           auto status = opsqlite_execute_host_objects(db_name, query, &params,
diff --git a/cpp/bridge.cpp b/cpp/bridge.cpp
index 795538af..e5092587 100644
--- a/cpp/bridge.cpp
+++ b/cpp/bridge.cpp
@@ -434,7 +434,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
              */
             double column_value =
                 sqlite3_column_double(statement, current_column);
-            row.push_back(JSVariant(column_value));
+            row.emplace_back(column_value);
             break;
           }
 
diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/bridge.cpp
index 0607ed92..5babb916 100644
--- a/cpp/libsql/bridge.cpp
+++ b/cpp/libsql/bridge.cpp
@@ -54,16 +54,14 @@ BridgeResult opsqlite_libsql_open_sync(std::string const &name,
   libsql_connection_t c;
   const char *err = NULL;
 
-    libsql_config config = {
-        .db_path = path.c_str(),
-        .primary_url = url.c_str(),
-        .auth_token = auth_token.c_str(),
-        .read_your_writes = '1',
-        .encryption_key = nullptr,
-        .sync_interval = sync_interval,
-        .with_webpki = '1'
-    };
-    status = libsql_open_sync_with_config(config, &db, &err);
+  libsql_config config = {.db_path = path.c_str(),
+                          .primary_url = url.c_str(),
+                          .auth_token = auth_token.c_str(),
+                          .read_your_writes = '1',
+                          .encryption_key = nullptr,
+                          .sync_interval = sync_interval,
+                          .with_webpki = '1'};
+  status = libsql_open_sync_with_config(config, &db, &err);
   if (status != 0) {
     return {.type = SQLiteError, .message = err};
   }
@@ -105,7 +103,8 @@ BridgeResult opsqlite_libsql_open(std::string const &name,
   const char *errMsg;
   const char *crsqliteEntryPoint = "sqlite3_crsqlite_init";
 
-  status = libsql_load_extension(c, crsqlitePath.c_str(), crsqliteEntryPoint, &errMsg);
+  status = libsql_load_extension(c, crsqlitePath.c_str(), crsqliteEntryPoint,
+                                 &errMsg);
 
   if (status != 0) {
     return {.type = SQLiteError, .message = errMsg};
@@ -124,7 +123,7 @@ BridgeResult opsqlite_libsql_open_remote(std::string const &url,
   int status = 0;
   libsql_database_t db;
   libsql_connection_t c;
-  const char *err = NULL;
+  const char *err = nullptr;
 
   status = libsql_open_remote_with_webpki(url.c_str(), auth_token.c_str(), &db,
                                           &err);
@@ -177,7 +176,7 @@ BridgeResult opsqlite_libsql_attach(std::string const &mainDBName,
   std::string statement = "ATTACH DATABASE '" + dbPath + "' AS " + alias;
 
   BridgeResult result =
-      opsqlite_libsql_execute(mainDBName, statement, nullptr, nullptr, nullptr);
+      opsqlite_libsql_execute(mainDBName, statement, nullptr);
 
   if (result.type == SQLiteError) {
     return {
@@ -195,7 +194,7 @@ BridgeResult opsqlite_libsql_detach(std::string const &mainDBName,
                                     std::string const &alias) {
   std::string statement = "DETACH DATABASE " + alias;
   BridgeResult result =
-      opsqlite_libsql_execute(mainDBName, statement, nullptr, nullptr, nullptr);
+      opsqlite_libsql_execute(mainDBName, statement, nullptr);
   if (result.type == SQLiteError) {
     return BridgeResult{
         .type = SQLiteError,
@@ -287,11 +286,7 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
   libsql_row_t row;
 
   int status = 0;
-  const char *err = NULL;
-
-  if (status != 0) {
-    return {.type = SQLiteError, .message = err};
-  }
+  const char *err = nullptr;
 
   status = libsql_query_stmt(stmt, &rows, &err);
 
@@ -420,14 +415,15 @@ libsql_stmt_t opsqlite_libsql_prepare_statement(std::string const &name,
   return stmt;
 }
 
-/// Base execution function, returns HostObjects to the JS environment
-BridgeResult opsqlite_libsql_execute(
-    std::string const &name, std::string const &query,
-    const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+BridgeResult opsqlite_libsql_execute(std::string const &name,
+                                     std::string const &query,
+                                     const std::vector<JSVariant> *params) {
 
   check_db_open(name);
 
+  std::vector<std::string> column_names;
+  std::vector<std::vector<JSVariant>> out_rows;
+  std::vector<JSVariant> out_row;
   libsql_connection_t c = db_map[name].c;
   libsql_rows_t rows;
   libsql_row_t row;
@@ -441,7 +437,7 @@ BridgeResult opsqlite_libsql_execute(
     return {.type = SQLiteError, .message = err};
   }
 
-  if (params != nullptr && params->size() > 0) {
+  if (params != nullptr && !params->empty()) {
     opsqlite_libsql_bind_statement(stmt, params);
   }
 
@@ -451,105 +447,97 @@ BridgeResult opsqlite_libsql_execute(
     return {.type = SQLiteError, .message = err};
   }
 
-  bool metadata_set = false;
+  // Get the column names on the first pass
+  int column_count = libsql_column_count(rows);
+  const char *col_name;
 
-  int num_cols = libsql_column_count(rows);
-  while ((status = libsql_next_row(rows, &row, &err)) == 0) {
+  for (int i = 0; i < column_count; i++) {
+    status = libsql_column_name(rows, i, &col_name, &err);
+    column_names.emplace_back(col_name);
+  }
+
+  long long int_value;
+  double float_value;
+  const char *text_value;
+  blob blob_value;
+
+  status = libsql_next_row(rows, &row, &err);
+  while (status == 0) {
+    out_row = std::vector<JSVariant>();
 
     if (!err && !row) {
       break;
     }
 
-    DumbHostObject row_host_object = DumbHostObject(metadatas);
-
-    for (int col = 0; col < num_cols; col++) {
+    for (int col = 0; col < column_count; col++) {
       int type;
 
       libsql_column_type(rows, row, col, &type, &err);
 
       switch (type) {
       case LIBSQL_INT:
-        long long int_value;
         status = libsql_get_int(row, col, &int_value, &err);
-        row_host_object.values.push_back(JSVariant(int_value));
+        out_row.emplace_back(int_value);
         break;
 
       case LIBSQL_FLOAT:
-        double float_value;
         status = libsql_get_float(row, col, &float_value, &err);
-        row_host_object.values.push_back(JSVariant(float_value));
+        out_row.emplace_back(float_value);
         break;
 
       case LIBSQL_TEXT:
-        const char *text_value;
+
         status = libsql_get_string(row, col, &text_value, &err);
-        row_host_object.values.push_back(JSVariant(text_value));
+        out_row.emplace_back(text_value);
         break;
 
       case LIBSQL_BLOB: {
-        blob value_blob;
-        libsql_get_blob(row, col, &value_blob, &err);
-        uint8_t *data = new uint8_t[value_blob.len];
+        libsql_get_blob(row, col, &blob_value, &err);
+        auto data = new uint8_t[blob_value.len];
         // You cannot share raw memory between native and JS
         // always copy the data
-        memcpy(data, value_blob.ptr, value_blob.len);
-        libsql_free_blob(value_blob);
-        row_host_object.values.push_back(JSVariant(
+        memcpy(data, blob_value.ptr, blob_value.len);
+        libsql_free_blob(blob_value);
+        out_row.emplace_back(
             ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                        .size = static_cast<size_t>(value_blob.len)}));
+                        .size = static_cast<size_t>(blob_value.len)});
         break;
       }
 
       case LIBSQL_NULL:
         // intentional fall-through
       default:
-        row_host_object.values.push_back(JSVariant(nullptr));
+        out_row.emplace_back(nullptr);
         break;
       }
 
       if (status != 0) {
         fprintf(stderr, "%s\n", err);
-        throw std::runtime_error("libsql error");
-      }
-
-      // On the first interation through the columns, set the metadata
-      if (!metadata_set && metadatas != nullptr) {
-        const char *col_name;
-        status = libsql_column_name(rows, col, &col_name, &err);
-
-        auto metadata = SmartHostObject();
-        metadata.fields.push_back(std::make_pair("name", col_name));
-        metadata.fields.push_back(std::make_pair("index", col));
-        metadata.fields.push_back(std::make_pair("type", "UNKNOWN"));
-        //                  metadata.fields.push_back(
-        //                      std::make_pair("type", type == -1 ? "UNKNOWN" :
-        //                      type));
-
-        metadatas->push_back(metadata);
+        throw std::runtime_error(err);
       }
     }
 
-    if (results != nullptr) {
-      results->push_back(row_host_object);
-    }
-
-    metadata_set = true;
-    err = NULL;
+    out_rows.emplace_back(out_row);
+    err = nullptr;
+    status = libsql_next_row(rows, &row, &err);
   }
 
   if (status != 0) {
     fprintf(stderr, "%s\n", err);
+    throw std::runtime_error(err);
   }
 
   libsql_free_rows(rows);
   libsql_free_stmt(stmt);
 
-  int changes = libsql_changes(c);
+  unsigned long long changes = libsql_changes(c);
   long long insert_row_id = libsql_last_insert_rowid(c);
 
   return {.type = SQLiteOk,
-          .affectedRows = changes,
-          .insertId = static_cast<double>(insert_row_id)};
+          .affectedRows = static_cast<int>(changes),
+          .insertId = static_cast<double>(insert_row_id),
+          .rows = std::move(out_rows),
+          .column_names = std::move(column_names)};
 }
 
 /// Executes returning data in raw arrays, a small performance optimization
@@ -679,16 +667,15 @@ opsqlite_libsql_execute_batch(std::string const &name,
 
   try {
     int affectedRows = 0;
-    opsqlite_libsql_execute(name, "BEGIN EXCLUSIVE TRANSACTION", nullptr,
-                            nullptr, nullptr);
+    opsqlite_libsql_execute(name, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
     for (int i = 0; i < commandCount; i++) {
       auto command = commands->at(i);
       // We do not provide a datastructure to receive query data because we
       // don't need/want to handle this results in a batch execution
       auto result = opsqlite_libsql_execute(
-          name, command.sql, command.params.get(), nullptr, nullptr);
+          name, command.sql, command.params.get());
       if (result.type == SQLiteError) {
-        opsqlite_libsql_execute(name, "ROLLBACK", nullptr, nullptr, nullptr);
+        opsqlite_libsql_execute(name, "ROLLBACK", nullptr);
         return BatchResult{
             .type = SQLiteError,
             .message = result.message,
@@ -697,14 +684,14 @@ opsqlite_libsql_execute_batch(std::string const &name,
         affectedRows += result.affectedRows;
       }
     }
-    opsqlite_libsql_execute(name, "COMMIT", nullptr, nullptr, nullptr);
+    opsqlite_libsql_execute(name, "COMMIT", nullptr);
     return BatchResult{
         .type = SQLiteOk,
         .affectedRows = affectedRows,
         .commands = static_cast<int>(commandCount),
     };
   } catch (std::exception &exc) {
-    opsqlite_libsql_execute(name, "ROLLBACK", nullptr, nullptr, nullptr);
+    opsqlite_libsql_execute(name, "ROLLBACK", nullptr);
     return BatchResult{
         .type = SQLiteError,
         .message = exc.what(),
diff --git a/cpp/libsql/bridge.h b/cpp/libsql/bridge.h
index 7b8145af..39383bba 100644
--- a/cpp/libsql/bridge.h
+++ b/cpp/libsql/bridge.h
@@ -57,8 +57,12 @@ BridgeResult opsqlite_libsql_sync(std::string const &name);
 
 BridgeResult opsqlite_libsql_execute(
     std::string const &name, std::string const &query,
-    const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas);
+    const std::vector<JSVariant> *params);
+
+    BridgeResult opsqlite_libsql_execute_with_host_objects(
+            std::string const &name, std::string const &query,
+            const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
+            std::shared_ptr<std::vector<SmartHostObject>> metadatas);
 
 BridgeResult
 opsqlite_libsql_execute_raw(std::string const &dbName, std::string const &query,
diff --git a/example/package.json b/example/package.json
index 4e7693d9..295a9429 100644
--- a/example/package.json
+++ b/example/package.json
@@ -64,7 +64,7 @@
     "crsqlite": false,
     "performanceMode": "2",
     "iosSqlite": false,
-    "fts5": true,
-    "libsql": false
+    "fts5": false,
+    "libsql": true
   }
 }

From c5ff1cc325e05ddf5875f9f5f4d5eef1ada375e1 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 08:03:37 -0400
Subject: [PATCH 19/28] stub

---
 cpp/DBHostObject.cpp  | 12 ++++++------
 cpp/libsql/bridge.cpp |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
index d038437a..d14b1ecb 100644
--- a/cpp/DBHostObject.cpp
+++ b/cpp/DBHostObject.cpp
@@ -862,32 +862,32 @@ jsi::Value DBHostObject::get(jsi::Runtime &rt,
   }
 #ifdef OP_SQLITE_USE_LIBSQL
   if (name == "loadFile") {
-    return HOSTFN("loadFile", 0) {
+    return HOSTFN("loadFile") {
       throw std::runtime_error("[op-sqlite] Load file not implemented");
     });
   }
   if (name == "updateHook") {
-    return HOSTFN("updateHook", 0) {
+    return HOSTFN("updateHook") {
       throw std::runtime_error("[op-sqlite] Hooks not supported in libsql");
     });
   }
   if (name == "commitHook") {
-    return HOSTFN("commitHook", 0) {
+    return HOSTFN("commitHook") {
       throw std::runtime_error("[op-sqlite] Hooks not supported in libsql");
     });
   }
   if (name == "rollbackHook") {
-    return HOSTFN("rollbackHook", 0) {
+    return HOSTFN("rollbackHook") {
       throw std::runtime_error("[op-sqlite] Hooks not supported in libsql");
     });
   }
   if (name == "loadExtension") {
-    return HOSTFN("loadExtension", 0) {
+    return HOSTFN("loadExtension") {
       throw std::runtime_error("[op-sqlite] Hooks not supported in libsql");
     });
   }
   if (name == "reactiveExecute") {
-    return HOSTFN("reactiveExecute", 0) {
+    return HOSTFN("reactiveExecute") {
       throw std::runtime_error("[op-sqlite] Hooks not supported in libsql");
     });
   }
diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/bridge.cpp
index 5babb916..fc981051 100644
--- a/cpp/libsql/bridge.cpp
+++ b/cpp/libsql/bridge.cpp
@@ -540,6 +540,12 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
           .column_names = std::move(column_names)};
 }
 
+BridgeResult opsqlite_libsql_execute_with_host_objects(std::string const &name,
+                                     std::string const &query,
+                                     const std::vector<JSVariant> *params) {
+
+}
+
 /// Executes returning data in raw arrays, a small performance optimization
 /// for certain use cases
 BridgeResult

From 1abf61f6643c07d80c597e23d00468e4e4b0a0fc Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 08:43:19 -0400
Subject: [PATCH 20/28] Fix libsql compilation

---
 cpp/DBHostObject.cpp  |   4 +-
 cpp/libsql/bridge.cpp | 128 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 129 insertions(+), 3 deletions(-)

diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
index d14b1ecb..72dc3197 100644
--- a/cpp/DBHostObject.cpp
+++ b/cpp/DBHostObject.cpp
@@ -445,8 +445,8 @@ void DBHostObject::create_jsi_functions() {
           std::shared_ptr<std::vector<SmartHostObject>> metadata =
               std::make_shared<std::vector<SmartHostObject>>();
 #ifdef OP_SQLITE_USE_LIBSQL
-          auto status = opsqlite_libsql_execute_with_host_objects(db_name, query, &params,
-                                                &results, metadata);
+          auto status = opsqlite_libsql_execute_with_host_objects(
+              db_name, query, &params, &results, metadata);
 #else
           auto status = opsqlite_execute_host_objects(db_name, query, &params,
                                                       &results, metadata);
diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/bridge.cpp
index fc981051..478699e3 100644
--- a/cpp/libsql/bridge.cpp
+++ b/cpp/libsql/bridge.cpp
@@ -542,7 +542,133 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
 
 BridgeResult opsqlite_libsql_execute_with_host_objects(std::string const &name,
                                      std::string const &query,
-                                     const std::vector<JSVariant> *params) {
+                                     const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
+    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+
+    check_db_open(name);
+
+    libsql_connection_t c = db_map[name].c;
+    libsql_rows_t rows;
+    libsql_row_t row;
+    libsql_stmt_t stmt;
+    int status = 0;
+    const char *err = NULL;
+
+    status = libsql_prepare(c, query.c_str(), &stmt, &err);
+
+    if (status != 0) {
+        return {.type = SQLiteError, .message = err};
+    }
+
+    if (params != nullptr && params->size() > 0) {
+        opsqlite_libsql_bind_statement(stmt, params);
+    }
+
+    status = libsql_query_stmt(stmt, &rows, &err);
+
+    if (status != 0) {
+        return {.type = SQLiteError, .message = err};
+    }
+
+    bool metadata_set = false;
+
+    int num_cols = libsql_column_count(rows);
+    while ((status = libsql_next_row(rows, &row, &err)) == 0) {
+
+        if (!err && !row) {
+            break;
+        }
+
+        DumbHostObject row_host_object = DumbHostObject(metadatas);
+
+        for (int col = 0; col < num_cols; col++) {
+            int type;
+
+            libsql_column_type(rows, row, col, &type, &err);
+
+            switch (type) {
+                case LIBSQL_INT:
+                    long long int_value;
+                    status = libsql_get_int(row, col, &int_value, &err);
+                    row_host_object.values.push_back(JSVariant(int_value));
+                    break;
+
+                case LIBSQL_FLOAT:
+                    double float_value;
+                    status = libsql_get_float(row, col, &float_value, &err);
+                    row_host_object.values.push_back(JSVariant(float_value));
+                    break;
+
+                case LIBSQL_TEXT:
+                    const char *text_value;
+                    status = libsql_get_string(row, col, &text_value, &err);
+                    row_host_object.values.push_back(JSVariant(text_value));
+                    break;
+
+                case LIBSQL_BLOB: {
+                    blob value_blob;
+                    libsql_get_blob(row, col, &value_blob, &err);
+                    uint8_t *data = new uint8_t[value_blob.len];
+                    // You cannot share raw memory between native and JS
+                    // always copy the data
+                    memcpy(data, value_blob.ptr, value_blob.len);
+                    libsql_free_blob(value_blob);
+                    row_host_object.values.push_back(JSVariant(
+                            ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                                    .size = static_cast<size_t>(value_blob.len)}));
+                    break;
+                }
+
+                case LIBSQL_NULL:
+                    // intentional fall-through
+                default:
+                    row_host_object.values.push_back(JSVariant(nullptr));
+                    break;
+            }
+
+            if (status != 0) {
+                fprintf(stderr, "%s\n", err);
+                throw std::runtime_error("libsql error");
+            }
+
+            // On the first interation through the columns, set the metadata
+            if (!metadata_set && metadatas != nullptr) {
+                const char *col_name;
+                status = libsql_column_name(rows, col, &col_name, &err);
+
+                auto metadata = SmartHostObject();
+                metadata.fields.push_back(std::make_pair("name", col_name));
+                metadata.fields.push_back(std::make_pair("index", col));
+                metadata.fields.push_back(std::make_pair("type", "UNKNOWN"));
+                //                  metadata.fields.push_back(
+                //                      std::make_pair("type", type == -1 ? "UNKNOWN" :
+                //                      type));
+
+                metadatas->push_back(metadata);
+            }
+        }
+
+        if (results != nullptr) {
+            results->push_back(row_host_object);
+        }
+
+        metadata_set = true;
+        err = NULL;
+    }
+
+    if (status != 0) {
+        fprintf(stderr, "%s\n", err);
+    }
+
+    libsql_free_rows(rows);
+    libsql_free_stmt(stmt);
+
+    int changes = libsql_changes(c);
+    long long insert_row_id = libsql_last_insert_rowid(c);
+
+    return {.type = SQLiteOk,
+            .affectedRows = changes,
+            .insertId = static_cast<double>(insert_row_id)};
 
 }
 

From fe0251d34ac21d365696d707c464cb4870a320fd Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 09:22:47 -0400
Subject: [PATCH 21/28] Fix libsql erroring out

---
 cpp/DBHostObject.cpp              |   1 +
 cpp/libsql/bridge.cpp             | 343 +++++++++++++++---------------
 cpp/libsql/bridge.h               |   4 +-
 example/src/tests/queries.spec.ts |  49 ++---
 4 files changed, 198 insertions(+), 199 deletions(-)

diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
index 72dc3197..95672d32 100644
--- a/cpp/DBHostObject.cpp
+++ b/cpp/DBHostObject.cpp
@@ -409,6 +409,7 @@ void DBHostObject::create_jsi_functions() {
                     << std::endl;
           invoker->invokeAsync([&rt, exc = std::move(exc), reject] {
             auto errorCtr = rt.global().getPropertyAsFunction(rt, "Error");
+            auto what = exc.what();
             auto error = errorCtr.callAsConstructor(
                 rt, jsi::String::createFromAscii(rt, exc.what()));
             reject->asObject(rt).asFunction(rt).call(rt, error);
diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/bridge.cpp
index 478699e3..4ee01c08 100644
--- a/cpp/libsql/bridge.cpp
+++ b/cpp/libsql/bridge.cpp
@@ -49,10 +49,10 @@ BridgeResult opsqlite_libsql_open_sync(std::string const &name,
                                        int sync_interval) {
   std::string path = opsqlite_get_db_path(name, base_path);
 
-  int status = 0;
+  int status;
   libsql_database_t db;
   libsql_connection_t c;
-  const char *err = NULL;
+  const char *err = nullptr;
 
   libsql_config config = {.db_path = path.c_str(),
                           .primary_url = url.c_str(),
@@ -82,10 +82,10 @@ BridgeResult opsqlite_libsql_open(std::string const &name,
                                   std::string const &crsqlitePath) {
   std::string path = opsqlite_get_db_path(name, last_path);
 
-  int status = 0;
+  int status;
   libsql_database_t db;
   libsql_connection_t c;
-  const char *err = NULL;
+  const char *err = nullptr;
 
   status = libsql_open_file(path.c_str(), &db, &err);
 
@@ -120,7 +120,7 @@ BridgeResult opsqlite_libsql_open(std::string const &name,
 
 BridgeResult opsqlite_libsql_open_remote(std::string const &url,
                                          std::string const &auth_token) {
-  int status = 0;
+  int status;
   libsql_database_t db;
   libsql_connection_t c;
   const char *err = nullptr;
@@ -175,8 +175,7 @@ BridgeResult opsqlite_libsql_attach(std::string const &mainDBName,
   std::string dbPath = opsqlite_get_db_path(databaseToAttach, docPath);
   std::string statement = "ATTACH DATABASE '" + dbPath + "' AS " + alias;
 
-  BridgeResult result =
-      opsqlite_libsql_execute(mainDBName, statement, nullptr);
+  BridgeResult result = opsqlite_libsql_execute(mainDBName, statement, nullptr);
 
   if (result.type == SQLiteError) {
     return {
@@ -193,8 +192,7 @@ BridgeResult opsqlite_libsql_attach(std::string const &mainDBName,
 BridgeResult opsqlite_libsql_detach(std::string const &mainDBName,
                                     std::string const &alias) {
   std::string statement = "DETACH DATABASE " + alias;
-  BridgeResult result =
-      opsqlite_libsql_execute(mainDBName, statement, nullptr);
+  BridgeResult result = opsqlite_libsql_execute(mainDBName, statement, nullptr);
   if (result.type == SQLiteError) {
     return BridgeResult{
         .type = SQLiteError,
@@ -211,7 +209,7 @@ BridgeResult opsqlite_libsql_sync(std::string const &name) {
   check_db_open(name);
 
   auto db = db_map[name].db;
-  const char *err = NULL;
+  const char *err = nullptr;
 
   int status = libsql_sync(db, &err);
 
@@ -253,23 +251,30 @@ void opsqlite_libsql_bind_statement(libsql_stmt_t statement,
   for (int ii = 0; ii < size; ii++) {
     int index = ii + 1;
     JSVariant value = values->at(ii);
+    int status;
 
-    if (std::holds_alternative<bool>(value)) {
-      libsql_bind_int(statement, index, std::get<int>(value), &err);
-    } else if (std::holds_alternative<int>(value)) {
-      libsql_bind_int(statement, index, std::get<int>(value), &err);
+    if (std::holds_alternative<bool>(value) ||
+        std::holds_alternative<int>(value)) {
+      status = libsql_bind_int(statement, index, std::get<int>(value), &err);
     } else if (std::holds_alternative<long long>(value)) {
-      libsql_bind_int(statement, index, std::get<long long>(value), &err);
+      status =
+          libsql_bind_int(statement, index, std::get<long long>(value), &err);
     } else if (std::holds_alternative<double>(value)) {
-      libsql_bind_float(statement, index, std::get<double>(value), &err);
+      status =
+          libsql_bind_float(statement, index, std::get<double>(value), &err);
     } else if (std::holds_alternative<std::string>(value)) {
       std::string str = std::get<std::string>(value);
-      libsql_bind_string(statement, index, str.c_str(), &err);
+      status = libsql_bind_string(statement, index, str.c_str(), &err);
     } else if (std::holds_alternative<ArrayBuffer>(value)) {
       ArrayBuffer buffer = std::get<ArrayBuffer>(value);
-      libsql_bind_blob(statement, index, buffer.data.get(), buffer.size, &err);
+      status = libsql_bind_blob(statement, index, buffer.data.get(),
+                                static_cast<int>(buffer.size), &err);
     } else {
-      libsql_bind_null(statement, index, &err);
+      status = libsql_bind_null(statement, index, &err);
+    }
+
+    if (status != 0) {
+      throw std::runtime_error(err);
     }
   }
 }
@@ -277,7 +282,7 @@ void opsqlite_libsql_bind_statement(libsql_stmt_t statement,
 BridgeResult opsqlite_libsql_execute_prepared_statement(
     std::string const &name, libsql_stmt_t stmt,
     std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+    const std::shared_ptr<std::vector<SmartHostObject>> &metadatas) {
 
   check_db_open(name);
 
@@ -285,7 +290,7 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
   libsql_rows_t rows;
   libsql_row_t row;
 
-  int status = 0;
+  int status;
   const char *err = nullptr;
 
   status = libsql_query_stmt(stmt, &rows, &err);
@@ -314,39 +319,39 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
       case LIBSQL_INT:
         long long int_value;
         status = libsql_get_int(row, col, &int_value, &err);
-        row_host_object.values.push_back(JSVariant(int_value));
+        row_host_object.values.emplace_back(int_value);
         break;
 
       case LIBSQL_FLOAT:
         double float_value;
         status = libsql_get_float(row, col, &float_value, &err);
-        row_host_object.values.push_back(JSVariant(float_value));
+        row_host_object.values.emplace_back(float_value);
         break;
 
       case LIBSQL_TEXT:
         const char *text_value;
         status = libsql_get_string(row, col, &text_value, &err);
-        row_host_object.values.push_back(JSVariant(text_value));
+        row_host_object.values.emplace_back(text_value);
         break;
 
       case LIBSQL_BLOB: {
         blob value_blob;
         libsql_get_blob(row, col, &value_blob, &err);
-        uint8_t *data = new uint8_t[value_blob.len];
+        auto *data = new uint8_t[value_blob.len];
         // You cannot share raw memory between native and JS
         // always copy the data
         memcpy(data, value_blob.ptr, value_blob.len);
         libsql_free_blob(value_blob);
-        row_host_object.values.push_back(JSVariant(
+        row_host_object.values.emplace_back(
             ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                        .size = static_cast<size_t>(value_blob.len)}));
+                        .size = static_cast<size_t>(value_blob.len)});
         break;
       }
 
       case LIBSQL_NULL:
         // intentional fall-through
       default:
-        row_host_object.values.push_back(JSVariant(nullptr));
+        row_host_object.values.emplace_back(nullptr);
         break;
       }
 
@@ -361,9 +366,9 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
         status = libsql_column_name(rows, col, &col_name, &err);
 
         auto metadata = SmartHostObject();
-        metadata.fields.push_back(std::make_pair("name", col_name));
-        metadata.fields.push_back(std::make_pair("index", col));
-        metadata.fields.push_back(std::make_pair("type", "UNKNOWN"));
+        metadata.fields.emplace_back("name", col_name);
+        metadata.fields.emplace_back("index", col);
+        metadata.fields.emplace_back("type", "UNKNOWN");
         //                  metadata.fields.push_back(
         //                      std::make_pair("type", type == -1 ? "UNKNOWN" :
         //                      type));
@@ -377,7 +382,7 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
     }
 
     metadata_set = true;
-    err = NULL;
+    err = nullptr;
   }
 
   if (status != 0) {
@@ -386,13 +391,13 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
 
   libsql_free_rows(rows);
 
-  int changes = libsql_changes(c);
+  unsigned long long changes = libsql_changes(c);
   long long insert_row_id = libsql_last_insert_rowid(c);
 
   libsql_reset_stmt(stmt, &err);
 
   return {.type = SQLiteOk,
-          .affectedRows = changes,
+          .affectedRows = static_cast<int>(changes),
           .insertId = static_cast<double>(insert_row_id)};
 }
 
@@ -428,8 +433,8 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
   libsql_rows_t rows;
   libsql_row_t row;
   libsql_stmt_t stmt;
-  int status = 0;
-  const char *err = NULL;
+  int status;
+  const char *err = nullptr;
 
   status = libsql_prepare(c, query.c_str(), &stmt, &err);
 
@@ -453,6 +458,9 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
 
   for (int i = 0; i < column_count; i++) {
     status = libsql_column_name(rows, i, &col_name, &err);
+    if (status != 0) {
+      throw std::runtime_error(err);
+    }
     column_names.emplace_back(col_name);
   }
 
@@ -512,7 +520,6 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
       }
 
       if (status != 0) {
-        fprintf(stderr, "%s\n", err);
         throw std::runtime_error(err);
       }
     }
@@ -522,11 +529,6 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
     status = libsql_next_row(rows, &row, &err);
   }
 
-  if (status != 0) {
-    fprintf(stderr, "%s\n", err);
-    throw std::runtime_error(err);
-  }
-
   libsql_free_rows(rows);
   libsql_free_stmt(stmt);
 
@@ -540,136 +542,135 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
           .column_names = std::move(column_names)};
 }
 
-BridgeResult opsqlite_libsql_execute_with_host_objects(std::string const &name,
-                                     std::string const &query,
-                                     const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+BridgeResult opsqlite_libsql_execute_with_host_objects(
+    std::string const &name, std::string const &query,
+    const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
+    const std::shared_ptr<std::vector<SmartHostObject>> &metadatas) {
 
-    check_db_open(name);
+  check_db_open(name);
 
-    libsql_connection_t c = db_map[name].c;
-    libsql_rows_t rows;
-    libsql_row_t row;
-    libsql_stmt_t stmt;
-    int status = 0;
-    const char *err = NULL;
+  libsql_connection_t c = db_map[name].c;
+  libsql_rows_t rows;
+  libsql_row_t row;
+  libsql_stmt_t stmt;
+  int status;
+  const char *err = nullptr;
 
-    status = libsql_prepare(c, query.c_str(), &stmt, &err);
+  status = libsql_prepare(c, query.c_str(), &stmt, &err);
 
-    if (status != 0) {
-        return {.type = SQLiteError, .message = err};
-    }
+  if (status != 0) {
+    return {.type = SQLiteError, .message = err};
+  }
 
-    if (params != nullptr && params->size() > 0) {
-        opsqlite_libsql_bind_statement(stmt, params);
-    }
+  if (params != nullptr && !params->empty()) {
+    opsqlite_libsql_bind_statement(stmt, params);
+  }
 
-    status = libsql_query_stmt(stmt, &rows, &err);
+  status = libsql_query_stmt(stmt, &rows, &err);
 
-    if (status != 0) {
-        return {.type = SQLiteError, .message = err};
-    }
+  if (status != 0) {
+    return {.type = SQLiteError, .message = err};
+  }
+
+  bool metadata_set = false;
+
+  int num_cols = libsql_column_count(rows);
+  while ((status = libsql_next_row(rows, &row, &err)) == 0) {
 
-    bool metadata_set = false;
-
-    int num_cols = libsql_column_count(rows);
-    while ((status = libsql_next_row(rows, &row, &err)) == 0) {
-
-        if (!err && !row) {
-            break;
-        }
-
-        DumbHostObject row_host_object = DumbHostObject(metadatas);
-
-        for (int col = 0; col < num_cols; col++) {
-            int type;
-
-            libsql_column_type(rows, row, col, &type, &err);
-
-            switch (type) {
-                case LIBSQL_INT:
-                    long long int_value;
-                    status = libsql_get_int(row, col, &int_value, &err);
-                    row_host_object.values.push_back(JSVariant(int_value));
-                    break;
-
-                case LIBSQL_FLOAT:
-                    double float_value;
-                    status = libsql_get_float(row, col, &float_value, &err);
-                    row_host_object.values.push_back(JSVariant(float_value));
-                    break;
-
-                case LIBSQL_TEXT:
-                    const char *text_value;
-                    status = libsql_get_string(row, col, &text_value, &err);
-                    row_host_object.values.push_back(JSVariant(text_value));
-                    break;
-
-                case LIBSQL_BLOB: {
-                    blob value_blob;
-                    libsql_get_blob(row, col, &value_blob, &err);
-                    uint8_t *data = new uint8_t[value_blob.len];
-                    // You cannot share raw memory between native and JS
-                    // always copy the data
-                    memcpy(data, value_blob.ptr, value_blob.len);
-                    libsql_free_blob(value_blob);
-                    row_host_object.values.push_back(JSVariant(
-                            ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                    .size = static_cast<size_t>(value_blob.len)}));
-                    break;
-                }
-
-                case LIBSQL_NULL:
-                    // intentional fall-through
-                default:
-                    row_host_object.values.push_back(JSVariant(nullptr));
-                    break;
-            }
-
-            if (status != 0) {
-                fprintf(stderr, "%s\n", err);
-                throw std::runtime_error("libsql error");
-            }
-
-            // On the first interation through the columns, set the metadata
-            if (!metadata_set && metadatas != nullptr) {
-                const char *col_name;
-                status = libsql_column_name(rows, col, &col_name, &err);
-
-                auto metadata = SmartHostObject();
-                metadata.fields.push_back(std::make_pair("name", col_name));
-                metadata.fields.push_back(std::make_pair("index", col));
-                metadata.fields.push_back(std::make_pair("type", "UNKNOWN"));
-                //                  metadata.fields.push_back(
-                //                      std::make_pair("type", type == -1 ? "UNKNOWN" :
-                //                      type));
-
-                metadatas->push_back(metadata);
-            }
-        }
-
-        if (results != nullptr) {
-            results->push_back(row_host_object);
-        }
-
-        metadata_set = true;
-        err = NULL;
+    if (!err && !row) {
+      break;
     }
 
-    if (status != 0) {
+    DumbHostObject row_host_object = DumbHostObject(metadatas);
+
+    for (int col = 0; col < num_cols; col++) {
+      int type;
+
+      libsql_column_type(rows, row, col, &type, &err);
+
+      switch (type) {
+      case LIBSQL_INT:
+        long long int_value;
+        status = libsql_get_int(row, col, &int_value, &err);
+        row_host_object.values.emplace_back(int_value);
+        break;
+
+      case LIBSQL_FLOAT:
+        double float_value;
+        status = libsql_get_float(row, col, &float_value, &err);
+        row_host_object.values.emplace_back(float_value);
+        break;
+
+      case LIBSQL_TEXT:
+        const char *text_value;
+        status = libsql_get_string(row, col, &text_value, &err);
+        row_host_object.values.emplace_back(text_value);
+        break;
+
+      case LIBSQL_BLOB: {
+        blob value_blob;
+        libsql_get_blob(row, col, &value_blob, &err);
+        auto *data = new uint8_t[value_blob.len];
+        // You cannot share raw memory between native and JS
+        // always copy the data
+        memcpy(data, value_blob.ptr, value_blob.len);
+        libsql_free_blob(value_blob);
+        row_host_object.values.emplace_back(
+            ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                        .size = static_cast<size_t>(value_blob.len)});
+        break;
+      }
+
+      case LIBSQL_NULL:
+        // intentional fall-through
+      default:
+        row_host_object.values.emplace_back(nullptr);
+        break;
+      }
+
+      if (status != 0) {
         fprintf(stderr, "%s\n", err);
+        throw std::runtime_error(err);
+      }
+
+      // On the first interation through the columns, set the metadata
+      if (!metadata_set && metadatas != nullptr) {
+        const char *col_name;
+        status = libsql_column_name(rows, col, &col_name, &err);
+
+        auto metadata = SmartHostObject();
+        metadata.fields.emplace_back("name", col_name);
+        metadata.fields.emplace_back("index", col);
+        metadata.fields.emplace_back("type", "UNKNOWN");
+        //                  metadata.fields.push_back(
+        //                      std::make_pair("type", type == -1 ? "UNKNOWN" :
+        //                      type));
+
+        metadatas->push_back(metadata);
+      }
+    }
+
+    if (results != nullptr) {
+      results->push_back(row_host_object);
     }
 
-    libsql_free_rows(rows);
-    libsql_free_stmt(stmt);
+    metadata_set = true;
+    err = nullptr;
+  }
+
+  if (status != 0) {
+    fprintf(stderr, "%s\n", err);
+  }
 
-    int changes = libsql_changes(c);
-    long long insert_row_id = libsql_last_insert_rowid(c);
+  libsql_free_rows(rows);
+  libsql_free_stmt(stmt);
 
-    return {.type = SQLiteOk,
-            .affectedRows = changes,
-            .insertId = static_cast<double>(insert_row_id)};
+  unsigned long long changes = libsql_changes(c);
+  long long insert_row_id = libsql_last_insert_rowid(c);
 
+  return {.type = SQLiteOk,
+          .affectedRows = static_cast<int>(changes),
+          .insertId = static_cast<double>(insert_row_id)};
 }
 
 /// Executes returning data in raw arrays, a small performance optimization
@@ -685,8 +686,8 @@ opsqlite_libsql_execute_raw(std::string const &name, std::string const &query,
   libsql_rows_t rows;
   libsql_row_t row;
   libsql_stmt_t stmt;
-  int status = 0;
-  const char *err = NULL;
+  int status;
+  const char *err = nullptr;
 
   status = libsql_prepare(c, query.c_str(), &stmt, &err);
 
@@ -694,7 +695,7 @@ opsqlite_libsql_execute_raw(std::string const &name, std::string const &query,
     return {.type = SQLiteError, .message = err};
   }
 
-  if (params != nullptr && params->size() > 0) {
+  if (params != nullptr && !params->empty()) {
     opsqlite_libsql_bind_statement(stmt, params);
   }
 
@@ -722,39 +723,39 @@ opsqlite_libsql_execute_raw(std::string const &name, std::string const &query,
       case LIBSQL_INT:
         long long int_value;
         status = libsql_get_int(row, col, &int_value, &err);
-        row_vector.push_back(JSVariant(int_value));
+        row_vector.emplace_back(int_value);
         break;
 
       case LIBSQL_FLOAT:
         double float_value;
         status = libsql_get_float(row, col, &float_value, &err);
-        row_vector.push_back(JSVariant(float_value));
+        row_vector.emplace_back(float_value);
         break;
 
       case LIBSQL_TEXT:
         const char *text_value;
         status = libsql_get_string(row, col, &text_value, &err);
-        row_vector.push_back(JSVariant(text_value));
+        row_vector.emplace_back(text_value);
         break;
 
       case LIBSQL_BLOB: {
         blob value_blob;
         libsql_get_blob(row, col, &value_blob, &err);
-        uint8_t *data = new uint8_t[value_blob.len];
+        auto *data = new uint8_t[value_blob.len];
         // You cannot share raw memory between native and JS
         // always copy the data
         memcpy(data, value_blob.ptr, value_blob.len);
         libsql_free_blob(value_blob);
-        row_vector.push_back(JSVariant(
+        row_vector.emplace_back(
             ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                        .size = static_cast<size_t>(value_blob.len)}));
+                        .size = static_cast<size_t>(value_blob.len)});
         break;
       }
 
       case LIBSQL_NULL:
         // intentional fall-through
       default:
-        row_vector.push_back(JSVariant(nullptr));
+        row_vector.emplace_back(nullptr);
         break;
       }
 
@@ -768,7 +769,7 @@ opsqlite_libsql_execute_raw(std::string const &name, std::string const &query,
       results->push_back(row_vector);
     }
 
-    err = NULL;
+    err = nullptr;
   }
 
   if (status != 0) {
@@ -778,11 +779,11 @@ opsqlite_libsql_execute_raw(std::string const &name, std::string const &query,
   libsql_free_rows(rows);
   libsql_free_stmt(stmt);
 
-  int changes = libsql_changes(c);
+  unsigned long long changes = libsql_changes(c);
   long long insert_row_id = libsql_last_insert_rowid(c);
 
   return {.type = SQLiteOk,
-          .affectedRows = changes,
+          .affectedRows = static_cast<int>(changes),
           .insertId = static_cast<double>(insert_row_id)};
 }
 
@@ -804,8 +805,8 @@ opsqlite_libsql_execute_batch(std::string const &name,
       auto command = commands->at(i);
       // We do not provide a datastructure to receive query data because we
       // don't need/want to handle this results in a batch execution
-      auto result = opsqlite_libsql_execute(
-          name, command.sql, command.params.get());
+      auto result =
+          opsqlite_libsql_execute(name, command.sql, command.params.get());
       if (result.type == SQLiteError) {
         opsqlite_libsql_execute(name, "ROLLBACK", nullptr);
         return BatchResult{
diff --git a/cpp/libsql/bridge.h b/cpp/libsql/bridge.h
index 39383bba..56ee89ee 100644
--- a/cpp/libsql/bridge.h
+++ b/cpp/libsql/bridge.h
@@ -62,7 +62,7 @@ BridgeResult opsqlite_libsql_execute(
     BridgeResult opsqlite_libsql_execute_with_host_objects(
             std::string const &name, std::string const &query,
             const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-            std::shared_ptr<std::vector<SmartHostObject>> metadatas);
+            const std::shared_ptr<std::vector<SmartHostObject>>& metadatas);
 
 BridgeResult
 opsqlite_libsql_execute_raw(std::string const &dbName, std::string const &query,
@@ -84,6 +84,6 @@ void opsqlite_libsql_bind_statement(libsql_stmt_t stmt,
 BridgeResult opsqlite_libsql_execute_prepared_statement(
     std::string const &name, libsql_stmt_t stmt,
     std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas);
+    const std::shared_ptr<std::vector<SmartHostObject>>& metadatas);
 
 } // namespace opsqlite
diff --git a/example/src/tests/queries.spec.ts b/example/src/tests/queries.spec.ts
index 261cd810..bbf050c2 100644
--- a/example/src/tests/queries.spec.ts
+++ b/example/src/tests/queries.spec.ts
@@ -2,8 +2,6 @@ import Chance from 'chance';
 import {
   isLibsql,
   open,
-  openRemote,
-  openSync,
   type DB,
   type SQLBatchTuple,
 } from '@op-engineering/op-sqlite';
@@ -39,35 +37,35 @@ export function queriesTests() {
   });
 
   describe('Queries tests', () => {
-    if (isLibsql()) {
-      it('Remote open a turso database', async () => {
-        const remoteDb = openRemote({
-          url: 'libsql://foo-ospfranco.turso.io',
-          authToken:
-            'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJhIjoicnciLCJpYXQiOjE3MTY5NTc5OTUsImlkIjoiZmJkNzZmMjYtZTliYy00MGJiLTlmYmYtMDczZjFmMjdjOGY4In0.U3cAWBOvcdiqoPN3MB81sco7x8CGOjjtZ1ZEf30uo2iPcAmOuJzcnAznmDlZ6SpQd4qzuJxE4mAIoRlOkpzgBQ',
-        });
+    // if (isLibsql()) {
+    //   it('Remote open a turso database', async () => {
+    //     const remoteDb = openRemote({
+    //       url: 'libsql://foo-ospfranco.turso.io',
+    //       authToken:
+    //         'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJhIjoicnciLCJpYXQiOjE3MTY5NTc5OTUsImlkIjoiZmJkNzZmMjYtZTliYy00MGJiLTlmYmYtMDczZjFmMjdjOGY4In0.U3cAWBOvcdiqoPN3MB81sco7x8CGOjjtZ1ZEf30uo2iPcAmOuJzcnAznmDlZ6SpQd4qzuJxE4mAIoRlOkpzgBQ',
+    //     });
 
-        const res = await remoteDb.execute('SELECT 1');
+    //     const res = await remoteDb.execute('SELECT 1');
 
-        expect(res.rowsAffected).to.equal(0);
-      });
+    //     expect(res.rowsAffected).to.equal(0);
+    //   });
 
-      it('Open a libsql database replicated to turso', async () => {
-        const remoteDb = openSync({
-          url: 'libsql://foo-ospfranco.turso.io',
-          authToken:
-            'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJhIjoicnciLCJpYXQiOjE3MTY5NTc5OTUsImlkIjoiZmJkNzZmMjYtZTliYy00MGJiLTlmYmYtMDczZjFmMjdjOGY4In0.U3cAWBOvcdiqoPN3MB81sco7x8CGOjjtZ1ZEf30uo2iPcAmOuJzcnAznmDlZ6SpQd4qzuJxE4mAIoRlOkpzgBQ',
-          name: 'my replica',
-          syncInterval: 1000,
-        });
+    //   it('Open a libsql database replicated to turso', async () => {
+    //     const remoteDb = openSync({
+    //       url: 'libsql://foo-ospfranco.turso.io',
+    //       authToken:
+    //         'eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJhIjoicnciLCJpYXQiOjE3MTY5NTc5OTUsImlkIjoiZmJkNzZmMjYtZTliYy00MGJiLTlmYmYtMDczZjFmMjdjOGY4In0.U3cAWBOvcdiqoPN3MB81sco7x8CGOjjtZ1ZEf30uo2iPcAmOuJzcnAznmDlZ6SpQd4qzuJxE4mAIoRlOkpzgBQ',
+    //       name: 'my replica',
+    //       syncInterval: 1000,
+    //     });
 
-        const res = await remoteDb.execute('SELECT 1');
+    //     const res = await remoteDb.execute('SELECT 1');
 
-        remoteDb.sync();
+    //     remoteDb.sync();
 
-        expect(res.rowsAffected).to.equal(0);
-      });
-    }
+    //     expect(res.rowsAffected).to.equal(0);
+    //   });
+    // }
 
     it('Insert', async () => {
       const id = chance.integer();
@@ -216,7 +214,6 @@ export function queriesTests() {
       const name = chance.name();
       const age = chance.string();
       const networth = chance.string();
-      // expect(
       try {
         await db.execute(
           'INSERT INTO User (id, name, age, networth) VALUES(?, ?, ?, ?)',

From d40db9790a9f5160628edbfd4e134fd1669bac20 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 09:56:05 -0400
Subject: [PATCH 22/28] clang tidy

---
 cpp/bridge.cpp       | 166 +++++++++++++++++++------------------------
 cpp/bridge.h         |   6 +-
 example/package.json |   4 +-
 3 files changed, 77 insertions(+), 99 deletions(-)

diff --git a/cpp/bridge.cpp b/cpp/bridge.cpp
index e5092587..29a0091b 100644
--- a/cpp/bridge.cpp
+++ b/cpp/bridge.cpp
@@ -185,21 +185,19 @@ inline void opsqlite_bind_statement(sqlite3_stmt *statement,
     int sqIndex = ii + 1;
     JSVariant value = values->at(ii);
 
-    if (std::holds_alternative<bool>(value)) {
-      sqlite3_bind_int(statement, sqIndex, std::get<bool>(value));
-    } else if (std::holds_alternative<int>(value)) {
+    if (std::holds_alternative<bool>(value) || std::holds_alternative<int>(value)) {
       sqlite3_bind_int(statement, sqIndex, std::get<int>(value));
     } else if (std::holds_alternative<long long>(value)) {
-      sqlite3_bind_double(statement, sqIndex, std::get<long long>(value));
+      sqlite3_bind_double(statement, sqIndex, static_cast<double>(std::get<long long>(value)));
     } else if (std::holds_alternative<double>(value)) {
       sqlite3_bind_double(statement, sqIndex, std::get<double>(value));
     } else if (std::holds_alternative<std::string>(value)) {
       std::string str = std::get<std::string>(value);
-      sqlite3_bind_text(statement, sqIndex, str.c_str(), str.length(),
+      sqlite3_bind_text(statement, sqIndex, str.c_str(), static_cast<int>(str.length()),
                         SQLITE_TRANSIENT);
     } else if (std::holds_alternative<ArrayBuffer>(value)) {
       ArrayBuffer buffer = std::get<ArrayBuffer>(value);
-      sqlite3_bind_blob(statement, sqIndex, buffer.data.get(), buffer.size,
+      sqlite3_bind_blob(statement, sqIndex, buffer.data.get(), static_cast<int>(buffer.size),
                         SQLITE_TRANSIENT);
     } else {
       sqlite3_bind_null(statement, sqIndex);
@@ -210,7 +208,7 @@ inline void opsqlite_bind_statement(sqlite3_stmt *statement,
 BridgeResult opsqlite_execute_prepared_statement(
     std::string const &dbName, sqlite3_stmt *statement,
     std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+    std::shared_ptr<std::vector<SmartHostObject>>& metadatas) {
 
   check_db_open(dbName);
 
@@ -223,8 +221,6 @@ BridgeResult opsqlite_execute_prepared_statement(
 
   int result = SQLITE_OK;
 
-  isConsuming = true;
-
   int i, count, column_type;
   std::string column_name, column_declared_type;
 
@@ -233,7 +229,7 @@ BridgeResult opsqlite_execute_prepared_statement(
 
     switch (result) {
     case SQLITE_ROW: {
-      if (results == NULL) {
+      if (results == nullptr) {
         break;
       }
 
@@ -252,13 +248,13 @@ BridgeResult opsqlite_execute_prepared_statement(
            * only represent Integers up to 53 bits
            */
           double column_value = sqlite3_column_double(statement, i);
-          row.values.push_back(JSVariant(column_value));
+          row.values.emplace_back(column_value);
           break;
         }
 
         case SQLITE_FLOAT: {
           double column_value = sqlite3_column_double(statement, i);
-          row.values.push_back(JSVariant(column_value));
+          row.values.emplace_back(column_value);
           break;
         }
 
@@ -267,20 +263,20 @@ BridgeResult opsqlite_execute_prepared_statement(
               reinterpret_cast<const char *>(sqlite3_column_text(statement, i));
           int byteLen = sqlite3_column_bytes(statement, i);
           // Specify length too; in case string contains NULL in the middle
-          row.values.push_back(JSVariant(std::string(column_value, byteLen)));
+          row.values.emplace_back(std::string(column_value, byteLen));
           break;
         }
 
         case SQLITE_BLOB: {
           int blob_size = sqlite3_column_bytes(statement, i);
           const void *blob = sqlite3_column_blob(statement, i);
-          uint8_t *data = new uint8_t[blob_size];
+          auto *data = new uint8_t[blob_size];
           // You cannot share raw memory between native and JS
           // always copy the data
           memcpy(data, blob, blob_size);
-          row.values.push_back(
-              JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                    .size = static_cast<size_t>(blob_size)}));
+          row.values.emplace_back(
+              ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                                    .size = static_cast<size_t>(blob_size)});
           break;
         }
 
@@ -288,14 +284,16 @@ BridgeResult opsqlite_execute_prepared_statement(
           // Intentionally left blank
 
         default:
-          row.values.push_back(JSVariant(nullptr));
+          row.values.emplace_back(nullptr);
           break;
         }
         i++;
       }
+
       if (results != nullptr) {
         results->push_back(row);
       }
+
       break;
     }
 
@@ -308,10 +306,9 @@ BridgeResult opsqlite_execute_prepared_statement(
           column_name = sqlite3_column_name(statement, i);
           const char *type = sqlite3_column_decltype(statement, i);
           auto metadata = SmartHostObject();
-          metadata.fields.push_back(std::make_pair("name", column_name));
-          metadata.fields.push_back(std::make_pair("index", i));
-          metadata.fields.push_back(
-              std::make_pair("type", type == NULL ? "UNKNOWN" : type));
+          metadata.fields.emplace_back("name", column_name);
+          metadata.fields.emplace_back("index", i);
+          metadata.fields.emplace_back("type", type == nullptr? "UNKNOWN" : type);
 
           metadatas->push_back(metadata);
           i++;
@@ -353,7 +350,7 @@ sqlite3_stmt *opsqlite_prepare_statement(std::string const &dbName,
 
   const char *queryStr = query.c_str();
 
-  int statementStatus = sqlite3_prepare_v2(db, queryStr, -1, &statement, NULL);
+  int statementStatus = sqlite3_prepare_v2(db, queryStr, -1, &statement, nullptr);
 
   if (statementStatus == SQLITE_ERROR) {
     const char *message = sqlite3_errmsg(db);
@@ -396,7 +393,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
               .affectedRows = 0};
     }
 
-    if (params != nullptr && params->size() > 0) {
+    if (params != nullptr && !params->empty()) {
       opsqlite_bind_statement(statement, params);
     }
 
@@ -408,6 +405,8 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
       column_names.push_back(column_name);
     }
 
+    double double_value;
+    const char* string_value;
     while (is_consuming) {
       step_result = sqlite3_step(statement);
 
@@ -422,53 +421,39 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
 
           switch (column_type) {
 
-          case SQLITE_INTEGER: {
-            /**
-             * It's not possible to send a int64_t in a jsi::Value because JS
-             * cannot represent the whole number range. Instead, we're sending a
-             * double, which can represent all integers up to 53 bits long
-             *
-             * See
-             * https://github.com/ospfranco/react-native-quick-sqlite/issues/16
-             * for more context.
-             */
-            double column_value =
-                sqlite3_column_double(statement, current_column);
-            row.emplace_back(column_value);
-            break;
-          }
-
+          case SQLITE_INTEGER:
+              // intentional fallthrough
           case SQLITE_FLOAT: {
-            double column_value =
+              double_value =
                 sqlite3_column_double(statement, current_column);
-            row.push_back(JSVariant(column_value));
+            row.emplace_back(double_value);
             break;
           }
 
           case SQLITE_TEXT: {
-            const char *column_value = reinterpret_cast<const char *>(
+              string_value = reinterpret_cast<const char *>(
                 sqlite3_column_text(statement, current_column));
             int byteLen = sqlite3_column_bytes(statement, current_column);
             // Specify length too; in case string contains NULL in the middle
-            row.push_back(JSVariant(std::string(column_value, byteLen)));
+            row.emplace_back(std::string(string_value, byteLen));
             break;
           }
 
           case SQLITE_BLOB: {
             int blob_size = sqlite3_column_bytes(statement, current_column);
             const void *blob = sqlite3_column_blob(statement, current_column);
-            uint8_t *data = new uint8_t[blob_size];
+            auto *data = new uint8_t[blob_size];
             memcpy(data, blob, blob_size);
-            row.push_back(
-                JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)}));
+            row.emplace_back(
+                ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                                      .size = static_cast<size_t>(blob_size)});
             break;
           }
 
           case SQLITE_NULL:
             // Intentionally left blank to switch to default case
           default:
-            row.push_back(JSVariant(nullptr));
+            row.emplace_back(nullptr);
             break;
           }
 
@@ -489,7 +474,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != NULL && strcmp(remainingStatement, "") != 0 &&
+  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
            !isFailed);
 
   if (isFailed) {
@@ -514,7 +499,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
 BridgeResult opsqlite_execute_host_objects(
     std::string const &dbName, std::string const &query,
     const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas) {
+    std::shared_ptr<std::vector<SmartHostObject>> &metadatas) {
 
   check_db_open(dbName);
 
@@ -547,16 +532,14 @@ BridgeResult opsqlite_execute_host_objects(
 
     // The statement did not fail to parse but there is nothing to do, just
     // skip to the end
-    if (statement == NULL) {
+    if (statement == nullptr) {
       continue;
     }
 
-    if (params != nullptr && params->size() > 0) {
+    if (params != nullptr && !params->empty()) {
       opsqlite_bind_statement(statement, params);
     }
 
-    isConsuming = true;
-
     int i, count, column_type;
     std::string column_name, column_declared_type;
 
@@ -565,7 +548,7 @@ BridgeResult opsqlite_execute_host_objects(
 
       switch (result) {
       case SQLITE_ROW: {
-        if (results == NULL) {
+        if (results == nullptr) {
           break;
         }
 
@@ -584,13 +567,13 @@ BridgeResult opsqlite_execute_host_objects(
              * only represent Integers up to 53 bits
              */
             double column_value = sqlite3_column_double(statement, i);
-            row.values.push_back(JSVariant(column_value));
+            row.values.emplace_back(column_value);
             break;
           }
 
           case SQLITE_FLOAT: {
             double column_value = sqlite3_column_double(statement, i);
-            row.values.push_back(JSVariant(column_value));
+            row.values.emplace_back(column_value);
             break;
           }
 
@@ -599,20 +582,20 @@ BridgeResult opsqlite_execute_host_objects(
                 sqlite3_column_text(statement, i));
             int byteLen = sqlite3_column_bytes(statement, i);
             // Specify length too; in case string contains NULL in the middle
-            row.values.push_back(JSVariant(std::string(column_value, byteLen)));
+            row.values.emplace_back(std::string(column_value, byteLen));
             break;
           }
 
           case SQLITE_BLOB: {
             int blob_size = sqlite3_column_bytes(statement, i);
             const void *blob = sqlite3_column_blob(statement, i);
-            uint8_t *data = new uint8_t[blob_size];
+            auto *data = new uint8_t[blob_size];
             // You cannot share raw memory between native and JS
             // always copy the data
             memcpy(data, blob, blob_size);
-            row.values.push_back(
-                JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)}));
+            row.values.emplace_back(
+                ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                                      .size = static_cast<size_t>(blob_size)});
             break;
           }
 
@@ -620,7 +603,7 @@ BridgeResult opsqlite_execute_host_objects(
             // Intentionally left blank
 
           default:
-            row.values.push_back(JSVariant(nullptr));
+            row.values.emplace_back(nullptr);
             break;
           }
           i++;
@@ -640,10 +623,9 @@ BridgeResult opsqlite_execute_host_objects(
             column_name = sqlite3_column_name(statement, i);
             const char *type = sqlite3_column_decltype(statement, i);
             auto metadata = SmartHostObject();
-            metadata.fields.push_back(std::make_pair("name", column_name));
-            metadata.fields.push_back(std::make_pair("index", i));
-            metadata.fields.push_back(
-                std::make_pair("type", type == NULL ? "UNKNOWN" : type));
+            metadata.fields.emplace_back("name", column_name);
+            metadata.fields.emplace_back("index", i);
+            metadata.fields.emplace_back("type", type == nullptr ? "UNKNOWN" : type);
 
             metadatas->push_back(metadata);
             i++;
@@ -660,7 +642,7 @@ BridgeResult opsqlite_execute_host_objects(
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != NULL && strcmp(remainingStatement, "") != 0 &&
+  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
            !isFailed);
 
   if (isFailed) {
@@ -718,16 +700,14 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
 
     // The statement did not fail to parse but there is nothing to do, just
     // skip to the end
-    if (statement == NULL) {
+    if (statement == nullptr) {
       continue;
     }
 
-    if (params != nullptr && params->size() > 0) {
+    if (params != nullptr && !params->empty()) {
       opsqlite_bind_statement(statement, params);
     }
 
-    isConsuming = true;
-
     int i, count, column_type;
     std::string column_name, column_declared_type;
 
@@ -756,13 +736,13 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
              * only represent Integers up to 53 bits
              */
             double column_value = sqlite3_column_double(statement, i);
-            row.push_back(JSVariant(column_value));
+            row.emplace_back(column_value);
             break;
           }
 
           case SQLITE_FLOAT: {
             double column_value = sqlite3_column_double(statement, i);
-            row.push_back(JSVariant(column_value));
+            row.emplace_back(column_value);
             break;
           }
 
@@ -771,27 +751,25 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
                 sqlite3_column_text(statement, i));
             int byteLen = sqlite3_column_bytes(statement, i);
             // Specify length too; in case string contains NULL in the middle
-            row.push_back(JSVariant(std::string(column_value, byteLen)));
+            row.emplace_back(std::string(column_value, byteLen));
             break;
           }
 
           case SQLITE_BLOB: {
             int blob_size = sqlite3_column_bytes(statement, i);
             const void *blob = sqlite3_column_blob(statement, i);
-            uint8_t *data = new uint8_t[blob_size];
+            auto *data = new uint8_t[blob_size];
             memcpy(data, blob, blob_size);
-            row.push_back(
-                JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)}));
+            row.emplace_back(
+                ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
+                                      .size = static_cast<size_t>(blob_size)});
             break;
           }
 
           case SQLITE_NULL:
-            row.push_back(JSVariant(nullptr));
-            break;
-
+              // intentional fallthrough
           default:
-            row.push_back(JSVariant(nullptr));
+            row.emplace_back(nullptr);
             break;
           }
           i++;
@@ -814,7 +792,7 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != NULL && strcmp(remainingStatement, "") != 0 &&
+  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
            !isFailed);
 
   if (isFailed) {
@@ -897,7 +875,7 @@ BridgeResult opsqlite_deregister_update_hook(std::string const &dbName) {
   sqlite3 *db = dbMap[dbName];
   updateCallbackMap.erase(dbName);
 
-  sqlite3_update_hook(db, NULL, NULL);
+  sqlite3_update_hook(db, nullptr, nullptr);
 
   return {SQLiteOk};
 }
@@ -935,7 +913,7 @@ BridgeResult opsqlite_deregister_commit_hook(std::string const &dbName) {
 
   sqlite3 *db = dbMap[dbName];
   commitCallbackMap.erase(dbName);
-  sqlite3_commit_hook(db, NULL, NULL);
+  sqlite3_commit_hook(db, nullptr, nullptr);
 
   return {SQLiteOk};
 }
@@ -972,7 +950,7 @@ BridgeResult opsqlite_deregister_rollback_hook(std::string const &dbName) {
   sqlite3 *db = dbMap[dbName];
   rollbackCallbackMap.erase(dbName);
 
-  sqlite3_rollback_hook(db, NULL, NULL);
+  sqlite3_rollback_hook(db, nullptr, nullptr);
 
   return {SQLiteOk};
 }
@@ -1008,7 +986,7 @@ BridgeResult opsqlite_load_extension(std::string const &db_name,
 #endif
 }
 
-BatchResult opsqlite_execute_batch(std::string dbName,
+BatchResult opsqlite_execute_batch(std::string &name,
                                    std::vector<BatchArguments> *commands) {
   size_t commandCount = commands->size();
   if (commandCount <= 0) {
@@ -1020,14 +998,14 @@ BatchResult opsqlite_execute_batch(std::string dbName,
 
   try {
     int affectedRows = 0;
-    opsqlite_execute(dbName, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
+    opsqlite_execute(name, "BEGIN EXCLUSIVE TRANSACTION", nullptr);
     for (int i = 0; i < commandCount; i++) {
       auto command = commands->at(i);
       // We do not provide a datastructure to receive query data because we
       // don't need/want to handle this results in a batch execution
-      auto result = opsqlite_execute(dbName, command.sql, command.params.get());
+      auto result = opsqlite_execute(name, command.sql, command.params.get());
       if (result.type == SQLiteError) {
-        opsqlite_execute(dbName, "ROLLBACK", nullptr);
+        opsqlite_execute(name, "ROLLBACK", nullptr);
         return BatchResult{
             .type = SQLiteError,
             .message = result.message,
@@ -1036,14 +1014,14 @@ BatchResult opsqlite_execute_batch(std::string dbName,
         affectedRows += result.affectedRows;
       }
     }
-    opsqlite_execute(dbName, "COMMIT", nullptr);
+    opsqlite_execute(name, "COMMIT", nullptr);
     return BatchResult{
         .type = SQLiteOk,
         .affectedRows = affectedRows,
         .commands = static_cast<int>(commandCount),
     };
   } catch (std::exception &exc) {
-    opsqlite_execute(dbName, "ROLLBACK", nullptr);
+    opsqlite_execute(name, "ROLLBACK", nullptr);
     return BatchResult{
         .type = SQLiteError,
         .message = exc.what(),
diff --git a/cpp/bridge.h b/cpp/bridge.h
index d075a1ab..cb2e2b0a 100644
--- a/cpp/bridge.h
+++ b/cpp/bridge.h
@@ -50,9 +50,9 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
 BridgeResult opsqlite_execute_host_objects(
     std::string const &dbName, std::string const &query,
     const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas);
+    std::shared_ptr<std::vector<SmartHostObject>>& metadatas);
 
-BatchResult opsqlite_execute_batch(std::string dbName,
+BatchResult opsqlite_execute_batch(std::string &name,
                                    std::vector<BatchArguments> *commands);
 
 BridgeResult opsqlite_execute_raw(std::string const &dbName,
@@ -81,7 +81,7 @@ void opsqlite_bind_statement(sqlite3_stmt *statement,
 BridgeResult opsqlite_execute_prepared_statement(
     std::string const &dbName, sqlite3_stmt *statement,
     std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>> metadatas);
+    std::shared_ptr<std::vector<SmartHostObject>> &metadatas);
 
 BridgeResult opsqlite_load_extension(std::string const &db_name,
                                      std::string &path,
diff --git a/example/package.json b/example/package.json
index 295a9429..4e7693d9 100644
--- a/example/package.json
+++ b/example/package.json
@@ -64,7 +64,7 @@
     "crsqlite": false,
     "performanceMode": "2",
     "iosSqlite": false,
-    "fts5": false,
-    "libsql": true
+    "fts5": true,
+    "libsql": false
   }
 }

From 33a408f4d7281fd9689547d944544518f618f7a4 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 09:56:11 -0400
Subject: [PATCH 23/28] Format

---
 cpp/bridge.cpp | 56 +++++++++++++++++++++++++++-----------------------
 cpp/bridge.h   |  2 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/cpp/bridge.cpp b/cpp/bridge.cpp
index 29a0091b..db9df6b5 100644
--- a/cpp/bridge.cpp
+++ b/cpp/bridge.cpp
@@ -185,20 +185,22 @@ inline void opsqlite_bind_statement(sqlite3_stmt *statement,
     int sqIndex = ii + 1;
     JSVariant value = values->at(ii);
 
-    if (std::holds_alternative<bool>(value) || std::holds_alternative<int>(value)) {
+    if (std::holds_alternative<bool>(value) ||
+        std::holds_alternative<int>(value)) {
       sqlite3_bind_int(statement, sqIndex, std::get<int>(value));
     } else if (std::holds_alternative<long long>(value)) {
-      sqlite3_bind_double(statement, sqIndex, static_cast<double>(std::get<long long>(value)));
+      sqlite3_bind_double(statement, sqIndex,
+                          static_cast<double>(std::get<long long>(value)));
     } else if (std::holds_alternative<double>(value)) {
       sqlite3_bind_double(statement, sqIndex, std::get<double>(value));
     } else if (std::holds_alternative<std::string>(value)) {
       std::string str = std::get<std::string>(value);
-      sqlite3_bind_text(statement, sqIndex, str.c_str(), static_cast<int>(str.length()),
-                        SQLITE_TRANSIENT);
+      sqlite3_bind_text(statement, sqIndex, str.c_str(),
+                        static_cast<int>(str.length()), SQLITE_TRANSIENT);
     } else if (std::holds_alternative<ArrayBuffer>(value)) {
       ArrayBuffer buffer = std::get<ArrayBuffer>(value);
-      sqlite3_bind_blob(statement, sqIndex, buffer.data.get(), static_cast<int>(buffer.size),
-                        SQLITE_TRANSIENT);
+      sqlite3_bind_blob(statement, sqIndex, buffer.data.get(),
+                        static_cast<int>(buffer.size), SQLITE_TRANSIENT);
     } else {
       sqlite3_bind_null(statement, sqIndex);
     }
@@ -208,7 +210,7 @@ inline void opsqlite_bind_statement(sqlite3_stmt *statement,
 BridgeResult opsqlite_execute_prepared_statement(
     std::string const &dbName, sqlite3_stmt *statement,
     std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>>& metadatas) {
+    std::shared_ptr<std::vector<SmartHostObject>> &metadatas) {
 
   check_db_open(dbName);
 
@@ -276,7 +278,7 @@ BridgeResult opsqlite_execute_prepared_statement(
           memcpy(data, blob, blob_size);
           row.values.emplace_back(
               ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                    .size = static_cast<size_t>(blob_size)});
+                          .size = static_cast<size_t>(blob_size)});
           break;
         }
 
@@ -308,7 +310,8 @@ BridgeResult opsqlite_execute_prepared_statement(
           auto metadata = SmartHostObject();
           metadata.fields.emplace_back("name", column_name);
           metadata.fields.emplace_back("index", i);
-          metadata.fields.emplace_back("type", type == nullptr? "UNKNOWN" : type);
+          metadata.fields.emplace_back("type",
+                                       type == nullptr ? "UNKNOWN" : type);
 
           metadatas->push_back(metadata);
           i++;
@@ -350,7 +353,8 @@ sqlite3_stmt *opsqlite_prepare_statement(std::string const &dbName,
 
   const char *queryStr = query.c_str();
 
-  int statementStatus = sqlite3_prepare_v2(db, queryStr, -1, &statement, nullptr);
+  int statementStatus =
+      sqlite3_prepare_v2(db, queryStr, -1, &statement, nullptr);
 
   if (statementStatus == SQLITE_ERROR) {
     const char *message = sqlite3_errmsg(db);
@@ -406,7 +410,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
     }
 
     double double_value;
-    const char* string_value;
+    const char *string_value;
     while (is_consuming) {
       step_result = sqlite3_step(statement);
 
@@ -422,16 +426,15 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
           switch (column_type) {
 
           case SQLITE_INTEGER:
-              // intentional fallthrough
+            // intentional fallthrough
           case SQLITE_FLOAT: {
-              double_value =
-                sqlite3_column_double(statement, current_column);
+            double_value = sqlite3_column_double(statement, current_column);
             row.emplace_back(double_value);
             break;
           }
 
           case SQLITE_TEXT: {
-              string_value = reinterpret_cast<const char *>(
+            string_value = reinterpret_cast<const char *>(
                 sqlite3_column_text(statement, current_column));
             int byteLen = sqlite3_column_bytes(statement, current_column);
             // Specify length too; in case string contains NULL in the middle
@@ -446,7 +449,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
             memcpy(data, blob, blob_size);
             row.emplace_back(
                 ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)});
+                            .size = static_cast<size_t>(blob_size)});
             break;
           }
 
@@ -474,8 +477,8 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
-           !isFailed);
+  } while (remainingStatement != nullptr &&
+           strcmp(remainingStatement, "") != 0 && !isFailed);
 
   if (isFailed) {
     const char *message = sqlite3_errmsg(db);
@@ -595,7 +598,7 @@ BridgeResult opsqlite_execute_host_objects(
             memcpy(data, blob, blob_size);
             row.values.emplace_back(
                 ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)});
+                            .size = static_cast<size_t>(blob_size)});
             break;
           }
 
@@ -625,7 +628,8 @@ BridgeResult opsqlite_execute_host_objects(
             auto metadata = SmartHostObject();
             metadata.fields.emplace_back("name", column_name);
             metadata.fields.emplace_back("index", i);
-            metadata.fields.emplace_back("type", type == nullptr ? "UNKNOWN" : type);
+            metadata.fields.emplace_back("type",
+                                         type == nullptr ? "UNKNOWN" : type);
 
             metadatas->push_back(metadata);
             i++;
@@ -642,8 +646,8 @@ BridgeResult opsqlite_execute_host_objects(
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
-           !isFailed);
+  } while (remainingStatement != nullptr &&
+           strcmp(remainingStatement, "") != 0 && !isFailed);
 
   if (isFailed) {
 
@@ -762,12 +766,12 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
             memcpy(data, blob, blob_size);
             row.emplace_back(
                 ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
-                                      .size = static_cast<size_t>(blob_size)});
+                            .size = static_cast<size_t>(blob_size)});
             break;
           }
 
           case SQLITE_NULL:
-              // intentional fallthrough
+            // intentional fallthrough
           default:
             row.emplace_back(nullptr);
             break;
@@ -792,8 +796,8 @@ opsqlite_execute_raw(std::string const &dbName, std::string const &query,
     }
 
     sqlite3_finalize(statement);
-  } while (remainingStatement != nullptr && strcmp(remainingStatement, "") != 0 &&
-           !isFailed);
+  } while (remainingStatement != nullptr &&
+           strcmp(remainingStatement, "") != 0 && !isFailed);
 
   if (isFailed) {
 
diff --git a/cpp/bridge.h b/cpp/bridge.h
index cb2e2b0a..f710265d 100644
--- a/cpp/bridge.h
+++ b/cpp/bridge.h
@@ -50,7 +50,7 @@ BridgeResult opsqlite_execute(std::string const &name, std::string const &query,
 BridgeResult opsqlite_execute_host_objects(
     std::string const &dbName, std::string const &query,
     const std::vector<JSVariant> *params, std::vector<DumbHostObject> *results,
-    std::shared_ptr<std::vector<SmartHostObject>>& metadatas);
+    std::shared_ptr<std::vector<SmartHostObject>> &metadatas);
 
 BatchResult opsqlite_execute_batch(std::string &name,
                                    std::vector<BatchArguments> *commands);

From dece8de405e207c64f96be2809594f7dcccb0d3f Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 10:01:06 -0400
Subject: [PATCH 24/28] Run iOS tests in simulator

---
 .github/workflows/ci.yml | 10 +++++++---
 example/package.json     |  1 +
 scripts/test-android.sh  |  4 ----
 scripts/test-ios.sh      |  4 ++++
 turbo.json               | 17 +----------------
 5 files changed, 13 insertions(+), 23 deletions(-)
 create mode 100755 scripts/test-ios.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a367779d..634136f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,7 +153,7 @@ jobs:
       #   run: |
       #     yarn turbo run android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
-  build-ios:
+  test-ios:
     runs-on: macos-latest
     env:
       TURBO_CACHE_DIR: .turbo/ios
@@ -208,9 +208,13 @@ jobs:
         env:
           NO_FLIPPER: 1
 
-      - name: Build example for iOS
+      # - name: Build example for iOS
+      #   run: |
+      #     yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+
+      - name: run tests
         run: |
-          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          ./scripts/test-ios.sh
 
   build-ios-sqlcipher:
     runs-on: macos-latest
diff --git a/example/package.json b/example/package.json
index 4e7693d9..9fb80760 100644
--- a/example/package.json
+++ b/example/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 15 Pro'",
+    "run:ios": "react-native run-ios --scheme='debug'",
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
diff --git a/scripts/test-android.sh b/scripts/test-android.sh
index 04867bc0..55607b4c 100755
--- a/scripts/test-android.sh
+++ b/scripts/test-android.sh
@@ -1,8 +1,4 @@
 JAVA_OPTS=-XX:MaxHeapSize=6g yarn turbo run run:android:release --cache-dir=.turbo/android
 adb forward tcp:9000 tcp:9000
-# echo "🟦 Android device address:"
-adb shell ip addr show
-# echo "📱 Android Emulator IP Address:"
-# adb shell ifconfig | grep "inet addr" | awk '{print $2}' | awk -F: '{print $2}'
 echo "Polling in-app server..."
 node ./scripts/poll-in-app-server.js
\ No newline at end of file
diff --git a/scripts/test-ios.sh b/scripts/test-ios.sh
new file mode 100755
index 00000000..9a86db55
--- /dev/null
+++ b/scripts/test-ios.sh
@@ -0,0 +1,4 @@
+yarn turbo run run:ios --cache-dir=.turbo/ios
+
+echo "Polling in-app server..."
+node ./scripts/poll-in-app-server.js
\ No newline at end of file
diff --git a/turbo.json b/turbo.json
index 7e39912c..e274708e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,21 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "pipeline": {
-    "build:android": {
-      "inputs": [
-        "package.json",
-        "android",
-        "!android/build",
-        "src/*.ts",
-        "src/*.tsx",
-        "example/package.json",
-        "example/android",
-        "!example/android/.gradle",
-        "!example/android/build",
-        "!example/android/app/build"
-      ],
-      "outputs": []
-    },
     "run:android:release": {
       "inputs": [
         "package.json",
@@ -31,7 +16,7 @@
       ],
       "outputs": []
     },
-    "build:ios": {
+    "run:ios": {
       "inputs": [
         "package.json",
         "*.podspec",

From 37f50fffefb35404f359803fe36f049945c003d3 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 10:04:30 -0400
Subject: [PATCH 25/28] Modify turbo cache

---
 .github/workflows/ci.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 634136f5..b94c76bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
 
   #     - name: Check turborepo cache for Android
   #       run: |
-  #         TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
+  #         TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:android:release --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:android:release').cache.status")
 
   #         if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
   #           echo "turbo_cache_hit=1" >> $GITHUB_ENV
@@ -72,7 +72,7 @@ jobs:
   #       env:
   #         JAVA_OPTS: '-XX:MaxHeapSize=6g'
   #       run: |
-  #         yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+  #         yarn turbo run run:android:release --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
   test-android:
     runs-on: ubuntu-latest
@@ -99,7 +99,7 @@ jobs:
 
       - name: Check turborepo cache for Android
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:android:release --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:android:release').cache.status")
 
           if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
@@ -183,7 +183,7 @@ jobs:
 
       - name: Check turborepo cache for iOS
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:ios').cache.status")
 
           if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
@@ -210,13 +210,13 @@ jobs:
 
       # - name: Build example for iOS
       #   run: |
-      #     yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+      #     yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
       - name: run tests
         run: |
           ./scripts/test-ios.sh
 
-  build-ios-sqlcipher:
+  test-ios-sqlcipher:
     runs-on: macos-latest
     env:
       TURBO_CACHE_DIR: .turbo/ios
@@ -246,7 +246,7 @@ jobs:
 
       - name: Check turborepo cache for iOS
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:ios').cache.status")
 
           if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
@@ -271,9 +271,13 @@ jobs:
         env:
           NO_FLIPPER: 1
 
-      - name: Build example for iOS
+      # - name: Build example for iOS
+      #   run: |
+      #     yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+
+      - name: run tests
         run: |
-          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+          ./scripts/test-ios.sh
 
   test-android-sqlcipher:
     runs-on: ubuntu-latest
@@ -300,7 +304,7 @@ jobs:
 
       - name: Check turborepo cache for Android
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:android:release --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:android:release').cache.status")
 
           if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
             echo "turbo_cache_hit=1" >> $GITHUB_ENV
@@ -373,7 +377,7 @@ jobs:
 
       - name: Check turborepo cache for Android
         run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:android:release --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:android:release').cache.status")
 
           if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
             echo "turbo_cache_hit=1" >> $GITHUB_ENV

From 0e8e898a48c2d8f1d22003a362c8b4927dabf037 Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 10:17:42 -0400
Subject: [PATCH 26/28] Change release scheme

---
 README.md            | 14 +++++++++++---
 example/package.json |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 86dd0d21..623f269f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,21 @@
 ![benchmark](benchmark.png)
 
-**Current SQLite version: 3.45.1**
-
 Created by [@ospfranco](https://twitter.com/ospfranco). **Please consider sponsoring!**.
 
-# Docs
+OP-SQLite has grown large to cover a lot of plugins, sqlite versions and APIs. Please read the full documentation before opening an issue.
 
 [See the docs](https://ospfranco.notion.site/OP-SQLite-Documentation-a279a52102464d0cb13c3fa230d2f2dc?pvs=4)
 
+Some of the big and external (back-ends, out-of-tree features, plugins) supported features:
+
+- Vanilla sqlite ofc
+- Libsql is supported as a sqlite backend
+- SQLCipher is supported as a sqlite backend
+- FTS5 plugin
+- cr-sqlite plugin
+- sqlite-vec plugin
+- Reactive queries (currently with some issues, please donate)
+
 # License
 
 MIT License.
diff --git a/example/package.json b/example/package.json
index 9fb80760..2c25b588 100644
--- a/example/package.json
+++ b/example/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 15 Pro'",
-    "run:ios": "react-native run-ios --scheme='debug'",
+    "run:ios": "react-native run-ios --scheme='release'",
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",

From 95229398f0e0ceb33fb6d35baf130fd2bd963bcf Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 12:17:14 -0400
Subject: [PATCH 27/28] Do not start metro

---
 .../OPSQLiteExample.xcodeproj/project.pbxproj | 18 +---
 .../xcshareddata/xcschemes/release.xcscheme   | 95 +++++++++++++++++++
 example/package.json                          |  3 +-
 scripts/test-ios.sh                           |  2 +-
 4 files changed, 102 insertions(+), 16 deletions(-)
 create mode 100644 example/ios/OPSQLiteExample.xcodeproj/xcshareddata/xcschemes/release.xcscheme

diff --git a/example/ios/OPSQLiteExample.xcodeproj/project.pbxproj b/example/ios/OPSQLiteExample.xcodeproj/project.pbxproj
index 887f6ecb..0038b3d9 100644
--- a/example/ios/OPSQLiteExample.xcodeproj/project.pbxproj
+++ b/example/ios/OPSQLiteExample.xcodeproj/project.pbxproj
@@ -26,11 +26,9 @@
 		19F6CBCC0A4E27FBF8BF4A61 /* libPods-OPSQLiteExample-OPSQLiteExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OPSQLiteExample-OPSQLiteExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B4392A12AC88292D35C810B /* Pods-OPSQLiteExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OPSQLiteExample.debug.xcconfig"; path = "Target Support Files/Pods-OPSQLiteExample/Pods-OPSQLiteExample.debug.xcconfig"; sourceTree = "<group>"; };
 		5709B34CF0A7D63546082F79 /* Pods-OPSQLiteExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OPSQLiteExample.release.xcconfig"; path = "Target Support Files/Pods-OPSQLiteExample/Pods-OPSQLiteExample.release.xcconfig"; sourceTree = "<group>"; };
-		5B7EB9410499542E8C5724F5 /* Pods-OPSQLiteExample-OPSQLiteExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OPSQLiteExample-OPSQLiteExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-OPSQLiteExample-OPSQLiteExampleTests/Pods-OPSQLiteExample-OPSQLiteExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
 		6EE3066EB7AAB7E17B1CAB50 /* libPods-OPSQLiteExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-OPSQLiteExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = OPSQLiteExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		89C6BE57DB24E9ADA2F236DE /* Pods-OPSQLiteExample-OPSQLiteExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OPSQLiteExample-OPSQLiteExampleTests.release.xcconfig"; path = "Target Support Files/Pods-OPSQLiteExample-OPSQLiteExampleTests/Pods-OPSQLiteExample-OPSQLiteExampleTests.release.xcconfig"; sourceTree = "<group>"; };
-		9218E48CFB1F478CAC374D68 /* sample2.sqlite */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = sample2.sqlite; path = ../assets/sqlite/sample2.sqlite; sourceTree = "<group>"; };
+		9218E48CFB1F478CAC374D68 /* sample2.sqlite */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = sample2.sqlite; path = ../assets/sqlite/sample2.sqlite; sourceTree = "<group>"; };
 		96FD9FD0FC4F4540AC7A9CE6 /* sample.sqlite */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = sample.sqlite; path = ../assets/sample.sqlite; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
@@ -114,8 +112,6 @@
 			children = (
 				3B4392A12AC88292D35C810B /* Pods-OPSQLiteExample.debug.xcconfig */,
 				5709B34CF0A7D63546082F79 /* Pods-OPSQLiteExample.release.xcconfig */,
-				5B7EB9410499542E8C5724F5 /* Pods-OPSQLiteExample-OPSQLiteExampleTests.debug.xcconfig */,
-				89C6BE57DB24E9ADA2F236DE /* Pods-OPSQLiteExample-OPSQLiteExampleTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -279,7 +275,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
+			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\n\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -438,10 +434,7 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_CFLAGS = "$(inherited)  ";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
@@ -527,10 +520,7 @@
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_CFLAGS = "$(inherited)  ";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
diff --git a/example/ios/OPSQLiteExample.xcodeproj/xcshareddata/xcschemes/release.xcscheme b/example/ios/OPSQLiteExample.xcodeproj/xcshareddata/xcschemes/release.xcscheme
new file mode 100644
index 00000000..c852bdda
--- /dev/null
+++ b/example/ios/OPSQLiteExample.xcodeproj/xcshareddata/xcschemes/release.xcscheme
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1210"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "OPSQLiteExample.app"
+               BlueprintName = "OPSQLiteExample"
+               ReferencedContainer = "container:OPSQLiteExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "OPSQLiteExampleTests.xctest"
+               BlueprintName = "OPSQLiteExampleTests"
+               ReferencedContainer = "container:OPSQLiteExample.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "OPSQLiteExample.app"
+            BlueprintName = "OPSQLiteExample"
+            ReferencedContainer = "container:OPSQLiteExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RCT_NO_LAUNCH_PACKAGER"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "OPSQLiteExample.app"
+            BlueprintName = "OPSQLiteExample"
+            ReferencedContainer = "container:OPSQLiteExample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/example/package.json b/example/package.json
index 2c25b588..217c4493 100644
--- a/example/package.json
+++ b/example/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 15 Pro'",
-    "run:ios": "react-native run-ios --scheme='release'",
+    "run:ios:unused": "xcodebuild -workspace ios/OPSQLiteExample.xcworkspace -scheme release -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15 Pro' clean build",
+    "run:ios": "react-native run-ios --scheme='release' --simulator='iPhone 15 Pro' --no-packager",
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
diff --git a/scripts/test-ios.sh b/scripts/test-ios.sh
index 9a86db55..913744f0 100755
--- a/scripts/test-ios.sh
+++ b/scripts/test-ios.sh
@@ -1,4 +1,4 @@
+# xcrun simctl boot "iPhone 15 Pro"
 yarn turbo run run:ios --cache-dir=.turbo/ios
-
 echo "Polling in-app server..."
 node ./scripts/poll-in-app-server.js
\ No newline at end of file

From b4d13e886e198dc150e1ac3e8fb90ae113f0e22d Mon Sep 17 00:00:00 2001
From: Oscar Franco <ospfranco@gmail.com>
Date: Mon, 9 Sep 2024 14:46:47 -0400
Subject: [PATCH 28/28] Add test libsql

---
 .github/workflows/ci.yml | 63 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b94c76bd..5de87e08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -279,6 +279,69 @@ jobs:
         run: |
           ./scripts/test-ios.sh
 
+  test-ios-libsql:
+    runs-on: macos-latest
+    env:
+      TURBO_CACHE_DIR: .turbo/ios
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Turn on SQLCipher
+        run: |
+          node ./scripts/turnOnLibsql.js
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: install bundler dependencies
+        run: |
+          cd example
+          bundle install
+
+      - name: Cache turborepo for iOS
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.TURBO_CACHE_DIR }}
+          key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-turborepo-ios-
+
+      - name: Check turborepo cache for iOS
+        run: |
+          TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'run:ios').cache.status")
+
+          if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
+            echo "turbo_cache_hit=1" >> $GITHUB_ENV
+          fi
+
+      - name: Cache cocoapods
+        if: env.turbo_cache_hit != 1
+        id: cocoapods-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/ios/Pods
+          key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cocoapods-
+
+      - name: Install cocoapods
+        # if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
+        run: |
+          cd example/ios
+          bundle exec pod install
+        env:
+          NO_FLIPPER: 1
+
+      # - name: Build example for iOS
+      #   run: |
+      #     yarn turbo run run:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+
+      - name: run tests
+        run: |
+          ./scripts/test-ios.sh
+
   test-android-sqlcipher:
     runs-on: ubuntu-latest
     env: