Merge pull request #223 from openbitapp/master

Added option that allows to specify path

Author: danielrbrowne

Sources/Models/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 useTLS: Bool
     public let activityTimeout: TimeInterval?
 
@@ -36,13 +37,15 @@ public enum AuthMethod {
         autoReconnect: Bool = true,
         host: PusherHost = .host(Constants.API.defaultHost),
         port: Int? = nil,
+        path: String? = nil,
         useTLS: Bool = true,
         activityTimeout: TimeInterval? = nil
     ) {
         self.authMethod = authMethod
         self.attemptToReturnJSONObject = attemptToReturnJSONObject
         self.autoReconnect = autoReconnect
         self.host = host.stringValue
+        self.path = path
         self.port = port ?? (useTLS ? 443 : 80)
         self.useTLS = useTLS
         self.activityTimeout = activityTimeout

Sources/PusherSwift.swift

@@ -180,11 +180,11 @@ let CLIENT_NAME = "pusher-websocket-swift"
 */
 func constructUrl(key: String, options: PusherClientOptions) -> String {
     var url = ""
-
+    let additionalPathComponents = options.path ?? ""
     if options.useTLS {
-        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)"
 }