@synonymdev/react-native-pubky 0.7.0 → 0.7.1

package/README.md

@@ -16,15 +16,17 @@ npm install @synonymdev/react-native-pubky
 - [x] [resolve](#resolve): Functionality to resolve content.
 - [x] [publishHttps](#publishHttps): Publish HTTPS records.
 - [x] [resolveHttps](#resolveHttps): Resolve HTTPS records.
+- [x] [signUp](#signUp): Sign-up to a homeserver and update Pkarr accordingly.
+- [x] [signIn](#signIn): Sign-in to a homeserver.
+- [x] [signOut](#signOut): Sign-out from a homeserver.
 - [x] [put](#put): Upload a small payload to a given path.
 - [x] [get](#get): Download a small payload from a given path relative to a pubky author.
 - [x] [list](#list): Returns a list of Pubky URLs of the files in the path of the `url` provided.
 - [x] [generateSecretKey](#generateSecretKey): Generate a secret key.
 - [x] [getPublicKeyFromSecretKey](#getPublicKeyFromSecretKey): Get the public key string and uri from a secret key.
 ### Methods to be Implemented
-- [ ] signIn: Sign-in to a homeserver.
-- [ ] signUp: Sign-up to a homeserver and update Pkarr accordingly.
-- [ ] signOut: Sign-out from a homeserver.
+- [ ] getProfile: Retrieve the profile of a user.
+- [ ] editProfile: Submit changes to the specified profile.
 
 
 ## Usage
@@ -118,8 +120,8 @@ console.log(resolveHttpsRes.value);
 import { put } from '@synonymdev/react-native-pubky';
 
 const putRes = await put(
-  'url', // URL
-  'content', // Content
+  'pubky://z4e8s17cou9qmuwen8p1556jzhf1wktmzo6ijsfnri9c4hnrdfty/pub/synonym.to', // URL
+  { data: 'test content' }, // Content
 );
 if (putRes.isErr()) {
   console.log(putRes.error.message);
@@ -133,7 +135,7 @@ console.log(putRes.value);
 import { get } from '@synonymdev/react-native-pubky';
 
 const getRes = await get(
-  'url' // URL
+  'pubky://z4e8s17cou9qmuwen8p1556jzhf1wktmzo6ijsfnri9c4hnrdfty/pub/synonym.to' // URL
 );
 if (getRes.isErr()) {
   console.log(getRes.error.message);
@@ -147,7 +149,7 @@ console.log(getRes.value);
 import { list } from '@synonymdev/react-native-pubky';
 
 const listRes = await list(
-  'url' // URL
+  'pubky://z4e8s17cou9qmuwen8p1556jzhf1wktmzo6ijsfnri9c4hnrdfty/pub/' // URL
 );
 if (listRes.isErr()) {
   console.log(listRes.error.message);
@@ -180,6 +182,49 @@ if (getPublicKeyFromSecretKeyRes.isErr()) {
 console.log(getPublicKeyFromSecretKeyRes.value);
 ```
 
+### <a name="signUp"></a>signUp
+```js
+import { signUp } from '@synonymdev/react-native-pubky';
+
+const signUpRes = await signUp(
+  'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855', // Secret
+  'pubky://8pinxxgqs41n4aididenw5apqp1urfmzdztr8jt4abrkdn435ewo', // Homeserver
+);
+if (signUpRes.isErr()) {
+  console.log(signUpRes.error.message);
+  return;
+}
+console.log(signUpRes.value);
+```
+
+### <a name="signIn"></a>signIn
+```js
+import { signIn } from '@synonymdev/react-native-pubky';
+
+const signInRes = await signIn(
+  'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' // Secret Key
+);
+if (signInRes.isErr()) {
+  console.log(signInRes.error.message);
+  return;
+}
+console.log(signInRes.value);
+```
+
+### <a name="signOut"></a>signIn
+```js
+import { signOut } from '@synonymdev/react-native-pubky';
+
+const signOutRes = await signOut(
+  'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' // Secret Key
+);
+if (signOutRes.isErr()) {
+  console.log(signOutRes.error.message);
+  return;
+}
+console.log(signOutRes.value);
+```
+
 ## Local Installation
 
 1. Clone & npm install:

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

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

package/ios/Frameworks/PubkyMobile.xcframework/ios-arm64/Headers/pubkymobileFFI.h

@@ -68,7 +68,7 @@ RustBuffer uniffi_pubkymobile_fn_func_auth(RustBuffer url, RustBuffer secret_key
 RustBuffer uniffi_pubkymobile_fn_func_generate_secret_key(RustCallStatus *_Nonnull out_status
     
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_get(RustBuffer url
+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
 );
@@ -80,17 +80,17 @@ RustBuffer uniffi_pubkymobile_fn_func_publish(RustBuffer record_name, RustBuffer
 );
 RustBuffer uniffi_pubkymobile_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content
+RustBuffer uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content, 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
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key
+RustBuffer uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key
+RustBuffer uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver
+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
 );

package/ios/Frameworks/PubkyMobile.xcframework/ios-arm64-simulator/Headers/pubkymobileFFI.h

@@ -68,7 +68,7 @@ RustBuffer uniffi_pubkymobile_fn_func_auth(RustBuffer url, RustBuffer secret_key
 RustBuffer uniffi_pubkymobile_fn_func_generate_secret_key(RustCallStatus *_Nonnull out_status
     
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_get(RustBuffer url
+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
 );
@@ -80,17 +80,17 @@ RustBuffer uniffi_pubkymobile_fn_func_publish(RustBuffer record_name, RustBuffer
 );
 RustBuffer uniffi_pubkymobile_fn_func_publish_https(RustBuffer record_name, RustBuffer target, RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content
+RustBuffer uniffi_pubkymobile_fn_func_put(RustBuffer url, RustBuffer content, 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
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key
+RustBuffer uniffi_pubkymobile_fn_func_sign_in(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key
+RustBuffer uniffi_pubkymobile_fn_func_sign_out(RustBuffer secret_key, RustCallStatus *_Nonnull out_status
 );
-void* _Nonnull uniffi_pubkymobile_fn_func_sign_up(RustBuffer secret_key, RustBuffer homeserver
+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
 );

package/ios/pubkymobile.swift

@@ -356,68 +356,6 @@ fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer {
         return seq
     }
 }
-private let UNIFFI_RUST_FUTURE_POLL_READY: Int8 = 0
-private let UNIFFI_RUST_FUTURE_POLL_MAYBE_READY: Int8 = 1
-
-fileprivate func uniffiRustCallAsync<F, T>(
-    rustFutureFunc: () -> UnsafeMutableRawPointer,
-    pollFunc: (UnsafeMutableRawPointer, UnsafeMutableRawPointer) -> (),
-    completeFunc: (UnsafeMutableRawPointer, UnsafeMutablePointer<RustCallStatus>) -> F,
-    freeFunc: (UnsafeMutableRawPointer) -> (),
-    liftFunc: (F) throws -> T,
-    errorHandler: ((RustBuffer) throws -> Error)?
-) async throws -> T {
-    // Make sure to call uniffiEnsureInitialized() since future creation doesn't have a
-    // RustCallStatus param, so doesn't use makeRustCall()
-    uniffiEnsureInitialized()
-    let rustFuture = rustFutureFunc()
-    defer {
-        freeFunc(rustFuture)
-    }
-    var pollResult: Int8;
-    repeat {
-        pollResult = await withUnsafeContinuation {
-            pollFunc(rustFuture, ContinuationHolder($0).toOpaque())
-        }
-    } while pollResult != UNIFFI_RUST_FUTURE_POLL_READY
-
-    return try liftFunc(makeRustCall(
-        { completeFunc(rustFuture, $0) },
-        errorHandler: errorHandler
-    ))
-}
-
-// Callback handlers for an async calls.  These are invoked by Rust when the future is ready.  They
-// lift the return value or error and resume the suspended function.
-fileprivate func uniffiFutureContinuationCallback(ptr: UnsafeMutableRawPointer, pollResult: Int8) {
-    ContinuationHolder.fromOpaque(ptr).resume(pollResult)
-}
-
-// Wraps UnsafeContinuation in a class so that we can use reference counting when passing it across
-// the FFI
-fileprivate class ContinuationHolder {
-    let continuation: UnsafeContinuation<Int8, Never>
-
-    init(_ continuation: UnsafeContinuation<Int8, Never>) {
-        self.continuation = continuation
-    }
-
-    func resume(_ pollResult: Int8) {
-        self.continuation.resume(returning: pollResult)
-    }
-
-    func toOpaque() -> UnsafeMutableRawPointer {
-        return Unmanaged<ContinuationHolder>.passRetained(self).toOpaque()
-    }
-
-    static func fromOpaque(_ ptr: UnsafeRawPointer) -> ContinuationHolder {
-        return Unmanaged<ContinuationHolder>.fromOpaque(ptr).takeRetainedValue()
-    }
-}
-
-fileprivate func uniffiInitContinuationCallback() {
-    ffi_pubkymobile_rust_future_continuation_callback_set(uniffiFutureContinuationCallback)
-}
 
 public func auth(url: String, secretKey: String)  -> [String] {
     return try!  FfiConverterSequenceString.lift(
@@ -437,24 +375,15 @@ public func generateSecretKey()  -> [String] {
     )
 }
 
-public func get(url: String) async  -> [String] {
-    return try!  await uniffiRustCallAsync(
-        rustFutureFunc: {
-            uniffi_pubkymobile_fn_func_get(
-                FfiConverterString.lower(url)
-            )
-        },
-        pollFunc: ffi_pubkymobile_rust_future_poll_rust_buffer,
-        completeFunc: ffi_pubkymobile_rust_future_complete_rust_buffer,
-        freeFunc: ffi_pubkymobile_rust_future_free_rust_buffer,
-        liftFunc: FfiConverterSequenceString.lift,
-        errorHandler: nil
-        
+public func get(url: String)  -> [String] {
+    return try!  FfiConverterSequenceString.lift(
+        try! rustCall() {
+    uniffi_pubkymobile_fn_func_get(
+        FfiConverterString.lower(url),$0)
+}
     )
 }
 
-
-
 public func getPublicKeyFromSecretKey(secretKey: String)  -> [String] {
     return try!  FfiConverterSequenceString.lift(
         try! rustCall() {
@@ -504,25 +433,16 @@ public func publishHttps(recordName: String, target: String, secretKey: String)
     )
 }
 
-public func put(url: String, content: String) async  -> [String] {
-    return try!  await uniffiRustCallAsync(
-        rustFutureFunc: {
-            uniffi_pubkymobile_fn_func_put(
-                FfiConverterString.lower(url),
-                FfiConverterString.lower(content)
-            )
-        },
-        pollFunc: ffi_pubkymobile_rust_future_poll_rust_buffer,
-        completeFunc: ffi_pubkymobile_rust_future_complete_rust_buffer,
-        freeFunc: ffi_pubkymobile_rust_future_free_rust_buffer,
-        liftFunc: FfiConverterSequenceString.lift,
-        errorHandler: nil
-        
+public func put(url: String, content: String)  -> [String] {
+    return try!  FfiConverterSequenceString.lift(
+        try! rustCall() {
+    uniffi_pubkymobile_fn_func_put(
+        FfiConverterString.lower(url),
+        FfiConverterString.lower(content),$0)
+}
     )
 }
 
-
-
 public func resolve(publicKey: String)  -> [String] {
     return try!  FfiConverterSequenceString.lift(
         try! rustCall() {
@@ -541,61 +461,34 @@ public func resolveHttps(publicKey: String)  -> [String] {
     )
 }
 
-public func signIn(secretKey: String) async  -> [String] {
-    return try!  await uniffiRustCallAsync(
-        rustFutureFunc: {
-            uniffi_pubkymobile_fn_func_sign_in(
-                FfiConverterString.lower(secretKey)
-            )
-        },
-        pollFunc: ffi_pubkymobile_rust_future_poll_rust_buffer,
-        completeFunc: ffi_pubkymobile_rust_future_complete_rust_buffer,
-        freeFunc: ffi_pubkymobile_rust_future_free_rust_buffer,
-        liftFunc: FfiConverterSequenceString.lift,
-        errorHandler: nil
-        
+public func signIn(secretKey: String)  -> [String] {
+    return try!  FfiConverterSequenceString.lift(
+        try! rustCall() {
+    uniffi_pubkymobile_fn_func_sign_in(
+        FfiConverterString.lower(secretKey),$0)
+}
     )
 }
 
-
-
-public func signOut(secretKey: String) async  -> [String] {
-    return try!  await uniffiRustCallAsync(
-        rustFutureFunc: {
-            uniffi_pubkymobile_fn_func_sign_out(
-                FfiConverterString.lower(secretKey)
-            )
-        },
-        pollFunc: ffi_pubkymobile_rust_future_poll_rust_buffer,
-        completeFunc: ffi_pubkymobile_rust_future_complete_rust_buffer,
-        freeFunc: ffi_pubkymobile_rust_future_free_rust_buffer,
-        liftFunc: FfiConverterSequenceString.lift,
-        errorHandler: nil
-        
+public func signOut(secretKey: String)  -> [String] {
+    return try!  FfiConverterSequenceString.lift(
+        try! rustCall() {
+    uniffi_pubkymobile_fn_func_sign_out(
+        FfiConverterString.lower(secretKey),$0)
+}
     )
 }
 
-
-
-public func signUp(secretKey: String, homeserver: String) async  -> [String] {
-    return try!  await uniffiRustCallAsync(
-        rustFutureFunc: {
-            uniffi_pubkymobile_fn_func_sign_up(
-                FfiConverterString.lower(secretKey),
-                FfiConverterString.lower(homeserver)
-            )
-        },
-        pollFunc: ffi_pubkymobile_rust_future_poll_rust_buffer,
-        completeFunc: ffi_pubkymobile_rust_future_complete_rust_buffer,
-        freeFunc: ffi_pubkymobile_rust_future_free_rust_buffer,
-        liftFunc: FfiConverterSequenceString.lift,
-        errorHandler: nil
-        
+public func signUp(secretKey: String, homeserver: String)  -> [String] {
+    return try!  FfiConverterSequenceString.lift(
+        try! rustCall() {
+    uniffi_pubkymobile_fn_func_sign_up(
+        FfiConverterString.lower(secretKey),
+        FfiConverterString.lower(homeserver),$0)
+}
     )
 }
 
-
-
 private enum InitializationResult {
     case ok
     case contractVersionMismatch
@@ -617,7 +510,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_pubkymobile_checksum_func_generate_secret_key() != 63116) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkymobile_checksum_func_get() != 5395) {
+    if (uniffi_pubkymobile_checksum_func_get() != 21596) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_pubkymobile_checksum_func_get_public_key_from_secret_key() != 23603) {
@@ -635,7 +528,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_pubkymobile_checksum_func_publish_https() != 14705) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkymobile_checksum_func_put() != 47594) {
+    if (uniffi_pubkymobile_checksum_func_put() != 51107) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_pubkymobile_checksum_func_resolve() != 18303) {
@@ -644,17 +537,16 @@ private var initializationResult: InitializationResult {
     if (uniffi_pubkymobile_checksum_func_resolve_https() != 34593) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkymobile_checksum_func_sign_in() != 53969) {
+    if (uniffi_pubkymobile_checksum_func_sign_in() != 21006) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkymobile_checksum_func_sign_out() != 32961) {
+    if (uniffi_pubkymobile_checksum_func_sign_out() != 59116) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkymobile_checksum_func_sign_up() != 28083) {
+    if (uniffi_pubkymobile_checksum_func_sign_up() != 58756) {
         return InitializationResult.apiChecksumMismatch
     }
 
-    uniffiInitContinuationCallback()
     return InitializationResult.ok
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synonymdev/react-native-pubky",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "React Native Implementation of Pubky",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",