Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
],
dependencies: [
.package(name: "BigInt", url: "https://github.com/attaswift/BigInt.git", from: "5.2.1"),
.package(name: "Starscream", url: "https://github.com/daltoniam/Starscream", from: "3.1.1")
.package(name: "Starscream", url: "https://github.com/daltoniam/Starscream", from: "4.0.8")
],
targets: [
.target(
Expand Down
4 changes: 1 addition & 3 deletions Sources/Models/FlowId.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ public extension Flow.ID {

let result = try await awaitPublisher(
ws.subscribeToTransactionStatus(txId: self)
.filter{ $0.payload?.transactionResult.status ?? .unknown > status }
.first()
.eraseToAnyPublisher()
.filter{ $0.payload?.transactionResult.status ?? .unknown >= status }
,
timeout: timeout
)
Expand Down
53 changes: 33 additions & 20 deletions Sources/Network/Websocket/Websocket.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ public extension Flow {
isConnecting = true
var request = URLRequest(url: url)
request.timeoutInterval = timeoutInterval
socket = WebSocket(request: request)

let pinner = FoundationSecurity(allowSelfSigned: true) // do not validate SSL certificates
socket = WebSocket(request: request, certPinner: pinner)

socket?.delegate = self
socket?.connect()
}
Expand Down Expand Up @@ -179,7 +182,7 @@ public extension Flow {
}

public func unsubscribe(subscriptionId: String) {
let request = SubscribeRequest<EmptyArguments>(id: subscriptionId, action: .unsubscribe, topic: .blocks, arguments: nil)
let request = SubscribeRequest<EmptyArguments>(id: subscriptionId, action: .unsubscribe, topic: nil, arguments: nil)
do {
let data = try encoder.encode(request)
socket?.write(data: data)
Expand Down Expand Up @@ -213,25 +216,35 @@ public extension Flow {
// MARK: - WebSocketDelegate

extension Flow.Websocket: WebSocketDelegate {
public func websocketDidConnect(socket: any Starscream.WebSocketClient) {
isConnected = true
isConnecting = false
connectionSubject.send(())
Flow.Publisher.shared.publishConnectionStatus(isConnected: true)
}

public func websocketDidDisconnect(socket: any Starscream.WebSocketClient, error: (any Error)?) {
isConnected = false
isConnecting = false
Flow.Publisher.shared.publishConnectionStatus(isConnected: false)
}

public func websocketDidReceiveMessage(socket: any Starscream.WebSocketClient, text: String) {
handleTextMessage(text)
}

public func websocketDidReceiveData(socket: any Starscream.WebSocketClient, data: Data) {
handleBinaryMessage(data)
public func didReceive(event: WebSocketEvent, client: any Starscream.WebSocketClient) {
switch event {
case .connected:
isConnected = true
isConnecting = false
connectionSubject.send(())
Flow.Publisher.shared.publishConnectionStatus(isConnected: true)

case .disconnected(_, _):
isConnected = false
isConnecting = false
Flow.Publisher.shared.publishConnectionStatus(isConnected: false)

case .text(let string):
handleTextMessage(string)

case .binary(let data):
handleBinaryMessage(data)

case .error(let error):
print("WebSocket error: \(String(describing: error))")
let wsError = WebSocketError.serverError(SocketError(code: -1, message: error?.localizedDescription ?? "Unknown error"))
subscriptions.values.forEach { $0.subject.send(completion: .failure(wsError)) }
Flow.Publisher.shared.publishError(wsError)

default:
break
}
}

private func handleTextMessage(_ text: String) {
Expand Down
2 changes: 1 addition & 1 deletion Tests/FlowAccessAPIOnTestnetTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ final class FlowAccessAPIOnTestnetTests: XCTestCase {
print("txid --> \(txId.hex)")
XCTAssertNotNil(txId)

let result = try await txId.onceExecuted()
let result = try await txId.onceSealed()
let address = result.getCreatedAddress()!
print("address --> \(address)")
XCTAssertNotNil(address)
Expand Down
Loading