strata-storage 2.3.0 → 2.4.1

package/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/adapters/web/MemoryAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/web/MemoryAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,cAAc,EACf,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAY;IACtC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAUxC;IAEF,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAK;IAExB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;OAEG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9D;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAepE;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B1E;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxC;;OAEG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBlD;;OAEG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC;;OAEG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBxD;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IAgC9F;;OAEG;IACH,cAAc,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAOlD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}
+{"version":3,"file":"MemoryAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/web/MemoryAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EACnB,YAAY,EACZ,YAAY,EACZ,cAAc,EACf,MAAM,SAAS,CAAC;AAIjB;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAY;IACtC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAUxC;IAEF,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,WAAW,CAAK;IAExB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;OAEG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9D;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAepE;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC1E;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxC;;OAEG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBlD;;OAEG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC;;OAEG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBxD;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IAgC9F;;OAEG;IACH,cAAc,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAOlD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7B"}

package/dist/adapters/web/MemoryAdapter.js

@@ -4,6 +4,7 @@
  */
 import { BaseAdapter } from "../../core/BaseAdapter.js";
 import { deepClone } from "../../utils/index.js";
+import { QuotaExceededError } from "../../utils/errors.js";
 /**
  * In-memory storage adapter using Map
  */
@@ -62,7 +63,12 @@ export class MemoryAdapter extends BaseAdapter {
             const oldSize = oldValue ? this.calculateSize(oldValue) : 0;
             const projectedSize = this.currentSize - oldSize + newSize;
             if (projectedSize > this.maxSize) {
-                throw new Error(`Memory storage size limit exceeded. Limit: ${this.maxSize}, Projected: ${projectedSize}`);
+                throw new QuotaExceededError('Memory storage size limit exceeded', {
+                    limit: this.maxSize,
+                    current: this.currentSize,
+                    projected: projectedSize,
+                    key,
+                });
             }
         }
         // Store a deep clone to prevent external modifications

package/dist/adapters/web/SessionStorageAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionStorageAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/web/SessionStorageAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEhE;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB;IAC5D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAoB;IAC9C,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAUxC;gBAEU,MAAM,SAAK;IAIvB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBrC;;OAEG;IACH,SAAS,CAAC,UAAU,IAAI,OAAO;IAI/B;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAoBtF;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5F;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC;;OAEG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBpE;;OAEG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAmBxD;;OAEG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC;IAwCnE;;;OAGG;IACH,SAAS,CACP,QAAQ,EAAE,OAAO,SAAS,EAAE,oBAAoB,GAC/C,OAAO,SAAS,EAAE,mBAAmB;CAKzC"}
+{"version":3,"file":"SessionStorageAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/web/SessionStorageAdapter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEhE;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB;IAC5D,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAoB;IAC9C,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAUxC;gBAEU,MAAM,SAAK;IAIvB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBrC;;OAEG;IACH,SAAS,CAAC,UAAU,IAAI,OAAO;IAI/B;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAoBtF;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5F;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxC;;OAEG;IACG,KAAK,CAAC,OAAO,CAAC,EAAE,OAAO,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBpE;;OAEG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAmBxD;;OAEG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,SAAS,EAAE,QAAQ,CAAC;IAwCnE;;;OAGG;IACH,SAAS,CACP,QAAQ,EAAE,OAAO,SAAS,EAAE,oBAAoB,GAC/C,OAAO,SAAS,EAAE,mBAAmB;CAKzC"}

package/dist/adapters/web/SessionStorageAdapter.js

@@ -3,6 +3,7 @@
  * Provides session-scoped storage with 5-10MB limit
  */
 import { LocalStorageAdapter } from "./LocalStorageAdapter.js";
+import { QuotaExceededError, SerializationError } from "../../utils/errors.js";
 /**
  * Browser sessionStorage adapter
  * Extends LocalStorageAdapter as the API is identical
@@ -80,9 +81,9 @@ export class SessionStorageAdapter extends LocalStorageAdapter {
         }
         catch (error) {
             if (this.isQuotaError(error)) {
-                throw new Error(`SessionStorage quota exceeded for key ${key}`);
+                throw new QuotaExceededError('SessionStorage quota exceeded', { key, error });
             }
-            throw new Error(`Failed to store key ${key} in sessionStorage: ${error}`);
+            throw new SerializationError(`Failed to store key ${key} in sessionStorage`, error);
         }
         // Emit change event
         this.emitChange(key, oldValue?.value, value.value, 'local');

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

@@ -3,42 +3,52 @@ package com.strata.storage;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
+import android.util.Log;
 import androidx.security.crypto.EncryptedSharedPreferences;
 import androidx.security.crypto.MasterKey;
+import java.security.GeneralSecurityException;
+import java.io.IOException;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
 import org.json.JSONObject;
+import org.json.JSONArray;
 
 public class EncryptedStorage {
     private SharedPreferences encryptedPrefs;
     private SharedPreferences.Editor editor;
     private static final String DEFAULT_NAME = "StrataSecureStorage";
     
-    public EncryptedStorage(Context context) throws Exception {
+    public EncryptedStorage(Context context) throws GeneralSecurityException, IOException {
         this(context, DEFAULT_NAME);
     }
-    
-    public EncryptedStorage(Context context, String name) throws Exception {
+
+    public EncryptedStorage(Context context, String name) throws GeneralSecurityException, IOException {
         String fileName = name != null ? name : DEFAULT_NAME;
-        
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            MasterKey masterKey = new MasterKey.Builder(context)
-                .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
-                .build();
-                
-            encryptedPrefs = EncryptedSharedPreferences.create(
-                context,
-                fileName,
-                masterKey,
-                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-            );
-            
-            editor = encryptedPrefs.edit();
+            try {
+                MasterKey masterKey = new MasterKey.Builder(context)
+                    .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
+                    .build();
+
+                encryptedPrefs = EncryptedSharedPreferences.create(
+                    context,
+                    fileName,
+                    masterKey,
+                    EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                    EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+                );
+
+                editor = encryptedPrefs.edit();
+            } catch (GeneralSecurityException | IOException e) {
+                Log.e("StrataStorage", "Failed to initialize encrypted storage", e);
+                throw e;
+            }
         } else {
+            Log.w("StrataStorage", "API < 23, using unencrypted SharedPreferences");
             // Fallback to regular SharedPreferences for older devices
             encryptedPrefs = context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
             editor = encryptedPrefs.edit();
@@ -52,14 +62,22 @@ public class EncryptedStorage {
                 stringValue = (String) value;
             } else {
                 // Convert complex objects to JSON
-                stringValue = value instanceof JSONObject ? 
-                    ((JSONObject) value).toString() : 
-                    new JSONObject(value).toString();
+                if (value instanceof JSONObject) {
+                    stringValue = ((JSONObject) value).toString();
+                } else {
+                    // Use helper method to convert object to JSON string
+                    try {
+                        stringValue = objectToJsonString(value);
+                    } catch (Exception e) {
+                        // Fallback to string representation
+                        stringValue = value.toString();
+                    }
+                }
             }
             editor.putString(key, stringValue);
             return editor.commit();
         } catch (Exception e) {
-            e.printStackTrace();
+            Log.e("StrataStorage", "Failed to set value in encrypted storage", e);
             return false;
         }
     }
@@ -140,6 +158,51 @@ public class EncryptedStorage {
         return new SizeInfo(totalSize, count);
     }
     
+    /**
+     * Convert an object to JSON string using reflection
+     */
+    private String objectToJsonString(Object obj) throws Exception {
+        if (obj == null) {
+            return "null";
+        }
+        
+        if (obj instanceof String || obj instanceof Number || obj instanceof Boolean) {
+            return obj.toString();
+        }
+        
+        if (obj instanceof Map) {
+            JSONObject jsonObj = new JSONObject();
+            Map<?, ?> map = (Map<?, ?>) obj;
+            for (Map.Entry<?, ?> entry : map.entrySet()) {
+                String key = entry.getKey().toString();
+                jsonObj.put(key, entry.getValue());
+            }
+            return jsonObj.toString();
+        }
+        
+        if (obj instanceof List || obj.getClass().isArray()) {
+            JSONArray jsonArray = new JSONArray();
+            if (obj instanceof List) {
+                List<?> list = (List<?>) obj;
+                for (Object item : list) {
+                    jsonArray.put(item);
+                }
+            } else {
+                Object[] array = (Object[]) obj;
+                for (Object item : array) {
+                    jsonArray.put(item);
+                }
+            }
+            return jsonArray.toString();
+        }
+        
+        // For other objects, create a simple JSON object with their string representation
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("value", obj.toString());
+        jsonObj.put("type", obj.getClass().getSimpleName());
+        return jsonObj.toString();
+    }
+    
     /**
      * Size information class
      */