react-native-mmkv 2.6.1 → 2.6.2

package/MMKV/Core/CMakeLists.txt

@@ -121,8 +121,6 @@ add_library(core
         aes/openssl/openssl_md5_one.cpp
         aes/openssl/openssl_md5.h
         aes/openssl/openssl_md32_common.h
-        aes/openssl/openssl_aesv8-armx.S
-        aes/openssl/openssl_aes-armv4.S
         aes/openssl/openssl_arm_arch.h
         crc32/Checksum.h
         crc32/crc32_armv8.cpp
@@ -133,8 +131,21 @@ add_library(core
         MMKVPredef.h
         )
 
+IF (NOT MSVC)
+    # .S files is not supported by MSVC.
+    target_sources(core PRIVATE 
+        aes/openssl/openssl_aesv8-armx.S
+        aes/openssl/openssl_aes-armv4.S)
+ENDIF()
+
 target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
+IF (WIN32)
+    # MMKV can be used only with Unicode on Windows.
+    target_compile_definitions(core PUBLIC UNICODE)
+    target_compile_definitions(core PUBLIC _UNICODE)
+ENDIF()
+
 set_target_properties(core PROPERTIES
         CXX_STANDARD 17
         CXX_EXTENSIONS OFF

package/MMKV/Core/MMKV.cpp

@@ -189,15 +189,16 @@ void initialize() {
 #endif     // __aarch64__ && defined(__linux__)
 
 #if defined(MMKV_DEBUG) && !defined(MMKV_DISABLE_CRYPT)
-    AESCrypt::testAESCrypt();
-    KeyValueHolderCrypt::testAESToMMBuffer();
+    // AESCrypt::testAESCrypt();
+    // KeyValueHolderCrypt::testAESToMMBuffer();
 #endif
 }
 
 ThreadOnceToken_t once_control = ThreadOnceUninitialized;
 
-void MMKV::initializeMMKV(const MMKVPath_t &rootDir, MMKVLogLevel logLevel) {
+void MMKV::initializeMMKV(const MMKVPath_t &rootDir, MMKVLogLevel logLevel, mmkv::LogHandler handler) {
     g_currentLogLevel = logLevel;
+    g_logHandler = handler;
 
     ThreadLock::ThreadOnce(&once_control, initialize);
 
@@ -975,12 +976,15 @@ void MMKV::sync(SyncFlag flag) {
 }
 
 void MMKV::lock() {
+    SCOPED_LOCK(m_lock);
     m_exclusiveProcessLock->lock();
 }
 void MMKV::unlock() {
+    SCOPED_LOCK(m_lock);
     m_exclusiveProcessLock->unlock();
 }
 bool MMKV::try_lock() {
+    SCOPED_LOCK(m_lock);
     return m_exclusiveProcessLock->try_lock();
 }
 

package/MMKV/Core/MMKV.h

@@ -156,7 +156,7 @@ class MMKV {
 
 public:
     // call this before getting any MMKV instance
-    static void initializeMMKV(const MMKVPath_t &rootDir, MMKVLogLevel logLevel = MMKVLogInfo);
+    static void initializeMMKV(const MMKVPath_t &rootDir, MMKVLogLevel logLevel = MMKVLogInfo, mmkv::LogHandler handler = nullptr);
 
 #ifdef MMKV_APPLE
     // protect from some old code that don't call initializeMMKV()

package/MMKV/Core/MMKVLog.cpp

@@ -28,7 +28,7 @@ MMKVLogLevel g_currentLogLevel = MMKVLogDebug;
 MMKVLogLevel g_currentLogLevel = MMKVLogInfo;
 #endif
 
-mmkv::LogHandler g_logHandler;
+mmkv::LogHandler g_logHandler = nullptr;
 
 #ifndef __FILE_NAME__
 const char *_getFileName(const char *path) {

package/MMKV/Core/MMKVPredef.h

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

package/MMKV/Core/MMKV_OSX.cpp

@@ -186,10 +186,10 @@ NSObject *MMKV::getObject(MMKVKey_t key, Class cls) {
         } else {
             if ([cls conformsToProtocol:@protocol(NSCoding)]) {
                 auto tmp = [NSData dataWithBytesNoCopy:data.getPtr() length:data.length() freeWhenDone:NO];
-                try {
+                @try {
                     id result = [NSKeyedUnarchiver unarchiveObjectWithData:tmp];
                     return result;
-                } catch (NSException *exception) {
+                } @catch (NSException *exception) {
                     MMKVError("%s", exception.reason);
                 }
             }

package/MMKV/Core/MemoryFile_OSX.cpp

@@ -61,7 +61,7 @@ bool tryAtomicRename(const char *src, const char *dst) {
     bool renamed = false;
 
     // try atomic swap first
-    if (@available(iOS 10.0, watchOS 3.0, *)) {
+    if (@available(iOS 10.0, watchOS 3.0, macOS 10.12, *)) {
         // renameat2() equivalent
         if (renamex_np(src, dst, RENAME_SWAP) == 0) {
             renamed = true;

package/README.md

@@ -196,6 +196,7 @@ A mocked MMKV instance is automatically used when testing with Jest, so you will
 * [Using MMKV with mobx-persist](./docs/WRAPPER_MOBXPERSIST.md)
 * [Using MMKV with zustand persist-middleware](./docs/WRAPPER_ZUSTAND_PERSIST_MIDDLEWARE.md)
 * [Using MMKV with jotai](./docs/WRAPPER_JOTAI.md)
+* [Using MMKV with react-query](./docs/WRAPPER_REACT_QUERY.md)
 * [How is this library different from **react-native-mmkv-storage**?](https://github.com/mrousavy/react-native-mmkv/issues/100#issuecomment-886477361)
 
 ## Limitations

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

@@ -55,7 +55,7 @@ jsi::Value MmkvHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& pro
   auto funcName = "MMKV." + propName;
 
   if (propName == "set") {
-    // MMKV.set(key: string, value: string | number | bool)
+    // MMKV.set(key: string, value: string | number | bool | Uint8Array)
     return jsi::Function::createFromHostFunction(runtime,
                                                  jsi::PropNameID::forAscii(runtime, funcName),
                                                  2,  // key, value

package/ios/JSIUtils.mm

@@ -80,7 +80,8 @@ id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value);
 
 NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value)
 {
-    return [NSString stringWithUTF8String:value.utf8(runtime).c_str()];
+    auto string = value.utf8(runtime);
+    return [NSString stringWithUTF8String:string.c_str()];
 }
 
 NSArray *convertJSIArrayToNSArray(jsi::Runtime &runtime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mmkv",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "The fastest key/value storage for React Native. ~30x faster than AsyncStorage! Works on Android, iOS and Web.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -29,8 +29,7 @@
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "lint-ci": "yarn lint -f ./node_modules/@firmnav/eslint-github-actions-formatter/dist/formatter.js",
-    "prepare": "git submodule update --init --recursive",
-    "build": "bob build",
+    "prepare": "git submodule update --init --recursive && bob build",
     "prepack": "bob build",
     "update-submodule": "git submodule update --remote --merge",
     "release": "release-it",
@@ -165,5 +164,10 @@
         }
       ]
     ]
+  },
+  "codegenConfig": {
+    "name": "reactnativemmkv",
+    "type": "modules",
+    "jsSrcsDir": "./lib/module"
   }
 }