Skip to content
Snippets Groups Projects

Release 1.0.0

Merged Dariusz Rybicki requested to merge development into main
2 files
+ 325
18
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -3,18 +3,49 @@ import XCTestDynamicOverlay
import XXClient
public struct MessengerSendFile {
public typealias Callback = (Data, XXClient.Progress) -> Void
public struct Params: Equatable {
public init(
file: FileSend,
recipientId: Data,
retry: Int = 3,
callbackIntervalMS: Int = 250
) {
self.file = file
self.recipientId = recipientId
self.retry = retry
self.callbackIntervalMS = callbackIntervalMS
}
public var file: FileSend
public var recipientId: Data
public var retry: Int
public var callbackIntervalMS: Int
}
public enum CallbackInfo: Equatable {
public enum Failure: Equatable {
case error(NSError)
case progressError(String)
case close(NSError)
}
case progress(id: Data, transmitted: Int, total: Int)
case finished(id: Data)
case failed(id: Data, Failure)
}
public typealias Callback = (CallbackInfo) -> Void
public enum Error: Swift.Error, Equatable {
case notConnected
}
public var run: (FileTransferSend.Params, @escaping Callback) throws -> Void
public var run: (Params, @escaping Callback) throws -> Data
public func callAsFunction(
_ params: FileTransferSend.Params,
_ params: Params,
callback: @escaping Callback
) throws -> Void {
) throws -> Data {
try run(params, callback)
}
}
@@ -35,33 +66,48 @@ extension MessengerSendFile {
fatalError("Bindings issue: ReceiveFileCallback called when sending file.")
}
)
let semaphore = DispatchSemaphore(value: 0)
func close(id: Data) {
do {
try fileTransfer.closeSend(transferId: id)
} catch {
callback(.failed(id: id, .close(error as NSError)))
}
}
var transferId: Data!
var error: Swift.Error?
transferId = try fileTransfer.send(
params: params,
params: FileTransferSend.Params(
payload: params.file,
recipientId: params.recipientId,
retry: Float(params.retry),
period: params.callbackIntervalMS
),
callback: FileTransferProgressCallback { result in
guard let transferId else {
fatalError("Bindings issue: file transfer progress callback was called before send function returned transfer id.")
}
switch result {
case .failure(let err):
error = err
semaphore.signal()
case .failure(let error):
callback(.failed(id: transferId, .error(error)))
close(id: transferId)
case .success(let cb):
callback(transferId, cb.progress)
if cb.progress.completed || cb.progress.error != nil {
semaphore.signal()
if let error = cb.progress.error {
callback(.failed(id: transferId, .progressError(error)))
close(id: transferId)
} else if cb.progress.completed {
callback(.finished(id: transferId))
close(id: transferId)
} else {
callback(.progress(
id: transferId,
transmitted: cb.progress.transmitted,
total: cb.progress.total
))
}
}
}
)
semaphore.wait()
try fileTransfer.closeSend(transferId: transferId)
if let error {
throw error
}
return transferId
}
}
}
Loading