Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sign actions should wait for preCallback completion before proceeding #193

Merged
merged 4 commits into from
Jan 3, 2024
Merged

fix: sign actions should wait for preCallback completion before proceeding #193

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3650b8d
fix: sign actions should wait for pre-callback completion before proc…
cameronvoell Dec 22, 2023
08649d7
Clean up kotlin code
cameronvoell Dec 22, 2023
d5f2557
ios: wait for pre-event callback completion
Dec 27, 2023
8560716
Update DispatchGroup to DispatchSemaphore in XMTPModule.swift
Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import expo.modules.xmtpreactnativesdk.wrappers.DecodedMessageWrapper
import expo.modules.xmtpreactnativesdk.wrappers.DecryptedLocalAttachment
import expo.modules.xmtpreactnativesdk.wrappers.EncryptedLocalAttachment
import expo.modules.xmtpreactnativesdk.wrappers.PreparedLocalMessage
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
Expand Down Expand Up @@ -126,6 +127,9 @@ class XMTPModule : Module() {
private val isDebugEnabled = BuildConfig.DEBUG // TODO: consider making this configurable
private val conversations: MutableMap<String, Conversation> = mutableMapOf()
private val subscriptions: MutableMap<String, Job> = mutableMapOf()
private var preEnableIdentityCallbackDeferred: CompletableDeferred<Unit>? = null
private var preCreateIdentityCallbackDeferred: CompletableDeferred<Unit>? = null


override fun definition() = ModuleDefinition {
Name("XMTP")
Expand All @@ -151,6 +155,11 @@ class XMTPModule : Module() {
logV("auth")
val reactSigner = ReactNativeSigner(module = this@XMTPModule, address = address)
signer = reactSigner

if (hasCreateIdentityCallback == true)
preCreateIdentityCallbackDeferred = CompletableDeferred()
if (hasEnableIdentityCallback == true)
preEnableIdentityCallbackDeferred = CompletableDeferred()
val preCreateIdentityCallback: PreEventCallback? =
preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true }
val preEnableIdentityCallback: PreEventCallback? =
Expand All @@ -175,6 +184,11 @@ class XMTPModule : Module() {
AsyncFunction("createRandom") { environment: String, appVersion: String?, hasCreateIdentityCallback: Boolean?, hasEnableIdentityCallback: Boolean? ->
logV("createRandom")
val privateKey = PrivateKeyBuilder()

if (hasCreateIdentityCallback == true)
preCreateIdentityCallbackDeferred = CompletableDeferred()
if (hasEnableIdentityCallback == true)
preEnableIdentityCallbackDeferred = CompletableDeferred()
val preCreateIdentityCallback: PreEventCallback? =
preCreateIdentityCallback.takeIf { hasCreateIdentityCallback == true }
val preEnableIdentityCallback: PreEventCallback? =
Expand Down Expand Up @@ -590,6 +604,16 @@ class XMTPModule : Module() {
val client = clients[clientAddress] ?: throw XMTPException("No client")
client.contacts.consentList.entries.map { ConsentWrapper.encode(it.value) }
}

Function("preCreateIdentityCallbackCompleted") {
logV("preCreateIdentityCallbackCompleted")
preCreateIdentityCallbackDeferred?.complete(Unit)
}

Function("preEnableIdentityCallbackCompleted") {
logV("preEnableIdentityCallbackCompleted")
preEnableIdentityCallbackDeferred?.complete(Unit)
}
}

//
Expand Down Expand Up @@ -715,10 +739,14 @@ class XMTPModule : Module() {

private val preEnableIdentityCallback: suspend () -> Unit = {
sendEvent("preEnableIdentityCallback")
preEnableIdentityCallbackDeferred?.await()
preCreateIdentityCallbackDeferred == null
}

private val preCreateIdentityCallback: suspend () -> Unit = {
sendEvent("preCreateIdentityCallback")
preCreateIdentityCallbackDeferred?.await()
preCreateIdentityCallbackDeferred = null
}
}

Expand Down
28 changes: 28 additions & 0 deletions ios/XMTPModule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [:]
Expand Down Expand Up @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -534,6 +548,14 @@ public class XMTPModule: Module {
try ConsentWrapper.encode(entry.value)
}
}

Function("preEnableIdentityCallbackCompleted") {
preEnableIdentityCallbackDeferred?.leave()
}

Function("preCreateIdentityCallbackCompleted") {
preCreateIdentityCallbackDeferred?.leave()
}
}

//
Expand Down Expand Up @@ -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
}
}
8 changes: 8 additions & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,14 @@ export async function consentList(
})
}

export function preEnableIdentityCallbackCompleted() {
XMTPModule.preEnableIdentityCallbackCompleted()
}

export function preCreateIdentityCallbackCompleted() {
XMTPModule.preCreateIdentityCallbackCompleted()
}

export const emitter = new EventEmitter(XMTPModule ?? NativeModulesProxy.XMTP)

export * from './lib/ContentCodec'
Expand Down
2 changes: 2 additions & 0 deletions src/lib/Client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ export class Client<ContentTypes> {
opts,
async () => {
await this.executeCallback(opts?.preEnableIdentityCallback)
XMTPModule.preEnableIdentityCallbackCompleted()
}
)

Expand All @@ -244,6 +245,7 @@ export class Client<ContentTypes> {
opts,
async () => {
await this.executeCallback(opts?.preCreateIdentityCallback)
XMTPModule.preCreateIdentityCallbackCompleted()
}
)

Expand Down
Loading