diff --git a/README.md b/README.md index 76b6245..b4d6a45 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,6 @@ npm install @synonymdev/react-native-pubky - [x] [create_recovery_file](#createRecoveryFile): Create a recovery file. - [x] [decrypt_recovery_file](#decryptRecoveryFile): Decrypt a recovery file. -### Methods to be Implemented -- [ ] setProfile: Set profile information for a pubky. -- [ ] getProfile: Get profile information for a pubky. - ## Usage ### Auth ```js diff --git a/android/src/main/java/com/pubky/PubkyModule.kt b/android/src/main/java/com/pubky/PubkyModule.kt index 6ac952b..41a3bf2 100644 --- a/android/src/main/java/com/pubky/PubkyModule.kt +++ b/android/src/main/java/com/pubky/PubkyModule.kt @@ -10,7 +10,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import uniffi.pubkymobile.* +import uniffi.pubkycore.* class PubkyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { diff --git a/android/src/main/java/uniffi/pubkymobile/pubkymobile.kt b/android/src/main/java/uniffi/pubkycore/pubkycore.kt similarity index 73% rename from android/src/main/java/uniffi/pubkymobile/pubkymobile.kt rename to android/src/main/java/uniffi/pubkycore/pubkycore.kt index 832b931..d4455aa 100644 --- a/android/src/main/java/uniffi/pubkymobile/pubkymobile.kt +++ b/android/src/main/java/uniffi/pubkycore/pubkycore.kt @@ -3,7 +3,7 @@ @file:Suppress("NAME_SHADOWING") -package uniffi.pubkymobile; +package uniffi.pubkycore; // Common helper code. // @@ -49,7 +49,7 @@ open class RustBuffer : Structure() { companion object { internal fun alloc(size: Int = 0) = rustCall() { status -> - _UniFFILib.INSTANCE.ffi_pubkymobile_rustbuffer_alloc(size, status) + _UniFFILib.INSTANCE.ffi_pubkycore_rustbuffer_alloc(size, status) }.also { if(it.data == null) { throw RuntimeException("RustBuffer.alloc() returned null data pointer (size=${size})") @@ -65,7 +65,7 @@ open class RustBuffer : Structure() { } internal fun free(buf: RustBuffer.ByValue) = rustCall() { status -> - _UniFFILib.INSTANCE.ffi_pubkymobile_rustbuffer_free(buf, status) + _UniFFILib.INSTANCE.ffi_pubkycore_rustbuffer_free(buf, status) } } @@ -362,7 +362,7 @@ private fun findLibraryName(componentName: String): String { if (libOverride != null) { return libOverride } - return "pubkymobile" + return "pubkycore" } private inline fun loadIndirect( @@ -377,7 +377,7 @@ private inline fun loadIndirect( internal interface _UniFFILib : Library { companion object { internal val INSTANCE: _UniFFILib by lazy { - loadIndirect<_UniFFILib>(componentName = "pubkymobile") + loadIndirect<_UniFFILib>(componentName = "pubkycore") .also { lib: _UniFFILib -> uniffiCheckContractApiVersion(lib) uniffiCheckApiChecksums(lib) @@ -386,207 +386,211 @@ internal interface _UniFFILib : Library { } } - fun uniffi_pubkymobile_fn_free_eventnotifier(`ptr`: Pointer,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_free_eventnotifier(`ptr`: Pointer,_uniffi_out_err: RustCallStatus, ): Unit - fun uniffi_pubkymobile_fn_init_callback_eventlistener(`callbackStub`: ForeignCallback,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_init_callback_eventlistener(`callbackStub`: ForeignCallback,_uniffi_out_err: RustCallStatus, ): Unit - fun uniffi_pubkymobile_fn_func_auth(`url`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_auth(`url`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_create_recovery_file(`secretKey`: RustBuffer.ByValue,`passphrase`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_create_recovery_file(`secretKey`: RustBuffer.ByValue,`passphrase`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_decrypt_recovery_file(`recoveryFile`: RustBuffer.ByValue,`passphrase`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_decrypt_recovery_file(`recoveryFile`: RustBuffer.ByValue,`passphrase`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_delete_file(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_delete_file(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_generate_secret_key(_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_generate_secret_key(_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_get(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_get(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_get_public_key_from_secret_key(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_get_public_key_from_secret_key(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_list(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_list(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_parse_auth_url(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_parse_auth_url(`url`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_publish(`recordName`: RustBuffer.ByValue,`recordContent`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_publish(`recordName`: RustBuffer.ByValue,`recordContent`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_publish_https(`recordName`: RustBuffer.ByValue,`target`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_publish_https(`recordName`: RustBuffer.ByValue,`target`: RustBuffer.ByValue,`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_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,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_remove_event_listener(_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_remove_event_listener(_uniffi_out_err: RustCallStatus, ): Unit - fun uniffi_pubkymobile_fn_func_resolve(`publicKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_resolve(`publicKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_resolve_https(`publicKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_resolve_https(`publicKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_session(`pubky`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_session(`pubky`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_set_event_listener(`listener`: Long,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_set_event_listener(`listener`: Long,_uniffi_out_err: RustCallStatus, ): Unit - fun uniffi_pubkymobile_fn_func_sign_in(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_sign_in(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_sign_out(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_sign_out(`secretKey`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun uniffi_pubkymobile_fn_func_sign_up(`secretKey`: RustBuffer.ByValue,`homeserver`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_sign_up(`secretKey`: RustBuffer.ByValue,`homeserver`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun ffi_pubkymobile_rustbuffer_alloc(`size`: Int,_uniffi_out_err: RustCallStatus, + fun uniffi_pubkycore_fn_func_switch_network(`useTestnet`: Byte,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun ffi_pubkymobile_rustbuffer_from_bytes(`bytes`: ForeignBytes.ByValue,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rustbuffer_alloc(`size`: Int,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun ffi_pubkymobile_rustbuffer_free(`buf`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rustbuffer_from_bytes(`bytes`: ForeignBytes.ByValue,_uniffi_out_err: RustCallStatus, + ): RustBuffer.ByValue + fun ffi_pubkycore_rustbuffer_free(`buf`: RustBuffer.ByValue,_uniffi_out_err: RustCallStatus, ): Unit - fun ffi_pubkymobile_rustbuffer_reserve(`buf`: RustBuffer.ByValue,`additional`: Int,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rustbuffer_reserve(`buf`: RustBuffer.ByValue,`additional`: Int,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun ffi_pubkymobile_rust_future_continuation_callback_set(`callback`: UniFffiRustFutureContinuationCallbackType, + fun ffi_pubkycore_rust_future_continuation_callback_set(`callback`: UniFffiRustFutureContinuationCallbackType, ): Unit - fun ffi_pubkymobile_rust_future_poll_u8(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_u8(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_u8(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_u8(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_u8(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_u8(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_u8(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_u8(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Byte - fun ffi_pubkymobile_rust_future_poll_i8(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_i8(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_i8(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_i8(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_i8(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_i8(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_i8(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_i8(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Byte - fun ffi_pubkymobile_rust_future_poll_u16(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_u16(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_u16(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_u16(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_u16(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_u16(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_u16(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_u16(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Short - fun ffi_pubkymobile_rust_future_poll_i16(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_i16(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_i16(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_i16(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_i16(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_i16(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_i16(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_i16(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Short - fun ffi_pubkymobile_rust_future_poll_u32(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_u32(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_u32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_u32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_u32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_u32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_u32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_u32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Int - fun ffi_pubkymobile_rust_future_poll_i32(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_i32(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_i32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_i32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_i32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_i32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_i32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_i32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Int - fun ffi_pubkymobile_rust_future_poll_u64(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_u64(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_u64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_u64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_u64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_u64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_u64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_u64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Long - fun ffi_pubkymobile_rust_future_poll_i64(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_i64(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_i64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_i64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_i64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_i64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_i64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_i64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Long - fun ffi_pubkymobile_rust_future_poll_f32(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_f32(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_f32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_f32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_f32(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_f32(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_f32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_f32(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Float - fun ffi_pubkymobile_rust_future_poll_f64(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_f64(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_f64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_f64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_f64(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_f64(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_f64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_f64(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Double - fun ffi_pubkymobile_rust_future_poll_pointer(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_pointer(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_pointer(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_pointer(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_pointer(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_pointer(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_pointer(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_pointer(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Pointer - fun ffi_pubkymobile_rust_future_poll_rust_buffer(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_rust_buffer(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_rust_buffer(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_rust_buffer(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_rust_buffer(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_rust_buffer(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_rust_buffer(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_rust_buffer(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): RustBuffer.ByValue - fun ffi_pubkymobile_rust_future_poll_void(`handle`: Pointer,`uniffiCallback`: USize, + fun ffi_pubkycore_rust_future_poll_void(`handle`: Pointer,`uniffiCallback`: USize, ): Unit - fun ffi_pubkymobile_rust_future_cancel_void(`handle`: Pointer, + fun ffi_pubkycore_rust_future_cancel_void(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_free_void(`handle`: Pointer, + fun ffi_pubkycore_rust_future_free_void(`handle`: Pointer, ): Unit - fun ffi_pubkymobile_rust_future_complete_void(`handle`: Pointer,_uniffi_out_err: RustCallStatus, + fun ffi_pubkycore_rust_future_complete_void(`handle`: Pointer,_uniffi_out_err: RustCallStatus, ): Unit - fun uniffi_pubkymobile_checksum_func_auth( + fun uniffi_pubkycore_checksum_func_auth( ): Short - fun uniffi_pubkymobile_checksum_func_create_recovery_file( + fun uniffi_pubkycore_checksum_func_create_recovery_file( ): Short - fun uniffi_pubkymobile_checksum_func_decrypt_recovery_file( + fun uniffi_pubkycore_checksum_func_decrypt_recovery_file( ): Short - fun uniffi_pubkymobile_checksum_func_delete_file( + fun uniffi_pubkycore_checksum_func_delete_file( ): Short - fun uniffi_pubkymobile_checksum_func_generate_secret_key( + fun uniffi_pubkycore_checksum_func_generate_secret_key( ): Short - fun uniffi_pubkymobile_checksum_func_get( + fun uniffi_pubkycore_checksum_func_get( ): Short - fun uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key( + fun uniffi_pubkycore_checksum_func_get_public_key_from_secret_key( ): Short - fun uniffi_pubkymobile_checksum_func_list( + fun uniffi_pubkycore_checksum_func_list( ): Short - fun uniffi_pubkymobile_checksum_func_parse_auth_url( + fun uniffi_pubkycore_checksum_func_parse_auth_url( ): Short - fun uniffi_pubkymobile_checksum_func_publish( + fun uniffi_pubkycore_checksum_func_publish( ): Short - fun uniffi_pubkymobile_checksum_func_publish_https( + fun uniffi_pubkycore_checksum_func_publish_https( ): Short - fun uniffi_pubkymobile_checksum_func_put( + fun uniffi_pubkycore_checksum_func_put( ): Short - fun uniffi_pubkymobile_checksum_func_remove_event_listener( + fun uniffi_pubkycore_checksum_func_remove_event_listener( ): Short - fun uniffi_pubkymobile_checksum_func_resolve( + fun uniffi_pubkycore_checksum_func_resolve( ): Short - fun uniffi_pubkymobile_checksum_func_resolve_https( + fun uniffi_pubkycore_checksum_func_resolve_https( ): Short - fun uniffi_pubkymobile_checksum_func_session( + fun uniffi_pubkycore_checksum_func_session( ): Short - fun uniffi_pubkymobile_checksum_func_set_event_listener( + fun uniffi_pubkycore_checksum_func_set_event_listener( ): Short - fun uniffi_pubkymobile_checksum_func_sign_in( + fun uniffi_pubkycore_checksum_func_sign_in( ): Short - fun uniffi_pubkymobile_checksum_func_sign_out( + fun uniffi_pubkycore_checksum_func_sign_out( ): Short - fun uniffi_pubkymobile_checksum_func_sign_up( + fun uniffi_pubkycore_checksum_func_sign_up( ): Short - fun uniffi_pubkymobile_checksum_method_eventlistener_on_event_occurred( + fun uniffi_pubkycore_checksum_func_switch_network( ): Short - fun ffi_pubkymobile_uniffi_contract_version( + fun uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred( + ): Short + fun ffi_pubkycore_uniffi_contract_version( ): Int } @@ -595,7 +599,7 @@ private fun uniffiCheckContractApiVersion(lib: _UniFFILib) { // Get the bindings contract version from our ComponentInterface val bindings_contract_version = 24 // Get the scaffolding contract version by calling the into the dylib - val scaffolding_contract_version = lib.ffi_pubkymobile_uniffi_contract_version() + val scaffolding_contract_version = lib.ffi_pubkycore_uniffi_contract_version() if (bindings_contract_version != scaffolding_contract_version) { throw RuntimeException("UniFFI contract version mismatch: try cleaning and rebuilding your project") } @@ -603,67 +607,70 @@ private fun uniffiCheckContractApiVersion(lib: _UniFFILib) { @Suppress("UNUSED_PARAMETER") private fun uniffiCheckApiChecksums(lib: _UniFFILib) { - if (lib.uniffi_pubkymobile_checksum_func_auth() != 61378.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_auth() != 51826.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_create_recovery_file() != 55903.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_create_recovery_file() != 48846.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_decrypt_recovery_file() != 59688.toShort()) { + 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_pubkymobile_checksum_func_delete_file() != 57905.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_delete_file() != 9063.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_generate_secret_key() != 63116.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_generate_secret_key() != 12800.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_get() != 21596.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_get() != 6591.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key() != 23603.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_get_public_key_from_secret_key() != 40316.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_list() != 8522.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_list() != 43198.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_parse_auth_url() != 29088.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_parse_auth_url() != 27379.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_publish() != 20156.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_publish() != 48989.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_publish_https() != 14705.toShort()) { + 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_pubkymobile_checksum_func_put() != 51107.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_put() != 48150.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_remove_event_listener() != 6794.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_remove_event_listener() != 23534.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_resolve() != 18303.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_resolve() != 34317.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_resolve_https() != 34593.toShort()) { + 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_pubkymobile_checksum_func_session() != 65177.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_session() != 59795.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_set_event_listener() != 19468.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_set_event_listener() != 60071.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_sign_in() != 21006.toShort()) { + 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_pubkymobile_checksum_func_sign_out() != 59116.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_sign_out() != 34903.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_func_sign_up() != 58756.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_sign_up() != 37999.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } - if (lib.uniffi_pubkymobile_checksum_method_eventlistener_on_event_occurred() != 39865.toShort()) { + if (lib.uniffi_pubkycore_checksum_func_switch_network() != 64215.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } + if (lib.uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred() != 11531.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } } @@ -673,6 +680,26 @@ private fun uniffiCheckApiChecksums(lib: _UniFFILib) { // Public interface members begin here. +public object FfiConverterBoolean: FfiConverter { + override fun lift(value: Byte): Boolean { + return value.toInt() != 0 + } + + override fun read(buf: ByteBuffer): Boolean { + return lift(buf.get()) + } + + override fun lower(value: Boolean): Byte { + return if (value) 1.toByte() else 0.toByte() + } + + override fun allocationSize(value: Boolean) = 1 + + override fun write(value: Boolean, buf: ByteBuffer) { + buf.put(lower(value)) + } +} + public object FfiConverterString: FfiConverter { // Note: we don't inherit from FfiConverterRustBuffer, because we use a // special encoding when lowering/lifting. We can use `RustBuffer.len` to @@ -909,7 +936,7 @@ class EventNotifier( */ override protected fun freeRustArcPtr() { rustCall() { status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_free_eventnotifier(this.pointer, status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_free_eventnotifier(this.pointer, status) } } @@ -1100,7 +1127,7 @@ public object FfiConverterTypeEventListener: FfiConverterCallbackInterface - lib.uniffi_pubkymobile_fn_init_callback_eventlistener(this.foreignCallback, status) + lib.uniffi_pubkycore_fn_init_callback_eventlistener(this.foreignCallback, status) } } } @@ -1133,7 +1160,7 @@ public object FfiConverterSequenceString: FfiConverterRustBuffer> { fun `auth`(`url`: String, `secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_auth(FfiConverterString.lower(`url`),FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_auth(FfiConverterString.lower(`url`),FfiConverterString.lower(`secretKey`),_status) }) } @@ -1141,7 +1168,7 @@ fun `auth`(`url`: String, `secretKey`: String): List { fun `createRecoveryFile`(`secretKey`: String, `passphrase`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_create_recovery_file(FfiConverterString.lower(`secretKey`),FfiConverterString.lower(`passphrase`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_create_recovery_file(FfiConverterString.lower(`secretKey`),FfiConverterString.lower(`passphrase`),_status) }) } @@ -1149,7 +1176,7 @@ fun `createRecoveryFile`(`secretKey`: String, `passphrase`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_decrypt_recovery_file(FfiConverterString.lower(`recoveryFile`),FfiConverterString.lower(`passphrase`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_decrypt_recovery_file(FfiConverterString.lower(`recoveryFile`),FfiConverterString.lower(`passphrase`),_status) }) } @@ -1157,7 +1184,7 @@ fun `decryptRecoveryFile`(`recoveryFile`: String, `passphrase`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_delete_file(FfiConverterString.lower(`url`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_delete_file(FfiConverterString.lower(`url`),_status) }) } @@ -1165,7 +1192,7 @@ fun `deleteFile`(`url`: String): List { fun `generateSecretKey`(): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_generate_secret_key(_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_generate_secret_key(_status) }) } @@ -1173,7 +1200,7 @@ fun `generateSecretKey`(): List { fun `get`(`url`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_get(FfiConverterString.lower(`url`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_get(FfiConverterString.lower(`url`),_status) }) } @@ -1181,7 +1208,7 @@ fun `get`(`url`: String): List { fun `getPublicKeyFromSecretKey`(`secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_get_public_key_from_secret_key(FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_get_public_key_from_secret_key(FfiConverterString.lower(`secretKey`),_status) }) } @@ -1189,7 +1216,7 @@ fun `getPublicKeyFromSecretKey`(`secretKey`: String): List { fun `list`(`url`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_list(FfiConverterString.lower(`url`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_list(FfiConverterString.lower(`url`),_status) }) } @@ -1197,7 +1224,7 @@ fun `list`(`url`: String): List { fun `parseAuthUrl`(`url`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_parse_auth_url(FfiConverterString.lower(`url`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_parse_auth_url(FfiConverterString.lower(`url`),_status) }) } @@ -1205,7 +1232,7 @@ fun `parseAuthUrl`(`url`: String): List { fun `publish`(`recordName`: String, `recordContent`: String, `secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_publish(FfiConverterString.lower(`recordName`),FfiConverterString.lower(`recordContent`),FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_publish(FfiConverterString.lower(`recordName`),FfiConverterString.lower(`recordContent`),FfiConverterString.lower(`secretKey`),_status) }) } @@ -1213,7 +1240,7 @@ fun `publish`(`recordName`: String, `recordContent`: String, `secretKey`: String fun `publishHttps`(`recordName`: String, `target`: String, `secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_publish_https(FfiConverterString.lower(`recordName`),FfiConverterString.lower(`target`),FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_publish_https(FfiConverterString.lower(`recordName`),FfiConverterString.lower(`target`),FfiConverterString.lower(`secretKey`),_status) }) } @@ -1221,7 +1248,7 @@ fun `publishHttps`(`recordName`: String, `target`: String, `secretKey`: String): fun `put`(`url`: String, `content`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_put(FfiConverterString.lower(`url`),FfiConverterString.lower(`content`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_put(FfiConverterString.lower(`url`),FfiConverterString.lower(`content`),_status) }) } @@ -1229,7 +1256,7 @@ fun `put`(`url`: String, `content`: String): List { fun `removeEventListener`() = rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_remove_event_listener(_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_remove_event_listener(_status) } @@ -1237,7 +1264,7 @@ fun `removeEventListener`() = fun `resolve`(`publicKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_resolve(FfiConverterString.lower(`publicKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_resolve(FfiConverterString.lower(`publicKey`),_status) }) } @@ -1245,7 +1272,7 @@ fun `resolve`(`publicKey`: String): List { fun `resolveHttps`(`publicKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_resolve_https(FfiConverterString.lower(`publicKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_resolve_https(FfiConverterString.lower(`publicKey`),_status) }) } @@ -1253,7 +1280,7 @@ fun `resolveHttps`(`publicKey`: String): List { fun `session`(`pubky`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_session(FfiConverterString.lower(`pubky`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_session(FfiConverterString.lower(`pubky`),_status) }) } @@ -1261,7 +1288,7 @@ fun `session`(`pubky`: String): List { fun `setEventListener`(`listener`: EventListener) = rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_set_event_listener(FfiConverterTypeEventListener.lower(`listener`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_set_event_listener(FfiConverterTypeEventListener.lower(`listener`),_status) } @@ -1269,7 +1296,7 @@ fun `setEventListener`(`listener`: EventListener) = fun `signIn`(`secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_sign_in(FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_sign_in(FfiConverterString.lower(`secretKey`),_status) }) } @@ -1277,7 +1304,7 @@ fun `signIn`(`secretKey`: String): List { fun `signOut`(`secretKey`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_sign_out(FfiConverterString.lower(`secretKey`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_sign_out(FfiConverterString.lower(`secretKey`),_status) }) } @@ -1285,7 +1312,15 @@ fun `signOut`(`secretKey`: String): List { fun `signUp`(`secretKey`: String, `homeserver`: String): List { return FfiConverterSequenceString.lift( rustCall() { _status -> - _UniFFILib.INSTANCE.uniffi_pubkymobile_fn_func_sign_up(FfiConverterString.lower(`secretKey`),FfiConverterString.lower(`homeserver`),_status) + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_sign_up(FfiConverterString.lower(`secretKey`),FfiConverterString.lower(`homeserver`),_status) +}) +} + + +fun `switchNetwork`(`useTestnet`: Boolean): List { + return FfiConverterSequenceString.lift( + rustCall() { _status -> + _UniFFILib.INSTANCE.uniffi_pubkycore_fn_func_switch_network(FfiConverterBoolean.lower(`useTestnet`),_status) }) } diff --git a/android/src/main/jniLibs/arm64-v8a/libpubkymobile.so b/android/src/main/jniLibs/arm64-v8a/libpubkycore.so similarity index 63% rename from android/src/main/jniLibs/arm64-v8a/libpubkymobile.so rename to android/src/main/jniLibs/arm64-v8a/libpubkycore.so index 8f508c9..39e505f 100755 Binary files a/android/src/main/jniLibs/arm64-v8a/libpubkymobile.so and b/android/src/main/jniLibs/arm64-v8a/libpubkycore.so differ diff --git a/android/src/main/jniLibs/armeabi-v7a/libpubkymobile.so b/android/src/main/jniLibs/armeabi-v7a/libpubkycore.so similarity index 57% rename from android/src/main/jniLibs/armeabi-v7a/libpubkymobile.so rename to android/src/main/jniLibs/armeabi-v7a/libpubkycore.so index c52df25..8b65e4b 100755 Binary files a/android/src/main/jniLibs/armeabi-v7a/libpubkymobile.so and b/android/src/main/jniLibs/armeabi-v7a/libpubkycore.so differ diff --git a/android/src/main/jniLibs/x86/libpubkymobile.so b/android/src/main/jniLibs/x86/libpubkycore.so similarity index 59% rename from android/src/main/jniLibs/x86/libpubkymobile.so rename to android/src/main/jniLibs/x86/libpubkycore.so index f872f87..d073ee3 100755 Binary files a/android/src/main/jniLibs/x86/libpubkymobile.so and b/android/src/main/jniLibs/x86/libpubkycore.so differ diff --git a/android/src/main/jniLibs/x86_64/libpubkymobile.so b/android/src/main/jniLibs/x86_64/libpubkycore.so similarity index 61% rename from android/src/main/jniLibs/x86_64/libpubkymobile.so rename to android/src/main/jniLibs/x86_64/libpubkycore.so index 6b7f080..eecb85b 100755 Binary files a/android/src/main/jniLibs/x86_64/libpubkymobile.so and b/android/src/main/jniLibs/x86_64/libpubkycore.so differ diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b51e9ae..690aeea 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1757,7 +1757,7 @@ SPEC CHECKSUMS: React-logger: 4072f39df335ca443932e0ccece41fbeb5ca8404 React-Mapbuffer: 714f2fae68edcabfc332b754e9fbaa8cfc68fdd4 React-microtasksnativemodule: 4943ad8f99be8ccf5a63329fa7d269816609df9e - react-native-pubky: 56f7277970ed798732a1268a6fac2fe4f8517c25 + react-native-pubky: 05217469a89bb1ffc94abbd9daf89d930d672e9d React-nativeconfig: 4a9543185905fe41014c06776bf126083795aed9 React-NativeModulesApple: 0506da59fc40d2e1e6e12a233db5e81c46face27 React-perflogger: 3bbb82f18e9ac29a1a6931568e99d6305ef4403b diff --git a/ios/Frameworks/PubkyMobile.xcframework/Info.plist b/ios/Frameworks/PubkyCore.xcframework/Info.plist similarity index 88% rename from ios/Frameworks/PubkyMobile.xcframework/Info.plist rename to ios/Frameworks/PubkyCore.xcframework/Info.plist index bb3ac5e..ed336bd 100644 --- a/ios/Frameworks/PubkyMobile.xcframework/Info.plist +++ b/ios/Frameworks/PubkyCore.xcframework/Info.plist @@ -6,29 +6,13 @@ BinaryPath - libpubkymobile.a - HeadersPath - Headers - LibraryIdentifier - ios-arm64 - LibraryPath - libpubkymobile.a - SupportedArchitectures - - arm64 - - SupportedPlatform - ios - - - BinaryPath - libpubkymobile.a + libpubkycore.a HeadersPath Headers LibraryIdentifier ios-arm64-simulator LibraryPath - libpubkymobile.a + libpubkycore.a SupportedArchitectures arm64 @@ -38,6 +22,22 @@ SupportedPlatformVariant simulator + + BinaryPath + libpubkycore.a + HeadersPath + Headers + LibraryIdentifier + ios-arm64 + LibraryPath + libpubkycore.a + SupportedArchitectures + + arm64 + + SupportedPlatform + ios + CFBundlePackageType XFWK diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/module.modulemap b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/module.modulemap similarity index 71% rename from ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/module.modulemap rename to ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/module.modulemap index 09b533a..4d51af4 100644 --- a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/module.modulemap +++ b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/module.modulemap @@ -1,6 +1,6 @@ // This file was autogenerated by some hot garbage in the `uniffi` crate. // Trust me, you don't want to mess with it! -module pubkymobileFFI { - header "pubkymobileFFI.h" +module pubkycoreFFI { + header "pubkycoreFFI.h" export * } \ No newline at end of file diff --git a/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/pubkycoreFFI.h b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/pubkycoreFFI.h new file mode 100644 index 0000000..d0b09a6 --- /dev/null +++ b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/Headers/pubkycoreFFI.h @@ -0,0 +1,297 @@ +// This file was autogenerated by some hot garbage in the `uniffi` crate. +// Trust me, you don't want to mess with it! + +#pragma once + +#include +#include +#include + +// The following structs are used to implement the lowest level +// of the FFI, and thus useful to multiple uniffied crates. +// We ensure they are declared exactly once, with a header guard, UNIFFI_SHARED_H. +#ifdef UNIFFI_SHARED_H + // We also try to prevent mixing versions of shared uniffi header structs. + // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V4 + #ifndef UNIFFI_SHARED_HEADER_V4 + #error Combining helper code from multiple versions of uniffi is not supported + #endif // ndef UNIFFI_SHARED_HEADER_V4 +#else +#define UNIFFI_SHARED_H +#define UNIFFI_SHARED_HEADER_V4 +// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ +// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ + +typedef struct RustBuffer +{ + int32_t capacity; + int32_t len; + uint8_t *_Nullable data; +} RustBuffer; + +typedef int32_t (*ForeignCallback)(uint64_t, int32_t, const uint8_t *_Nonnull, int32_t, RustBuffer *_Nonnull); + +// Task defined in Rust that Swift executes +typedef void (*UniFfiRustTaskCallback)(const void * _Nullable, int8_t); + +// Callback to execute Rust tasks using a Swift Task +// +// Args: +// executor: ForeignExecutor lowered into a size_t value +// delay: Delay in MS +// task: UniFfiRustTaskCallback to call +// task_data: data to pass the task callback +typedef int8_t (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable); + +typedef struct ForeignBytes +{ + int32_t len; + const uint8_t *_Nullable data; +} ForeignBytes; + +// Error definitions +typedef struct RustCallStatus { + int8_t code; + RustBuffer errorBuf; +} RustCallStatus; + +// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ +// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ +#endif // def UNIFFI_SHARED_H + +// Continuation callback for UniFFI Futures +typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t); + +// Scaffolding functions +void uniffi_pubkycore_fn_free_eventnotifier(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status +); +void uniffi_pubkycore_fn_init_callback_eventlistener(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_auth(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_create_recovery_file(RustBuffer secret_key, RustBuffer passphrase, RustCallStatus *_Nonnull out_status +); +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_generate_secret_key(RustCallStatus *_Nonnull out_status + +); +RustBuffer uniffi_pubkycore_fn_func_get(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_get_public_key_from_secret_key(RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_list(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_parse_auth_url(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_publish(RustBuffer record_name, RustBuffer record_content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +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 +); +void uniffi_pubkycore_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status + +); +RustBuffer uniffi_pubkycore_fn_func_resolve(RustBuffer public_key, RustCallStatus *_Nonnull out_status +); +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 +); +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_up(RustBuffer secret_key, RustBuffer homeserver, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_switch_network(int8_t use_testnet, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_alloc(int32_t size, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_from_bytes(ForeignBytes bytes, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rustbuffer_free(RustBuffer buf, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_reserve(RustBuffer buf, int32_t additional, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_continuation_callback_set(UniFfiRustFutureContinuation _Nonnull callback +); +void ffi_pubkycore_rust_future_poll_u8(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u8(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u8(void* _Nonnull handle +); +uint8_t ffi_pubkycore_rust_future_complete_u8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i8(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i8(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i8(void* _Nonnull handle +); +int8_t ffi_pubkycore_rust_future_complete_i8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u16(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u16(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u16(void* _Nonnull handle +); +uint16_t ffi_pubkycore_rust_future_complete_u16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i16(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i16(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i16(void* _Nonnull handle +); +int16_t ffi_pubkycore_rust_future_complete_i16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u32(void* _Nonnull handle +); +uint32_t ffi_pubkycore_rust_future_complete_u32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i32(void* _Nonnull handle +); +int32_t ffi_pubkycore_rust_future_complete_i32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u64(void* _Nonnull handle +); +uint64_t ffi_pubkycore_rust_future_complete_u64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i64(void* _Nonnull handle +); +int64_t ffi_pubkycore_rust_future_complete_i64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_f32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_f32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_f32(void* _Nonnull handle +); +float ffi_pubkycore_rust_future_complete_f32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_f64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_f64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_f64(void* _Nonnull handle +); +double ffi_pubkycore_rust_future_complete_f64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_pointer(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_pointer(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_pointer(void* _Nonnull handle +); +void*_Nonnull ffi_pubkycore_rust_future_complete_pointer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_rust_buffer(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_rust_buffer(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_rust_buffer(void* _Nonnull handle +); +RustBuffer ffi_pubkycore_rust_future_complete_rust_buffer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_void(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_void(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_void(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_complete_void(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +uint16_t uniffi_pubkycore_checksum_func_auth(void + +); +uint16_t uniffi_pubkycore_checksum_func_create_recovery_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_decrypt_recovery_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_delete_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_generate_secret_key(void + +); +uint16_t uniffi_pubkycore_checksum_func_get(void + +); +uint16_t uniffi_pubkycore_checksum_func_get_public_key_from_secret_key(void + +); +uint16_t uniffi_pubkycore_checksum_func_list(void + +); +uint16_t uniffi_pubkycore_checksum_func_parse_auth_url(void + +); +uint16_t uniffi_pubkycore_checksum_func_publish(void + +); +uint16_t uniffi_pubkycore_checksum_func_publish_https(void + +); +uint16_t uniffi_pubkycore_checksum_func_put(void + +); +uint16_t uniffi_pubkycore_checksum_func_remove_event_listener(void + +); +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_set_event_listener(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_in(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_out(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_up(void + +); +uint16_t uniffi_pubkycore_checksum_func_switch_network(void + +); +uint16_t uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred(void + +); +uint32_t ffi_pubkycore_uniffi_contract_version(void + +); + diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/libpubkymobile.a b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/libpubkycore.a similarity index 93% rename from ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/libpubkymobile.a rename to ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/libpubkycore.a index 2804809..90190ac 100644 Binary files a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/libpubkymobile.a and b/ios/Frameworks/PubkyCore.xcframework/ios-arm64-simulator/libpubkycore.a differ diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/module.modulemap b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/module.modulemap similarity index 71% rename from ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/module.modulemap rename to ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/module.modulemap index 09b533a..4d51af4 100644 --- a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/module.modulemap +++ b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/module.modulemap @@ -1,6 +1,6 @@ // This file was autogenerated by some hot garbage in the `uniffi` crate. // Trust me, you don't want to mess with it! -module pubkymobileFFI { - header "pubkymobileFFI.h" +module pubkycoreFFI { + header "pubkycoreFFI.h" export * } \ No newline at end of file diff --git a/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/pubkycoreFFI.h b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/pubkycoreFFI.h new file mode 100644 index 0000000..d0b09a6 --- /dev/null +++ b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/Headers/pubkycoreFFI.h @@ -0,0 +1,297 @@ +// This file was autogenerated by some hot garbage in the `uniffi` crate. +// Trust me, you don't want to mess with it! + +#pragma once + +#include +#include +#include + +// The following structs are used to implement the lowest level +// of the FFI, and thus useful to multiple uniffied crates. +// We ensure they are declared exactly once, with a header guard, UNIFFI_SHARED_H. +#ifdef UNIFFI_SHARED_H + // We also try to prevent mixing versions of shared uniffi header structs. + // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V4 + #ifndef UNIFFI_SHARED_HEADER_V4 + #error Combining helper code from multiple versions of uniffi is not supported + #endif // ndef UNIFFI_SHARED_HEADER_V4 +#else +#define UNIFFI_SHARED_H +#define UNIFFI_SHARED_HEADER_V4 +// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ +// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ + +typedef struct RustBuffer +{ + int32_t capacity; + int32_t len; + uint8_t *_Nullable data; +} RustBuffer; + +typedef int32_t (*ForeignCallback)(uint64_t, int32_t, const uint8_t *_Nonnull, int32_t, RustBuffer *_Nonnull); + +// Task defined in Rust that Swift executes +typedef void (*UniFfiRustTaskCallback)(const void * _Nullable, int8_t); + +// Callback to execute Rust tasks using a Swift Task +// +// Args: +// executor: ForeignExecutor lowered into a size_t value +// delay: Delay in MS +// task: UniFfiRustTaskCallback to call +// task_data: data to pass the task callback +typedef int8_t (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable); + +typedef struct ForeignBytes +{ + int32_t len; + const uint8_t *_Nullable data; +} ForeignBytes; + +// Error definitions +typedef struct RustCallStatus { + int8_t code; + RustBuffer errorBuf; +} RustCallStatus; + +// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ +// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ +#endif // def UNIFFI_SHARED_H + +// Continuation callback for UniFFI Futures +typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t); + +// Scaffolding functions +void uniffi_pubkycore_fn_free_eventnotifier(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status +); +void uniffi_pubkycore_fn_init_callback_eventlistener(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_auth(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_create_recovery_file(RustBuffer secret_key, RustBuffer passphrase, RustCallStatus *_Nonnull out_status +); +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_generate_secret_key(RustCallStatus *_Nonnull out_status + +); +RustBuffer uniffi_pubkycore_fn_func_get(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_get_public_key_from_secret_key(RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_list(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_parse_auth_url(RustBuffer url, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_publish(RustBuffer record_name, RustBuffer record_content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status +); +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 +); +void uniffi_pubkycore_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status + +); +RustBuffer uniffi_pubkycore_fn_func_resolve(RustBuffer public_key, RustCallStatus *_Nonnull out_status +); +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 +); +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_up(RustBuffer secret_key, RustBuffer homeserver, RustCallStatus *_Nonnull out_status +); +RustBuffer uniffi_pubkycore_fn_func_switch_network(int8_t use_testnet, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_alloc(int32_t size, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_from_bytes(ForeignBytes bytes, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rustbuffer_free(RustBuffer buf, RustCallStatus *_Nonnull out_status +); +RustBuffer ffi_pubkycore_rustbuffer_reserve(RustBuffer buf, int32_t additional, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_continuation_callback_set(UniFfiRustFutureContinuation _Nonnull callback +); +void ffi_pubkycore_rust_future_poll_u8(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u8(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u8(void* _Nonnull handle +); +uint8_t ffi_pubkycore_rust_future_complete_u8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i8(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i8(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i8(void* _Nonnull handle +); +int8_t ffi_pubkycore_rust_future_complete_i8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u16(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u16(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u16(void* _Nonnull handle +); +uint16_t ffi_pubkycore_rust_future_complete_u16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i16(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i16(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i16(void* _Nonnull handle +); +int16_t ffi_pubkycore_rust_future_complete_i16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u32(void* _Nonnull handle +); +uint32_t ffi_pubkycore_rust_future_complete_u32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i32(void* _Nonnull handle +); +int32_t ffi_pubkycore_rust_future_complete_i32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_u64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_u64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_u64(void* _Nonnull handle +); +uint64_t ffi_pubkycore_rust_future_complete_u64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_i64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_i64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_i64(void* _Nonnull handle +); +int64_t ffi_pubkycore_rust_future_complete_i64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_f32(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_f32(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_f32(void* _Nonnull handle +); +float ffi_pubkycore_rust_future_complete_f32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_f64(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_f64(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_f64(void* _Nonnull handle +); +double ffi_pubkycore_rust_future_complete_f64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_pointer(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_pointer(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_pointer(void* _Nonnull handle +); +void*_Nonnull ffi_pubkycore_rust_future_complete_pointer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_rust_buffer(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_rust_buffer(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_rust_buffer(void* _Nonnull handle +); +RustBuffer ffi_pubkycore_rust_future_complete_rust_buffer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +void ffi_pubkycore_rust_future_poll_void(void* _Nonnull handle, void* _Nonnull uniffi_callback +); +void ffi_pubkycore_rust_future_cancel_void(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_free_void(void* _Nonnull handle +); +void ffi_pubkycore_rust_future_complete_void(void* _Nonnull handle, RustCallStatus *_Nonnull out_status +); +uint16_t uniffi_pubkycore_checksum_func_auth(void + +); +uint16_t uniffi_pubkycore_checksum_func_create_recovery_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_decrypt_recovery_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_delete_file(void + +); +uint16_t uniffi_pubkycore_checksum_func_generate_secret_key(void + +); +uint16_t uniffi_pubkycore_checksum_func_get(void + +); +uint16_t uniffi_pubkycore_checksum_func_get_public_key_from_secret_key(void + +); +uint16_t uniffi_pubkycore_checksum_func_list(void + +); +uint16_t uniffi_pubkycore_checksum_func_parse_auth_url(void + +); +uint16_t uniffi_pubkycore_checksum_func_publish(void + +); +uint16_t uniffi_pubkycore_checksum_func_publish_https(void + +); +uint16_t uniffi_pubkycore_checksum_func_put(void + +); +uint16_t uniffi_pubkycore_checksum_func_remove_event_listener(void + +); +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_set_event_listener(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_in(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_out(void + +); +uint16_t uniffi_pubkycore_checksum_func_sign_up(void + +); +uint16_t uniffi_pubkycore_checksum_func_switch_network(void + +); +uint16_t uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred(void + +); +uint32_t ffi_pubkycore_uniffi_contract_version(void + +); + diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/libpubkymobile.a b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/libpubkycore.a similarity index 93% rename from ios/Frameworks/PubkyMobile.xcframework/ios-arm64/libpubkymobile.a rename to ios/Frameworks/PubkyCore.xcframework/ios-arm64/libpubkycore.a index 437fa01..1bc54b2 100644 Binary files a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/libpubkymobile.a and b/ios/Frameworks/PubkyCore.xcframework/ios-arm64/libpubkycore.a differ diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/pubkymobileFFI.h b/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/pubkymobileFFI.h deleted file mode 100644 index 239d115..0000000 --- a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/pubkymobileFFI.h +++ /dev/null @@ -1,292 +0,0 @@ -// This file was autogenerated by some hot garbage in the `uniffi` crate. -// Trust me, you don't want to mess with it! - -#pragma once - -#include -#include -#include - -// The following structs are used to implement the lowest level -// of the FFI, and thus useful to multiple uniffied crates. -// We ensure they are declared exactly once, with a header guard, UNIFFI_SHARED_H. -#ifdef UNIFFI_SHARED_H - // We also try to prevent mixing versions of shared uniffi header structs. - // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V4 - #ifndef UNIFFI_SHARED_HEADER_V4 - #error Combining helper code from multiple versions of uniffi is not supported - #endif // ndef UNIFFI_SHARED_HEADER_V4 -#else -#define UNIFFI_SHARED_H -#define UNIFFI_SHARED_HEADER_V4 -// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ -// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ - -typedef struct RustBuffer -{ - int32_t capacity; - int32_t len; - uint8_t *_Nullable data; -} RustBuffer; - -typedef int32_t (*ForeignCallback)(uint64_t, int32_t, const uint8_t *_Nonnull, int32_t, RustBuffer *_Nonnull); - -// Task defined in Rust that Swift executes -typedef void (*UniFfiRustTaskCallback)(const void * _Nullable, int8_t); - -// Callback to execute Rust tasks using a Swift Task -// -// Args: -// executor: ForeignExecutor lowered into a size_t value -// delay: Delay in MS -// task: UniFfiRustTaskCallback to call -// task_data: data to pass the task callback -typedef int8_t (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable); - -typedef struct ForeignBytes -{ - int32_t len; - const uint8_t *_Nullable data; -} ForeignBytes; - -// Error definitions -typedef struct RustCallStatus { - int8_t code; - RustBuffer errorBuf; -} RustCallStatus; - -// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ -// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ -#endif // def UNIFFI_SHARED_H - -// Continuation callback for UniFFI Futures -typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t); - -// Scaffolding functions -void uniffi_pubkymobile_fn_free_eventnotifier(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_init_callback_eventlistener(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_auth(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_create_recovery_file(RustBuffer secret_key, RustBuffer passphrase, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_decrypt_recovery_file(RustBuffer recovery_file, RustBuffer passphrase, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_delete_file(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_generate_secret_key(RustCallStatus *_Nonnull out_status - -); -RustBuffer uniffi_pubkymobile_fn_func_get(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_get_public_key_from_secret_key(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_list(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_parse_auth_url(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_publish(RustBuffer record_name, RustBuffer record_content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status - -); -RustBuffer uniffi_pubkymobile_fn_func_resolve(RustBuffer public_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_resolve_https(RustBuffer public_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_session(RustBuffer pubky, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_func_set_event_listener(uint64_t listener, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_alloc(int32_t size, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_from_bytes(ForeignBytes bytes, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rustbuffer_free(RustBuffer buf, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_reserve(RustBuffer buf, int32_t additional, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_continuation_callback_set(UniFfiRustFutureContinuation _Nonnull callback -); -void ffi_pubkymobile_rust_future_poll_u8(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u8(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u8(void* _Nonnull handle -); -uint8_t ffi_pubkymobile_rust_future_complete_u8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i8(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i8(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i8(void* _Nonnull handle -); -int8_t ffi_pubkymobile_rust_future_complete_i8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u16(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u16(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u16(void* _Nonnull handle -); -uint16_t ffi_pubkymobile_rust_future_complete_u16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i16(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i16(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i16(void* _Nonnull handle -); -int16_t ffi_pubkymobile_rust_future_complete_i16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u32(void* _Nonnull handle -); -uint32_t ffi_pubkymobile_rust_future_complete_u32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i32(void* _Nonnull handle -); -int32_t ffi_pubkymobile_rust_future_complete_i32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u64(void* _Nonnull handle -); -uint64_t ffi_pubkymobile_rust_future_complete_u64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i64(void* _Nonnull handle -); -int64_t ffi_pubkymobile_rust_future_complete_i64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_f32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_f32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_f32(void* _Nonnull handle -); -float ffi_pubkymobile_rust_future_complete_f32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_f64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_f64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_f64(void* _Nonnull handle -); -double ffi_pubkymobile_rust_future_complete_f64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_pointer(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_pointer(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_pointer(void* _Nonnull handle -); -void*_Nonnull ffi_pubkymobile_rust_future_complete_pointer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_rust_buffer(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_rust_buffer(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_rust_buffer(void* _Nonnull handle -); -RustBuffer ffi_pubkymobile_rust_future_complete_rust_buffer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_void(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_void(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_void(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_complete_void(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -uint16_t uniffi_pubkymobile_checksum_func_auth(void - -); -uint16_t uniffi_pubkymobile_checksum_func_create_recovery_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_decrypt_recovery_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_delete_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_generate_secret_key(void - -); -uint16_t uniffi_pubkymobile_checksum_func_get(void - -); -uint16_t uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key(void - -); -uint16_t uniffi_pubkymobile_checksum_func_list(void - -); -uint16_t uniffi_pubkymobile_checksum_func_parse_auth_url(void - -); -uint16_t uniffi_pubkymobile_checksum_func_publish(void - -); -uint16_t uniffi_pubkymobile_checksum_func_publish_https(void - -); -uint16_t uniffi_pubkymobile_checksum_func_put(void - -); -uint16_t uniffi_pubkymobile_checksum_func_remove_event_listener(void - -); -uint16_t uniffi_pubkymobile_checksum_func_resolve(void - -); -uint16_t uniffi_pubkymobile_checksum_func_resolve_https(void - -); -uint16_t uniffi_pubkymobile_checksum_func_session(void - -); -uint16_t uniffi_pubkymobile_checksum_func_set_event_listener(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_in(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_out(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_up(void - -); -uint16_t uniffi_pubkymobile_checksum_method_eventlistener_on_event_occurred(void - -); -uint32_t ffi_pubkymobile_uniffi_contract_version(void - -); - diff --git a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/pubkymobileFFI.h b/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/pubkymobileFFI.h deleted file mode 100644 index 239d115..0000000 --- a/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/pubkymobileFFI.h +++ /dev/null @@ -1,292 +0,0 @@ -// This file was autogenerated by some hot garbage in the `uniffi` crate. -// Trust me, you don't want to mess with it! - -#pragma once - -#include -#include -#include - -// The following structs are used to implement the lowest level -// of the FFI, and thus useful to multiple uniffied crates. -// We ensure they are declared exactly once, with a header guard, UNIFFI_SHARED_H. -#ifdef UNIFFI_SHARED_H - // We also try to prevent mixing versions of shared uniffi header structs. - // If you add anything to the #else block, you must increment the version suffix in UNIFFI_SHARED_HEADER_V4 - #ifndef UNIFFI_SHARED_HEADER_V4 - #error Combining helper code from multiple versions of uniffi is not supported - #endif // ndef UNIFFI_SHARED_HEADER_V4 -#else -#define UNIFFI_SHARED_H -#define UNIFFI_SHARED_HEADER_V4 -// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ -// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ - -typedef struct RustBuffer -{ - int32_t capacity; - int32_t len; - uint8_t *_Nullable data; -} RustBuffer; - -typedef int32_t (*ForeignCallback)(uint64_t, int32_t, const uint8_t *_Nonnull, int32_t, RustBuffer *_Nonnull); - -// Task defined in Rust that Swift executes -typedef void (*UniFfiRustTaskCallback)(const void * _Nullable, int8_t); - -// Callback to execute Rust tasks using a Swift Task -// -// Args: -// executor: ForeignExecutor lowered into a size_t value -// delay: Delay in MS -// task: UniFfiRustTaskCallback to call -// task_data: data to pass the task callback -typedef int8_t (*UniFfiForeignExecutorCallback)(size_t, uint32_t, UniFfiRustTaskCallback _Nullable, const void * _Nullable); - -typedef struct ForeignBytes -{ - int32_t len; - const uint8_t *_Nullable data; -} ForeignBytes; - -// Error definitions -typedef struct RustCallStatus { - int8_t code; - RustBuffer errorBuf; -} RustCallStatus; - -// ⚠️ Attention: If you change this #else block (ending in `#endif // def UNIFFI_SHARED_H`) you *must* ⚠️ -// ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file. ⚠️ -#endif // def UNIFFI_SHARED_H - -// Continuation callback for UniFFI Futures -typedef void (*UniFfiRustFutureContinuation)(void * _Nonnull, int8_t); - -// Scaffolding functions -void uniffi_pubkymobile_fn_free_eventnotifier(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_init_callback_eventlistener(ForeignCallback _Nonnull callback_stub, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_auth(RustBuffer url, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_create_recovery_file(RustBuffer secret_key, RustBuffer passphrase, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_decrypt_recovery_file(RustBuffer recovery_file, RustBuffer passphrase, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_delete_file(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_generate_secret_key(RustCallStatus *_Nonnull out_status - -); -RustBuffer uniffi_pubkymobile_fn_func_get(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_get_public_key_from_secret_key(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_list(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_parse_auth_url(RustBuffer url, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_publish(RustBuffer record_name, RustBuffer record_content, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_func_remove_event_listener(RustCallStatus *_Nonnull out_status - -); -RustBuffer uniffi_pubkymobile_fn_func_resolve(RustBuffer public_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_resolve_https(RustBuffer public_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_session(RustBuffer pubky, RustCallStatus *_Nonnull out_status -); -void uniffi_pubkymobile_fn_func_set_event_listener(uint64_t listener, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status -); -RustBuffer uniffi_pubkymobile_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_alloc(int32_t size, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_from_bytes(ForeignBytes bytes, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rustbuffer_free(RustBuffer buf, RustCallStatus *_Nonnull out_status -); -RustBuffer ffi_pubkymobile_rustbuffer_reserve(RustBuffer buf, int32_t additional, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_continuation_callback_set(UniFfiRustFutureContinuation _Nonnull callback -); -void ffi_pubkymobile_rust_future_poll_u8(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u8(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u8(void* _Nonnull handle -); -uint8_t ffi_pubkymobile_rust_future_complete_u8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i8(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i8(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i8(void* _Nonnull handle -); -int8_t ffi_pubkymobile_rust_future_complete_i8(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u16(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u16(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u16(void* _Nonnull handle -); -uint16_t ffi_pubkymobile_rust_future_complete_u16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i16(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i16(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i16(void* _Nonnull handle -); -int16_t ffi_pubkymobile_rust_future_complete_i16(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u32(void* _Nonnull handle -); -uint32_t ffi_pubkymobile_rust_future_complete_u32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i32(void* _Nonnull handle -); -int32_t ffi_pubkymobile_rust_future_complete_i32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_u64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_u64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_u64(void* _Nonnull handle -); -uint64_t ffi_pubkymobile_rust_future_complete_u64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_i64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_i64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_i64(void* _Nonnull handle -); -int64_t ffi_pubkymobile_rust_future_complete_i64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_f32(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_f32(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_f32(void* _Nonnull handle -); -float ffi_pubkymobile_rust_future_complete_f32(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_f64(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_f64(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_f64(void* _Nonnull handle -); -double ffi_pubkymobile_rust_future_complete_f64(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_pointer(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_pointer(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_pointer(void* _Nonnull handle -); -void*_Nonnull ffi_pubkymobile_rust_future_complete_pointer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_rust_buffer(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_rust_buffer(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_rust_buffer(void* _Nonnull handle -); -RustBuffer ffi_pubkymobile_rust_future_complete_rust_buffer(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -void ffi_pubkymobile_rust_future_poll_void(void* _Nonnull handle, void* _Nonnull uniffi_callback -); -void ffi_pubkymobile_rust_future_cancel_void(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_free_void(void* _Nonnull handle -); -void ffi_pubkymobile_rust_future_complete_void(void* _Nonnull handle, RustCallStatus *_Nonnull out_status -); -uint16_t uniffi_pubkymobile_checksum_func_auth(void - -); -uint16_t uniffi_pubkymobile_checksum_func_create_recovery_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_decrypt_recovery_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_delete_file(void - -); -uint16_t uniffi_pubkymobile_checksum_func_generate_secret_key(void - -); -uint16_t uniffi_pubkymobile_checksum_func_get(void - -); -uint16_t uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key(void - -); -uint16_t uniffi_pubkymobile_checksum_func_list(void - -); -uint16_t uniffi_pubkymobile_checksum_func_parse_auth_url(void - -); -uint16_t uniffi_pubkymobile_checksum_func_publish(void - -); -uint16_t uniffi_pubkymobile_checksum_func_publish_https(void - -); -uint16_t uniffi_pubkymobile_checksum_func_put(void - -); -uint16_t uniffi_pubkymobile_checksum_func_remove_event_listener(void - -); -uint16_t uniffi_pubkymobile_checksum_func_resolve(void - -); -uint16_t uniffi_pubkymobile_checksum_func_resolve_https(void - -); -uint16_t uniffi_pubkymobile_checksum_func_session(void - -); -uint16_t uniffi_pubkymobile_checksum_func_set_event_listener(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_in(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_out(void - -); -uint16_t uniffi_pubkymobile_checksum_func_sign_up(void - -); -uint16_t uniffi_pubkymobile_checksum_method_eventlistener_on_event_occurred(void - -); -uint32_t ffi_pubkymobile_uniffi_contract_version(void - -); - diff --git a/ios/pubkymobile.swift b/ios/pubkycore.swift similarity index 88% rename from ios/pubkymobile.swift rename to ios/pubkycore.swift index 8bcf22c..a20783f 100644 --- a/ios/pubkymobile.swift +++ b/ios/pubkycore.swift @@ -5,8 +5,8 @@ import Foundation // Depending on the consumer's build setup, the low-level FFI code // might be in a separate module, or it might be compiled inline into // this module. This is a bit of light hackery to work with both. -#if canImport(pubkymobileFFI) -import pubkymobileFFI +#if canImport(pubkycoreFFI) +import pubkycoreFFI #endif fileprivate extension RustBuffer { @@ -19,13 +19,13 @@ fileprivate extension RustBuffer { } static func from(_ ptr: UnsafeBufferPointer) -> RustBuffer { - try! rustCall { ffi_pubkymobile_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) } + try! rustCall { ffi_pubkycore_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) } } // Frees the buffer in place. // The buffer must not be used after this is called. func deallocate() { - try! rustCall { ffi_pubkymobile_rustbuffer_free(self, $0) } + try! rustCall { ffi_pubkycore_rustbuffer_free(self, $0) } } } @@ -297,6 +297,27 @@ private func uniffiCheckCallStatus( // Public interface members begin here. +fileprivate struct FfiConverterBool : FfiConverter { + typealias FfiType = Int8 + typealias SwiftType = Bool + + public static func lift(_ value: Int8) throws -> Bool { + return value != 0 + } + + public static func lower(_ value: Bool) -> Int8 { + return value ? 1 : 0 + } + + public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Bool { + return try lift(readInt(&buf)) + } + + public static func write(_ value: Bool, into buf: inout [UInt8]) { + writeInt(&buf, lower(value)) + } +} + fileprivate struct FfiConverterString: FfiConverter { typealias SwiftType = String typealias FfiType = RustBuffer @@ -351,7 +372,7 @@ public class EventNotifier: EventNotifierProtocol { } deinit { - try! rustCall { uniffi_pubkymobile_fn_free_eventnotifier(pointer, $0) } + try! rustCall { uniffi_pubkycore_fn_free_eventnotifier(pointer, $0) } } @@ -524,7 +545,7 @@ fileprivate struct FfiConverterCallbackInterfaceEventListener { private static let initCallbackOnce: () = { // Swift ensures this initializer code will once run once, even when accessed by multiple threads. try! rustCall { (err: UnsafeMutablePointer) in - uniffi_pubkymobile_fn_init_callback_eventlistener(foreignCallbackCallbackInterfaceEventListener, err) + uniffi_pubkycore_fn_init_callback_eventlistener(foreignCallbackCallbackInterfaceEventListener, err) } }() @@ -594,7 +615,7 @@ fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer { public func auth(url: String, secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_auth( + uniffi_pubkycore_fn_func_auth( FfiConverterString.lower(url), FfiConverterString.lower(secretKey),$0) } @@ -604,7 +625,7 @@ public func auth(url: String, secretKey: String) -> [String] { public func createRecoveryFile(secretKey: String, passphrase: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_create_recovery_file( + uniffi_pubkycore_fn_func_create_recovery_file( FfiConverterString.lower(secretKey), FfiConverterString.lower(passphrase),$0) } @@ -614,7 +635,7 @@ public func createRecoveryFile(secretKey: String, passphrase: String) -> [Strin public func decryptRecoveryFile(recoveryFile: String, passphrase: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_decrypt_recovery_file( + uniffi_pubkycore_fn_func_decrypt_recovery_file( FfiConverterString.lower(recoveryFile), FfiConverterString.lower(passphrase),$0) } @@ -624,7 +645,7 @@ public func decryptRecoveryFile(recoveryFile: String, passphrase: String) -> [S public func deleteFile(url: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_delete_file( + uniffi_pubkycore_fn_func_delete_file( FfiConverterString.lower(url),$0) } ) @@ -633,7 +654,7 @@ public func deleteFile(url: String) -> [String] { public func generateSecretKey() -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_generate_secret_key($0) + uniffi_pubkycore_fn_func_generate_secret_key($0) } ) } @@ -641,7 +662,7 @@ public func generateSecretKey() -> [String] { public func get(url: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_get( + uniffi_pubkycore_fn_func_get( FfiConverterString.lower(url),$0) } ) @@ -650,7 +671,7 @@ public func get(url: String) -> [String] { public func getPublicKeyFromSecretKey(secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_get_public_key_from_secret_key( + uniffi_pubkycore_fn_func_get_public_key_from_secret_key( FfiConverterString.lower(secretKey),$0) } ) @@ -659,7 +680,7 @@ public func getPublicKeyFromSecretKey(secretKey: String) -> [String] { public func list(url: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_list( + uniffi_pubkycore_fn_func_list( FfiConverterString.lower(url),$0) } ) @@ -668,7 +689,7 @@ public func list(url: String) -> [String] { public func parseAuthUrl(url: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_parse_auth_url( + uniffi_pubkycore_fn_func_parse_auth_url( FfiConverterString.lower(url),$0) } ) @@ -677,7 +698,7 @@ public func parseAuthUrl(url: String) -> [String] { public func publish(recordName: String, recordContent: String, secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_publish( + uniffi_pubkycore_fn_func_publish( FfiConverterString.lower(recordName), FfiConverterString.lower(recordContent), FfiConverterString.lower(secretKey),$0) @@ -688,7 +709,7 @@ public func publish(recordName: String, recordContent: String, secretKey: String public func publishHttps(recordName: String, target: String, secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_publish_https( + uniffi_pubkycore_fn_func_publish_https( FfiConverterString.lower(recordName), FfiConverterString.lower(target), FfiConverterString.lower(secretKey),$0) @@ -699,7 +720,7 @@ public func publishHttps(recordName: String, target: String, secretKey: String) public func put(url: String, content: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_put( + uniffi_pubkycore_fn_func_put( FfiConverterString.lower(url), FfiConverterString.lower(content),$0) } @@ -708,7 +729,7 @@ public func put(url: String, content: String) -> [String] { public func removeEventListener() { try! rustCall() { - uniffi_pubkymobile_fn_func_remove_event_listener($0) + uniffi_pubkycore_fn_func_remove_event_listener($0) } } @@ -717,7 +738,7 @@ public func removeEventListener() { public func resolve(publicKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_resolve( + uniffi_pubkycore_fn_func_resolve( FfiConverterString.lower(publicKey),$0) } ) @@ -726,7 +747,7 @@ public func resolve(publicKey: String) -> [String] { public func resolveHttps(publicKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_resolve_https( + uniffi_pubkycore_fn_func_resolve_https( FfiConverterString.lower(publicKey),$0) } ) @@ -735,7 +756,7 @@ public func resolveHttps(publicKey: String) -> [String] { public func session(pubky: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_session( + uniffi_pubkycore_fn_func_session( FfiConverterString.lower(pubky),$0) } ) @@ -743,7 +764,7 @@ public func session(pubky: String) -> [String] { public func setEventListener(listener: EventListener) { try! rustCall() { - uniffi_pubkymobile_fn_func_set_event_listener( + uniffi_pubkycore_fn_func_set_event_listener( FfiConverterCallbackInterfaceEventListener.lower(listener),$0) } } @@ -753,7 +774,7 @@ public func setEventListener(listener: EventListener) { public func signIn(secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_sign_in( + uniffi_pubkycore_fn_func_sign_in( FfiConverterString.lower(secretKey),$0) } ) @@ -762,7 +783,7 @@ public func signIn(secretKey: String) -> [String] { public func signOut(secretKey: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_sign_out( + uniffi_pubkycore_fn_func_sign_out( FfiConverterString.lower(secretKey),$0) } ) @@ -771,13 +792,22 @@ public func signOut(secretKey: String) -> [String] { public func signUp(secretKey: String, homeserver: String) -> [String] { return try! FfiConverterSequenceString.lift( try! rustCall() { - uniffi_pubkymobile_fn_func_sign_up( + uniffi_pubkycore_fn_func_sign_up( FfiConverterString.lower(secretKey), FfiConverterString.lower(homeserver),$0) } ) } +public func switchNetwork(useTestnet: Bool) -> [String] { + return try! FfiConverterSequenceString.lift( + try! rustCall() { + uniffi_pubkycore_fn_func_switch_network( + FfiConverterBool.lower(useTestnet),$0) +} + ) +} + private enum InitializationResult { case ok case contractVersionMismatch @@ -789,71 +819,74 @@ private var initializationResult: InitializationResult { // Get the bindings contract version from our ComponentInterface let bindings_contract_version = 24 // Get the scaffolding contract version by calling the into the dylib - let scaffolding_contract_version = ffi_pubkymobile_uniffi_contract_version() + let scaffolding_contract_version = ffi_pubkycore_uniffi_contract_version() if bindings_contract_version != scaffolding_contract_version { return InitializationResult.contractVersionMismatch } - if (uniffi_pubkymobile_checksum_func_auth() != 61378) { + if (uniffi_pubkycore_checksum_func_auth() != 51826) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_create_recovery_file() != 55903) { + if (uniffi_pubkycore_checksum_func_create_recovery_file() != 48846) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_decrypt_recovery_file() != 59688) { + if (uniffi_pubkycore_checksum_func_decrypt_recovery_file() != 26407) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_delete_file() != 57905) { + if (uniffi_pubkycore_checksum_func_delete_file() != 9063) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_generate_secret_key() != 63116) { + if (uniffi_pubkycore_checksum_func_generate_secret_key() != 12800) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_get() != 21596) { + if (uniffi_pubkycore_checksum_func_get() != 6591) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key() != 23603) { + if (uniffi_pubkycore_checksum_func_get_public_key_from_secret_key() != 40316) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_list() != 8522) { + if (uniffi_pubkycore_checksum_func_list() != 43198) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_parse_auth_url() != 29088) { + if (uniffi_pubkycore_checksum_func_parse_auth_url() != 27379) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_publish() != 20156) { + if (uniffi_pubkycore_checksum_func_publish() != 48989) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_publish_https() != 14705) { + if (uniffi_pubkycore_checksum_func_publish_https() != 5614) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_put() != 51107) { + if (uniffi_pubkycore_checksum_func_put() != 48150) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_remove_event_listener() != 6794) { + if (uniffi_pubkycore_checksum_func_remove_event_listener() != 23534) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_resolve() != 18303) { + if (uniffi_pubkycore_checksum_func_resolve() != 34317) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_resolve_https() != 34593) { + if (uniffi_pubkycore_checksum_func_resolve_https() != 17266) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_session() != 65177) { + if (uniffi_pubkycore_checksum_func_session() != 59795) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_set_event_listener() != 19468) { + if (uniffi_pubkycore_checksum_func_set_event_listener() != 60071) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_sign_in() != 21006) { + if (uniffi_pubkycore_checksum_func_sign_in() != 21584) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_sign_out() != 59116) { + if (uniffi_pubkycore_checksum_func_sign_out() != 34903) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_func_sign_up() != 58756) { + if (uniffi_pubkycore_checksum_func_sign_up() != 37999) { return InitializationResult.apiChecksumMismatch } - if (uniffi_pubkymobile_checksum_method_eventlistener_on_event_occurred() != 39865) { + if (uniffi_pubkycore_checksum_func_switch_network() != 64215) { + return InitializationResult.apiChecksumMismatch + } + if (uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred() != 11531) { return InitializationResult.apiChecksumMismatch } diff --git a/package.json b/package.json index 25d300b..9444ca7 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "update-local-bindings:android": "npm run cargo-build && cd rust && ./build.sh android && cd ../ && node setup-local-android-bindings.js && npm run reinstall", "update-local-bindings": "npm run reinstall && npm run cargo-build && npm run update-local-bindings:ios && npm run update-local-bindings:android", "rebuild-local": "rm -rf node_modules && cd example && rm -rf node_modules && cd ios && rm -rf Pods Podfile.lock build && cd ../../ && npm run cargo-build && yarn install && npm run update-local-bindings && cd example && yarn install && bundle install && cd ios && pod install && cd ../ && yarn build:ios && yarn ios", - "update-remote-bindings:ios": "node setup-remote-ios-bindings.js && npm run reinstall", - "update-remote-bindings:android": "node setup-remote-android-bindings.js && npm run reinstall", + "update-remote-bindings:ios": "npm run reinstall && node setup-remote-ios-bindings.js && npm run reinstall", + "update-remote-bindings:android": "npm run reinstall && node setup-remote-android-bindings.js && npm run reinstall", "update-remote-bindings": "npm run reinstall && npm run update-remote-bindings:ios && npm run update-remote-bindings:android", "rebuild-remote": "rm -rf node_modules && cd example && rm -rf node_modules && cd ios && rm -rf Pods Podfile.lock build && cd ../../ && yarn install && npm run update-remote-bindings && cd example && yarn install && bundle install && cd ios && pod install && cd ../ && yarn build:ios && yarn ios" }, diff --git a/react-native-pubky.podspec b/react-native-pubky.podspec index a8a1987..7cf9e1c 100644 --- a/react-native-pubky.podspec +++ b/react-native-pubky.podspec @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm,swift}" s.ios.source_files = "ios/**/*.{h,m,mm,swift}" - s.ios.vendored_frameworks = "ios/Frameworks/PubkyMobile.xcframework" + s.ios.vendored_frameworks = "ios/Frameworks/PubkyCore.xcframework" s.pod_target_xcconfig = { "EXCLUDED_ARCHS[sdk=iphonesimulator*]" => "x86_64" diff --git a/setup-android-bindings.js b/setup-android-bindings.js index 4b6c3fd..b1a7322 100644 --- a/setup-android-bindings.js +++ b/setup-android-bindings.js @@ -23,7 +23,7 @@ const setupAndroidCommand = ` cargo install cargo-ndk && \\ rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android && \\ cargo ndk -o ./app/src/main/jniLibs --manifest-path ./Cargo.toml -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 build --release && \\ - cargo run --bin uniffi-bindgen generate --library ./target/release/libpubkymobile.dylib --language kotlin --out-dir ./app/src/main/java/tech/forgen/todolist/rust + cargo run --bin uniffi-bindgen generate --library ./target/release/libpubkycore.dylib --language kotlin --out-dir ./app/src/main/java/tech/forgen/todolist/rust `; const postSetupAndroid = async () => { @@ -38,8 +38,8 @@ const postSetupAndroid = async () => { 'todolist', 'rust', 'uniffi', - 'pubkymobile', - 'pubkymobile.kt' + 'pubkycore', + 'pubkycore.kt' ); const androidMobileKt = path.resolve( 'android', @@ -47,8 +47,8 @@ const postSetupAndroid = async () => { 'main', 'java', 'uniffi', - 'pubkymobile', - 'pubkymobile.kt' + 'pubkycore', + 'pubkycore.kt' ); // Create the destination directory if it doesn't exist diff --git a/setup-ios-bindings.js b/setup-ios-bindings.js index bd7b25d..cd9b02d 100644 --- a/setup-ios-bindings.js +++ b/setup-ios-bindings.js @@ -21,56 +21,54 @@ const setupIosCommand = ` export IPHONEOS_DEPLOYMENT_TARGET=13.4 sed -i '' 's/crate_type = .*/crate_type = ["cdylib", "staticlib"]/' Cargo.toml && \\ cargo build --release && \\ - cargo run --bin uniffi-bindgen generate --library ./target/release/libpubkymobile.dylib --language swift --out-dir ./bindings && \\ + cargo run --bin uniffi-bindgen generate --library ./target/release/libpubkycore.dylib --language swift --out-dir ./bindings && \\ rustup target add aarch64-apple-ios-sim aarch64-apple-ios && \\ cargo build --release --target=aarch64-apple-ios-sim && \\ cargo build --release --target=aarch64-apple-ios && \\ - mv bindings/pubkymobileFFI.modulemap bindings/module.modulemap && \\ - xcodebuild -create-xcframework -library ./target/aarch64-apple-ios-sim/release/libpubkymobile.a -headers ./bindings -library ./target/aarch64-apple-ios/release/libpubkymobile.a -headers ./bindings -output "ios/PubkyMobile.xcframework" + mv bindings/pubkycoreFFI.modulemap bindings/module.modulemap && \\ + xcodebuild -create-xcframework -library ./target/aarch64-apple-ios-sim/release/libpubkycore.a -headers ./bindings -library ./target/aarch64-apple-ios/release/libpubkycore.a -headers ./bindings -output "ios/PubkyCore.xcframework" `; const originalDir = process.cwd(); const postSetupIos = async () => { - const rustBindingsPubkyMobileSwift = path.resolve( + const rustBindingsPubkyCoreSwift = path.resolve( 'rust', 'bindings', - 'pubkymobile.swift' + 'pubkycore.swift' ); - const iosPubkyMobileSwift = path.resolve('ios', 'pubkymobile.swift'); + const iosPubkyCoreSwift = path.resolve('ios', 'pubkycore.swift'); - // Copy rust/bindings/pubkymobile.swift file to ios/ directory - await fs.promises.copyFile(rustBindingsPubkyMobileSwift, iosPubkyMobileSwift); - console.log( - `Copied ${rustBindingsPubkyMobileSwift} to ${iosPubkyMobileSwift}` - ); + // Copy rust/bindings/pubkycore.swift file to ios/ directory + await fs.promises.copyFile(rustBindingsPubkyCoreSwift, iosPubkyCoreSwift); + console.log(`Copied ${rustBindingsPubkyCoreSwift} to ${iosPubkyCoreSwift}`); - // Delete rust/ios/PubkyMobile.xcframework/ios-arm64/Headers/pubkymobile.swift - const iosArm64HeadersPubkyMobileSwift = path.resolve( + // Delete rust/ios/PubkyCore.xcframework/ios-arm64/Headers/pubkycore.swift + const iosArm64HeadersPubkyCoreSwift = path.resolve( 'rust', 'ios', - 'PubkyMobile.xcframework', + 'PubkyCore.xcframework', 'ios-arm64', 'Headers', - 'pubkymobile.swift' + 'pubkycore.swift' ); - if (fs.existsSync(iosArm64HeadersPubkyMobileSwift)) { - await fs.promises.unlink(iosArm64HeadersPubkyMobileSwift); - console.log(`Deleted ${iosArm64HeadersPubkyMobileSwift}`); + if (fs.existsSync(iosArm64HeadersPubkyCoreSwift)) { + await fs.promises.unlink(iosArm64HeadersPubkyCoreSwift); + console.log(`Deleted ${iosArm64HeadersPubkyCoreSwift}`); } - // Delete rust/ios/PubkyMobile.xcframework/ios-arm64-simulator/Headers/pubkymobile.swift - const iosArm64SimulatorHeadersPubkyMobileSwift = path.resolve( + // Delete rust/ios/PubkyCore.xcframework/ios-arm64-simulator/Headers/pubkycore.swift + const iosArm64SimulatorHeadersPubkyCoreSwift = path.resolve( 'rust', 'ios', - 'PubkyMobile.xcframework', + 'PubkyCore.xcframework', 'ios-arm64-simulator', 'Headers', - 'pubkymobile.swift' + 'pubkycore.swift' ); - if (fs.existsSync(iosArm64SimulatorHeadersPubkyMobileSwift)) { - await fs.promises.unlink(iosArm64SimulatorHeadersPubkyMobileSwift); - console.log(`Deleted ${iosArm64SimulatorHeadersPubkyMobileSwift}`); + if (fs.existsSync(iosArm64SimulatorHeadersPubkyCoreSwift)) { + await fs.promises.unlink(iosArm64SimulatorHeadersPubkyCoreSwift); + console.log(`Deleted ${iosArm64SimulatorHeadersPubkyCoreSwift}`); } const rustIos = path.resolve('rust', 'ios'); diff --git a/setup-local-android-bindings.js b/setup-local-android-bindings.js index b14f92f..80e8f42 100644 --- a/setup-local-android-bindings.js +++ b/setup-local-android-bindings.js @@ -1,8 +1,8 @@ const fs = require('fs').promises; const path = require('path'); -const ktPath = 'rust/bindings/android/pubkymobile.kt'; -const ktDestinationPath = 'android/src/main/java/uniffi/pubkymobile/'; +const ktPath = 'rust/bindings/android/pubkycore.kt'; +const ktDestinationPath = 'android/src/main/java/uniffi/pubkycore/'; const jniPath = 'rust/bindings/android/jniLibs'; const jniDestinationPath = 'android/src/main/jniLibs/'; @@ -24,7 +24,7 @@ async function runSetup() { console.log('Copying Kotlin file...'); // Copy Kotlin file to destination - const ktTargetPath = path.join(ktDestinationPath, 'pubkymobile.kt'); + const ktTargetPath = path.join(ktDestinationPath, 'pubkycore.kt'); await fs.copyFile(ktPath, ktTargetPath); console.log('Copying JNI libraries...'); diff --git a/setup-local-ios-bindings.js b/setup-local-ios-bindings.js index fee0d8d..1d47001 100644 --- a/setup-local-ios-bindings.js +++ b/setup-local-ios-bindings.js @@ -1,9 +1,9 @@ const fs = require('fs').promises; const path = require('path'); -const frameworkPath = 'rust/bindings/ios/PubkyMobile.xcframework'; +const frameworkPath = 'rust/bindings/ios/PubkyCore.xcframework'; const frameworkDestinationPath = 'ios/Frameworks'; -const swiftFilePath = 'rust/bindings/ios/pubkymobile.swift'; +const swiftFilePath = 'rust/bindings/ios/pubkycore.swift'; const swiftDestinationPath = 'ios/'; async function runSetup() { @@ -12,7 +12,7 @@ async function runSetup() { // Remove destination directories if they exist await Promise.all([ fs.rm(frameworkDestinationPath, { recursive: true, force: true }), - fs.rm('ios/pubkymobile.swift', { recursive: true, force: true }), + fs.rm('ios/pubkycore.swift', { recursive: true, force: true }), ]); console.log('Creating directories...'); diff --git a/setup-remote-android-bindings.js b/setup-remote-android-bindings.js index 5aa7a67..67fec2d 100644 --- a/setup-remote-android-bindings.js +++ b/setup-remote-android-bindings.js @@ -4,10 +4,10 @@ const simpleGit = require('simple-git'); // Configuration const repoOwner = 'pubky'; -const repoName = 'pubky-core-mobile-sdk'; +const repoName = 'pubky-core-ffi'; const branch = 'main'; -const ktPath = 'bindings/android/pubkymobile.kt'; -const ktDestinationPath = 'android/src/main/java/uniffi/pubkymobile/'; +const ktPath = 'bindings/android/pubkycore.kt'; +const ktDestinationPath = 'android/src/main/java/uniffi/pubkycore/'; const jniPath = 'bindings/android/jniLibs'; const jniDestinationPath = 'android/src/main/jniLibs/'; const tempDir = 'temp'; @@ -50,7 +50,7 @@ async function runSetup() { console.log('Copying Kotlin file...'); // Copy Kotlin file to destination const ktSourcePath = path.join(tempDir, ktPath); - const ktTargetPath = path.join(ktDestinationPath, 'pubkymobile.kt'); + const ktTargetPath = path.join(ktDestinationPath, 'pubkycore.kt'); await fs.copyFile(ktSourcePath, ktTargetPath); console.log('Copying JNI libraries...'); diff --git a/setup-remote-ios-bindings.js b/setup-remote-ios-bindings.js index 0a0f9e5..2bb0690 100644 --- a/setup-remote-ios-bindings.js +++ b/setup-remote-ios-bindings.js @@ -4,11 +4,11 @@ const simpleGit = require('simple-git'); // Configuration const repoOwner = 'pubky'; -const repoName = 'pubky-core-mobile-sdk'; +const repoName = 'pubky-core-ffi'; const branch = 'main'; -const frameworkPath = 'bindings/ios/PubkyMobile.xcframework'; +const frameworkPath = 'bindings/ios/PubkyCore.xcframework'; const frameworkDestinationPath = 'ios/Frameworks'; -const swiftFilePath = 'bindings/ios/pubkymobile.swift'; +const swiftFilePath = 'bindings/ios/pubkycore.swift'; const swiftDestinationPath = 'ios/'; const tempDir = 'temp'; @@ -18,7 +18,7 @@ async function runSetup() { // Remove destination directories if they exist & Clean up any lingering temporary directory await Promise.all([ fs.rm(frameworkDestinationPath, { recursive: true, force: true }), - fs.rm('ios/pubkymobile.swift', { recursive: true, force: true }), + fs.rm('ios/pubkycore.swift', { recursive: true, force: true }), fs.rm(tempDir, { recursive: true, force: true }), ]);