@tryvital/vital-health-react-native 1.6.0 → 1.7.1

package/android/build.gradle

@@ -130,7 +130,7 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-def vital_sdk_version = '1.0.0-beta.14'
+def vital_sdk_version = '1.0.0-beta.16'
 def health_connect_version = '1.0.0-alpha11'
 
 dependencies {
@@ -142,6 +142,8 @@ dependencies {
   implementation "com.github.tryVital.vital-android:VitalClient:$vital_sdk_version"
   implementation "com.github.tryVital.vital-android:VitalHealthConnect:$vital_sdk_version"
   implementation "androidx.health.connect:connect-client:$health_connect_version"
+
+  implementation project(':tryvital_vital-core-react-native')
 // From node_modules
 }
 

package/android/src/main/java/com/vitalhealthreactnative/VitalHealthReactNativeModule.kt

@@ -5,10 +5,9 @@ import android.content.Intent
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContract
 import com.facebook.react.bridge.*
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import io.tryvital.client.Environment
-import io.tryvital.client.Region
-import io.tryvital.client.VitalClient
+import com.vitalcorereactnative.VitalCoreReactNativeModule
 import io.tryvital.client.utils.VitalLogger
 import io.tryvital.vitalhealthconnect.VitalHealthConnectManager
 import io.tryvital.vitalhealthconnect.model.*
@@ -20,12 +19,15 @@ import java.time.Instant
 const val VITAL_HEALTH_ERROR = "VitalHealthError"
 const val VITAL_REQUEST_CODE = 1984
 
+@ReactModule(name = VitalHealthReactNativeModule.NAME)
 class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener {
 
   private val logger = VitalLogger.getOrCreate()
 
-  private var vitalClient: VitalClient? = null
+  private val vitalCore: VitalCoreReactNativeModule by lazy {
+    reactContext.getNativeModule(VitalCoreReactNativeModule::class.java)!!
+  }
   private var vitalHealthConnectManager: VitalHealthConnectManager? = null
 
   private var askForPermission: AskForPermissionContinuation? = null
@@ -47,18 +49,15 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
     enableLogs: Boolean,
     promise: Promise
   ) {
-    if (vitalClient == null) {
-      return promise.reject(
-        "VitalClient is not configured",
-        "VitalClient is not configured",
-      )
-    }
+    logger.enabled = enableLogs
+
+    val client = vitalCore.client ?: return promise.rejectCoreNotConfigured()
 
     val availability = VitalHealthConnectManager.isAvailable(reactApplicationContext)
 
     if (availability != HealthConnectAvailability.Installed) {
       return promise.reject(
-        "Health Connect is unavailable: $availability",
+        VITAL_HEALTH_ERROR,
         "Health Connect is unavailable: $availability",
       )
     }
@@ -67,9 +66,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
 
     val manager = VitalHealthConnectManager.create(
       reactApplicationContext,
-      vitalClient!!.apiKey,
-      vitalClient!!.region,
-      vitalClient!!.environment
+      client
     )
 
     vitalHealthConnectManager = manager
@@ -90,12 +87,8 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun setUserId(userId: String, promise: Promise) {
-    val manager = vitalHealthConnectManager ?: return promise.rejectHealthNotConfigured()
-
-    mainScope.launch {
-      manager.setUserId(userId)
-      promise.resolve(null)
-    }
+    // [Backward Compatibility] Delegate to VitalCore.
+    vitalCore.setUserId(userId, promise)
   }
 
   @ReactMethod
@@ -106,16 +99,8 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
     enableLogs: Boolean,
     promise: Promise
   ) {
-    logger.enabled = enableLogs
-
-    vitalClient = VitalClient(
-      reactApplicationContext,
-      stringToRegion(region),
-      stringToEnvironment(environment),
-      apiKey
-    )
-
-    promise.resolve(null)
+    // [Backward Compatibility] Delegate to VitalCore.
+    vitalCore.configure(apiKey, environment, region, enableLogs, promise)
   }
 
   @ReactMethod
@@ -203,10 +188,19 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun cleanUp(promise: Promise) {
-    reset()
-    promise.resolve(null)
+    val manager = vitalHealthConnectManager ?: return promise.rejectHealthNotConfigured()
+
+    mainScope.launch {
+      manager.cleanUp()
+      promise.resolve(null)
+    }
   }
 
+  /**
+   * Cancel the existing VitalHealthConnectManager and prepare for a new one to be recreated.
+   *
+   * TODO: To be removed after the Android SDK is singletonized.
+   */
   private fun reset() {
     mainScope.cancel()
     mainScope = MainScope()
@@ -242,8 +236,8 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
         promise.resolve(null)
       } catch (e: Exception) {
         promise.reject(
-          "Failed to write data",
-          e.message,
+          VITAL_HEALTH_ERROR,
+          "Failed to write data: ${e.message}",
           e
         )
       }
@@ -351,24 +345,8 @@ private data class AskForPermissionContinuation(
   val promise: Promise
 )
 
-private fun stringToRegion(region: String): Region {
-  when (region) {
-    "eu" -> return Region.EU
-    "us" -> return Region.US
-  }
-
-  throw Exception("Unsupported region $region")
-}
-
-private fun stringToEnvironment(environment: String): Environment {
-  when (environment) {
-    "production" -> return Environment.Production
-    "sandbox" -> return Environment.Sandbox
-    "dev" -> return Environment.Dev
-  }
-
-  throw Exception("Unsupported environment $environment")
-}
+private fun Promise.rejectCoreNotConfigured()
+  = reject(VITAL_HEALTH_ERROR, "VitalCore client has not been configured.")
 
 private fun Promise.rejectHealthNotConfigured()
   = reject(VITAL_HEALTH_ERROR, "VitalHealth client has not been configured.")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-health-react-native",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "Client to access iOS's HealthKit and Android HealthConnect",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/vital-health-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "VitalHealthKit", "~> 0.9.6"
+  s.dependency "VitalHealthKit", "~> 0.9.7"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then