strata-storage 2.1.0 → 2.3.0

package/dist/adapters/web/SessionStorageAdapter.js

@@ -20,7 +20,7 @@ export class SessionStorageAdapter extends LocalStorageAdapter {
         encrypted: false,
         crossTab: false, // Session storage is per-tab
     };
-    constructor(prefix = 'strata:session:') {
+    constructor(prefix = '') {
         super(prefix);
     }
     /**
@@ -101,7 +101,8 @@ export class SessionStorageAdapter extends LocalStorageAdapter {
      * Clear sessionStorage
      */
     async clear(options) {
-        if (!options || (!options.pattern && !options.tags && !options.expiredOnly)) {
+        if (!options ||
+            (!options.pattern && !options.prefix && !options.tags && !options.expiredOnly)) {
             // Clear all with our prefix
             const keysToRemove = [];
             for (let i = 0; i < window.sessionStorage.length; i++) {
@@ -143,23 +144,27 @@ export class SessionStorageAdapter extends LocalStorageAdapter {
         let count = 0;
         let keySize = 0;
         let valueSize = 0;
+        const byKey = {};
         for (let i = 0; i < window.sessionStorage.length; i++) {
             const fullKey = window.sessionStorage.key(i);
             if (fullKey?.startsWith(this.prefix)) {
                 const item = window.sessionStorage.getItem(fullKey);
                 if (item) {
                     count++;
+                    const key = fullKey.substring(this.prefix.length);
                     const itemSize = (fullKey.length + item.length) * 2; // UTF-16
                     total += itemSize;
                     if (detailed) {
                         keySize += fullKey.length * 2;
                         valueSize += item.length * 2;
+                        byKey[key] = itemSize;
                     }
                 }
             }
         }
         const result = { total, count };
         if (detailed) {
+            result.byKey = byKey;
             result.detailed = {
                 keys: keySize,
                 values: valueSize,
@@ -172,9 +177,9 @@ export class SessionStorageAdapter extends LocalStorageAdapter {
      * Subscribe to storage changes
      * Note: sessionStorage doesn't fire storage events in the same tab
      */
-    subscribe(_callback) {
+    subscribe(callback) {
         // For sessionStorage, we only get local changes, not cross-tab
-        // So we'll just return a no-op unsubscribe function
-        return () => { };
+        // Use the base class subscription for local changes
+        return super.subscribe(callback);
     }
 }

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

@@ -8,6 +8,9 @@ import androidx.security.crypto.MasterKey;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import org.json.JSONObject;
 
 public class EncryptedStorage {
     private SharedPreferences encryptedPrefs;
@@ -42,9 +45,23 @@ public class EncryptedStorage {
         }
     }
     
-    public boolean set(String key, String value) {
-        editor.putString(key, value);
-        return editor.commit();
+    public boolean set(String key, Object value) {
+        try {
+            String stringValue;
+            if (value instanceof String) {
+                stringValue = (String) value;
+            } else {
+                // Convert complex objects to JSON
+                stringValue = value instanceof JSONObject ? 
+                    ((JSONObject) value).toString() : 
+                    new JSONObject(value).toString();
+            }
+            editor.putString(key, stringValue);
+            return editor.commit();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
     
     public String get(String key) {
@@ -79,19 +96,19 @@ public class EncryptedStorage {
         return editor.commit();
     }
     
-    public Set<String> keys() {
+    public List<String> keys() {
         return keys(null);
     }
     
-    public Set<String> keys(String pattern) {
+    public List<String> keys(String pattern) {
         Set<String> allKeys = encryptedPrefs.getAll().keySet();
         
         if (pattern == null) {
-            return allKeys;
+            return new ArrayList<>(allKeys);
         }
         
         // Filter keys by pattern
-        Set<String> filteredKeys = new HashSet<>();
+        List<String> filteredKeys = new ArrayList<>();
         for (String key : allKeys) {
             if (key.startsWith(pattern) || key.contains(pattern)) {
                 filteredKeys.add(key);
@@ -103,4 +120,36 @@ public class EncryptedStorage {
     public boolean has(String key) {
         return encryptedPrefs.contains(key);
     }
+    
+    public SizeInfo size() {
+        Map<String, ?> all = encryptedPrefs.getAll();
+        long totalSize = 0;
+        int count = all.size();
+        
+        for (Map.Entry<String, ?> entry : all.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            
+            // Estimate size (key + value in bytes)
+            totalSize += key.getBytes().length;
+            if (value != null) {
+                totalSize += value.toString().getBytes().length;
+            }
+        }
+        
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

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

@@ -9,6 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.HashMap;
 import java.util.Map;
+import org.json.JSONObject;
+import java.nio.charset.StandardCharsets;
 
 public class SQLiteStorage extends SQLiteOpenHelper {
     private static final int DATABASE_VERSION = 1;
@@ -50,13 +52,31 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         onCreate(db);
     }
     
-    public boolean set(String key, byte[] value, Long expires, String tags, String metadata) {
+    public boolean set(String key, Object value, Long expires, String tags, String metadata) {
+        byte[] valueBytes;
+        
+        try {
+            if (value instanceof byte[]) {
+                valueBytes = (byte[]) value;
+            } else if (value instanceof String) {
+                valueBytes = ((String) value).getBytes(StandardCharsets.UTF_8);
+            } else {
+                // Convert complex objects to JSON then to bytes
+                String json = value instanceof JSONObject ? 
+                    ((JSONObject) value).toString() : 
+                    new JSONObject(value).toString();
+                valueBytes = json.getBytes(StandardCharsets.UTF_8);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         
         long now = System.currentTimeMillis();
         values.put(KEY_ID, key);
-        values.put(KEY_VALUE, value);
+        values.put(KEY_VALUE, valueBytes);
         values.put(KEY_CREATED, now);
         values.put(KEY_UPDATED, now);
         
@@ -75,6 +95,11 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         return result != -1;
     }
     
+    // Convenience method for simple Object values
+    public boolean set(String key, Object value) {
+        return set(key, value, null, null, null);
+    }
+    
     public Map<String, Object> get(String key) {
         SQLiteDatabase db = this.getReadableDatabase();
         Cursor cursor = db.query(TABLE_NAME, null, KEY_ID + "=?",
@@ -174,4 +199,34 @@ public class SQLiteStorage extends SQLiteOpenHelper {
         db.close();
         return exists;
     }
+    
+    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();
+        }
+        
+        db.close();
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

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

@@ -5,6 +5,8 @@ import android.content.SharedPreferences;
 import java.util.Map;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.List;
+import java.util.ArrayList;
 import org.json.JSONObject;
 import org.json.JSONArray;
 
@@ -83,19 +85,19 @@ public class SharedPreferencesStorage {
         return editor.commit();
     }
     
-    public Set<String> keys() {
+    public List<String> keys() {
         return keys(null);
     }
     
-    public Set<String> keys(String pattern) {
+    public List<String> keys(String pattern) {
         Set<String> allKeys = prefs.getAll().keySet();
         
         if (pattern == null) {
-            return allKeys;
+            return new ArrayList<>(allKeys);
         }
         
         // Filter keys by pattern
-        Set<String> filteredKeys = new HashSet<>();
+        List<String> filteredKeys = new ArrayList<>();
         for (String key : allKeys) {
             if (key.startsWith(pattern) || key.contains(pattern)) {
                 filteredKeys.add(key);
@@ -111,4 +113,36 @@ public class SharedPreferencesStorage {
     public Map<String, ?> getAll() {
         return prefs.getAll();
     }
+    
+    public SizeInfo size() {
+        Map<String, ?> all = prefs.getAll();
+        long totalSize = 0;
+        int count = all.size();
+        
+        for (Map.Entry<String, ?> entry : all.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            
+            // Estimate size (key + value in bytes)
+            totalSize += key.getBytes().length;
+            if (value != null) {
+                totalSize += value.toString().getBytes().length;
+            }
+        }
+        
+        return new SizeInfo(totalSize, count);
+    }
+    
+    /**
+     * Size information class
+     */
+    public static class SizeInfo {
+        public final long total;
+        public final int count;
+        
+        public SizeInfo(long total, int count) {
+            this.total = total;
+            this.count = count;
+        }
+    }
 }

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

@@ -11,7 +11,6 @@ import com.strata.storage.SQLiteStorage;
 import org.json.JSONArray;
 import org.json.JSONException;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Main Capacitor plugin for Strata Storage
@@ -226,40 +225,31 @@ public class StrataStoragePlugin extends Plugin {
         String storage = call.getString("storage", "preferences");
         
         try {
-            SizeInfo sizeInfo = null;
+            JSObject result = new JSObject();
             
             switch (storage) {
                 case "secure":
-                    sizeInfo = encryptedStorage.size();
+                    EncryptedStorage.SizeInfo encryptedSizeInfo = encryptedStorage.size();
+                    result.put("total", encryptedSizeInfo.total);
+                    result.put("count", encryptedSizeInfo.count);
                     break;
                 case "sqlite":
-                    sizeInfo = sqliteStorage.size();
+                    SQLiteStorage.SizeInfo sqliteSizeInfo = sqliteStorage.size();
+                    result.put("total", sqliteSizeInfo.total);
+                    result.put("count", sqliteSizeInfo.count);
                     break;
                 case "preferences":
                 default:
-                    sizeInfo = sharedPrefsStorage.size();
+                    SharedPreferencesStorage.SizeInfo prefsSizeInfo = sharedPrefsStorage.size();
+                    result.put("total", prefsSizeInfo.total);
+                    result.put("count", prefsSizeInfo.count);
                     break;
             }
             
-            JSObject result = new JSObject();
-            result.put("total", sizeInfo.total);
-            result.put("count", sizeInfo.count);
             call.resolve(result);
         } catch (Exception e) {
             call.reject("Failed to get size", e);
         }
     }
     
-    /**
-     * Size information class
-     */
-    static class SizeInfo {
-        public final long total;
-        public final int count;
-        
-        public SizeInfo(long total, int count) {
-            this.total = total;
-            this.count = count;
-        }
-    }
 }

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

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

package/dist/core/BaseAdapter.js

@@ -66,6 +66,10 @@ export class BaseAdapter {
         if (pattern instanceof RegExp) {
             return keys.filter((key) => pattern.test(key));
         }
+        // If pattern doesn't contain glob characters, treat it as a prefix
+        if (!pattern.includes('*') && !pattern.includes('?')) {
+            return keys.filter((key) => key.startsWith(pattern));
+        }
         return keys.filter((key) => matchGlob(pattern, key));
     }
     /**
@@ -88,8 +92,10 @@ export class BaseAdapter {
         const keys = await this.keys();
         for (const key of keys) {
             let shouldDelete = true;
-            if (options?.pattern) {
-                shouldDelete = this.filterKeys([key], options.pattern).length > 0;
+            // Support both pattern and prefix options
+            const pattern = options?.pattern || options?.prefix;
+            if (pattern) {
+                shouldDelete = this.filterKeys([key], pattern).length > 0;
             }
             if (shouldDelete && options?.tags) {
                 const value = await this.get(key);
@@ -117,14 +123,19 @@ export class BaseAdapter {
         let keySize = 0;
         let valueSize = 0;
         let metadataSize = 0;
+        const byKey = {};
         for (const key of keys) {
-            keySize += key.length * 2; // UTF-16
+            const keyLength = key.length * 2; // UTF-16
+            keySize += keyLength;
             const item = await this.get(key);
             if (item) {
                 const size = this.calculateSize(item);
                 valueSize += getObjectSize(item.value);
                 metadataSize += size - getObjectSize(item.value);
                 total += size;
+                if (detailed) {
+                    byKey[key] = size + keyLength;
+                }
             }
         }
         const result = {
@@ -132,6 +143,7 @@ export class BaseAdapter {
             count: keys.length,
         };
         if (detailed) {
+            result.byKey = byKey;
             result.detailed = {
                 keys: keySize,
                 values: valueSize,
@@ -181,8 +193,23 @@ export class BaseAdapter {
         const keys = await this.keys();
         for (const key of keys) {
             const item = await this.get(key);
-            if (item && !this.isExpired(item) && this.queryEngine.matches(item.value, condition)) {
-                results.push({ key, value: item.value });
+            if (item && !this.isExpired(item)) {
+                // Check if querying storage metadata (tags, metadata, etc) or the actual value
+                let matches = false;
+                // Check for storage-level properties
+                const storageProps = ['tags', 'metadata', 'created', 'updated', 'expires'];
+                const isStorageQuery = Object.keys(condition).some((k) => storageProps.includes(k));
+                if (isStorageQuery) {
+                    // Query against the storage wrapper
+                    matches = this.queryEngine.matches(item, condition);
+                }
+                else {
+                    // Query against the stored value
+                    matches = this.queryEngine.matches(item.value, condition);
+                }
+                if (matches) {
+                    results.push({ key, value: item.value });
+                }
             }
         }
         return results;

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

@@ -1 +1 @@
-{"version":3,"file":"Strata.d.ts","sourceRoot":"","sources":["../../src/core/Strata.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,cAAc,EACd,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,aAAa,EACb,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQpD;;GAEG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAA+C;IAC/D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,OAAO,CAAC,kBAAkB,CAAC,CAAqB;IAChD,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,UAAU,CAAC,CAAa;IAChC,OAAO,CAAC,YAAY,CAAkB;gBAE1B,MAAM,GAAE,YAAiB;IAMrC;;OAEG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAED;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmDjC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IA2DhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAwDtF;;;;;;;;;;;;;;;;OAgBG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE;;;;;;;;;;;;;;;;;OAiBG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAYnE;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBlF;;OAEG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAmBjD;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,mBAAmB;IAuBxF;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,OAAO,EACrB,SAAS,EAAE,cAAc,EACzB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IAU5C;;OAEG;IACG,MAAM,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtD;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BlE;;OAEG;IACH,wBAAwB,IAAI,WAAW,EAAE;IAIzC;;OAEG;IACH,eAAe,CACb,OAAO,CAAC,EAAE,WAAW,GACpB,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAc5D;;OAEG;IACH,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAOzC;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOzC;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAU3E;;OAEG;IACG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxF;;OAEG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnE;;OAEG;IACG,WAAW,CACf,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAWrD;;OAEG;IACG,cAAc,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAa/D;;;;;;;;;OASG;IACH,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI;IAI9C;;;OAGG;IACH,WAAW,IAAI,eAAe;IAI9B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B5B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,kBAAkB;YAgBZ,oBAAoB;YAsCpB,kBAAkB;YAKlB,aAAa;CA2B5B"}
+{"version":3,"file":"Strata.d.ts","sourceRoot":"","sources":["../../src/core/Strata.ts"],"names":[],"mappings":"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"}

package/dist/core/Strata.js

@@ -375,17 +375,28 @@ export class Strata {
         let total = 0;
         let count = 0;
         const byStorage = {};
+        const allByKey = {};
         for (const [type, adapter] of this.adapters.entries()) {
             const sizeInfo = await adapter.size(detailed);
             total += sizeInfo.total;
             count += sizeInfo.count;
             byStorage[type] = sizeInfo.total;
+            // Aggregate byKey data if detailed
+            if (detailed && sizeInfo.byKey) {
+                for (const [key, size] of Object.entries(sizeInfo.byKey)) {
+                    allByKey[key] = (allByKey[key] || 0) + size;
+                }
+            }
         }
-        return {
+        const result = {
             total,
             count,
             byStorage: byStorage,
         };
+        if (detailed) {
+            result.byKey = allByKey;
+        }
+        return result;
     }
     /**
      * Subscribe to storage changes

package/dist/ios/Plugin/KeychainStorage.swift

@@ -11,18 +11,30 @@ import Security
         super.init()
     }
     
-    @objc public func set(key: String, value: Data) -> Bool {
+    @objc public func set(key: String, value: Any) throws -> Bool {
+        let data: Data
+        
+        if let dataValue = value as? Data {
+            data = dataValue
+        } else if let stringValue = value as? String {
+            data = stringValue.data(using: .utf8) ?? Data()
+        } else {
+            // Convert to JSON for complex objects
+            let jsonData = try JSONSerialization.data(withJSONObject: value, options: [])
+            data = jsonData
+        }
+        
         let query = createQuery(key: key)
         SecItemDelete(query as CFDictionary)
         
         var newItem = query
-        newItem[kSecValueData as String] = value
+        newItem[kSecValueData as String] = data
         
         let status = SecItemAdd(newItem as CFDictionary, nil)
         return status == errSecSuccess
     }
     
-    @objc public func get(key: String) -> Data? {
+    @objc public func get(key: String) throws -> Any? {
         var query = createQuery(key: key)
         query[kSecReturnData as String] = true
         query[kSecMatchLimit as String] = kSecMatchLimitOne
@@ -31,22 +43,29 @@ import Security
         let status = SecItemCopyMatching(query as CFDictionary, &result)
         
         guard status == errSecSuccess else { return nil }
-        return result as? Data
+        guard let data = result as? Data else { return nil }
+        
+        // Try to parse as JSON first, fallback to string
+        if let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []) {
+            return jsonObject
+        } else {
+            return String(data: data, encoding: .utf8)
+        }
     }
     
-    @objc public func remove(key: String) -> Bool {
+    @objc public func remove(key: String) throws -> Bool {
         let query = createQuery(key: key)
         let status = SecItemDelete(query as CFDictionary)
         return status == errSecSuccess
     }
     
-    @objc public func clear(prefix: String? = nil) -> Bool {
+    @objc public func clear(prefix: String? = nil) throws -> Bool {
         if let prefix = prefix {
             // Clear only keys with the given prefix
-            let keysToRemove = keys(pattern: prefix)
+            let keysToRemove = try keys(pattern: prefix)
             var allSuccess = true
             for key in keysToRemove {
-                if !remove(key: key) {
+                if !(try remove(key: key)) {
                     allSuccess = false
                 }
             }
@@ -62,7 +81,7 @@ import Security
         }
     }
     
-    @objc public func keys(pattern: String? = nil) -> [String] {
+    @objc public func keys(pattern: String? = nil) throws -> [String] {
         var query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: service,
@@ -106,4 +125,20 @@ import Security
         
         return query
     }
+    
+    @objc public func size() throws -> (total: Int, count: Int) {
+        let allKeys = try keys()
+        var totalSize = 0
+        
+        for key in allKeys {
+            if let data = try get(key: key) as? Data {
+                totalSize += data.count
+            } else if let string = try get(key: key) as? String {
+                totalSize += string.data(using: .utf8)?.count ?? 0
+            }
+            totalSize += key.data(using: .utf8)?.count ?? 0
+        }
+        
+        return (total: totalSize, count: allKeys.count)
+    }
 }

package/dist/ios/Plugin/SQLiteStorage.swift

@@ -53,7 +53,18 @@ import SQLite3
         sqlite3_finalize(createTableStatement)
     }
     
-    @objc public func set(key: String, value: Data, expires: Int64? = nil, tags: [String]? = nil, metadata: [String: Any]? = nil) -> Bool {
+    @objc public func set(key: String, value: Any, expires: Int64? = nil, tags: [String]? = nil, metadata: [String: Any]? = nil) throws -> Bool {
+        let data: Data
+        
+        if let dataValue = value as? Data {
+            data = dataValue
+        } else if let stringValue = value as? String {
+            data = stringValue.data(using: .utf8) ?? Data()
+        } else {
+            // Convert to JSON for complex objects
+            data = try JSONSerialization.data(withJSONObject: value, options: [])
+        }
+        
         let now = Int64(Date().timeIntervalSince1970 * 1000)
         let tagsJson = tags != nil ? try? JSONSerialization.data(withJSONObject: tags!, options: []) : nil
         let metadataJson = metadata != nil ? try? JSONSerialization.data(withJSONObject: metadata!, options: []) : nil
@@ -67,7 +78,7 @@ import SQLite3
         var statement: OpaquePointer?
         let result = sqlite3_prepare_v2(db, insertSQL, -1, &statement, nil) == SQLITE_OK &&
             sqlite3_bind_text(statement, 1, key, -1, nil) == SQLITE_OK &&
-            sqlite3_bind_blob(statement, 2, (value as NSData).bytes, Int32(value.count), nil) == SQLITE_OK &&
+            sqlite3_bind_blob(statement, 2, (data as NSData).bytes, Int32(data.count), nil) == SQLITE_OK &&
             sqlite3_bind_int64(statement, 3, now) == SQLITE_OK &&
             sqlite3_bind_int64(statement, 4, now) == SQLITE_OK &&
             (expires != nil ? sqlite3_bind_int64(statement, 5, expires!) : sqlite3_bind_null(statement, 5)) == SQLITE_OK &&
@@ -79,6 +90,11 @@ import SQLite3
         return result
     }
     
+    // Convenience method for simple values
+    @objc public func set(key: String, value: Any) throws -> Bool {
+        return try set(key: key, value: value, expires: nil, tags: nil, metadata: nil)
+    }
+    
     @objc public func get(key: String) -> [String: Any]? {
         let querySQL = "SELECT * FROM \(tableName) WHERE key = ? LIMIT 1"
         var statement: OpaquePointer?
@@ -187,4 +203,22 @@ import SQLite3
         sqlite3_finalize(statement)
         return keys
     }
+    
+    @objc public func size() throws -> (total: Int, count: Int) {
+        let querySQL = "SELECT COUNT(*), SUM(LENGTH(value)) FROM \(tableName)"
+        var statement: OpaquePointer?
+        
+        var totalSize = 0
+        var count = 0
+        
+        if sqlite3_prepare_v2(db, querySQL, -1, &statement, nil) == SQLITE_OK {
+            if sqlite3_step(statement) == SQLITE_ROW {
+                count = Int(sqlite3_column_int(statement, 0))
+                totalSize = Int(sqlite3_column_int64(statement, 1))
+            }
+        }
+        
+        sqlite3_finalize(statement)
+        return (total: totalSize, count: count)
+    }
 }