@doorstepai/dropoff-sdk 1.0.32 → 2.0.1

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:1.0.21")
+  implementation("ai.doorstep.com:doorstepai-dropoff-sdk:2.0.0")
   api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
 }
 

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

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReactMethod
 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.facebook.react.bridge.ReadableMap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.CoroutineScope
@@ -37,9 +38,14 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startDeliveryByPlaceID(placeID: String, deliveryId: String, promise: Promise) {
+  fun startDeliveryByPlaceID(
+    placeID: String,
+    deliveryId: String,
+    timeoutSeconds: Double?,
+    promise: Promise
+  ) {
     try {
-      DoorstepAI.startDeliveryByPlaceID(placeID, deliveryId) { result ->
+      DoorstepAI.startDeliveryByPlaceID(placeID, deliveryId, timeoutSeconds) { result ->
         result.onSuccess { sessionId ->
           promise.resolve(sessionId)
         }.onFailure { error ->
@@ -52,9 +58,14 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startDeliveryByPlusCode(plusCode: String, deliveryId: String, promise: Promise) {
+  fun startDeliveryByPlusCode(
+    plusCode: String,
+    deliveryId: String,
+    timeoutSeconds: Double?,
+    promise: Promise
+  ) {
     try {
-      DoorstepAI.startDeliveryByPlusCode(plusCode, deliveryId) { result ->
+      DoorstepAI.startDeliveryByPlusCode(plusCode, deliveryId, timeoutSeconds) { result ->
         result.onSuccess { sessionId ->
           promise.resolve(sessionId)
         }.onFailure { error ->
@@ -67,9 +78,14 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startDeliveryByAddressString(address: String, deliveryId: String, promise: Promise) {
+  fun startDeliveryByAddressString(
+    address: String,
+    deliveryId: String,
+    timeoutSeconds: Double?,
+    promise: Promise
+  ) {
     try {
-      DoorstepAI.startDeliveryByAddressString(address, deliveryId) { result ->
+      DoorstepAI.startDeliveryByAddressString(address, deliveryId, timeoutSeconds) { result ->
         result.onSuccess { message ->
           promise.resolve(message)
         }.onFailure { error ->
@@ -82,9 +98,16 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startDeliveryByLatLng(latitude: Double, longitude: Double, deliveryId: String, promise: Promise) {
+  fun startDeliveryByLatLng(
+    latitude: Double,
+    longitude: Double,
+    subUnit: String,
+    deliveryId: String,
+    timeoutSeconds: Double?,
+    promise: Promise
+  ) {
     try {
-      DoorstepAI.startDeliveryByLatLng(latitude, longitude, deliveryId) { result ->
+      DoorstepAI.startDeliveryByLatLng(latitude, longitude, subUnit, deliveryId, timeoutSeconds) { result ->
         result.onSuccess { message ->
           promise.resolve(message)
         }.onFailure { error ->
@@ -100,6 +123,7 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
   fun startDeliveryByAddress(
     addressMap: ReadableMap,
     deliveryId: String,
+    timeoutSeconds: Double?,
     promise: Promise
   ) {
     try {
@@ -119,7 +143,7 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
         postalCode = postalCode
       )
 
-      DoorstepAI.startDeliveryByAddressType(address, deliveryId) { result ->
+      DoorstepAI.startDeliveryByAddressType(address, deliveryId, timeoutSeconds) { result ->
         result.onSuccess { sessionId ->
           promise.resolve(sessionId)
         }.onFailure { error ->
@@ -141,6 +165,26 @@ class DoorstepAIModule(private val reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun markDropoff(deliveryId: String, dropoffType: String, promise: Promise) {
+    CoroutineScope(Dispatchers.IO).launch {
+      try {
+        val type = when (dropoffType.uppercase()) {
+          "POD" -> DropoffType.POD
+          "NON_POD" -> DropoffType.NON_POD
+          else -> {
+            promise.reject("DROP_OFF_TYPE_ERROR", "Invalid dropoff type: $dropoffType")
+            return@launch
+          }
+        }
+        DoorstepAI.markDropoff(deliveryId, type)
+        promise.resolve(true)
+      } catch (e: Exception) {
+        promise.reject("DROP_OFF_ERROR", e.message ?: "Failed to mark dropoff")
+      }
+    }
+  }
+
   @ReactMethod
   fun stopDelivery(deliveryId: String, promise: Promise) {
     try {

package/ios/DoorstepAI.mm

@@ -2,36 +2,46 @@
 
 @interface RCT_EXTERN_MODULE(DoorstepAI, NSObject)
 
-RCT_EXTERN_METHOD(setApiKey:(NSString *)apiKey)
-RCT_EXTERN_METHOD(enableDevMode:(NSString *)apiKey
+RCT_EXTERN_METHOD(setApiKey:(nonnull NSString *)apiKey)
+RCT_EXTERN_METHOD(enableDevMode:(nonnull NSString *)apiKey
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(startDeliveryByPlaceID:(NSString *)placeID
-                 deliveryId:(NSString *)deliveryId
+RCT_EXTERN_METHOD(startDeliveryByPlaceID:(nonnull NSString *)placeID
+                 deliveryId:(nonnull NSString *)deliveryId
+                 timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(startDeliveryByPlusCode:(NSString *)plusCode
-                 deliveryId:(NSString *)deliveryId
+RCT_EXTERN_METHOD(startDeliveryByPlusCode:(nonnull NSString *)plusCode
+                 deliveryId:(nonnull NSString *)deliveryId
+                 timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(startDeliveryByAddress:(NSDictionary *)address
-                 deliveryId:(NSString *)deliveryId
+RCT_EXTERN_METHOD(startDeliveryByAddress:(nonnull NSDictionary *)address
+                 deliveryId:(nonnull NSString *)deliveryId
+                 timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(startDeliveryByAddressString:(NSString *)address
-                 deliveryId:(NSString *)deliveryId
+RCT_EXTERN_METHOD(startDeliveryByAddressString:(nonnull NSString *)address
+                 deliveryId:(nonnull NSString *)deliveryId
+                 timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(startDeliveryByLatLng:(nonnull NSNumber *)latitude
                  longitude:(nonnull NSNumber *)longitude
-                 deliveryId:(NSString *)deliveryId
+                 subUnit:(nonnull NSString *)subUnit
+                 deliveryId:(nonnull NSString *)deliveryId
+                 timeoutSeconds:(nullable NSNumber *)timeoutSeconds
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(newEvent:(NSString *)eventName
-                 deliveryId:(NSString *)deliveryId
+RCT_EXTERN_METHOD(newEvent:(nonnull NSString *)eventName
+                 deliveryId:(nonnull NSString *)deliveryId
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(stopDelivery:(NSString *)deliveryId
+RCT_EXTERN_METHOD(markDropoff:(nonnull NSString *)deliveryId
+                 dropoffType:(nonnull NSString *)dropoffType
+                 resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(stopDelivery:(nonnull NSString *)deliveryId
                  resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(hasCachedData:(RCTPromiseResolveBlock)resolve

package/ios/DoorstepAI.swift

@@ -41,12 +41,18 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByPlaceID(_ placeID: NSString,
                                 deliveryId: NSString,
+                                timeoutSeconds: NSNumber?,
                                 resolver resolve: @escaping RCTPromiseResolveBlock,
                                 rejecter reject: @escaping RCTPromiseRejectBlock) {
         // Use Swift's concurrency support to call the async method.
         Task {
             do {
-                try await DoorstepAI.startDeliveryByPlaceID(placeID: placeID as String, deliveryId: deliveryId as String)
+                let timeout = timeoutSeconds?.doubleValue
+                try await DoorstepAI.startDeliveryByPlaceID(
+                    placeID: placeID as String,
+                    deliveryId: deliveryId as String,
+                    timeoutSeconds: timeout
+                )
                 resolve(nil)
             } catch {
                 reject("E_START_DELIVERY", "Failed to start delivery by Place ID: \(error.localizedDescription)", error)
@@ -57,11 +63,17 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByPlusCode(_ plusCode: NSString,
                                  deliveryId: NSString,
+                                 timeoutSeconds: NSNumber?,
                                  resolver resolve: @escaping RCTPromiseResolveBlock,
                                  rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                try await DoorstepAI.startDeliveryByPlusCode(plusCode: plusCode as String, deliveryId: deliveryId as String)
+                let timeout = timeoutSeconds?.doubleValue
+                try await DoorstepAI.startDeliveryByPlusCode(
+                    plusCode: plusCode as String,
+                    deliveryId: deliveryId as String,
+                    timeoutSeconds: timeout
+                )
                 resolve(nil)
             } catch {
                 reject("E_START_DELIVERY", "Failed to start delivery by Plus Code: \(error.localizedDescription)", error)
@@ -72,11 +84,17 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByAddressString(_ address: NSString,
                                       deliveryId: NSString,
+                                      timeoutSeconds: NSNumber?,
                                       resolver resolve: @escaping RCTPromiseResolveBlock,
                                       rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                try await DoorstepAI.startDeliveryByAddressString(address: address as String, deliveryId: deliveryId as String)
+                let timeout = timeoutSeconds?.doubleValue
+                try await DoorstepAI.startDeliveryByAddressString(
+                    address: address as String,
+                    deliveryId: deliveryId as String,
+                    timeoutSeconds: timeout
+                )
                 resolve(nil)
             } catch {
                 reject("E_START_DELIVERY", "Failed to start delivery by Address String: \(error.localizedDescription)", error)
@@ -87,12 +105,21 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByLatLng(_ latitude: NSNumber,
                                longitude: NSNumber,
+                               subUnit: NSString,
                                deliveryId: NSString,
+                               timeoutSeconds: NSNumber?,
                                resolver resolve: @escaping RCTPromiseResolveBlock,
                                rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                try await DoorstepAI.startDeliveryByLatLng(latitude: latitude.doubleValue, longitude: longitude.doubleValue, deliveryId: deliveryId as String)
+                let timeout = timeoutSeconds?.doubleValue
+                try await DoorstepAI.startDeliveryByLatLng(
+                    latitude: latitude.doubleValue,
+                    longitude: longitude.doubleValue,
+                    subUnit: subUnit as String,
+                    deliveryId: deliveryId as String,
+                    timeoutSeconds: timeout
+                )
                 resolve(nil)
             } catch {
                 reject("E_START_DELIVERY", "Failed to start delivery by LatLng: \(error.localizedDescription)", error)
@@ -103,6 +130,7 @@ class DoorstepAIBridge: NSObject {
     @objc
     func startDeliveryByAddress(_ address: [String: Any],
                                 deliveryId: NSString,
+                                timeoutSeconds: NSNumber?,
                                 resolver resolve: @escaping RCTPromiseResolveBlock,
                                 rejecter reject: @escaping RCTPromiseRejectBlock) {
         Task {
@@ -125,7 +153,12 @@ class DoorstepAIBridge: NSObject {
                                             administrativeAreaLevel1: administrativeAreaLevel1,
                                             postalCode: postalCode)
 
-                try await DoorstepAI.startDeliveryByAddressType(address: addressStruct, deliveryId: deliveryId as String)
+                let timeout = timeoutSeconds?.doubleValue
+                try await DoorstepAI.startDeliveryByAddressType(
+                    address: addressStruct,
+                    deliveryId: deliveryId as String,
+                    timeoutSeconds: timeout
+                )
                 resolve(nil)
             } catch let error as DoorstepAIError {
                 reject("E_START_DELIVERY", "Failed to start delivery by address: \(error.localizedDescription)", error)
@@ -150,6 +183,32 @@ class DoorstepAIBridge: NSObject {
         }
     }
 
+    @objc
+    func markDropoff(_ deliveryId: NSString,
+                     dropoffType: NSString,
+                     resolver resolve: @escaping RCTPromiseResolveBlock,
+                     rejecter reject: @escaping RCTPromiseRejectBlock) {
+        Task {
+            do {
+                let normalized = (dropoffType as String).lowercased()
+                let type: DropoffType
+                switch normalized {
+                case "pod":
+                    type = .pod
+                case "non_pod":
+                    type = .non_pod
+                default:
+                    reject("E_DROP_OFF_TYPE", "Invalid dropoff type: \(dropoffType)", nil)
+                    return
+                }
+                try await DoorstepAI.markDropoff(deliveryId: deliveryId as String, dropoffType: type)
+                resolve(nil)
+            } catch {
+                reject("E_DROP_OFF", "Failed to mark dropoff: \(error.localizedDescription)", error)
+            }
+        }
+    }
+
     @objc
     func stopDelivery(_ deliveryId: NSString,
                       resolver resolve: @escaping RCTPromiseResolveBlock,

package/ios/DoorstepDropoffSDK.xcframework/Info.plist

@@ -10,15 +10,18 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>DoorstepDropoffSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,18 +29,15 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>DoorstepDropoffSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>