@capacitor-community/sqlite 5.7.2 → 5.7.3-2

package/README.md

@@ -18,7 +18,7 @@
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/dw/@capacitor-community/sqlite?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/sqlite"><img src="https://img.shields.io/npm/v/@capacitor-community/sqlite?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-40-orange?style=flat-square" /></a>
+<a href="#contributors-"><img src="https://img.shields.io/badge/all%20contributors-43-orange?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -357,7 +357,7 @@ npm install --save-dev electron-builder@24.6.4
 
 The iOS and Android codes are using `SQLCipher` allowing for database encryption.
 The iOS codes is using `ZIPFoundation` for unzipping assets files
-The Electron code is using `better-sqlite3-multiple-ciphers` , `electron-json-storage and `node-fetch`  from 5.0.4.
+The Electron code is using `better-sqlite3-multiple-ciphers` , `electron-json-storage` and `node-fetch`  from 5.0.4.
 The Web code is using the Stencil component `jeep-sqlite` based on `sql.js`, `localforage`. and `jszip`  
 
 ## Contributors ✨
@@ -408,6 +408,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <a href="https://github.com/DawidWetzler" title="DawidWetzler"><img src="https://avatars.githubusercontent.com/u/49675685?v=4" width="50" height="50" /></a>
   <a href="https://github.com/mmouterde" title="mmouterde"><img src="https://avatars.githubusercontent.com/u/733538?v=4" width="50" height="50" /></a>
   <a href="https://github.com/msfstef" title="msfstef"><img src="https://avatars.githubusercontent.com/u/12274098?v=4" width="50" height="50" /></a>
+  <a href="https://github.com/ChrisHSandN" title="
+ChrisHSandN"><img src="https://avatars.githubusercontent.com/u/13466620?v=4" width="50" height="50" /></a>
+  <a href="https://github.com/lasher23" title="
+lasher23"><img src="https://avatars.githubusercontent.com/u/24244618?v=4" width="50" height="50" /></a>
+  <a href="https://github.com/mirsella" title="
+mirsella"><img src="https://avatars.githubusercontent.com/u/45905567?v=4" width="50" height="50" /></a>
   </p>
 
 

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/Database.java

@@ -12,6 +12,7 @@ import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLStatemen
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.database.DatabaseUtils;
 import android.os.Build;
 import android.util.Log;
 import androidx.sqlite.db.SimpleSQLiteQuery;
@@ -503,7 +504,7 @@ public class Database {
                     String elementValue = "";
 
                     if (innerElement instanceof String) {
-                        elementValue = "'" + innerElement + "'";
+                        elementValue = DatabaseUtils.sqlEscapeString((String) innerElement);
                     } else {
                         elementValue = String.valueOf(innerElement);
                     }
@@ -520,7 +521,6 @@ public class Database {
                     sqlBuilder.append(",");
                 }
             }
-            sqlBuilder.append(";");
             String questionMark = extractQuestionMarkValues(statement);
             String finalSql = "";
             if (questionMark != null) {
@@ -537,7 +537,7 @@ public class Database {
     }
 
     public String extractQuestionMarkValues(String input) {
-        Pattern pattern = Pattern.compile("VALUES \\((\\?(?:,\\s*\\?\\s*)*)\\)");
+        Pattern pattern = Pattern.compile("(?i)VALUES \\((\\?(?:,\\s*\\?\\s*)*)\\)");
         Matcher matcher = pattern.matcher(input);
 
         if (matcher.find()) {

package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsDownloadFromHTTP.java

@@ -1,13 +1,17 @@
 package com.getcapacitor.community.database.sqlite.SQLite;
 
+import java.net.MalformedURLException;
 import android.content.Context;
-import android.content.res.AssetManager;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 public class UtilsDownloadFromHTTP {
 
@@ -16,34 +20,46 @@ public class UtilsDownloadFromHTTP {
     private final UtilsFile _uFile = new UtilsFile();
 
     public void download(Context context, String fileUrl) throws Exception {
-        AssetManager assetManager = context.getAssets();
-        String fileName = fileUrl.substring(fileUrl.lastIndexOf('/') + 1);
-        String dbName = fileName;
-        Boolean isZip = false;
-        if (!fileName.contains("SQLite.db")) {
-            if (_uFile.getFileExtension((fileName)).equals("db")) {
-                dbName = fileName.substring(0, fileName.length() - 3) + "SQLite.db";
-            }
-            if (_uFile.isLast(fileName, ".zip")) {
-                isZip = true;
+         Boolean isZip = false;
+        String fileName = "";
+        try {
+            String[] fileDetails = getFileDetails(fileUrl);
+            fileName = fileDetails[0];
+            String extension = fileDetails[1];
+            if (!fileName.contains("SQLite.db")) {
+                switch(extension) {
+                    case "db":
+                        fileName = fileName.substring(0, fileName.length() - 3) + "SQLite.db";
+                        break;
+                    case "zip":
+                        isZip = true;
+                        break;
+                    default:
+                        throw new Exception("Unknown file type. Filename: " + fileName);
+                }
             }
+
+        } catch (Exception e) {
+            throw new Exception(e.getMessage());
         }
+
+
         File cacheDir = context.getCacheDir();
         String cachePath = cacheDir.getAbsolutePath();
-        String tmpFilePath = cachePath + File.separator + dbName;
+        String tmpFilePath = cachePath + File.separator + fileName;
         String databasePath = _uFile.getDatabaseDirectoryPath(context);
         File databaseDir = new File(databasePath);
         try {
             // delete file if exists in cache
             Boolean isExists = _uFile.isPathExists(tmpFilePath);
             if (isExists) {
-                _uFile.deleteFile(cachePath, dbName);
+                _uFile.deleteFile(cachePath, fileName);
             }
-            downloadFileToCache(fileUrl, cachePath);
+            downloadFileToCache(fileUrl, fileName, cachePath);
             if (isZip) {
                 _uFile.unzipCopyDatabase(cachePath, null, tmpFilePath, true);
                 // delete zip file from cache
-                _uFile.deleteFile(cachePath, dbName);
+                _uFile.deleteFile(cachePath, fileName);
             }
             // move files to database folder
             _uFile.moveAllDBs(cacheDir, databaseDir);
@@ -52,28 +68,41 @@ public class UtilsDownloadFromHTTP {
         }
     }
 
-    public static void downloadFileToCache(String fileURL, String cacheDir) throws Exception {
+    public static String[] getFileDetails(String url) throws Exception {
+        try {
+            URL javaUrl = new URL(url);
+            String path = javaUrl.getPath();
+            String decodedPath = URLDecoder.decode(path, StandardCharsets.UTF_8.toString()); // Decode URL-encoded path
+            String filename = decodedPath.substring(decodedPath.lastIndexOf('/') + 1); // Extract filename from decoded path
+            String extension = getFileExtension(filename);
+            if(extension == null) {
+                throw new Exception("extension db or zip not found");
+            }
+            return new String[]{filename, extension};
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            throw new Exception(e.getMessage());
+        }
+    }
+    public static String getFileExtension(String filename) {
+        Pattern pattern = Pattern.compile("\\.([a-zA-Z0-9]+)(?:[\\?#]|$)");
+        Matcher matcher = pattern.matcher(filename);
+
+        if (matcher.find()) {
+            return matcher.group(1).toLowerCase(); // returns the matched extension in lowercase
+        }
+
+        return null; // no extension found
+    }
+    public static void downloadFileToCache(String fileURL, String fileName, String cacheDir) throws Exception {
         HttpURLConnection httpConn = null;
         try {
             URL url = new URL(fileURL);
             httpConn = (HttpURLConnection) url.openConnection();
+            httpConn.setRequestMethod("GET");
             int responseCode = httpConn.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK) {
-                String fileName = "";
-                String disposition = httpConn.getHeaderField("Content-Disposition");
-                //                String contentType = httpConn.getContentType();
                 int contentLength = httpConn.getContentLength();
-
-                if (disposition != null) {
-                    // extracts file name from header field
-                    int index = disposition.indexOf("filename=");
-                    if (index > 0) {
-                        fileName = disposition.substring(index + 10, disposition.length() - 1);
-                    }
-                } else {
-                    // extracts file name from URL
-                    fileName = fileURL.substring(fileURL.lastIndexOf("/") + 1);
-                }
                 String dbName = fileName;
                 if (!fileName.contains("SQLite.db")) {
                     if (fileName.substring(fileName.length() - 3).equals(".db")) {
@@ -81,26 +110,22 @@ public class UtilsDownloadFromHTTP {
                     }
                 }
 
-                //                System.out.println("Content-Type = " + contentType);
-                //                System.out.println("Content-Disposition = " + disposition);
-                //                System.out.println("Content-Length = " + contentLength);
-                //                System.out.println("fileName = " + fileName);
-                // opens input stream from the HTTP connection
-                InputStream inputStream = httpConn.getInputStream();
                 // create temporary file path
                 String tmpFilePath = cacheDir + File.separator + dbName;
-                // opens an output stream to save into file
-                FileOutputStream outputStream = new FileOutputStream(tmpFilePath);
-                int bytesRead = -1;
-                byte[] buffer = new byte[BUFFER_SIZE];
-                while ((bytesRead = inputStream.read(buffer)) != -1) {
-                    outputStream.write(buffer, 0, bytesRead);
-                }
+                // opens input stream from the HTTP connection
+                try (InputStream inputStream = httpConn.getInputStream();
+                     FileOutputStream outputStream = new FileOutputStream(tmpFilePath)) {
 
-                outputStream.close();
-                inputStream.close();
+                    byte[] buffer = new byte[1024];
+                    int bytesRead;
+                    while ((bytesRead = inputStream.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, bytesRead);
+                    }
+                    outputStream.close();
+                    inputStream.close();
 
-                System.out.println("File " + fileName + " downloaded (" + contentLength + ")");
+                    System.out.println("File " + fileName + " downloaded (" + contentLength + ")");
+                }
             } else {
                 String msg = "No file to download. Server replied HTTP code: " + responseCode;
                 throw new IOException(msg);

package/electron/dist/plugin.js

@@ -447,10 +447,14 @@ class UtilsFile {
      * @returns
      */
     getExtName(filePath) {
-        return this.Path.extname(filePath);
+        const matches = filePath.match(/\.([a-zA-Z0-9]+)(?:[\\?#]|$)/);
+        return matches ? `.${matches[1].toLowerCase()}` : ''; // returns the matched extension in lowercase
+        //    return this.Path.extname(filePath);
     }
     getBaseName(filePath) {
-        return this.Path.basename(filePath, this.Path.extname(filePath));
+        const decodedUrl = decodeURIComponent(filePath); // Decode the URL component
+        const baseName = this.Path.basename(decodedUrl, this.Path.extname(filePath));
+        return baseName;
     }
     /**
      * IsPathExists
@@ -589,34 +593,38 @@ class UtilsFile {
      */
     async unzipDatabase(db, fPath, overwrite) {
         const pZip = this.Path.join(fPath, db);
-        // Read the Zip file
-        this.NodeFs.readFile(pZip, (err, data) => {
-            if (err) {
-                console.log(err);
-                return Promise.reject(`unzipDatabase ${JSON.stringify(err)}`);
-            }
+        try {
+            // Read the Zip file
+            const data = await this.NodeFs.promises.readFile(pZip);
             const zip = new this.JSZip();
-            zip.loadAsync(data).then((contents) => {
-                Object.keys(contents.files).forEach(filename => {
-                    zip
-                        .file(filename)
-                        .async('nodebuffer')
-                        .then(async (content) => {
-                        const toDb = this.setPathSuffix(filename);
-                        const pDb = this.Path.join(this.getDatabasesPath(), toDb);
-                        // check filePath exists
-                        const isPath = this.isPathExists(pDb);
-                        if (!isPath || overwrite) {
-                            if (overwrite && isPath) {
-                                await this.deleteFilePath(pDb);
-                            }
-                            this.NodeFs.writeFileSync(pDb, content);
+            const contents = await zip.loadAsync(data);
+            // Create an array to store promises for writing files
+            const writePromises = [];
+            Object.keys(contents.files).forEach(filename => {
+                writePromises.push(zip
+                    .file(filename)
+                    .async('nodebuffer')
+                    .then(async (content) => {
+                    const toDb = this.setPathSuffix(filename);
+                    const pDb = this.Path.join(this.getDatabasesPath(), toDb);
+                    // check filePath exists
+                    const isPath = this.isPathExists(pDb);
+                    if (!isPath || overwrite) {
+                        if (overwrite && isPath) {
+                            await this.deleteFilePath(pDb);
                         }
-                        return Promise.resolve();
-                    });
-                });
+                        await this.NodeFs.promises.writeFile(pDb, content);
+                    }
+                }));
             });
-        });
+            // Wait for all write promises to resolve
+            await Promise.all(writePromises);
+            return Promise.resolve();
+        }
+        catch (err) {
+            console.log(err);
+            return Promise.reject(`unzipDatabase ${JSON.stringify(err)}`);
+        }
     }
     /**
      * CopyFileName
@@ -871,6 +879,7 @@ class UtilsFile {
                 }
             }
         }
+        return Promise.resolve();
     }
     /**
      * RestoreFileName
@@ -5893,6 +5902,7 @@ class CapacitorSQLite {
         else {
             throw new Error(`getFromHTTPRequest: cannot move file from cache overwrite: ${overwrite}`);
         }
+        return;
     }
     async getDatabaseList() {
         // get the database folder