@synonymdev/react-native-pubky 0.10.6 → 0.11.1

package/android/build.gradle

@@ -26,9 +26,11 @@ def isNewArchitectureEnabled() {
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+// Disable New Architecture plugin for this library to prevent codegen from
+// generating duplicate React Native core classes
+// if (isNewArchitectureEnabled()) {
+//   apply plugin: "com.facebook.react"
+// }
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Pubky_" + name]

package/android/src/main/java/com/pubky/PubkyModule.kt

@@ -60,29 +60,10 @@ class PubkyModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun deleteFile(url: String, promise: Promise) {
+    fun deleteFile(url: String, secretKey: String, promise: Promise) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val result = deleteFile(url)
-                val array = Arguments.createArray().apply {
-                    result.forEach { pushString(it) }
-                }
-                withContext(Dispatchers.Main) {
-                    promise.resolve(array)
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    promise.reject("Error", e.message)
-                }
-            }
-        }
-    }
-
-    @ReactMethod
-    fun session(pubky: String, promise: Promise) {
-        CoroutineScope(Dispatchers.IO).launch {
-            try {
-                val result = session(pubky)
+                val result = deleteFile(url, secretKey)
                 val array = Arguments.createArray().apply {
                     result.forEach { pushString(it) }
                 }
@@ -244,10 +225,29 @@ class PubkyModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun signOut(secretKey: String, promise: Promise) {
+    fun signOut(sessionSecret: String, promise: Promise) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val result = signOut(sessionSecret)
+                val array = Arguments.createArray().apply {
+                    result.forEach { pushString(it) }
+                }
+                withContext(Dispatchers.Main) {
+                    promise.resolve(array)
+                }
+            } catch (e: Exception) {
+                withContext(Dispatchers.Main) {
+                    promise.reject("Error", e.message)
+                }
+            }
+        }
+    }
+
+    @ReactMethod
+    fun revalidateSession(sessionSecret: String, promise: Promise) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val result = signOut(secretKey)
+                val result = revalidateSession(sessionSecret)
                 val array = Arguments.createArray().apply {
                     result.forEach { pushString(it) }
                 }
@@ -263,10 +263,10 @@ class PubkyModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun put(url: String, content: String, promise: Promise) {
+    fun put(url: String, content: String, secretKey: String, promise: Promise) {
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val result = put(url, content)
+                val result = put(url, content, secretKey)
                 val array = Arguments.createArray().apply {
                     result.forEach { pushString(it) }
                 }

package/android/src/main/java/uniffi/pubkycore/pubkycore.kt

@@ -396,7 +396,7 @@ internal interface _UniFFILib : Library {
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_decrypt_recovery_file(`recoveryFile`: RustBuffer.ByValue,`passphrase`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
-    fun uniffi_pubkycore_fn_func_delete_file(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
+    fun uniffi_pubkycore_fn_func_delete_file(`url`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_generate_mnemonic_phrase(_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
@@ -422,7 +422,7 @@ internal interface _UniFFILib : Library {
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_publish_https(`recordName`: RustBuffer.ByValue,`target`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
-    fun uniffi_pubkycore_fn_func_put(`url`: RustBuffer.ByValue,`content`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
+    fun uniffi_pubkycore_fn_func_put(`url`: RustBuffer.ByValue,`content`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_remove_event_listener(_uniffi_out_err: RustCallStatus, 
     ): Unit
@@ -432,13 +432,13 @@ internal interface _UniFFILib : Library {
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_resolve_https(`publicKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
-    fun uniffi_pubkycore_fn_func_session(`pubky`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
+    fun uniffi_pubkycore_fn_func_revalidate_session(`sessionSecret`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_set_event_listener(`listener`: Long,_uniffi_out_err: RustCallStatus, 
     ): Unit
     fun uniffi_pubkycore_fn_func_sign_in(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
-    fun uniffi_pubkycore_fn_func_sign_out(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
+    fun uniffi_pubkycore_fn_func_sign_out(`sessionSecret`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
     fun uniffi_pubkycore_fn_func_sign_up(`secretKey`: RustBuffer.ByValue,`homeserver`: RustBuffer.ByValue,`signupToken`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, 
     ): RustBuffer.ByValue
@@ -602,7 +602,7 @@ internal interface _UniFFILib : Library {
     ): Short
     fun uniffi_pubkycore_checksum_func_resolve_https(
     ): Short
-    fun uniffi_pubkycore_checksum_func_session(
+    fun uniffi_pubkycore_checksum_func_revalidate_session(
     ): Short
     fun uniffi_pubkycore_checksum_func_set_event_listener(
     ): Short
@@ -644,7 +644,7 @@ private fun uniffiCheckApiChecksums(lib: _UniFFILib) {
     if (lib.uniffi_pubkycore_checksum_func_decrypt_recovery_file() != 26407.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_pubkycore_checksum_func_delete_file() != 9063.toShort()) {
+    if (lib.uniffi_pubkycore_checksum_func_delete_file() != 47931.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_pubkycore_checksum_func_generate_mnemonic_phrase() != 2358.toShort()) {
@@ -683,7 +683,7 @@ private fun uniffiCheckApiChecksums(lib: _UniFFILib) {
     if (lib.uniffi_pubkycore_checksum_func_publish_https() != 5614.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_pubkycore_checksum_func_put() != 48150.toShort()) {
+    if (lib.uniffi_pubkycore_checksum_func_put() != 64514.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_pubkycore_checksum_func_remove_event_listener() != 23534.toShort()) {
@@ -698,7 +698,7 @@ private fun uniffiCheckApiChecksums(lib: _UniFFILib) {
     if (lib.uniffi_pubkycore_checksum_func_resolve_https() != 17266.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_pubkycore_checksum_func_session() != 59795.toShort()) {
+    if (lib.uniffi_pubkycore_checksum_func_revalidate_session() != 57726.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_pubkycore_checksum_func_set_event_listener() != 60071.toShort()) {
@@ -707,7 +707,7 @@ private fun uniffiCheckApiChecksums(lib: _UniFFILib) {
     if (lib.uniffi_pubkycore_checksum_func_sign_in() != 21584.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_pubkycore_checksum_func_sign_out() != 34903.toShort()) {
+    if (lib.uniffi_pubkycore_checksum_func_sign_out() != 27163.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_pubkycore_checksum_func_sign_up() != 48789.toShort()) {
@@ -1259,10 +1259,10 @@ fun `decryptRecoveryFile`(`recoveryFile`: String, `passphrase`: String): List<St
 }
 
 
-fun `deleteFile`(`url`: String): List<String> {
+fun `deleteFile`(`url`: String, `secretKey`: String): List<String> {
     return FfiConverterSequenceString.lift(
     rustCall() { _status ->
-    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_delete_file(FfiConverterString.lower(`url`),_status)
+    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_delete_file(FfiConverterString.lower(`url`),FfiConverterString.lower(`secretKey`),_status)
 })
 }
 
@@ -1363,10 +1363,10 @@ fun `publishHttps`(`recordName`: String, `target`: String, `secretKey`: String):
 }
 
 
-fun `put`(`url`: String, `content`: String): List<String> {
+fun `put`(`url`: String, `content`: String, `secretKey`: String): List<String> {
     return FfiConverterSequenceString.lift(
     rustCall() { _status ->
-    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_put(FfiConverterString.lower(`url`),FfiConverterString.lower(`content`),_status)
+    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_put(FfiConverterString.lower(`url`),FfiConverterString.lower(`content`),FfiConverterString.lower(`secretKey`),_status)
 })
 }
 
@@ -1403,10 +1403,10 @@ fun `resolveHttps`(`publicKey`: String): List<String> {
 }
 
 
-fun `session`(`pubky`: String): List<String> {
+fun `revalidateSession`(`sessionSecret`: String): List<String> {
     return FfiConverterSequenceString.lift(
     rustCall() { _status ->
-    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_session(FfiConverterString.lower(`pubky`),_status)
+    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_revalidate_session(FfiConverterString.lower(`sessionSecret`),_status)
 })
 }
 
@@ -1427,10 +1427,10 @@ fun `signIn`(`secretKey`: String): List<String> {
 }
 
 
-fun `signOut`(`secretKey`: String): List<String> {
+fun `signOut`(`sessionSecret`: String): List<String> {
     return FfiConverterSequenceString.lift(
     rustCall() { _status ->
-    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_sign_out(FfiConverterString.lower(`secretKey`),_status)
+    _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_sign_out(FfiConverterString.lower(`sessionSecret`),_status)
 })
 }
 

package/ios/Frameworks/PubkyCore.xcframework/Info.plist

@@ -10,7 +10,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libpubkycore.a</string>
 			<key>SupportedArchitectures</key>
@@ -19,8 +19,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -28,7 +26,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libpubkycore.a</string>
 			<key>SupportedArchitectures</key>
@@ -37,6 +35,8 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/pubkycoreFFI.h

@@ -73,7 +73,7 @@ RustBuffer uniffi_pubkycore_fn_func_create_recovery_file(RustBuffer secret_key,
 );
 RustBuffer uniffi_pubkycore_fn_func_decrypt_recovery_file(RustBuffer recovery_file, RustBuffer passphrase, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_delete_file(RustBuffer url, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_delete_file(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_generate_mnemonic_phrase(RustCallStatus *_Nonnull out_status
     
@@ -102,7 +102,7 @@ RustBuffer uniffi_pubkycore_fn_func_publish(RustBuffer record_name, RustBuffer r
 );
 RustBuffer uniffi_pubkycore_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_put(RustBuffer url, RustBuffer content, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_put(RustBuffer url, RustBuffer content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
 void uniffi_pubkycore_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status
     
@@ -113,13 +113,13 @@ RustBuffer uniffi_pubkycore_fn_func_resolve(RustBuffer public_key, RustCallStatu
 );
 RustBuffer uniffi_pubkycore_fn_func_resolve_https(RustBuffer public_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_session(RustBuffer pubky, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_revalidate_session(RustBuffer session_secret, RustCallStatus *_Nonnull out_status
 );
 void uniffi_pubkycore_fn_func_set_event_listener(uint64_t listener, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_sign_out(RustBuffer session_secret, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver, RustBuffer signup_token, RustCallStatus *_Nonnull out_status
 );
@@ -304,7 +304,7 @@ uint16_t uniffi_pubkycore_checksum_func_resolve(void
 uint16_t uniffi_pubkycore_checksum_func_resolve_https(void
     
 );
-uint16_t uniffi_pubkycore_checksum_func_session(void
+uint16_t uniffi_pubkycore_checksum_func_revalidate_session(void
     
 );
 uint16_t uniffi_pubkycore_checksum_func_set_event_listener(void

package/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/pubkycoreFFI.h

@@ -73,7 +73,7 @@ RustBuffer uniffi_pubkycore_fn_func_create_recovery_file(RustBuffer secret_key,
 );
 RustBuffer uniffi_pubkycore_fn_func_decrypt_recovery_file(RustBuffer recovery_file, RustBuffer passphrase, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_delete_file(RustBuffer url, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_delete_file(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_generate_mnemonic_phrase(RustCallStatus *_Nonnull out_status
     
@@ -102,7 +102,7 @@ RustBuffer uniffi_pubkycore_fn_func_publish(RustBuffer record_name, RustBuffer r
 );
 RustBuffer uniffi_pubkycore_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_put(RustBuffer url, RustBuffer content, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_put(RustBuffer url, RustBuffer content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
 void uniffi_pubkycore_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status
     
@@ -113,13 +113,13 @@ RustBuffer uniffi_pubkycore_fn_func_resolve(RustBuffer public_key, RustCallStatu
 );
 RustBuffer uniffi_pubkycore_fn_func_resolve_https(RustBuffer public_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_session(RustBuffer pubky, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_revalidate_session(RustBuffer session_secret, RustCallStatus *_Nonnull out_status
 );
 void uniffi_pubkycore_fn_func_set_event_listener(uint64_t listener, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_pubkycore_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_pubkycore_fn_func_sign_out(RustBuffer session_secret, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_pubkycore_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver, RustBuffer signup_token, RustCallStatus *_Nonnull out_status
 );
@@ -304,7 +304,7 @@ uint16_t uniffi_pubkycore_checksum_func_resolve(void
 uint16_t uniffi_pubkycore_checksum_func_resolve_https(void
     
 );
-uint16_t uniffi_pubkycore_checksum_func_session(void
+uint16_t uniffi_pubkycore_checksum_func_revalidate_session(void
     
 );
 uint16_t uniffi_pubkycore_checksum_func_set_event_listener(void

package/ios/Pubky.swift

@@ -136,10 +136,10 @@ class Pubky: RCTEventEmitter {
     }
 
     @objc(signOut:withResolver:withRejecter:)
-    func signOut(_ secretKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func signOut(_ sessionSecret: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                let result = try await react_native_pubky.signOut(secretKey: secretKey)
+                let result = try await react_native_pubky.signOut(sessionSecret: sessionSecret)
                 resolve(result)
             } catch {
                 reject("signOut Error", "Failed to sign out", error)
@@ -147,11 +147,23 @@ class Pubky: RCTEventEmitter {
         }
     }
 
-    @objc(put:content:withResolver:withRejecter:)
-    func put(_ url: String, content: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    @objc(revalidateSession:withResolver:withRejecter:)
+    func revalidateSession(_ sessionSecret: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                let result = try await react_native_pubky.put(url: url, content: content)
+                let result = try await react_native_pubky.revalidateSession(sessionSecret: sessionSecret)
+                resolve(result)
+            } catch {
+                reject("revalidateSession Error", "Failed to revalidate session", error)
+            }
+        }
+    }
+
+    @objc(put:content:secretKey:withResolver:withRejecter:)
+    func put(_ url: String, content: String, secretKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        Task {
+            do {
+                let result = try await react_native_pubky.put(url: url, content: content, secretKey: secretKey)
                 resolve(result)
             } catch {
                 reject("put Error", "Failed to put", error)
@@ -207,11 +219,11 @@ class Pubky: RCTEventEmitter {
         }
     }
 
-    @objc(deleteFile:withResolver:withRejecter:)
-    func deleteFile(_ url: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    @objc(deleteFile:secretKey:withResolver:withRejecter:)
+    func deleteFile(_ url: String, secretKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         Task {
             do {
-                let result = try await react_native_pubky.deleteFile(url: url)
+                let result = try await react_native_pubky.deleteFile(url: url, secretKey: secretKey)
                 resolve(result)
             } catch {
                 reject("list Error", "Failed to deleteFile", error)
@@ -219,18 +231,6 @@ class Pubky: RCTEventEmitter {
         }
     }
 
-    @objc(session:withResolver:withRejecter:)
-    func session(_ pubky: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        Task {
-            do {
-                let result = react_native_pubky.session(pubky: pubky)
-                resolve(result)
-            } catch {
-                reject("session Error", "Failed to get session", error)
-            }
-        }
-    }
-
     @objc(generateSecretKey:withRejecter:)
     func generateSecretKey(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         Task {