@synonymdev/react-native-pubky 0.10.6 → 0.11.0

package/ios/pubkycore.swift

@@ -1,5 +1,7 @@
 // This file was autogenerated by some hot garbage in the `uniffi` crate.
 // Trust me, you don't want to mess with it!
+
+// swiftlint:disable all
 import Foundation
 
 // Depending on the consumer's build setup, the low-level FFI code
@@ -18,6 +20,10 @@ fileprivate extension RustBuffer {
         self.init(capacity: rbuf.capacity, len: rbuf.len, data: rbuf.data)
     }
 
+    static func empty() -> RustBuffer {
+        RustBuffer(capacity: 0, len:0, data: nil)
+    }
+
     static func from(_ ptr: UnsafeBufferPointer<UInt8>) -> RustBuffer {
         try! rustCall { ffi_pubkycore_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
     }
@@ -44,9 +50,11 @@ fileprivate extension ForeignBytes {
 
 fileprivate extension Data {
     init(rustBuffer: RustBuffer) {
-        // TODO: This copies the buffer. Can we read directly from a
-        // Rust buffer?
-        self.init(bytes: rustBuffer.data!, count: Int(rustBuffer.len))
+        self.init(
+            bytesNoCopy: rustBuffer.data!,
+            count: Int(rustBuffer.len),
+            deallocator: .none
+        )
     }
 }
 
@@ -147,7 +155,7 @@ fileprivate func writeDouble(_ writer: inout [UInt8], _ value: Double) {
 }
 
 // Protocol for types that transfer other types across the FFI. This is
-// analogous go the Rust trait of the same name.
+// analogous to the Rust trait of the same name.
 fileprivate protocol FfiConverter {
     associatedtype FfiType
     associatedtype SwiftType
@@ -162,10 +170,16 @@ fileprivate protocol FfiConverter {
 fileprivate protocol FfiConverterPrimitive: FfiConverter where FfiType == SwiftType { }
 
 extension FfiConverterPrimitive {
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func lift(_ value: FfiType) throws -> SwiftType {
         return value
     }
 
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func lower(_ value: SwiftType) -> FfiType {
         return value
     }
@@ -176,6 +190,9 @@ extension FfiConverterPrimitive {
 fileprivate protocol FfiConverterRustBuffer: FfiConverter where FfiType == RustBuffer {}
 
 extension FfiConverterRustBuffer {
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func lift(_ buf: RustBuffer) throws -> SwiftType {
         var reader = createReader(data: Data(rustBuffer: buf))
         let value = try read(from: &reader)
@@ -186,6 +203,9 @@ extension FfiConverterRustBuffer {
         return value
     }
 
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func lower(_ value: SwiftType) -> RustBuffer {
           var writer = createWriter()
           write(value, into: &writer)
@@ -220,9 +240,17 @@ fileprivate enum UniffiInternalError: LocalizedError {
     }
 }
 
+fileprivate extension NSLock {
+    func withLock<T>(f: () throws -> T) rethrows -> T {
+        self.lock()
+        defer { self.unlock() }
+        return try f()
+    }
+}
+
 fileprivate let CALL_SUCCESS: Int8 = 0
 fileprivate let CALL_ERROR: Int8 = 1
-fileprivate let CALL_PANIC: Int8 = 2
+fileprivate let CALL_UNEXPECTED_ERROR: Int8 = 2
 fileprivate let CALL_CANCELLED: Int8 = 3
 
 fileprivate extension RustCallStatus {
@@ -239,29 +267,30 @@ fileprivate extension RustCallStatus {
 }
 
 private func rustCall<T>(_ callback: (UnsafeMutablePointer<RustCallStatus>) -> T) throws -> T {
-    try makeRustCall(callback, errorHandler: nil)
+    let neverThrow: ((RustBuffer) throws -> Never)? = nil
+    return try makeRustCall(callback, errorHandler: neverThrow)
 }
 
-private func rustCallWithError<T>(
-    _ errorHandler: @escaping (RustBuffer) throws -> Error,
+private func rustCallWithError<T, E: Swift.Error>(
+    _ errorHandler: @escaping (RustBuffer) throws -> E,
     _ callback: (UnsafeMutablePointer<RustCallStatus>) -> T) throws -> T {
     try makeRustCall(callback, errorHandler: errorHandler)
 }
 
-private func makeRustCall<T>(
+private func makeRustCall<T, E: Swift.Error>(
     _ callback: (UnsafeMutablePointer<RustCallStatus>) -> T,
-    errorHandler: ((RustBuffer) throws -> Error)?
+    errorHandler: ((RustBuffer) throws -> E)?
 ) throws -> T {
-    uniffiEnsureInitialized()
+    uniffiEnsurePubkycoreInitialized()
     var callStatus = RustCallStatus.init()
     let returnedVal = callback(&callStatus)
     try uniffiCheckCallStatus(callStatus: callStatus, errorHandler: errorHandler)
     return returnedVal
 }
 
-private func uniffiCheckCallStatus(
+private func uniffiCheckCallStatus<E: Swift.Error>(
     callStatus: RustCallStatus,
-    errorHandler: ((RustBuffer) throws -> Error)?
+    errorHandler: ((RustBuffer) throws -> E)?
 ) throws {
     switch callStatus.code {
         case CALL_SUCCESS:
@@ -275,7 +304,7 @@ private func uniffiCheckCallStatus(
                 throw UniffiInternalError.unexpectedRustCallError
             }
 
-        case CALL_PANIC:
+        case CALL_UNEXPECTED_ERROR:
             // When the rust code sees a panic, it tries to construct a RustBuffer
             // with the message.  But if that code panics, then it just sends back
             // an empty buffer.
@@ -287,16 +316,96 @@ private func uniffiCheckCallStatus(
             }
 
         case CALL_CANCELLED:
-                throw CancellationError()
+            fatalError("Cancellation not supported yet")
 
         default:
             throw UniffiInternalError.unexpectedRustCallStatusCode
     }
 }
 
-// Public interface members begin here.
+private func uniffiTraitInterfaceCall<T>(
+    callStatus: UnsafeMutablePointer<RustCallStatus>,
+    makeCall: () throws -> T,
+    writeReturn: (T) -> ()
+) {
+    do {
+        try writeReturn(makeCall())
+    } catch let error {
+        callStatus.pointee.code = CALL_UNEXPECTED_ERROR
+        callStatus.pointee.errorBuf = FfiConverterString.lower(String(describing: error))
+    }
+}
+
+private func uniffiTraitInterfaceCallWithError<T, E>(
+    callStatus: UnsafeMutablePointer<RustCallStatus>,
+    makeCall: () throws -> T,
+    writeReturn: (T) -> (),
+    lowerError: (E) -> RustBuffer
+) {
+    do {
+        try writeReturn(makeCall())
+    } catch let error as E {
+        callStatus.pointee.code = CALL_ERROR
+        callStatus.pointee.errorBuf = lowerError(error)
+    } catch {
+        callStatus.pointee.code = CALL_UNEXPECTED_ERROR
+        callStatus.pointee.errorBuf = FfiConverterString.lower(String(describing: error))
+    }
+}
+fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
+    // All mutation happens with this lock held, which is why we implement @unchecked Sendable.
+    private let lock = NSLock()
+    private var map: [UInt64: T] = [:]
+    private var currentHandle: UInt64 = 1
+
+    func insert(obj: T) -> UInt64 {
+        lock.withLock {
+            let handle = currentHandle
+            currentHandle += 1
+            map[handle] = obj
+            return handle
+        }
+    }
+
+     func get(handle: UInt64) throws -> T {
+        try lock.withLock {
+            guard let obj = map[handle] else {
+                throw UniffiInternalError.unexpectedStaleHandle
+            }
+            return obj
+        }
+    }
+
+    @discardableResult
+    func remove(handle: UInt64) throws -> T {
+        try lock.withLock {
+            guard let obj = map.removeValue(forKey: handle) else {
+                throw UniffiInternalError.unexpectedStaleHandle
+            }
+            return obj
+        }
+    }
+
+    var count: Int {
+        get {
+            map.count
+        }
+    }
+}
 
 
+// Public interface members begin here.
+// Magic number for the Rust proxy to call using the same mechanism as every other method,
+// to free the callback once it's dropped by Rust.
+private let IDX_CALLBACK_FREE: Int32 = 0
+// Callback return codes
+private let UNIFFI_CALLBACK_SUCCESS: Int32 = 0
+private let UNIFFI_CALLBACK_ERROR: Int32 = 1
+private let UNIFFI_CALLBACK_UNEXPECTED_ERROR: Int32 = 2
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 fileprivate struct FfiConverterBool : FfiConverter {
     typealias FfiType = Int8
     typealias SwiftType = Bool
@@ -318,6 +427,9 @@ fileprivate struct FfiConverterBool : FfiConverter {
     }
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 fileprivate struct FfiConverterString: FfiConverter {
     typealias SwiftType = String
     typealias FfiType = RustBuffer
@@ -357,34 +469,83 @@ fileprivate struct FfiConverterString: FfiConverter {
 }
 
 
-public protocol EventNotifierProtocol {
+
+
+public protocol EventNotifierProtocol: AnyObject, Sendable {
     
 }
+open class EventNotifier: EventNotifierProtocol, @unchecked Sendable {
+    fileprivate let pointer: UnsafeMutableRawPointer!
 
-public class EventNotifier: EventNotifierProtocol {
-    fileprivate let pointer: UnsafeMutableRawPointer
+    /// Used to instantiate a [FFIObject] without an actual pointer, for fakes in tests, mostly.
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    public struct NoPointer {
+        public init() {}
+    }
 
     // TODO: We'd like this to be `private` but for Swifty reasons,
     // we can't implement `FfiConverter` without making this `required` and we can't
     // make it `required` without making it `public`.
-    required init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) {
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    required public init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) {
         self.pointer = pointer
     }
 
+    // This constructor can be used to instantiate a fake object.
+    // - Parameter noPointer: Placeholder value so we can have a constructor separate from the default empty one that may be implemented for classes extending [FFIObject].
+    //
+    // - Warning:
+    //     Any object instantiated with this constructor cannot be passed to an actual Rust-backed object. Since there isn't a backing [Pointer] the FFI lower functions will crash.
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    public init(noPointer: NoPointer) {
+        self.pointer = nil
+    }
+
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    public func uniffiClonePointer() -> UnsafeMutableRawPointer {
+        return try! rustCall { uniffi_pubkycore_fn_clone_eventnotifier(self.pointer, $0) }
+    }
+    // No primary constructor declared for this class.
+
     deinit {
+        guard let pointer = pointer else {
+            return
+        }
+
         try! rustCall { uniffi_pubkycore_fn_free_eventnotifier(pointer, $0) }
     }
 
     
 
     
-    
+
 }
 
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 public struct FfiConverterTypeEventNotifier: FfiConverter {
+
     typealias FfiType = UnsafeMutableRawPointer
     typealias SwiftType = EventNotifier
 
+    public static func lift(_ pointer: UnsafeMutableRawPointer) throws -> EventNotifier {
+        return EventNotifier(unsafeFromRawPointer: pointer)
+    }
+
+    public static func lower(_ value: EventNotifier) -> UnsafeMutableRawPointer {
+        return value.uniffiClonePointer()
+    }
+
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> EventNotifier {
         let v: UInt64 = try readInt(&buf)
         // The Rust code won't compile if a pointer won't fit in a UInt64.
@@ -401,195 +562,144 @@ public struct FfiConverterTypeEventNotifier: FfiConverter {
         // The Rust code won't compile if a pointer won't fit in a `UInt64`.
         writeInt(&buf, UInt64(bitPattern: Int64(Int(bitPattern: lower(value)))))
     }
-
-    public static func lift(_ pointer: UnsafeMutableRawPointer) throws -> EventNotifier {
-        return EventNotifier(unsafeFromRawPointer: pointer)
-    }
-
-    public static func lower(_ value: EventNotifier) -> UnsafeMutableRawPointer {
-        return value.pointer
-    }
 }
 
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 public func FfiConverterTypeEventNotifier_lift(_ pointer: UnsafeMutableRawPointer) throws -> EventNotifier {
     return try FfiConverterTypeEventNotifier.lift(pointer)
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 public func FfiConverterTypeEventNotifier_lower(_ value: EventNotifier) -> UnsafeMutableRawPointer {
     return FfiConverterTypeEventNotifier.lower(value)
 }
 
-fileprivate extension NSLock {
-    func withLock<T>(f: () throws -> T) rethrows -> T {
-        self.lock()
-        defer { self.unlock() }
-        return try f()
-    }
-}
 
-fileprivate typealias UniFFICallbackHandle = UInt64
-fileprivate class UniFFICallbackHandleMap<T> {
-    private var leftMap: [UniFFICallbackHandle: T] = [:]
-    private var counter: [UniFFICallbackHandle: UInt64] = [:]
-    private var rightMap: [ObjectIdentifier: UniFFICallbackHandle] = [:]
 
-    private let lock = NSLock()
-    private var currentHandle: UniFFICallbackHandle = 0
-    private let stride: UniFFICallbackHandle = 1
 
-    func insert(obj: T) -> UniFFICallbackHandle {
-        lock.withLock {
-            let id = ObjectIdentifier(obj as AnyObject)
-            let handle = rightMap[id] ?? {
-                currentHandle += stride
-                let handle = currentHandle
-                leftMap[handle] = obj
-                rightMap[id] = handle
-                return handle
-            }()
-            counter[handle] = (counter[handle] ?? 0) + 1
-            return handle
-        }
-    }
 
-    func get(handle: UniFFICallbackHandle) -> T? {
-        lock.withLock {
-            leftMap[handle]
-        }
-    }
 
-    func delete(handle: UniFFICallbackHandle) {
-        remove(handle: handle)
-    }
-
-    @discardableResult
-    func remove(handle: UniFFICallbackHandle) -> T? {
-        lock.withLock {
-            defer { counter[handle] = (counter[handle] ?? 1) - 1 }
-            guard counter[handle] == 1 else { return leftMap[handle] }
-            let obj = leftMap.removeValue(forKey: handle)
-            if let obj = obj {
-                rightMap.removeValue(forKey: ObjectIdentifier(obj as AnyObject))
-            }
-            return obj
-        }
-    }
-}
-
-// Magic number for the Rust proxy to call using the same mechanism as every other method,
-// to free the callback once it's dropped by Rust.
-private let IDX_CALLBACK_FREE: Int32 = 0
-// Callback return codes
-private let UNIFFI_CALLBACK_SUCCESS: Int32 = 0
-private let UNIFFI_CALLBACK_ERROR: Int32 = 1
-private let UNIFFI_CALLBACK_UNEXPECTED_ERROR: Int32 = 2
-
-// Declaration and FfiConverters for EventListener Callback Interface
-
-public protocol EventListener : AnyObject {
+public protocol EventListener: AnyObject, Sendable {
+    
     func onEventOccurred(eventData: String) 
     
 }
 
-// The ForeignCallback that is passed to Rust.
-fileprivate let foreignCallbackCallbackInterfaceEventListener : ForeignCallback =
-    { (handle: UniFFICallbackHandle, method: Int32, argsData: UnsafePointer<UInt8>, argsLen: Int32, out_buf: UnsafeMutablePointer<RustBuffer>) -> Int32 in
-    
 
-    func invokeOnEventOccurred(_ swiftCallbackInterface: EventListener, _ argsData: UnsafePointer<UInt8>, _ argsLen: Int32, _ out_buf: UnsafeMutablePointer<RustBuffer>) throws -> Int32 {
-        var reader = createReader(data: Data(bytes: argsData, count: Int(argsLen)))
-        func makeCall() throws -> Int32 {
-            try swiftCallbackInterface.onEventOccurred(
-                    eventData:  try FfiConverterString.read(from: &reader)
-                    )
-            return UNIFFI_CALLBACK_SUCCESS
-        }
-        return try makeCall()
-    }
-
-
-    switch method {
-        case IDX_CALLBACK_FREE:
-            FfiConverterCallbackInterfaceEventListener.drop(handle: handle)
-            // Sucessful return
-            // See docs of ForeignCallback in `uniffi_core/src/ffi/foreigncallbacks.rs`
-            return UNIFFI_CALLBACK_SUCCESS
-        case 1:
-            let cb: EventListener
-            do {
-                cb = try FfiConverterCallbackInterfaceEventListener.lift(handle)
-            } catch {
-                out_buf.pointee = FfiConverterString.lower("EventListener: Invalid handle")
-                return UNIFFI_CALLBACK_UNEXPECTED_ERROR
+// Put the implementation in a struct so we don't pollute the top-level namespace
+fileprivate struct UniffiCallbackInterfaceEventListener {
+
+    // Create the VTable using a series of closures.
+    // Swift automatically converts these into C callback functions.
+    //
+    // This creates 1-element array, since this seems to be the only way to construct a const
+    // pointer that we can pass to the Rust code.
+    static let vtable: [UniffiVTableCallbackInterfaceEventListener] = [UniffiVTableCallbackInterfaceEventListener(
+        onEventOccurred: { (
+            uniffiHandle: UInt64,
+            eventData: RustBuffer,
+            uniffiOutReturn: UnsafeMutableRawPointer,
+            uniffiCallStatus: UnsafeMutablePointer<RustCallStatus>
+        ) in
+            let makeCall = {
+                () throws -> () in
+                guard let uniffiObj = try? FfiConverterCallbackInterfaceEventListener.handleMap.get(handle: uniffiHandle) else {
+                    throw UniffiInternalError.unexpectedStaleHandle
+                }
+                return uniffiObj.onEventOccurred(
+                     eventData: try FfiConverterString.lift(eventData)
+                )
             }
-            do {
-                return try invokeOnEventOccurred(cb, argsData, argsLen, out_buf)
-            } catch let error {
-                out_buf.pointee = FfiConverterString.lower(String(describing: error))
-                return UNIFFI_CALLBACK_UNEXPECTED_ERROR
+
+            
+            let writeReturn = { () }
+            uniffiTraitInterfaceCall(
+                callStatus: uniffiCallStatus,
+                makeCall: makeCall,
+                writeReturn: writeReturn
+            )
+        },
+        uniffiFree: { (uniffiHandle: UInt64) -> () in
+            let result = try? FfiConverterCallbackInterfaceEventListener.handleMap.remove(handle: uniffiHandle)
+            if result == nil {
+                print("Uniffi callback interface EventListener: handle missing in uniffiFree")
             }
-        
-        // This should never happen, because an out of bounds method index won't
-        // ever be used. Once we can catch errors, we should return an InternalError.
-        // https://github.com/mozilla/uniffi-rs/issues/351
-        default:
-            // An unexpected error happened.
-            // See docs of ForeignCallback in `uniffi_core/src/ffi/foreigncallbacks.rs`
-            return UNIFFI_CALLBACK_UNEXPECTED_ERROR
-    }
+        }
+    )]
+}
+
+private func uniffiCallbackInitEventListener() {
+    uniffi_pubkycore_fn_init_callback_vtable_eventlistener(UniffiCallbackInterfaceEventListener.vtable)
 }
 
 // FfiConverter protocol for callback interfaces
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 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<RustCallStatus>) in
-            uniffi_pubkycore_fn_init_callback_eventlistener(foreignCallbackCallbackInterfaceEventListener, err)
-        }
-    }()
-
-    private static func ensureCallbackinitialized() {
-        _ = initCallbackOnce
-    }
-
-    static func drop(handle: UniFFICallbackHandle) {
-        handleMap.remove(handle: handle)
-    }
-
-    private static var handleMap = UniFFICallbackHandleMap<EventListener>()
+    fileprivate static let handleMap = UniffiHandleMap<EventListener>()
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 extension FfiConverterCallbackInterfaceEventListener : FfiConverter {
     typealias SwiftType = EventListener
-    // We can use Handle as the FfiType because it's a typealias to UInt64
-    typealias FfiType = UniFFICallbackHandle
+    typealias FfiType = UInt64
 
-    public static func lift(_ handle: UniFFICallbackHandle) throws -> SwiftType {
-        ensureCallbackinitialized();
-        guard let callback = handleMap.get(handle: handle) else {
-            throw UniffiInternalError.unexpectedStaleHandle
-        }
-        return callback
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    public static func lift(_ handle: UInt64) throws -> SwiftType {
+        try handleMap.get(handle: handle)
     }
 
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
-        ensureCallbackinitialized();
-        let handle: UniFFICallbackHandle = try readInt(&buf)
+        let handle: UInt64 = try readInt(&buf)
         return try lift(handle)
     }
 
-    public static func lower(_ v: SwiftType) -> UniFFICallbackHandle {
-        ensureCallbackinitialized();
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
+    public static func lower(_ v: SwiftType) -> UInt64 {
         return handleMap.insert(obj: v)
     }
 
+#if swift(>=5.8)
+    @_documentation(visibility: private)
+#endif
     public static func write(_ v: SwiftType, into buf: inout [UInt8]) {
-        ensureCallbackinitialized();
         writeInt(&buf, lower(v))
     }
 }
 
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterCallbackInterfaceEventListener_lift(_ handle: UInt64) throws -> EventListener {
+    return try FfiConverterCallbackInterfaceEventListener.lift(handle)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterCallbackInterfaceEventListener_lower(_ v: EventListener) -> UInt64 {
+    return FfiConverterCallbackInterfaceEventListener.lower(v)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 fileprivate struct FfiConverterOptionString: FfiConverterRustBuffer {
     typealias SwiftType = String?
 
@@ -611,6 +721,9 @@ fileprivate struct FfiConverterOptionString: FfiConverterRustBuffer {
     }
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
 fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer {
     typealias SwiftType = [String]
 
@@ -632,265 +745,216 @@ fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer {
         return seq
     }
 }
-
-public func auth(url: String, secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func auth(url: String, secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_auth(
         FfiConverterString.lower(url),
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func createRecoveryFile(secretKey: String, passphrase: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func createRecoveryFile(secretKey: String, passphrase: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_create_recovery_file(
         FfiConverterString.lower(secretKey),
-        FfiConverterString.lower(passphrase),$0)
-}
+        FfiConverterString.lower(passphrase),$0
     )
+})
 }
-
-public func decryptRecoveryFile(recoveryFile: String, passphrase: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func decryptRecoveryFile(recoveryFile: String, passphrase: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_decrypt_recovery_file(
         FfiConverterString.lower(recoveryFile),
-        FfiConverterString.lower(passphrase),$0)
-}
+        FfiConverterString.lower(passphrase),$0
     )
+})
 }
-
-public func deleteFile(url: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func deleteFile(url: String, secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_delete_file(
-        FfiConverterString.lower(url),$0)
-}
+        FfiConverterString.lower(url),
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func generateMnemonicPhrase()  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
-    uniffi_pubkycore_fn_func_generate_mnemonic_phrase($0)
-}
+public func generateMnemonicPhrase() -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
+    uniffi_pubkycore_fn_func_generate_mnemonic_phrase($0
     )
+})
 }
-
-public func generateMnemonicPhraseAndKeypair()  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
-    uniffi_pubkycore_fn_func_generate_mnemonic_phrase_and_keypair($0)
-}
+public func generateMnemonicPhraseAndKeypair() -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
+    uniffi_pubkycore_fn_func_generate_mnemonic_phrase_and_keypair($0
     )
+})
 }
-
-public func generateSecretKey()  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
-    uniffi_pubkycore_fn_func_generate_secret_key($0)
-}
+public func generateSecretKey() -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
+    uniffi_pubkycore_fn_func_generate_secret_key($0
     )
+})
 }
-
-public func get(url: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func get(url: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_get(
-        FfiConverterString.lower(url),$0)
-}
+        FfiConverterString.lower(url),$0
     )
+})
 }
-
-public func getHomeserver(pubky: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func getHomeserver(pubky: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_get_homeserver(
-        FfiConverterString.lower(pubky),$0)
-}
+        FfiConverterString.lower(pubky),$0
     )
+})
 }
-
-public func getPublicKeyFromSecretKey(secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func getPublicKeyFromSecretKey(secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_get_public_key_from_secret_key(
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func getSignupToken(homeserverPubky: String, adminPassword: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func getSignupToken(homeserverPubky: String, adminPassword: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_get_signup_token(
         FfiConverterString.lower(homeserverPubky),
-        FfiConverterString.lower(adminPassword),$0)
-}
+        FfiConverterString.lower(adminPassword),$0
     )
+})
 }
-
-public func list(url: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func list(url: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_list(
-        FfiConverterString.lower(url),$0)
-}
+        FfiConverterString.lower(url),$0
     )
+})
 }
-
-public func mnemonicPhraseToKeypair(mnemonicPhrase: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func mnemonicPhraseToKeypair(mnemonicPhrase: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_mnemonic_phrase_to_keypair(
-        FfiConverterString.lower(mnemonicPhrase),$0)
-}
+        FfiConverterString.lower(mnemonicPhrase),$0
     )
+})
 }
-
-public func parseAuthUrl(url: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func parseAuthUrl(url: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_parse_auth_url(
-        FfiConverterString.lower(url),$0)
-}
+        FfiConverterString.lower(url),$0
     )
+})
 }
-
-public func publish(recordName: String, recordContent: String, secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func publish(recordName: String, recordContent: String, secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_publish(
         FfiConverterString.lower(recordName),
         FfiConverterString.lower(recordContent),
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func publishHttps(recordName: String, target: String, secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func publishHttps(recordName: String, target: String, secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_publish_https(
         FfiConverterString.lower(recordName),
         FfiConverterString.lower(target),
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func put(url: String, content: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func put(url: String, content: String, secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_put(
         FfiConverterString.lower(url),
-        FfiConverterString.lower(content),$0)
-}
+        FfiConverterString.lower(content),
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func removeEventListener()  {
-    try! rustCall() {
-    uniffi_pubkycore_fn_func_remove_event_listener($0)
+public func removeEventListener()  {try! rustCall() {
+    uniffi_pubkycore_fn_func_remove_event_listener($0
+    )
 }
 }
-
-
-
-public func republishHomeserver(secretKey: String, homeserver: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func republishHomeserver(secretKey: String, homeserver: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_republish_homeserver(
         FfiConverterString.lower(secretKey),
-        FfiConverterString.lower(homeserver),$0)
-}
+        FfiConverterString.lower(homeserver),$0
     )
-}
-
-public func resolve(publicKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+})
+}
+/**
+ * * Resolve a signed packet from a public key
+ * * @param public_key The public key to resolve
+ * * @returns A vector with two elements: the first element is a boolean indicating success or failure,
+ * * and the second element is the response data (either an error message or the resolved signed packet)
+ * *
+ */
+public func resolve(publicKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_resolve(
-        FfiConverterString.lower(publicKey),$0)
-}
+        FfiConverterString.lower(publicKey),$0
     )
+})
 }
-
-public func resolveHttps(publicKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func resolveHttps(publicKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_resolve_https(
-        FfiConverterString.lower(publicKey),$0)
-}
+        FfiConverterString.lower(publicKey),$0
     )
+})
 }
-
-public func session(pubky: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
-    uniffi_pubkycore_fn_func_session(
-        FfiConverterString.lower(pubky),$0)
-}
+public func revalidateSession(sessionSecret: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
+    uniffi_pubkycore_fn_func_revalidate_session(
+        FfiConverterString.lower(sessionSecret),$0
     )
+})
 }
-
-public func setEventListener(listener: EventListener)  {
-    try! rustCall() {
+public func setEventListener(listener: EventListener)  {try! rustCall() {
     uniffi_pubkycore_fn_func_set_event_listener(
-        FfiConverterCallbackInterfaceEventListener.lower(listener),$0)
+        FfiConverterCallbackInterfaceEventListener_lower(listener),$0
+    )
 }
 }
-
-
-
-public func signIn(secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func signIn(secretKey: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_sign_in(
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(secretKey),$0
     )
+})
 }
-
-public func signOut(secretKey: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func signOut(sessionSecret: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_sign_out(
-        FfiConverterString.lower(secretKey),$0)
-}
+        FfiConverterString.lower(sessionSecret),$0
     )
+})
 }
-
-public func signUp(secretKey: String, homeserver: String, signupToken: String?)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func signUp(secretKey: String, homeserver: String, signupToken: String?) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_sign_up(
         FfiConverterString.lower(secretKey),
         FfiConverterString.lower(homeserver),
-        FfiConverterOptionString.lower(signupToken),$0)
-}
+        FfiConverterOptionString.lower(signupToken),$0
     )
+})
 }
-
-public func switchNetwork(useTestnet: Bool)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func switchNetwork(useTestnet: Bool) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_switch_network(
-        FfiConverterBool.lower(useTestnet),$0)
-}
+        FfiConverterBool.lower(useTestnet),$0
     )
+})
 }
-
-public func validateMnemonicPhrase(mnemonicPhrase: String)  -> [String] {
-    return try!  FfiConverterSequenceString.lift(
-        try! rustCall() {
+public func validateMnemonicPhrase(mnemonicPhrase: String) -> [String]  {
+    return try!  FfiConverterSequenceString.lift(try! rustCall() {
     uniffi_pubkycore_fn_func_validate_mnemonic_phrase(
-        FfiConverterString.lower(mnemonicPhrase),$0)
-}
+        FfiConverterString.lower(mnemonicPhrase),$0
     )
+})
 }
 
 private enum InitializationResult {
@@ -898,108 +962,111 @@ private enum InitializationResult {
     case contractVersionMismatch
     case apiChecksumMismatch
 }
-// Use a global variables to perform the versioning checks. Swift ensures that
+// Use a global variable to perform the versioning checks. Swift ensures that
 // the code inside is only computed once.
-private var initializationResult: InitializationResult {
+private let initializationResult: InitializationResult = {
     // Get the bindings contract version from our ComponentInterface
-    let bindings_contract_version = 24
+    let bindings_contract_version = 29
     // Get the scaffolding contract version by calling the into the dylib
     let scaffolding_contract_version = ffi_pubkycore_uniffi_contract_version()
     if bindings_contract_version != scaffolding_contract_version {
         return InitializationResult.contractVersionMismatch
     }
-    if (uniffi_pubkycore_checksum_func_auth() != 51826) {
+    if (uniffi_pubkycore_checksum_func_auth() != 36598) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_create_recovery_file() != 48846) {
+    if (uniffi_pubkycore_checksum_func_create_recovery_file() != 13366) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_decrypt_recovery_file() != 26407) {
+    if (uniffi_pubkycore_checksum_func_decrypt_recovery_file() != 56578) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_delete_file() != 9063) {
+    if (uniffi_pubkycore_checksum_func_delete_file() != 37648) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_generate_mnemonic_phrase() != 2358) {
+    if (uniffi_pubkycore_checksum_func_generate_mnemonic_phrase() != 38398) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_generate_mnemonic_phrase_and_keypair() != 44395) {
+    if (uniffi_pubkycore_checksum_func_generate_mnemonic_phrase_and_keypair() != 13119) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_generate_secret_key() != 12800) {
+    if (uniffi_pubkycore_checksum_func_generate_secret_key() != 63319) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_get() != 6591) {
+    if (uniffi_pubkycore_checksum_func_get() != 12463) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_get_homeserver() != 40658) {
+    if (uniffi_pubkycore_checksum_func_get_homeserver() != 35947) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_get_public_key_from_secret_key() != 40316) {
+    if (uniffi_pubkycore_checksum_func_get_public_key_from_secret_key() != 65274) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_get_signup_token() != 47927) {
+    if (uniffi_pubkycore_checksum_func_get_signup_token() != 7931) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_list() != 43198) {
+    if (uniffi_pubkycore_checksum_func_list() != 14351) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_mnemonic_phrase_to_keypair() != 45784) {
+    if (uniffi_pubkycore_checksum_func_mnemonic_phrase_to_keypair() != 59088) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_parse_auth_url() != 27379) {
+    if (uniffi_pubkycore_checksum_func_parse_auth_url() != 47180) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_publish() != 48989) {
+    if (uniffi_pubkycore_checksum_func_publish() != 60897) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_publish_https() != 5614) {
+    if (uniffi_pubkycore_checksum_func_publish_https() != 43863) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_put() != 48150) {
+    if (uniffi_pubkycore_checksum_func_put() != 29897) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_remove_event_listener() != 23534) {
+    if (uniffi_pubkycore_checksum_func_remove_event_listener() != 3828) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_republish_homeserver() != 63919) {
+    if (uniffi_pubkycore_checksum_func_republish_homeserver() != 20001) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_resolve() != 34317) {
+    if (uniffi_pubkycore_checksum_func_resolve() != 873) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_resolve_https() != 17266) {
+    if (uniffi_pubkycore_checksum_func_resolve_https() != 34852) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_session() != 59795) {
+    if (uniffi_pubkycore_checksum_func_revalidate_session() != 12593) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_set_event_listener() != 60071) {
+    if (uniffi_pubkycore_checksum_func_set_event_listener() != 18894) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_sign_in() != 21584) {
+    if (uniffi_pubkycore_checksum_func_sign_in() != 31244) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_sign_out() != 34903) {
+    if (uniffi_pubkycore_checksum_func_sign_out() != 9048) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_sign_up() != 48789) {
+    if (uniffi_pubkycore_checksum_func_sign_up() != 49409) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_switch_network() != 64215) {
+    if (uniffi_pubkycore_checksum_func_switch_network() != 48346) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_func_validate_mnemonic_phrase() != 30362) {
+    if (uniffi_pubkycore_checksum_func_validate_mnemonic_phrase() != 9633) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred() != 11531) {
+    if (uniffi_pubkycore_checksum_method_eventlistener_on_event_occurred() != 24359) {
         return InitializationResult.apiChecksumMismatch
     }
 
+    uniffiCallbackInitEventListener()
     return InitializationResult.ok
-}
+}()
 
-private func uniffiEnsureInitialized() {
+// Make the ensure init function public so that other modules which have external type references to
+// our types can call it.
+public func uniffiEnsurePubkycoreInitialized() {
     switch initializationResult {
     case .ok:
         break
@@ -1008,4 +1075,6 @@ private func uniffiEnsureInitialized() {
     case .apiChecksumMismatch:
         fatalError("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-}
+}
+
+// swiftlint:enable all