cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to newer starscream

Browse Source
This commit is contained in:
Erik Little 2023-08-25 10:40:32 -04:00
parent 12b08a975f
commit 332a25f241
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartfile
View File

@ -1 +1 @@
github "NachoSoto/Starscream" "xros" github "daltoniam/Starscream" ~> 4.0.6

2
Cartfile.resolved
View File

@ -1 +1 @@
github "NachoSoto/Starscream" "4a776fae4200ce2087ad1bbb45c2bc59e1231d8d" github "daltoniam/Starscream" "4.0.6"

4
Package.resolved
View File

@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/daltoniam/Starscream", "repositoryURL": "https://github.com/daltoniam/Starscream",
"state": { "state": {
"branch": null, "branch": null,
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21", "revision": "ac6c0fc9da221873e01bd1a0d4818498a71eef33",
"version": "4.0.4" "version": "4.0.6"
} }
} }
] ]

4
Package.swift
View File

@ -1,4 +1,4 @@
// swift-tools-version:5.3 // swift-tools-version:5.4
import PackageDescription import PackageDescription
@ -8,7 +8,7 @@ let package = Package(
.library(name: "SocketIO", targets: ["SocketIO"]) .library(name: "SocketIO", targets: ["SocketIO"])
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.4")), .package(url: "https://github.com/daltoniam/Starscream", .exactItem("4.0.6")),
], ],
targets: [ targets: [
.target(name: "SocketIO", dependencies: ["Starscream"]), .target(name: "SocketIO", dependencies: ["Starscream"]),

4
Socket.IO-Client-Swift.podspec
View File

@ -24,8 +24,8 @@ Pod::Spec.new do |s|
s.swift_version = "5" s.swift_version = "5"
s.pod_target_xcconfig = { s.pod_target_xcconfig = {
'SWIFT_VERSION' => '5.0' 'SWIFT_VERSION' => '5.4'
} }
s.source_files = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift" s.source_files = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
s.dependency "Starscream", "~> 4.0" s.dependency "Starscream", "~> 4.0.6"
end end

10
Source/SocketIO/Engine/SocketEngine.swift
View File

@ -28,8 +28,10 @@ import Starscream
/// The class that handles the engine.io protocol and transports. /// The class that handles the engine.io protocol and transports.
/// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods. /// See `SocketEnginePollable` and `SocketEngineWebsocket` for transport specific methods.
open class SocketEngine: open class SocketEngine: NSObject, WebSocketDelegate, URLSessionDelegate,
NSObject, WebSocketDelegate, URLSessionDelegate, SocketEnginePollable, SocketEngineWebsocket, ConfigSettable { SocketEnginePollable, SocketEngineWebsocket, ConfigSettable {
// MARK: Properties // MARK: Properties
private static let logType = "SocketEngine" private static let logType = "SocketEngine"
@ -747,11 +749,11 @@ extension SocketEngine {
/// - Parameters: /// - Parameters:
/// - event: WS Event /// - event: WS Event
/// - _: /// - _:
public func didReceive(event: WebSocketEvent, client _: WebSocket) { public func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocketClient) {
switch event { switch event {
case let .connected(headers): case let .connected(headers):
wsConnected = true wsConnected = true
client?.engineDidWebsocketUpgrade(headers: headers) self.client?.engineDidWebsocketUpgrade(headers: headers)
websocketDidConnect() websocketDidConnect()
case .cancelled: case .cancelled:
wsConnected = false wsConnected = false