Fix libsql error

Better logs for android launch

Use new op-server

lock

Increase timeouts

Change port

Change port

patch package op-test

Debug

Get rid of disk cleaner images have bigger disks now

Get rid of server

update

iOS test script

Android script

Increase timeouts

Remove timeouts

test

ios

Background task killer

Thread pool fix

clean up

Author: ospfranco

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Typecheck files
         run: yarn typecheck
 
-  test-ios:
+  ios:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -56,7 +56,7 @@ jobs:
         run: |
           ./scripts/test-ios.sh
 
-  test-ios-embedded:
+  ios-embedded:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -98,7 +98,7 @@ jobs:
         run: |
           ./scripts/test-ios.sh
 
-  test-ios-sqlcipher:
+  ios-sqlcipher:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -140,7 +140,7 @@ jobs:
         run: |
           ./scripts/test-ios.sh
 
-  test-ios-libsql:
+  ios-libsql:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -182,25 +182,25 @@ jobs:
         run: |
           ./scripts/test-ios.sh
 
-  test-android:
+  android:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
     steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: insightsengineering/disk-space-reclaimer@v1
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tools-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          swap-storage: true
-          docker-images: true
+      # - name: Free Disk Space (Ubuntu)
+      #   uses: insightsengineering/disk-space-reclaimer@v1
+      #   with:
+      #     # this might remove tools that are actually needed,
+      #     # if set to "true" but frees about 6 GB
+      #     tools-cache: false
+
+      #     # all of these default to true, but feel free to set to
+      #     # "false" if necessary for your workflow
+      #     android: false
+      #     dotnet: true
+      #     haskell: true
+      #     large-packages: true
+      #     swap-storage: true
+      #     docker-images: true
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -236,15 +236,15 @@ jobs:
       #       ~/.android/adb*
       #     key: avd-29
 
-      - name: create AVD and generate snapshot for caching
-        # if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 29
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          script: echo "Generated AVD snapshot for caching."
+      # - name: create AVD and generate snapshot for caching
+      #   # if: steps.avd-cache.outputs.cache-hit != 'true'
+      #   uses: reactivecircus/android-emulator-runner@v2
+      #   with:
+      #     api-level: 29
+      #     force-avd-creation: false
+      #     emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+      #     disable-animations: false
+      #     script: echo "Generated AVD snapshot for caching."
 
       - name: Give execute permissions to script
         run: chmod +x ./scripts/test-android.sh
@@ -259,25 +259,33 @@ jobs:
           script: |
             ./scripts/test-android.sh
 
-  test-android-sqlcipher:
+      - name: Upload Android diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-logcat-${{ github.job }}
+          path: example/android-logcat.txt
+          if-no-files-found: ignore
+
+  android-sqlcipher:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
     steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: insightsengineering/disk-space-reclaimer@v1
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tools-cache: false
-
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          swap-storage: true
-          docker-images: true
+      # - name: Free Disk Space (Ubuntu)
+      #   uses: insightsengineering/disk-space-reclaimer@v1
+      #   with:
+      #     # this might remove tools that are actually needed,
+      #     # if set to "true" but frees about 6 GB
+      #     tools-cache: false
+
+      #     # all of these default to true, but feel free to set to
+      #     # "false" if necessary for your workflow
+      #     android: false
+      #     dotnet: true
+      #     haskell: true
+      #     large-packages: true
+      #     swap-storage: true
+      #     docker-images: true
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -337,8 +345,17 @@ jobs:
             adb shell input keyevent 82
             ./scripts/test-android.sh
 
-  test-android-libsql:
+      - name: Upload Android diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-logcat-${{ github.job }}
+          path: example/android-logcat.txt
+          if-no-files-found: ignore
+
+  android-libsql:
     runs-on: ubuntu-latest
+    timeout-minutes: 40
     env:
       TURBO_CACHE_DIR: .turbo/android
     steps:
@@ -387,3 +404,11 @@ jobs:
             adb wait-for-device
             adb shell input keyevent 82
             ./scripts/test-android.sh
+
+      - name: Upload Android diagnostics
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-logcat-${{ github.job }}
+          path: example/android-logcat.txt
+          if-no-files-found: ignore

cpp/DBHostObject.cpp

@@ -242,10 +242,11 @@ void DBHostObject::create_jsi_functions(jsi::Runtime &rt) {
     thread_pool->waitFinished();
 #ifdef OP_SQLITE_USE_LIBSQL
     opsqlite_libsql_close(db);
+    db = {};
 #else
     opsqlite_close(db);
-#endif
     db = nullptr;
+#endif
 
     return {};
   });

cpp/OPThreadPool.cpp

@@ -74,10 +74,14 @@ void ThreadPool::doWork() {
 
       task = workQueue.front();
       workQueue.pop();
+      ++busy;
     }
-    ++busy;
     task();
-    --busy;
+    {
+      std::lock_guard<std::mutex> g(workQueueMutex);
+      --busy;
+    }
+    workQueueConditionVariable.notify_one();
   }
 }
 

example/ios/Podfile.lock

@@ -25,28 +25,6 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - OpServer (0.1.5):
-    - hermes-engine
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-Core-prebuilt
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - ReactNativeDependencies
-    - Yoga
   - RCTDeprecation (0.82.1)
   - RCTRequired (0.82.1)
   - RCTTypeSafety (0.82.1):
@@ -1356,7 +1334,7 @@ PODS:
     - ReactNativeDependencies
   - react-native-restart (0.0.27):
     - React-Core
-  - react-native-safe-area-context (5.6.2):
+  - react-native-safe-area-context (5.7.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1368,8 +1346,8 @@ PODS:
     - React-graphics
     - React-ImageManager
     - React-jsi
-    - react-native-safe-area-context/common (= 5.6.2)
-    - react-native-safe-area-context/fabric (= 5.6.2)
+    - react-native-safe-area-context/common (= 5.7.0)
+    - react-native-safe-area-context/fabric (= 5.7.0)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-renderercss
@@ -1380,7 +1358,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - react-native-safe-area-context/common (5.6.2):
+  - react-native-safe-area-context/common (5.7.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1402,7 +1380,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - react-native-safe-area-context/fabric (5.6.2):
+  - react-native-safe-area-context/fabric (5.7.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -1803,7 +1781,6 @@ DEPENDENCIES:
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - op-sqlite (from `../..`)
-  - "OpServer (from `../node_modules/@op-engineering/op-server`)"
   - RCTDeprecation (from `../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
   - RCTRequired (from `../node_modules/react-native/Libraries/Required`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -1883,8 +1860,6 @@ EXTERNAL SOURCES:
     :tag: hermes-2025-09-01-RNv0.82.0-265ef62ff3eb7289d17e366664ac0da82303e101
   op-sqlite:
     :path: "../.."
-  OpServer:
-    :path: "../node_modules/@op-engineering/op-server"
   RCTDeprecation:
     :path: "../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
   RCTRequired:
@@ -2027,8 +2002,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   FBLazyVector: 2e5b5553df729e080483373db6f045201ff4e6db
   hermes-engine: 273e30e7fb618279934b0b95ffab60ecedb7acf5
-  op-sqlite: a0d8cbee3fc5f8c8b67272c3b07c3b4f07b5b17f
-  OpServer: 9b3ebdeeb095950e760e3c39853cd06849421b35
+  op-sqlite: 0e554518f49eb1488f2b42bc166c713c0756f4d3
   RCTDeprecation: c6b36da89aa26090c8684d29c2868dcca2cd4554
   RCTRequired: 1413a0844770d00fa1f1bb2da4680adfa8698065
   RCTTypeSafety: 354b4bb344998550c45d054ef66913837948f958
@@ -2063,7 +2037,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: b825b19234eb571a071e595c123909f0c15ab8f5
   React-microtasksnativemodule: acf58b8dd297cd84ccff01eeac094c405adcea00
   react-native-restart: 0bc732f4461709022a742bb29bcccf6bbc5b4863
-  react-native-safe-area-context: 37e680fc4cace3c0030ee46e8987d24f5d3bdab2
+  react-native-safe-area-context: ae7587b95fb580d1800c5b0b2a7bd48c2868e67a
   React-NativeModulesApple: b50b7150a4f573d8466c43d8af38d2610fe17d92
   React-oscompat: 2290ac70fe07fbaba8473c4054084029777c5a22
   React-perflogger: d3b6b00d0e8fe2108069d175f6a51ea58f31c76a

example/package.json

@@ -7,6 +7,7 @@
     "ios": "react-native run-ios --scheme='debug' --simulator='iPhone 16 Pro'",
     "run:ios:unused": "xcodebuild -workspace ios/OPSQLiteExample.xcworkspace -scheme release -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 16 Pro' clean build",
     "run:ios:release": "react-native run-ios --scheme='release' --no-packager",
+    "postinstall": "patch-package",
     "start": "react-native start",
     "pods": "cd ios && bundle exec pod install && rm -f .xcode.env.local",
     "pods:nuke": "cd ios && rm -rf Pods && rm -rf Podfile.lock && bundle exec pod install",
@@ -15,7 +16,6 @@
     "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"
   },
   "dependencies": {
-    "@op-engineering/op-server": "^0.1.5",
     "@op-engineering/op-test": "^0.2.5",
     "chance": "^1.1.9",
     "clsx": "^2.0.0",
@@ -36,6 +36,7 @@
     "@react-native/typescript-config": "0.81.5",
     "@types/chance": "^1.1.7",
     "@types/react": "^19.1.1",
+    "patch-package": "^8.0.1",
     "react-native-builder-bob": "^0.40.13",
     "react-native-monorepo-config": "^0.1.9",
     "react-native-restart": "^0.0.27",

example/src/App.tsx

@@ -1,5 +1,4 @@
 import {useEffect, useState} from 'react';
-import {setServerResults, stopServer} from './server';
 import {
   displayResults,
   runTests,
@@ -9,7 +8,7 @@ import './tests'; // import all tests to register them
 import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
 // import {performanceTest} from './performance_test';
 import {StyleSheet, Text, View} from 'react-native';
-import {open} from '@op-engineering/op-sqlite';
+// import {open} from '@op-engineering/op-sqlite';
 
 export default function App() {
   const [results, setResults] = useState<any>(null);
@@ -19,20 +18,22 @@ export default function App() {
   useEffect(() => {
     console.log("App has started 🟢")
     const work = async () => {
-      let start = performance.now();
-      open({
-        name: 'dummyDb.sqlite',
-      });
-      setOpenTime(performance.now() - start);
+      // let start = performance.now();
+      // open({
+      //   name: 'dummyDb.sqlite',
+      // });
+      // setOpenTime(performance.now() - start);
 
       try {
+        console.log("TESTS STARTED 🟠");
         const results = await runTests();
+        const passed = allTestsPassed(results);
         console.log("TESTS FINISHED 🟢")
-        setServerResults(allTestsPassed(results));
+        console.log(`OPSQLITE_TEST_RESULT:${passed ? 'PASS' : 'FAIL'}`);
         setResults(results);
       } catch (e) {
         console.log(`TEST FAILED 🟥 ${e}`)
-        setServerResults(false);
+        console.log('OPSQLITE_TEST_RESULT:FAIL');
       }
 
       // setTimeout(() => {
@@ -48,9 +49,7 @@ export default function App() {
 
     work();
 
-    return () => {
-      stopServer();
-    };
+    return () => {};
   }, []);
 
   // const shareDb = async () => {