@tryvital/vital-core-react-native 1.8.0 → 1.9.0

package/android/build/reports/tests/testDebugUnitTest/classes/com.vitalcorereactnative.SerializationTests.html

@@ -41,7 +41,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.208s</div>
+<div class="counter">0.200s</div>
 <p>duration</p>
 </div>
 </td>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="success">canDeserializeGlucoseSamples</td>
-<td class="success">0.207s</td>
+<td class="success">0.199s</td>
 <td class="success">passed</td>
 </tr>
 </table>
@@ -94,7 +94,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 10 Aug 2023, 16:26:28</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:21</p>
 </div>
 </div>
 </body>

package/android/build/reports/tests/testDebugUnitTest/index.html

@@ -38,7 +38,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.208s</div>
+<div class="counter">0.200s</div>
 <p>duration</p>
 </div>
 </td>
@@ -85,7 +85,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.208s</td>
+<td>0.200s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -112,7 +112,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.208s</td>
+<td>0.200s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -126,7 +126,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 10 Aug 2023, 16:26:28</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:21</p>
 </div>
 </div>
 </body>

package/android/build/reports/tests/testDebugUnitTest/packages/com.vitalcorereactnative.html

@@ -40,7 +40,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.208s</div>
+<div class="counter">0.200s</div>
 <p>duration</p>
 </div>
 </td>
@@ -83,7 +83,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.208s</td>
+<td>0.200s</td>
 <td class="success">100%</td>
 </tr>
 </table>
@@ -96,7 +96,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 10 Aug 2023, 16:26:28</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:21</p>
 </div>
 </div>
 </body>

package/android/build/reports/tests/testReleaseUnitTest/classes/com.vitalcorereactnative.SerializationTests.html

@@ -41,7 +41,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.248s</div>
+<div class="counter">0.176s</div>
 <p>duration</p>
 </div>
 </td>
@@ -76,12 +76,12 @@
 </thead>
 <tr>
 <td class="success">canDeserializeBloodPressureSamples</td>
-<td class="success">0.003s</td>
+<td class="success">0.001s</td>
 <td class="success">passed</td>
 </tr>
 <tr>
 <td class="success">canDeserializeGlucoseSamples</td>
-<td class="success">0.245s</td>
+<td class="success">0.175s</td>
 <td class="success">passed</td>
 </tr>
 </table>
@@ -94,7 +94,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 27 Jun 2023, 09:52:22</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:22</p>
 </div>
 </div>
 </body>

package/android/build/reports/tests/testReleaseUnitTest/index.html

@@ -38,7 +38,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.248s</div>
+<div class="counter">0.176s</div>
 <p>duration</p>
 </div>
 </td>
@@ -85,7 +85,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.248s</td>
+<td>0.176s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -112,7 +112,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.248s</td>
+<td>0.176s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -126,7 +126,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 27 Jun 2023, 09:52:22</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:22</p>
 </div>
 </div>
 </body>

package/android/build/reports/tests/testReleaseUnitTest/packages/com.vitalcorereactnative.html

@@ -40,7 +40,7 @@
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.248s</div>
+<div class="counter">0.176s</div>
 <p>duration</p>
 </div>
 </td>
@@ -83,7 +83,7 @@
 <td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.248s</td>
+<td>0.176s</td>
 <td class="success">100%</td>
 </tr>
 </table>
@@ -96,7 +96,7 @@
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 7.5.1</a> at 27 Jun 2023, 09:52:22</p>
+<a href="http://www.gradle.org">Gradle 7.5.1</a> at 18 Aug 2023, 21:22:22</p>
 </div>
 </div>
 </body>

package/android/build/test-results/testDebugUnitTest/TEST-com.vitalcorereactnative.SerializationTests.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="com.vitalcorereactnative.SerializationTests" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-08-10T15:26:28" hostname="meter.localdomain" time="0.208">
+<testsuite name="com.vitalcorereactnative.SerializationTests" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-08-18T20:22:20" hostname="meter.localdomain" time="0.2">
   <properties/>
-  <testcase name="canDeserializeGlucoseSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.207"/>
+  <testcase name="canDeserializeGlucoseSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.199"/>
   <testcase name="canDeserializeBloodPressureSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.001"/>
   <system-out><![CDATA[]]></system-out>
   <system-err><![CDATA[]]></system-err>

package/android/build/test-results/testReleaseUnitTest/TEST-com.vitalcorereactnative.SerializationTests.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="com.vitalcorereactnative.SerializationTests" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-06-27T08:52:22" hostname="meter.localdomain" time="0.248">
+<testsuite name="com.vitalcorereactnative.SerializationTests" tests="2" skipped="0" failures="0" errors="0" timestamp="2023-08-18T20:22:21" hostname="meter.localdomain" time="0.176">
   <properties/>
-  <testcase name="canDeserializeGlucoseSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.245"/>
-  <testcase name="canDeserializeBloodPressureSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.003"/>
+  <testcase name="canDeserializeGlucoseSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.175"/>
+  <testcase name="canDeserializeBloodPressureSamples" classname="com.vitalcorereactnative.SerializationTests" time="0.001"/>
   <system-out><![CDATA[]]></system-out>
   <system-err><![CDATA[]]></system-err>
 </testsuite>

package/android/build.gradle

@@ -129,7 +129,7 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-def vital_sdk_version = '1.0.0-beta.16'
+def vital_sdk_version = '1.0.0-beta.17'
 
 dependencies {
     //noinspection GradleDynamicVersion

package/android/src/main/java/com/vitalcorereactnative/VitalCoreReactNativeModule.kt

@@ -12,6 +12,8 @@ import com.squareup.moshi.adapter
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import io.tryvital.client.*
+import io.tryvital.client.services.data.DataStage
+import io.tryvital.client.services.data.IngestibleTimeseriesResource
 import io.tryvital.client.services.data.ManualProviderSlug
 import io.tryvital.client.services.data.ProviderSlug
 import io.tryvital.client.services.data.Source
@@ -38,7 +40,7 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
 
   private val mainScope = MainScope()
-  var client: VitalClient? = null
+  val client: VitalClient get() = VitalClient.getOrCreate(reactApplicationContext)
 
   override fun getName(): String {
     return NAME
@@ -46,7 +48,9 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun setUserId(userId: String, promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
+
     client.setUserId(userId)
     promise.resolve(null)
   }
@@ -56,9 +60,7 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
     try {
       VitalLogger.getOrCreate().enabled = enableLogs
 
-      client = VitalClient(
-        reactApplicationContext,
-        // TODO: Expose these as enum constants in the RN SDK
+      VitalClient.getOrCreate(reactApplicationContext).configure(
         region = Region.valueOf(region.uppercase()),
         environment = Environment.valueOf(environment.lowercase().replaceFirstChar { it.uppercase() }),
         apiKey = apiKey
@@ -72,7 +74,8 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun cleanUp(promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
 
     mainScope.launch {
       client.cleanUp()
@@ -82,7 +85,8 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun hasUserConnectedTo(provider: String, promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
 
     val slug = try { ProviderSlug.fromJsonName(provider) } catch (e: IllegalArgumentException) {
       return promise.reject(VITAL_CORE_ERROR, "Unrecognized provider slug: $provider")
@@ -93,7 +97,9 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun userConnectedSources(promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
+
     val userId = client.currentUserId ?: return promise.rejectUserIDNotSet()
 
     mainScope.launch {
@@ -120,7 +126,9 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun deregisterProvider(provider: String, promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
+
     val userId = client.currentUserId ?: return promise.rejectUserIDNotSet()
 
     val slug = try { ProviderSlug.fromJsonName(provider) } catch (e: IllegalArgumentException) {
@@ -142,7 +150,9 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun createConnectedSourceIfNotExist(provider: String, promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
+
     val userId = client.currentUserId ?: return promise.rejectUserIDNotSet()
 
     val slug = try { ManualProviderSlug.fromJsonName(provider) } catch (e: IllegalArgumentException) {
@@ -162,7 +172,9 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   @OptIn(ExperimentalStdlibApi::class)
   fun postTimeSeriesData(jsonString: String, provider: String, timeZoneString: String?, promise: Promise) {
-    val client = client ?: return promise.rejectCoreNotConfigured()
+    if (!client.isConfigured)
+      return promise.rejectCoreNotConfigured()
+
     val userId = client.currentUserId ?: return promise.rejectUserIDNotSet()
 
     val slug = try { ManualProviderSlug.fromJsonName(provider) } catch (e: IllegalArgumentException) {
@@ -189,7 +201,7 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
     }
 
     fun <T> makeTimeseriesPayload(data: T) = TimeseriesPayload(
-      stage = "daily",
+      stage = DataStage.Daily,
       provider = slug,
       startDate = null,
       endDate = null,
@@ -201,9 +213,10 @@ class VitalCoreReactNativeModule(reactContext: ReactApplicationContext) :
       try {
         when (data) {
           is ReactNativeTimeSeriesData.Glucose ->
-            client.vitalsService.sendGlucose(
+            client.vitalsService.sendQuantitySamples(
               userId = userId,
-              glucosePayloads = makeTimeseriesPayload(
+              resource = IngestibleTimeseriesResource.BloodGlucose,
+              timeseriesPayload = makeTimeseriesPayload(
                 data.samples.map { it.payload }
               )
             )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-core-react-native",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "test",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",