From 5d1b58d1031cca71205bd37b668e4f256ad97e6d Mon Sep 17 00:00:00 2001 From: Roberto Casula Date: Fri, 19 Jul 2019 11:13:27 +0200 Subject: [PATCH 1/5] Added option that allows to specify path --- Sources/PusherClientOptions.swift | 3 +++ Sources/PusherSwift.swift | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Sources/PusherClientOptions.swift b/Sources/PusherClientOptions.swift index 98cde4b2..d8f03cd0 100644 --- a/Sources/PusherClientOptions.swift +++ b/Sources/PusherClientOptions.swift @@ -27,6 +27,7 @@ public enum AuthMethod { public let autoReconnect: Bool public let host: String public let port: Int + public let path: String? public let encrypted: Bool public let activityTimeout: TimeInterval? @@ -36,6 +37,7 @@ public enum AuthMethod { autoReconnect: Bool = true, host: PusherHost = .host("ws.pusherapp.com"), port: Int? = nil, + path: String? = nil, encrypted: Bool = true, activityTimeout: TimeInterval? = nil ) { @@ -44,6 +46,7 @@ public enum AuthMethod { self.autoReconnect = autoReconnect self.host = host.stringValue self.port = port ?? (encrypted ? 443 : 80) + self.path = path self.encrypted = encrypted self.activityTimeout = activityTimeout } diff --git a/Sources/PusherSwift.swift b/Sources/PusherSwift.swift index b65be8cb..1d162c80 100644 --- a/Sources/PusherSwift.swift +++ b/Sources/PusherSwift.swift @@ -155,11 +155,11 @@ let CLIENT_NAME = "pusher-websocket-swift" */ func constructUrl(key: String, options: PusherClientOptions) -> String { var url = "" - + let additionalPathComponents = options.path ?? "" if options.encrypted { - url = "wss://\(options.host):\(options.port)/app/\(key)" + url = "wss://\(options.host):\(options.port)\(additionalPathComponents)/app/\(key)" } else { - url = "ws://\(options.host):\(options.port)/app/\(key)" + url = "ws://\(options.host):\(options.port)\(additionalPathComponents)/app/\(key)" } return "\(url)?client=\(CLIENT_NAME)&version=\(VERSION)&protocol=\(PROTOCOL)" } From 422727db38b8340408f670c336cb3eef2aeb9998 Mon Sep 17 00:00:00 2001 From: Roberto Casula Date: Sat, 30 May 2020 09:04:45 +0200 Subject: [PATCH 2/5] fix encrypted --- Sources/PusherClientOptions.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/PusherClientOptions.swift b/Sources/PusherClientOptions.swift index b793f38a..7a7935d6 100644 --- a/Sources/PusherClientOptions.swift +++ b/Sources/PusherClientOptions.swift @@ -45,7 +45,6 @@ public enum AuthMethod { self.attemptToReturnJSONObject = attemptToReturnJSONObject self.autoReconnect = autoReconnect self.host = host.stringValue - self.port = port ?? (encrypted ? 443 : 80) self.path = path self.port = port ?? (useTLS ? 443 : 80) self.useTLS = useTLS From e9b5bc294b29c6e1100feebe7b7fd816158455a1 Mon Sep 17 00:00:00 2001 From: Roberto Casula Date: Tue, 6 Oct 2020 10:46:43 +0200 Subject: [PATCH 3/5] Fix depl target --- Package.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 45a7cc76..3c2af098 100644 --- a/Package.swift +++ b/Package.swift @@ -1,14 +1,20 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.3 import PackageDescription let package = Package( name: "PusherSwift", + platforms: [ + .iOS(.v13), +// .watchOS(.v6), +// .tvOS(.v13), +// .macOS(.v10_15) + ], products: [ .library(name: "PusherSwift", targets: ["PusherSwift"]) ], dependencies: [ - .package(url: "https://github.com/ashleymills/Reachability.swift.git", .upToNextMajor(from: "5.0.0")), + .package(name: "Reachability", url: "https://github.com/ashleymills/Reachability.swift.git", .upToNextMajor(from: "5.0.0")), .package(url: "https://github.com/daltoniam/Starscream.git", .upToNextMajor(from: "3.1.0")), ], targets: [ From a9db2462553829d2e6d28f1a9026d1bb27936fa0 Mon Sep 17 00:00:00 2001 From: rcasula <16337140+rcasula@users.noreply.github.com> Date: Tue, 6 Oct 2020 11:52:31 +0200 Subject: [PATCH 4/5] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 3c2af098..e5aee793 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.2 import PackageDescription From d3182e167e5fa62d59187b3d606212e6b71f1668 Mon Sep 17 00:00:00 2001 From: Roberto Casula Date: Fri, 15 Jan 2021 08:34:38 +0100 Subject: [PATCH 5/5] Fix Package.swift --- Package.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index ca81ae4d..0f7f889b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,14 +1,10 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.0 import PackageDescription let package = Package( name: "PusherSwift", - platforms: [ - .iOS(.v13), - .tvOS(.v13), - .macOS(.v10_15) - ], + platforms: [.iOS("13.0"), .macOS("10.15"), .tvOS("13.0")], products: [ .library(name: "PusherSwift", targets: ["PusherSwift"]) ],