@doorstepai/dropoff-sdk 2.0.2 → 2.0.3

package/android/build.gradle

@@ -86,7 +86,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation("ai.doorstep.com:doorstepai-dropoff-sdk:2.0.1")
+  implementation("ai.doorstep.com:doorstepai-dropoff-sdk:2.0.3")
   api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
 }
 

package/android/src/main/java/com/doorstepai/dropoffsdk/DoorstepAIModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.Promise
 import com.doorstepai.sdks.tracking.DoorstepAI
 import com.doorstepai.sdks.tracking.AddressType
 import com.doorstepai.sdks.tracking.DropoffType
+import com.doorstepai.sdks.tracking.LatLngObject
 import com.facebook.react.bridge.ReadableMap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.CoroutineScope
@@ -81,11 +82,13 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   fun startDeliveryByAddressString(
     address: String,
     deliveryId: String,
+    coordinates: ReadableMap?,
     timeoutSeconds: Double?,
     promise: Promise
   ) {
     try {
-      DoorstepAI.startDeliveryByAddressString(address, deliveryId, timeoutSeconds) { result ->
+      val coords = parseCoordinates(coordinates)
+      DoorstepAI.startDeliveryByAddressString(address, deliveryId, coords, timeoutSeconds) { result ->
         result.onSuccess { message ->
           promise.resolve(message)
         }.onFailure { error ->
@@ -123,6 +126,7 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   fun startDeliveryByAddress(
     addressMap: ReadableMap,
     deliveryId: String,
+    coordinates: ReadableMap?,
     timeoutSeconds: Double?,
     promise: Promise
   ) {
@@ -143,7 +147,8 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
         postalCode = postalCode
       )
 
-      DoorstepAI.startDeliveryByAddressType(address, deliveryId, timeoutSeconds) { result ->
+      val coords = parseCoordinates(coordinates)
+      DoorstepAI.startDeliveryByAddressType(address, deliveryId, coords, timeoutSeconds) { result ->
         result.onSuccess { sessionId ->
           promise.resolve(sessionId)
         }.onFailure { error ->
@@ -196,8 +201,9 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  fun setApiKey(key: String) {
+  fun setApiKey(key: String): Boolean {
     DoorstepAI.setAPIKey(key)
+    return true
   }
 
   @ReactMethod
@@ -288,6 +294,13 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
     }
   }
 
+  private fun parseCoordinates(map: ReadableMap?): LatLngObject? {
+    if (map == null) return null
+    val lat = if (map.hasKey("lat")) map.getDouble("lat") else return null
+    val lng = if (map.hasKey("lng")) map.getDouble("lng") else return null
+    return LatLngObject(lat = lat, lng = lng)
+  }
+
   companion object {
     const val NAME = "DoorstepAI"
   }

package/ios/DoorstepAI.mm

@@ -18,11 +18,13 @@ RCT_EXTERN_METHOD(startDeliveryByPlusCode:(nonnull NSString *)plusCode
                  rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(startDeliveryByAddress:(nonnull NSDictionary *)address
                  deliveryId:(nonnull NSString *)deliveryId
+                 coordinates:(nullable NSDictionary *)coordinates
                  timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(startDeliveryByAddressString:(nonnull NSString *)address
                  deliveryId:(nonnull NSString *)deliveryId
+                 coordinates:(nullable NSDictionary *)coordinates
                  timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/DoorstepAI.swift

@@ -70,15 +70,18 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByAddressString(_ address: NSString,
                                       deliveryId: NSString,
+                                      coordinates: NSDictionary?,
                                       timeoutSeconds: NSNumber?,
                                       resolver resolve: @escaping RCTPromiseResolveBlock,
                                       rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
                 let timeout = timeoutSeconds?.doubleValue
+                let coords = parseCoordinates(coordinates)
                 try await DoorstepAI.startDeliveryByAddressString(
                     address: address as String,
                     deliveryId: deliveryId as String,
+                    coordinates: coords,
                     timeoutSeconds: timeout
                 )
                 resolve(nil)
@@ -116,11 +119,11 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByAddress(_ address: [String: Any],
                                 deliveryId: NSString,
+                                coordinates: NSDictionary?,
                                 timeoutSeconds: NSNumber?,
                                 resolver resolve: @escaping RCTPromiseResolveBlock,
                                 rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
-            print("Starting delivery by address: \(address)")
             do {
                 guard let streetNumber = address["streetNumber"] as? String,
                       let route = address["route"] as? String,
@@ -140,9 +143,11 @@ class DoorstepAIBridge: NSObject {
                                             postalCode: postalCode)
 
                 let timeout = timeoutSeconds?.doubleValue
+                let coords = parseCoordinates(coordinates)
                 try await DoorstepAI.startDeliveryByAddressType(
                     address: addressStruct,
                     deliveryId: deliveryId as String,
+                    coordinates: coords,
                     timeoutSeconds: timeout
                 )
                 resolve(nil)
@@ -221,4 +226,13 @@ class DoorstepAIBridge: NSObject {
         }
     }
 
+    private func parseCoordinates(_ raw: NSDictionary?) -> LatLngObject? {
+        guard let coordinates = raw as? [String: Any],
+              let lat = coordinates["lat"] as? Double,
+              let lng = coordinates["lng"] as? Double else {
+            return nil
+        }
+        return LatLngObject(lat: lat, lng: lng)
+    }
+
 }