cordova-sqlite-evmax-build-free 0.0.11 → 0.1.0

package/CHANGES.md

@@ -1,5 +1,21 @@
 # Changes
 
+# cordova-sqlite-evmax-build-free 0.1.0
+
+## cordova-sqlite-evmax-feat-android-db-location 0.0.3-dev
+
+## cordova-sqlite-evmax-common-free 0.0.8-dev
+
+- more robust handling of large results on Android - replace PluginResult.setKeepCallback() usage to avoid potential stability issue described in:
+- https://github.com/storesafe/cordova-plugin-sqlite-evplus-ext-common-free/issues/14
+
+NOTE: While this may introduce a little more overhead, this overhead is expected to be very minor relative to the cost of handling large results between the C, Java, and JavaScript code.
+
+# cordova-sqlite-evmax-build-free 0.0.12
+
+- update SQLite -> 3.51.2
+- disable support for macOS ("OSX") & Windows (deprecated Cordova platforms)
+
 # cordova-sqlite-evmax-build-free 0.0.11
 
 - rebuild JAR with JDK 17, as needed by many build systems with Gradle 8

package/README.md

@@ -3,8 +3,10 @@
 Native SQLite component with API based on HTML5/[Web SQL (DRAFT) API](http://www.w3.org/TR/webdatabase/) for the following platforms:
 - Android
 - iOS
-- macOS ("osx" platform)
-- Windows 10 (UWP) DESKTOP ~~and MOBILE~~ (see below for major limitations)
+- ~~macOS ("osx" platform)~~
+- ~~Windows 10 (UWP) DESKTOP and MOBILE (see below for major limitations)~~
+
+NOTICE: DEPRECATED Cordova OSX & WINDOWS PLATFORMS ARE NO LONGER SUPPORTED BY THIS PLUGIN VERSION
 
 <!-- [TBD] HIDE browser usage notes for now (at least):
 Browser platform is currently supported with some limitations as described in [browser platform usage notes](#browser-platform-usage-notes) section below, will be supported with more features such as numbered parameters and SQL batch API in the near future.
@@ -52,7 +54,7 @@ under consideration:
 
 ## About this plugin version
 
-Super-premium enterprise version with additional performance and stability improvements for Android, iOS, and macOS, including workarounds for super-large INSERT transactions and SELECT results on Android - with limited extra features (missing pre-populated database support), using the `before_plugin_install` hook to fetch the sqlite3 component dependencies from <https://github.com/brodybits/cordova-sqlite-evmax-free-dependencies-dev>.
+Super-premium enterprise version with additional performance and stability improvements for Android, iOS, ~~and macOS,~~ including workarounds for super-large INSERT transactions and SELECT results on Android - with limited extra features (missing pre-populated database support), using the `before_plugin_install` hook to fetch the sqlite3 component dependencies from <https://github.com/brodybits/cordova-sqlite-evmax-free-dependencies-dev>.
 
 <!-- FUTURE TBD critical bug notices for this plugin version -->
 
@@ -200,8 +202,8 @@ See the [Sample section](#sample) for a sample with a more detailed explanation
   - Cordova versions older than `6.0.0` are missing the `cordova-ios@4.0.0` security fixes.
 - This plugin version includes the following extra (non-standard) features:
   - BASE64 and BLOBFROMBASE64 integrated from [brodybits / sqlite3-base64](https://github.com/brodybits/sqlite3-base64), using [brodybits / libb64-core](https://github.com/brodybits/libb64-core) (based on <http://libb64.sourceforge.net/> by Chris Venter, public domain)
-  - REGEXP for Android (default Android-sqlite-connector database implementation), iOS, and macOS using [brodybits / sqlite3-regexp-cached](https://github.com/brodybits/sqlite3-regexp-cached) (based on <http://git.altlinux.org/people/at/packages/?p=sqlite3-pcre.git> by Alexey Tourbin, public domain)
-- SQLite __`3.43.1`__ included when building (all platforms), with the following compile-time definitions:
+  - REGEXP for Android (default Android-sqlite-connector database implementation), iOS, ~~and macOS~~ using [brodybits / sqlite3-regexp-cached](https://github.com/brodybits/sqlite3-regexp-cached) (based on <http://git.altlinux.org/people/at/packages/?p=sqlite3-pcre.git> by Alexey Tourbin, public domain)
+- SQLite __`3.51.2`__ included when building (all platforms), with the following compile-time definitions:
   - `SQLITE_THREADSAFE=1`
   - `SQLITE_DEFAULT_SYNCHRONOUS=3` (EXTRA DURABLE build setting) ref: [xpbrew/cordova-sqlite-storage#736](https://github.com/xpbrew/cordova-sqlite-storage/issues/736)
   - `SQLITE_LOCKING_STYLE=1` on iOS/macOS ONLY
@@ -282,7 +284,7 @@ See the [Sample section](#sample) for a sample with a more detailed explanation
 - This plugin version now supports SELECT BLOB data in Base64 format on all platforms in addition to REGEXP (Android/iOS/macOS) ~~and pre-populated database (all platforms - FUTURE TODO)~~.
 - [brodybits / sql-promise-helper](https://github.com/brodybits/sql-promise-helper) provides a Promise-based API wrapper.
 - _[`pouchdb-adapter-cordova-sqlite`](https://github.com/nolanlawson/pouchdb-adapter-cordova-sqlite) supports this plugin along with other implementations such as [nolanlawson / sqlite-plugin-2](https://github.com/nolanlawson/sqlite-plugin-2) and [Microsoft / cordova-plugin-websql](https://github.com/Microsoft/cordova-plugin-websql)._
-- macOS ("osx" platform) is now supported
+- ~~macOS ("osx" platform) is now supported~~
 - Published [brodybits / Cordova-quick-start-checklist](https://github.com/brodybits/Cordova-quick-start-checklist) and [brodybits / Avoiding-some-Cordova-pitfalls](https://github.com/brodybits/Avoiding-some-Cordova-pitfalls).
 - Self-test functions to verify proper installation and operation of this plugin
 - More explicit `openDatabase` and `deleteDatabase` `iosDatabaseLocation` option

package/SQLitePlugin.coffee.md

@@ -721,10 +721,16 @@
         cb1 = (result) ->
           if result[0] is 'multi'
             ch1 = true
+            # trigger next callback from Java side
+            # (using "fjnext:..." rather than "fj:..." for the sake of clarity)
+            cordova.exec cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]
           else if result[0] isnt null
             resultSet = resultSet.concat result.slice(0, result.length-1)
             if !ch1
               cb1 [null]
+            if ch1
+              # trigger next callback from Java side (see comment above regarding "fjnext:")
+              cordova.exec cb1, null, "SQLitePlugin", "fjnext:0;extra", [mydbid, 0]
           else # if result[0] is null
             if (index + 1 == batchExecutesLength)
               cb resultSet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-evmax-build-free",
-  "version": "0.0.11",
+  "version": "0.1.0",
   "description": "Cordova/PhoneGap sqlite storage - free evmax enterprise version with premium stability and performance improvements including workaround for super-large INSERT transactions & SELECT results on Android (version with external sqlite3 dependencies)",
   "cordova": {
     "id": "cordova-sqlite-evmax-build-free",

package/plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlite-evmax-build-free"
-    version="0.0.11">
+    version="0.1.0">
 
     <name>Cordova sqlite storage - free evmax common version branch with premium stability performance improvements including workaround for super-large INSERT transactions and SELECT results on Android (with external sqlite3 dependencies)</name>
 
@@ -70,7 +70,7 @@
     </platform>
 
     <!-- macOS (osx) -->
-    <platform name="osx">
+    <platform name="disabled-osx">
         <config-file target="config.xml" parent="/*">
             <feature name="SQLitePlugin">
                 <param name="osx-package" value="SQLitePlugin" />
@@ -103,7 +103,7 @@
     </platform>
 
     <!-- windows -->
-    <platform name="windows">
+    <platform name="disabled-windows">
         <js-module src="src/windows/sqlite-proxy.js" name="SQLiteProxy">
             <runs />
         </js-module>
@@ -114,18 +114,9 @@
         </js-module>
 
         <!-- Thanks to AllJoyn-Cordova / cordova-plugin-alljoyn for guidance: -->
-        <!-- uncomment next line to rebuild WinMD & DLL artifacts - Release build is required:
+        <!-- uncomment next line to build WinMD & DLL artifacts - Release build is required:
         <framework src="src/windows/SQLite3-WinRT-sync/SQLite3/SQLite3.UWP.vcxproj" custom="true" type="projectReference" versions="10.*" />
         -->
-        <!-- remove these when rebuilding WinMD & DLL artifacts -->
-        <!-- sources:
-             - https://www.dynamsoft.com/codepool/cordova-plugin-barcode-winrt.html
-             - https://github.com/yushulx/cordova-windows-barcode
-             - -->
-        <framework src="src/windows/libs/dummy/BarcodeComponent.winmd" target-dir="x86" arch="x86" custom="true"/>
-        <framework src="src/windows/libs/x86/SQLite3.winmd" target-dir="x86" arch="x86" custom="true" implementation="src/windows/libs/x86/SQLite3.UWP.dll"/>
-        <framework src="src/windows/libs/dummy/BarcodeComponent.winmd" target-dir="x64" arch="x64" custom="true"/>
-        <framework src="src/windows/libs/x86/SQLite3.winmd" target-dir="x64" arch="x64" custom="true" implementation="src/windows/libs/x64/SQLite3.UWP.dll"/>
     </platform>
 
 </plugin>

package/spec/www/spec/sqlite-version-test.js

@@ -104,7 +104,7 @@ var mytests = function() {
               expect(rs).toBeDefined();
               expect(rs.rows).toBeDefined();
               expect(rs.rows.length).toBe(1);
-              expect(rs.rows.item(0).myResult).toBe('3.43.1');
+              expect(rs.rows.item(0).myResult).toBe('3.51.2');
 
               // Close (plugin only) & finish:
               (isWebSql) ? done() : db.close(done, done);

package/src/android/io/sqlc/SQLitePlugin.java

@@ -61,7 +61,7 @@ public class SQLitePlugin extends CordovaPlugin {
 
     @Override
     public boolean execute(String actionAsString, String argsAsString, CallbackContext cbc) {
-        if (actionAsString.startsWith("fj")) {
+        if (actionAsString.startsWith("fj")) { // matches both fj: & fjnext: actions
             int sep1pos = actionAsString.indexOf(':');
             int sep2pos = actionAsString.indexOf(';');
 
@@ -514,10 +514,11 @@ public class SQLitePlugin extends CordovaPlugin {
                         final String jr1 = EVNDKDriver.sqlc_evplus_qc_execute(qc, dbq.fj);
                         final boolean multi = jr1.charAt(2) == 'm';
                         final PluginResult pr1 = new MyPluginResult(jr1);
+                        dbq.cbc.sendPluginResult(pr1);
                         if (multi) {
-                            pr1.setKeepCallback(true);
+                            // wait for fjnext: action from JavaScript
+                            dbq = q.take();
                         }
-                        dbq.cbc.sendPluginResult(pr1);
 
                         boolean more = multi;
 
@@ -525,10 +526,11 @@ public class SQLitePlugin extends CordovaPlugin {
                             final String jr2 = EVNDKDriver.sqlc_evplus_qc_execute(qc, "");
                             more = jr2.charAt(1) != 'n';
                             final PluginResult pr2 = new MyPluginResult(jr2);
+                            dbq.cbc.sendPluginResult(pr2);
                             if (more) {
-                                pr2.setKeepCallback(true);
+                                // wait for fjnext: action from JavaScript
+                                dbq = q.take();
                             }
-                            dbq.cbc.sendPluginResult(pr2);
                         }
 
                         // cleanup: