fix android & ios bindings tests

Author: insipx

sdks/android/library/src/androidTest/java/org/xmtp/android/library/ClientTest.kt

@@ -523,7 +523,7 @@ class ClientTest : BaseInstrumentedTest() {
     @Test
     fun testsCanSeeKeyPackageStatus() {
         val fixtures = runBlocking { createFixtures() }
-        runBlocking { Client.connectToApiBackend(ClientOptions.Api(XMTPEnvironment.LOCAL, true)) }
+        runBlocking { Client.connectToApiBackendExclusive(ClientOptions.Api(XMTPEnvironment.LOCAL, true)) }
         val inboxState =
             runBlocking {
                 Client
@@ -576,7 +576,7 @@ class ClientTest : BaseInstrumentedTest() {
     //    @Test
     //    fun testsCanSeeInvalidKeyPackageStatusOnDev() {
     //        runBlocking {
-    //            Client.connectToApiBackend(
+    //            Client.connectToApiBackendExclusive(
     //                ClientOptions.Api(
     //                    XMTPEnvironment.DEV,
     //                    true

sdks/android/library/src/androidTest/java/org/xmtp/android/library/PerformanceTest.kt

@@ -150,7 +150,7 @@ class PerformanceTest : BaseInstrumentedTest() {
         val time3 = end3.time - start3.time
         Log.d("PERF", "Built a client with inboxId in ${time3 / 1000.0}s")
 
-        runBlocking { Client.connectToApiBackend(ClientOptions.Api(XMTPEnvironment.DEV, true)) }
+        runBlocking { Client.connectToApiBackendExclusive(ClientOptions.Api(XMTPEnvironment.DEV, true)) }
         val start4 = Date()
         runBlocking {
             Client.create(

sdks/android/library/src/main/java/org/xmtp/android/library/Client.kt

@@ -31,6 +31,7 @@ import uniffi.xmtpv3.FfiXmtpClient
 import uniffi.xmtpv3.XmtpApiClient
 import uniffi.xmtpv3.applySignatureRequest
 import uniffi.xmtpv3.connectToBackend
+import uniffi.xmtpv3.connectToBackendExclusive
 import uniffi.xmtpv3.createClient
 import uniffi.xmtpv3.enterDebugWriter
 import uniffi.xmtpv3.exitDebugWriter
@@ -245,6 +246,56 @@ class Client(
             }
         }
 
+        @Deprecated("This function will be removed on d14n cutover. Use connectToApiBackend instead.")
+        suspend fun connectToApiBackendExclusive(api: ClientOptions.Api): XmtpApiClient {
+            val cacheKey = api.toCacheKey()
+            return cacheLock.withLock {
+                val cached = apiClientCache[cacheKey]
+
+                if (cached != null && isConnected(cached)) {
+                    return cached
+                }
+
+                // If not cached or not connected, create a fresh client
+                val newClient =
+                    connectToBackendExclusive(
+                        api.env.getUrl(),
+                        api.gatewayHost,
+                        FfiClientMode.DEFAULT,
+                        api.appVersion,
+                        null,
+                        null,
+                    )
+                apiClientCache[cacheKey] = newClient
+                return@withLock newClient
+            }
+        }
+
+        @Deprecated("This function will be removed on d14n cutover. Use connectToSyncApiBackend instead.")
+        suspend fun connectToSyncApiBackendExclusive(api: ClientOptions.Api): XmtpApiClient {
+            val cacheKey = api.toCacheKey()
+            return syncCacheLock.withLock {
+                val cached = syncApiClientCache[cacheKey]
+
+                if (cached != null && isConnected(cached)) {
+                    return cached
+                }
+
+                // If not cached or not connected, create a fresh client
+                val newClient =
+                    connectToBackendExclusive(
+                        api.env.getUrl(),
+                        api.gatewayHost,
+                        FfiClientMode.DEFAULT,
+                        api.appVersion,
+                        null,
+                        null,
+                    )
+                syncApiClientCache[cacheKey] = newClient
+                return@withLock newClient
+            }
+        }
+
         suspend fun getOrCreateInboxId(
             api: ClientOptions.Api,
             publicIdentity: PublicIdentity,

sdks/ios/Sources/XMTPiOS/Client.swift

@@ -478,6 +478,60 @@ public final class Client {
 		return newClient
 	}
 
+	@available(*, deprecated, message: "This function will be removed on d14n cutover. Use connectToApiBackend instead.")
+	public static func connectToApiBackendExclusive(api: ClientOptions.Api)
+		async throws
+		-> XmtpApiClient
+	{
+		let cacheKey = ApiCacheKey(api: api).stringValue
+
+		// Check for an existing connected client
+		if let cached = await apiCache.getClient(forKey: cacheKey),
+		   try await isConnected(api: cached)
+		{
+			return cached
+		}
+
+		// Either not cached or not connected; create new client
+		let newClient = try await connectToBackendExclusive(
+			v3Host: api.env.url,
+			gatewayHost: api.gatewayHost,
+			clientMode: FfiClientMode.default,
+			appVersion: api.appVersion,
+			authCallback: nil,
+			authHandle: nil
+		)
+		await apiCache.setClient(newClient, forKey: cacheKey)
+		return newClient
+	}
+
+	@available(*, deprecated, message: "This function will be removed on d14n cutover. Use connectToSyncApiBackend instead.")
+	public static func connectToSyncApiBackendExclusive(api: ClientOptions.Api)
+		async throws
+		-> XmtpApiClient
+	{
+		let cacheKey = ApiCacheKey(api: api).stringValue
+
+		// Check for an existing connected client
+		if let cached = await apiCache.getSyncClient(forKey: cacheKey),
+		   try await isConnected(api: cached)
+		{
+			return cached
+		}
+
+		// Either not cached or not connected; create new client
+		let newClient = try await connectToBackendExclusive(
+			v3Host: api.env.url,
+			gatewayHost: api.gatewayHost,
+			clientMode: FfiClientMode.default,
+			appVersion: api.appVersion,
+			authCallback: nil,
+			authHandle: nil
+		)
+		await apiCache.setSyncClient(newClient, forKey: cacheKey)
+		return newClient
+	}
+
 	public static func getOrCreateInboxId(
 		api: ClientOptions.Api, publicIdentity: PublicIdentity
 	) async throws -> InboxId {

sdks/ios/Tests/XMTPTests/ClientTests.swift

@@ -942,7 +942,7 @@ class ClientTests: XCTestCase {
 		let fixtures = try await fixtures()
 		let api = ClientOptions.Api(env: .local, isSecure: XMTPEnvironment.local.isSecure)
 
-		try await Client.connectToApiBackend(api: api)
+		try await Client.connectToApiBackendExclusive(api: api)
 
 		guard
 			let inboxState = try await Client.inboxStatesForInboxIds(