react-native-mmkv 3.0.0-beta.2 → 3.0.0-beta.4

package/MMKV/Core/CMakeLists.txt

@@ -47,8 +47,14 @@ ELSEIF("${ANDROID_ABI}" STREQUAL "armeabi")
 ENDIF()
 
 #include(CMakePrintHelpers)
-#cmake_print_variables(CMAKE_SYSTEM_PROCESSOR)
-IF(UNIX AND (NOT APPLE))
+#cmake_print_variables(CMAKE_SYSTEM_PROCESSOR OHOS OHOS_ARCH CFLAGS ASM_OPTIONS CMAKE_ASM_FLAGS)
+
+IF(OHOS)
+    IF("${OHOS_ARCH}" STREQUAL "arm64-v8a")
+        SET(ASM_OPTIONS "-x assembler-with-cpp")
+        SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8+crypto -D__MUSL__")
+    ENDIF()
+ELSEIF(UNIX AND (NOT APPLE))
     IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
         SET(ASM_OPTIONS "-x assembler-with-cpp")
         SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8-a+crypto")
@@ -131,9 +137,11 @@ add_library(core
         MMKVPredef.h
         )
 
-IF (NOT MSVC)
+IF (MSVC OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
     # .S files is not supported by MSVC.
-    target_sources(core PRIVATE 
+    # x86_64 asm not supported in OHOS
+ELSE()
+    target_sources(core PRIVATE
         aes/openssl/openssl_aesv8-armx.S
         aes/openssl/openssl_aes-armv4.S)
 ENDIF()

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

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -349,7 +349,8 @@
 		CB9563D023AB2D9500ACCD39 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1420;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1530;
 				ORGANIZATIONNAME = lingol;
 				TargetAttributes = {
 					CB9563D723AB2D9500ACCD39 = {
@@ -448,6 +449,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -481,6 +483,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -495,7 +498,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -511,6 +514,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -544,6 +548,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -552,7 +557,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -580,6 +585,7 @@
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = "";
@@ -606,6 +612,7 @@
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = "";
@@ -630,6 +637,7 @@
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = MMKVCore;
 				SDKROOT = watchos;
@@ -655,6 +663,7 @@
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_SIGN_COMPARE = YES;
 				GCC_WARN_UNUSED_PARAMETER = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = MMKVCore;
 				SDKROOT = watchos;

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1530"
    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 = "1420"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

package/MMKV/Core/MMKV.cpp

@@ -40,10 +40,9 @@
 #include <cstdio>
 #include <cstring>
 #include <unordered_set>
-//#include <unistd.h>
 #include <cassert>
 
-#if defined(__aarch64__) && defined(__linux)
+#if defined(__aarch64__) && defined(__linux__) && !defined (MMKV_OHOS)
 #    include <asm/hwcap.h>
 #    include <sys/auxv.h>
 #endif
@@ -167,7 +166,7 @@ void initialize() {
     MMKVInfo("version %s, page size %d, arch %s", MMKV_VERSION, DEFAULT_MMAP_SIZE, MMKV_ABI);
 
     // get CPU status of ARMv8 extensions (CRC32, AES)
-#if defined(__aarch64__) && defined(__linux__)
+#if defined(__aarch64__) && defined(__linux__) && !defined (MMKV_OHOS)
     auto hwcaps = getauxval(AT_HWCAP);
 #    ifndef MMKV_DISABLE_CRYPT
     if (hwcaps & HWCAP_AES) {
@@ -188,7 +187,7 @@ void initialize() {
         MMKVInfo("armv8 CRC32 instructions is not supported");
     }
 #    endif // MMKV_USE_ARMV8_CRC32
-#endif     // __aarch64__ && defined(__linux__)
+#endif     // __aarch64__ && defined(__linux__) && !defined (MMKV_OHOS)
 
 #if defined(MMKV_DEBUG) && !defined(MMKV_DISABLE_CRYPT)
     // AESCrypt::testAESCrypt();

package/MMKV/Core/MMKVLog_Android.cpp

@@ -21,7 +21,62 @@
 #include "MMKVLog.h"
 
 #ifdef ENABLE_MMKV_LOG
-#    ifdef MMKV_ANDROID
+#   ifdef MMKV_OHOS
+#   include <hilog/log.h>
+#   include <cstdarg>
+#   include <string>
+
+using namespace std;
+
+constexpr auto APP_NAME = "MMKV";
+
+static LogLevel MMKVLogLevelDesc(MMKVLogLevel level) {
+    switch (level) {
+    case MMKVLogDebug:
+        return LOG_DEBUG;
+    case MMKVLogInfo:
+        return LOG_INFO;
+    case MMKVLogWarning:
+        return LOG_WARN;
+    case MMKVLogError:
+        return LOG_ERROR;
+    default:
+        return LOG_INFO;
+    }
+}
+
+void _MMKVLogWithLevel(MMKVLogLevel level, const char *filename, const char *func, int line, const char *format, ...) {
+    if (level >= g_currentLogLevel) {
+        string message;
+        char buffer[16];
+
+        va_list args;
+        va_start(args, format);
+        auto length = std::vsnprintf(buffer, sizeof(buffer), format, args);
+        va_end(args);
+
+        if (length < 0) { // something wrong
+            message = {};
+        } else if (length < sizeof(buffer)) {
+            message = string(buffer, static_cast<unsigned long>(length));
+        } else {
+            message.resize(static_cast<unsigned long>(length), '\0');
+            va_start(args, format);
+            std::vsnprintf(const_cast<char *>(message.data()), static_cast<size_t>(length) + 1, format, args);
+            va_end(args);
+        }
+
+        if (g_logHandler) {
+            g_logHandler(level, filename, line, func, message);
+        } else {
+            auto desc = MMKVLogLevelDesc(level);
+            OH_LOG_Print(LOG_APP, desc, 0, APP_NAME, "<%{public}s:%{public}d::%{public}s> %{public}s",
+                filename, line, func, message.c_str());
+        }
+    }
+}
+
+#    elif defined(MMKV_ANDROID)
 #        include <android/log.h>
 #        include <cstdarg>
 #        include <string>

package/MMKV/Core/MMKVPredef.h

@@ -34,7 +34,7 @@
 #include <vector>
 #include <unordered_map>
 
-constexpr auto MMKV_VERSION = "v1.3.4";
+constexpr auto MMKV_VERSION = "v1.3.5";
 
 #ifdef DEBUG
 #    define MMKV_DEBUG
@@ -50,6 +50,13 @@ constexpr auto MMKV_VERSION = "v1.3.4";
 #    else
 #        define MMKV_ANDROID
 #    endif
+#elif __OHOS__
+#   ifdef FORCE_POSIX
+#       define MMKV_POSIX
+#   else
+#       define MMKV_ANDROID
+#       define MMKV_OHOS
+#endif
 #elif __APPLE__
 #    ifdef FORCE_POSIX
 #        define MMKV_POSIX

package/MMKV/Core/MMKV_Android.cpp

@@ -19,6 +19,7 @@
  */
 
 #include "MMKV.h"
+// #include <bits/alltypes.h>
 
 #ifdef MMKV_ANDROID
 
@@ -136,8 +137,7 @@ MMKV::MMKV(const string &mmapID, int ashmemFD, int ashmemMetaFD, string *cryptKe
     }*/
 }
 
-MMKV *MMKV::mmkvWithID(const string &mmapID, int size, MMKVMode mode, string *cryptKey, string *rootPath,
-                       size_t expectedCapacity) {
+MMKV *MMKV::mmkvWithID(const string &mmapID, int size, MMKVMode mode, string *cryptKey, string *rootPath, size_t expectedCapacity) {
     if (mmapID.empty()) {
         return nullptr;
     }
@@ -155,7 +155,7 @@ MMKV *MMKV::mmkvWithID(const string &mmapID, int size, MMKVMode mode, string *cr
                 return nullptr;
             }
         }
-        MMKVInfo("prepare to load %s (id %s) from rootPath %s", mmapID.c_str(), mmapKey.c_str(), rootPath->c_str());
+        MMKVInfo("prepare to load %s (id %s) from rootPath %zu", mmapID.c_str(), mmapKey.c_str(), rootPath->c_str());
     }
     auto kv = new MMKV(mmapID, size, mode, cryptKey, rootPath, expectedCapacity);
     (*g_instanceDic)[mmapKey] = kv;

package/MMKV/Core/MMKV_IO.cpp

@@ -156,7 +156,7 @@ void MMKV::partialLoadFromFile() {
                 size_t addedSize = m_actualSize - position;
                 auto basePtr = (uint8_t *) m_file->getMemory() + Fixed32Size;
                 // incremental update crc digest
-                m_crcDigest = (uint32_t) CRC32(m_crcDigest, basePtr + position, addedSize);
+                m_crcDigest = (uint32_t) CRC32(m_crcDigest, basePtr + position, (z_size_t) addedSize);
                 if (m_crcDigest == m_metaInfo->m_crcDigest) {
                     MMBuffer inputBuffer(basePtr, m_actualSize, MMBufferNoCopy);
 #ifndef MMKV_DISABLE_CRYPT

package/MMKV/Core/MemoryFile.cpp

@@ -267,10 +267,10 @@ bool isFileExist(const string &nsFilePath) {
         return false;
     }
 
-    struct stat temp = {};
-    return lstat(nsFilePath.c_str(), &temp) == 0;
+    return access(nsFilePath.c_str(), F_OK) == 0;
 }
 
+#ifndef MMKV_APPLE
 extern bool mkPath(const MMKVPath_t &str) {
     char *path = strdup(str.c_str());
 
@@ -307,6 +307,19 @@ LContinue:
 
     return true;
 }
+#else
+// avoid using so-called privacy API
+extern bool mkPath(const MMKVPath_t &str) {
+    auto path = [NSString stringWithUTF8String:str.c_str()];
+    NSError *error = nil;
+    auto ret = [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
+    if (!ret) {
+        MMKVWarning("%s", error.localizedDescription.UTF8String);
+        return false;
+    }
+    return true;
+}
+#endif
 
 MMBuffer *readWholeFile(const MMKVPath_t &path) {
     MMBuffer *buffer = nullptr;
@@ -360,6 +373,7 @@ bool zeroFillFile(int fd, size_t startPos, size_t size) {
     return true;
 }
 
+#ifndef MMKV_APPLE
 bool getFileSize(int fd, size_t &size) {
     struct stat st = {};
     if (fstat(fd, &st) != -1) {
@@ -368,6 +382,23 @@ bool getFileSize(int fd, size_t &size) {
     }
     return false;
 }
+#else
+// avoid using so-called privacy API
+bool getFileSize(int fd, size_t &size) {
+    auto cur = lseek(fd, 0, SEEK_CUR);
+    if (cur == -1) {
+        return false;
+    }
+    auto end = lseek(fd, 0, SEEK_END);
+    if (end == -1) {
+        return false;
+    }
+    size = (size_t) end;
+
+    lseek(fd, cur, SEEK_SET);
+    return true;
+}
+#endif
 
 size_t getPageSize() {
     return static_cast<size_t>(getpagesize());

package/MMKV/Core/MemoryFile.h

@@ -23,6 +23,7 @@
 #ifdef __cplusplus
 
 #include "MMKVPredef.h"
+#include <cstdint>
 #include <functional>
 
 #ifdef MMKV_ANDROID

package/MMKV/Core/MemoryFile_Android.cpp

@@ -114,9 +114,12 @@ constexpr auto ASHMEM_IOC = 0x77;
 #    define ASHMEM_SET_SIZE _IOW(ASHMEM_IOC, 3, size_t)
 #    define ASHMEM_GET_SIZE _IO(ASHMEM_IOC, 4)
 
+#ifndef MMKV_OHOS
 int g_android_api = __ANDROID_API_L__;
+#endif
 std::string g_android_tmpDir = "/data/local/tmp/";
 
+#ifndef MMKV_OHOS
 void *loadLibrary() {
     auto name = "libandroid.so";
     static auto handle = dlopen(name, RTLD_LAZY | RTLD_LOCAL);
@@ -127,9 +130,13 @@ void *loadLibrary() {
 }
 
 typedef int (*AShmem_create_t)(const char *name, size_t size);
+typedef size_t (*AShmem_getSize_t)(int fd);
+
+#endif
 
 int ASharedMemory_create(const char *name, size_t size) {
     int fd = -1;
+#ifndef MMKV_OHOS
     if (g_android_api >= __ANDROID_API_O__) {
         static auto handle = loadLibrary();
         static AShmem_create_t funcPtr =
@@ -143,6 +150,7 @@ int ASharedMemory_create(const char *name, size_t size) {
             MMKVWarning("fail to locate ASharedMemory_create() from loading libandroid.so");
         }
     }
+#endif
     if (fd < 0) {
         fd = open(ASHMEM_NAME_DEF, O_RDWR | O_CLOEXEC);
         if (fd < 0) {
@@ -158,10 +166,9 @@ int ASharedMemory_create(const char *name, size_t size) {
     return fd;
 }
 
-typedef size_t (*AShmem_getSize_t)(int fd);
-
 size_t ASharedMemory_getSize(int fd) {
     size_t size = 0;
+#ifndef MMKV_OHOS
     if (g_android_api >= __ANDROID_API_O__) {
         static auto handle = loadLibrary();
         static AShmem_getSize_t funcPtr =
@@ -175,6 +182,7 @@ size_t ASharedMemory_getSize(int fd) {
             MMKVWarning("fail to locate ASharedMemory_create() from loading libandroid.so");
         }
     }
+#endif
     if (size == 0) {
         int tmp = ioctl(fd, ASHMEM_GET_SIZE, nullptr);
         if (tmp < 0) {
@@ -190,9 +198,11 @@ string ASharedMemory_getName(int fd) {
     // Android Q doesn't have ASharedMemory_getName()
     // I've make a request to Google, https://issuetracker.google.com/issues/130741665
     // There's nothing we can do before it's supported officially by Google
-    if (g_android_api >= __ANDROID_API_Q__) {
+#ifndef MMKV_OHOS
+    if (g_android_api >= __ANDROID_API_O__) {
         return "";
     }
+#endif
 
     char name[ASHMEM_NAME_LEN] = {0};
     if (ioctl(fd, ASHMEM_GET_NAME, name) != 0) {

package/MMKV/Core/MemoryFile_Linux.cpp

@@ -54,20 +54,25 @@ bool tryAtomicRename(const MMKVPath_t &srcPath, const MMKVPath_t &dstPath) {
     bool renamed = false;
 
     // try renameat2() first
-#ifdef SYS_renameat2
+#if defined(SYS_renameat2) && !defined(MMKV_OHOS)
 #ifdef MMKV_ANDROID
     static auto g_renameat2 = (renameat2_t) dlsym(RTLD_DEFAULT, "renameat2");
     if (g_renameat2) {
         renamed = (g_renameat2(AT_FDCWD, srcPath.c_str(), AT_FDCWD, dstPath.c_str(), RENAME_EXCHANGE) == 0);
     }
+    if (!renamed && errno != ENOENT) {
+        MMKVWarning("fail on renameat2() [%s] to [%s], %d(%s)", srcPath.c_str(), dstPath.c_str(), errno,
+                    strerror(errno));
+    }
 #endif
     if (!renamed) {
         renamed = (syscall(SYS_renameat2, AT_FDCWD, srcPath.c_str(), AT_FDCWD, dstPath.c_str(), RENAME_EXCHANGE) == 0);
     }
     if (!renamed && errno != ENOENT) {
-        MMKVError("fail on renameat2() [%s] to [%s], %d(%s)", srcPath.c_str(), dstPath.c_str(), errno, strerror(errno));
+        MMKVWarning("fail on syscall(SYS_renameat2) [%s] to [%s], %d(%s)", srcPath.c_str(), dstPath.c_str(), errno,
+                    strerror(errno));
     }
-#endif // SYS_renameat2
+#endif // SYS_renameat2 && !MMKV_OHOS
 
     if (!renamed) {
         if (::rename(srcPath.c_str(), dstPath.c_str()) != 0) {

package/MMKV/Core/MemoryFile_Win32.cpp

@@ -282,7 +282,7 @@ MMBuffer *readWholeFile(const MMKVPath_t &nsFilePath) {
             buffer = new MMBuffer(static_cast<size_t>(fileLength));
             SetFilePointer(fd, 0, 0, FILE_BEGIN);
             DWORD readSize = 0;
-            if (ReadFile(fd, buffer->getPtr(), fileLength, &readSize, nullptr)) {
+            if (ReadFile(fd, buffer->getPtr(), (DWORD) fileLength, &readSize, nullptr)) {
                 //fileSize = readSize;
             } else {
                 MMKVWarning("fail to read %ls: %d", nsFilePath.c_str(), GetLastError());
@@ -323,7 +323,7 @@ bool zeroFillFile(MMKVFileHandle_t file, size_t startPos, size_t size) {
     }
     if (size > 0) {
         DWORD bytesWritten = 0;
-        if (!WriteFile(file, zeros, size, &bytesWritten, nullptr)) {
+        if (!WriteFile(file, zeros, (DWORD) size, &bytesWritten, nullptr)) {
             MMKVError("fail to write fd[%p], error:%d", file, GetLastError());
             return false;
         }
@@ -407,7 +407,7 @@ bool copyFileContent(const MMKVPath_t &srcPath, MMKVFileHandle_t dstFD, bool nee
     // the Win32 platform don't have sendfile()/fcopyfile() equivalent, do it the hard way
     while (true) {
         DWORD sizeRead = 0;
-        if (!ReadFile(srcFile.getFd(), buffer, bufferSize, &sizeRead, nullptr)) {
+        if (!ReadFile(srcFile.getFd(), buffer, (DWORD) bufferSize, &sizeRead, nullptr)) {
             MMKVError("fail to read %ls: %d", srcPath.c_str(), GetLastError());
             goto errorOut;
         }

package/MMKV/Core/ThreadLock.cpp

@@ -27,7 +27,7 @@ using namespace std;
 
 namespace mmkv {
 
-ThreadLock::ThreadLock() {
+ThreadLock::ThreadLock() : m_lock({}) {
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -38,13 +38,13 @@ ThreadLock::ThreadLock() {
 }
 
 ThreadLock::~ThreadLock() {
+#ifdef MMKV_OHOS
+    // OHOS's pthread is buggy, check for POC: https://gist.github.com/lingol/622af352e090e0490ebacfe3a38b9221 
+    pthread_mutex_unlock(&m_lock);
+#endif
     pthread_mutex_destroy(&m_lock);
 }
 
-void ThreadLock::initialize() {
-    return;
-}
-
 void ThreadLock::lock() {
     auto ret = pthread_mutex_lock(&m_lock);
     if (ret != 0) {
@@ -64,6 +64,10 @@ bool ThreadLock::try_lock() {
     return (ret == 0);
 }
 
+void ThreadLock::initialize() {
+    return;
+}
+
 void ThreadLock::ThreadOnce(ThreadOnceToken_t *onceToken, void (*callback)()) {
     pthread_once(onceToken, callback);
 }

package/MMKV/Core/ThreadLock.h

@@ -20,6 +20,7 @@
 
 #ifndef MMKV_THREADLOCK_H
 #define MMKV_THREADLOCK_H
+
 #ifdef  __cplusplus
 
 #include "MMKVPredef.h"
@@ -29,8 +30,7 @@
 #    define MMKV_USING_PTHREAD 1
 #endif
 
-#if MMKV_USING_PTHREAD
-#else
+#ifndef MMKV_USING_PTHREAD
 #    include <atomic>
 #endif
 
@@ -45,7 +45,6 @@ using ThreadOnceToken_t = std::atomic<ThreadOnceTokenEnum>;
 #endif
 
 class ThreadLock {
-private:
 #if MMKV_USING_PTHREAD
     pthread_mutex_t m_lock;
 #else

package/MMKV/Core/aes/AESCrypt.h

@@ -24,6 +24,7 @@
 
 #include "../MMKVPredef.h"
 #include <cstddef>
+#include <cstdint>
 
 #ifdef MMKV_DISABLE_CRYPT
 

package/MMKV/Core/aes/openssl/openssl_aes.h

@@ -13,6 +13,7 @@
 
 #include "openssl_opensslconf.h"
 #include "openssl_arm_arch.h"
+#include <cstdint>
 #include <stddef.h>
 #include "../../MMKVPredef.h"
 
@@ -77,6 +78,15 @@ extern "C" int openssl_aes_armv8_set_decrypt_key(const uint8_t *userKey, const i
 extern "C" void openssl_aes_armv8_encrypt(const uint8_t *in, uint8_t *out, const void *key);
 extern "C" void openssl_aes_armv8_decrypt(const uint8_t *in, uint8_t *out, const void *key);
 
+#ifdef MMKV_OHOS
+
+#define AES_set_encrypt_key(userKey, bits, key) openssl_aes_armv8_set_encrypt_key(userKey, bits, key)
+#define AES_set_decrypt_key(userKey, bits, key) openssl_aes_armv8_set_decrypt_key(userKey, bits, key)
+#define AES_encrypt(in, out, key) openssl_aes_armv8_encrypt(in, out, key)
+#define AES_decrypt(in, out, key) openssl_aes_armv8_decrypt(in, out, key)
+
+#else
+
 typedef int (*aes_set_encrypt_t)(const uint8_t *userKey, const int bits, void *key);
 typedef int (*aes_set_decrypt_t)(const uint8_t *userKey, const int bits, void *key);
 typedef void (*aes_encrypt_t)(const uint8_t *in, uint8_t *out, const void *key);
@@ -96,6 +106,8 @@ extern aes_decrypt_t AES_decrypt;
 
 } // namespace openssl
 
+#endif // !MMKV_OHOS
+
 #endif // __ARM_MAX_ARCH__ <= 7
 
 #endif // __linux__

package/MMKV/Core/aes/openssl/openssl_aes_core.cpp

@@ -45,16 +45,16 @@
 
 namespace openssl {
 
-#if (__ARM_MAX_ARCH__ > 7) && defined(__linux__)
+#if (__ARM_MAX_ARCH__ > 7) && defined(__linux__) && !defined(MMKV_OHOS)
 
 aes_set_encrypt_t AES_set_encrypt_key = openssl::AES_C_set_encrypt_key;
 aes_set_decrypt_t AES_set_decrypt_key = openssl::AES_C_set_decrypt_key;
 aes_encrypt_t AES_encrypt = openssl::AES_C_encrypt;
 aes_encrypt_t AES_decrypt = openssl::AES_C_decrypt;
 
-#endif // (__ARM_MAX_ARCH__ > 7 && defined(__linux__)
+#endif // (__ARM_MAX_ARCH__ > 7 && defined(__linux__) && !defined(MMKV_OHOS)
 
-#if (__ARM_MAX_ARCH__ <= 0) || (__ARM_MAX_ARCH__ > 7 && defined(__linux__))
+#if (__ARM_MAX_ARCH__ <= 0) || (__ARM_MAX_ARCH__ > 7 && defined(__linux__) && !defined(MMKV_OHOS))
 
 /*-
 Te0[x] = S [x].[02, 01, 01, 03];
@@ -1037,7 +1037,7 @@ void AES_C_decrypt(const uint8_t *in, uint8_t *out, const void *k) {
     PUTU32(out + 12, s3);
 }
 
-#endif // (__ARM_MAX_ARCH__ < 0) || (__ARM_MAX_ARCH__ > 7 && defined(__linux__))
+#endif // (__ARM_MAX_ARCH__ < 0) || (__ARM_MAX_ARCH__ > 7 && defined(__linux__) && !defined(MMKV_OHOS))
 
 } // namespace openssl