ios: wait for pre-event callback completion

xmtp · Dec 27, 2023 · d5f2557 · d5f2557
1 parent 08649d7
commit d5f2557
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/ios/XMTPModule.swift b/ios/XMTPModule.swift
@@ -28,6 +28,8 @@ public class XMTPModule: Module {
 	let clientsManager = ClientsManager()
 	let conversationsManager = IsolatedManager<Conversation>()
 	let subscriptionsManager = IsolatedManager<Task<Void, Never>>()
+	var preEnableIdentityCallbackDeferred: DispatchGroup?
+	var preCreateIdentityCallbackDeferred: DispatchGroup?
 
 	actor ClientsManager {
 		private var clients: [String: XMTP.Client] = [:]
@@ -67,6 +69,12 @@ public class XMTPModule: Module {
 		AsyncFunction("auth") { (address: String, environment: String, appVersion: String?, hasCreateIdentityCallback: Bool?, hasEnableIdentityCallback: Bool?) in
 			let signer = ReactNativeSigner(module: self, address: address)
 			self.signer = signer
+			if(hasCreateIdentityCallback ?? false) {
+				preCreateIdentityCallbackDeferred = DispatchGroup()
+			}
+			if(hasEnableIdentityCallback ?? false) {
+				preEnableIdentityCallbackDeferred = DispatchGroup()
+			}
 			let preCreateIdentityCallback: PreEventCallback? = hasCreateIdentityCallback ?? false ? self.preCreateIdentityCallback : nil
 			let preEnableIdentityCallback: PreEventCallback? = hasEnableIdentityCallback ?? false ? self.preEnableIdentityCallback : nil
 			let options = createClientConfig(env: environment, appVersion: appVersion, preEnableIdentityCallback: preEnableIdentityCallback, preCreateIdentityCallback: preCreateIdentityCallback)
@@ -82,6 +90,12 @@ public class XMTPModule: Module {
 		// Generate a random wallet and set the client to that
 		AsyncFunction("createRandom") { (environment: String, appVersion: String?, hasCreateIdentityCallback: Bool?, hasEnableIdentityCallback: Bool?) -> String in
 			let privateKey = try PrivateKey.generate()
+			if(hasCreateIdentityCallback ?? false) {
+				preCreateIdentityCallbackDeferred = DispatchGroup()
+			}
+			if(hasEnableIdentityCallback ?? false) {
+				preEnableIdentityCallbackDeferred = DispatchGroup()
+			}
 			let preCreateIdentityCallback: PreEventCallback? = hasCreateIdentityCallback ?? false ? self.preCreateIdentityCallback : nil
 			let preEnableIdentityCallback: PreEventCallback? = hasEnableIdentityCallback ?? false ? self.preEnableIdentityCallback : nil
 
@@ -534,6 +548,14 @@ public class XMTPModule: Module {
 				try ConsentWrapper.encode(entry.value)
 			}
 		}
+
+		Function("preEnableIdentityCallbackCompleted") {
+			preEnableIdentityCallbackDeferred?.leave()
+		}
+
+		Function("preCreateIdentityCallbackCompleted") {
+			preCreateIdentityCallbackDeferred?.leave()
+		}
 	}
 
 	//
@@ -673,9 +695,15 @@ public class XMTPModule: Module {
 
 	func preEnableIdentityCallback() {
 		sendEvent("preEnableIdentityCallback")
+		preEnableIdentityCallbackDeferred?.enter()
+		preEnableIdentityCallbackDeferred?.wait()
+		preCreateIdentityCallbackDeferred = nil
 	}
 
 	func preCreateIdentityCallback() {
 		sendEvent("preCreateIdentityCallback")
+		preCreateIdentityCallbackDeferred?.enter()
+		preCreateIdentityCallbackDeferred?.wait()
+		preEnableIdentityCallbackDeferred = nil
 	}
 }