@capgo/capacitor-fast-sql 8.0.25 → 8.0.30

package/CapgoCapacitorFastSql.podspec

@@ -10,10 +10,19 @@ Pod::Spec.new do |s|
   s.homepage = package['repository']['url']
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '15.0'
-  s.dependency 'Capacitor'
-  s.dependency 'Telegraph', '~> 0.30'
-  s.dependency 'SQLCipher', '~> 4.10'
   s.swift_version = '5.1'
+  s.default_subspecs = 'Core'
+
+  s.subspec 'Core' do |ss|
+    ss.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+    ss.dependency 'Capacitor'
+    ss.dependency 'Telegraph', '~> 0.30'
+  end
+
+  # Optional encryption support. Include this subspec to enable SQLCipher.
+  s.subspec 'SQLCipher' do |ss|
+    ss.dependency 'CapgoCapacitorFastSql/Core'
+    ss.dependency 'SQLCipher', '~> 4.10'
+  end
 end

package/README.md

@@ -103,7 +103,9 @@ Then reference it in your `AndroidManifest.xml`:
 </application>
 ```
 
-## Encryption (Android)
+## Encryption
+
+### Android
 
 Encryption uses [SQLCipher](https://www.zetetic.net/sqlcipher/) and is opt-in. Add the SQLCipher dependency to your **app-level** `build.gradle`:
 
@@ -125,6 +127,18 @@ const db = await FastSQL.connect({
 
 If SQLCipher is not installed and `encrypted: true` is passed, the plugin returns a clear error message instead of crashing.
 
+### iOS
+
+SQLCipher is optional on iOS. The plugin builds without it; encryption calls will return `Encryption is not available in this build` unless SQLCipher is installed.
+
+To enable encryption via CocoaPods, update your `ios/App/Podfile` after `capacitor install`/`cap sync` to use the SQLCipher subspec:
+
+```ruby
+pod 'CapgoCapacitorFastSql/SQLCipher', :path => '../../node_modules/@capgo/capacitor-fast-sql'
+```
+
+Then run `pod install` in the `ios/App` directory. If you skip this subspec, keep `encrypted: false`.
+
 ## Web Platform
 
 On the web, this plugin uses [sql.js](https://sql.js.org/) (SQLite compiled to WebAssembly) with IndexedDB for persistence.

package/android/build.gradle

@@ -54,7 +54,7 @@ dependencies {
     implementation 'androidx.sqlite:sqlite:2.6.2'
     implementation 'com.google.code.gson:gson:2.13.2'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
-    compileOnly 'net.zetetic:sqlcipher-android:4.14.0'
+    compileOnly 'net.zetetic:sqlcipher-android:4.14.1'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/java/app/capgo/capacitor/fastsql/CapgoCapacitorFastSqlPlugin.java

@@ -19,7 +19,7 @@ import java.util.Map;
 @CapacitorPlugin(name = "CapgoCapacitorFastSql")
 public class CapgoCapacitorFastSqlPlugin extends Plugin {
 
-    private final String pluginVersion = "8.0.25";
+    private final String pluginVersion = "8.0.30";
 
     private Map<String, DatabaseConnection> databases = new HashMap<>();
     private SQLHTTPServer server;

package/android/src/main/java/app/capgo/capacitor/fastsql/SQLHTTPServer.java

@@ -11,6 +11,9 @@ import fi.iki.elonen.NanoHTTPD; // Note: org.nanohttpd:nanohttpd:2.3.1 still use
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -25,6 +28,12 @@ public class SQLHTTPServer extends NanoHTTPD {
     private final String token;
     private final Map<String, DatabaseConnection> databases;
     private final Gson gson = new Gson();
+    private final ExecutorService requestExecutor = Executors.newSingleThreadExecutor((runnable) -> {
+        Thread thread = new Thread(runnable);
+        thread.setName("FastSQL-DB");
+        thread.setDaemon(true);
+        return thread;
+    });
 
     public SQLHTTPServer(Map<String, DatabaseConnection> databases) throws IOException {
         super(findAvailablePort());
@@ -48,6 +57,12 @@ public class SQLHTTPServer extends NanoHTTPD {
         return response;
     }
 
+    @Override
+    public void stop() {
+        super.stop();
+        requestExecutor.shutdownNow();
+    }
+
     @Override
     public Response serve(IHTTPSession session) {
         if (Method.OPTIONS.equals(session.getMethod())) {
@@ -69,25 +84,34 @@ public class SQLHTTPServer extends NanoHTTPD {
             return addCorsHeaders(newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "Database not found"));
         }
 
+        try {
+            return requestExecutor.submit(() -> routeRequest(session, db)).get();
+        } catch (ExecutionException e) {
+            Throwable cause = e.getCause();
+            String message = cause != null ? cause.getMessage() : e.getMessage();
+            return addCorsHeaders(newFixedLengthResponse(Response.Status.INTERNAL_ERROR, "text/plain", "Error: " + message));
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return addCorsHeaders(newFixedLengthResponse(Response.Status.INTERNAL_ERROR, "text/plain", "Request interrupted"));
+        }
+    }
+
+    private Response routeRequest(IHTTPSession session, DatabaseConnection db) throws Exception {
         String uri = session.getUri();
         Method method = session.getMethod();
 
-        try {
-            if (method == Method.POST && uri.equals("/execute")) {
-                return addCorsHeaders(handleExecute(session, db));
-            } else if (method == Method.POST && uri.equals("/batch")) {
-                return addCorsHeaders(handleBatch(session, db));
-            } else if (method == Method.POST && uri.equals("/transaction/begin")) {
-                return addCorsHeaders(handleBeginTransaction(db));
-            } else if (method == Method.POST && uri.equals("/transaction/commit")) {
-                return addCorsHeaders(handleCommitTransaction(db));
-            } else if (method == Method.POST && uri.equals("/transaction/rollback")) {
-                return addCorsHeaders(handleRollbackTransaction(db));
-            } else {
-                return addCorsHeaders(newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "Endpoint not found"));
-            }
-        } catch (Exception e) {
-            return addCorsHeaders(newFixedLengthResponse(Response.Status.INTERNAL_ERROR, "text/plain", "Error: " + e.getMessage()));
+        if (method == Method.POST && uri.equals("/execute")) {
+            return addCorsHeaders(handleExecute(session, db));
+        } else if (method == Method.POST && uri.equals("/batch")) {
+            return addCorsHeaders(handleBatch(session, db));
+        } else if (method == Method.POST && uri.equals("/transaction/begin")) {
+            return addCorsHeaders(handleBeginTransaction(db));
+        } else if (method == Method.POST && uri.equals("/transaction/commit")) {
+            return addCorsHeaders(handleCommitTransaction(db));
+        } else if (method == Method.POST && uri.equals("/transaction/rollback")) {
+            return addCorsHeaders(handleRollbackTransaction(db));
+        } else {
+            return addCorsHeaders(newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "Endpoint not found"));
         }
     }
 

package/ios/Sources/CapgoCapacitorFastSqlPlugin/CapgoCapacitorFastSqlPlugin.swift

@@ -10,7 +10,7 @@ import SQLite3
  */
 @objc(CapgoCapacitorFastSqlPlugin)
 public class CapgoCapacitorFastSqlPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.0.25"
+    private let pluginVersion: String = "8.0.30"
     public let identifier = "CapgoCapacitorFastSqlPlugin"
     public let jsName = "CapgoCapacitorFastSql"
     public let pluginMethods: [CAPPluginMethod] = [

package/ios/Sources/CapgoCapacitorFastSqlPlugin/SQLDatabase.swift

@@ -270,7 +270,7 @@ extension SQLError: LocalizedError {
         case .encryptionKeyMissing:
             return "Encryption key is required when encryption is enabled"
         case .encryptionUnavailable:
-            return "Encryption is not available in this build"
+            return "Encryption is not available in this build. Add SQLCipher to enable encryption."
         case .encryptionFailed(let message):
             return "Failed to set encryption key: \(message)"
         case .transactionAlreadyActive:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-fast-sql",
-  "version": "8.0.25",
+  "version": "8.0.30",
   "description": "High-performance native SQLite plugin with custom protocol for efficient sync operations and IndexedDB replacement",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",