@op-engineering/op-sqlite 14.1.3 → 15.0.0

package/android/CMakeLists.txt

@@ -72,72 +72,33 @@ if (USER_DEFINED_SOURCE_FILES)
 endif()
 
 if (USE_SQLCIPHER)
-  if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      ReactAndroid::reactnative
-      ReactAndroid::jsi
-      fbjni::fbjni
-      openssl::crypto
-    )
-  else()
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      fbjni::fbjni
-      ReactAndroid::jsi
-      ReactAndroid::turbomodulejsijni
-      ReactAndroid::react_nativemodule_core
-      android
-      openssl::crypto
-    )
-  endif()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+    openssl::crypto
+  )
 elseif (USE_LIBSQL)
   cmake_path(SET LIBSQL ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libsql_experimental.a NORMALIZE)
   add_library(libsql STATIC IMPORTED)
   set_target_properties(libsql PROPERTIES IMPORTED_LOCATION ${LIBSQL})
 
-  if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      ReactAndroid::reactnative
-      ReactAndroid::jsi
-      fbjni::fbjni
-      libsql
-    )
-  else()
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      fbjni::fbjni
-      ReactAndroid::jsi
-      ReactAndroid::turbomodulejsijni
-      ReactAndroid::react_nativemodule_core
-      android
-      libsql
-    )
-  endif()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+    libsql
+  )
 else ()
-  # if (REACTNATIVE_MERGED_SO)
-  if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      ReactAndroid::reactnative
-      ReactAndroid::jsi
-      fbjni::fbjni
-    )
-  else()
-    target_link_libraries(
-      ${PACKAGE_NAME}
-      ${LOG_LIB}
-      fbjni::fbjni
-      ReactAndroid::jsi
-      ReactAndroid::turbomodulejsijni
-      ReactAndroid::react_nativemodule_core
-      android
-    )
-  endif()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    ${LOG_LIB}
+    ReactAndroid::reactnative
+    ReactAndroid::jsi
+    fbjni::fbjni
+  )
 endif()

package/android/build.gradle

@@ -2,29 +2,29 @@ import java.nio.file.Paths
 import groovy.json.JsonSlurper
 
 buildscript {
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['OPSQLite_' + name]
+  }
+
   repositories {
     google()
-    gradlePluginPortal()
+    mavenCentral()
   }
 
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["OPSQLite_kotlinVersion"]
-
   dependencies {
-    classpath("com.android.tools.build:gradle:7.3.1")
+    classpath("com.android.tools.build:gradle:8.7.2")
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
 }
 
-def resolveBuildType() {
-    Gradle gradle = getGradle()
-    String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-    return tskReqStr.contains('Release') ? 'release' : 'debug'
-}
+apply plugin: "com.facebook.react"
 
-def isNewArchitectureEnabled() {
-  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["OPSQLite_" + name]).toInteger()
 }
 
 def useSQLCipher = false
@@ -66,8 +66,7 @@ def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
 def opsqliteConfig = packageJson["op-sqlite"]
 
 if(opsqliteConfig) {
-println "[OP-SQLITE] Detected op-sqlite config from package.json at: " + packageJsonFile.absolutePath
-
+  println "[OP-SQLITE] Detected op-sqlite config from package.json at: " + packageJsonFile.absolutePath
   useSQLCipher = opsqliteConfig["sqlcipher"]
   useCRSQLite = opsqliteConfig["crsqlite"]
   useSqliteVec = opsqliteConfig["sqliteVec"]
@@ -80,12 +79,10 @@ println "[OP-SQLITE] Detected op-sqlite config from package.json at: " + package
 }
 
 if(useSQLCipher) {
-  println "[OP-SQLITE] using SQLCipher 🔒"
+  println "[OP-SQLITE] using sqlcipher."
 } else if(useLibsql) {
-  println "[OP-SQLITE] using libsql 📦"
-} else {
-  println "[OP-SQLITE] using Vanilla SQLite"
-}
+  println "[OP-SQLITE] using libsql. Report any issues to Turso"
+} 
 
 if(useCRSQLite) {
   println "[OP-SQLITE] using CR-SQLite 🤖"
@@ -112,132 +109,98 @@ if (!tokenizers.isEmpty()) {
   println "[OP-SQLITE] Tokenizers enabled! 🧾 Tokenizers: " + tokenizers
 }
 
-if (isNewArchitectureEnabled()) {
-    apply plugin: "com.facebook.react"
-}
-
-apply plugin: 'com.android.library'
-apply plugin: "kotlin-android"
+android {
+  namespace "com.op.sqlite"
 
-def safeExtGet(prop, fallback) {
-  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["OPSQLite" + name]
-}
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-def reactNativeArchitectures() {
-  def value = project.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
+    externalNativeBuild {
+      cmake {
+      if(useSQLCipher) {
+        cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+        cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
+      }
+      if(useLibsql) {
+        cFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+        cppFlags += "-DOP_SQLITE_USE_LIBSQL=1"
+      }
+      if(useCRSQLite) {
+        cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+        cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
+      }
+      if(performanceMode) {
+        cFlags += ["-DSQLITE_DQS=0", "-DSQLITE_THREADSAFE=1", "-DSQLITE_DEFAULT_MEMSTATUS=0", "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1", "-DSQLITE_MAX_EXPR_DEPTH=0", "-DSQLITE_OMIT_DEPRECATED=1", "-DSQLITE_OMIT_PROGRESS_CALLBACK=1", "-DSQLITE_OMIT_SHARED_CACHE=1", "-DSQLITE_USE_ALLOCA=1"]
+      }
+      if(enableFTS5) {
+        cFlags += ["-DSQLITE_ENABLE_FTS5=1"]
+      }
+      if(enableRtree) {
+        cFlags += ["-DSQLITE_ENABLE_RTREE=1"]
+      }
+      if(useSqliteVec) {
+        cFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+        cppFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
+      }
 
-android {
+      // This are zeroes because they will be passed as C flags, so they become falsy
+      def sourceFiles = 0
+      // def tokenizerInitStrings = 0
+      def tokenizersHeaderPath = 0
+      if (!tokenizers.isEmpty()) {
+        def sourceDir = isUserApp ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
+        def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
+        copy {
+          from sourceDir
+          into destDir
+          include "**/*.cpp", "**/*.h"
+        }
+        sourceFiles = fileTree(dir: destDir, include: ["**/*.cpp", "**/*.h"]).files.join(";")
+        tokenizersHeaderPath = "../c_sources/tokenizers.h"
+      }
 
-  compileSdkVersion safeExtGet("compileSdkVersion", 35)
-  namespace "com.op.sqlite"
-  // Used to override the NDK path/version on internal CI or by allowing
-  // users to customize the NDK path/version from their root project (e.g. for M1 support)
-  if (rootProject.hasProperty("ndkPath")) {
-    ndkPath rootProject.ext.ndkPath
-  }
-  if (rootProject.hasProperty("ndkVersion")) {
-    ndkVersion rootProject.ext.ndkVersion
+      cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
+      arguments "-DANDROID_STL=c++_shared",
+        "-DSQLITE_FLAGS='$sqliteFlags'",
+        "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
+        "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
+        "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
+        "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}",
+        "-DUSER_DEFINED_SOURCE_FILES=${sourceFiles}",
+        "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'",
+        "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+      }
+    }
   }
 
   buildFeatures {
+    buildConfig true
     prefab true
     prefabPublishing true
   }
 
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+
   prefab {
     "op-sqlite" {
       headers "${project.buildDir}/headers/op-sqlite/"
     }
   }
 
-  defaultConfig {
-    minSdkVersion safeExtGet("minSdkVersion", 24)
-    targetSdkVersion safeExtGet('targetSdkVersion', 35)
-    versionCode 1
-    versionName "1.0"
-
-    externalNativeBuild {
-        cmake {
-            if(useSQLCipher) {
-              cFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
-              cppFlags += "-DOP_SQLITE_USE_SQLCIPHER=1"
-            }
-            if(useLibsql) {
-              cFlags += "-DOP_SQLITE_USE_LIBSQL=1"
-              cppFlags += "-DOP_SQLITE_USE_LIBSQL=1"
-            }
-            if(useCRSQLite) {
-              cFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
-              cppFlags += "-DOP_SQLITE_USE_CRSQLITE=1"
-            }
-            if(performanceMode) {
-              cFlags += ["-DSQLITE_DQS=0", "-DSQLITE_THREADSAFE=1", "-DSQLITE_DEFAULT_MEMSTATUS=0", "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1", "-DSQLITE_MAX_EXPR_DEPTH=0", "-DSQLITE_OMIT_DEPRECATED=1", "-DSQLITE_OMIT_PROGRESS_CALLBACK=1", "-DSQLITE_OMIT_SHARED_CACHE=1", "-DSQLITE_USE_ALLOCA=1"]
-            }
-            if(enableFTS5) {
-              cFlags += ["-DSQLITE_ENABLE_FTS5=1"]
-            }
-            if(enableRtree) {
-              cFlags += ["-DSQLITE_ENABLE_RTREE=1"]
-            }
-            if(useSqliteVec) {
-              cFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
-              cppFlags += "-DOP_SQLITE_USE_SQLITE_VEC=1"
-            }
-
-            // This are zeroes because they will be passed as C flags, so they become falsy
-            def sourceFiles = 0
-            // def tokenizerInitStrings = 0
-            def tokenizersHeaderPath = 0
-            if (!tokenizers.isEmpty()) {
-              def sourceDir = isUserApp ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
-              def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
-              copy {
-                from sourceDir
-                into destDir
-                include "**/*.cpp", "**/*.h"
-              }
-              sourceFiles = fileTree(dir: destDir, include: ["**/*.cpp", "**/*.h"]).files.join(";")
-              tokenizersHeaderPath = "../c_sources/tokenizers.h"
-            }
-
-            cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
-            abiFilters(*reactNativeArchitectures())
-            arguments "-DANDROID_STL=c++_shared",
-              "-DSQLITE_FLAGS='$sqliteFlags'",
-              "-DUSE_SQLCIPHER=${useSQLCipher ? 1 : 0}",
-              "-DUSE_CRSQLITE=${useCRSQLite ? 1 : 0}",
-              "-DUSE_LIBSQL=${useLibsql ? 1 : 0}",
-              "-DUSE_SQLITE_VEC=${useSqliteVec ? 1 : 0}",
-              "-DUSER_DEFINED_SOURCE_FILES=${sourceFiles}",
-              "-DUSER_DEFINED_TOKENIZERS_HEADER_PATH='${tokenizersHeaderPath}'",
-              "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
-        }
-    }
-
-    packagingOptions {
-      doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
-      excludes = [
-              "META-INF",
-              "META-INF/**",
-              "**/libjsi.so",
-              "**/libreact_nativemodule_core.so",
-              "**/libturbomodulejsijni.so",
-              "**/libc++_shared.so",
-              "**/libfbjni.so",
-              "**/libreactnative.so",
-      ]
-    }
+  lintOptions {
+    disable "GradleCompatible"
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 
   externalNativeBuild {
@@ -246,21 +209,20 @@ android {
     }
   }
 
-  sourceSets.main {
-    java {
-      // TODO removed the codegen config to allow the package to be built under bridgeless
-      // Once there is a stable API for C++ Turbo Modules, maybe this can be enabled again
-      // if (!isNewArchitectureEnabled()) {
-        srcDirs += 'src/paper/java'
-      // }
-    }
-    jniLibs {
-      srcDirs = []
-      if (useCRSQLite) {
-        srcDirs += 'src/main/libcrsqlite'
-      }
-      if (useSqliteVec) {
-        srcDirs += 'src/main/libsqlitevec'
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+      jniLibs {
+        srcDirs = []
+        if (useCRSQLite) {
+          srcDirs += 'src/main/libcrsqlite'
+        }
+        if (useSqliteVec) {
+          srcDirs += 'src/main/libsqlitevec'
+        }
       }
     }
   }
@@ -272,11 +234,12 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
+
 dependencies {
-  implementation 'com.facebook.react:react-native'
+  implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   if (useSQLCipher) {
-    implementation('io.github.ronickg:openssl:3.3.2')
+    implementation('io.github.ronickg:openssl:3.3.2-1')
   }
 }
 
@@ -288,26 +251,3 @@ tasks.register('prepareHeaders', Copy) {
 }
 
 preBuild.dependsOn(prepareHeaders)
-
-// Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct".
-tasks.configureEach { task ->
-  if (task.name.contains("configureCMakeDebug")) {
-    rootProject.getTasksByName("packageReactNdkDebugLibs", true).forEach {
-      task.dependsOn(it)
-    }
-  }
-  // We want to add a dependency for both configureCMakeRelease and configureCMakeRelWithDebInfo
-  if (task.name.contains("configureCMakeRel")) {
-    rootProject.getTasksByName("packageReactNdkReleaseLibs", true).forEach {
-      task.dependsOn(it)
-    }
-  }
-}
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "opsqlite"
-    codegenJavaPackageName = "com.op.sqlite.example"
-  }
-}

package/android/gradle.properties

@@ -1 +1,5 @@
-OPSQLite_kotlinVersion=2.0.21
+OPSQLite_kotlinVersion=2.0.21
+OPSQLite_minSdkVersion=24
+OPSQLite_targetSdkVersion=34
+OPSQLite_compileSdkVersion=35
+OPSQLite_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/cpp/DBHostObject.cpp

@@ -157,13 +157,15 @@ DBHostObject::DBHostObject(jsi::Runtime &rt,
                            std::string &db_name, std::string &path,
                            std::string &url, std::string &auth_token,
                            int sync_interval, bool offline,
-                           std::string &encryption_key)
+                           std::string &encryption_key,
+                           std::string &remote_encryption_key)
     : db_name(db_name), invoker(std::move(invoker)), rt(rt) {
 
     _thread_pool = std::make_shared<ThreadPool>();
 
     db = opsqlite_libsql_open_sync(db_name, path, url, auth_token,
-                                   sync_interval, offline, encryption_key);
+                                   sync_interval, offline, encryption_key,
+                                   remote_encryption_key);
 
     create_jsi_functions();
 }
@@ -359,6 +361,23 @@ void DBHostObject::create_jsi_functions() {
 
         return create_js_rows(rt, status);
     });
+    
+    function_map["executeRawSync"] = HOSTFN("executeRawSync") {
+        const std::string query = args[0].asString(rt).utf8(rt);
+        std::vector<JSVariant> params = count == 2 && args[1].isObject()
+                                            ? to_variant_vec(rt, args[1])
+                                            : std::vector<JSVariant>();
+
+        std::vector<std::vector<JSVariant>> results;
+
+#ifdef OP_SQLITE_USE_LIBSQL
+        auto status = opsqlite_libsql_execute_raw(db, query, &params, &results);
+#else
+        auto status = opsqlite_execute_raw(db, query, &params, &results);
+#endif
+
+        return create_raw_result(rt, status, &results);
+    });
 
     function_map["execute"] = HOSTFN("execute") {
         const std::string query = args[0].asString(rt).utf8(rt);

package/cpp/DBHostObject.h

@@ -59,7 +59,8 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject {
     DBHostObject(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> invoker,
                  std::string &db_name, std::string &path, std::string &url,
                  std::string &auth_token, int sync_interval, bool offline,
-                 std::string &encryption_key);
+                 std::string &encryption_key,
+                 std::string &remote_encryption_key);
 #endif
 
     std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;

package/cpp/bindings.cpp

@@ -150,6 +150,12 @@ void install(jsi::Runtime &rt,
                 options.getProperty(rt, "encryptionKey").asString(rt).utf8(rt);
         }
 
+        std::string remote_encryption_key;
+        if (options.hasProperty(rt, "remoteEncryptionKey")) {
+            encryption_key =
+                options.getProperty(rt, "remoteEncryptionKey").asString(rt).utf8(rt);
+        }
+
         std::string location;
         if (options.hasProperty(rt, "location")) {
             location =
@@ -166,7 +172,7 @@ void install(jsi::Runtime &rt,
         }
 
         std::shared_ptr<DBHostObject> db = std::make_shared<DBHostObject>(
-            rt, invoker, name, path, url, auth_token, sync_interval, offline, encryption_key);
+            rt, invoker, name, path, url, auth_token, sync_interval, offline, encryption_key, remote_encryption_key);
         return jsi::Object::createFromHostObject(rt, db);
     });
 #endif

package/cpp/libsql/bridge.cpp

@@ -40,7 +40,8 @@ DB opsqlite_libsql_open_sync(std::string const &name,
                              std::string const &base_path,
                              std::string const &url,
                              std::string const &auth_token, int sync_interval,
-                             bool offline, std::string const &encryption_key) {
+                             bool offline, std::string const &encryption_key,
+                             std::string const &remote_encryption_key) {
     std::string path = opsqlite_get_db_path(name, base_path);
 
     int status;
@@ -53,6 +54,7 @@ DB opsqlite_libsql_open_sync(std::string const &name,
                             .auth_token = auth_token.c_str(),
                             .read_your_writes = '1',
                             .encryption_key = encryption_key.c_str(),
+                            .remote_encryption_key = remote_encryption_key.c_str(),
                             .sync_interval = sync_interval,
                             .with_webpki = '1',
                             .offline = offline};

package/cpp/libsql/bridge.h

@@ -41,7 +41,8 @@ DB opsqlite_libsql_open_remote(std::string const &url,
 DB opsqlite_libsql_open_sync(std::string const &name, std::string const &path,
                              std::string const &url,
                              std::string const &auth_token, int sync_interval,
-                             bool offline, std::string const &encryption_key);
+                             bool offline, std::string const &encryption_key,
+                             std::string const &remote_encryption_key);
 
 void opsqlite_libsql_close(DB &db);
 

package/cpp/libsql/libsql.h

@@ -41,6 +41,7 @@ typedef struct {
   int sync_interval;
   char with_webpki;
   char offline;
+  const char *remote_encryption_key;
 } libsql_config;
 
 typedef const libsql_connection *libsql_connection_t;