strata-storage 2.4.0 → 2.4.1

package/dist/android/src/main/java/com/strata/storage/SQLiteStorage.java

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.content.ContentValues;
+import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
@@ -78,7 +79,7 @@ public class SQLiteStorage extends SQLiteOpenHelper {
                 valueBytes = json.getBytes(StandardCharsets.UTF_8);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            Log.e("StrataStorage", "Failed to set value in SQLite", e);
             return false;
         }
         SQLiteDatabase db = this.getWritableDatabase();
@@ -112,36 +113,41 @@ public class SQLiteStorage extends SQLiteOpenHelper {
     
     public Map<String, Object> get(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
-                new String[]{key}, null, null, null, null);
-                
-        Map<String, Object> result = null;
-        if (cursor != null && cursor.moveToFirst()) {
-            result = new HashMap<>();
-            result.put("key", key);
-            result.put("value", cursor.getBlob(cursor.getColumnIndex(KEY_VALUE)));
-            result.put("created", cursor.getLong(cursor.getColumnIndex(KEY_CREATED)));
-            result.put("updated", cursor.getLong(cursor.getColumnIndex(KEY_UPDATED)));
-            
-            int expiresIndex = cursor.getColumnIndex(KEY_EXPIRES);
-            if (!cursor.isNull(expiresIndex)) {
-                result.put("expires", cursor.getLong(expiresIndex));
-            }
-            
-            int tagsIndex = cursor.getColumnIndex(KEY_TAGS);
-            if (!cursor.isNull(tagsIndex)) {
-                result.put("tags", cursor.getString(tagsIndex));
+        Cursor cursor = null;
+        try {
+            cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
+                    new String[]{key}, null, null, null, null);
+
+            Map<String, Object> result = null;
+            if (cursor != null && cursor.moveToFirst()) {
+                result = new HashMap<>();
+                result.put("key", key);
+                result.put("value", cursor.getBlob(cursor.getColumnIndex(KEY_VALUE)));
+                result.put("created", cursor.getLong(cursor.getColumnIndex(KEY_CREATED)));
+                result.put("updated", cursor.getLong(cursor.getColumnIndex(KEY_UPDATED)));
+
+                int expiresIndex = cursor.getColumnIndex(KEY_EXPIRES);
+                if (!cursor.isNull(expiresIndex)) {
+                    result.put("expires", cursor.getLong(expiresIndex));
+                }
+
+                int tagsIndex = cursor.getColumnIndex(KEY_TAGS);
+                if (!cursor.isNull(tagsIndex)) {
+                    result.put("tags", cursor.getString(tagsIndex));
+                }
+
+                int metadataIndex = cursor.getColumnIndex(KEY_METADATA);
+                if (!cursor.isNull(metadataIndex)) {
+                    result.put("metadata", cursor.getString(metadataIndex));
+                }
             }
-            
-            int metadataIndex = cursor.getColumnIndex(KEY_METADATA);
-            if (!cursor.isNull(metadataIndex)) {
-                result.put("metadata", cursor.getString(metadataIndex));
+            return result;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
             }
-            
-            cursor.close();
+            db.close();
         }
-        db.close();
-        return result;
     }
     
     public boolean remove(String key) {
@@ -179,52 +185,73 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         List<String> keys = new ArrayList<>();
         String selectQuery;
         String[] selectionArgs = null;
-        
+
         if (pattern != null) {
             selectQuery = "SELECT " + KEY_ID + " FROM " + TABLE_NAME + " WHERE " + KEY_ID + " LIKE ?";
-            selectionArgs = new String[]{"% " + pattern + "%"};
+            selectionArgs = new String[]{"%" + pattern + "%"};
         } else {
             selectQuery = "SELECT " + KEY_ID + " FROM " + TABLE_NAME;
         }
-        
+
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.rawQuery(selectQuery, selectionArgs);
-        
-        if (cursor.moveToFirst()) {
-            do {
-                keys.add(cursor.getString(0));
-            } while (cursor.moveToNext());
+        Cursor cursor = null;
+        try {
+            cursor = db.rawQuery(selectQuery, selectionArgs);
+
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    keys.add(cursor.getString(0));
+                } while (cursor.moveToNext());
+            }
+            return keys;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
         }
-        cursor.close();
-        db.close();
-        return keys;
     }
     
     public boolean has(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(TABLE_NAME, new String[]{KEY_ID}, KEY_ID + "=?",
-                new String[]{key}, null, null, null, null);
-        boolean exists = cursor.getCount() > 0;
-        cursor.close();
-        db.close();
-        return exists;
+        Cursor cursor = null;
+        try {
+            cursor = db.query(TABLE_NAME, new String[]{KEY_ID}, KEY_ID + "=?",
+                    new String[]{key}, null, null, null, null);
+            boolean exists = cursor != null && cursor.getCount() > 0;
+            return exists;
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
+        }
     }
     
     public SizeInfo size() {
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.rawQuery("SELECT COUNT(*), SUM(LENGTH(" + KEY_VALUE + ")) FROM " + TABLE_NAME, null);
-        
-        long totalSize = 0;
-        int count = 0;
-        
-        if (cursor != null && cursor.moveToFirst()) {
-            count = cursor.getInt(0);
-            totalSize = cursor.getLong(1);
-            cursor.close();
+        Cursor cursor = null;
+        try {
+            cursor = db.rawQuery("SELECT COUNT(*), SUM(LENGTH(" + KEY_VALUE + ")) FROM " + TABLE_NAME, null);
+
+            long totalSize = 0;
+            int count = 0;
+
+            if (cursor != null && cursor.moveToFirst()) {
+                count = cursor.getInt(0);
+                // Check for NULL values from SQL SUM function
+                if (!cursor.isNull(1)) {
+                    totalSize = cursor.getLong(1);
+                }
+            }
+
+            return new SizeInfo(totalSize, count);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+            db.close();
         }
-        
-        db.close();
-        return new SizeInfo(totalSize, count);
     }
     
     /**

package/dist/android/src/main/java/com/strata/storage/SharedPreferencesStorage.java

@@ -2,6 +2,7 @@ package com.strata.storage;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
@@ -37,7 +38,13 @@ public class SharedPreferencesStorage {
             } else if (value instanceof Boolean) {
                 editor.putBoolean(key, (Boolean) value);
             } else if (value instanceof Set) {
-                editor.putStringSet(key, (Set<String>) value);
+                // Safely convert to Set<String>
+                Set<?> rawSet = (Set<?>) value;
+                Set<String> stringSet = new HashSet<>();
+                for (Object item : rawSet) {
+                    stringSet.add(item != null ? item.toString() : "null");
+                }
+                editor.putStringSet(key, stringSet);
             } else {
                 // Convert complex objects to JSON
                 String json;
@@ -56,7 +63,7 @@ public class SharedPreferencesStorage {
             }
             return editor.commit();
         } catch (Exception e) {
-            e.printStackTrace();
+            Log.e("StrataStorage", "Failed to set value in SharedPreferences", e);
             return false;
         }
     }

package/dist/android/src/main/java/com/stratastorage/StrataStoragePlugin.java

@@ -8,6 +8,7 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 import com.strata.storage.SharedPreferencesStorage;
 import com.strata.storage.EncryptedStorage;
 import com.strata.storage.SQLiteStorage;
+import android.util.Log;
 import org.json.JSONArray;
 import org.json.JSONException;
 import java.util.List;
@@ -30,7 +31,7 @@ public class StrataStoragePlugin extends Plugin {
             sqliteStorage = new SQLiteStorage(getContext());
         } catch (Exception e) {
             // Log error but don't crash - some storage types may not be available
-            e.printStackTrace();
+            Log.e("StrataStorage", "Failed to initialize storage", e);
         }
     }
 
@@ -68,20 +69,32 @@ public class StrataStoragePlugin extends Plugin {
         
         try {
             Object value = null;
-            
+
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     value = encryptedStorage.get(key);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     value = sqliteStorage.get(key);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     value = sharedPrefsStorage.get(key);
                     break;
             }
-            
+
             JSObject result = new JSObject();
             result.put("value", value);
             call.resolve(result);
@@ -107,17 +120,29 @@ public class StrataStoragePlugin extends Plugin {
         try {
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     encryptedStorage.set(key, value);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     sqliteStorage.set(key, value);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     sharedPrefsStorage.set(key, value);
                     break;
             }
-            
+
             call.resolve();
         } catch (Exception e) {
             call.reject("Failed to set value", e);
@@ -140,17 +165,29 @@ public class StrataStoragePlugin extends Plugin {
         try {
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     encryptedStorage.remove(key);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     sqliteStorage.remove(key);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     sharedPrefsStorage.remove(key);
                     break;
             }
-            
+
             call.resolve();
         } catch (Exception e) {
             call.reject("Failed to remove value", e);
@@ -168,17 +205,29 @@ public class StrataStoragePlugin extends Plugin {
         try {
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     encryptedStorage.clear(prefix);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     sqliteStorage.clear(prefix);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     sharedPrefsStorage.clear(prefix);
                     break;
             }
-            
+
             call.resolve();
         } catch (Exception e) {
             call.reject("Failed to clear storage", e);
@@ -195,20 +244,32 @@ public class StrataStoragePlugin extends Plugin {
         
         try {
             List<String> keys = null;
-            
+
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     keys = encryptedStorage.keys(pattern);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     keys = sqliteStorage.keys(pattern);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     keys = sharedPrefsStorage.keys(pattern);
                     break;
             }
-            
+
             JSObject result = new JSObject();
             result.put("keys", new JSONArray(keys));
             call.resolve(result);
@@ -226,26 +287,38 @@ public class StrataStoragePlugin extends Plugin {
         
         try {
             JSObject result = new JSObject();
-            
+
             switch (storage) {
                 case "secure":
+                    if (encryptedStorage == null) {
+                        call.reject("Encrypted storage not available");
+                        return;
+                    }
                     EncryptedStorage.SizeInfo encryptedSizeInfo = encryptedStorage.size();
                     result.put("total", encryptedSizeInfo.total);
                     result.put("count", encryptedSizeInfo.count);
                     break;
                 case "sqlite":
+                    if (sqliteStorage == null) {
+                        call.reject("SQLite storage not available");
+                        return;
+                    }
                     SQLiteStorage.SizeInfo sqliteSizeInfo = sqliteStorage.size();
                     result.put("total", sqliteSizeInfo.total);
                     result.put("count", sqliteSizeInfo.count);
                     break;
                 case "preferences":
                 default:
+                    if (sharedPrefsStorage == null) {
+                        call.reject("Preferences storage not available");
+                        return;
+                    }
                     SharedPreferencesStorage.SizeInfo prefsSizeInfo = sharedPrefsStorage.size();
                     result.put("total", prefsSizeInfo.total);
                     result.put("count", prefsSizeInfo.count);
                     break;
             }
-            
+
             call.resolve(result);
         } catch (Exception e) {
             call.reject("Failed to get size", e);

package/dist/core/Strata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Strata.d.ts","sourceRoot":"","sources":["../../src/core/Strata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Strata.d.ts","sourceRoot":"","sources":["../../src/core/Strata.ts"],"names":[],"mappings":"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"}

package/dist/core/Strata.js

@@ -3,7 +3,7 @@
  * Zero-dependency universal storage solution
  */
 import { AdapterRegistry } from "./AdapterRegistry.js";
-import { isBrowser, isNode } from "../utils/index.js";
+import { isBrowser, isNode, deepMerge } from "../utils/index.js";
 import { StorageError, EncryptionError } from "../utils/errors.js";
 import { EncryptionManager } from "../features/encryption.js";
 import { CompressionManager } from "../features/compression.js";
@@ -474,11 +474,9 @@ export class Strata {
             else if (options?.merge) {
                 const existing = await this.get(key);
                 if (options.merge === 'deep' && typeof existing === 'object' && typeof value === 'object') {
-                    // Deep merge will be implemented with utils
-                    await this.set(key, {
-                        ...existing,
-                        ...value,
-                    });
+                    // Use deep merge utility for proper nested object merging
+                    const merged = deepMerge(existing, value);
+                    await this.set(key, merged);
                 }
                 else {
                     await this.set(key, value);

package/dist/firebase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.d.ts","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CA8Jf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAQ5D"}
+{"version":3,"file":"firebase.d.ts","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAI5C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CAyOf;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAQ5D"}

package/dist/firebase.js

@@ -1,3 +1,4 @@
+import { StorageError } from "./utils/errors.js";
 /**
  * Enable Firebase sync for Strata Storage
  * This dynamically imports Firebase SDK only when needed
@@ -19,8 +20,9 @@ export async function enableFirebaseSync(storage, config) {
             });
         }
         if (config.firestore) {
+            const { getFirestore, doc, setDoc, getDoc, deleteDoc, collection, getDocs, onSnapshot } = 
             // @ts-expect-error - Firebase is an optional peer dependency
-            const { getFirestore, doc, setDoc, getDoc, deleteDoc } = await import('firebase/firestore');
+            await import('firebase/firestore');
             const db = getFirestore();
             const collectionName = config.collectionName || 'strata-storage';
             // Create custom adapter for Firestore
@@ -56,12 +58,31 @@ export async function enableFirebaseSync(storage, config) {
                     return docSnap.exists();
                 },
                 async clear() {
-                    // Firestore doesn't have a direct clear method
-                    console.warn('Clear operation not supported for Firestore adapter');
+                    try {
+                        const collectionRef = collection(db, collectionName);
+                        const snapshot = await getDocs(collectionRef);
+                        const deletePromises = snapshot.docs.map((docSnapshot) => deleteDoc(doc(db, collectionName, docSnapshot.id)));
+                        await Promise.all(deletePromises);
+                    }
+                    catch (error) {
+                        throw new StorageError('Failed to clear Firestore collection', {
+                            collectionName,
+                            originalError: error,
+                        });
+                    }
                 },
                 async keys() {
-                    // Would need to implement with queries
-                    return [];
+                    try {
+                        const collectionRef = collection(db, collectionName);
+                        const snapshot = await getDocs(collectionRef);
+                        return snapshot.docs.map((docSnapshot) => docSnapshot.id);
+                    }
+                    catch (error) {
+                        throw new StorageError('Failed to retrieve keys from Firestore', {
+                            collectionName,
+                            originalError: error,
+                        });
+                    }
                 },
                 async size() {
                     return { total: 0, count: 0 };
@@ -72,9 +93,24 @@ export async function enableFirebaseSync(storage, config) {
                 async isAvailable() {
                     return true;
                 },
-                subscribe() {
-                    // Not implemented for Firebase adapter
-                    return () => { };
+                subscribe(callback) {
+                    const collectionRef = collection(db, collectionName);
+                    const unsubscribe = onSnapshot(collectionRef, (snapshot) => {
+                        snapshot
+                            .docChanges()
+                            .forEach((change) => {
+                            const docData = change.doc.data();
+                            callback({
+                                key: change.doc.id,
+                                oldValue: change.type === 'removed' ? docData.value : undefined,
+                                newValue: change.type !== 'removed' ? docData.value : undefined,
+                                source: 'remote',
+                                storage: 'firestore',
+                                timestamp: Date.now(),
+                            });
+                        });
+                    });
+                    return unsubscribe;
                 },
                 async close() {
                     // No cleanup needed
@@ -86,7 +122,7 @@ export async function enableFirebaseSync(storage, config) {
         }
         if (config.realtimeDatabase) {
             // @ts-expect-error - Firebase is an optional peer dependency
-            const { getDatabase, ref, set, get, remove } = await import('firebase/database');
+            const { getDatabase, ref, set, get, remove, onValue } = await import('firebase/database');
             const db = getDatabase();
             // Create custom adapter for Realtime Database
             const realtimeAdapter = {
@@ -134,9 +170,32 @@ export async function enableFirebaseSync(storage, config) {
                 async isAvailable() {
                     return true;
                 },
-                subscribe() {
-                    // Not implemented for Firebase adapter
-                    return () => { };
+                subscribe(callback) {
+                    const dbRef = ref(db, 'strata-storage');
+                    let previousData = {};
+                    const unsubscribe = onValue(dbRef, (snapshot) => {
+                        const snapshotTyped = snapshot;
+                        const currentData = snapshotTyped.exists()
+                            ? snapshotTyped.val()
+                            : {};
+                        const allKeys = new Set([...Object.keys(previousData), ...Object.keys(currentData)]);
+                        allKeys.forEach((key) => {
+                            const oldValue = previousData[key];
+                            const newValue = currentData[key];
+                            if (oldValue !== newValue) {
+                                callback({
+                                    key,
+                                    oldValue,
+                                    newValue,
+                                    source: 'remote',
+                                    storage: 'realtime',
+                                    timestamp: Date.now(),
+                                });
+                            }
+                        });
+                        previousData = { ...currentData };
+                    });
+                    return unsubscribe;
                 },
                 async close() {
                     // No cleanup needed
@@ -149,7 +208,10 @@ export async function enableFirebaseSync(storage, config) {
         // Firebase sync enabled successfully
     }
     catch (error) {
-        throw new Error(`Failed to enable Firebase sync: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        throw new StorageError('Failed to enable Firebase sync', {
+            originalError: error,
+            config,
+        });
     }
 }
 /**