@capacitor-community/sqlite 6.0.0-beta.2 → 6.0.1-dev.094dcaf.1724913257

package/ios/Plugin/Utils/UtilsDownloadFromHTTP.swift

@@ -158,14 +158,17 @@ class UtilsDownloadFromHTTP {
     }
 
     class func extractDBFiles(from zipFile: URL, completion: @escaping ([URL], Error?) -> Void) {
-        DispatchQueue.global().async {
+        DispatchQueue.global().async(execute: {
             var dbFiles: [URL] = []
 
             do {
                 let destinationURL = zipFile.deletingLastPathComponent()
 
-                // Use the throwing initializer
-                let archive = try Archive(url: zipFile, accessMode: .read)
+                guard let archive = Archive(url: zipFile, accessMode: .read) else {
+                    let msg = "Failed in reading Archive"
+                    completion([], UtilsDownloadError.invalidArchive(message: msg))
+                    return
+                }
 
                 for entry in archive where entry.type == .file {
                     let fileURL = destinationURL.appendingPathComponent(entry.path)
@@ -176,15 +179,14 @@ class UtilsDownloadFromHTTP {
                         dbFiles.append(fileURL)
                     }
                 }
-
                 // Delete the zip file
                 try FileManager.default.removeItem(at: zipFile)
 
                 completion(dbFiles, nil)
             } catch {
-                let msg = "Failed in reading Archive: \(error.localizedDescription)"
-                completion([], UtilsDownloadError.invalidArchive(message: msg))
+                completion([], error)
             }
-        }
+        })
+
     }
 }

package/ios/Plugin/Utils/UtilsFile.swift

@@ -421,13 +421,15 @@ class UtilsFile {
 
     }
 
-    class func unzipToDatabase(fromURL: URL, databaseLocation: String, zip: String, overwrite: Bool) throws {
+    class func unzipToDatabase(fromURL: URL, databaseLocation: String, zip: String,
+                               overwrite: Bool) throws {
         do {
             let zipAsset: URL = fromURL.appendingPathComponent(zip)
-            
-            // Use the throwing initializer
-            let archive = try Archive(url: zipAsset, accessMode: .read)
-            
+            guard let archive = Archive(url: zipAsset, accessMode: .read) else {
+                let msg = "Error: Read Archive: \(zipAsset) failed"
+                print("\(msg)")
+                throw UtilsFileError.unzipToDatabaseFailed(message: msg)
+            }
             let uDb: URL = try getFolderURL(folderPath: databaseLocation)
             for entry in archive {
                 let dbEntry = setPathSuffix(sDb: entry.path)
@@ -440,6 +442,7 @@ class UtilsFile {
                         }
                         _ = try archive.extract(entry, to: zipCopy)
                     }
+
                 } catch {
                     let msg = "Error: Extracting \(entry.path) from archive failed \(error.localizedDescription)"
                     print("\(msg)")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.1-dev.094dcaf.1724913257",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/src/definitions.ts

@@ -1137,13 +1137,13 @@ export interface ISQLiteConnection {
   /**
    * Add the upgrade Statement for database version upgrading
    * @param database
-   * @param upgrade @since 5.6.4 
+   * @param upgrade @since 5.6.4
    * @returns Promise<void>
    * @since 2.9.0 refactor
    */
   addUpgradeStatement(
     database: string,
-    upgrade: capSQLiteVersionUpgrade[]
+    upgrade: capSQLiteVersionUpgrade[],
   ): Promise<void>;
   /**
    * Create a connection to a database
@@ -1457,7 +1457,7 @@ export class SQLiteConnection implements ISQLiteConnection {
   }
   async addUpgradeStatement(
     database: string,
-    upgrade: capSQLiteVersionUpgrade[]
+    upgrade: capSQLiteVersionUpgrade[],
   ): Promise<void> {
     try {
       if (database.endsWith('.db')) database = database.slice(0, -3);
@@ -2408,13 +2408,11 @@ export class SQLiteDBConnection implements ISQLiteDBConnection {
         database: this.dbName,
       });
       if (!isActive) {
-        return Promise.reject(
-          'After Begin Transaction, no transaction active',
-        );
+        return Promise.reject('After Begin Transaction, no transaction active');
       }
       try {
         for (const task of txn) {
-          if(typeof task !== 'object' || !('statement' in task)) {
+          if (typeof task !== 'object' || !('statement' in task)) {
             throw new Error('Error a task.statement must be provided');
           }
           if ('values' in task && task.values && task.values.length > 0) {

package/src/web.ts

@@ -45,47 +45,47 @@ export class CapacitorSQLiteWeb
   private isWebStoreOpen = false;
 
   async initWebStore(): Promise<void> {
-     await customElements.whenDefined('jeep-sqlite')
+    await customElements.whenDefined('jeep-sqlite');
+
+    this.jeepSqliteElement = document.querySelector('jeep-sqlite');
+    this.ensureJeepSqliteIsAvailable();
+
+    this.jeepSqliteElement.addEventListener(
+      'jeepSqliteImportProgress',
+      (event: CustomEvent) => {
+        this.notifyListeners('sqliteImportProgressEvent', event.detail);
+      },
+    );
+    this.jeepSqliteElement.addEventListener(
+      'jeepSqliteExportProgress',
+      (event: CustomEvent) => {
+        this.notifyListeners('sqliteExportProgressEvent', event.detail);
+      },
+    );
+    this.jeepSqliteElement.addEventListener(
+      'jeepSqliteHTTPRequestEnded',
+      (event: CustomEvent) => {
+        this.notifyListeners('sqliteHTTPRequestEndedEvent', event.detail);
+      },
+    );
+    this.jeepSqliteElement.addEventListener(
+      'jeepSqlitePickDatabaseEnded',
+      (event: CustomEvent) => {
+        this.notifyListeners('sqlitePickDatabaseEndedEvent', event.detail);
+      },
+    );
+    this.jeepSqliteElement.addEventListener(
+      'jeepSqliteSaveDatabaseToDisk',
+      (event: CustomEvent) => {
+        this.notifyListeners('sqliteSaveDatabaseToDiskEvent', event.detail);
+      },
+    );
 
-      this.jeepSqliteElement = document.querySelector('jeep-sqlite');
-      this.ensureJeepSqliteIsAvailable();
-
-      this.jeepSqliteElement.addEventListener(
-        'jeepSqliteImportProgress',
-        (event: CustomEvent) => {
-          this.notifyListeners('sqliteImportProgressEvent', event.detail);
-        },
-      );
-      this.jeepSqliteElement.addEventListener(
-        'jeepSqliteExportProgress',
-        (event: CustomEvent) => {
-          this.notifyListeners('sqliteExportProgressEvent', event.detail);
-        },
-      );
-      this.jeepSqliteElement.addEventListener(
-        'jeepSqliteHTTPRequestEnded',
-        (event: CustomEvent) => {
-          this.notifyListeners('sqliteHTTPRequestEndedEvent', event.detail);
-        },
-      );
-      this.jeepSqliteElement.addEventListener(
-        'jeepSqlitePickDatabaseEnded',
-        (event: CustomEvent) => {
-          this.notifyListeners('sqlitePickDatabaseEndedEvent', event.detail);
-        },
-      );
-      this.jeepSqliteElement.addEventListener(
-        'jeepSqliteSaveDatabaseToDisk',
-        (event: CustomEvent) => {
-          this.notifyListeners('sqliteSaveDatabaseToDiskEvent', event.detail);
-        },
-      );
-
-      if (!this.isWebStoreOpen) {
-        this.isWebStoreOpen = await this.jeepSqliteElement.isStoreOpen();
-      }
+    if (!this.isWebStoreOpen) {
+      this.isWebStoreOpen = await this.jeepSqliteElement.isStoreOpen();
+    }
 
-      return;
+    return;
   }
 
   async saveToStore(options: capSQLiteOptions): Promise<void> {
@@ -204,7 +204,6 @@ export class CapacitorSQLiteWeb
     } catch (err) {
       throw new Error(`${err}`);
     }
-
   }
   async beginTransaction(options: capSQLiteOptions): Promise<capSQLiteChanges> {
     this.ensureJeepSqliteIsAvailable();
@@ -285,7 +284,6 @@ export class CapacitorSQLiteWeb
     } catch (err) {
       throw new Error(`${err}`);
     }
-
   }
 
   async executeSet(options: capSQLiteSetOptions): Promise<capSQLiteChanges> {
@@ -555,7 +553,6 @@ export class CapacitorSQLiteWeb
     }
   }
 
-
   ////////////////////////////////////
   ////// UNIMPLEMENTED METHODS
   ////////////////////////////////////