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

Jump to bottom

Resolve memory leak on NativeEngine #1043

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve memory leak on NativeEngine #1043

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions Sources/Engine/NativeEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,24 @@ import Foundation
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
public class NativeEngine: NSObject, Engine, URLSessionDataDelegate, URLSessionWebSocketDelegate {
private var task: URLSessionWebSocketTask?
private var session: URLSession?
weak var delegate: EngineDelegate?

public func register(delegate: EngineDelegate) {
self.delegate = delegate
}

public func start(request: URLRequest) {
let session = URLSession(configuration: URLSessionConfiguration.default, delegate: self, delegateQueue: nil)
task = session.webSocketTask(with: request)
session = URLSession(configuration: URLSessionConfiguration.default, delegate: self, delegateQueue: nil)
task = session?.webSocketTask(with: request)
doRead()
task?.resume()
}

public func closeSession() {
session?.finishTasksAndInvalidate()
}

public func stop(closeCode: UInt16) {
let closeCode = URLSessionWebSocketTask.CloseCode(rawValue: Int(closeCode)) ?? .normalClosure
task?.cancel(with: closeCode, reason: nil)
Expand Down
10 changes: 9 additions & 1 deletion Sources/Starscream/WebSocket.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,15 @@ open class WebSocket: WebSocketClient, EngineDelegate {
self.init(request: request, engine: WSEngine(transport: FoundationTransport(), certPinner: certPinner, compressionHandler: compressionHandler))
}
}


deinit {
if #available(iOS 13.0, *) {
if let engine = engine as? NativeEngine {
engine.closeSession()
}
}
}

public func connect() {
engine.register(delegate: self)
engine.start(request: request)
Expand Down