react-native-mmkv 1.6.0 → 2.0.0

package/README.md

@@ -37,13 +37,13 @@
 ## Sponsors
 
 <div align="right">
-  <a href="https://getstream.io/chat/react-native-chat/tutorial/?utm_source=github&utm_medium=github_repo_content_ad&utm_content=developer&utm_campaign=github_sept2021_reactnativechat">
+  <a href="https://getstream.io/chat/react-native-chat/tutorial/?utm_source=Github&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=Github_Jan2022_ReactNative&utm_term=react-native-mmkv">
     <img align="right" src="https://theme.zdassets.com/theme_assets/9442057/efc3820e436f9150bc8cf34267fff4df052a1f9c.png" height="40" />
   </a>
 </div>
 
 react-native-mmkv is sponsored by **getstream.io**. <br/>
-[Try the React Native Chat tutorial 💬](https://getstream.io/chat/react-native-chat/tutorial/?utm_source=github&utm_medium=github_repo_content_ad&utm_content=developer&utm_campaign=github_sept2021_reactnativechat)
+[Try the React Native Chat tutorial 💬](https://getstream.io/chat/react-native-chat/tutorial/?utm_source=Github&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=Github_Jan2022_ReactNative&utm_term=react-native-mmkv)
 
 ## Benchmark
 
@@ -57,25 +57,19 @@ react-native-mmkv is sponsored by **getstream.io**. <br/>
 
 ## Installation
 
-```sh
-npm install react-native-mmkv
-```
-
-### iOS
-
-iOS installation is automatic, just run:
+### React Native
 
 ```sh
+yarn add react-native-mmkv
 cd ios && pod install
 ```
 
-### Android
-
-To correctly initialize MMKV on Android, please follow the [Installation guide](./INSTALL.md).
-
 ### Expo
 
-See this comment for more information: [mrousavy/react-native-mmkv#157 (comment)](https://github.com/mrousavy/react-native-mmkv/issues/157#issuecomment-960647481).
+```sh
+expo install react-native-mmkv
+expo prebuild
+```
 
 ## Usage
 
@@ -168,6 +162,7 @@ const userObject = JSON.parse(jsonUser)
 * [Migrate from AsyncStorage](./docs/MIGRATE_FROM_ASYNC_STORAGE.md)
 * [Using MMKV with redux-persis](./docs/WRAPPER_REDUX.md)
 * [Using MMKV with mobx-persist-storage](./docs/WRAPPER_MOBX.md)
+* [Using MMKV with mobx-persist](./docs/WRAPPER_MOBXPERSIST.md)
 
 ## Limitations
 

package/android/CMakeLists.txt

@@ -17,10 +17,6 @@ if(${REACT_NATIVE_VERSION} LESS 66)
                 INCLUDE_JSI_CPP
                 "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
         )
-        set (
-                INCLUDE_JSIDYNAMIC_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-        )
 endif()
 
 add_library(reactnativemmkv  # <-- Library name
@@ -28,7 +24,6 @@ add_library(reactnativemmkv  # <-- Library name
         src/main/cpp/cpp-adapter.cpp
         src/main/cpp/MmkvHostObject.cpp
         ${INCLUDE_JSI_CPP} # only on older RN versions
-        ${INCLUDE_JSIDYNAMIC_CPP} # only on older RN versions
 )
 
 set_target_properties(
@@ -38,7 +33,7 @@ set_target_properties(
         POSITION_INDEPENDENT_CODE ON
 )
 
-file (GLOB LIBRN_DIR "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
+file (GLOB LIBRN_DIR "${PREBUILT_DIR}/${ANDROID_ABI}")
 
 find_library(
         log-lib

package/android/build.gradle

@@ -2,6 +2,24 @@ import groovy.json.JsonSlurper
 import org.apache.tools.ant.filters.ReplaceTokens
 import java.nio.file.Paths
 
+static def findNodeModules(baseDir) {
+  def basePath = baseDir.toPath().normalize()
+  // Node's module resolution algorithm searches up to the root directory,
+  // after which the base path will be null
+  while (basePath) {
+    def nodeModulesPath = Paths.get(basePath.toString(), "node_modules")
+    def reactNativePath = Paths.get(nodeModulesPath.toString(), "react-native")
+    if (nodeModulesPath.toFile().exists() && reactNativePath.toFile().exists()) {
+      return nodeModulesPath.toString()
+    }
+    basePath = basePath.getParent()
+  }
+  throw new GradleException("MMKV: Failed to find node_modules/ path!")
+}
+
+def nodeModules = findNodeModules(projectDir)
+logger.warn("MMKV: node_modules/ found at: ${nodeModules}")
+
 buildscript {
   repositories {
     google()
@@ -28,7 +46,12 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['Mmkv_' + name]).toInteger()
 }
 
-def found = false
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+def sourceBuild = false
 def defaultDir = null
 def androidSourcesDir = null
 def androidSourcesName = 'React Native sources'
@@ -36,45 +59,28 @@ def androidSourcesName = 'React Native sources'
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
   androidSourcesDir = defaultDir.parentFile.toString()
+} else if (findProject(':ReactAndroid') != null) {
+    sourceBuild = true
+    defaultDir = project(':ReactAndroid').projectDir
+    androidSourcesDir = defaultDir.parentFile.toString()
 } else {
-  defaultDir = new File(
-    projectDir,
-    '/../../../node_modules/react-native/android'
-  )
+  defaultDir = file("$nodeModules/react-native/android")
   androidSourcesDir = defaultDir.parentFile.toString()
 }
 
-if (defaultDir.exists()) {
-  found = true
-} else {
-  def parentDir = rootProject.projectDir
-  defaultDir = new File(parentDir, '../node_modules/react-native/android')
-
-  1.upto(5, {
-    if (found) return true
-    parentDir = parentDir.parentFile
-
-    androidSourcesDir = new File(
-      parentDir,
-      'node_modules/react-native'
-    )
-
-    def androidPrebuiltBinaryDir = new File(
-      parentDir,
-      'node_modules/react-native/android'
+if (!defaultDir.exists()) {
+    throw new GradleException(
+      "${project.name}: React Native android directory (node_modules/react-native/android) does not exist! Resolved node_modules to: ${nodeModules}"
     )
-
-    if (androidPrebuiltBinaryDir.exists()) {
-        found = true
-      } else if (androidSourcesDir.exists()) {
-        found = true
-      }
-  })
 }
 
+def prebuiltDir = sourceBuild
+    ? "$nodeModules/react-native/ReactAndroid/src/main/jni/prebuilt/lib"
+    : "$buildDir/react-native-0*/jni"
+
 
 def reactProperties = new Properties()
-file("$projectDir/../node_modules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+file("$nodeModules/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\.")[1].toInteger()
 
 android {
@@ -90,12 +96,15 @@ android {
     externalNativeBuild {
       cmake {
         cppFlags "-fexceptions", "-frtti", "-std=c++1y", "-DONANDROID"
-        abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         arguments '-DANDROID_STL=c++_shared',
                   "-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION}",
-                  "-DNODE_MODULES_DIR=${defaultDir.parentFile.parentFile.toString()}"
+                  "-DNODE_MODULES_DIR=${nodeModules}",
+                  "-DPREBUILT_DIR=${prebuiltDir}"
       }
     }
+    ndk {
+      abiFilters (*reactNativeArchitectures())
+    }
   }
 
   dexOptions {
@@ -135,41 +144,9 @@ repositories {
   mavenCentral()
   google()
 
-  if (defaultDir.exists()) {
-    maven {
-      url defaultDir.toString()
-      name androidSourcesName
-    }
-
-    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
-  } else {
-    def parentDir = rootProject.projectDir
-    defaultDir = new File(parentDir, '../node_modules/react-native/android')
-
-    1.upto(5, {
-      if (androidPrebuiltBinaryDir.exists()) {
-        maven {
-          url androidPrebuiltBinaryDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
-      } else if (androidSourcesDir.exists()) {
-        maven {
-          url androidSourcesDir.toString()
-          name androidSourcesName
-        }
-
-        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
-      }
-    })
-  }
-
-  if (!found) {
-    throw new GradleException(
-      "${project.name}: unable to locate React Native android sources. " +
-        "Ensure you have you installed React Native as a dependency in your project and try again."
-    )
+  maven {
+    url defaultDir.toString()
+    name androidSourcesName
   }
 }
 
@@ -182,8 +159,10 @@ dependencies {
   //noinspection GradleDynamicVersion
   extractJNI("com.facebook.fbjni:fbjni:+")
 
-  def rnAAR = fileTree("${defaultDir.toString()}").matching({ it.include "**/**/*.aar" }).singleFile
-  extractJNI(files(rnAAR))
+  if (!sourceBuild) {
+    def rnAAR = fileTree("${defaultDir.toString()}").matching({ it.include "**/**/*.aar" }).singleFile
+    extractJNI(files(rnAAR))
+  }
 }
 
 // third-party-ndk deps headers
@@ -352,10 +331,22 @@ task extractJNIFiles {
 }
 extractJNIFiles.mustRunAfter extractAARHeaders
 
-tasks.whenTaskAdded { task ->
-  if (!task.name.contains('Clean') && (task.name.contains('externalNative') || task.name.contains('CMake'))) {
-    task.dependsOn(extractAARHeaders)
-    task.dependsOn(extractJNIFiles)
-    task.dependsOn(prepareThirdPartyNdkHeaders)
+def nativeBuildDependsOn(dependsOnTask, variant) {
+  def buildTasks = tasks.findAll({ task ->
+      !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
+  if (variant != null) {
+    buildTasks = buildTasks.findAll({ task -> task.name.contains(variant) })
+  }
+  buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
+}
+
+afterEvaluate {
+  if (sourceBuild) {
+    nativeBuildDependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck", "Debug")
+    nativeBuildDependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck", "Rel")
+  } else {
+    nativeBuildDependsOn(extractAARHeaders, null)
+    nativeBuildDependsOn(extractJNIFiles, null)
+    nativeBuildDependsOn(prepareThirdPartyNdkHeaders, null)
   }
 }

package/android/src/main/java/com/reactnativemmkv/MmkvModule.java

@@ -1,24 +1,49 @@
 package com.reactnativemmkv;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = MmkvModule.NAME)
 public class MmkvModule extends ReactContextBaseJavaModule {
-  static {
-    System.loadLibrary("reactnativemmkv");
-  }
+  public static final String NAME = "MMKV";
 
-  private static native void nativeInstall(long jsiPtr, String path);
-
-  public static void install(JavaScriptContextHolder jsContext, String storageDirectory) {
-    nativeInstall(jsContext.get(), storageDirectory);
+  public MmkvModule(ReactApplicationContext reactContext) {
+    super(reactContext);
   }
 
   @NonNull
   @Override
   public String getName() {
-    return "MMKV";
+    return NAME;
   }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public boolean install(@Nullable String rootDirectory) {
+    try {
+      Log.i(NAME, "Loading C++ library...");
+      System.loadLibrary("reactnativemmkv");
+
+      JavaScriptContextHolder jsContext = getReactApplicationContext().getJavaScriptContextHolder();
+      if (rootDirectory == null) {
+        rootDirectory = getReactApplicationContext().getFilesDir().getAbsolutePath() + "/mmkv";
+      }
+      Log.i(NAME, "Installing MMKV JSI Bindings for MMKV root directory: " + rootDirectory);
+      nativeInstall(jsContext.get(), rootDirectory);
+      Log.i(NAME, "Successfully installed MMKV JSI Bindings!");
+      return true;
+    } catch (Exception exception) {
+      Log.e(NAME, "Failed to install MMKV JSI Bindings!", exception);
+      return false;
+    }
+  }
+
+  private static native void nativeInstall(long jsiPtr, String path);
 }

package/android/src/main/java/com/reactnativemmkv/MmkvPackage.java

@@ -15,8 +15,7 @@ public class MmkvPackage implements ReactPackage {
   @NonNull
   @Override
   public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-    // TODO: Remove this dummy init, once TurboModules are stable I will migrate to those.
-    return Collections.singletonList(new MmkvModule());
+    return Collections.singletonList(new MmkvModule(reactContext));
   }
 
   @NonNull

package/ios/{Mmkv.h → MmkvModule.h}

@@ -1,6 +1,6 @@
 #import <React/RCTBridgeModule.h>
 
-@interface Mmkv : NSObject <RCTBridgeModule>
+@interface MmkvModule : NSObject <RCTBridgeModule>
 
 @property (nonatomic, assign) BOOL setBridgeOnMainQueue;
 

package/ios/MmkvModule.mm

@@ -0,0 +1,70 @@
+#import "MmkvModule.h"
+#import "JSIUtils.h"
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTUtils.h>
+#import <jsi/jsi.h>
+
+#import <MMKV/MMKV.h>
+#import "MmkvHostObject.h"
+
+using namespace facebook;
+
+@implementation MmkvModule
+@synthesize bridge = _bridge;
+@synthesize methodQueue = _methodQueue;
+
+RCT_EXPORT_MODULE(MMKV)
+
++ (NSString*)getPropertyAsStringOrNilFromObject:(jsi::Object&)object propertyName:(std::string)propertyName runtime:(jsi::Runtime&)runtime {
+    jsi::Value value = object.getProperty(runtime, propertyName.c_str());
+    std::string string = value.isString() ? value.asString(runtime).utf8(runtime) : "";
+    return string.length() > 0 ? [NSString stringWithUTF8String:string.c_str()] : nil;
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install:(nullable NSString*)storageDirectory)
+{
+    NSLog(@"Installing global.mmkvCreateNewInstance...");
+    RCTBridge* bridge = [RCTBridge currentBridge];
+    RCTCxxBridge* cxxBridge = (RCTCxxBridge*)bridge;
+    if (cxxBridge == nil) {
+        return @false;
+    }
+
+    using namespace facebook;
+
+    auto jsiRuntime = (jsi::Runtime*) cxxBridge.runtime;
+    if (jsiRuntime == nil) {
+        return @false;
+    }
+    auto& runtime = *jsiRuntime;
+  
+    [MMKV initializeMMKV:storageDirectory];
+
+    // MMKV.createNewInstance()
+    auto mmkvCreateNewInstance = jsi::Function::createFromHostFunction(runtime,
+                                                                        jsi::PropNameID::forAscii(runtime, "mmkvCreateNewInstance"),
+                                                                        1,
+                                                                        [](jsi::Runtime& runtime,
+                                                                           const jsi::Value& thisValue,
+                                                                           const jsi::Value* arguments,
+                                                                           size_t count) -> jsi::Value {
+        if (count != 1) {
+            throw jsi::JSError(runtime, "MMKV.createNewInstance(..) expects one argument (object)!");
+        }
+        jsi::Object config = arguments[0].asObject(runtime);
+
+        NSString* instanceId = [MmkvModule getPropertyAsStringOrNilFromObject:config propertyName:"id" runtime:runtime];
+        NSString* path = [MmkvModule getPropertyAsStringOrNilFromObject:config propertyName:"path" runtime:runtime];
+        NSString* encryptionKey = [MmkvModule getPropertyAsStringOrNilFromObject:config propertyName:"encryptionKey" runtime:runtime];
+
+        auto instance = std::make_shared<MmkvHostObject>(instanceId, path, encryptionKey);
+        return jsi::Object::createFromHostObject(runtime, instance);
+    });
+    runtime.global().setProperty(runtime, "mmkvCreateNewInstance", std::move(mmkvCreateNewInstance));
+
+    NSLog(@"Installed global.mmkvCreateNewInstance!");
+    return @true;
+}
+
+@end

package/lib/commonjs/createMMKV.js

@@ -5,10 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createMMKV = void 0;
 
-// global func declaration for JSI functions
+var _reactNative = require("react-native");
+
+// Root directory of all MMKV stores
+const ROOT_DIRECTORY = null;
+
 const createMMKV = config => {
+  // Check if the constructor exists. If not, try installing the JSI bindings.
   if (global.mmkvCreateNewInstance == null) {
-    throw new Error('Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!');
+    // get the MMKV ReactModule
+    const MMKVModule = _reactNative.NativeModules.MMKV;
+    if (MMKVModule == null || typeof MMKVModule.install !== 'function') throw new Error('The native MMKV Module could not be found! Is it correctly installed and autolinked?'); // Call the synchronous blocking install() function
+
+    const result = MMKVModule.install(ROOT_DIRECTORY);
+    if (result !== true) throw new Error(`The native MMKV Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`); // Check again if the constructor now exists. If not, throw an error.
+
+    if (global.mmkvCreateNewInstance == null) throw new Error('Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!');
   }
 
   return global.mmkvCreateNewInstance(config);

package/lib/commonjs/createMMKV.js.map

@@ -1 +1 @@
-{"version":3,"sources":["createMMKV.ts"],"names":["createMMKV","config","global","mmkvCreateNewInstance","Error"],"mappings":";;;;;;;AAEA;AAKO,MAAMA,UAAU,GAAIC,MAAD,IAA2C;AACnE,MAAIC,MAAM,CAACC,qBAAP,IAAgC,IAApC,EAA0C;AACxC,UAAM,IAAIC,KAAJ,CACJ,0MADI,CAAN;AAGD;;AAED,SAAOF,MAAM,CAACC,qBAAP,CAA6BF,MAA7B,CAAP;AACD,CARM","sourcesContent":["import type { MMKVConfiguration, NativeMMKV } from 'react-native-mmkv';\n\n// global func declaration for JSI functions\ndeclare global {\n  function mmkvCreateNewInstance(configuration: MMKVConfiguration): NativeMMKV;\n}\n\nexport const createMMKV = (config: MMKVConfiguration): NativeMMKV => {\n  if (global.mmkvCreateNewInstance == null) {\n    throw new Error(\n      'Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!'\n    );\n  }\n\n  return global.mmkvCreateNewInstance(config);\n};\n"]}
+{"version":3,"sources":["createMMKV.ts"],"names":["ROOT_DIRECTORY","createMMKV","config","global","mmkvCreateNewInstance","MMKVModule","NativeModules","MMKV","install","Error","result"],"mappings":";;;;;;;AAAA;;AAQA;AACA,MAAMA,cAA6B,GAAG,IAAtC;;AAEO,MAAMC,UAAU,GAAIC,MAAD,IAA2C;AACnE;AACA,MAAIC,MAAM,CAACC,qBAAP,IAAgC,IAApC,EAA0C;AACxC;AACA,UAAMC,UAAU,GAAGC,2BAAcC,IAAjC;AACA,QAAIF,UAAU,IAAI,IAAd,IAAsB,OAAOA,UAAU,CAACG,OAAlB,KAA8B,UAAxD,EACE,MAAM,IAAIC,KAAJ,CACJ,sFADI,CAAN,CAJsC,CAOxC;;AACA,UAAMC,MAAM,GAAGL,UAAU,CAACG,OAAX,CAAmBR,cAAnB,CAAf;AACA,QAAIU,MAAM,KAAK,IAAf,EACE,MAAM,IAAID,KAAJ,CACH,gHAA+GC,MAAO,EADnH,CAAN,CAVsC,CAaxC;;AACA,QAAIP,MAAM,CAACC,qBAAP,IAAgC,IAApC,EACE,MAAM,IAAIK,KAAJ,CACJ,0MADI,CAAN;AAGH;;AAED,SAAON,MAAM,CAACC,qBAAP,CAA6BF,MAA7B,CAAP;AACD,CAvBM","sourcesContent":["import { NativeModules } from 'react-native';\nimport type { MMKVConfiguration, NativeMMKV } from 'react-native-mmkv';\n\n// global func declaration for JSI functions\ndeclare global {\n  function mmkvCreateNewInstance(configuration: MMKVConfiguration): NativeMMKV;\n}\n\n// Root directory of all MMKV stores\nconst ROOT_DIRECTORY: string | null = null;\n\nexport const createMMKV = (config: MMKVConfiguration): NativeMMKV => {\n  // Check if the constructor exists. If not, try installing the JSI bindings.\n  if (global.mmkvCreateNewInstance == null) {\n    // get the MMKV ReactModule\n    const MMKVModule = NativeModules.MMKV;\n    if (MMKVModule == null || typeof MMKVModule.install !== 'function')\n      throw new Error(\n        'The native MMKV Module could not be found! Is it correctly installed and autolinked?'\n      );\n    // Call the synchronous blocking install() function\n    const result = MMKVModule.install(ROOT_DIRECTORY);\n    if (result !== true)\n      throw new Error(\n        `The native MMKV Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`\n      );\n    // Check again if the constructor now exists. If not, throw an error.\n    if (global.mmkvCreateNewInstance == null)\n      throw new Error(\n        'Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!'\n      );\n  }\n\n  return global.mmkvCreateNewInstance(config);\n};\n"]}

package/lib/module/createMMKV.js

@@ -1,7 +1,17 @@
-// global func declaration for JSI functions
+import { NativeModules } from 'react-native';
+// Root directory of all MMKV stores
+const ROOT_DIRECTORY = null;
 export const createMMKV = config => {
+  // Check if the constructor exists. If not, try installing the JSI bindings.
   if (global.mmkvCreateNewInstance == null) {
-    throw new Error('Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!');
+    // get the MMKV ReactModule
+    const MMKVModule = NativeModules.MMKV;
+    if (MMKVModule == null || typeof MMKVModule.install !== 'function') throw new Error('The native MMKV Module could not be found! Is it correctly installed and autolinked?'); // Call the synchronous blocking install() function
+
+    const result = MMKVModule.install(ROOT_DIRECTORY);
+    if (result !== true) throw new Error(`The native MMKV Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`); // Check again if the constructor now exists. If not, throw an error.
+
+    if (global.mmkvCreateNewInstance == null) throw new Error('Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!');
   }
 
   return global.mmkvCreateNewInstance(config);

package/lib/module/createMMKV.js.map

@@ -1 +1 @@
-{"version":3,"sources":["createMMKV.ts"],"names":["createMMKV","config","global","mmkvCreateNewInstance","Error"],"mappings":"AAEA;AAKA,OAAO,MAAMA,UAAU,GAAIC,MAAD,IAA2C;AACnE,MAAIC,MAAM,CAACC,qBAAP,IAAgC,IAApC,EAA0C;AACxC,UAAM,IAAIC,KAAJ,CACJ,0MADI,CAAN;AAGD;;AAED,SAAOF,MAAM,CAACC,qBAAP,CAA6BF,MAA7B,CAAP;AACD,CARM","sourcesContent":["import type { MMKVConfiguration, NativeMMKV } from 'react-native-mmkv';\n\n// global func declaration for JSI functions\ndeclare global {\n  function mmkvCreateNewInstance(configuration: MMKVConfiguration): NativeMMKV;\n}\n\nexport const createMMKV = (config: MMKVConfiguration): NativeMMKV => {\n  if (global.mmkvCreateNewInstance == null) {\n    throw new Error(\n      'Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!'\n    );\n  }\n\n  return global.mmkvCreateNewInstance(config);\n};\n"]}
+{"version":3,"sources":["createMMKV.ts"],"names":["NativeModules","ROOT_DIRECTORY","createMMKV","config","global","mmkvCreateNewInstance","MMKVModule","MMKV","install","Error","result"],"mappings":"AAAA,SAASA,aAAT,QAA8B,cAA9B;AAQA;AACA,MAAMC,cAA6B,GAAG,IAAtC;AAEA,OAAO,MAAMC,UAAU,GAAIC,MAAD,IAA2C;AACnE;AACA,MAAIC,MAAM,CAACC,qBAAP,IAAgC,IAApC,EAA0C;AACxC;AACA,UAAMC,UAAU,GAAGN,aAAa,CAACO,IAAjC;AACA,QAAID,UAAU,IAAI,IAAd,IAAsB,OAAOA,UAAU,CAACE,OAAlB,KAA8B,UAAxD,EACE,MAAM,IAAIC,KAAJ,CACJ,sFADI,CAAN,CAJsC,CAOxC;;AACA,UAAMC,MAAM,GAAGJ,UAAU,CAACE,OAAX,CAAmBP,cAAnB,CAAf;AACA,QAAIS,MAAM,KAAK,IAAf,EACE,MAAM,IAAID,KAAJ,CACH,gHAA+GC,MAAO,EADnH,CAAN,CAVsC,CAaxC;;AACA,QAAIN,MAAM,CAACC,qBAAP,IAAgC,IAApC,EACE,MAAM,IAAII,KAAJ,CACJ,0MADI,CAAN;AAGH;;AAED,SAAOL,MAAM,CAACC,qBAAP,CAA6BF,MAA7B,CAAP;AACD,CAvBM","sourcesContent":["import { NativeModules } from 'react-native';\nimport type { MMKVConfiguration, NativeMMKV } from 'react-native-mmkv';\n\n// global func declaration for JSI functions\ndeclare global {\n  function mmkvCreateNewInstance(configuration: MMKVConfiguration): NativeMMKV;\n}\n\n// Root directory of all MMKV stores\nconst ROOT_DIRECTORY: string | null = null;\n\nexport const createMMKV = (config: MMKVConfiguration): NativeMMKV => {\n  // Check if the constructor exists. If not, try installing the JSI bindings.\n  if (global.mmkvCreateNewInstance == null) {\n    // get the MMKV ReactModule\n    const MMKVModule = NativeModules.MMKV;\n    if (MMKVModule == null || typeof MMKVModule.install !== 'function')\n      throw new Error(\n        'The native MMKV Module could not be found! Is it correctly installed and autolinked?'\n      );\n    // Call the synchronous blocking install() function\n    const result = MMKVModule.install(ROOT_DIRECTORY);\n    if (result !== true)\n      throw new Error(\n        `The native MMKV Module could not be installed! Looks like something went wrong when installing JSI bindings: ${result}`\n      );\n    // Check again if the constructor now exists. If not, throw an error.\n    if (global.mmkvCreateNewInstance == null)\n      throw new Error(\n        'Failed to create a new MMKV instance, the native initializer function does not exist. Is the native MMKV library correctly installed? Make sure to disable any remote debugger (e.g. Chrome) to use JSI!'\n      );\n  }\n\n  return global.mmkvCreateNewInstance(config);\n};\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-mmkv",
-  "version": "1.6.0",
-  "description": "An efficient, small mobile key-value storage framework developed by WeChat. Works on Android and iOS.",
+  "version": "2.0.0",
+  "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",
   "types": "lib/typescript/index.d.ts",
@@ -28,7 +28,8 @@
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "lint-ci": "yarn lint -f ./node_modules/@firmnav/eslint-github-actions-formatter/dist/formatter.js",
-    "build": "git submodule update --init --recursive && bob build",
+    "prepare": "git submodule update --init --recursive",
+    "build": "bob build",
     "update-submodule": "git submodule update --remote --merge",
     "release": "release-it",
     "example": "yarn --cwd example",

package/react-native-mmkv.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   # Note how this does not include headers, since those can nameclash.
   s.source_files = [
     "ios/**/*.{m,mm}",
-    "ios/Mmkv.h"
+    "ios/MmkvModule.h"
   ]
   # Any private headers that are not globally unique should be mentioned here.
   # Otherwise there will be a nameclash, since CocoaPods flattens out any header directories

package/android/src/main/java/com/reactnativemmkv/MmkvModulePackage.java

@@ -1,16 +0,0 @@
-package com.reactnativemmkv;
-
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import java.util.Collections;
-import java.util.List;
-
-public class MmkvModulePackage implements JSIModulePackage {
-  @Override
-  public List<JSIModuleSpec> getJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
-    MmkvModule.install(jsContext, reactApplicationContext.getFilesDir().getAbsolutePath() + "/mmkv");
-    return Collections.emptyList();
-  }
-}

package/ios/Mmkv.mm

@@ -1,76 +0,0 @@
-#import "Mmkv.h"
-#import "JSIUtils.h"
-
-#import <React/RCTBridge+Private.h>
-#import <React/RCTUtils.h>
-#import <jsi/jsi.h>
-
-#import <MMKV/MMKV.h>
-#import "MmkvHostObject.h"
-
-using namespace facebook;
-
-@implementation Mmkv
-@synthesize bridge = _bridge;
-@synthesize methodQueue = _methodQueue;
-
-RCT_EXPORT_MODULE()
-
-+ (BOOL)requiresMainQueueSetup {
-    return YES;
-}
-
-static void install(jsi::Runtime & jsiRuntime)
-{
-    // MMKV.createNewInstance()
-    auto mmkvCreateNewInstance = jsi::Function::createFromHostFunction(jsiRuntime,
-                                                                       jsi::PropNameID::forAscii(jsiRuntime, "mmkvCreateNewInstance"),
-                                                                       1,
-                                                                       [](jsi::Runtime& runtime,
-                                                                          const jsi::Value& thisValue,
-                                                                          const jsi::Value* arguments,
-                                                                          size_t count) -> jsi::Value {
-      if (count != 1) {
-        throw jsi::JSError(runtime, "MMKV.createNewInstance(..) expects one argument (object)!");
-      }
-      jsi::Object config = arguments[0].asObject(runtime);
-
-      NSString* instanceId = [Mmkv getPropertyAsStringOrNilFromObject:config propertyName:"id" runtime:runtime];
-      NSString* path = [Mmkv getPropertyAsStringOrNilFromObject:config propertyName:"path" runtime:runtime];
-      NSString* encryptionKey = [Mmkv getPropertyAsStringOrNilFromObject:config propertyName:"encryptionKey" runtime:runtime];
-
-      auto instance = std::make_shared<MmkvHostObject>(instanceId, path, encryptionKey);
-      return jsi::Object::createFromHostObject(runtime, instance);
-    });
-    jsiRuntime.global().setProperty(jsiRuntime, "mmkvCreateNewInstance", std::move(mmkvCreateNewInstance));
-}
-
-+ (NSString*)getPropertyAsStringOrNilFromObject:(jsi::Object&)object propertyName:(std::string)propertyName runtime:(jsi::Runtime&)runtime {
-  jsi::Value value = object.getProperty(runtime, propertyName.c_str());
-  std::string string = value.isString() ? value.asString(runtime).utf8(runtime) : "";
-  return string.length() > 0 ? [NSString stringWithUTF8String:string.c_str()] : nil;
-}
-
-- (void)setup
-{
-    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-    if (!cxxBridge.runtime) {
-        // retry 10ms later - THIS IS A WACK WORKAROUND. wait for TurboModules to land.
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.001 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            [self setup];
-        });
-        return;
-    }
-
-    [MMKV initializeMMKV:nil];
-    install(*(jsi::Runtime *)cxxBridge.runtime);
-}
-
-- (void)setBridge:(RCTBridge *)bridge
-{
-    _bridge = bridge;
-    _setBridgeOnMainQueue = RCTIsMainQueue();
-    [self setup];
-}
-
-@end