Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]Misleading error logs when leaving a call #658

Merged
merged 1 commit into from
Feb 5, 2025
Merged

[Fix]Misleading error logs when leaving a call #658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions Sources/StreamVideo/WebSockets/Client/URLSessionWebSocketEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
oldValue?.cancel()
}
}

let request: URLRequest
private var session: URLSession?
let delegateOperationQueue: OperationQueue
let sessionConfiguration: URLSessionConfiguration
var urlSessionDelegateHandler: URLSessionDelegateHandler?

var callbackQueue: DispatchQueue { delegateOperationQueue.underlyingQueue! }

weak var delegate: WebSocketEngineDelegate?

required init(request: URLRequest, sessionConfiguration: URLSessionConfiguration, callbackQueue: DispatchQueue) {
self.request = request
self.sessionConfiguration = sessionConfiguration

delegateOperationQueue = OperationQueue()
delegateOperationQueue.underlyingQueue = callbackQueue

super.init()
}

func connect() {
urlSessionDelegateHandler = makeURLSessionDelegateHandler()

Expand Down Expand Up @@ -64,7 +64,7 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
task = nil
urlSessionDelegateHandler = nil
}

func send(message: SendableEvent) {
do {
let data = try message.serializedData()
Expand All @@ -73,7 +73,7 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
log.error("Failed sending SendableEvent", subsystems: .webSocket, error: error)
}
}

func send(jsonMessage: Codable) {
do {
let data = try JSONEncoder().encode(jsonMessage)
Expand All @@ -82,11 +82,11 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
log.error("Failed sending JSON message", subsystems: .webSocket, error: error)
}
}

func sendPing() {
task?.sendPing { _ in }
}

private func send(data: Data) {
let message: URLSessionWebSocketTask.Message = .data(data)
task?.send(message) { [weak self] error in
Expand All @@ -101,28 +101,30 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
}
}
}

private func doRead() {
task?.receive { [weak self] result in
log.debug("received new event \(result)", subsystems: .webSocket)
guard let self = self else {
guard let self = self, task != nil else {
return
}

switch result {
case let .success(message):
if case let .data(data) = message {
self.callbackQueue.async { [weak self] in
guard self?.task != nil else { return }
self?.delegate?.webSocketDidReceiveMessage(data)
}
} else if case let .string(string) = message {
let messageData = Data(string.utf8)
self.callbackQueue.async { [weak self] in
guard self?.task != nil else { return }
self?.delegate?.webSocketDidReceiveMessage(messageData)
}
}
self.doRead()

case let .failure(error):
log.error("Failed receiving Web Socket Message", subsystems: .webSocket, error: error)
}
Expand Down Expand Up @@ -175,7 +177,7 @@ class URLSessionWebSocketEngine: NSObject, WebSocketEngine {
disconnect()
}
}

class URLSessionDelegateHandler: NSObject, URLSessionDataDelegate, URLSessionWebSocketDelegate {
var onOpen: ((_ protocol: String?) -> Void)?
var onClose: ((_ code: URLSessionWebSocketTask.CloseCode, _ reason: Data?) -> Void)?
Expand Down