initial JourneyApps PowerSync

stevensJourney · stevensJourney · commit 97c0538873ed · 2023-10-02T20:11:14.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
-Copyright 2021 Oscar Franco
+Copyright 2023 Oscar Franco, Journey Mobile, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
+# Alpha
+This package is currently in an alpha release. Functionality could change dramatically in future releases. Certain functions may be partially implemented or buggy.
+
 ![screenshot](https://raw.githubusercontent.com/margelo/react-native-quick-sqlite/main/header2.png)
 
 <div align="center">
@@ -299,7 +302,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     if target.name == "react-native-quick-sqlite" then
       target.build_configurations.each do |config|
-        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'SQLITE_ENABLE_FTS5=1'
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '<SQLITE_FLAGS>']
       end
     end
   end
diff --git a/android/.project b/android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android_</name>
+	<name>journeyapps_react-native-quick-sqlite</name>
 	<comment>Project android_ created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1695029328310</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,11 +1,11 @@
-arguments=
+arguments=--init-script /var/folders/jx/_56srfzj0s3d98w7v3tl8kvr0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/jx/_56srfzj0s3d98w7v3tl8kvr0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home
+java.home=/usr/local/Cellar/openjdk@11/11.0.14.1/libexec/openjdk.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
@@ -46,6 +46,12 @@ find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 find_library(LOG_LIB log)
 
+if(${USE_HERMES})
+  set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
+else()
+  set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
+endif()
+
 
 target_link_libraries(
   ${PACKAGE_NAME}
@@ -54,5 +60,7 @@ target_link_libraries(
   ReactAndroid::jsi
   ReactAndroid::turbomodulejsijni
   ReactAndroid::react_nativemodule_core
+  ${JSEXECUTOR_LIB}
   android
+  powersync ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libpowersync.so
 )
diff --git a/android/build.gradle b/android/build.gradle
@@ -62,6 +62,10 @@ android {
     prefab true
   }
 
+  sourceSets.main {
+        jniLibs.srcDirs = ['src/main/jniLibs'] 
+  }
+
   defaultConfig {
     minSdkVersion 21 
     targetSdkVersion safeExtGet('targetSdkVersion', 28)
@@ -86,9 +90,7 @@ android {
               "META-INF/**",
               "**/libjsi.so",
               "**/libreact_nativemodule_core.so",
-              "**/libturbomodulejsijni.so",
-              "**/libc++_shared.so",
-              "**/libfbjni.so"
+              "**/libturbomodulejsijni.so"
       ]
     }
     
diff --git a/android/src/main/jniLibs/arm64-v8a/libpowersync.so b/android/src/main/jniLibs/arm64-v8a/libpowersync.so
diff --git a/android/src/main/jniLibs/armeabi-v7a/libpowersync.so b/android/src/main/jniLibs/armeabi-v7a/libpowersync.so
diff --git a/android/src/main/jniLibs/x86/libpowersync.so b/android/src/main/jniLibs/x86/libpowersync.so
diff --git a/android/src/main/jniLibs/x86_64/libpowersync.so b/android/src/main/jniLibs/x86_64/libpowersync.so
diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp
@@ -9,25 +9,75 @@
 #include <string>
 #include "macros.h"
 #include <iostream>
+#include "sqlite3.h"
 
 using namespace std;
 using namespace facebook;
 
 namespace osp {
 string docPathStr;
 std::shared_ptr<react::CallInvoker> invoker;
+jsi::Runtime *runtime;
+
+extern "C" {
+  int sqlite3_powersync_init(sqlite3 *db, char **pzErrMsg,
+                            const sqlite3_api_routines *pApi);
+}
+
+/**
+ * This function loads the PowerSync extension into SQLite
+*/
+int init_powersync_sqlite_plugin() {
+  int result = sqlite3_auto_extension((void (*)(void))&sqlite3_powersync_init);
+  return result;
+}
 
 void clearState() {
-  sqliteCloseAll(); 
+  sqliteCloseAll();
+}
+
+/**
+ * Callback handler for SQLite table updates
+ */
+void
+updateTableHandler(void *voidDBName, int opType, char const *dbName, char const *tableName, sqlite3_int64 rowId)
+{
+  /**
+   * No DB operations should occur when this callback is fired from SQLite.
+   * This function triggers an async invocation to call watch callbacks,
+   * avoiding holding SQLite up.
+   */
+  invoker->invokeAsync([voidDBName, opType, dbName, tableName, rowId]
+     {
+      try {
+        // Sqlite 3 just returns main as the db name is no other DBs are attached
+        auto global = runtime->global();
+        jsi::Function handlerFunction = global.getPropertyAsFunction(*runtime, "triggerUpdateHook");
+
+        std::string actualDBName = std::string((char *)voidDBName);
+        auto jsiDbName = jsi::String::createFromAscii(*runtime, actualDBName);
+        auto jsiTableName = jsi::String::createFromAscii(*runtime, tableName);
+        auto jsiOpType = jsi::Value(opType);
+        auto jsiRowId = jsi::String::createFromAscii(*runtime, std::to_string(rowId));
+        handlerFunction.call(*runtime, move(jsiDbName), move(jsiTableName), move(jsiOpType), move(jsiRowId));
+      } catch (jsi::JSINativeException e) {
+        std::cout << e.what() << std::endl;
+      } catch (...) {
+        std::cout << "Unknown error" << std::endl;
+      } 
+      });
 }
 
 void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker, const char *docPath)
 {
   docPathStr = std::string(docPath);
   auto pool = std::make_shared<ThreadPool>();
   invoker = jsCallInvoker;
+  runtime = &rt;
 
   auto open = HOSTFN("open", 2) {
+    init_powersync_sqlite_plugin();
+
     if (count == 0)
     {
       throw jsi::JSError(rt, "[react-native-quick-sqlite][open] database name is required");
@@ -50,13 +100,17 @@ void install(jsi::Runtime &rt, std::shared_ptr<react::CallInvoker> jsCallInvoker
       tempDocPath = tempDocPath + "/" + args[1].asString(rt).utf8(rt);
     }
 
-    SQLiteOPResult result = sqliteOpenDb(dbName, tempDocPath);
+    sqlite3 *db;
+    SQLiteOPResult result = sqliteOpenDb(dbName, tempDocPath, &db);
 
     if (result.type == SQLiteError)
     {
       throw jsi::JSError(rt, result.errorMessage.c_str());
     }
 
+    // Register for update hooks
+    sqlite3_update_hook(db, updateTableHandler, getDBName(db));
+
     return {};
   });
   
diff --git a/cpp/sqliteBridge.cpp b/cpp/sqliteBridge.cpp
@@ -20,6 +20,9 @@
 using namespace std;
 using namespace facebook;
 
+
+
+
 map<string, sqlite3 *> dbMap = map<string, sqlite3 *>();
 
 bool folder_exists(const std::string &foldername)
@@ -80,26 +83,25 @@ string get_db_path(string const dbName, string const docPath)
   return docPath + "/" + dbName;
 }
 
-SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath)
+SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath, sqlite3 **db)
 {
   string dbPath = get_db_path(dbName, docPath);
 
   int sqlOpenFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX;
 
-  sqlite3 *db;
   int exit = 0;
-  exit = sqlite3_open_v2(dbPath.c_str(), &db, sqlOpenFlags, nullptr);
+  exit = sqlite3_open_v2(dbPath.c_str(), db, sqlOpenFlags, nullptr);
 
   if (exit != SQLITE_OK)
   {
     return SQLiteOPResult{
       .type = SQLiteError,
-      .errorMessage = sqlite3_errmsg(db)
+      .errorMessage = sqlite3_errmsg(*db)
     };
   }
   else
   {
-    dbMap[dbName] = db;
+    dbMap[dbName] = *db;
   }
 
   return SQLiteOPResult{
@@ -130,6 +132,15 @@ SQLiteOPResult sqliteCloseDb(string const dbName)
   };
 }
 
+char* getDBName(sqlite3 *db) {
+  for (auto const& x : dbMap) {
+    if (x.second == db) {
+      return (char*) x.first.c_str();
+    }
+  }
+  return NULL;
+}
+
 void sqliteCloseAll() {
   for (auto const& x : dbMap) {
     // In certain cases, this will return SQLITE_OK, mark the database connection as an unusable "zombie",
@@ -346,7 +357,7 @@ SQLiteOPResult sqliteExecute(string const dbName, string const &query, vector<Qu
             {
               int blob_size = sqlite3_column_bytes(statement, i);
               const void *blob = sqlite3_column_blob(statement, i);
-              uint8_t *data = new uint8_t[blob_size];
+              uint8_t *data;
               memcpy(data, blob, blob_size);
               row[column_name] = createArrayBufferQuickValue(data, blob_size);
               break;
diff --git a/cpp/sqliteBridge.h b/cpp/sqliteBridge.h
@@ -9,11 +9,12 @@
 
 #include "JSIHelper.h"
 #include <vector>
+#include <sqlite3.h>
 
 using namespace std;
 using namespace facebook;
 
-SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath);
+SQLiteOPResult sqliteOpenDb(string const dbName, string const docPath, sqlite3 **db);
 
 SQLiteOPResult sqliteCloseDb(string const dbName);
 
@@ -27,4 +28,6 @@ SQLiteOPResult sqliteExecute(string const dbName, string const &query, vector<Qu
 
 SequelLiteralUpdateResult sqliteExecuteLiteral(string const dbName, string const &query);
 
+char* getDBName(sqlite3 *db);
+
 void sqliteCloseAll();
diff --git a/example/src/Database.ts b/example/src/Database.ts
@@ -1,5 +1,4 @@
 import { DataSource } from 'typeorm';
-import { typeORMDriver } from 'react-native-quick-sqlite';
 import { Book } from './model/Book';
 import { User } from './model/User';
 // import { Buffer } from 'buffer';
@@ -10,7 +9,7 @@ export async function typeORMInit() {
     type: 'react-native',
     database: 'typeormdb',
     location: '.',
-    driver: typeORMDriver,
+    driver: require('react-native-quick-sqlite'),
     entities: [Book, User],
     synchronize: true,
   });
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
-  "name": "react-native-quick-sqlite",
-  "version": "8.0.5",
+  "name": "@journeyapps/react-native-quick-sqlite",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "version": "0.0.0",
   "description": "Fast SQLite for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -13,6 +17,7 @@
     "android",
     "ios",
     "cpp",
+    "meta.json",
     "react-native-quick-sqlite.podspec",
     "!lib/typescript/example",
     "!android/build",
@@ -23,8 +28,11 @@
     "!**/__mocks__"
   ],
   "scripts": {
+    "build": "bob build",
+    "clean": "rm -rf lib tsconfig.tsbuildinfo",
     "typescript": "tsc --noEmit",
     "prepare": "bob build",
+    "preversion": "node ./scripts/dev-package-version.js $npm_package_version",
     "example": "yarn --cwd example",
     "pods": "cd example/ios && bundle exec pod install",
     "bootstrap": "yarn example && yarn && yarn pods",
@@ -36,15 +44,12 @@
     "android"
   ],
   "repository": "https://github.com/margelo/react-native-quick-sqlite",
-  "author": "Marc Rousavy <me@mrousavy.com> (https://github.com/mrousavy)",
+  "author": "JOURNEYAPPS",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/margelo/react-native-quick-sqlite/issues"
   },
   "homepage": "https://github.com/margelo/react-native-quick-sqlite#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
   "devDependencies": {
     "react": "18.2.0",
     "react-native": "0.71.0",
diff --git a/react-native-quick-sqlite.podspec b/react-native-quick-sqlite.podspec
@@ -1,6 +1,10 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+if (File.exist?(File.join(__dir__, "meta.json")))
+  meta = JSON.parse(File.read(File.join(__dir__, "meta.json")))
+  package["version"] = meta["version"]
+end
 
 Pod::Spec.new do |s|
   s.name         = "react-native-quick-sqlite"
@@ -25,6 +29,7 @@ Pod::Spec.new do |s|
   s.dependency "React-callinvoker"
   s.dependency "React"
   s.dependency "React-Core"
+  s.dependency 'powersync-sqlite-core'
 
   if ENV['QUICK_SQLITE_USE_PHONE_VERSION'] == '1' then
     s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
diff --git a/scripts/dev-package-version.js b/scripts/dev-package-version.js
@@ -0,0 +1,17 @@
+/**
+ * Dev package version like 0.0.0-dev-hash seem to cause issues with the podspec
+ * This script will remove the -dev-hash from the version.
+ */
+const fs = require('fs');
+const path = require('path');
+const version = process.argv[2];
+
+if (version.includes('0.0.0')) {
+  console.log(`Storing current version for dev version ${version}`);
+  const currentPackage = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8'));
+  // Backup the current version
+  fs.writeFileSync(
+    path.join(__dirname, '../meta.json'),
+    JSON.stringify({ version: currentPackage.version }, null, '\t')
+  );
+}
diff --git a/src/index.ts b/src/index.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ android {`
`62`	`62`	`prefab true`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ sourceSets.main {`
	`66`	`+ jniLibs.srcDirs = ['src/main/jniLibs']`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`defaultConfig {`
`66`	`70`	`minSdkVersion 21`
`67`	`71`	`targetSdkVersion safeExtGet('targetSdkVersion', 28)`
`@@ -86,9 +90,7 @@ android {`
`86`	`90`	`"META-INF/**",`
`87`	`91`	`"**/libjsi.so",`
`88`	`92`	`"**/libreact_nativemodule_core.so",`
`89`		`- "**/libturbomodulejsijni.so",`
`90`		`- "**/libc++_shared.so",`
`91`		`- "**/libfbjni.so"`
	`93`	`+ "**/libturbomodulejsijni.so"`
`92`	`94`	`]`
`93`	`95`	`}`
`94`	`96`