react-native-mmkv 2.1.2 → 2.3.1

package/MMKV/CHANGELOG.md

@@ -1,5 +1,19 @@
 # MMKV Change Log
 
+## v1.2.13 / 2022-03-30
+
+### Android
+* Fix crash on using Ashmem while `MMKV_DISABLE_CRYPT` macro is defined.
+
+### iOS
+* Add ability to retrieve key existece while getting value, aka `-[MMKV getXXX:forKey:hasValue:]` methods.
+
+### POSIX
+* Add ability to retrieve key existece while getting value, aka `MMKV::getXXX(key, defaultValue, hasValue)` methods.
+
+### Win32
+* Add ability to retrieve key existece while getting value, aka `MMKV::getXXX(key, defaultValue, hasValue)` methods.
+
 ## v1.2.12 / 2022-01-17
 ### Changes for All platforms
 * Fix a bug that a subsequential `clearAll()` call may fail to take effect in multi-process mode.

package/MMKV/Core/Core.xcodeproj/project.pbxproj

@@ -349,7 +349,7 @@
 		CB9563D023AB2D9500ACCD39 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1330;
 				ORGANIZATIONNAME = lingol;
 				TargetAttributes = {
 					CB9563D723AB2D9500ACCD39 = {

package/MMKV/Core/Core.xcodeproj/xcshareddata/xcschemes/Core.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

package/MMKV/Core/Core.xcodeproj/xcshareddata/xcschemes/MMKVWatchCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1330"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

package/MMKV/Core/MMKV.cpp

@@ -607,8 +607,11 @@ bool MMKV::getVector(MMKVKey_t key, vector<string> &result) {
 
 #endif // MMKV_APPLE
 
-bool MMKV::getBool(MMKVKey_t key, bool defaultValue) {
+bool MMKV::getBool(MMKVKey_t key, bool defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -616,16 +619,25 @@ bool MMKV::getBool(MMKVKey_t key, bool defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readBool();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-int32_t MMKV::getInt32(MMKVKey_t key, int32_t defaultValue) {
+int32_t MMKV::getInt32(MMKVKey_t key, int32_t defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -633,16 +645,25 @@ int32_t MMKV::getInt32(MMKVKey_t key, int32_t defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readInt32();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-uint32_t MMKV::getUInt32(MMKVKey_t key, uint32_t defaultValue) {
+uint32_t MMKV::getUInt32(MMKVKey_t key, uint32_t defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -650,16 +671,25 @@ uint32_t MMKV::getUInt32(MMKVKey_t key, uint32_t defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readUInt32();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-int64_t MMKV::getInt64(MMKVKey_t key, int64_t defaultValue) {
+int64_t MMKV::getInt64(MMKVKey_t key, int64_t defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -667,16 +697,25 @@ int64_t MMKV::getInt64(MMKVKey_t key, int64_t defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readInt64();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-uint64_t MMKV::getUInt64(MMKVKey_t key, uint64_t defaultValue) {
+uint64_t MMKV::getUInt64(MMKVKey_t key, uint64_t defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -684,16 +723,25 @@ uint64_t MMKV::getUInt64(MMKVKey_t key, uint64_t defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readUInt64();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-float MMKV::getFloat(MMKVKey_t key, float defaultValue) {
+float MMKV::getFloat(MMKVKey_t key, float defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -701,16 +749,25 @@ float MMKV::getFloat(MMKVKey_t key, float defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readFloat();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 
-double MMKV::getDouble(MMKVKey_t key, double defaultValue) {
+double MMKV::getDouble(MMKVKey_t key, double defaultValue, bool *hasValue) {
     if (isKeyEmpty(key)) {
+        if (hasValue != nullptr) {
+            *hasValue = false;
+        }
         return defaultValue;
     }
     SCOPED_LOCK(m_lock);
@@ -718,11 +775,17 @@ double MMKV::getDouble(MMKVKey_t key, double defaultValue) {
     if (data.length() > 0) {
         try {
             CodedInputData input(data.getPtr(), data.length());
+            if (hasValue != nullptr) {
+                *hasValue = true;
+            }
             return input.readDouble();
         } catch (std::exception &exception) {
             MMKVError("%s", exception.what());
         }
     }
+    if (hasValue != nullptr) {
+        *hasValue = false;
+    }
     return defaultValue;
 }
 

package/MMKV/Core/MMKV.h

@@ -47,6 +47,8 @@ enum MMKVMode : uint32_t {
 #endif
 };
 
+#define OUT
+
 class MMKV {
 #ifndef MMKV_ANDROID
     std::string m_mmapKey;
@@ -253,19 +255,19 @@ public:
     bool getVector(MMKVKey_t key, std::vector<std::string> &result);
 #endif // MMKV_APPLE
 
-    bool getBool(MMKVKey_t key, bool defaultValue = false);
+    bool getBool(MMKVKey_t key, bool defaultValue = false, OUT bool *hasValue = nullptr);
 
-    int32_t getInt32(MMKVKey_t key, int32_t defaultValue = 0);
+    int32_t getInt32(MMKVKey_t key, int32_t defaultValue = 0, OUT bool *hasValue = nullptr);
 
-    uint32_t getUInt32(MMKVKey_t key, uint32_t defaultValue = 0);
+    uint32_t getUInt32(MMKVKey_t key, uint32_t defaultValue = 0, OUT bool *hasValue = nullptr);
 
-    int64_t getInt64(MMKVKey_t key, int64_t defaultValue = 0);
+    int64_t getInt64(MMKVKey_t key, int64_t defaultValue = 0, OUT bool *hasValue = nullptr);
 
-    uint64_t getUInt64(MMKVKey_t key, uint64_t defaultValue = 0);
+    uint64_t getUInt64(MMKVKey_t key, uint64_t defaultValue = 0, OUT bool *hasValue = nullptr);
 
-    float getFloat(MMKVKey_t key, float defaultValue = 0);
+    float getFloat(MMKVKey_t key, float defaultValue = 0, OUT bool *hasValue = nullptr);
 
-    double getDouble(MMKVKey_t key, double defaultValue = 0);
+    double getDouble(MMKVKey_t key, double defaultValue = 0, OUT bool *hasValue = nullptr);
 
     // return the actual size consumption of the key's value
     // pass actualSize = true to get value's length

package/MMKV/Core/MMKVPredef.h

@@ -34,7 +34,7 @@
 #include <vector>
 #include <unordered_map>
 
-constexpr auto MMKV_VERSION = "v1.2.12";
+constexpr auto MMKV_VERSION = "v1.2.13";
 
 #ifdef DEBUG
 #    define MMKV_DEBUG

package/MMKV/README.md

@@ -1,6 +1,6 @@
 [![license](https://img.shields.io/badge/license-BSD_3-brightgreen.svg?style=flat)](https://github.com/Tencent/MMKV/blob/master/LICENSE.TXT)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/MMKV/pulls)
-[![Release Version](https://img.shields.io/badge/release-1.2.12-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
+[![Release Version](https://img.shields.io/badge/release-1.2.13-brightgreen.svg)](https://github.com/Tencent/MMKV/releases)
 [![Platform](https://img.shields.io/badge/Platform-%20Android%20%7C%20iOS%2FmacOS%20%7C%20Win32%20%7C%20POSIX-brightgreen.svg)](https://github.com/Tencent/MMKV/wiki/home)
 
 中文版本请参看[这里](./README_CN.md)
@@ -11,14 +11,14 @@ MMKV is an **efficient**, **small**, **easy-to-use** mobile key-value storage fr
 
 ## Features
 
-* **Efficient**. MMKV uses mmap to keep memory synced with file, and protobuf to encode/decode values, making the most of Android to achieve best performance.
+* **Efficient**. MMKV uses mmap to keep memory synced with files, and protobuf to encode/decode values, making the most of Android to achieve the best performance.
   * **Multi-Process concurrency**: MMKV supports concurrent read-read and read-write access between processes.
 
 * **Easy-to-use**. You can use MMKV as you go. All changes are saved immediately, no `sync`, no `apply` calls needed.
 
 * **Small**.
-  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics and nothing more. It's really tidy.
-  * **About 50K in binary size**: MMKV adds about 50K per architecture on App size, and much less when zipped (apk).
+  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics, and nothing more. It's really tidy.
+  * **About 50K in binary size**: MMKV adds about 50K per architecture on App size, and much less when zipped (APK).
 
 
 ## Getting Started
@@ -28,8 +28,8 @@ Add the following lines to `build.gradle` on your app module:
 
 ```gradle
 dependencies {
-    implementation 'com.tencent:mmkv:1.2.12'
-    // replace "1.2.12" with any available version
+    implementation 'com.tencent:mmkv:1.2.13'
+    // replace "1.2.13" with any available version
 }
 ```
 
@@ -78,19 +78,19 @@ For more benchmark data, please refer to [our benchmark](https://github.com/Tenc
 
 ## Features
 
-* **Efficient**. MMKV uses mmap to keep memory synced with file, and protobuf to encode/decode values, making the most of iOS/macOS to achieve best performance.
+* **Efficient**. MMKV uses mmap to keep memory synced with files, and protobuf to encode/decode values, making the most of iOS/macOS to achieve the best performance.
  
-* **Easy-to-use**. You can use MMKV as you go, no configurations needed. All changes are saved immediately, no `synchronize` calls needed.
+* **Easy-to-use**. You can use MMKV as you go, no configurations are needed. All changes are saved immediately, no `synchronize` calls are needed.
 
 * **Small**.
   * **A handful of files**: MMKV contains encode/decode helpers and mmap logics and nothing more. It's really tidy.
-  * **Less than 30K in binary size**: MMKV adds less than 30K per architecture on App size, and much less when zipped (ipa).
+  * **Less than 30K in binary size**: MMKV adds less than 30K per architecture on App size, and much less when zipped (IPA).
 
 ## Getting Started
 
 ### Installation Via CocoaPods:
   1. Install [CocoaPods](https://guides.CocoaPods.org/using/getting-started.html);
-  2. Open terminal, `cd` to your project directory, run `pod repo update` to make CocoaPods aware of the latest available MMKV versions;
+  2. Open the terminal, `cd` to your project directory, run `pod repo update` to make CocoaPods aware of the latest available MMKV versions;
   3. Edit your Podfile, add `pod 'MMKV'` to your app target;
   4. Run `pod install`;
   5. Open the `.xcworkspace` file generated by CocoaPods;
@@ -99,7 +99,7 @@ For more benchmark data, please refer to [our benchmark](https://github.com/Tenc
 For other installation options, see [iOS/macOS Setup](https://github.com/Tencent/MMKV/wiki/iOS_setup).
 
 ### Quick Tutorial
-You can use MMKV as you go, no configurations needed. All changes are saved immediately, no `synchronize` calls needed.
+You can use MMKV as you go, no configurations are needed. All changes are saved immediately, no `synchronize` calls are needed.
 Setup MMKV on App startup, in your `-[MyApp application: didFinishLaunchingWithOptions:]`, add these lines:
 
 ```objective-c
@@ -139,13 +139,13 @@ For more benchmark data, please refer to [our benchmark](https://github.com/Tenc
 
 ## Features
 
-* **Efficient**. MMKV uses mmap to keep memory synced with file, and protobuf to encode/decode values, making the most of Windows to achieve best performance.
+* **Efficient**. MMKV uses mmap to keep memory synced with files, and protobuf to encode/decode values, making the most of Windows to achieve the best performance.
   * **Multi-Process concurrency**: MMKV supports concurrent read-read and read-write access between processes.
 
-* **Easy-to-use**. You can use MMKV as you go. All changes are saved immediately, no `save`, no `sync` calls needed.
+* **Easy-to-use**. You can use MMKV as you go. All changes are saved immediately, no `save`, no `sync` calls are needed.
 
 * **Small**.
-  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics and nothing more. It's really tidy.
+  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics, and nothing more. It's really tidy.
   * **About 10K in binary size**: MMKV adds about 10K on application size, and much less when zipped.
 
 
@@ -168,7 +168,7 @@ For more benchmark data, please refer to [our benchmark](https://github.com/Tenc
 
 note:  
 
-1. MMKV is compiled with `MT/MTd` runtime by default. If your project uses `MD/MDd`, you should change MMKV's setting to match your project's (`C/C++` -> `Code Generation` -> `Runtime Library`), or vise versa.
+1. MMKV is compiled with `MT/MTd` runtime by default. If your project uses `MD/MDd`, you should change MMKV's setting to match your project's (`C/C++` -> `Code Generation` -> `Runtime Library`), or vice versa.
 2. MMKV is developed with Visual Studio 2017, change the `Platform Toolset` if you use a different version of Visual Studio.
 
 For other installation options, see [Win32 Setup](https://github.com/Tencent/MMKV/wiki/windows_setup).
@@ -210,20 +210,20 @@ MMKV also supports **Multi-Process Access**. Full tutorials can be found here [W
 
 ## Features
 
-* **Efficient**. MMKV uses mmap to keep memory synced with file, and protobuf to encode/decode values, making the most of POSIX to achieve best performance.
+* **Efficient**. MMKV uses mmap to keep memory synced with files, and protobuf to encode/decode values, making the most of POSIX to achieve the best performance.
   * **Multi-Process concurrency**: MMKV supports concurrent read-read and read-write access between processes.
 
-* **Easy-to-use**. You can use MMKV as you go. All changes are saved immediately, no `save`, no `sync` calls needed.
+* **Easy-to-use**. You can use MMKV as you go. All changes are saved immediately, no `save`, no `sync` calls are needed.
 
 * **Small**.
-  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics and nothing more. It's really tidy.
+  * **A handful of files**: MMKV contains process locks, encode/decode helpers and mmap logics, and nothing more. It's really tidy.
   * **About 7K in binary size**: MMKV adds about 7K on application size, and much less when zipped.
 
 
 ## Getting Started
 
 ### Installation Via CMake
-1. Getting source code from git repository:
+1. Getting source code from the git repository:
   
    ```
    git clone https://github.com/Tencent/MMKV.git

package/README.md

@@ -29,7 +29,7 @@
 * **Encryption** support (secure storage)
 * **Multiple instances** support (separate user-data with global data)
 * **Customize storage location**
-* **High performance** because everything is **written in C++** (even the JS functions have C++ bodies!)
+* **High performance** because everything is **written in C++**
 * **~30x faster than AsyncStorage**
 * Uses [**JSI**](https://github.com/react-native-community/discussions-and-proposals/issues/91) instead of the "old" Bridge
 * **iOS**, **Android** and **Web** support
@@ -104,7 +104,7 @@ This creates a new storage instance using a custom MMKV storage ID. By using a c
 
 The following values can be configured:
 
-* `id`: The MMKV instance's ID. If you want to use multiple instances, use different IDs. For example, you can separte the global app's storage and a logged-in user's storage. (default: `'mmkv.default'`)
+* `id`: The MMKV instance's ID. If you want to use multiple instances, use different IDs. For example, you can separte the global app's storage and a logged-in user's storage. (required if `path` or `encryptionKey` fields are specified, otherwise defaults to: `'mmkv.default'`)
 * `path`: The MMKV instance's root path. By default, MMKV stores file inside `$(Documents)/mmkv/`. You can customize MMKV's root directory on MMKV initialization (documentation: [iOS](https://github.com/Tencent/MMKV/wiki/iOS_advance#customize-location) / [Android](https://github.com/Tencent/MMKV/wiki/android_advance#customize-location))
 * `encryptionKey`: The MMKV instance's encryption/decryption key. By default, MMKV stores all key-values in plain text on file, relying on iOS's/Android's sandbox to make sure the file is encrypted. Should you worry about information leaking, you can choose to encrypt MMKV. (documentation: [iOS](https://github.com/Tencent/MMKV/wiki/iOS_advance#encryption) / [Android](https://github.com/Tencent/MMKV/wiki/android_advance#encryption))
 
@@ -181,6 +181,10 @@ storage.recrypt(undefined)
 
 As the library uses JSI for synchronous native methods access, remote debugging (e.g. with Chrome) is no longer possible. Instead, you should use [Flipper](https://fbflipper.com).
 
+## Debugging
+
+Use [flipper-plugin-react-native-mmkv](https://github.com/muchobien/flipper-plugin-react-native-mmkv) to debug your MMKV storage using Flipper. You can also simply `console.log` an MMKV instance.
+
 ## Adopting at scale
 
 react-native-mmkv is provided _as is_, I work on it in my free time.

package/android/src/main/cpp/MmkvHostObject.cpp

@@ -9,6 +9,7 @@
 #include "MmkvHostObject.h"
 #include <MMKV.h>
 #include <android/log.h>
+#include <string>
 
 MmkvHostObject::MmkvHostObject(const std::string& instanceId, std::string path, std::string cryptKey) {
   __android_log_print(ANDROID_LOG_INFO, "RNMMKV", "Creating MMKV instance \"%s\"... (Path: %s, Encryption-Key: %s)",
@@ -59,21 +60,23 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "MMKV::set: First argument ('key') has to be of type string!");
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
-
-                                                   if (arguments[1].isBool()) {
-                                                     instance->set(arguments[1].getBool(), keyName);
-                                                   } else if (arguments[1].isNumber()) {
-                                                     instance->set(arguments[1].getNumber(), keyName);
-                                                   } else if (arguments[1].isString()) {
-                                                     auto stringValue = arguments[1].getString(runtime).utf8(runtime);
-                                                     instance->set(stringValue, keyName);
-                                                   } else {
-                                                     throw jsi::JSError(runtime, "MMKV::set: 'value' argument is not of type bool, number or string!");
-                                                   }
-                                                   return jsi::Value::undefined();
-                                                 });
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "MMKV::set: First argument ('key') has to be of type string!");
+      }
+
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      if (arguments[1].isBool()) {
+        instance->set(arguments[1].getBool(), keyName);
+      } else if (arguments[1].isNumber()) {
+        instance->set(arguments[1].getNumber(), keyName);
+      } else if (arguments[1].isString()) {
+        auto stringValue = arguments[1].getString(runtime).utf8(runtime);
+        instance->set(stringValue, keyName);
+      } else {
+        throw jsi::JSError(runtime, "MMKV::set: 'value' argument is not of type bool, number or string!");
+      }
+      return jsi::Value::undefined();
+    });
   }
 
   if (propName == "getBoolean") {
@@ -85,11 +88,19 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
-                                                   auto value = instance->getBool(keyName);
-                                                   return jsi::Value(value);
-                                                 });
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
+      }
+
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      bool hasValue;
+      auto value = instance->getBool(keyName, false, &hasValue);
+      if (hasValue) {
+        return jsi::Value(value);
+      } else {
+        return jsi::Value::undefined();
+      }
+    });
   }
 
   if (propName == "getString") {
@@ -101,17 +112,19 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
-
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
+      }
 
-                                                   std::string result;
-                                                   bool hasValue = instance->getString(keyName, result);
-                                                   if (hasValue)
-                                                     return jsi::Value(runtime, jsi::String::createFromUtf8(runtime, result));
-                                                   else
-                                                     return jsi::Value::undefined();
-                                                 });
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      std::string result;
+      bool hasValue = instance->getString(keyName, result);
+      if (hasValue) {
+        return jsi::Value(runtime, jsi::String::createFromUtf8(runtime, result));
+      } else {
+        return jsi::Value::undefined();
+      }
+    });
   }
 
   if (propName == "getNumber") {
@@ -123,12 +136,19 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
+      }
 
-                                                   auto value = instance->getDouble(keyName);
-                                                   return jsi::Value(value);
-                                                 });
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      bool hasValue;
+      auto value = instance->getDouble(keyName, 0.0, &hasValue);
+      if (hasValue) {
+        return jsi::Value(value);
+      } else {
+        return jsi::Value::undefined();
+      }
+    });
   }
 
   if (propName == "contains") {
@@ -140,12 +160,14 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
+      }
 
-                                                   bool containsKey = instance->containsKey(keyName);
-                                                   return jsi::Value(containsKey);
-                                                 });
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      bool containsKey = instance->containsKey(keyName);
+      return jsi::Value(containsKey);
+    });
   }
 
   if (propName == "delete") {
@@ -157,12 +179,14 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   if (!arguments[0].isString()) throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
-                                                   auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      if (!arguments[0].isString()) {
+        throw jsi::JSError(runtime, "First argument ('key') has to be of type string!");
+      }
 
-                                                   instance->removeValueForKey(keyName);
-                                                   return jsi::Value::undefined();
-                                                 });
+      auto keyName = arguments[0].getString(runtime).utf8(runtime);
+      instance->removeValueForKey(keyName);
+      return jsi::Value::undefined();
+    });
   }
 
   if (propName == "getAllKeys") {
@@ -174,13 +198,13 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   auto keys = instance->allKeys();
-                                                   auto array = jsi::Array(runtime, keys.size());
-                                                   for (int i = 0; i < keys.size(); i++) {
-                                                     array.setValueAtIndex(runtime, i, keys[i]);
-                                                   }
-                                                   return array;
-                                                 });
+      auto keys = instance->allKeys();
+      auto array = jsi::Array(runtime, keys.size());
+      for (int i = 0; i < keys.size(); i++) {
+        array.setValueAtIndex(runtime, i, keys[i]);
+      }
+      return array;
+    });
   }
 
   if (propName == "clearAll") {
@@ -192,10 +216,9 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
                                                         const jsi::Value& thisValue,
                                                         const jsi::Value* arguments,
                                                         size_t count) -> jsi::Value {
-                                                   instance->clearAll();
-
-                                                   return jsi::Value::undefined();
-                                                 });
+      instance->clearAll();
+      return jsi::Value::undefined();
+    });
   }
 
   if (propName == "recrypt") {